diff options
Diffstat (limited to 'arm9/modules/40')
| -rw-r--r-- | arm9/modules/40/asm/module_40.s | 15 | ||||
| -rw-r--r-- | arm9/modules/40/src/module_40_sinit.c | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s index e46b1f2a..409892d9 100644 --- a/arm9/modules/40/asm/module_40.s +++ b/arm9/modules/40/asm/module_40.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD40_02254840 -MOD40_02254840: ; 0x02254840 - ldr r3, _02254848 ; =Poketch_InitApp - ldr r0, _0225484C ; =MOD40_02254854 - ldr r1, _02254850 ; =MOD40_022549D4 - bx r3 - .align 2, 0 -_02254848: .word Poketch_InitApp -_0225484C: .word MOD40_02254854 -_02254850: .word MOD40_022549D4 - thumb_func_end MOD40_02254840 - thumb_func_start MOD40_02254854 MOD40_02254854: ; 0x02254854 push {r3, r4, r5, r6, r7, lr} @@ -1453,6 +1441,3 @@ MOD40_022553B0: ; 0x022553B0 .byte 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00 .byte 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 - - .section .sinit - .word MOD40_02254840 diff --git a/arm9/modules/40/src/module_40_sinit.c b/arm9/modules/40/src/module_40_sinit.c new file mode 100644 index 00000000..fc2d56c5 --- /dev/null +++ b/arm9/modules/40/src/module_40_sinit.c @@ -0,0 +1,13 @@ +#include "global.h" + +extern void Poketch_InitApp(void *func1, void *func2); +extern void MOD40_02254854(); +extern void MOD40_022549D4(); + +THUMB_FUNC static void MOD40_02254840(void) +{ + Poketch_InitApp(MOD40_02254854, MOD40_022549D4); +} + +#define NitroStaticInit MOD40_02254840 +#include "sinit.h" |