summaryrefslogtreecommitdiff
path: root/arm9/modules/23
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/23')
-rw-r--r--arm9/modules/23/asm/module_23.s12
-rw-r--r--arm9/modules/23/src/module_23_sinit.c13
2 files changed, 11 insertions, 14 deletions
diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s
index 370847aa..56b78aaf 100644
--- a/arm9/modules/23/asm/module_23.s
+++ b/arm9/modules/23/asm/module_23.s
@@ -3,18 +3,6 @@
.section .text
.balign 4, 0
- thumb_func_start MOD23_02254840
-MOD23_02254840: ; 0x02254840
- ldr r3, _02254848 ; =Poketch_InitApp
- ldr r0, _0225484C ; =MOD23_02254854
- ldr r1, _02254850 ; =MOD23_022549A4
- bx r3
- .align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD23_02254854
-_02254850: .word MOD23_022549A4
- thumb_func_end MOD23_02254840
-
thumb_func_start MOD23_02254854
MOD23_02254854: ; 0x02254854
push {r3, r4, r5, r6, r7, lr}
diff --git a/arm9/modules/23/src/module_23_sinit.c b/arm9/modules/23/src/module_23_sinit.c
index 522e8ac4..97abb012 100644
--- a/arm9/modules/23/src/module_23_sinit.c
+++ b/arm9/modules/23/src/module_23_sinit.c
@@ -1,4 +1,13 @@
-#define NitroStaticInit MOD23_02254840
#include "global.h"
-extern void MOD23_02254840(void);
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD23_02254854();
+extern void MOD23_022549A4();
+
+THUMB_FUNC static void MOD23_02254840(void)
+{
+ Poketch_InitApp(MOD23_02254854, MOD23_022549A4);
+}
+
+#define NitroStaticInit MOD23_02254840
#include "sinit.h"