summaryrefslogtreecommitdiff
path: root/arm9/modules/37
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/37')
-rw-r--r--arm9/modules/37/asm/module_37.s15
-rw-r--r--arm9/modules/37/src/module_37_sinit.c13
2 files changed, 13 insertions, 15 deletions
diff --git a/arm9/modules/37/asm/module_37.s b/arm9/modules/37/asm/module_37.s
index 8135b43b..3c7f412c 100644
--- a/arm9/modules/37/asm/module_37.s
+++ b/arm9/modules/37/asm/module_37.s
@@ -3,18 +3,6 @@
.section .text
.balign 4, 0
- thumb_func_start MOD37_02254840
-MOD37_02254840: ; 0x02254840
- ldr r3, _02254848 ; =Poketch_InitApp
- ldr r0, _0225484C ; =MOD37_02254854
- ldr r1, _02254850 ; =MOD37_02254934
- bx r3
- .align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD37_02254854
-_02254850: .word MOD37_02254934
- thumb_func_end MOD37_02254840
-
thumb_func_start MOD37_02254854
MOD37_02254854: ; 0x02254854
push {r3, r4, r5, r6, r7, lr}
@@ -693,9 +681,6 @@ MOD37_02254D60: ; 0x02254D60
.word 0x02, MOD37_02254C44, 0x00
.word 0x00, 0x00000000, 0x00
- .section .sinit
- .word MOD37_02254840
-
.section .bss
.global MOD37_02254DA0
MOD37_02254DA0: ; 0x02254DA0
diff --git a/arm9/modules/37/src/module_37_sinit.c b/arm9/modules/37/src/module_37_sinit.c
new file mode 100644
index 00000000..ba3df423
--- /dev/null
+++ b/arm9/modules/37/src/module_37_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD37_02254854();
+extern void MOD37_02254934();
+
+THUMB_FUNC static void MOD37_02254840(void)
+{
+ Poketch_InitApp(MOD37_02254854, MOD37_02254934);
+}
+
+#define NitroStaticInit MOD37_02254840
+#include "sinit.h"