summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-09-18 19:21:34 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-09-18 19:21:34 -0400
commitee73040717ad1c1d8c61c4ffde9ab14ff3719772 (patch)
tree34bf2046e49a43abfebb7ee75ade45235042b225 /ld_script.txt
parent25c7b4cd9243bb32e7d5ebd90d629acf91706133 (diff)
parente23fb64dad2f349184c8ec44e38f3c495f346785 (diff)
Merge branch 'master' into field_map_obj
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 b050d3c51..0fb325602 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);