diff options
Diffstat (limited to 'arm9/modules/45')
| -rw-r--r-- | arm9/modules/45/asm/module_45.s | 15 | ||||
| -rw-r--r-- | arm9/modules/45/src/module_45_sinit.c | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s index effe8de8..182774aa 100644 --- a/arm9/modules/45/asm/module_45.s +++ b/arm9/modules/45/asm/module_45.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD45_02254840 -MOD45_02254840: ; 0x02254840 - ldr r3, _02254848 ; =Poketch_InitApp - ldr r0, _0225484C ; =MOD45_02254854 - ldr r1, _02254850 ; =MOD45_02254A30 - bx r3 - .align 2, 0 -_02254848: .word Poketch_InitApp -_0225484C: .word MOD45_02254854 -_02254850: .word MOD45_02254A30 - thumb_func_end MOD45_02254840 - thumb_func_start MOD45_02254854 MOD45_02254854: ; 0x02254854 push {r3, r4, r5, r6, r7, lr} @@ -1110,6 +1098,3 @@ MOD45_02255140: ; 0x02255140 .word 0x01, MOD45_02254D70, 0x00 .word 0x02, MOD45_02254D94, 0x00 .word 0x00, 0x00000000, 0x00 - - .section .sinit - .word MOD45_02254840 diff --git a/arm9/modules/45/src/module_45_sinit.c b/arm9/modules/45/src/module_45_sinit.c new file mode 100644 index 00000000..6bfb10f7 --- /dev/null +++ b/arm9/modules/45/src/module_45_sinit.c @@ -0,0 +1,13 @@ +#include "global.h" + +extern void Poketch_InitApp(void *func1, void *func2); +extern void MOD45_02254854(); +extern void MOD45_02254A30(); + +THUMB_FUNC static void MOD45_02254840(void) +{ + Poketch_InitApp(MOD45_02254854, MOD45_02254A30); +} + +#define NitroStaticInit MOD45_02254840 +#include "sinit.h" |