From 1f06dab55e56cdf757ad52e652faf7ac40fce26a Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Mon, 27 Jul 2020 15:22:11 +0100
Subject: finish poketch sinit sections

---
 arm9/modules/49/asm/module_49.s       | 15 ---------------
 arm9/modules/49/src/module_49_sinit.c | 13 +++++++++++++
 2 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 arm9/modules/49/src/module_49_sinit.c

(limited to 'arm9/modules/49')

diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s
index a3ab2dcf..8c011bb6 100644
--- a/arm9/modules/49/asm/module_49.s
+++ b/arm9/modules/49/asm/module_49.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD49_02254840
-MOD49_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD49_02254854
-	ldr r1, _02254850 ; =MOD49_02254974
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD49_02254854
-_02254850: .word MOD49_02254974
-	thumb_func_end MOD49_02254840
-
 	thumb_func_start MOD49_02254854
 MOD49_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -670,6 +658,3 @@ MOD49_02254D60: ; 0x02254D60
 	.byte 0x00, 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x02, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00
 	.byte 0x00, 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x80, 0x0A, 0x00
 	.byte 0x00, 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x02, 0x01, 0x01, 0x00, 0x00
-
-	.section .sinit
-	.word MOD49_02254840
diff --git a/arm9/modules/49/src/module_49_sinit.c b/arm9/modules/49/src/module_49_sinit.c
new file mode 100644
index 00000000..23e5419d
--- /dev/null
+++ b/arm9/modules/49/src/module_49_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD49_02254854();
+extern void MOD49_02254974();
+
+THUMB_FUNC static void MOD49_02254840(void)
+{
+    Poketch_InitApp(MOD49_02254854, MOD49_02254974);
+}
+
+#define NitroStaticInit MOD49_02254840
+#include "sinit.h"
-- 
cgit v1.2.3