Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Misty 2023-10-29 18:08:50 -04:00
commit 5d1bf81944
154 changed files with 1200 additions and 184 deletions

View file

@ -13,6 +13,13 @@ ButterfreeAnimation: INCLUDE "gfx/pokemon/butterfree/anim.asm"
WeedleAnimation: INCLUDE "gfx/pokemon/weedle/anim.asm"
KakunaAnimation: INCLUDE "gfx/pokemon/kakuna/anim.asm"
BeedrillAnimation: INCLUDE "gfx/pokemon/beedrill/anim.asm"
GentlarvaAnimation: INCLUDE "gfx/pokemon/gentlarva/anim.asm"
PupalAnimation: INCLUDE "gfx/pokemon/pupal/anim.asm"
CarapthorAnimation: INCLUDE "gfx/pokemon/carapthor/anim.asm"
KotoraAnimation: INCLUDE "gfx/pokemon/kotora/anim.asm"
GaotoraAnimation: INCLUDE "gfx/pokemon/gaotora/anim.asm"
GorotoraAnimation: INCLUDE "gfx/pokemon/gorotora/anim.asm"
RaitoraAnimation: INCLUDE "gfx/pokemon/raitora/anim.asm"
PidgeyAnimation: INCLUDE "gfx/pokemon/pidgey/anim.asm"
PidgeottoAnimation: INCLUDE "gfx/pokemon/pidgeotto/anim.asm"
PidgeotAnimation: INCLUDE "gfx/pokemon/pidgeot/anim.asm"
@ -36,27 +43,34 @@ NidokingAnimation: INCLUDE "gfx/pokemon/nidoking/anim.asm"
NidoreignAnimation: INCLUDE "gfx/pokemon/nidoreign/anim.asm"
ClefairyAnimation: INCLUDE "gfx/pokemon/clefairy/anim.asm"
ClefableAnimation: INCLUDE "gfx/pokemon/clefable/anim.asm"
VulpiiiAnimation: INCLUDE "gfx/pokemon/vulpiii/anim.asm"
VulpixAnimation: INCLUDE "gfx/pokemon/vulpix/anim.asm"
NinetalesAnimation: INCLUDE "gfx/pokemon/ninetales/anim.asm"
JigglypuffAnimation: INCLUDE "gfx/pokemon/jigglypuff/anim.asm"
WigglytuffAnimation: INCLUDE "gfx/pokemon/wigglytuff/anim.asm"
BittybatAnimation: INCLUDE "gfx/pokemon/bittybat/anim.asm"
ZubatAnimation: INCLUDE "gfx/pokemon/zubat/anim.asm"
GolbatAnimation: INCLUDE "gfx/pokemon/golbat/anim.asm"
OddishAnimation: INCLUDE "gfx/pokemon/oddish/anim.asm"
GloomAnimation: INCLUDE "gfx/pokemon/gloom/anim.asm"
VileplumeAnimation: INCLUDE "gfx/pokemon/vileplume/anim.asm"
ParasporAnimation: INCLUDE "gfx/pokemon/paraspor/anim.asm"
ParasAnimation: INCLUDE "gfx/pokemon/paras/anim.asm"
ParasectAnimation: INCLUDE "gfx/pokemon/parasect/anim.asm"
VenonatAnimation: INCLUDE "gfx/pokemon/venonat/anim.asm"
VenomothAnimation: INCLUDE "gfx/pokemon/venomoth/anim.asm"
DiglettAnimation: INCLUDE "gfx/pokemon/diglett/anim.asm"
DugtrioAnimation: INCLUDE "gfx/pokemon/dugtrio/anim.asm"
CoinpurAnimation: INCLUDE "gfx/pokemon/coinpur/anim.asm"
MeowthAnimation: INCLUDE "gfx/pokemon/meowth/anim.asm"
PersianAnimation: INCLUDE "gfx/pokemon/persian/anim.asm"
PerrserkerAnimation: INCLUDE "gfx/pokemon/perrserker/anim.asm"
PsyduckAnimation: INCLUDE "gfx/pokemon/psyduck/anim.asm"
GolduckAnimation: INCLUDE "gfx/pokemon/golduck/anim.asm"
MankeyAnimation: INCLUDE "gfx/pokemon/mankey/anim.asm"
PrimeapeAnimation: INCLUDE "gfx/pokemon/primeape/anim.asm"
AnnihilapeAnimation: INCLUDE "gfx/pokemon/annihilape/anim.asm"
PupperonAnimation: INCLUDE "gfx/pokemon/pupperon/anim.asm"
GrowlitheAnimation: INCLUDE "gfx/pokemon/growlithe/anim.asm"
ArcanineAnimation: INCLUDE "gfx/pokemon/arcanine/anim.asm"
PoliwagAnimation: INCLUDE "gfx/pokemon/poliwag/anim.asm"
@ -208,6 +222,9 @@ WooperAnimation: INCLUDE "gfx/pokemon/wooper/anim.asm"
QuagsireAnimation: INCLUDE "gfx/pokemon/quagsire/anim.asm"
EspeonAnimation: INCLUDE "gfx/pokemon/espeon/anim.asm"
UmbreonAnimation: INCLUDE "gfx/pokemon/umbreon/anim.asm"
LeafeonAnimation: INCLUDE "gfx/pokemon/leafeon/anim.asm"
GlaceonAnimation: INCLUDE "gfx/pokemon/glaceon/anim.asm"
SylveonAnimation: INCLUDE "gfx/pokemon/sylveon/anim.asm"
MurkrowAnimation: INCLUDE "gfx/pokemon/murkrow/anim.asm"
SlowkingAnimation: INCLUDE "gfx/pokemon/slowking/anim.asm"
MisdreavusAnimation: INCLUDE "gfx/pokemon/misdreavus/anim.asm"