summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-09-18 23:50:08 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-09-18 23:50:08 +0200
commitf255cbd7dc765562ecdf3b5344fbba15245b7e66 (patch)
tree03b51afe1e6111ac2379b4e09623582dc1f7afca /ld_script.txt
parent2e7127284f98cb4c8c02b1a41a19fdc73ed4eb79 (diff)
parente23fb64dad2f349184c8ec44e38f3c495f346785 (diff)
Merge branch 'master' into decomp_egg_hatch
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 9b0384427..826e3d4b2 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -58,7 +58,7 @@ SECTIONS {
src/decompress.o(.text);
asm/battle_1.o(.text);
asm/battle_2.o(.text);
- asm/battle_3.o(.text);
+ src/battle_3.o(.text);
src/battle_4.o(.text);
asm/battle_4.o(.text);
asm/battle_5.o(.text);