vs_seeker: sub_810C670

asm/vs_seeker.s

@@ -5,94 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_810C670
-sub_810C670: @ 810C670
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	movs r2, 0
-	ldr r7, _0810C6C0 @ =gUnknown_203ADB8
-	lsls r1, r4, 2
-	adds r0, r1, r4
-	lsls r3, r0, 3
-	ldr r5, _0810C6C4 @ =gTasks+0x8
-	adds r6, r1, 0
-	movs r1, 0
-_0810C686:
-	lsls r0, r2, 1
-	adds r0, r3
-	adds r0, r5
-	strh r1, [r0]
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0xF
-	bls _0810C686
-	adds r5, r7, 0
-	ldr r0, _0810C6C8 @ =0x00000434
-	bl AllocZeroed
-	str r0, [r5]
-	bl sub_810C808
-	bl sub_810C96C
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r0, 0
-	cmp r0, 0
-	bne _0810C6D0
-	ldr r0, [r5]
-	bl Free
-	ldr r2, _0810C6CC @ =gUnknown_81C137C
-	b _0810C6DC
-	.align 2, 0
-_0810C6C0: .4byte gUnknown_203ADB8
-_0810C6C4: .4byte gTasks+0x8
-_0810C6C8: .4byte 0x00000434
-_0810C6CC: .4byte gUnknown_81C137C
-_0810C6D0:
-	cmp r0, 0x1
-	bne _0810C6F0
-	ldr r0, [r7]
-	bl Free
-	ldr r2, _0810C6E8 @ =gUnknown_81C13D6
-_0810C6DC:
-	ldr r3, _0810C6EC @ =sub_80A1E0C
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl DisplayItemMessageOnField
-	b _0810C718
-	.align 2, 0
-_0810C6E8: .4byte gUnknown_81C13D6
-_0810C6EC: .4byte sub_80A1E0C
-_0810C6F0:
-	cmp r1, 0x2
-	bne _0810C718
-	ldr r0, _0810C720 @ =gUnknown_203AD30
-	ldrh r2, [r0]
-	ldr r3, _0810C724 @ =0x0000ffff
-	movs r0, 0x4
-	movs r1, 0
-	bl sub_80A2294
-	movs r0, 0x41
-	bl FieldEffectStart
-	ldr r1, _0810C728 @ =gTasks
-	adds r0, r6, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _0810C72C @ =sub_810C730
-	str r1, [r0]
-	movs r1, 0xF
-	strh r1, [r0, 0x8]
-_0810C718:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810C720: .4byte gUnknown_203AD30
-_0810C724: .4byte 0x0000ffff
-_0810C728: .4byte gTasks
-_0810C72C: .4byte sub_810C730
-	thumb_func_end sub_810C670
-
 	thumb_func_start sub_810C730
 sub_810C730: @ 810C730
 	push {lr}

include/event_scripts.h

@@ -372,4 +372,6 @@ extern const u8 SecretBase_RedCave1_Text_274E75[];
 extern const u8 SecretBase_RedCave1_Text_2751E1[];
 extern const u8 SecretBase_RedCave1_Text_2754F6[];
 extern const u8 SecretBase_RedCave1_Text_2758CC[];
+extern const u8 gUnknown_81C137C[];
+extern const u8 gUnknown_81C13D6[];
 #endif //GUARD_EVENT_SCRIPTS_H

include/field_effect.h

@@ -66,7 +66,9 @@ enum FieldEffectScriptIdx
     FLDEFF_USE_FLY_ANCIENT_TOMB,
     FLDEFF_PCTURN_ON,
     FLDEFF_HALL_OF_FAME_RECORD,
-    FLDEFF_USE_TELEPORT
+    FLDEFF_USE_TELEPORT,
+    FLDEFF_UNK_40,
+    FLDEFF_UNK_41  // TODO: related to vs_seeker
 };
 
 extern u32 gFieldEffectArguments[8];

include/item_menu.h

@@ -1,12 +1,14 @@
-#ifndef GUARD_item_menu_H
-#define GUARD_item_menu_H
+#ifndef GUARD_ITEM_MENU_H
+#define GUARD_ITEM_MENU_H
 
 // Exported type declarations
 
 // Exported RAM declarations
 
+extern u16 gUnknown_203AD30;
+
 // Exported ROM declarations
 void sub_81AAC50(void);
 void sub_81AAC70(void);
 
-#endif //GUARD_item_menu_H
+#endif //GUARD_ITEM_MENU_H

include/new_menu_helpers.h

@@ -1,6 +1,7 @@
 #ifndef GUARD_NEW_MENU_HELPERS_H
 #define GUARD_NEW_MENU_HELPERS_H
 
+#include "global.h"
 #include "text.h"
 #include "task.h"
 
@@ -9,7 +10,7 @@ void sub_81973C4(u8, u8);
 void sub_819746C(u8 windowId, bool8 copyToVram);
 void sub_81973FC(u8, u8);
 u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
-void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
+void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *src, TaskFunc callback);
 void sub_8197434(u8 a0, u8 a1);
 void SetStandardWindowBorderStyle(u8 a0, u8 a1);
 void sub_8197930(void);

ld_script.txt

@@ -219,6 +219,7 @@ SECTIONS {
         asm/bag.o(.text);
         asm/battle_dome_cards.o(.text);
         asm/unk_810C3A4.o(.text);
+        src/vs_seeker.o(.text);
         asm/vs_seeker.o(.text);
         asm/item_pc.o(.text);
         asm/mailbox_pc.o(.text);