finish poketch sinit sections

23 files changed, 154 insertions, 165 deletions

diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf
index 9c13b534..e977dbf4 100644
--- a/arm9/arm9.lsf
+++ b/arm9/arm9.lsf
@@ -716,6 +716,7 @@ Overlay MODULE_31
 {
 	##Pokétch Counter##
 	After MODULE_20
+	Object module_31_sinit.o
 	Object module_31.o
 }
 
@@ -729,6 +730,7 @@ Overlay MODULE_32
 Overlay MODULE_33
 {
 	After MODULE_20
+	Object module_33_sinit.o
 	Object module_33.o
 }
 
@@ -743,6 +745,7 @@ Overlay MODULE_35
 {
 	##Daycare Checker##
 	After MODULE_20
+	Object module_35_sinit.o
 	Object module_35.o
 }
 
@@ -757,6 +760,7 @@ Overlay MODULE_37
 {
 	##Coin Toss##
 	After MODULE_20
+	Object module_37_sinit.o
 	Object module_37.o
 }
 
@@ -764,6 +768,7 @@ Overlay MODULE_38
 {
 	##Move Checker##
 	After MODULE_20
+	Object module_38_sinit.o
 	Object module_38.o
 }
 
@@ -777,6 +782,7 @@ Overlay MODULE_39
 Overlay MODULE_40
 {
 	After MODULE_20
+	Object module_40_sinit.o
 	Object module_40.o
 }
 
@@ -813,12 +819,14 @@ Overlay MODULE_44
 Overlay MODULE_45
 {
 	After MODULE_20
+	Object module_45_sinit.o
 	Object module_45.o
 }
 
 Overlay MODULE_46
 {
 	After MODULE_20
+	Object module_46_sinit.o
 	Object module_46.o
 }
 
@@ -833,6 +841,7 @@ Overlay MODULE_47
 Overlay MODULE_48
 {
 	After MODULE_20
+	Object module_48_sinit.o
 	Object module_48.o
 }
 
@@ -840,12 +849,14 @@ Overlay MODULE_49
 {
 	##Pokemon History##
 	After MODULE_20
+	Object module_49_sinit.o
 	Object module_49.o
 }
 
 Overlay MODULE_50
 {
 	After MODULE_20
+	Object module_50_sinit.o
 	Object module_50.o
 }
 
diff --git a/arm9/modules/31/asm/module_31.s b/arm9/modules/31/asm/module_31.s
index 47018f81..8bdedda5 100644
--- a/arm9/modules/31/asm/module_31.s
+++ b/arm9/modules/31/asm/module_31.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD31_02254840
-MOD31_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD31_02254854
-	ldr r1, _02254850 ; =MOD31_02254954
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD31_02254854
-_02254850: .word MOD31_02254954
-	thumb_func_end MOD31_02254840
-
 	thumb_func_start MOD31_02254854
 MOD31_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -749,6 +737,3 @@ MOD31_02254DE4: ; 0x02254DE4
 	.word 0x02, MOD31_02254CB8, 0x00
 	.word 0x03, MOD31_02254CF8, 0x00
 	.word 0x00, 0x00000000, 0x00
-
-	.section .sinit
-	.word MOD31_02254840
diff --git a/arm9/modules/31/src/module_31_sinit.c b/arm9/modules/31/src/module_31_sinit.c
new file mode 100644
index 00000000..89eadae8
--- /dev/null
+++ b/arm9/modules/31/src/module_31_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD31_02254854();
+extern void MOD31_02254954();
+
+THUMB_FUNC static void MOD31_02254840(void)
+{
+    Poketch_InitApp(MOD31_02254854, MOD31_02254954);
+}
+
+#define NitroStaticInit MOD31_02254840
+#include "sinit.h"
diff --git a/arm9/modules/33/asm/module_33.s b/arm9/modules/33/asm/module_33.s
index e7d626bc..6db0efdf 100644
--- a/arm9/modules/33/asm/module_33.s
+++ b/arm9/modules/33/asm/module_33.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD33_02254840
-MOD33_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD33_02254854
-	ldr r1, _02254850 ; =MOD33_02254908
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD33_02254854
-_02254850: .word MOD33_02254908
-	thumb_func_end MOD33_02254840
-
 	thumb_func_start MOD33_02254854
 MOD33_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -408,6 +396,3 @@ MOD33_02254B1C: ; 0x02254B1C
 	.word 0x00, MOD33_02254A38, 0x00
 	.word 0x01, MOD33_02254AD8, 0x00
 	.word 0x00, 0x00000000, 0x00
-
-	.section .sinit
-	.word MOD33_02254840
diff --git a/arm9/modules/33/src/module_33_sinit.c b/arm9/modules/33/src/module_33_sinit.c
new file mode 100644
index 00000000..6ea456ad
--- /dev/null
+++ b/arm9/modules/33/src/module_33_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD33_02254854();
+extern void MOD33_02254908();
+
+THUMB_FUNC static void MOD33_02254840(void)
+{
+    Poketch_InitApp(MOD33_02254854, MOD33_02254908);
+}
+
+#define NitroStaticInit MOD33_02254840
+#include "sinit.h"
diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s
index 48953e9f..7b347ca5 100644
--- a/arm9/modules/35/asm/module_35.s
+++ b/arm9/modules/35/asm/module_35.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD35_02254840
-MOD35_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD35_02254854
-	ldr r1, _02254850 ; =MOD35_02254924
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD35_02254854
-_02254850: .word MOD35_02254924
-	thumb_func_end MOD35_02254840
-
 	thumb_func_start MOD35_02254854
 MOD35_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -1167,6 +1155,3 @@ MOD35_02255110: ; 0x02255110
 	.byte 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x80, 0x02, 0x00
 	.byte 0x0A, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0C, 0x00, 0x00, 0x80, 0x02, 0x00
 	.byte 0x0A, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
-
-	.section .sinit
-	.word MOD35_02254840
diff --git a/arm9/modules/35/src/module_35_sinit.c b/arm9/modules/35/src/module_35_sinit.c
new file mode 100644
index 00000000..85fe5344
--- /dev/null
+++ b/arm9/modules/35/src/module_35_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD35_02254854();
+extern void MOD35_02254924();
+
+THUMB_FUNC static void MOD35_02254840(void)
+{
+    Poketch_InitApp(MOD35_02254854, MOD35_02254924);
+}
+
+#define NitroStaticInit MOD35_02254840
+#include "sinit.h"
diff --git a/arm9/modules/37/asm/module_37.s b/arm9/modules/37/asm/module_37.s
index 8135b43b..3c7f412c 100644
--- a/arm9/modules/37/asm/module_37.s
+++ b/arm9/modules/37/asm/module_37.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD37_02254840
-MOD37_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD37_02254854
-	ldr r1, _02254850 ; =MOD37_02254934
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD37_02254854
-_02254850: .word MOD37_02254934
-	thumb_func_end MOD37_02254840
-
 	thumb_func_start MOD37_02254854
 MOD37_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -693,9 +681,6 @@ MOD37_02254D60: ; 0x02254D60
 	.word 0x02, MOD37_02254C44, 0x00
 	.word 0x00, 0x00000000, 0x00
 
-	.section .sinit
-	.word MOD37_02254840
-
 	.section .bss
 	.global MOD37_02254DA0
 MOD37_02254DA0: ; 0x02254DA0
diff --git a/arm9/modules/37/src/module_37_sinit.c b/arm9/modules/37/src/module_37_sinit.c
new file mode 100644
index 00000000..ba3df423
--- /dev/null
+++ b/arm9/modules/37/src/module_37_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD37_02254854();
+extern void MOD37_02254934();
+
+THUMB_FUNC static void MOD37_02254840(void)
+{
+    Poketch_InitApp(MOD37_02254854, MOD37_02254934);
+}
+
+#define NitroStaticInit MOD37_02254840
+#include "sinit.h"
diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s
index 59871d4a..fafafb07 100644
--- a/arm9/modules/38/asm/module_38.s
+++ b/arm9/modules/38/asm/module_38.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD38_02254840
-MOD38_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD38_02254854
-	ldr r1, _02254850 ; =MOD38_02254990
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD38_02254854
-_02254850: .word MOD38_02254990
-	thumb_func_end MOD38_02254840
-
 	thumb_func_start MOD38_02254854
 MOD38_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -1254,6 +1242,3 @@ MOD38_02255300: ; 0x02255300
 	.byte 0x00, 0x40, 0x0C, 0x00, 0x00, 0x80, 0x02, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0xC0, 0x06, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x40, 0x0C, 0x00, 0x00, 0x80, 0x04, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
-
-	.section .sinit
-	.word MOD38_02254840
diff --git a/arm9/modules/38/src/module_38_sinit.c b/arm9/modules/38/src/module_38_sinit.c
new file mode 100644
index 00000000..6c41dda8
--- /dev/null
+++ b/arm9/modules/38/src/module_38_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD38_02254854();
+extern void MOD38_02254990();
+
+THUMB_FUNC static void MOD38_02254840(void)
+{
+    Poketch_InitApp(MOD38_02254854, MOD38_02254990);
+}
+
+#define NitroStaticInit MOD38_02254840
+#include "sinit.h"
diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s
index e46b1f2a..409892d9 100644
--- a/arm9/modules/40/asm/module_40.s
+++ b/arm9/modules/40/asm/module_40.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD40_02254840
-MOD40_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD40_02254854
-	ldr r1, _02254850 ; =MOD40_022549D4
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD40_02254854
-_02254850: .word MOD40_022549D4
-	thumb_func_end MOD40_02254840
-
 	thumb_func_start MOD40_02254854
 MOD40_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -1453,6 +1441,3 @@ MOD40_022553B0: ; 0x022553B0
 	.byte 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00
 	.byte 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00
 	.byte 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
-
-	.section .sinit
-	.word MOD40_02254840
diff --git a/arm9/modules/40/src/module_40_sinit.c b/arm9/modules/40/src/module_40_sinit.c
new file mode 100644
index 00000000..fc2d56c5
--- /dev/null
+++ b/arm9/modules/40/src/module_40_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD40_02254854();
+extern void MOD40_022549D4();
+
+THUMB_FUNC static void MOD40_02254840(void)
+{
+    Poketch_InitApp(MOD40_02254854, MOD40_022549D4);
+}
+
+#define NitroStaticInit MOD40_02254840
+#include "sinit.h"
diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s
index effe8de8..182774aa 100644
--- a/arm9/modules/45/asm/module_45.s
+++ b/arm9/modules/45/asm/module_45.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD45_02254840
-MOD45_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD45_02254854
-	ldr r1, _02254850 ; =MOD45_02254A30
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD45_02254854
-_02254850: .word MOD45_02254A30
-	thumb_func_end MOD45_02254840
-
 	thumb_func_start MOD45_02254854
 MOD45_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -1110,6 +1098,3 @@ MOD45_02255140: ; 0x02255140
 	.word 0x01, MOD45_02254D70, 0x00
 	.word 0x02, MOD45_02254D94, 0x00
 	.word 0x00, 0x00000000, 0x00
-
-	.section .sinit
-	.word MOD45_02254840
diff --git a/arm9/modules/45/src/module_45_sinit.c b/arm9/modules/45/src/module_45_sinit.c
new file mode 100644
index 00000000..6bfb10f7
--- /dev/null
+++ b/arm9/modules/45/src/module_45_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD45_02254854();
+extern void MOD45_02254A30();
+
+THUMB_FUNC static void MOD45_02254840(void)
+{
+    Poketch_InitApp(MOD45_02254854, MOD45_02254A30);
+}
+
+#define NitroStaticInit MOD45_02254840
+#include "sinit.h"
diff --git a/arm9/modules/46/asm/module_46.s b/arm9/modules/46/asm/module_46.s
index 02956d4b..9e4c3dc5 100644
--- a/arm9/modules/46/asm/module_46.s
+++ b/arm9/modules/46/asm/module_46.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD46_02254840
-MOD46_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD46_02254854
-	ldr r1, _02254850 ; =MOD46_02254908
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD46_02254854
-_02254850: .word MOD46_02254908
-	thumb_func_end MOD46_02254840
-
 	thumb_func_start MOD46_02254854
 MOD46_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -408,6 +396,3 @@ MOD46_02254B1C: ; 0x02254B1C
 	.word 0x00, MOD46_02254A38, 0x00
 	.word 0x01, MOD46_02254AD8, 0x00
 	.word 0x00, 0x00000000, 0x00
-
-	.section .sinit
-	.word MOD46_02254840
diff --git a/arm9/modules/46/src/module_46_sinit.c b/arm9/modules/46/src/module_46_sinit.c
new file mode 100644
index 00000000..96fe680a
--- /dev/null
+++ b/arm9/modules/46/src/module_46_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD46_02254854();
+extern void MOD46_02254908();
+
+THUMB_FUNC static void MOD46_02254840(void)
+{
+    Poketch_InitApp(MOD46_02254854, MOD46_02254908);
+}
+
+#define NitroStaticInit MOD46_02254840
+#include "sinit.h"
diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s
index 32b5d3c8..ed66d753 100644
--- a/arm9/modules/48/asm/module_48.s
+++ b/arm9/modules/48/asm/module_48.s
@@ -3,18 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD48_02254840
-MOD48_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =Poketch_InitApp
-	ldr r0, _0225484C ; =MOD48_02254854
-	ldr r1, _02254850 ; =MOD48_0225498C
-	bx r3
-	.align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD48_02254854
-_02254850: .word MOD48_0225498C
-	thumb_func_end MOD48_02254840
-
 	thumb_func_start MOD48_02254854
 MOD48_02254854: ; 0x02254854
 	push {r3, r4, r5, r6, r7, lr}
@@ -996,6 +984,3 @@ MOD48_02254FD0: ; 0x02254FD0
 	.byte 0x00, 0x40, 0x02, 0x00, 0x00, 0x80, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x00, 0x00, 0x00
 	.byte 0x00, 0xC0, 0x02, 0x00, 0x00, 0x80, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x00, 0x00, 0x00
 	.byte 0x00, 0x40, 0x03, 0x00, 0x00, 0x80, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x00, 0x00, 0x00
-
-	.section .sinit
-	.word MOD48_02254840
diff --git a/arm9/modules/48/src/module_48_sinit.c b/arm9/modules/48/src/module_48_sinit.c
new file mode 100644
index 00000000..6d2a342d
--- /dev/null
+++ b/arm9/modules/48/src/module_48_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD48_02254854();
+extern void MOD48_0225498C();
+
+THUMB_FUNC static void MOD48_02254840(void)
+{
+    Poketch_InitApp(MOD48_02254854, MOD48_0225498C);
+}
+
+#define NitroStaticInit MOD48_02254840
+#include "sinit.h"
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"
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"