From 2178e8f6c3674351e3612ef2bbbbf510ecd8592f Mon Sep 17 00:00:00 2001 From: TrinerX493 Date: Mon, 21 Aug 2023 13:05:23 -0600 Subject: [PATCH] Pidgeot name fix --- src/data/cards.asm | 12 ++++++------ src/gfx.asm | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/data/cards.asm b/src/data/cards.asm index 48be497c..0650f5e6 100644 --- a/src/data/cards.asm +++ b/src/data/cards.asm @@ -168,8 +168,8 @@ CardPointers:: dw MewLv23Card dw PidgeyCard dw PidgeottoCard - dw Pidgeot1Card - dw Pidgeot2Card + dw PidgeotLv38Card + dw PidgeotLv40Card dw RattataCard dw RaticateCard dw SpearowCard @@ -8242,9 +8242,9 @@ PidgeottoCard: tx PidgeottoDescription ; description db 16 -Pidgeot1Card: +PidgeotLv38Card: db TYPE_PKMN_COLORLESS ; type - gfx Pidgeot1CardGfx ; gfx + gfx PidgeotLv38CardGfx ; gfx tx PidgeotName ; name db STAR ; rarity db LABORATORY | GB ; sets @@ -8293,9 +8293,9 @@ Pidgeot1Card: tx Pidgeot1Description ; description db 0 -Pidgeot2Card: +PidgeotLv40Card: db TYPE_PKMN_COLORLESS ; type - gfx Pidgeot2CardGfx ; gfx + gfx PidgeotLv40CardGfx ; gfx tx PidgeotName ; name db STAR ; rarity db EVOLUTION | JUNGLE ; sets diff --git a/src/gfx.asm b/src/gfx.asm index e66a4916..16f0b196 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -2152,11 +2152,11 @@ PidgeottoCardGfx:: INCBIN "gfx/cards/pidgeotto.2bpp" INCBIN "gfx/cards/pidgeotto.pal" -Pidgeot1CardGfx:: +PidgeotLv38CardGfx:: INCBIN "gfx/cards/pidgeot1.2bpp" INCBIN "gfx/cards/pidgeot1.pal" -Pidgeot2CardGfx:: +PidgeotLv40CardGfx:: INCBIN "gfx/cards/pidgeot2.2bpp" INCBIN "gfx/cards/pidgeot2.pal"