diff options
| author | Parker Burnett <burnettparker@gmail.com> | 2021-06-02 19:13:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-02 19:13:06 -0400 |
| commit | 2bf68a5263d15b0b32db0c684a56175cf7755dbc (patch) | |
| tree | 7ce4fc66b64e4870104c2871867872d93cbe1f8b /linker_scripts | |
| parent | 631225a626187be9cbbda3c1be075c1234194b51 (diff) | |
Z_obj_bell Matching (#167)
* ringing in the bell
* another matching func
* stuck on func_80A357A8, needs a z_actor func...
* no luck on a fix, but got further...
* matched func_80A357A8, one left
* might be on the right track? saving progress...
* getting closer
* pushing up matching, it has warnign regarding Vecs
* all functions matching
* obj_bell OK, time for bed
* prepping for PR
* fixing suggestions
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 32f8879b9..9e22c8de6 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -4478,9 +4478,9 @@ SECTIONS ovl_Obj_Bell : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.o(.text) - build/asm/overlays/ovl_Obj_Bell_data.o(.data) + build/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.o(.data) build/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.o(.rodata) - build/asm/overlays/ovl_Obj_Bell_rodata.o(.rodata) + build/src/overlays/actors/ovl_Obj_Bell/z_obj_bell_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 9a3a9f4d5..46ca375ac 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -284,6 +284,15 @@ D_060004B0 = 0x060004B0; /* z_en_jc_mato */ D_06000390 = 0x06000390; +/* obj_bell */ +D_06001BA8 = 0x06001BA8; +D_06000840 = 0x06000840; +D_06000570 = 0x06000570; +D_06000698 = 0x06000698; +D_060008D0 = 0x060008D0; +D_06000960 = 0x06000960; +D_060007A8 = 0x060007A8; + /* z_en_fg */ D_06001534 = 0x06001534; D_060011C0 = 0x060011C0; |