summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-07-07 14:11:04 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-07-07 14:11:04 +0200
commit98922986456010f6c81ff4450aa2914a33ad50dc (patch)
tree9de563091b3b98934f0072ec7bbc6505a7231d9b /ld_script.txt
parente6d67c7c2299a0c6fa7ec79fa1427c4a1277a6f7 (diff)
parent6313f360d5006527549b142253e22374624129e9 (diff)
Merge branch 'master' into final_battle_files_touches
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 566059e20..6d5e31a25 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -128,7 +128,7 @@ SECTIONS {
asm/pokemon_storage_system.o(.text);
src/pokemon_icon.o(.text);
src/script_movement.o(.text);
- asm/fldeff_cut.o(.text);
+ src/fldeff_cut.o(.text);
src/mail_data.o(.text);
src/map_name_popup.o(.text);
src/item_menu_icons.o(.text);
@@ -425,7 +425,7 @@ SECTIONS {
src/pokemon_storage_system.o(.rodata);
data/pokemon_storage_system.o(.rodata);
src/pokemon_icon.o(.rodata);
- data/fldeff_cut.o(.rodata);
+ src/fldeff_cut.o(.rodata);
src/map_name_popup.o(.rodata);
src/item_menu_icons.o(.rodata);
data/contest.o(.rodata);