diff options
| author | Cameron Hall <cameronghall@cox.net> | 2019-08-04 11:51:23 -0500 |
|---|---|---|
| committer | Cameron Hall <cameronghall@cox.net> | 2019-08-04 11:51:23 -0500 |
| commit | f352ab8d0db435b0ca1cde501871861088cfff71 (patch) | |
| tree | cd29e4c91040103b36800d9fbfa130ac629fbb53 | |
| parent | 9ae0e5b3ba1e9794da3cee0585a2dacb99f015be (diff) | |
migrate IWRAM symbols to ld script
| -rwxr-xr-x | asm/rom_9BC.s | 4 | ||||
| -rwxr-xr-x | ld_script.txt | 2 | ||||
| -rwxr-xr-x | sym_bss.txt | 29 | ||||
| -rw-r--r-- | undefined_iwram.txt | 11 |
4 files changed, 22 insertions, 24 deletions
diff --git a/asm/rom_9BC.s b/asm/rom_9BC.s index d351e33..12970f6 100755 --- a/asm/rom_9BC.s +++ b/asm/rom_9BC.s @@ -814,7 +814,7 @@ sub_1A78: @ 0x08001A78 ldr r3, _08001A98 @ =0x04000208 movs r0, #0 strh r0, [r3] - ldr r2, _08001A9C @ =gUnknown_03007FF8 + ldr r2, _08001A9C @ =INTR_CHECK ldrh r0, [r2] movs r1, #1 orrs r0, r1 @@ -824,7 +824,7 @@ sub_1A78: @ 0x08001A78 bx r0 .align 2, 0 _08001A98: .4byte 0x04000208 -_08001A9C: .4byte gUnknown_03007FF8 +_08001A9C: .4byte 0x03007FF8 @ INTR_CHECK thumb_func_start nullsub_15 nullsub_15: @ 0x08001AA0 diff --git a/ld_script.txt b/ld_script.txt index b347ff3..943fbc3 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -17,6 +17,7 @@ SECTIONS { /* .bss starts at 0x3000000 */ <BSS> + . = 0x7400; /* .bss.code starts at 0x3007400 */ src/m4a.o(.bss.code); @@ -74,5 +75,4 @@ SECTIONS } } -INCLUDE ../../undefined_iwram.txt INCLUDE ../../undefined_rom.txt diff --git a/sym_bss.txt b/sym_bss.txt index fc81cd3..db4a584 100755 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -1,14 +1,23 @@ -gUnknown_03000000: @ 0x3000000 - -.space 0x5000 - +gUnknown_03000000: @ 0x03000000 + .space 0x1800 +gUnknown_03001800: @ 0x03001800 + .space 0xB00 +gUnknown_03002300: @ 0x03002300 + .space 0x2D00 gOamBuffer: @ 0x3005000 .space 0x400 - IntrMain_Buffer: @ 0x3005400 .space 0x800 - -gUnknown_03005C00: @ 0x3005C00 - .space 0xC00 - - .space 0xC00 +gUnknown_03005C00: @ 0x03005C00 + .space 0x2C0 +gUnknown_03005EC0: @ 0x03005EC0 + .space 0x380 +gUnknown_03006240: @ 0x03006240 + .space 0x40 +gUnknown_03006280: @ 0x03006280 + .space 0x180 +gUnknown_03006400: @ 0x03006400 + .space 0x780 +gUnknown_03006B80: @ 0x03006B80 + .space 0x80 +gUnknown_03006C00: @ 0x03006C00 diff --git a/undefined_iwram.txt b/undefined_iwram.txt deleted file mode 100644 index f379272..0000000 --- a/undefined_iwram.txt +++ /dev/null @@ -1,11 +0,0 @@ -gUnknown_03000000 = 0x03000000; -gUnknown_03001800 = 0x03001800; -gUnknown_03002300 = 0x03002300; -gUnknown_03005C00 = 0x03005C00; -gUnknown_03005EC0 = 0x03005EC0; -gUnknown_03006240 = 0x03006240; -gUnknown_03006280 = 0x03006280; -gUnknown_03006400 = 0x03006400; -gUnknown_03006B80 = 0x03006B80; -gUnknown_03006C00 = 0x03006C00; -gUnknown_03007FF8 = 0x03007FF8; |