Merge pull request #180 from ghoulslash/trainer-card

Trainer card
2019-12-11 18:20:58 -05:00
parent 7526b2ccf1 b43c48202b
commit f12824e3b1
48 changed files with 2593 additions and 5358 deletions
@@ -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);
@@ -434,7 +434,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);