diff options
Diffstat (limited to 'arm9/modules/35')
| -rw-r--r-- | arm9/modules/35/asm/module_35.s | 15 | ||||
| -rw-r--r-- | arm9/modules/35/src/module_35_sinit.c | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s index 48953e9f..7b347ca5 100644 --- a/arm9/modules/35/asm/module_35.s +++ b/arm9/modules/35/asm/module_35.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD35_02254840 -MOD35_02254840: ; 0x02254840 - ldr r3, _02254848 ; =Poketch_InitApp - ldr r0, _0225484C ; =MOD35_02254854 - ldr r1, _02254850 ; =MOD35_02254924 - bx r3 - .align 2, 0 -_02254848: .word Poketch_InitApp -_0225484C: .word MOD35_02254854 -_02254850: .word MOD35_02254924 - thumb_func_end MOD35_02254840 - thumb_func_start MOD35_02254854 MOD35_02254854: ; 0x02254854 push {r3, r4, r5, r6, r7, lr} @@ -1167,6 +1155,3 @@ MOD35_02255110: ; 0x02255110 .byte 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x80, 0x02, 0x00 .byte 0x0A, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0C, 0x00, 0x00, 0x80, 0x02, 0x00 .byte 0x0A, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 - - .section .sinit - .word MOD35_02254840 diff --git a/arm9/modules/35/src/module_35_sinit.c b/arm9/modules/35/src/module_35_sinit.c new file mode 100644 index 00000000..85fe5344 --- /dev/null +++ b/arm9/modules/35/src/module_35_sinit.c @@ -0,0 +1,13 @@ +#include "global.h" + +extern void Poketch_InitApp(void *func1, void *func2); +extern void MOD35_02254854(); +extern void MOD35_02254924(); + +THUMB_FUNC static void MOD35_02254840(void) +{ + Poketch_InitApp(MOD35_02254854, MOD35_02254924); +} + +#define NitroStaticInit MOD35_02254840 +#include "sinit.h" |