summaryrefslogtreecommitdiff
path: root/arm9/modules/34
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/34')
-rw-r--r--arm9/modules/34/asm/module_34.s12
-rw-r--r--arm9/modules/34/src/module_34_sinit.c13
2 files changed, 11 insertions, 14 deletions
diff --git a/arm9/modules/34/asm/module_34.s b/arm9/modules/34/asm/module_34.s
index 4a439bd8..84100418 100644
--- a/arm9/modules/34/asm/module_34.s
+++ b/arm9/modules/34/asm/module_34.s
@@ -3,18 +3,6 @@
.section .text
.balign 4, 0
- thumb_func_start MOD34_02254840
-MOD34_02254840: ; 0x02254840
- ldr r3, _02254848 ; =Poketch_InitApp
- ldr r0, _0225484C ; =MOD34_02254854
- ldr r1, _02254850 ; =MOD34_02254948
- bx r3
- .align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD34_02254854
-_02254850: .word MOD34_02254948
- thumb_func_end MOD34_02254840
-
thumb_func_start MOD34_02254854
MOD34_02254854: ; 0x02254854
push {r3, r4, r5, r6, r7, lr}
diff --git a/arm9/modules/34/src/module_34_sinit.c b/arm9/modules/34/src/module_34_sinit.c
index 80d96e0a..96789176 100644
--- a/arm9/modules/34/src/module_34_sinit.c
+++ b/arm9/modules/34/src/module_34_sinit.c
@@ -1,4 +1,13 @@
-#define NitroStaticInit MOD34_02254840
#include "global.h"
-extern void MOD34_02254840(void);
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD34_02254854();
+extern void MOD34_02254948();
+
+THUMB_FUNC static void MOD34_02254840(void)
+{
+ Poketch_InitApp(MOD34_02254854, MOD34_02254948);
+}
+
+#define NitroStaticInit MOD34_02254840
#include "sinit.h"