diff options
Diffstat (limited to 'arm9/modules/25')
| -rw-r--r-- | arm9/modules/25/asm/module_25.s | 15 | ||||
| -rw-r--r-- | arm9/modules/25/src/module_25_sinit.c | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/arm9/modules/25/asm/module_25.s b/arm9/modules/25/asm/module_25.s index ba331a34..84129725 100644 --- a/arm9/modules/25/asm/module_25.s +++ b/arm9/modules/25/asm/module_25.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD25_02254840 -MOD25_02254840: ; 0x02254840 - ldr r3, _02254848 ; =Poketch_InitApp - ldr r0, _0225484C ; =MOD25_02254854 - ldr r1, _02254850 ; =MOD25_0225496C - bx r3 - .align 2, 0 -_02254848: .word Poketch_InitApp -_0225484C: .word MOD25_02254854 -_02254850: .word MOD25_0225496C - thumb_func_end MOD25_02254840 - thumb_func_start MOD25_02254854 MOD25_02254854: ; 0x02254854 push {r3, r4, r5, r6, r7, lr} @@ -686,6 +674,3 @@ MOD25_02254D44: ; 0x02254D44 .word 0x02, MOD25_02254BE8, 0x00 .word 0x03, MOD25_02254C14, 0x00 .word 0x00, 0x00000000, 0x00 - - .section .sinit - .word MOD25_02254840 diff --git a/arm9/modules/25/src/module_25_sinit.c b/arm9/modules/25/src/module_25_sinit.c new file mode 100644 index 00000000..e86493c7 --- /dev/null +++ b/arm9/modules/25/src/module_25_sinit.c @@ -0,0 +1,13 @@ +#include "global.h" + +extern void Poketch_InitApp(void *func1, void *func2); +extern void MOD25_02254854(); +extern void MOD25_0225496C(); + +THUMB_FUNC static void MOD25_02254840(void) +{ + Poketch_InitApp(MOD25_02254854, MOD25_0225496C); +} + +#define NitroStaticInit MOD25_02254840 +#include "sinit.h" |