diff options
Diffstat (limited to 'arm9/modules/26')
-rw-r--r-- | arm9/modules/26/asm/module_26.s | 15 | ||||
-rw-r--r-- | arm9/modules/26/src/module_26_sinit.c | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/arm9/modules/26/asm/module_26.s b/arm9/modules/26/asm/module_26.s index 12d880aa..45536bcf 100644 --- a/arm9/modules/26/asm/module_26.s +++ b/arm9/modules/26/asm/module_26.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD26_02254840 -MOD26_02254840: ; 0x02254840 - ldr r3, _02254848 ; =Poketch_InitApp - ldr r0, _0225484C ; =MOD26_02254854 - ldr r1, _02254850 ; =MOD26_02254A84 - bx r3 - .align 2, 0 -_02254848: .word Poketch_InitApp -_0225484C: .word MOD26_02254854 -_02254850: .word MOD26_02254A84 - thumb_func_end MOD26_02254840 - thumb_func_start MOD26_02254854 MOD26_02254854: ; 0x02254854 push {r3, r4, r5, r6, r7, lr} @@ -843,6 +831,3 @@ MOD26_02254FF0: ; 0x02254FF0 .word 0x01, MOD26_02254D6C, 0x00 .word 0x02, MOD26_02254D90, 0x00 .word 0x00, 0x00000000, 0x00 - - .section .sinit - .word MOD26_02254840 diff --git a/arm9/modules/26/src/module_26_sinit.c b/arm9/modules/26/src/module_26_sinit.c new file mode 100644 index 00000000..a84f88bb --- /dev/null +++ b/arm9/modules/26/src/module_26_sinit.c @@ -0,0 +1,13 @@ +#include "global.h" + +extern void Poketch_InitApp(void *func1, void *func2); +extern void MOD26_02254854(); +extern void MOD26_02254A84(); + +THUMB_FUNC static void MOD26_02254840(void) +{ + Poketch_InitApp(MOD26_02254854, MOD26_02254A84); +} + +#define NitroStaticInit MOD26_02254840 +#include "sinit.h" |