diff options
| -rw-r--r-- | arm9/modules/11/src/module_11_sinit.c | 3 | ||||
| -rw-r--r-- | arm9/src/error_handling.c | 3 | ||||
| -rw-r--r-- | arm9/src/error_message_reset.c | 7 | ||||
| -rw-r--r-- | arm9/src/heap.c | 3 | ||||
| -rw-r--r-- | arm9/src/main.c | 8 | ||||
| -rw-r--r-- | arm9/src/unk_0202F150.c | 12 | ||||
| -rw-r--r-- | include/unk_0202F150.h | 4 |
7 files changed, 21 insertions, 19 deletions
diff --git a/arm9/modules/11/src/module_11_sinit.c b/arm9/modules/11/src/module_11_sinit.c index 977c4fde..8bf5f6f6 100644 --- a/arm9/modules/11/src/module_11_sinit.c +++ b/arm9/modules/11/src/module_11_sinit.c @@ -1,8 +1,9 @@ #include "global.h" #include "poke_overlay.h" #include "FS_overlay.h" +#include "unk_02031734.h" + -extern u32 FUN_02033590(void); FS_EXTERN_OVERLAY(MODULE_16); THUMB_FUNC static void MOD11_0222F284(void) diff --git a/arm9/src/error_handling.c b/arm9/src/error_handling.c index a01894f6..7f006039 100644 --- a/arm9/src/error_handling.c +++ b/arm9/src/error_handling.c @@ -1,8 +1,9 @@ #include "global.h" #include "error_handling.h" #include "error_message_reset.h" +#include "unk_02031734.h" + -extern u32 FUN_02031810(void); THUMB_FUNC void ErrorHandling(void) { diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c index 3a727924..f70fec0f 100644 --- a/arm9/src/error_message_reset.c +++ b/arm9/src/error_message_reset.c @@ -1,5 +1,9 @@ #include "error_message_reset.h" #include "GX_layers.h" +#include "unk_02031734.h" +#include "unk_0202F150.h" + + const u32 UNK_020FF49C[2] = { 0x1a030300, 0x00230112 }; @@ -27,9 +31,6 @@ extern void FUN_020196F4(u32 *, u8, u16, u16, u16, u16); extern void FUN_0200CCA4(u32 *param0, u32 param1, u32 param2, u32 param3); extern void FUN_0200E394(u32 param0); extern void FUN_0200A274(u32 param0, u32 param1, u32 param2); -extern BOOL FUN_02032DAC(void); -extern BOOL FUN_0202FB80(void); -extern BOOL FUN_02033678(void); extern void FUN_02019178(u32 *param0); THUMB_FUNC void VBlankHandler() diff --git a/arm9/src/heap.c b/arm9/src/heap.c index 84abc834..895ce808 100644 --- a/arm9/src/heap.c +++ b/arm9/src/heap.c @@ -1,11 +1,12 @@ #include "heap.h" #include "error_message_reset.h" +#include "unk_02031734.h" + extern void *tempName_NNS_FndCreateExpHeapEx(void *param0, u32 param1, u32 param2); extern void *tempName_NNS_FndAllocFromExpHeapEx(void *param0, u32 param1, s32 param2); extern void thunk_FUN_020adc8c(); extern void FUN_020ADDF0(void *ptr1, void *ptr2); -extern u32 FUN_02031810(void); extern u32 FUN_020ADDC8(void *param0); extern void FUN_020AE82C(u32 param0, void *param1, u32 param2); extern u32 FUN_020ADDC0(void *param0); diff --git a/arm9/src/main.c b/arm9/src/main.c index c50fbaff..f7bcf7f0 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -12,6 +12,10 @@ #include "player_data.h" #include "sound.h" #include "timer3.h" +#include "unk_02031734.h" +#include "unk_0202F150.h" + + FS_EXTERN_OVERLAY(MODULE_52); FS_EXTERN_OVERLAY(MODULE_63); @@ -23,9 +27,6 @@ struct Unk2106FA0 gBacklightTop; extern BOOL OverlayManager_new(struct Unk21DBE18 *, s32 *, int); extern BOOL OverlayManager_Run(int); extern void OverlayManager_delete(int); -extern BOOL FUN_02033678(void); -extern u32 FUN_020335B8(void); -extern BOOL FUN_0202FB80(void); extern void InitSystemForTheGame(void); extern void InitGraphicMemory(void); @@ -218,7 +219,6 @@ THUMB_FUNC void FUN_02000EE8(void) } extern void FUN_0200E3A0(PMLCDTarget, int); -extern BOOL FUN_02032DAC(void); // No Return THUMB_FUNC void DoSoftReset(u32 parameter) diff --git a/arm9/src/unk_0202F150.c b/arm9/src/unk_0202F150.c index c728ddf1..02980c02 100644 --- a/arm9/src/unk_0202F150.c +++ b/arm9/src/unk_0202F150.c @@ -1,5 +1,7 @@ #include "unk_0202F150.h" #include "unk_02031480.h" +#include "unk_02031734.h" + struct { u8 unk00; @@ -9,7 +11,6 @@ struct vu8 UNK_02105D58 = 4; vu8 UNK_02105D59 = 4; -extern int FUN_02033534(); extern void FUN_0202D7D8(u8 *param0, u32 param1, struct UnkStruct0202F150_sub1 *param2); extern u32 FUN_0200CA60(void (*param0)(), u32 param1, u32 param2); extern void FUN_0202D394(struct UnkStruct0202F150_sub1 *param0, u8 *param1, u32 param2); @@ -25,10 +26,8 @@ extern void FUN_0202D824(u8 *param0); extern u32 FUN_0202E9E8(u32 param0); extern u32 FUN_0202F03C(); extern u32 FUN_0202EE24(); -extern void FUN_02031CDC(); extern void FUN_0202EBD0(u16 param0); extern void FUN_0202ED70(u32 param0); -extern void FUN_020335F4(u32 param0); extern void FUN_0202E538(); extern u32 MOD04_021D78FC(void *param0, u32 param1); extern u32 FUN_0202CBD4(); @@ -52,7 +51,6 @@ extern void *FUN_0202DA40(u32 param0, u32 param1, u16 param2); extern u32 MOD04_021D8018(); extern u32 FUN_0202EDF8(); extern u16 FUN_0202D19C(); -extern void FUN_020334E8(u32 param0, u32 param1); extern u32 FUN_0202EE60(); extern void FUN_0202F05C(); extern void GF_RTC_CopyDateTime(RTCDate *, RTCTime *); @@ -537,7 +535,7 @@ THUMB_FUNC void FUN_0202FB58() } } -THUMB_FUNC u32 FUN_0202FB80() +THUMB_FUNC BOOL FUN_0202FB80() { FUN_02031CDC(); @@ -2021,9 +2019,9 @@ THUMB_FUNC u32 FUN_02030E7C(u16 param0) return 0; } -THUMB_FUNC u32 FUN_02030F20() +THUMB_FUNC s32 FUN_02030F20() { - u32 r4 = 0; + s32 r4 = 0; for (int i = 0; i < 8; i++) { if (FUN_02030E7C((u16)i) != 0) diff --git a/include/unk_0202F150.h b/include/unk_0202F150.h index 4542cdd1..49c58a52 100644 --- a/include/unk_0202F150.h +++ b/include/unk_0202F150.h @@ -105,7 +105,7 @@ THUMB_FUNC void FUN_0202FA5C(); THUMB_FUNC u32 FUN_0202FB18(u32 param0); THUMB_FUNC void FUN_0202FB20(); THUMB_FUNC void FUN_0202FB58(); -THUMB_FUNC u32 FUN_0202FB80(); +THUMB_FUNC BOOL FUN_0202FB80(); THUMB_FUNC void FUN_0202FC60(); THUMB_FUNC void FUN_0202FC80(); THUMB_FUNC void FUN_0202FCA8(); @@ -145,7 +145,7 @@ THUMB_FUNC void FUN_02030C8C(struct UnkStruct0202F150_sub1 *param0, THUMB_FUNC void FUN_02030DA4(); THUMB_FUNC void FUN_02030DFC(); THUMB_FUNC u32 FUN_02030E7C(u16 param0); -THUMB_FUNC u32 FUN_02030F20(); +THUMB_FUNC s32 FUN_02030F20(); THUMB_FUNC u32 FUN_02030F40(); THUMB_FUNC void FUN_02030F60(u8 param0); THUMB_FUNC u8 FUN_02030F74(u32 param0); |