Merge pull request #17 from PikalaxALT/vs_seeker

Vs seeker

include/battle_setup.h

@@ -14,5 +14,6 @@ void trainer_flag_clear(u16);
 void BattleSetup_StartTrainerBattle(void);
 u8 *BattleSetup_GetScriptAddrAfterBattle(void);
 u8 *BattleSetup_GetTrainerPostBattleScript(void);
+void sub_80803FC(void);
 
 #endif // GUARD_BATTLE_SETUP_H

include/constants/flags.h

@@ -1,6 +1,8 @@
 #ifndef GUARD_CONSTANTS_FLAGS_H
 #define GUARD_CONSTANTS_FLAGS_H
 
+// TODO: Get correct names and numbers
+
 #define FLAG_0x001               0x1
 #define FLAG_0x002               0x2
 #define FLAG_0x003               0x3

include/constants/movement_commands.h

@@ -0,0 +1,117 @@
+#ifndef GUARD_CONSTANTS_MOVEMENT_COMMANDS_H
+#define GUARD_CONSTANTS_MOVEMENT_COMMANDS_H
+
+enum
+{
+    step_00,
+    step_01,
+    step_02,
+    step_03,
+    slow_step_down,
+    slow_step_up,
+    slow_step_left,
+    slow_step_right,
+    step_down,
+    step_up,
+    step_left,
+    step_right,
+    fast_step_down,
+    fast_step_up,
+    fast_step_left,
+    fast_step_right,
+    step_10,
+    step_11,
+    step_12,
+    step_13,
+    step_14,
+    step_15,
+    step_16,
+    step_17,
+    step_18,
+    step_19,
+    step_1a,
+    step_1b,
+    step_1c,
+    step_1d,
+    step_1e,
+    step_1f,
+    step_20,
+    step_21,
+    step_22,
+    step_23,
+    step_24,
+    step_25,
+    step_26,
+    step_27,
+    step_28,
+    step_29,
+    step_2a,
+    step_2b,
+    step_2c,
+    step_2d,
+    step_2e,
+    step_2f,
+    step_30,
+    step_31,
+    step_32,
+    step_33,
+    step_34,
+    step_35,
+    step_36,
+    step_37,
+    step_38,
+    step_39,
+    step_3a,
+    step_3b,
+    step_3c,
+    step_3d,
+    step_3e,
+    step_3f,
+    step_40,
+    step_41,
+    step_42,
+    step_43,
+    step_44,
+    step_45,
+    step_46,
+    step_47,
+    step_48,
+    step_49,
+    step_4a,
+    step_4b,
+    step_4c,
+    step_4d,
+    step_4e,
+    step_4f,
+    step_50,
+    step_51,
+    step_52,
+    step_53,
+    step_54,
+    step_55,
+    step_56,
+    step_57,
+    step_58,
+    step_59,
+    step_5a,
+    step_5b,
+    step_5c,
+    step_5d,
+    step_5e,
+    step_5f,
+    step_60,
+    step_61,
+    step_62,
+    step_63,
+    step_64,
+    step_65,
+
+    step_91 = 0x91,
+    step_92,
+
+    step_96 = 0x96,
+
+    step_end = 0xfe,
+};
+
+#endif //GUARD_CONSTANTS_MOVEMENT_COMMANDS_H

include/event_scripts.h

@@ -372,4 +372,9 @@ 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[];
+
+// vs_seeker
+extern const u8 gUnknown_81C137C[];
+extern const u8 gUnknown_81C13D6[];
+extern const u8 gUnknown_81C1429[];
 #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/field_map_obj.h

@@ -76,6 +76,9 @@ void MoveCoords(u8, s16 *, s16 *);
 bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
 u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *);
 u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z);
+void npc_coords_shift_still(struct MapObject *);
+void sub_805FE7C(struct MapObject *, u8);
+void npc_set_running_behaviour_etc(struct MapObject *, u8);
 
 // Exported data declarations
 

include/field_specials.h

@@ -2,5 +2,6 @@
 #define GUARD_FIELD_SPECIALS_H
 
 u8 GetLeadMonIndex(void);
+void TV_PrintIntToStringVar(u8, int);
 
 #endif // GUARD_FIELD_SPECIALS_H

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/item_use.h

@@ -0,0 +1,9 @@
+#ifndef GUARD_ITEM_USE_H
+#define GUARD_ITEM_USE_H
+
+#include "global.h"
+
+void sub_80A1E0C(u8);
+void sub_80A2294(u8, u8, u16, u16);
+
+#endif //GUARD_ITEM_USE_H

include/map_obj_lock.h

@@ -7,5 +7,6 @@ bool8 sub_809847C(void);
 void LockSelectedMapObject(void);
 void sub_8098630(void);
 bool8 sub_8098734(void);
+void sub_80696C0(void);
 
 #endif // GUARD_MAP_OBJ_LOCK_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,10 +10,11 @@ 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);
 u8 GetPlayerTextSpeed(void);
+void sub_80F6F54(u8, u8);
 
 #endif // GUARD_NEW_MENU_HELPERS_H

include/unk_810c3a4.h

@@ -0,0 +1,7 @@
+#ifndef GUARD_UNK_810C3A4_H
+#define GUARD_UNK_810C3A4_H
+
+void sub_810C604(void);
+void sub_810C640(void);
+
+#endif //GUARD_UNK_810C3A4_H

include/vs_seeker.h

@@ -0,0 +1,14 @@
+#ifndef GUARD_VS_SEEKER_H
+#define GUARD_VS_SEEKER_H
+
+#include "global.h"
+
+void Task_VsSeeker_0(u8 taskId);
+void sub_810CB90(void);
+void sub_810CDE8(void);
+int sub_810CE64(u16 a0);
+bool8 sub_810CF04(u8 a0);
+u8 sub_810CF54();
+void sub_810D0D0(void);
+
+#endif //GUARD_VS_SEEKER_H