diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2021-07-21 01:07:05 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 11:07:05 -0400 |
| commit | 9637e19303bdd2c99b1a03390cc1bbea786a8150 (patch) | |
| tree | f02b8fcaebc84d38f3ae749e98df330d6992df61 /linker_scripts | |
| parent | 5fa3049236bdcfcece10c3e85d003b7fa41c8124 (diff) | |
EnClearTag OK and documented (#214)
* merge main
* Match Init
* Clear_Tag OK
* Full documentation
* More docs
* Fix function
* Fix MakeFile for assets and Fix texture swapped names
* Fix name
* Improve name and remove pad
* Can't stop the minor tweeks
* Adding potential Makefile fixes
* Minor name change
* Another name fix... and format
* PR Suggestion & Add Overlay File Description
* Re-documentation to match OoT WIP (more to come)
* Finish docs from OoT
* Fix merge and format
* Minor touch-ups
* Cleaner conditional
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 967e7413d..b81b39eab 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -2410,9 +2410,9 @@ SECTIONS ovl_En_Clear_Tag : AT(RomLocation) { build/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.o(.text) - build/asm/overlays/ovl_En_Clear_Tag_data.o(.data) + build/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.o(.data) build/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.o(.rodata) - build/asm/overlays/ovl_En_Clear_Tag_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 896e0ddcb..fdb775b6e 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -11,6 +11,16 @@ D_04029CB0 = 0x04029CB0; D_04029CF0 = 0x04029CF0; D_04029CB0 = 0x04029CB0; D_04029CF0 = 0x04029CF0; +D_04030100 = 0x04030100; +D_040378F0 = 0x040378F0; +D_04037DF0 = 0x04037DF0; +D_040382F0 = 0x040382F0; +D_040387F0 = 0x040387F0; +D_04038CF0 = 0x04038CF0; +D_040391F0 = 0x040391F0; +D_040396F0 = 0x040396F0; +D_04039BF0 = 0x04039BF0; +D_0403A0F0 = 0x0403A0F0; D_04058BA0 = 0x04058BA0; D_0405AAB0 = 0x0405AAB0; D_0405BEF0 = 0x0405BEF0; |