diff options
| author | EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> | 2021-06-29 00:36:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-28 19:36:46 -0400 |
| commit | 2df51868ddb4867974bceff4355e71bf96852d67 (patch) | |
| tree | 6d10cf0fea778783ed463287a3c488b8931ba8ac /linker_scripts/code_script.txt | |
| parent | 447ba8e990272f7d70d2abb13f88899c2f1addb7 (diff) | |
BgIcicle OK and mostly documented (#180)
* remove ZAPD submodule
* git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "ca229f19"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "ca229f19"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* git subrepo clone https://github.com/simonlindholm/decomp-permuter.git tools/decomp-permuter
subrepo:
subdir: "tools/decomp-permuter"
merged: "1e4b85a7"
upstream:
origin: "https://github.com/simonlindholm/decomp-permuter.git"
branch: "main"
commit: "1e4b85a7"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Remove asm-differ
* git subrepo clone https://github.com/simonlindholm/asm-differ.git tools/asm-differ
subrepo:
subdir: "tools/asm-differ"
merged: "eaf72269"
upstream:
origin: "https://github.com/simonlindholm/asm-differ.git"
branch: "master"
commit: "eaf72269"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* remove asm-processor
* git subrepo clone https://github.com/simonlindholm/asm-processor.git tools/asm-processor
subrepo:
subdir: "tools/asm-processor"
merged: "85288fcd"
upstream:
origin: "https://github.com/simonlindholm/asm-processor.git"
branch: "master"
commit: "85288fcd"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* remove .gitmodules file
* Update REAMDE
* OK
* Import data
* Begin naming
* Delete asm references
* Main type enum
* Rename in functions.txt
* Review changes
Co-authored-by: angie <angheloalf95@gmail.com>
Diffstat (limited to 'linker_scripts/code_script.txt')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index c53ea2b2c..8afb1b698 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -3889,9 +3889,9 @@ SECTIONS ovl_Bg_Icicle : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.o(.text) - build/asm/overlays/ovl_Bg_Icicle_data.o(.data) + build/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.o(.data) build/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.o(.rodata) - build/asm/overlays/ovl_Bg_Icicle_rodata.o(.rodata) + build/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; |