diff options
Diffstat (limited to 'arm9/modules/42')
| -rw-r--r-- | arm9/modules/42/asm/module_42.s | 12 | ||||
| -rw-r--r-- | arm9/modules/42/src/module_42_sinit.c | 13 |
2 files changed, 11 insertions, 14 deletions
diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s index b4e4e4d8..8bda4f17 100644 --- a/arm9/modules/42/asm/module_42.s +++ b/arm9/modules/42/asm/module_42.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD42_02254840 -MOD42_02254840: ; 0x02254840 - ldr r3, _02254848 ; =Poketch_InitApp - ldr r0, _0225484C ; =MOD42_02254854 - ldr r1, _02254850 ; =MOD42_02254A38 - bx r3 - .align 2, 0 -_02254848: .word Poketch_InitApp -_0225484C: .word MOD42_02254854 -_02254850: .word MOD42_02254A38 - thumb_func_end MOD42_02254840 - thumb_func_start MOD42_02254854 MOD42_02254854: ; 0x02254854 push {r3, r4, r5, r6, r7, lr} diff --git a/arm9/modules/42/src/module_42_sinit.c b/arm9/modules/42/src/module_42_sinit.c index 3b42fc7d..73baf05b 100644 --- a/arm9/modules/42/src/module_42_sinit.c +++ b/arm9/modules/42/src/module_42_sinit.c @@ -1,4 +1,13 @@ -#define NitroStaticInit MOD42_02254840 #include "global.h" -extern void MOD42_02254840(void); + +extern void Poketch_InitApp(void *func1, void *func2); +extern void MOD42_02254854(); +extern void MOD42_02254A38(); + +THUMB_FUNC static void MOD42_02254840(void) +{ + Poketch_InitApp(MOD42_02254854, MOD42_02254A38); +} + +#define NitroStaticInit MOD42_02254840 #include "sinit.h" |