diff options
Diffstat (limited to 'arm9/modules/24')
| -rw-r--r-- | arm9/modules/24/asm/module_24.s | 15 | ||||
| -rw-r--r-- | arm9/modules/24/src/module_24_sinit.c | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index ccf6c969..e7eb3899 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD24_02254840 -MOD24_02254840: ; 0x02254840 - ldr r3, _02254848 ; =Poketch_InitApp - ldr r0, _0225484C ; =MOD24_02254854 - ldr r1, _02254850 ; =MOD24_02254990 - bx r3 - .align 2, 0 -_02254848: .word Poketch_InitApp -_0225484C: .word MOD24_02254854 -_02254850: .word MOD24_02254990 - thumb_func_end MOD24_02254840 - thumb_func_start MOD24_02254854 MOD24_02254854: ; 0x02254854 push {r3, r4, r5, r6, r7, lr} @@ -1219,6 +1207,3 @@ MOD24_0225516C: ; 0x0225516C .word 0x04, MOD24_02255038, 0x00 .word 0x05, MOD24_02255050, 0x00 .word 0x00, 0x00000000, 0x00 - - .section .sinit - .word MOD24_02254840 diff --git a/arm9/modules/24/src/module_24_sinit.c b/arm9/modules/24/src/module_24_sinit.c new file mode 100644 index 00000000..de535e77 --- /dev/null +++ b/arm9/modules/24/src/module_24_sinit.c @@ -0,0 +1,13 @@ +#include "global.h" + +extern void Poketch_InitApp(void *func1, void *func2); +extern void MOD24_02254854(); +extern void MOD24_02254990(); + +THUMB_FUNC static void MOD24_02254840(void) +{ + Poketch_InitApp(MOD24_02254854, MOD24_02254990); +} + +#define NitroStaticInit MOD24_02254840 +#include "sinit.h" |