Merge pull request #22 from etdv-thevoid/issue21

Add GEN_2_GRAPHICS check to all Pokémon
dannye · Apr 20, 2024 · 29ed0e0 · 29ed0e0
2 parents a8b62fb + d0b2ae5
commit 29ed0e0
Show file tree

Hide file tree

Showing 151 changed files with 607 additions and 15 deletions.
diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm
@@ -7,7 +7,11 @@
 	db 200 ; catch rate
 	db 73 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/abra.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/abra.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw AbraPicFront, AbraPicBack
 
 	db TELEPORT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm
@@ -7,7 +7,11 @@
 	db 45 ; catch rate
 	db 202 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/aerodactyl.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/aerodactyl.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw AerodactylPicFront, AerodactylPicBack
 
 	db WING_ATTACK, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm
@@ -7,7 +7,11 @@
 	db 50 ; catch rate
 	db 186 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/alakazam.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/alakazam.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw AlakazamPicFront, AlakazamPicBack
 
 	db TELEPORT, CONFUSION, DISABLE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm
@@ -7,7 +7,11 @@
 	db 90 ; catch rate
 	db 147 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/arbok.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/arbok.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw ArbokPicFront, ArbokPicBack
 
 	db WRAP, LEER, POISON_STING, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm
@@ -7,7 +7,11 @@
 	db 75 ; catch rate
 	db 213 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/arcanine.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/arcanine.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw ArcaninePicFront, ArcaninePicBack
 
 	db ROAR, EMBER, LEER, TAKE_DOWN ; level 1 learnset

diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm
@@ -7,7 +7,11 @@
 	db 3 ; catch rate
 	db 215 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/articuno.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/articuno.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw ArticunoPicFront, ArticunoPicBack
 
 	db PECK, ICE_BEAM, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm
@@ -7,7 +7,11 @@
 	db 45 ; catch rate
 	db 159 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/beedrill.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/beedrill.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw BeedrillPicFront, BeedrillPicBack
 
 	db FURY_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm
@@ -7,7 +7,11 @@
 	db 255 ; catch rate
 	db 84 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/bellsprout.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/bellsprout.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw BellsproutPicFront, BellsproutPicBack
 
 	db VINE_WHIP, GROWTH, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm
@@ -7,7 +7,11 @@
 	db 45 ; catch rate
 	db 210 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/blastoise.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/blastoise.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw BlastoisePicFront, BlastoisePicBack
 
 	db TACKLE, TAIL_WHIP, BUBBLE, WATER_GUN ; level 1 learnset

diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm
@@ -7,7 +7,11 @@
 	db 45 ; catch rate
 	db 64 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/bulbasaur.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/bulbasaur.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw BulbasaurPicFront, BulbasaurPicBack
 
 	db TACKLE, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm
@@ -7,7 +7,11 @@
 	db 45 ; catch rate
 	db 160 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/butterfree.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/butterfree.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw ButterfreePicFront, ButterfreePicBack
 
 	db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm
@@ -7,7 +7,11 @@
 	db 255 ; catch rate
 	db 53 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/caterpie.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/caterpie.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw CaterpiePicFront, CaterpiePicBack
 
 	db TACKLE, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm
@@ -7,7 +7,11 @@
 	db 30 ; catch rate
 	db 255 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/chansey.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/chansey.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw ChanseyPicFront, ChanseyPicBack
 
 	db POUND, DOUBLESLAP, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm
@@ -7,7 +7,11 @@
 	db 45 ; catch rate
 	db 209 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/charizard.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/charizard.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw CharizardPicFront, CharizardPicBack
 
 	db SCRATCH, GROWL, EMBER, LEER ; level 1 learnset

diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm
@@ -7,7 +7,11 @@
 	db 45 ; catch rate
 	db 65 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/charmander.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/charmander.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw CharmanderPicFront, CharmanderPicBack
 
 	db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm
@@ -7,7 +7,11 @@
 	db 45 ; catch rate
 	db 142 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/charmeleon.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/charmeleon.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw CharmeleonPicFront, CharmeleonPicBack
 
 	db SCRATCH, GROWL, EMBER, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm
@@ -7,7 +7,11 @@
 	db 25 ; catch rate
 	db 129 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/clefable.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/clefable.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw ClefablePicFront, ClefablePicBack
 
 	db SING, DOUBLESLAP, MINIMIZE, METRONOME ; level 1 learnset

diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm
@@ -7,7 +7,11 @@
 	db 150 ; catch rate
 	db 68 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/clefairy.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/clefairy.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw ClefairyPicFront, ClefairyPicBack
 
 	db POUND, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm
@@ -7,7 +7,11 @@
 	db 60 ; catch rate
 	db 203 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/cloyster.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/cloyster.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw CloysterPicFront, CloysterPicBack
 
 	db WITHDRAW, SUPERSONIC, CLAMP, AURORA_BEAM ; level 1 learnset

diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm
@@ -7,7 +7,11 @@
 	db 190 ; catch rate
 	db 87 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/cubone.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/cubone.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw CubonePicFront, CubonePicBack
 
 	db BONE_CLUB, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm
@@ -7,11 +7,11 @@
 	db 75 ; catch rate
 	db 176 ; base exp
 
-	IF GEN_2_GRAPHICS
-		INCBIN "gfx/pokemon/gsfront/dewgong.pic", 0, 1 ; sprite dimensions
-	ELSE
-		INCBIN "gfx/pokemon/front/dewgong.pic", 0, 1 ; sprite dimensions
-	ENDC
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/dewgong.pic", 0, 1 ; sprite dimensions
+ELSE
+	INCBIN "gfx/pokemon/front/dewgong.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw DewgongPicFront, DewgongPicBack
 
 	db HEADBUTT, GROWL, AURORA_BEAM, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm
@@ -7,7 +7,11 @@
 	db 255 ; catch rate
 	db 81 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/diglett.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/diglett.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw DiglettPicFront, DiglettPicBack
 
 	db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm
@@ -7,7 +7,11 @@
 	db 35 ; catch rate
 	db 61 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/ditto.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/ditto.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw DittoPicFront, DittoPicBack
 
 	db TRANSFORM, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm
@@ -7,7 +7,11 @@
 	db 45 ; catch rate
 	db 158 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/dodrio.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/dodrio.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw DodrioPicFront, DodrioPicBack
 
 	db PECK, GROWL, FURY_ATTACK, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm
@@ -7,7 +7,11 @@
 	db 190 ; catch rate
 	db 96 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/doduo.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/doduo.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw DoduoPicFront, DoduoPicBack
 
 	db PECK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm
@@ -7,7 +7,11 @@
 	db 45 ; catch rate
 	db 144 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/dragonair.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/dragonair.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw DragonairPicFront, DragonairPicBack
 
 	db WRAP, LEER, THUNDER_WAVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm
@@ -7,7 +7,11 @@
 	db 45 ; catch rate
 	db 218 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/dragonite.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/dragonite.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw DragonitePicFront, DragonitePicBack
 
 	db WRAP, LEER, THUNDER_WAVE, AGILITY ; level 1 learnset

diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm
@@ -7,7 +7,11 @@
 	db 45 ; catch rate
 	db 67 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/dratini.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/dratini.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw DratiniPicFront, DratiniPicBack
 
 	db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm
@@ -7,7 +7,11 @@
 	db 190 ; catch rate
 	db 102 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/drowzee.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/drowzee.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw DrowzeePicFront, DrowzeePicBack
 
 	db POUND, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm
@@ -7,11 +7,11 @@
 	db 50 ; catch rate
 	db 153 ; base exp
 
-	IF GEN_2_GRAPHICS
-		INCBIN "gfx/pokemon/gsfront/dugtrio.pic", 0, 1 ; sprite dimensions
-	ELSE
-		INCBIN "gfx/pokemon/front/dugtrio.pic", 0, 1 ; sprite dimensions
-	ENDC
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/dugtrio.pic", 0, 1 ; sprite dimensions
+ELSE
+	INCBIN "gfx/pokemon/front/dugtrio.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw DugtrioPicFront, DugtrioPicBack
 
 	db SCRATCH, GROWL, DIG, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm
@@ -7,7 +7,11 @@
 	db 45 ; catch rate
 	db 92 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/eevee.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/eevee.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw EeveePicFront, EeveePicBack
 
 	db TACKLE, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset

diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm
@@ -7,7 +7,11 @@
 	db 255 ; catch rate
 	db 62 ; base exp
 
+IF GEN_2_GRAPHICS
+	INCBIN "gfx/pokemon/gsfront/ekans.pic", 0, 1 ; sprite dimensions
+ELSE
 	INCBIN "gfx/pokemon/front/ekans.pic", 0, 1 ; sprite dimensions
+ENDC
 	dw EkansPicFront, EkansPicBack
 
 	db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset