diff options
| -rw-r--r-- | arm9/global.inc | 3 | ||||
| -rw-r--r-- | arm9/modules/52/asm/module_52.s | 15 | ||||
| -rw-r--r-- | arm9/modules/52/src/module_52_c.c | 37 |
3 files changed, 28 insertions, 27 deletions
diff --git a/arm9/global.inc b/arm9/global.inc index f6c46ada..7e2fc2e9 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -8523,4 +8523,5 @@ .extern MOD52_021D74F8 .extern MOD52_021D750C .extern MOD52_021D7528 -.extern MOD52_021D7540
\ No newline at end of file +.extern MOD52_021D7540 +.extern MOD52_021D7560 diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index 1fb81f69..385167f4 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -4,20 +4,7 @@ .balign 4, 0 - thumb_func_start MOD52_021D7560 -MOD52_021D7560: ; 0x021D7560 - push {r3, lr} - mov r0, #0x4d - bl FUN_020168D0 - mov r0, #0 - ldr r1, _021D7578 ; =UNK_020F2B7C - mvn r0, r0 - bl RegisterMainOverlay - mov r0, #1 - pop {r3, pc} - nop -_021D7578: .word UNK_020F2B7C - thumb_func_end MOD52_021D7560 + thumb_func_start MOD52_021D757C MOD52_021D757C: ; 0x021D757C diff --git a/arm9/modules/52/src/module_52_c.c b/arm9/modules/52/src/module_52_c.c index f4803a8d..38aa29c0 100644 --- a/arm9/modules/52/src/module_52_c.c +++ b/arm9/modules/52/src/module_52_c.c @@ -3,22 +3,25 @@ #include "overlay_manager.h" #include "player_data.h" - extern void FUN_0201681C(u32 param0, u32 heap_id, u32 param2); extern int FUN_020168D0(u32 heap_id); extern void MOD52_021D769C(u32 heap_id, struct SaveBlock2 *save); extern struct Unk21DBE18 UNK_020FD144; +extern struct Unk21DBE18 UNK_020F2B7C; + extern void MOD52_021D7604(u32 heap_id, struct SaveBlock2 *save, u32 param2); -extern void FUN_02015E3C(struct IGT* igt); +extern void FUN_02015E3C(struct IGT *igt); -THUMB_FUNC int MOD52_021D74E0() { +THUMB_FUNC int MOD52_021D74E0() +{ FUN_0201681C(3, 0x4d, 2 << 16); - InitializeMainRNG(); + InitializeMainRNG(); return 1; } -THUMB_FUNC int MOD52_021D74F8(struct UnkStruct_02006234 *param0) { +THUMB_FUNC int MOD52_021D74F8(struct UnkStruct_02006234 *param0) +{ struct SaveBlock2 *save = OverlayManager_GetField18(param0)[2]; MOD52_021D769C(0x4d, save); @@ -26,26 +29,36 @@ THUMB_FUNC int MOD52_021D74F8(struct UnkStruct_02006234 *param0) { return 1; } -THUMB_FUNC int MOD52_021D750C() { +THUMB_FUNC int MOD52_021D750C() +{ FUN_020168D0(0x4d); RegisterMainOverlay(-1, &UNK_020FD144); return 1; } -THUMB_FUNC int MOD52_021D7528() { +THUMB_FUNC int MOD52_021D7528() +{ FUN_0201681C(3, 0x4d, 2 << 16); - InitializeMainRNG(); + InitializeMainRNG(); - return 1; + return 1; } - -THUMB_FUNC int MOD52_021D7540(struct UnkStruct_02006234 *param0) { +THUMB_FUNC int MOD52_021D7540(struct UnkStruct_02006234 *param0) +{ struct SaveBlock2 *save = OverlayManager_GetField18(param0)[2]; MOD52_021D7604(0x4d, save, 1); - struct IGT* igt = Sav2_PlayerData_GetIGTAddr(save); + struct IGT *igt = Sav2_PlayerData_GetIGTAddr(save); FUN_02015E3C(igt); return 1; +} + +THUMB_FUNC int MOD52_021D7560() +{ + FUN_020168D0(0x4d); + RegisterMainOverlay(-1, &UNK_020F2B7C); + + return 1; }
\ No newline at end of file |