summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-12-11 19:51:51 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2019-12-11 19:51:51 -0500
commitaf1c24b751a12b5c5d283e13326df3a997ef27dd (patch)
treec85749e46d0f0dba95483ee16f264652c9233c1f /ld_script.txt
parent0d586d304dbae11eeb0809ef7a06e2d23db5010c (diff)
parentf12824e3b1643f86599e2c03c96b752a87a73746 (diff)
Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen
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 f6da871fb..42fc57437 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -130,7 +130,7 @@ SECTIONS {
src/scanline_effect.o(.text);
src/option_menu.o(.text);
src/pokedex.o(.text);
- asm/trainer_card.o(.text);
+ src/trainer_card.o(.text);
asm/pokemon_storage_system.o(.text);
src/pokemon_icon.o(.text);
asm/script_movement.o(.text);
@@ -435,7 +435,7 @@ SECTIONS {
src/wild_encounter.o(.rodata);
data/field_effect.o(.rodata);
src/option_menu.o(.rodata);
- data/trainer_card.o(.rodata);
+ src/trainer_card.o(.rodata);
data/pokemon_storage_system.o(.rodata);
src/pokemon_icon.o(.rodata);
data/fldeff_cut.o(.rodata);