summaryrefslogtreecommitdiff
path: root/linker_scripts
diff options
context:
space:
mode:
authorengineer124 <47598039+engineer124@users.noreply.github.com>2021-07-22 11:42:58 +1000
committerGitHub <noreply@github.com>2021-07-21 21:42:58 -0400
commit39eeb672007a04cc43fe45886ffe66e7c43c01a8 (patch)
tree8bf39c9b85aa8de0e9fbf1fa084b50fdec103966 /linker_scripts
parent8e0359289c4ff32aac1da3af3825c15de727d584 (diff)
EnTuboTrap and EnWeatherTag OK (#220)
Diffstat (limited to 'linker_scripts')
-rw-r--r--linker_scripts/code_script.txt6
1 files changed, 1 insertions, 5 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt
index 8664b78bb..b4e947514 100644
--- a/linker_scripts/code_script.txt
+++ b/linker_scripts/code_script.txt
@@ -2163,7 +2163,7 @@ SECTIONS
build/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.o(.text)
build/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.o(.data)
build/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.o(.rodata)
- build/asm/overlays/ovl_En_Tubo_Trap_rodata.o(.rodata)
+ build/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap_overlay.o(.ovl)
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;
@@ -2629,11 +2629,7 @@ SECTIONS
build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.text)
build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.data)
build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.rodata)
-#ifdef NON_MATCHING
build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag_overlay.o(.ovl)
-#else
- build/asm/overlays/ovl_En_Weather_Tag_rodata.o(.rodata)
-#endif
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;