More prototype fixing

6 files changed, 161 insertions, 164 deletions

diff --git a/arm9/modules/52/include/module_52.h b/arm9/modules/52/include/module_52.h
index 0abc13e1..0adedc62 100644
--- a/arm9/modules/52/include/module_52.h
+++ b/arm9/modules/52/include/module_52.h
@@ -13,19 +13,21 @@
 #include "unk_02024E64.h"
 #include "unk_020286F8.h"
 
-const u16 MOD52_021D76F8[];
+extern const struct Unk21DBE18 MOD52_021D76E8;
+extern const struct Unk21DBE18 MOD52_021D76D8;
+extern const struct Unk21DBE18 MOD52_021D76C8;
 
-THUMB_FUNC BOOL MOD52_021D74E0();
+THUMB_FUNC BOOL MOD52_021D74E0(struct UnkStruct_02006234 *arg1, u32 *arg2);
 THUMB_FUNC BOOL MOD52_021D74F8(struct UnkStruct_02006234 *param0, u32 *unused);
-THUMB_FUNC BOOL MOD52_021D750C();
+THUMB_FUNC BOOL MOD52_021D750C(struct UnkStruct_02006234 *arg1, u32 *arg2);
 
-THUMB_FUNC BOOL MOD52_021D7528();
+THUMB_FUNC BOOL MOD52_021D7528(struct UnkStruct_02006234 *arg1, u32 *arg2);
 THUMB_FUNC BOOL MOD52_021D7540(struct UnkStruct_02006234 *param0, u32 *unused);
-THUMB_FUNC BOOL MOD52_021D7560();
+THUMB_FUNC BOOL MOD52_021D7560(struct UnkStruct_02006234 *arg1, u32 *arg2);
 
-THUMB_FUNC BOOL MOD52_021D757C();
+THUMB_FUNC BOOL MOD52_021D757C(struct UnkStruct_02006234 *arg1, u32 *arg2);
 THUMB_FUNC BOOL MOD52_021D7594(struct UnkStruct_02006234 *param0, u32 *unused);
-THUMB_FUNC BOOL MOD52_021D75E8();
+THUMB_FUNC BOOL MOD52_021D75E8(struct UnkStruct_02006234 *arg1, u32 *arg2);
 
 THUMB_FUNC void MOD52_021D7604(u32 heap_id, struct SaveBlock2 *sav2, BOOL set_trainerid);
 THUMB_FUNC void MOD52_021D7688(u32 param0, struct SaveBlock2 *sav2);
diff --git a/arm9/modules/52/src/module_52.c b/arm9/modules/52/src/module_52.c
index 52cba975..41f2706a 100644
--- a/arm9/modules/52/src/module_52.c
+++ b/arm9/modules/52/src/module_52.c
@@ -1,18 +1,160 @@
 #include "module_52.h"
 #include "heap.h"
 #include "unk_0205FA2C.h"
+#include "unk_02015E30.h"
 
 
 extern struct Unk21DBE18 UNK_020FD144;
 extern struct Unk21DBE18 UNK_020F2B7C;
 extern struct Unk21DBE18 UNK_020F2B8C;
 
-extern void FUN_02015E3C(struct IGT *igt);
 extern int FUN_02053678(u32 random, u32 gender, u32 param2);
 extern void FUN_020250C4(void *sav_ptr, u32 heap_id, const u16 param2[], u32 param3);
 extern void FUN_020377E0(struct SaveBlock2 *sav2);
 extern void FUN_0205ECD4(struct ScriptState *script_state);
 
+const struct Unk21DBE18 MOD52_021D76E8 = {
+    MOD52_021D74E0,
+    MOD52_021D74F8,
+    MOD52_021D750C,
+    0xFFFFFFFF,
+};
+
+const struct Unk21DBE18 MOD52_021D76D8 = {
+    MOD52_021D7528,
+    MOD52_021D7540,
+    MOD52_021D7560,
+    0xFFFFFFFF,
+};
+
+const struct Unk21DBE18 MOD52_021D76C8 = {
+    MOD52_021D757C,
+    MOD52_021D7594,
+    MOD52_021D75E8,
+    0xFFFFFFFF,
+};
+
+const u16 MOD52_021D76F8[] = {
+    ITEM_ORAN_BERRY, 1,
+    ITEM_CHERI_BERRY, 1,
+    ITEM_CHESTO_BERRY, 1,
+    ITEM_PECHA_BERRY, 1,
+    ITEM_ORAN_BERRY, 1,
+    ITEM_PECHA_BERRY, 1,
+    ITEM_RAZZ_BERRY, 2,
+    ITEM_BLUK_BERRY, 2,
+    ITEM_CHERI_BERRY, 1,
+    ITEM_ORAN_BERRY, 2,
+    ITEM_SITRUS_BERRY, 1,
+    ITEM_WEPEAR_BERRY, 2,
+    ITEM_WEPEAR_BERRY, 2,
+    ITEM_KELPSY_BERRY, 1,
+    ITEM_CHERI_BERRY, 1,
+    ITEM_PECHA_BERRY, 1,
+    ITEM_ORAN_BERRY, 1,
+    ITEM_ORAN_BERRY, 1,
+    ITEM_RAWST_BERRY, 1,
+    ITEM_RAWST_BERRY, 1,
+    ITEM_RAZZ_BERRY, 1,
+    ITEM_RAZZ_BERRY, 1,
+    ITEM_CHERI_BERRY, 1,
+    ITEM_ORAN_BERRY, 1,
+    ITEM_ORAN_BERRY, 1,
+    ITEM_BLUK_BERRY, 1,
+    ITEM_NANAB_BERRY, 2,
+    ITEM_RAZZ_BERRY, 2,
+    ITEM_BLUK_BERRY, 2,
+    ITEM_PINAP_BERRY, 2,
+    ITEM_LEPPA_BERRY, 1,
+    ITEM_CHESTO_BERRY, 1,
+    ITEM_RAZZ_BERRY, 1,
+    ITEM_RAZZ_BERRY, 1,
+    ITEM_PERSIM_BERRY, 1,
+    ITEM_NANAB_BERRY, 1,
+    ITEM_NANAB_BERRY, 1,
+    ITEM_FIGY_BERRY, 1,
+    ITEM_ASPEAR_BERRY, 1,
+    ITEM_ASPEAR_BERRY, 1,
+    ITEM_RAZZ_BERRY, 1,
+    ITEM_PINAP_BERRY, 1,
+    ITEM_SITRUS_BERRY, 1,
+    ITEM_CHESTO_BERRY, 1,
+    ITEM_WIKI_BERRY, 1,
+    ITEM_AGUAV_BERRY, 1,
+    ITEM_PECHA_BERRY, 1,
+    ITEM_ASPEAR_BERRY, 1,
+    ITEM_IAPAPA_BERRY, 1,
+    ITEM_GREPA_BERRY, 1,
+    ITEM_SITRUS_BERRY, 1,
+    ITEM_ASPEAR_BERRY, 1,
+    ITEM_TAMATO_BERRY, 1,
+    ITEM_LUM_BERRY, 1,
+    ITEM_PECHA_BERRY, 1,
+    ITEM_PINAP_BERRY, 1,
+    ITEM_PINAP_BERRY, 1,
+    ITEM_PINAP_BERRY, 1,
+    ITEM_PERSIM_BERRY, 1,
+    ITEM_PERSIM_BERRY, 1,
+    ITEM_NANAB_BERRY, 1,
+    ITEM_NANAB_BERRY, 1,
+    ITEM_AGUAV_BERRY, 1,
+    ITEM_IAPAPA_BERRY, 1,
+    ITEM_RAWST_BERRY, 1,
+    ITEM_RAWST_BERRY, 1,
+    ITEM_CHERI_BERRY, 1,
+    ITEM_SITRUS_BERRY, 1,
+    ITEM_CHESTO_BERRY, 1,
+    ITEM_POMEG_BERRY, 1,
+    ITEM_PECHA_BERRY, 2,
+    ITEM_BLUK_BERRY, 2,
+    ITEM_WIKI_BERRY, 1,
+    ITEM_MAGO_BERRY, 1,
+    ITEM_RAWST_BERRY, 1,
+    ITEM_PERSIM_BERRY, 1,
+    ITEM_FIGY_BERRY, 1,
+    ITEM_PINAP_BERRY, 2,
+    ITEM_LEPPA_BERRY, 1,
+    ITEM_PECHA_BERRY, 1,
+    ITEM_MAGO_BERRY, 1,
+    ITEM_HONDEW_BERRY, 1,
+    ITEM_WIKI_BERRY, 2,
+    ITEM_MAGO_BERRY, 2,
+    ITEM_AGUAV_BERRY, 2,
+    ITEM_QUALOT_BERRY, 1,
+    ITEM_SITRUS_BERRY, 2,
+    ITEM_BLUK_BERRY, 3,
+    ITEM_NANAB_BERRY, 3,
+    ITEM_WEPEAR_BERRY, 3,
+    ITEM_POMEG_BERRY, 1,
+    ITEM_POMEG_BERRY, 1,
+    ITEM_HONDEW_BERRY, 2,
+    ITEM_HONDEW_BERRY, 2,
+    ITEM_KELPSY_BERRY, 1,
+    ITEM_KELPSY_BERRY, 1,
+    ITEM_TAMATO_BERRY, 1,
+    ITEM_TAMATO_BERRY, 1,
+    ITEM_QUALOT_BERRY, 1,
+    ITEM_QUALOT_BERRY, 1,
+    ITEM_POMEG_BERRY, 1,
+    ITEM_POMEG_BERRY, 1,
+    ITEM_HONDEW_BERRY, 1,
+    ITEM_HONDEW_BERRY, 1,
+    ITEM_TAMATO_BERRY, 1,
+    ITEM_TAMATO_BERRY, 1,
+    ITEM_GREPA_BERRY, 1,
+    ITEM_GREPA_BERRY, 1,
+    ITEM_QUALOT_BERRY, 1,
+    ITEM_QUALOT_BERRY, 1,
+    ITEM_LUM_BERRY, 1,
+    ITEM_LEPPA_BERRY, 1,
+    ITEM_QUALOT_BERRY, 2,
+    ITEM_GREPA_BERRY, 2,
+    ITEM_KELPSY_BERRY, 2,
+    ITEM_KELPSY_BERRY, 2,
+    ITEM_GREPA_BERRY, 1,
+    ITEM_GREPA_BERRY, 1,
+};
+
 THUMB_FUNC BOOL MOD52_021D74E0(struct UnkStruct_02006234 *arg1, u32 *arg2)
 {
 #pragma unused(arg1)
@@ -139,7 +281,7 @@ THUMB_FUNC void MOD52_021D7604(u32 heap_id, struct SaveBlock2 *sav2, BOOL set_tr
 
     PlayerProfile_SetAvatar(player_data, (u8)avatar);
 
-    FUN_020250C4(FUN_02024ECC(sav2), heap_id, MOD52_021D76F8, 0x76);
+    FUN_020250C4(FUN_02024ECC(sav2), heap_id, MOD52_021D76F8, NELEMS(MOD52_021D76F8) / 2);
 }
 
 THUMB_FUNC void MOD52_021D7688(u32 unused, struct SaveBlock2 *sav2)
@@ -164,145 +306,3 @@ THUMB_FUNC void MOD52_021D769C(u32 unused, struct SaveBlock2 *sav2)
     PlayerProfile_SetMoney(player_data, 3000);
     FUN_0205ECD4(SavArray_Flags_get(sav2));
 }
-
-const struct Unk21DBE18 MOD52_021D76E8 = {
-    MOD52_021D74E0,
-    MOD52_021D74F8,
-    MOD52_021D750C,
-    0xFFFFFFFF,
-};
-
-const struct Unk21DBE18 MOD52_021D76D8 = {
-    MOD52_021D7528,
-    MOD52_021D7540,
-    MOD52_021D7560,
-    0xFFFFFFFF,
-};
-
-const struct Unk21DBE18 MOD52_021D76C8 = {
-    MOD52_021D757C,
-    MOD52_021D7594,
-    MOD52_021D75E8,
-    0xFFFFFFFF,
-};
-
-const u16 MOD52_021D76F8[] = {
-    ITEM_ORAN_BERRY, 1,
-    ITEM_CHERI_BERRY, 1,
-    ITEM_CHESTO_BERRY, 1,
-    ITEM_PECHA_BERRY, 1,
-    ITEM_ORAN_BERRY, 1,
-    ITEM_PECHA_BERRY, 1,
-    ITEM_RAZZ_BERRY, 2,
-    ITEM_BLUK_BERRY, 2,
-    ITEM_CHERI_BERRY, 1,
-    ITEM_ORAN_BERRY, 2,
-    ITEM_SITRUS_BERRY, 1,
-    ITEM_WEPEAR_BERRY, 2,
-    ITEM_WEPEAR_BERRY, 2,
-    ITEM_KELPSY_BERRY, 1,
-    ITEM_CHERI_BERRY, 1,
-    ITEM_PECHA_BERRY, 1,
-    ITEM_ORAN_BERRY, 1,
-    ITEM_ORAN_BERRY, 1,
-    ITEM_RAWST_BERRY, 1,
-    ITEM_RAWST_BERRY, 1,
-    ITEM_RAZZ_BERRY, 1,
-    ITEM_RAZZ_BERRY, 1,
-    ITEM_CHERI_BERRY, 1,
-    ITEM_ORAN_BERRY, 1,
-    ITEM_ORAN_BERRY, 1,
-    ITEM_BLUK_BERRY, 1,
-    ITEM_NANAB_BERRY, 2,
-    ITEM_RAZZ_BERRY, 2,
-    ITEM_BLUK_BERRY, 2,
-    ITEM_PINAP_BERRY, 2,
-    ITEM_LEPPA_BERRY, 1,
-    ITEM_CHESTO_BERRY, 1,
-    ITEM_RAZZ_BERRY, 1,
-    ITEM_RAZZ_BERRY, 1,
-    ITEM_PERSIM_BERRY, 1,
-    ITEM_NANAB_BERRY, 1,
-    ITEM_NANAB_BERRY, 1,
-    ITEM_FIGY_BERRY, 1,
-    ITEM_ASPEAR_BERRY, 1,
-    ITEM_ASPEAR_BERRY, 1,
-    ITEM_RAZZ_BERRY, 1,
-    ITEM_PINAP_BERRY, 1,
-    ITEM_SITRUS_BERRY, 1,
-    ITEM_CHESTO_BERRY, 1,
-    ITEM_WIKI_BERRY, 1,
-    ITEM_AGUAV_BERRY, 1,
-    ITEM_PECHA_BERRY, 1,
-    ITEM_ASPEAR_BERRY, 1,
-    ITEM_IAPAPA_BERRY, 1,
-    ITEM_GREPA_BERRY, 1,
-    ITEM_SITRUS_BERRY, 1,
-    ITEM_ASPEAR_BERRY, 1,
-    ITEM_TAMATO_BERRY, 1,
-    ITEM_LUM_BERRY, 1,
-    ITEM_PECHA_BERRY, 1,
-    ITEM_PINAP_BERRY, 1,
-    ITEM_PINAP_BERRY, 1,
-    ITEM_PINAP_BERRY, 1,
-    ITEM_PERSIM_BERRY, 1,
-    ITEM_PERSIM_BERRY, 1,
-    ITEM_NANAB_BERRY, 1,
-    ITEM_NANAB_BERRY, 1,
-    ITEM_AGUAV_BERRY, 1,
-    ITEM_IAPAPA_BERRY, 1,
-    ITEM_RAWST_BERRY, 1,
-    ITEM_RAWST_BERRY, 1,
-    ITEM_CHERI_BERRY, 1,
-    ITEM_SITRUS_BERRY, 1,
-    ITEM_CHESTO_BERRY, 1,
-    ITEM_POMEG_BERRY, 1,
-    ITEM_PECHA_BERRY, 2,
-    ITEM_BLUK_BERRY, 2,
-    ITEM_WIKI_BERRY, 1,
-    ITEM_MAGO_BERRY, 1,
-    ITEM_RAWST_BERRY, 1,
-    ITEM_PERSIM_BERRY, 1,
-    ITEM_FIGY_BERRY, 1,
-    ITEM_PINAP_BERRY, 2,
-    ITEM_LEPPA_BERRY, 1,
-    ITEM_PECHA_BERRY, 1,
-    ITEM_MAGO_BERRY, 1,
-    ITEM_HONDEW_BERRY, 1,
-    ITEM_WIKI_BERRY, 2,
-    ITEM_MAGO_BERRY, 2,
-    ITEM_AGUAV_BERRY, 2,
-    ITEM_QUALOT_BERRY, 1,
-    ITEM_SITRUS_BERRY, 2,
-    ITEM_BLUK_BERRY, 3,
-    ITEM_NANAB_BERRY, 3,
-    ITEM_WEPEAR_BERRY, 3,
-    ITEM_POMEG_BERRY, 1,
-    ITEM_POMEG_BERRY, 1,
-    ITEM_HONDEW_BERRY, 2,
-    ITEM_HONDEW_BERRY, 2,
-    ITEM_KELPSY_BERRY, 1,
-    ITEM_KELPSY_BERRY, 1,
-    ITEM_TAMATO_BERRY, 1,
-    ITEM_TAMATO_BERRY, 1,
-    ITEM_QUALOT_BERRY, 1,
-    ITEM_QUALOT_BERRY, 1,
-    ITEM_POMEG_BERRY, 1,
-    ITEM_POMEG_BERRY, 1,
-    ITEM_HONDEW_BERRY, 1,
-    ITEM_HONDEW_BERRY, 1,
-    ITEM_TAMATO_BERRY, 1,
-    ITEM_TAMATO_BERRY, 1,
-    ITEM_GREPA_BERRY, 1,
-    ITEM_GREPA_BERRY, 1,
-    ITEM_QUALOT_BERRY, 1,
-    ITEM_QUALOT_BERRY, 1,
-    ITEM_LUM_BERRY, 1,
-    ITEM_LEPPA_BERRY, 1,
-    ITEM_QUALOT_BERRY, 2,
-    ITEM_GREPA_BERRY, 2,
-    ITEM_KELPSY_BERRY, 2,
-    ITEM_KELPSY_BERRY, 2,
-    ITEM_GREPA_BERRY, 1,
-    ITEM_GREPA_BERRY, 1,
-};
\ No newline at end of file
diff --git a/arm9/src/main.c b/arm9/src/main.c
index 05b7f67f..117535b2 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -14,7 +14,7 @@
 #include "timer3.h"
 #include "unk_02031734.h"
 #include "unk_0202F150.h"
-
+#include "module_52.h"
 
 
 FS_EXTERN_OVERLAY(MODULE_52);
@@ -24,10 +24,6 @@ FS_EXTERN_OVERLAY(MODULE_63);
 
 struct Unk2106FA0 gBacklightTop;
 
-extern BOOL OverlayManager_new(struct Unk21DBE18 *, s32 *, int);
-extern BOOL OverlayManager_Run(int);
-extern void OverlayManager_delete(int);
-
 extern void InitSystemForTheGame(void);
 extern void InitGraphicMemory(void);
 extern void FUN_02022294(void);
@@ -50,7 +46,6 @@ extern void FUN_0200A318(void);
 extern void FUN_0200E2D8(void);
 
 extern struct Unk21DBE18 MOD63_021DBE18;
-extern struct Unk21DBE18 MOD52_021D76C8;
 
 extern u8 SDK_STATIC_BSS_START[];
 
@@ -174,7 +169,7 @@ THUMB_FUNC void Main_RunOverlayManager(void)
     }
 }
 
-THUMB_FUNC void RegisterMainOverlay(FSOverlayID id, struct Unk21DBE18 * arg1)
+THUMB_FUNC void RegisterMainOverlay(FSOverlayID id, const struct Unk21DBE18 * arg1)
 {
     if (gBacklightTop.unk14 != NULL)
         ErrorHandling();
diff --git a/arm9/src/overlay_manager.c b/arm9/src/overlay_manager.c
index a59e15ac..4a04dde1 100644
--- a/arm9/src/overlay_manager.c
+++ b/arm9/src/overlay_manager.c
@@ -4,7 +4,7 @@
 #include "heap.h"
 #include "overlay_manager.h"
 
-THUMB_FUNC struct UnkStruct_02006234 * OverlayManager_new(struct Unk21DBE18 * ovly_mgr, int * a1, u32 heap_id)
+THUMB_FUNC struct UnkStruct_02006234 * OverlayManager_new(const struct Unk21DBE18 * ovly_mgr, s32 * a1, u32 heap_id)
 {
     struct UnkStruct_02006234 * ret = (struct UnkStruct_02006234 *)AllocFromHeap(heap_id, sizeof(struct UnkStruct_02006234));
     ret->ovly_mgr = *ovly_mgr;
diff --git a/include/main.h b/include/main.h
index d40e22f9..2e424e09 100644
--- a/include/main.h
+++ b/include/main.h
@@ -20,7 +20,7 @@ struct UnkStruct_02006234
     struct Unk21DBE18 ovly_mgr;
     u32 unk10;
     u32 unk14;
-    int * unk18;
+    s32 * unk18;
     void * unk1C;
     struct SaveBlock2 * unk20;
     u32 unk24;
@@ -31,9 +31,9 @@ struct Unk2106FA0
     PMBackLightSwitch unk0;
     s32 unk4;
     FSOverlayID unk8;
-    s32 unkC;
+    struct UnkStruct_02006234 *unkC;
     FSOverlayID unk10;
-    struct Unk21DBE18 * unk14;
+    const struct Unk21DBE18 * unk14;
     s32 unk18;
     s32 unk1C;
     struct SaveBlock2 * unk20;
@@ -113,7 +113,7 @@ extern struct Main gMain;
 
 void FUN_02000DF4(void);
 void Main_RunOverlayManager(void);
-void RegisterMainOverlay(FSOverlayID id, struct Unk21DBE18 * arg1);
+void RegisterMainOverlay(FSOverlayID id, const struct Unk21DBE18 * arg1);
 void FUN_02000E9C(void);
 void FUN_02000EC8(u32 parameter);
 void FUN_02000EE8(void);
diff --git a/include/overlay_manager.h b/include/overlay_manager.h
index 193bc7e8..534af18d 100644
--- a/include/overlay_manager.h
+++ b/include/overlay_manager.h
@@ -5,7 +5,7 @@
 
 struct Unk21DBE18;
 
-struct UnkStruct_02006234 * OverlayManager_new(struct Unk21DBE18 * ovly_mgr, int * a1, u32 heap_id);
+struct UnkStruct_02006234 * OverlayManager_new(const struct Unk21DBE18 * ovly_mgr, s32 * a1, u32 heap_id);
 void OverlayManager_delete(struct UnkStruct_02006234 * a0);
 void * OverlayManager_CreateAndGetData(struct UnkStruct_02006234 * a0, u32 size, u32 heap_id);
 void * OverlayManager_GetData(struct UnkStruct_02006234 * a0);