Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen

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);