diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2021-07-22 11:42:51 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 21:42:51 -0400 |
| commit | 8e0359289c4ff32aac1da3af3825c15de727d584 (patch) | |
| tree | f0cc6f556fa5c86b9a6fb283a3eca72c9408ab7e /linker_scripts | |
| parent | 87137da829c10b085925e9aae00b9dc20c3ee02f (diff) | |
Match Remaining En_Niw Functions (En_Niw OK) (#218)
* Niw OK
* Fix snake case
* PR Cleanup
* Improve docs from PR suggestions
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 8 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 5a1665015..8664b78bb 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -1043,14 +1043,8 @@ SECTIONS { build/src/overlays/actors/ovl_En_Niw/z_en_niw.o(.text) build/src/overlays/actors/ovl_En_Niw/z_en_niw.o(.data) -#ifdef NON_EQUIVALENT - build/src/overlays/actors/ovl_En_Niw_rodata_overlay.o(.ovl) -#elseif NON_MATCHING - build/src/overlays/actors/ovl_En_Niw_rodata_overlay.o(.ovl) -#else build/src/overlays/actors/ovl_En_Niw/z_en_niw.o(.rodata) - build/asm/overlays/ovl_En_Niw_rodata.o(.rodata) -#endif + build/src/overlays/actors/ovl_En_Niw/z_en_niw_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 5b8ba7db0..0500d1cae 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -494,8 +494,10 @@ D_06005BA0 = 0x06005BA0; D_0600B538 = 0x0600B538; /* en_niw */ -D_06002530 = 0x06002530; D_060000E8 = 0x060000E8; +D_060023B0 = 0x060023B0; +D_06002428 = 0x06002428; +D_06002530 = 0x06002530; /* z_en_nnh */ D_06001510 = 0x06001510; |