diff options
| -rw-r--r-- | arm9/arm9.lcf | 40 | ||||
| -rw-r--r-- | arm9/modules/06/asm/module_06.s | 8 | ||||
| -rw-r--r-- | arm9/modules/07/asm/module_07.s | 4 | ||||
| -rw-r--r-- | arm9/modules/08/asm/module_08.s | 7 | ||||
| -rw-r--r-- | arm9/modules/09/asm/module_09.s | 4 |
5 files changed, 55 insertions, 8 deletions
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf index 1bcc9243..14232c74 100644 --- a/arm9/arm9.lcf +++ b/arm9/arm9.lcf @@ -597,8 +597,17 @@ SECTIONS { ALIGNALL(4); . = ALIGN(32); SDK_OVERLAY.MODULE_06.START = .; module_06.o (.text) + module_06.o (.rodata) + module_06.o (.init) + SDK_OVERLAY.MODULE_06.SINIT_START = .; + module_06.o (.ctor) + module_06.o (.sinit) + WRITEW 0; + SDK_OVERLAY.MODULE_06.SINIT_END = .; + . = ALIGN(32); module_06.o (.sdata) module_06.o (.data) + . = ALIGN(32); SDK_OVERLAY.MODULE_06.END = .; SDK_OVERLAY.MODULE_06.SIZE = SDK_OVERLAY.MODULE_06.END - SDK_OVERLAY.MODULE_06.START; } > MODULE_06 @@ -608,6 +617,7 @@ SECTIONS { SDK_OVERLAY.MODULE_06.BSS_START = .; module_06.o (.sbss) module_06.o (.bss) + . = ALIGN(32); SDK_OVERLAY.MODULE_06.BSS_END = .; SDK_OVERLAY.MODULE_06.BSS_SIZE = SDK_OVERLAY.MODULE_06.BSS_END - SDK_OVERLAY.MODULE_06.BSS_START; } >> MODULE_06 @@ -617,8 +627,17 @@ SECTIONS { ALIGNALL(4); . = ALIGN(32); SDK_OVERLAY.MODULE_07.START = .; module_07.o (.text) + module_07.o (.rodata) + module_07.o (.init) + SDK_OVERLAY.MODULE_07.SINIT_START = .; + module_07.o (.ctor) + module_07.o (.sinit) + WRITEW 0; + SDK_OVERLAY.MODULE_07.SINIT_END = .; + . = ALIGN(32); module_07.o (.sdata) module_07.o (.data) + . = ALIGN(32); SDK_OVERLAY.MODULE_07.END = .; SDK_OVERLAY.MODULE_07.SIZE = SDK_OVERLAY.MODULE_07.END - SDK_OVERLAY.MODULE_07.START; } > MODULE_07 @@ -629,6 +648,7 @@ SECTIONS { SDK_OVERLAY.MODULE_07.BSS_START = .; module_07.o (.sbss) module_07.o (.bss) + . = ALIGN(32); SDK_OVERLAY.MODULE_07.BSS_END = .; SDK_OVERLAY.MODULE_07.BSS_SIZE = SDK_OVERLAY.MODULE_07.BSS_END - SDK_OVERLAY.MODULE_07.BSS_START; } >> MODULE_07 @@ -638,8 +658,17 @@ SECTIONS { ALIGNALL(4); . = ALIGN(32); SDK_OVERLAY.MODULE_08.START = .; module_08.o (.text) + module_08.o (.rodata) + module_08.o (.init) + SDK_OVERLAY.MODULE_08.SINIT_START = .; + module_08.o (.ctor) + module_08.o (.sinit) + WRITEW 0; + SDK_OVERLAY.MODULE_08.SINIT_END = .; + . = ALIGN(32); module_08.o (.sdata) module_08.o (.data) + . = ALIGN(32); SDK_OVERLAY.MODULE_08.END = .; SDK_OVERLAY.MODULE_08.SIZE = SDK_OVERLAY.MODULE_08.END - SDK_OVERLAY.MODULE_08.START; } > MODULE_08 @@ -650,6 +679,7 @@ SECTIONS { SDK_OVERLAY.MODULE_08.BSS_START = .; module_08.o (.sbss) module_08.o (.bss) + . = ALIGN(32); SDK_OVERLAY.MODULE_08.BSS_END = .; SDK_OVERLAY.MODULE_08.BSS_SIZE = SDK_OVERLAY.MODULE_08.BSS_END - SDK_OVERLAY.MODULE_08.BSS_START; } >> MODULE_08 @@ -659,8 +689,17 @@ SECTIONS { ALIGNALL(4); . = ALIGN(32); SDK_OVERLAY.MODULE_09.START = .; module_09.o (.text) + module_09.o (.rodata) + module_09.o (.init) + SDK_OVERLAY.MODULE_09.SINIT_START = .; + module_09.o (.ctor) + module_09.o (.sinit) + WRITEW 0; + SDK_OVERLAY.MODULE_09.SINIT_END = .; + . = ALIGN(32); module_09.o (.sdata) module_09.o (.data) + . = ALIGN(32); SDK_OVERLAY.MODULE_09.END = .; SDK_OVERLAY.MODULE_09.SIZE = SDK_OVERLAY.MODULE_09.END - SDK_OVERLAY.MODULE_09.START; } > MODULE_09 @@ -671,6 +710,7 @@ SECTIONS { SDK_OVERLAY.MODULE_09.BSS_START = .; module_09.o (.sbss) module_09.o (.bss) + . = ALIGN(32); SDK_OVERLAY.MODULE_09.BSS_END = .; SDK_OVERLAY.MODULE_09.BSS_SIZE = SDK_OVERLAY.MODULE_09.BSS_END - SDK_OVERLAY.MODULE_09.BSS_START; } >> MODULE_09 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index ac7d6b48..a12da563 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -44468,9 +44468,13 @@ _0224F144: _0224F16C: .word 0x02252210 _0224F170: .word MOD06_0224F0D8 - .section .data + .section .rodata ; 0x0224F174 - .incbin "baserom.nds", 0x1810D4, 0x32AC + .incbin "baserom.nds", 0x1810D4, 0x30B4 + + .section .data + ; 0x022252240 + .incbin "baserom.nds", 0x1841a0, 0x1e0 .section .bss ; 0x02252420 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 39869410..0afcff05 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -5270,6 +5270,6 @@ _0221494A: pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 - .section .data + .section .rodata ; 0x02214950 - .incbin "baserom.nds", 0x186EF0, 0x7F0 + .incbin "baserom.nds", 0x186EF0, 0x7E4 diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index 50ed884f..f1281f99 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -49976,6 +49976,9 @@ _0222A758: .align 2, 0
_0222A75C: .word 0x0000013B
- .section .data
+ .section .rodata
; 0x0222A760
- .incbin "baserom.nds", 0x1A0100, 0x2E60
+ .incbin "baserom.nds", 0x1A0100, 0x2E38
+
+ .section .data
+ .incbin "baserom.nds", 0x1A2F40, 0x20
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index 7e5ad9c1..efa63611 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -17658,6 +17658,6 @@ _0221AEBC: .word 0x021C48B8 _0221AEC0: .word 0x000005DC
_0221AEC4: .word 0x000005DD
- .section .data
+ .section .rodata
; 0x0221AEC8
- .incbin "baserom.nds", 0x1AC068, 0x1138
+ .incbin "baserom.nds", 0x1AC068, 0x1120
|