Merge pull request #137 from TrainerX493/master

Pidgeot name fix
pret · Aug 26, 2023 · 0a1a711 · 0a1a711
2 parents 43b7b92 + 2178e8f
commit 0a1a711
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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"