diff options
| author | fullgrowngaming <42490167+fullgrowngaming@users.noreply.github.com> | 2020-10-11 16:30:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-11 18:30:22 -0500 |
| commit | f92773041808697bcdfd0a8f0743b0f863c66ee8 (patch) | |
| tree | d4b70af90da6da43a84a0efbfc0eb6644e405b75 /linker_scripts/code_script.txt | |
| parent | 1c4a3047dea5649ad703779cdc07854fc623260d (diff) | |
Arms_Hook OK (#33)
* All but 2 functions matched
* More work on hookshot
* hookshot work
* 2 functions left (and one is almost done)
* sp issues with draw, but matching otherwise
* hookshot matching
* Changed rodata inclusion for armshook
* Hookshot OK
* Resolve script conflicts
* Rename unk variables to match MM standard
* Made requested changes
Diffstat (limited to 'linker_scripts/code_script.txt')
| -rw-r--r-- | linker_scripts/code_script.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 47e50e897..d6dcb37bf 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -1312,8 +1312,9 @@ SECTIONS ovl_Arms_Hook : AT(RomLocation) { build/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.o(.text) - build/asm/ovl_Arms_Hook_data.o(.data) - build/asm/ovl_Arms_Hook_rodata.o(.rodata) + build/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.o(.data) + build/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.o(.rodata) + build/src/overlays/actors/ovl_Arms_Hook/z_arms_hook_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; |