diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2021-05-04 20:10:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-04 23:10:59 -0400 |
| commit | e39141fb3df04cfd7c0df63e4570340db5df9e1a (patch) | |
| tree | dd2a9f958386546f92e48e95537fb58526445953 /linker_scripts | |
| parent | fcc87b3ae29c0dca3950ee0920cf0b298f5a73a8 (diff) | |
Ovl en nutsball OK (#115)
* EnNutsball Match but one function with sp issues
* Updated ActorPlayer
* Renamed unk144 to timer and added data as comment
* Got update matched but stack issues with two vars
* add back new line
* Fixed stack issue based on PR comments. Added data
* more descriptive variable names
* Use OPEN_DISPS/CLOSE_DISPS macros in draw
* Address PR comments
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index e4269351a..c0c46aa62 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -3179,9 +3179,9 @@ SECTIONS ovl_En_Nutsball : AT(RomLocation) { build/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.o(.text) - build/asm/overlays/ovl_En_Nutsball_data.o(.data) + build/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.o(.data) build/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.o(.rodata) - build/asm/overlays/ovl_En_Nutsball_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index d5c75ccbb..cda0993a7 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -1,6 +1,7 @@ D_040008D0 = 0x040008D0; D_04029CB0 = 0x04029CB0; D_04029CF0 = 0x04029CF0; +D_04058BA0 = 0x04058BA0; D_0405AAB0 = 0x0405AAB0; D_0405BEF0 = 0x0405BEF0; D_0405B6F0 = 0x0405B6F0; |