diff options
| -rw-r--r-- | arm9/arm9.lcf | 31 | ||||
| -rw-r--r-- | arm9/modules/12/asm/module_12.s | 9 | ||||
| -rw-r--r-- | arm9/modules/13/asm/module_13_arm1.s | 12 | ||||
| -rw-r--r-- | arm9/modules/13/asm/module_13_arm2.s | 10 | ||||
| -rw-r--r-- | arm9/modules/13/asm/module_13_thumb.s | 12 |
5 files changed, 68 insertions, 6 deletions
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf index 14232c74..3b6dd691 100644 --- a/arm9/arm9.lcf +++ b/arm9/arm9.lcf @@ -782,8 +782,17 @@ SECTIONS { ALIGNALL(4); . = ALIGN(32); SDK_OVERLAY.MODULE_12.START = .; module_12.o (.text) + module_12.o (.rodata) + module_12.o (.init) + SDK_OVERLAY.MODULE_12.SINIT_START = .; + module_12.o (.ctor) + module_12.o (.sinit) + WRITEW 0; + SDK_OVERLAY.MODULE_12.SINIT_END = .; + . = ALIGN(32); module_12.o (.sdata) module_12.o (.data) + . = ALIGN(32); SDK_OVERLAY.MODULE_12.END = .; SDK_OVERLAY.MODULE_12.SIZE = SDK_OVERLAY.MODULE_12.END - SDK_OVERLAY.MODULE_12.START; } > MODULE_12 @@ -794,6 +803,7 @@ SECTIONS { SDK_OVERLAY.MODULE_12.BSS_START = .; module_12.o (.sbss) module_12.o (.bss) + . = ALIGN(32); SDK_OVERLAY.MODULE_12.BSS_END = .; SDK_OVERLAY.MODULE_12.BSS_SIZE = SDK_OVERLAY.MODULE_12.BSS_END - SDK_OVERLAY.MODULE_12.BSS_START; } >> MODULE_12 @@ -806,6 +816,25 @@ SECTIONS { module_13_arm1.o (.text) module_13_thumb.o (.text) module_13_arm2.o (.text) + module_13_init.o (.rodata) + module_13_arm1.o (.rodata) + module_13_thumb.o (.rodata) + module_13_arm2.o (.rodata) + module_13_init.o (.init) + module_13_arm1.o (.init) + module_13_thumb.o (.init) + module_13_arm2.o (.init) + SDK_OVERLAY.MODULE_13.SINIT_START = .; + module_13_init.o (.ctor) + module_13_arm1.o (.ctor) + module_13_thumb.o (.ctor) + module_13_arm2.o (.ctor) + module_13_init.o (.sinit) + module_13_arm1.o (.sinit) + module_13_thumb.o (.sinit) + module_13_arm2.o (.sinit) + SDK_OVERLAY.MODULE_13.SINIT_END = .; + . = ALIGN(32); module_13_init.o (.sdata) module_13_arm1.o (.sdata) module_13_thumb.o (.sdata) @@ -814,6 +843,7 @@ SECTIONS { module_13_arm1.o (.data) module_13_thumb.o (.data) module_13_arm2.o (.data) + . = ALIGN(32); SDK_OVERLAY.MODULE_13.END = .; SDK_OVERLAY.MODULE_13.SIZE = SDK_OVERLAY.MODULE_13.END - SDK_OVERLAY.MODULE_13.START; } > MODULE_13 @@ -830,6 +860,7 @@ SECTIONS { module_13_arm1.o (.bss) module_13_thumb.o (.bss) module_13_arm2.o (.bss) + . = ALIGN(32); SDK_OVERLAY.MODULE_13.BSS_END = .; SDK_OVERLAY.MODULE_13.BSS_SIZE = SDK_OVERLAY.MODULE_13.BSS_END - SDK_OVERLAY.MODULE_13.BSS_START; } >> MODULE_13 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 36381bcf..b2e41348 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -7445,7 +7445,7 @@ _022312B4: .word 0x00001158 _022312B8: .word 0x00000127 thumb_func_start MOD12_022312BC -MOD12_022312BC: ; 0x022312BC +MOD12_022312BC: ; 0x022312BC __sinit push {r3, lr} ldr r0, _022312D0 ; =SDK_OVERLAY_MODULE_08_ID mov r1, #2 @@ -48103,6 +48103,9 @@ _0224496A: _02244988: pop {r4, r5, r6, pc} - .section .data + .section .rodata ; 0x0224498C - .incbin "baserom.nds", 0x1F71CC, 0x1E94 + .incbin "baserom.nds", 0x1F71CC, 0x1E84 + + .section .sinit + .word MOD12_022312BC diff --git a/arm9/modules/13/asm/module_13_arm1.s b/arm9/modules/13/asm/module_13_arm1.s index edb71ead..ffde9a27 100644 --- a/arm9/modules/13/asm/module_13_arm1.s +++ b/arm9/modules/13/asm/module_13_arm1.s @@ -6049,3 +6049,15 @@ MOD13_022172A0: ; 0x022172A0 bx lr .align 2, 0 _022172D8: .word 0x02240B28 + + .section .rodata + ; 0x0223C420 + .incbin "baserom.nds", 0x2237C0, 0x24 + + .section .data + ; 0x0223F780 + .incbin "baserom.nds", 0x226B20, 0x38 + + .section .bss + ; 0x02240A40 + .space 0xF4 diff --git a/arm9/modules/13/asm/module_13_arm2.s b/arm9/modules/13/asm/module_13_arm2.s index 7910e1a0..2e9dd8b5 100644 --- a/arm9/modules/13/asm/module_13_arm2.s +++ b/arm9/modules/13/asm/module_13_arm2.s @@ -35364,10 +35364,14 @@ _0223C330: _0223C418: .word 0x0224320C _0223C41C: .word 0x0223F764 + .section .rodata + ; 0x0223EC6C + .incbin "baserom.nds", 0x22600C, 0xafc + .section .data ; 0x0223C420 - .incbin "baserom.nds", 0x2237C0, 0x4620 + .incbin "baserom.nds", 0x226CD4, 0x110C .section .bss - ; 0x02240A40 - .space 0x27E0 + ; 0x02242FE4 + .space 0x23C diff --git a/arm9/modules/13/asm/module_13_thumb.s b/arm9/modules/13/asm/module_13_thumb.s index b180ff6b..c231800c 100644 --- a/arm9/modules/13/asm/module_13_thumb.s +++ b/arm9/modules/13/asm/module_13_thumb.s @@ -14777,3 +14777,15 @@ _0221E556: bx r3 .align 2, 0 _0221E55C: .word 0x02241B30 + + .section .rodata + ; 0x0223C444 + .incbin "baserom.nds", 0x2237e4, 0x2828 + + .section .data + ; 0x0223F7B8 + .incbin "baserom.nds", 0x226B58, 0x17C + + .section .bss + ; 0x02240B34 + .space 0x24B0 |