diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2021-07-08 18:30:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-08 21:30:37 -0400 |
| commit | 5453731f4e2cadabc518b76ebb1ea9d9d6f366b7 (patch) | |
| tree | 6e4f8179b2d9f83b912133124e2eae4d4c5b1798 /linker_scripts | |
| parent | 6db3fc7b323e8d81ba848a2baa372b3295a1d29e (diff) | |
ovl_Obj_Ending Data brought over (#196)
* ObjEnding Matches but with unkStruct and no data
* Removed inital code comments
* Added data as a comment
* Add missing semicolon
* Addressed PR comments
* Added data
* Cleanup
* Some documentation
* Change 0 to NULL
* Remove redundant array size
* Cleanup
* Fix Format
* Rename D_80C25CE0
* Change this to thisx for indexing sGraphics
* Change this to thisx
* PR suggestions
* rename graphics
Co-authored-by: Derek Hensley <d.hensley@tempered.io>
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 2d32a555b..c173698d1 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -9415,9 +9415,9 @@ SECTIONS ovl_Obj_Ending : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.o(.text) - build/asm/overlays/ovl_Obj_Ending_data.o(.data) + build/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.o(.data) build/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.o(.rodata) - build/asm/overlays/ovl_Obj_Ending_rodata.o(.rodata) + build/src/overlays/actors/ovl_Obj_Ending/z_obj_ending_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 50edca586..8c060c873 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -478,6 +478,12 @@ D_06000E88 = 0x06000E88; /* z_obj_dinner */ D_060011E0 = 0x060011E0; +/* z_obj_ending */ +D_060003D0 = 0x060003D0; +D_060031A0 = 0x060031A0; +D_06003440 = 0x06003440; +D_06001FF8 = 0x06001FF8; + /* z_obj_funen */ D_060000D0 = 0x060000D0; |