diff options
| -rw-r--r-- | arm9/arm9.lcf | 100 | ||||
| -rw-r--r-- | arm9/modules/14/asm/module_14.s | 8 | ||||
| -rw-r--r-- | arm9/modules/15/asm/module_15.s | 4 | ||||
| -rw-r--r-- | arm9/modules/16/asm/module_16.s | 4 | ||||
| -rw-r--r-- | arm9/modules/17/asm/module_17.s | 4 | ||||
| -rw-r--r-- | arm9/modules/18/asm/module_18.s | 8 |
6 files changed, 113 insertions, 15 deletions
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf index 94b1a386..6e40a693 100644 --- a/arm9/arm9.lcf +++ b/arm9/arm9.lcf @@ -871,8 +871,17 @@ SECTIONS { ALIGNALL(4); . = ALIGN(32); SDK_OVERLAY.MODULE_14.START = .; module_14.o (.text) + module_14.o (.rodata) + module_14.o (.init) + SDK_OVERLAY.MODULE_14.SINIT_START = .; + module_14.o (.ctor) + module_14.o (.sinit) + WRITEW 0; + SDK_OVERLAY.MODULE_14.SINIT_END = .; + . = ALIGN(32); module_14.o (.sdata) module_14.o (.data) + . = ALIGN(32); SDK_OVERLAY.MODULE_14.END = .; SDK_OVERLAY.MODULE_14.SIZE = SDK_OVERLAY.MODULE_14.END - SDK_OVERLAY.MODULE_14.START; } > MODULE_14 @@ -883,6 +892,7 @@ SECTIONS { SDK_OVERLAY.MODULE_14.BSS_START = .; module_14.o (.sbss) module_14.o (.bss) + . = ALIGN(32); SDK_OVERLAY.MODULE_14.BSS_END = .; SDK_OVERLAY.MODULE_14.BSS_SIZE = SDK_OVERLAY.MODULE_14.BSS_END - SDK_OVERLAY.MODULE_14.BSS_START; } >> MODULE_14 @@ -892,8 +902,17 @@ SECTIONS { ALIGNALL(4); . = ALIGN(32); SDK_OVERLAY.MODULE_15.START = .; module_15.o (.text) + module_15.o (.rodata) + module_15.o (.init) + SDK_OVERLAY.MODULE_15.SINIT_START = .; + module_15.o (.ctor) + module_15.o (.sinit) + WRITEW 0; + SDK_OVERLAY.MODULE_15.SINIT_END = .; + . = ALIGN(32); module_15.o (.sdata) module_15.o (.data) + . = ALIGN(32); SDK_OVERLAY.MODULE_15.END = .; SDK_OVERLAY.MODULE_15.SIZE = SDK_OVERLAY.MODULE_15.END - SDK_OVERLAY.MODULE_15.START; } > MODULE_15 @@ -904,6 +923,7 @@ SECTIONS { SDK_OVERLAY.MODULE_15.BSS_START = .; module_15.o (.sbss) module_15.o (.bss) + . = ALIGN(32); SDK_OVERLAY.MODULE_15.BSS_END = .; SDK_OVERLAY.MODULE_15.BSS_SIZE = SDK_OVERLAY.MODULE_15.BSS_END - SDK_OVERLAY.MODULE_15.BSS_START; } >> MODULE_15 @@ -913,8 +933,17 @@ SECTIONS { ALIGNALL(4); . = ALIGN(32); SDK_OVERLAY.MODULE_16.START = .; module_16.o (.text) + module_16.o (.rodata) + module_16.o (.init) + SDK_OVERLAY.MODULE_16.SINIT_START = .; + module_16.o (.ctor) + module_16.o (.sinit) + WRITEW 0; + SDK_OVERLAY.MODULE_16.SINIT_END = .; + . = ALIGN(32); module_16.o (.sdata) module_16.o (.data) + . = ALIGN(32); SDK_OVERLAY.MODULE_16.END = .; SDK_OVERLAY.MODULE_16.SIZE = SDK_OVERLAY.MODULE_16.END - SDK_OVERLAY.MODULE_16.START; } > MODULE_16 @@ -925,6 +954,7 @@ SECTIONS { SDK_OVERLAY.MODULE_16.BSS_START = .; module_16.o (.sbss) module_16.o (.bss) + . = ALIGN(32); SDK_OVERLAY.MODULE_16.BSS_END = .; SDK_OVERLAY.MODULE_16.BSS_SIZE = SDK_OVERLAY.MODULE_16.BSS_END - SDK_OVERLAY.MODULE_16.BSS_START; } >> MODULE_16 @@ -934,8 +964,17 @@ SECTIONS { ALIGNALL(4); . = ALIGN(32); SDK_OVERLAY.MODULE_17.START = .; module_17.o (.text) + module_17.o (.rodata) + module_17.o (.init) + SDK_OVERLAY.MODULE_17.SINIT_START = .; + module_17.o (.ctor) + module_17.o (.init) + WRITEW 0; + SDK_OVERLAY.MODULE_17.SINIT_END = .; + . = ALIGN(32); module_17.o (.sdata) module_17.o (.data) + . = ALIGN(32); SDK_OVERLAY.MODULE_17.END = .; SDK_OVERLAY.MODULE_17.SIZE = SDK_OVERLAY.MODULE_17.END - SDK_OVERLAY.MODULE_17.START; } > MODULE_17 @@ -946,6 +985,7 @@ SECTIONS { SDK_OVERLAY.MODULE_17.BSS_START = .; module_17.o (.sbss) module_17.o (.bss) + . = ALIGN(32); SDK_OVERLAY.MODULE_17.BSS_END = .; SDK_OVERLAY.MODULE_17.BSS_SIZE = SDK_OVERLAY.MODULE_17.BSS_END - SDK_OVERLAY.MODULE_17.BSS_START; } >> MODULE_17 @@ -955,8 +995,17 @@ SECTIONS { ALIGNALL(4); . = ALIGN(32); SDK_OVERLAY.MODULE_18.START = .; module_18.o (.text) + module_18.o (.rodata) + module_18.o (.init) + SDK_OVERLAY.MODULE_18.SINIT_START = .; + module_18.o (.ctor) + module_18.o (.sinit) + WRITEW 0; + SDK_OVERLAY.MODULE_18.SINIT_END = .; + . = ALIGN(32); module_18.o (.sdata) module_18.o (.data) + . = ALIGN(32); SDK_OVERLAY.MODULE_18.END = .; SDK_OVERLAY.MODULE_18.SIZE = SDK_OVERLAY.MODULE_18.END - SDK_OVERLAY.MODULE_18.START; } > MODULE_18 @@ -967,6 +1016,7 @@ SECTIONS { SDK_OVERLAY.MODULE_18.BSS_START = .; module_18.o (.sbss) module_18.o (.bss) + . = ALIGN(32); SDK_OVERLAY.MODULE_18.BSS_END = .; SDK_OVERLAY.MODULE_18.BSS_SIZE = SDK_OVERLAY.MODULE_18.BSS_END - SDK_OVERLAY.MODULE_18.BSS_START; } >> MODULE_18 @@ -2541,11 +2591,51 @@ SECTIONS { WRITEW SDK_OVERLAY_MODULE_13_ID; WRITEW 0; - OVERLAY_TABLE(MODULE_14, 14) - OVERLAY_TABLE(MODULE_15, 15) - OVERLAY_TABLE(MODULE_16, 16) - OVERLAY_TABLE(MODULE_17, 17) - OVERLAY_TABLE(MODULE_18, 18) + WRITEW SDK_OVERLAY_MODULE_14_ID; + WRITEW SDK_OVERLAY.MODULE_14.START; + WRITEW SDK_OVERLAY.MODULE_14.SIZE; + WRITEW SDK_OVERLAY.MODULE_14.BSS_SIZE; + WRITEW SDK_OVERLAY.MODULE_14.SINIT_START; + WRITEW SDK_OVERLAY.MODULE_14.SINIT_END; + WRITEW SDK_OVERLAY_MODULE_14_ID; + WRITEW 0; + + WRITEW SDK_OVERLAY_MODULE_15_ID; + WRITEW SDK_OVERLAY.MODULE_15.START; + WRITEW SDK_OVERLAY.MODULE_15.SIZE; + WRITEW SDK_OVERLAY.MODULE_15.BSS_SIZE; + WRITEW SDK_OVERLAY.MODULE_15.SINIT_START; + WRITEW SDK_OVERLAY.MODULE_15.SINIT_END; + WRITEW SDK_OVERLAY_MODULE_15_ID; + WRITEW 0; + + WRITEW SDK_OVERLAY_MODULE_16_ID; + WRITEW SDK_OVERLAY.MODULE_16.START; + WRITEW SDK_OVERLAY.MODULE_16.SIZE; + WRITEW SDK_OVERLAY.MODULE_16.BSS_SIZE; + WRITEW SDK_OVERLAY.MODULE_16.SINIT_START; + WRITEW SDK_OVERLAY.MODULE_16.SINIT_END; + WRITEW SDK_OVERLAY_MODULE_16_ID; + WRITEW 0; + + WRITEW SDK_OVERLAY_MODULE_17_ID; + WRITEW SDK_OVERLAY.MODULE_17.START; + WRITEW SDK_OVERLAY.MODULE_17.SIZE; + WRITEW SDK_OVERLAY.MODULE_17.BSS_SIZE; + WRITEW SDK_OVERLAY.MODULE_17.SINIT_START; + WRITEW SDK_OVERLAY.MODULE_17.SINIT_END; + WRITEW SDK_OVERLAY_MODULE_17_ID; + WRITEW 0; + + WRITEW SDK_OVERLAY_MODULE_18_ID; + WRITEW SDK_OVERLAY.MODULE_18.START; + WRITEW SDK_OVERLAY.MODULE_18.SIZE; + WRITEW SDK_OVERLAY.MODULE_18.BSS_SIZE; + WRITEW SDK_OVERLAY.MODULE_18.SINIT_START; + WRITEW SDK_OVERLAY.MODULE_18.SINIT_END; + WRITEW SDK_OVERLAY_MODULE_18_ID; + WRITEW 0; + OVERLAY_TABLE(MODULE_19, 19) OVERLAY_TABLE(MODULE_20, 20) OVERLAY_TABLE(MODULE_21, 21) diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 42e1c73b..1ace4733 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -30394,9 +30394,13 @@ MOD14_021E6220: ; 0x021E6220 ldr r0, [r0, #0x74] bx lr - .section .data + .section .rodata ; 0x021E6224 - .incbin "baserom.nds", 0x236b44, 0x7dc + .incbin "baserom.nds", 0x236b44, 0x7a4 + + .section .data + ; 0x021E69E0 + .incbin "baserom.nds", 0x237300, 0x1C .section .bss ; 0x021E69FC diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index bd9eb99a..8659bfeb 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -8748,6 +8748,6 @@ _021DB85C: .align 2, 0
_021DB868: .word 0x021DBA55
- .section .data
+ .section .rodata
; 0x021DB86C
- .incbin "baserom.nds", 0x23B78C, 0x2F4
+ .incbin "baserom.nds", 0x23B78C, 0x2F0
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 7d62c0f0..551ab8e1 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -63320,6 +63320,6 @@ _021F4E2C: .word 0x000003D1 _021F4E30: .word 0x000003D6 thumb_func_end MOD16_021F4A40 - .section .data + .section .rodata ; 0x021F4E34 - .incbin "baserom.nds", 0x259554, 0xABAC + .incbin "baserom.nds", 0x259554, 0xAB90 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 884302f2..b839403b 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -14601,6 +14601,6 @@ _021DE24C: .word 0x00000151 _021DE250: .word 0x00010200 thumb_func_end MOD17_021DE0F4 - .section .data + .section .rodata ; 0x021DE254 - .incbin "baserom.nds", 0x26AF74, 0x10C + .incbin "baserom.nds", 0x26AF74, 0x100 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 767c2f6c..e73fc56e 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -46251,9 +46251,13 @@ _0224FFDC: .word 0x02250834 _0224FFE0: .word 0x022507F0 thumb_func_end MOD18_0224FFA0 - .section .data + .section .rodata ; 0x0224FFE4 - .incbin "baserom.nds", 0x281B44, 0x139C + .incbin "baserom.nds", 0x281B44, 0x874 + + .section .data + ; 0x02250860 + .incbin "baserom.nds", 0x2823C0, 0xB20 .section .bss ; 0x02251380 |