diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-08 10:10:10 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-08 10:10:10 -0400 |
| commit | 22d325d76a279da3a45e8bd0748a9450d5688456 (patch) | |
| tree | 43ab27a5fc8e4ee930434f48e971931e8ff3c245 | |
| parent | 26fe22ac52dd917361afb8ce58baf336bbb414f9 (diff) | |
Actual static text/data boundary
| -rw-r--r-- | arm9/arm9.lcf | 7 | ||||
| -rw-r--r-- | arm9/asm/libmwcc.s | 9 | ||||
| -rw-r--r-- | arm9/data/rom2_3.s | 7 |
3 files changed, 17 insertions, 6 deletions
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf index 4f2e0bd1..3aeb3859 100644 --- a/arm9/arm9.lcf +++ b/arm9/arm9.lcf @@ -234,8 +234,11 @@ SECTIONS { FS_file.o (.rodata) FS_rom.o (.rodata) FS_overlay.o (.rodata) - /* . = ALIGN(32); */ - SDK_STATIC_TEXT_END = .; /* somewhere around here */ + rom2_3.o (.rodata) + libmwcc.o (.rodata) + . = ALIGN(32); + SDK_STATIC_TEXT_END = .; + SDK_STATIC_DATA_START = .; rom2_3.o (.data) FS_command.o (.data) diff --git a/arm9/asm/libmwcc.s b/arm9/asm/libmwcc.s index fcabec42..259abf50 100644 --- a/arm9/asm/libmwcc.s +++ b/arm9/asm/libmwcc.s @@ -3100,10 +3100,15 @@ __close_console: ; 0x020EC68C mov r0, #0x0 bx lr + .section .rodata +__static_initializers: + .word 0 + + .section .text arm_func_start __call_static_initializers __call_static_initializers: ; 0x020EC694 stmdb sp!, {r4,lr} - ldr r4, _020EC6BC ; =0x02104774 + ldr r4, _020EC6BC ; =__static_initializers b _020EC6A8 _020EC6A0: blx r0 @@ -3115,7 +3120,7 @@ _020EC6A8: bne _020EC6A0 ldmia sp!, {r4,pc} .balign 4 -_020EC6BC: .word 0x02104774 +_020EC6BC: .word __static_initializers arm_func_start __destroy_global_chain __destroy_global_chain: ; 0x020EC6C0 diff --git a/arm9/data/rom2_3.s b/arm9/data/rom2_3.s index 95e5aaa9..68eb6073 100644 --- a/arm9/data/rom2_3.s +++ b/arm9/data/rom2_3.s @@ -3,7 +3,10 @@ /* rom2.s TODO: Disassemble */ - .section .data + .section .rodata /* 0x02103FE4 */ - .incbin "baserom.nds", 0x107FE4, 0x2848
\ No newline at end of file + .incbin "baserom.nds", 0x107FE4, 0x790 + + .section .data + .incbin "baserom.nds", 0x108780, 0x20ac
\ No newline at end of file |