diff options
| -rw-r--r-- | arm9/arm9.lsf | 1 | ||||
| -rw-r--r-- | arm9/global.inc | 1 | ||||
| -rw-r--r-- | arm9/modules/52/asm/module_52.s | 14 | ||||
| -rw-r--r-- | arm9/modules/52/src/module_52_c.c | 13 |
4 files changed, 15 insertions, 14 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index b8accee4..615430f9 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -899,6 +899,7 @@ Overlay MODULE_52 { ##Some kind of transition overlay for intro## After arm9 + Object module_52_c.o Object module_52.o } diff --git a/arm9/global.inc b/arm9/global.inc index d816d92a..999a0e6d 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -8519,3 +8519,4 @@ .extern CARDi_InitCommon .extern MonNotFaintedOrEgg .extern CountAlivePokemon +.extern MOD52_021D74E0 diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index 22824930..4d85bb58 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -3,20 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD52_021D74E0 -MOD52_021D74E0: ; 0x021D74E0 - push {r3, lr} - mov r2, #2 - mov r0, #3 - mov r1, #0x4d - lsl r2, r2, #0x10 - bl FUN_0201681C - bl InitializeMainRNG - mov r0, #1 - pop {r3, pc} - .align 2, 0 - thumb_func_end MOD52_021D74E0 - thumb_func_start MOD52_021D74F8 MOD52_021D74F8: ; 0x021D74F8 push {r3, lr} diff --git a/arm9/modules/52/src/module_52_c.c b/arm9/modules/52/src/module_52_c.c index e69de29b..5835255f 100644 --- a/arm9/modules/52/src/module_52_c.c +++ b/arm9/modules/52/src/module_52_c.c @@ -0,0 +1,13 @@ +#include "global.h" +#include "main.h" + + +extern void FUN_0201681C(u32 param0, u32 heap_id, u32 param2); +extern void MOD52_021D769C(u32 heap_id, u32 param1); + +THUMB_FUNC int MOD52_021D74E0() { + FUN_0201681C(3, 0x4d, 2 << 16); + InitializeMainRNG(); + + return 1; +}
\ No newline at end of file |