summaryrefslogtreecommitdiff
path: root/arm9/modules/50
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/50')
-rw-r--r--arm9/modules/50/asm/module_50.s15
-rw-r--r--arm9/modules/50/src/module_50_sinit.c13
2 files changed, 13 insertions, 15 deletions
diff --git a/arm9/modules/50/asm/module_50.s b/arm9/modules/50/asm/module_50.s
index ad870e7a..f91ae977 100644
--- a/arm9/modules/50/asm/module_50.s
+++ b/arm9/modules/50/asm/module_50.s
@@ -3,18 +3,6 @@
.section .text
.balign 4, 0
- thumb_func_start MOD50_02254840
-MOD50_02254840: ; 0x02254840
- ldr r3, _02254848 ; =Poketch_InitApp
- ldr r0, _0225484C ; =MOD50_02254854
- ldr r1, _02254850 ; =MOD50_02254908
- bx r3
- .align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD50_02254854
-_02254850: .word MOD50_02254908
- thumb_func_end MOD50_02254840
-
thumb_func_start MOD50_02254854
MOD50_02254854: ; 0x02254854
push {r3, r4, r5, r6, r7, lr}
@@ -418,6 +406,3 @@ MOD50_02254B2C: ; 0x02254B2C
.word 0x00, MOD50_02254A48, 0x00
.word 0x01, MOD50_02254AE8, 0x00
.word 0x00, 0x00000000, 0x00
-
- .section .sinit
- .word MOD50_02254840
diff --git a/arm9/modules/50/src/module_50_sinit.c b/arm9/modules/50/src/module_50_sinit.c
new file mode 100644
index 00000000..c16e885f
--- /dev/null
+++ b/arm9/modules/50/src/module_50_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD50_02254854();
+extern void MOD50_02254908();
+
+THUMB_FUNC static void MOD50_02254840(void)
+{
+ Poketch_InitApp(MOD50_02254854, MOD50_02254908);
+}
+
+#define NitroStaticInit MOD50_02254840
+#include "sinit.h"