static init for modules 19-27

9 files changed, 55 insertions, 18 deletions

diff --git a/arm9/modules/19/asm/module_19.s b/arm9/modules/19/asm/module_19.s
index 76dad3e4..52c045cc 100644
--- a/arm9/modules/19/asm/module_19.s
+++ b/arm9/modules/19/asm/module_19.s
@@ -101,6 +101,6 @@ MOD19_02252504: ; 0x02252504
 	bx lr
 	thumb_func_end MOD19_02252504
 
-	.section .data
+	.section .rodata
 	; 0x02252508
-	.incbin "baserom.nds", 0x2830C8, 0x38
+	.incbin "baserom.nds", 0x2830C8, 0x1c
diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s
index afe8646c..1c3ba821 100644
--- a/arm9/modules/20/asm/module_20.s
+++ b/arm9/modules/20/asm/module_20.s
@@ -4565,6 +4565,6 @@ _022544BC: .word 0x022547C4
 _022544C0: .word 0x022547C5
 	thumb_func_end MOD20_02254488
 
-	.section .data
+	.section .rodata
 	; 0x022544C4
-	.incbin "baserom.nds", 0x285284, 0x37C
+	.incbin "baserom.nds", 0x285284, 0x374
diff --git a/arm9/modules/21/asm/module_21.s b/arm9/modules/21/asm/module_21.s
index cea8f6e8..0c30eb9a 100644
--- a/arm9/modules/21/asm/module_21.s
+++ b/arm9/modules/21/asm/module_21.s
@@ -721,6 +721,15 @@ _02254D78: .word 0x040002A0
 _02254D7C: .word 0x040002A8
 	thumb_func_end MOD21_02254C5C
 
-	.section .data
+	.section .rodata
 	; 0x02254D80
-	.incbin "baserom.nds", 0x285B40, 0x80
+	.incbin "baserom.nds", 0x285B40, 0x68
+
+	; 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/22/asm/module_22.s b/arm9/modules/22/asm/module_22.s
index 77e6bff4..610d0a55 100644
--- a/arm9/modules/22/asm/module_22.s
+++ b/arm9/modules/22/asm/module_22.s
@@ -1840,6 +1840,9 @@ _02255604:
 	.align 2, 0
 	thumb_func_end MOD22_022555FC
 
-	.section .data
+	.section .rodata
 	; 0x02255618
-	.incbin "baserom.nds", 0x2869D8, 0x128
+	.incbin "baserom.nds", 0x2869D8, 0x118
+
+	.section .sinit
+	.word MOD22_02254840
diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s
index 6688578e..a5adabbb 100644
--- a/arm9/modules/23/asm/module_23.s
+++ b/arm9/modules/23/asm/module_23.s
@@ -2789,6 +2789,14 @@ _02255C96:
 _02255CB8: .word 0x022560D0
 	thumb_func_end MOD23_02255C6C
 
-	.section .data
+	.section .rodata
 	; 0x02255CBC
-	.incbin "baserom.nds", 0x28807C, 0x484
+	.incbin "baserom.nds", 0x28807C, 0x46C
+
+	; .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/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s
index e3b9a327..ba2c3f32 100644
--- a/arm9/modules/24/asm/module_24.s
+++ b/arm9/modules/24/asm/module_24.s
@@ -1179,6 +1179,9 @@ _022550DC:
 	.align 2, 0
 	thumb_func_end MOD24_022550D4
 
-	.section .data
+	.section .rodata
 	; 0x022550F8
-	.incbin "baserom.nds", 0x288EB8, 0xE8
+	.incbin "baserom.nds", 0x288EB8, 0xC8
+
+	.section .sinit
+	.word MOD24_02254840
diff --git a/arm9/modules/25/asm/module_25.s b/arm9/modules/25/asm/module_25.s
index 6df522da..e1d7b555 100644
--- a/arm9/modules/25/asm/module_25.s
+++ b/arm9/modules/25/asm/module_25.s
@@ -658,6 +658,9 @@ _02254CE6:
 	pop {r4, r5, r6, pc}
 	thumb_func_end MOD25_02254CD8
 
-	.section .data
+	.section .rodata
 	; 0x02254CF8
-	.incbin "baserom.nds", 0x2894B8, 0xA8
+	.incbin "baserom.nds", 0x2894B8, 0x88
+
+	.section .sinit
+	.word MOD25_02254840
diff --git a/arm9/modules/26/asm/module_26.s b/arm9/modules/26/asm/module_26.s
index 2511101e..0b8d99df 100644
--- a/arm9/modules/26/asm/module_26.s
+++ b/arm9/modules/26/asm/module_26.s
@@ -788,6 +788,9 @@ _02254DC2:
 _02254DE0: .word 0x02254FD0
 	thumb_func_end MOD26_02254DAC
 
-	.section .data
+	.section .rodata
 	; 0x02254DE4
-	.incbin "baserom.nds", 0x289BA4, 0x25C
+	.incbin "baserom.nds", 0x289BA4, 0x23C
+
+	.section .sinit
+	.word MOD26_02254840
diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index b9a2d1ca..13a97851 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -1448,6 +1448,14 @@ MOD27_022552D0: ; 0x022552D0
 _02255338: .word 0x00000669
 	thumb_func_end MOD27_022552D0
 
-	.section .data
+	.section .rodata
 	; 0x0225533C
-	.incbin "baserom.nds", 0x28A8FC, 0xA4
+	.incbin "baserom.nds", 0x28A8FC, 0x88
+
+	; .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: