diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2021-06-09 15:51:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 18:51:33 -0400 |
| commit | 3ac21daf26586c23158c42e38d79de1b24304bfb (patch) | |
| tree | cbac669a4c3b46e8155a4f79b44c6d3519314cb2 /linker_scripts | |
| parent | 8b21da8c34c3f10c144c31552aeb3363e3ddae7a (diff) | |
ovl_dm_char07 OK (#172)
* Dm_Char07 Ok
* Cleanup
* Documented
* Add small documentation to en_toto and run format
* Better documenting of spotlight flags
* PR suggestions
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 19 |
2 files changed, 21 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 29d971da3..1a7242341 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -5468,9 +5468,9 @@ SECTIONS ovl_Dm_Char07 : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.o(.text) - build/asm/overlays/ovl_Dm_Char07_data.o(.data) + build/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.o(.data) build/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.o(.rodata) - build/asm/overlays/ovl_Dm_Char07_rodata.o(.rodata) + build/src/overlays/actors/ovl_Dm_Char07/z_dm_char07_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index ff89653f5..1367a9315 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -179,6 +179,25 @@ D_06007750 = 0x06007750; D_0600A390 = 0x0600A390; D_0600A490 = 0x0600A490; +/* dm_char07 */ +D_06000100 = 0x06000100; +D_06000240 = 0x06000240; +D_06000650 = 0x06000650; +D_06000790 = 0x06000790; +D_06000B80 = 0x06000B80; +D_06000CC0 = 0x06000CC0; +D_060010D0 = 0x060010D0; +D_06001210 = 0x06001210; +D_060015E0 = 0x060015E0; +D_060016B8 = 0x060016B8; +D_06002BA0 = 0x06002BA0; +D_06002CD0 = 0x06002CD0; +D_06006688 = 0x06006688; +D_060076A0 = 0x060076A0; +D_06007918 = 0x06007918; +D_060105F8 = 0x060105F8; +D_06010D68 = 0x06010D68; + /* obj_lightswitch */ D_06000C20 = 0x6000C20; D_06000420 = 0x6000420; |