summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-11-26 19:21:51 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-11-26 19:21:51 +0100
commitb0657350a43f3f91cd5e3ab8f910ab5ab78bb61c (patch)
tree9568b4252f963e3210410880dad3b53dd3b5ab7d /ld_script.txt
parentad3a97e178b93c38b1d43f8120449b042ac23a0e (diff)
parent1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff)
berry blender fix merge conflicts
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 1cde81ae5..305d59b71 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -123,7 +123,7 @@ SECTIONS {
asm/battle_setup.o(.text);
asm/cable_club.o(.text);
asm/trainer_see.o(.text);
- asm/wild_encounter.o(.text);
+ src/wild_encounter.o(.text);
asm/field_effect.o(.text);
asm/unknown_task.o(.text);
asm/option_menu.o(.text);