diff options
Diffstat (limited to 'arm9/modules/21')
| -rw-r--r-- | arm9/modules/21/asm/module_21.s | 12 | ||||
| -rw-r--r-- | arm9/modules/21/src/module_21_sinit.c | 13 |
2 files changed, 11 insertions, 14 deletions
diff --git a/arm9/modules/21/asm/module_21.s b/arm9/modules/21/asm/module_21.s index 7ec2a1e6..787a729f 100644 --- a/arm9/modules/21/asm/module_21.s +++ b/arm9/modules/21/asm/module_21.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD21_02254840 -MOD21_02254840: ; 0x02254840 - ldr r3, _02254848 ; =Poketch_InitApp - ldr r0, _0225484C ; =MOD21_02254854 - ldr r1, _02254850 ; =MOD21_0225496C - bx r3 - .align 2, 0 -_02254848: .word Poketch_InitApp -_0225484C: .word MOD21_02254854 -_02254850: .word MOD21_0225496C - thumb_func_end MOD21_02254840 - thumb_func_start MOD21_02254854 MOD21_02254854: ; 0x02254854 push {r3, r4, r5, r6, r7, lr} diff --git a/arm9/modules/21/src/module_21_sinit.c b/arm9/modules/21/src/module_21_sinit.c index e19c840f..2af569ec 100644 --- a/arm9/modules/21/src/module_21_sinit.c +++ b/arm9/modules/21/src/module_21_sinit.c @@ -1,4 +1,13 @@ -#define NitroStaticInit MOD21_02254840 #include "global.h" -extern void MOD21_02254840(void); + +extern void Poketch_InitApp(void *func1, void *func2); +extern void MOD21_02254854(); +extern void MOD21_0225496C(); + +THUMB_FUNC static void MOD21_02254840(void) +{ + Poketch_InitApp(MOD21_02254854, MOD21_0225496C); +} + +#define NitroStaticInit MOD21_02254840 #include "sinit.h" |