diff options
| author | Zelllll <56516451+Zelllll@users.noreply.github.com> | 2021-04-29 20:54:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 21:54:53 -0400 |
| commit | f0cd2db05579c0237b2fa7836ac696de824844e1 (patch) | |
| tree | a461a0b3f0a98e90adc81ebe596702cec43b06c3 /linker_scripts | |
| parent | fed1b37da1dcab04124f27d32bec98275f7fe3f2 (diff) | |
ovl_Item_B_Heart OK (#110)
* finish heart
* fix linker
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 7e9a08e64..c7ee6128a 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -1363,9 +1363,9 @@ SECTIONS ovl_Item_B_Heart : AT(RomLocation) { build/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.o(.text) - build/asm/overlays/ovl_Item_B_Heart_data.o(.data) + build/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.o(.data) build/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.o(.rodata) - build/asm/overlays/ovl_Item_B_Heart_rodata.o(.rodata) + build/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index a13ae82ee..2d2704d65 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -142,6 +142,10 @@ D_0600CC94 = 0x0600CC94; D_06000F28 = 0x06000F28; D_06000CE8 = 0x06000CE8; +/* item_b_heart */ +D_06001290 = 0x06001290; +D_06001470 = 0x06001470; + /* z_dm_statue */ D_06001788 = 0x06001788; D_06000520 = 0x06000520; |