8 files changed, 52 insertions, 60 deletions
diff --git a/arm9/modules/22/asm/module_22.s b/arm9/modules/22/asm/module_22.s
index 15332cb9..ef079cdb 100644
--- a/arm9/modules/22/asm/module_22.s
+++ b/arm9/modules/22/asm/module_22.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD22_02254840
-MOD22_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD22_02254854
-	ldr r1, _02254850 ; =MOD22_022549D8
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD22_02254854
-_02254850: .word MOD22_022549D8
-	thumb_func_end MOD22_02254840
-
 	thumb_func_start MOD22_02254854
 MOD22_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -1885,6 +1873,3 @@ MOD22_022556A0: ; 0x022556A0
 	.byte 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x02, 0x00
 	.byte 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00
 	.byte 0x0A, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00
-
-	.section .sinit
-	.word MOD22_02254840
diff --git a/arm9/modules/22/src/module_22_sinit.c b/arm9/modules/22/src/module_22_sinit.c
new file mode 100644
index 00000000..0095f0c1
--- /dev/null
+++ b/arm9/modules/22/src/module_22_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD22_02254854();
+extern void MOD22_022549D8();
+
+THUMB_FUNC static void MOD22_02254840(void)
+{
+    Poketch_InitApp(MOD22_02254854, MOD22_022549D8);
+}
+
+#define NitroStaticInit MOD22_02254840
+#include "sinit.h"
diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s
index ccf6c969..e7eb3899 100644
--- a/arm9/modules/24/asm/module_24.s
+++ b/arm9/modules/24/asm/module_24.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD24_02254840
-MOD24_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD24_02254854
-	ldr r1, _02254850 ; =MOD24_02254990
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD24_02254854
-_02254850: .word MOD24_02254990
-	thumb_func_end MOD24_02254840
-
 	thumb_func_start MOD24_02254854
 MOD24_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -1219,6 +1207,3 @@ MOD24_0225516C: ; 0x0225516C
 	.word 0x04, MOD24_02255038, 0x00
 	.word 0x05, MOD24_02255050, 0x00
 	.word 0x00, 0x00000000, 0x00
-
-	.section .sinit
-	.word MOD24_02254840
diff --git a/arm9/modules/24/src/module_24_sinit.c b/arm9/modules/24/src/module_24_sinit.c
new file mode 100644
index 00000000..de535e77
--- /dev/null
+++ b/arm9/modules/24/src/module_24_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD24_02254854();
+extern void MOD24_02254990();
+
+THUMB_FUNC static void MOD24_02254840(void)
+{
+    Poketch_InitApp(MOD24_02254854, MOD24_02254990);
+}
+
+#define NitroStaticInit MOD24_02254840
+#include "sinit.h"
diff --git a/arm9/modules/25/asm/module_25.s b/arm9/modules/25/asm/module_25.s
index ba331a34..84129725 100644
--- a/arm9/modules/25/asm/module_25.s
+++ b/arm9/modules/25/asm/module_25.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD25_02254840
-MOD25_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD25_02254854
-	ldr r1, _02254850 ; =MOD25_0225496C
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD25_02254854
-_02254850: .word MOD25_0225496C
-	thumb_func_end MOD25_02254840
-
 	thumb_func_start MOD25_02254854
 MOD25_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -686,6 +674,3 @@ MOD25_02254D44: ; 0x02254D44
 	.word 0x02, MOD25_02254BE8, 0x00
 	.word 0x03, MOD25_02254C14, 0x00
 	.word 0x00, 0x00000000, 0x00
-
-	.section .sinit
-	.word MOD25_02254840
diff --git a/arm9/modules/25/src/module_25_sinit.c b/arm9/modules/25/src/module_25_sinit.c
new file mode 100644
index 00000000..e86493c7
--- /dev/null
+++ b/arm9/modules/25/src/module_25_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD25_02254854();
+extern void MOD25_0225496C();
+
+THUMB_FUNC static void MOD25_02254840(void)
+{
+    Poketch_InitApp(MOD25_02254854, MOD25_0225496C);
+}
+
+#define NitroStaticInit MOD25_02254840
+#include "sinit.h"
diff --git a/arm9/modules/26/asm/module_26.s b/arm9/modules/26/asm/module_26.s
index 12d880aa..45536bcf 100644
--- a/arm9/modules/26/asm/module_26.s
+++ b/arm9/modules/26/asm/module_26.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD26_02254840
-MOD26_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD26_02254854
-	ldr r1, _02254850 ; =MOD26_02254A84
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD26_02254854
-_02254850: .word MOD26_02254A84
-	thumb_func_end MOD26_02254840
-
 	thumb_func_start MOD26_02254854
 MOD26_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -843,6 +831,3 @@ MOD26_02254FF0: ; 0x02254FF0
 	.word 0x01, MOD26_02254D6C, 0x00
 	.word 0x02, MOD26_02254D90, 0x00
 	.word 0x00, 0x00000000, 0x00
-
-	.section .sinit
-	.word MOD26_02254840
diff --git a/arm9/modules/26/src/module_26_sinit.c b/arm9/modules/26/src/module_26_sinit.c
new file mode 100644
index 00000000..a84f88bb
--- /dev/null
+++ b/arm9/modules/26/src/module_26_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD26_02254854();
+extern void MOD26_02254A84();
+
+THUMB_FUNC static void MOD26_02254840(void)
+{
+    Poketch_InitApp(MOD26_02254854, MOD26_02254A84);
+}
+
+#define NitroStaticInit MOD26_02254840
+#include "sinit.h"