diff options
Diffstat (limited to 'arm9/modules/46')
| -rw-r--r-- | arm9/modules/46/asm/module_46.s | 15 | ||||
| -rw-r--r-- | arm9/modules/46/src/module_46_sinit.c | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/arm9/modules/46/asm/module_46.s b/arm9/modules/46/asm/module_46.s index 02956d4b..9e4c3dc5 100644 --- a/arm9/modules/46/asm/module_46.s +++ b/arm9/modules/46/asm/module_46.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD46_02254840 -MOD46_02254840: ; 0x02254840 - ldr r3, _02254848 ; =Poketch_InitApp - ldr r0, _0225484C ; =MOD46_02254854 - ldr r1, _02254850 ; =MOD46_02254908 - bx r3 - .align 2, 0 -_02254848: .word Poketch_InitApp -_0225484C: .word MOD46_02254854 -_02254850: .word MOD46_02254908 - thumb_func_end MOD46_02254840 - thumb_func_start MOD46_02254854 MOD46_02254854: ; 0x02254854 push {r3, r4, r5, r6, r7, lr} @@ -408,6 +396,3 @@ MOD46_02254B1C: ; 0x02254B1C .word 0x00, MOD46_02254A38, 0x00 .word 0x01, MOD46_02254AD8, 0x00 .word 0x00, 0x00000000, 0x00 - - .section .sinit - .word MOD46_02254840 diff --git a/arm9/modules/46/src/module_46_sinit.c b/arm9/modules/46/src/module_46_sinit.c new file mode 100644 index 00000000..96fe680a --- /dev/null +++ b/arm9/modules/46/src/module_46_sinit.c @@ -0,0 +1,13 @@ +#include "global.h" + +extern void Poketch_InitApp(void *func1, void *func2); +extern void MOD46_02254854(); +extern void MOD46_02254908(); + +THUMB_FUNC static void MOD46_02254840(void) +{ + Poketch_InitApp(MOD46_02254854, MOD46_02254908); +} + +#define NitroStaticInit MOD46_02254840 +#include "sinit.h" |