diff options
Diffstat (limited to 'arm9/modules/22')
| -rw-r--r-- | arm9/modules/22/asm/module_22.s | 15 | ||||
| -rw-r--r-- | arm9/modules/22/src/module_22_sinit.c | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/arm9/modules/22/asm/module_22.s b/arm9/modules/22/asm/module_22.s index 15332cb9..ef079cdb 100644 --- a/arm9/modules/22/asm/module_22.s +++ b/arm9/modules/22/asm/module_22.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD22_02254840 -MOD22_02254840: ; 0x02254840 - ldr r3, _02254848 ; =Poketch_InitApp - ldr r0, _0225484C ; =MOD22_02254854 - ldr r1, _02254850 ; =MOD22_022549D8 - bx r3 - .align 2, 0 -_02254848: .word Poketch_InitApp -_0225484C: .word MOD22_02254854 -_02254850: .word MOD22_022549D8 - thumb_func_end MOD22_02254840 - thumb_func_start MOD22_02254854 MOD22_02254854: ; 0x02254854 push {r3, r4, r5, r6, r7, lr} @@ -1885,6 +1873,3 @@ MOD22_022556A0: ; 0x022556A0 .byte 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x02, 0x00 .byte 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00 .byte 0x0A, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00 - - .section .sinit - .word MOD22_02254840 diff --git a/arm9/modules/22/src/module_22_sinit.c b/arm9/modules/22/src/module_22_sinit.c new file mode 100644 index 00000000..0095f0c1 --- /dev/null +++ b/arm9/modules/22/src/module_22_sinit.c @@ -0,0 +1,13 @@ +#include "global.h" + +extern void Poketch_InitApp(void *func1, void *func2); +extern void MOD22_02254854(); +extern void MOD22_022549D8(); + +THUMB_FUNC static void MOD22_02254840(void) +{ + Poketch_InitApp(MOD22_02254854, MOD22_022549D8); +} + +#define NitroStaticInit MOD22_02254840 +#include "sinit.h" |