From b0cf87ca3640d912d047de41343b4ff9e5f44c6e Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Mon, 27 Jul 2020 14:38:25 +0100
Subject: decomp module static init sections

---
 arm9/modules/41/asm/module_41.s       | 12 ------------
 arm9/modules/41/src/module_41_sinit.c | 13 +++++++++++--
 2 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'arm9/modules/41')

diff --git a/arm9/modules/41/asm/module_41.s b/arm9/modules/41/asm/module_41.s
index 13762a02..a60736df 100644
--- a/arm9/modules/41/asm/module_41.s
+++ b/arm9/modules/41/asm/module_41.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD41_02254840
-MOD41_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD41_02254854
-	ldr r1, _02254850 ; =MOD41_02254AD8
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD41_02254854
-_02254850: .word MOD41_02254AD8
-	thumb_func_end MOD41_02254840
-
 	thumb_func_start MOD41_02254854
 MOD41_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
diff --git a/arm9/modules/41/src/module_41_sinit.c b/arm9/modules/41/src/module_41_sinit.c
index 9d0d5aa8..1e119d0f 100644
--- a/arm9/modules/41/src/module_41_sinit.c
+++ b/arm9/modules/41/src/module_41_sinit.c
@@ -1,4 +1,13 @@
-#define NitroStaticInit MOD41_02254840
 #include "global.h"
-extern void MOD41_02254840(void);
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD41_02254854();
+extern void MOD41_02254AD8();
+
+THUMB_FUNC static void MOD41_02254840(void)
+{
+    Poketch_InitApp(MOD41_02254854, MOD41_02254AD8);
+}
+
+#define NitroStaticInit MOD41_02254840
 #include "sinit.h"
-- 
cgit v1.2.3