summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/01/src/module_01.c3
-rw-r--r--arm9/modules/11/asm/module_11.s10
-rw-r--r--arm9/modules/11/src/module_11_sinit.c4
-rw-r--r--arm9/modules/21/asm/module_21.s9
-rw-r--r--arm9/modules/21/src/module_21_sinit.c4
-rw-r--r--arm9/modules/23/asm/module_23.s8
-rw-r--r--arm9/modules/23/src/module_23_sinit.c4
-rw-r--r--arm9/modules/27/asm/module_27.s8
-rw-r--r--arm9/modules/27/src/module_27_sinit.c4
-rw-r--r--arm9/modules/28/asm/module_28.s8
-rw-r--r--arm9/modules/28/src/module_28_sinit.c4
-rw-r--r--arm9/modules/29/asm/module_29.s8
-rw-r--r--arm9/modules/29/src/module_29_sinit.c4
-rw-r--r--arm9/modules/30/asm/module_30.s10
-rw-r--r--arm9/modules/30/src/module_30_sinit.c4
-rw-r--r--arm9/modules/32/asm/module_32.s8
-rw-r--r--arm9/modules/32/src/module_32_sinit.c4
-rw-r--r--arm9/modules/34/asm/module_34.s8
-rw-r--r--arm9/modules/34/src/module_34_sinit.c4
-rw-r--r--arm9/modules/36/asm/module_36.s8
-rw-r--r--arm9/modules/36/src/module_36_sinit.c4
-rw-r--r--arm9/modules/39/asm/module_39.s8
-rw-r--r--arm9/modules/39/src/module_39_sinit.c4
-rw-r--r--arm9/modules/41/asm/module_41.s8
-rw-r--r--arm9/modules/41/src/module_41_sinit.c4
-rw-r--r--arm9/modules/42/asm/module_42.s8
-rw-r--r--arm9/modules/42/src/module_42_sinit.c4
-rw-r--r--arm9/modules/43/asm/module_43.s8
-rw-r--r--arm9/modules/43/src/module_43_sinit.c4
-rw-r--r--arm9/modules/44/asm/module_44.s8
-rw-r--r--arm9/modules/44/src/module_44_sinit.c4
-rw-r--r--arm9/modules/47/asm/module_47.s8
-rw-r--r--arm9/modules/47/src/module_47_sinit.c4
33 files changed, 67 insertions, 133 deletions
diff --git a/arm9/modules/01/src/module_01.c b/arm9/modules/01/src/module_01.c
index 1f9f0edc..a126a247 100644
--- a/arm9/modules/01/src/module_01.c
+++ b/arm9/modules/01/src/module_01.c
@@ -1,7 +1,8 @@
#include "global.h"
#include "sinit.h"
+#pragma thumb on
-THUMB_FUNC static void NitroStaticInit(void) {
+static void NitroStaticInit(void) {
static u32 var[2];
var[1]++;
}
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index 338eaadb..ef15a30d 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -99235,16 +99235,6 @@ MOD11_0225D98C: ; 0x0225D98C
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- ; Stupid hack to override alignment
- ; .section .sinit
- ; 0x0225FF18
- .global SDK_OVERLAY.MODULE_11.SINIT_START
- .global SDK_OVERLAY.MODULE_11.SINIT_END
-SDK_OVERLAY.MODULE_11.SINIT_START:
- .word MOD11_0222F284
- .word 0
-SDK_OVERLAY.MODULE_11.SINIT_END:
-
.section .data
; 0x0225FF20
.byte 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x08, 0x08, 0x06, 0x0C
diff --git a/arm9/modules/11/src/module_11_sinit.c b/arm9/modules/11/src/module_11_sinit.c
new file mode 100644
index 00000000..b798941e
--- /dev/null
+++ b/arm9/modules/11/src/module_11_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD11_0222F284
+#include "global.h"
+extern void MOD11_0222F284(void);
+#include "sinit.h"
diff --git a/arm9/modules/21/asm/module_21.s b/arm9/modules/21/asm/module_21.s
index d3c385c0..c54eab3e 100644
--- a/arm9/modules/21/asm/module_21.s
+++ b/arm9/modules/21/asm/module_21.s
@@ -730,12 +730,3 @@ _02254D7C: .word 0x040002A8
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x15, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x41, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
- ; Dumb hack because the compiler aligns to 16 instead of 8
- ;.section .sinit
- .global SDK_OVERLAY.MODULE_21.SINIT_START
- .global SDK_OVERLAY.MODULE_21.SINIT_END
-SDK_OVERLAY.MODULE_21.SINIT_START:
- .word MOD21_02254840
- .word 0
-SDK_OVERLAY.MODULE_21.SINIT_END:
diff --git a/arm9/modules/21/src/module_21_sinit.c b/arm9/modules/21/src/module_21_sinit.c
new file mode 100644
index 00000000..e19c840f
--- /dev/null
+++ b/arm9/modules/21/src/module_21_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD21_02254840
+#include "global.h"
+extern void MOD21_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s
index 0fceaaad..a03c36ad 100644
--- a/arm9/modules/23/asm/module_23.s
+++ b/arm9/modules/23/asm/module_23.s
@@ -2862,11 +2862,3 @@ _02255CB8: .word 0x022560D0
.byte 0x00, 0x00, 0x00, 0x00, 0x40, 0x42, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x96, 0x98, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1, 0xF5, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCA, 0x9A, 0x3B
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xE4, 0x0B, 0x54, 0x02, 0x00, 0x00, 0x00
-
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_23.SINIT_START
- .global SDK_OVERLAY.MODULE_23.SINIT_END
-SDK_OVERLAY.MODULE_23.SINIT_START:
- .word MOD23_02254840
- .word 0
-SDK_OVERLAY.MODULE_23.SINIT_END:
diff --git a/arm9/modules/23/src/module_23_sinit.c b/arm9/modules/23/src/module_23_sinit.c
new file mode 100644
index 00000000..522e8ac4
--- /dev/null
+++ b/arm9/modules/23/src/module_23_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD23_02254840
+#include "global.h"
+extern void MOD23_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index 2445df1b..4508ffdc 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -1459,11 +1459,3 @@ _02255338: .word 0x00000669
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xB5, 0x52, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0xD1, 0x52, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_27.SINIT_START
- .global SDK_OVERLAY.MODULE_27.SINIT_END
-SDK_OVERLAY.MODULE_27.SINIT_START:
- .word MOD27_02254840
- .word 0
-SDK_OVERLAY.MODULE_27.SINIT_END:
diff --git a/arm9/modules/27/src/module_27_sinit.c b/arm9/modules/27/src/module_27_sinit.c
new file mode 100644
index 00000000..6b069297
--- /dev/null
+++ b/arm9/modules/27/src/module_27_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD27_02254840
+#include "global.h"
+extern void MOD27_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s
index faaa636a..beb0e25c 100644
--- a/arm9/modules/28/asm/module_28.s
+++ b/arm9/modules/28/asm/module_28.s
@@ -2977,14 +2977,6 @@ _02255E74: .word 0x00000163
.byte 0x19, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0x4F, 0x25, 0x02
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_28.SINIT_START
- .global SDK_OVERLAY.MODULE_28.SINIT_END
-SDK_OVERLAY.MODULE_28.SINIT_START:
- .word MOD28_02254840
- .word 0
-SDK_OVERLAY.MODULE_28.SINIT_END:
-
.section .data
; 0x02255F20
.byte 0x69, 0x63, 0x6F, 0x6E, 0x5B, 0x25, 0x64, 0x5D, 0x20, 0x52, 0x45, 0x46, 0x5B, 0x25, 0x64, 0x5D
diff --git a/arm9/modules/28/src/module_28_sinit.c b/arm9/modules/28/src/module_28_sinit.c
new file mode 100644
index 00000000..3d2d7cf6
--- /dev/null
+++ b/arm9/modules/28/src/module_28_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD28_02254840
+#include "global.h"
+extern void MOD28_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/29/asm/module_29.s b/arm9/modules/29/asm/module_29.s
index 1d279ddc..8744eadd 100644
--- a/arm9/modules/29/asm/module_29.s
+++ b/arm9/modules/29/asm/module_29.s
@@ -1132,11 +1132,3 @@ MOD29_0225508C: ; 0x0225508C
.byte 0x00, 0x00, 0x00, 0x00, 0x11, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0xF5, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x11, 0x4E, 0x25, 0x02
.byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_29.SINIT_START
- .global SDK_OVERLAY.MODULE_29.SINIT_END
-SDK_OVERLAY.MODULE_29.SINIT_START:
- .word MOD29_02254840
- .word 0
-SDK_OVERLAY.MODULE_29.SINIT_END:
diff --git a/arm9/modules/29/src/module_29_sinit.c b/arm9/modules/29/src/module_29_sinit.c
new file mode 100644
index 00000000..77fee47c
--- /dev/null
+++ b/arm9/modules/29/src/module_29_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD29_02254840
+#include "global.h"
+extern void MOD29_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/30/asm/module_30.s b/arm9/modules/30/asm/module_30.s
index a6c7ee0d..153c1b76 100644
--- a/arm9/modules/30/asm/module_30.s
+++ b/arm9/modules/30/asm/module_30.s
@@ -729,7 +729,7 @@ _02254D98: .word 0x040002A0
_02254D9C: .word 0x040002A8
thumb_func_end MOD30_02254D28
- .section .data
+ .section .rodata
; 0x02254DA0
.byte 0x64, 0x9C, 0x52, 0x92, 0x89, 0x49, 0x25, 0x02, 0xC9, 0x49, 0x25, 0x02, 0x5D, 0x4A, 0x25, 0x02
.byte 0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
@@ -740,11 +740,3 @@ _02254D9C: .word 0x040002A8
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xC5, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x05, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_30.SINIT_START
- .global SDK_OVERLAY.MODULE_30.SINIT_END
-SDK_OVERLAY.MODULE_30.SINIT_START:
- .word MOD30_02254840
- .word 0
-SDK_OVERLAY.MODULE_30.SINIT_END:
diff --git a/arm9/modules/30/src/module_30_sinit.c b/arm9/modules/30/src/module_30_sinit.c
new file mode 100644
index 00000000..058b270d
--- /dev/null
+++ b/arm9/modules/30/src/module_30_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD30_02254840
+#include "global.h"
+extern void MOD30_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/32/asm/module_32.s b/arm9/modules/32/asm/module_32.s
index fa319f00..d75a5d63 100644
--- a/arm9/modules/32/asm/module_32.s
+++ b/arm9/modules/32/asm/module_32.s
@@ -580,11 +580,3 @@ _02254C50: .word 0x00000663
.byte 0x00, 0x00, 0x00, 0x00, 0x59, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x25, 0x02
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_32.SINIT_START
- .global SDK_OVERLAY.MODULE_32.SINIT_END
-SDK_OVERLAY.MODULE_32.SINIT_START:
- .word MOD32_02254840
- .word 0
-SDK_OVERLAY.MODULE_32.SINIT_END:
diff --git a/arm9/modules/32/src/module_32_sinit.c b/arm9/modules/32/src/module_32_sinit.c
new file mode 100644
index 00000000..cf500b6e
--- /dev/null
+++ b/arm9/modules/32/src/module_32_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD32_02254840
+#include "global.h"
+extern void MOD32_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/34/asm/module_34.s b/arm9/modules/34/asm/module_34.s
index e08716c1..e69ff4f1 100644
--- a/arm9/modules/34/asm/module_34.s
+++ b/arm9/modules/34/asm/module_34.s
@@ -599,11 +599,3 @@ _02254C6C: .word 0x02254C94
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xB5, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_34.SINIT_START
- .global SDK_OVERLAY.MODULE_34.SINIT_END
-SDK_OVERLAY.MODULE_34.SINIT_START:
- .word MOD34_02254840
- .word 0
-SDK_OVERLAY.MODULE_34.SINIT_END:
diff --git a/arm9/modules/34/src/module_34_sinit.c b/arm9/modules/34/src/module_34_sinit.c
new file mode 100644
index 00000000..80d96e0a
--- /dev/null
+++ b/arm9/modules/34/src/module_34_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD34_02254840
+#include "global.h"
+extern void MOD34_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s
index 4c84dc7b..75b165b9 100644
--- a/arm9/modules/36/asm/module_36.s
+++ b/arm9/modules/36/asm/module_36.s
@@ -1577,11 +1577,3 @@ _022553E4: .word 0x0000066A
.byte 0x06, 0x00, 0x00, 0x00, 0xE1, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
.byte 0x0D, 0x52, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x9D, 0x53, 0x25, 0x02
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_36.SINIT_START
- .global SDK_OVERLAY.MODULE_36.SINIT_END
-SDK_OVERLAY.MODULE_36.SINIT_START:
- .word MOD36_02254840
- .word 0
-SDK_OVERLAY.MODULE_36.SINIT_END:
diff --git a/arm9/modules/36/src/module_36_sinit.c b/arm9/modules/36/src/module_36_sinit.c
new file mode 100644
index 00000000..b365faa7
--- /dev/null
+++ b/arm9/modules/36/src/module_36_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD36_02254840
+#include "global.h"
+extern void MOD36_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s
index f7c09bfc..ec2bff78 100644
--- a/arm9/modules/39/asm/module_39.s
+++ b/arm9/modules/39/asm/module_39.s
@@ -1477,11 +1477,3 @@ _022552FA:
.byte 0xF9, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xF9, 0xFF, 0xFF, 0xFF
.byte 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00
.byte 0xFF, 0xFF, 0xFF, 0xFF
-
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_39.SINIT_START
- .global SDK_OVERLAY.MODULE_39.SINIT_END
-SDK_OVERLAY.MODULE_39.SINIT_START:
- .word MOD39_02254840
- .word 0
-SDK_OVERLAY.MODULE_39.SINIT_END:
diff --git a/arm9/modules/39/src/module_39_sinit.c b/arm9/modules/39/src/module_39_sinit.c
new file mode 100644
index 00000000..f59753f9
--- /dev/null
+++ b/arm9/modules/39/src/module_39_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD39_02254840
+#include "global.h"
+extern void MOD39_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/41/asm/module_41.s b/arm9/modules/41/asm/module_41.s
index 8ea279f7..594ec16c 100644
--- a/arm9/modules/41/asm/module_41.s
+++ b/arm9/modules/41/asm/module_41.s
@@ -2051,11 +2051,3 @@ MOD41_0225578C: ; 0x0225578C
.byte 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
-
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_41.SINIT_START
- .global SDK_OVERLAY.MODULE_41.SINIT_END
-SDK_OVERLAY.MODULE_41.SINIT_START:
- .word MOD41_02254840
- .word 0
-SDK_OVERLAY.MODULE_41.SINIT_END:
diff --git a/arm9/modules/41/src/module_41_sinit.c b/arm9/modules/41/src/module_41_sinit.c
new file mode 100644
index 00000000..9d0d5aa8
--- /dev/null
+++ b/arm9/modules/41/src/module_41_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD41_02254840
+#include "global.h"
+extern void MOD41_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s
index 89617940..e630bbb7 100644
--- a/arm9/modules/42/asm/module_42.s
+++ b/arm9/modules/42/asm/module_42.s
@@ -1155,11 +1155,3 @@ _022550C8:
.byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x3D, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xCD, 0x4F, 0x25, 0x02
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_42.SINIT_START
- .global SDK_OVERLAY.MODULE_42.SINIT_END
-SDK_OVERLAY.MODULE_42.SINIT_START:
- .word MOD42_02254840
- .word 0
-SDK_OVERLAY.MODULE_42.SINIT_END:
diff --git a/arm9/modules/42/src/module_42_sinit.c b/arm9/modules/42/src/module_42_sinit.c
new file mode 100644
index 00000000..3b42fc7d
--- /dev/null
+++ b/arm9/modules/42/src/module_42_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD42_02254840
+#include "global.h"
+extern void MOD42_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s
index 517cdaac..667029af 100644
--- a/arm9/modules/43/asm/module_43.s
+++ b/arm9/modules/43/asm/module_43.s
@@ -1150,11 +1150,3 @@ _022550A2:
.byte 0x01, 0x00, 0x00, 0x00, 0x4D, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.byte 0xA9, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
-
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_43.SINIT_START
- .global SDK_OVERLAY.MODULE_43.SINIT_END
-SDK_OVERLAY.MODULE_43.SINIT_START:
- .word MOD43_02254840
- .word 0
-SDK_OVERLAY.MODULE_43.SINIT_END:
diff --git a/arm9/modules/43/src/module_43_sinit.c b/arm9/modules/43/src/module_43_sinit.c
new file mode 100644
index 00000000..8143a29f
--- /dev/null
+++ b/arm9/modules/43/src/module_43_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD43_02254840
+#include "global.h"
+extern void MOD43_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/44/asm/module_44.s b/arm9/modules/44/asm/module_44.s
index 346f755c..f40d59c0 100644
--- a/arm9/modules/44/asm/module_44.s
+++ b/arm9/modules/44/asm/module_44.s
@@ -576,11 +576,3 @@ _02254C50: .word 0x00000663
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xF9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0x15, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_44.SINIT_START
- .global SDK_OVERLAY.MODULE_44.SINIT_END
-SDK_OVERLAY.MODULE_44.SINIT_START:
- .word MOD44_02254840
- .word 0
-SDK_OVERLAY.MODULE_44.SINIT_END:
diff --git a/arm9/modules/44/src/module_44_sinit.c b/arm9/modules/44/src/module_44_sinit.c
new file mode 100644
index 00000000..8bb54dd1
--- /dev/null
+++ b/arm9/modules/44/src/module_44_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD44_02254840
+#include "global.h"
+extern void MOD44_02254840(void);
+#include "sinit.h"
diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s
index 159d2c30..56a71aff 100644
--- a/arm9/modules/47/asm/module_47.s
+++ b/arm9/modules/47/asm/module_47.s
@@ -1504,11 +1504,3 @@ _0225539C: .word 0x022553F0
.byte 0x35, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x81, 0x50, 0x25, 0x02
.byte 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xD9, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
- ; .section .sinit
- .global SDK_OVERLAY.MODULE_47.SINIT_START
- .global SDK_OVERLAY.MODULE_47.SINIT_END
-SDK_OVERLAY.MODULE_47.SINIT_START:
- .word MOD47_02254840
- .word 0
-SDK_OVERLAY.MODULE_47.SINIT_END:
diff --git a/arm9/modules/47/src/module_47_sinit.c b/arm9/modules/47/src/module_47_sinit.c
new file mode 100644
index 00000000..f8e3041a
--- /dev/null
+++ b/arm9/modules/47/src/module_47_sinit.c
@@ -0,0 +1,4 @@
+#define NitroStaticInit MOD47_02254840
+#include "global.h"
+extern void MOD47_02254840(void);
+#include "sinit.h"