summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-07-17 20:48:34 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-07-17 20:48:34 -0400
commitb23014cfa0573e53a104f433cf2d75f350340d60 (patch)
tree238805ebd3640688c171220a10334f665001b259 /ld_script.txt
parent23c169df9d72eb1c571f650a56252b772a17f85e (diff)
parent67ced1d77ec0d36cc2b6ebcbfc58ba28b357ddbb (diff)
Merge branch 'master' of https://github.com/pret/pokeruby
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 f4506ba52..ddc08c49d 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -208,7 +208,7 @@ SECTIONS {
src/slot_machine.o(.text_b);
src/contest_painting.o(.text);
src/battle_ai.o(.text);
- asm/trader.o(.text);
+ src/trader.o(.text);
src/starter_choose.o(.text);
src/wallclock.o(.text);
src/rom6.o(.text);
@@ -436,7 +436,7 @@ SECTIONS {
data/slot_machine.o(.rodata);
src/contest_painting.o(.rodata);
src/battle_ai.o(.rodata);
- data/trader.o(.rodata);
+ src/trader.o(.rodata);
src/starter_choose.o(.rodata);
src/wallclock.o(.rodata);
src/pokeblock.o(.rodata);