Modules 28-33 static initializers

6 files changed, 54 insertions, 10 deletions

diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s
index 0ad10077..e1a1d741 100644
--- a/arm9/modules/28/asm/module_28.s
+++ b/arm9/modules/28/asm/module_28.s
@@ -2963,5 +2963,19 @@ _02255E6E:
 	nop
 _02255E74: .word 0x00000163
 	thumb_func_end MOD28_02255920
+
+	.section .rodata
 	; 0x02255E78
-	.incbin "baserom.nds", 0x28C038, 0x148
+	.incbin "baserom.nds", 0x28C038, 0xa0
+
+	; .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
+	.incbin "baserom.nds", 0x28C0E0, 0xa0
diff --git a/arm9/modules/29/asm/module_29.s b/arm9/modules/29/asm/module_29.s
index 818f41aa..db3f5ab8 100644
--- a/arm9/modules/29/asm/module_29.s
+++ b/arm9/modules/29/asm/module_29.s
@@ -1121,6 +1121,14 @@ MOD29_0225508C: ; 0x0225508C
 	.align 2, 0
 	thumb_func_end MOD29_0225508C
 
-	.section .data
+	.section .rodata
 	; 0x0225509C
-	.incbin "baserom.nds", 0x28CA5C, 0xA4
+	.incbin "baserom.nds", 0x28CA5C, 0x90
+
+	; .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/30/asm/module_30.s b/arm9/modules/30/asm/module_30.s
index 36581e76..924f7ad0 100644
--- a/arm9/modules/30/asm/module_30.s
+++ b/arm9/modules/30/asm/module_30.s
@@ -731,4 +731,12 @@ _02254D9C: .word 0x040002A8
 
 	.section .data
 	; 0x02254DA0
-	.incbin "baserom.nds", 0x28D160, 0xA0
+	.incbin "baserom.nds", 0x28D160, 0x88
+
+	; .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/31/asm/module_31.s b/arm9/modules/31/asm/module_31.s
index cdf3282a..e9c70424 100644
--- a/arm9/modules/31/asm/module_31.s
+++ b/arm9/modules/31/asm/module_31.s
@@ -719,6 +719,9 @@ _02254D90: .word 0x040002A0
 _02254D94: .word 0x040002A8
 	thumb_func_end MOD31_02254D1C
 
-	.section .data
+	.section .rodata
 	; 0x02254D98
-	.incbin "baserom.nds", 0x28D758, 0xA8
+	.incbin "baserom.nds", 0x28D758, 0x88
+
+	.section .sinit
+	.word MOD31_02254840
diff --git a/arm9/modules/32/asm/module_32.s b/arm9/modules/32/asm/module_32.s
index 135a9b15..299432f1 100644
--- a/arm9/modules/32/asm/module_32.s
+++ b/arm9/modules/32/asm/module_32.s
@@ -571,6 +571,14 @@ _02254C48:
 _02254C50: .word 0x00000663
 	thumb_func_end MOD32_02254C08
 
-	.section .data
+	.section .rodata
 	; 0x02254C54
-	.incbin "baserom.nds", 0x28DC14, 0x8C
+	.incbin "baserom.nds", 0x28DC14, 0x70
+
+	; .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/33/asm/module_33.s b/arm9/modules/33/asm/module_33.s
index d1b6ad49..67ec554d 100644
--- a/arm9/modules/33/asm/module_33.s
+++ b/arm9/modules/33/asm/module_33.s
@@ -391,6 +391,9 @@ MOD33_02254AD8: ; 0x02254AD8
 	.align 2, 0
 	thumb_func_end MOD33_02254AD8
 
-	.section .data
+	.section .rodata
 	; 0x02254AF4
-	.incbin "baserom.nds", 0x28E0B4, 0x6C
+	.incbin "baserom.nds", 0x28E0B4, 0x4C
+
+	.section .sinit
+	.word MOD33_02254840