Merge branch 'main' of github.com:pagefaultgames/pokerogue into tests/masterlist

 Conflicts:
	src/test/pokemonSprite.test.ts
This commit is contained in:
Greenlamp 2024-05-20 19:43:54 +02:00
commit 6afdad7c34

View File

@ -60026,10 +60026,14 @@ export const tmSpecies: TmSpecies = {
Species.ARCANINE, Species.ARCANINE,
Species.AERODACTYL, Species.AERODACTYL,
Species.MEW, Species.MEW,
Species.CROCONAW,
Species.FERALIGATR,
Species.ESPEON, Species.ESPEON,
Species.GIRAFARIG, Species.GIRAFARIG,
Species.GLIGAR, Species.GLIGAR,
Species.STEELIX, Species.STEELIX,
Species.SNUBBULL,
Species.GRANBULL,
Species.HOUNDOUR, Species.HOUNDOUR,
Species.HOUNDOOM, Species.HOUNDOOM,
Species.POOCHYENA, Species.POOCHYENA,