diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2019-12-11 19:51:51 -0500 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-12-11 19:51:51 -0500 |
commit | af1c24b751a12b5c5d283e13326df3a997ef27dd (patch) | |
tree | c85749e46d0f0dba95483ee16f264652c9233c1f /ld_script.txt | |
parent | 0d586d304dbae11eeb0809ef7a06e2d23db5010c (diff) | |
parent | f12824e3b1643f86599e2c03c96b752a87a73746 (diff) |
Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen
Diffstat (limited to 'ld_script.txt')
-rw-r--r-- | ld_script.txt | 4 |
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); |