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 @@ ButterfreeAnimationIdle: INCLUDE "gfx/pokemon/butterfree/anim_idle.asm"
WeedleAnimationIdle: INCLUDE "gfx/pokemon/weedle/anim_idle.asm"
KakunaAnimationIdle: INCLUDE "gfx/pokemon/kakuna/anim_idle.asm"
BeedrillAnimationIdle: INCLUDE "gfx/pokemon/beedrill/anim_idle.asm"
GentlarvaAnimationIdle: INCLUDE "gfx/pokemon/gentlarva/anim_idle.asm"
PupalAnimationIdle: INCLUDE "gfx/pokemon/pupal/anim_idle.asm"
CarapthorAnimationIdle: INCLUDE "gfx/pokemon/carapthor/anim_idle.asm"
KotoraAnimationIdle: INCLUDE "gfx/pokemon/kotora/anim_idle.asm"
GaotoraAnimationIdle: INCLUDE "gfx/pokemon/gaotora/anim_idle.asm"
GorotoraAnimationIdle: INCLUDE "gfx/pokemon/gorotora/anim_idle.asm"
RaitoraAnimationIdle: INCLUDE "gfx/pokemon/raitora/anim_idle.asm"
PidgeyAnimationIdle: INCLUDE "gfx/pokemon/pidgey/anim_idle.asm"
PidgeottoAnimationIdle: INCLUDE "gfx/pokemon/pidgeotto/anim_idle.asm"
PidgeotAnimationIdle: INCLUDE "gfx/pokemon/pidgeot/anim_idle.asm"
@ -36,27 +43,34 @@ NidokingAnimationIdle: INCLUDE "gfx/pokemon/nidoking/anim_idle.asm"
NidoreignAnimationIdle: INCLUDE "gfx/pokemon/nidoreign/anim_idle.asm"
ClefairyAnimationIdle: INCLUDE "gfx/pokemon/clefairy/anim_idle.asm"
ClefableAnimationIdle: INCLUDE "gfx/pokemon/clefable/anim_idle.asm"
VulpiiiAnimationIdle: INCLUDE "gfx/pokemon/vulpiii/anim_idle.asm"
VulpixAnimationIdle: INCLUDE "gfx/pokemon/vulpix/anim_idle.asm"
NinetalesAnimationIdle: INCLUDE "gfx/pokemon/ninetales/anim_idle.asm"
JigglypuffAnimationIdle: INCLUDE "gfx/pokemon/jigglypuff/anim_idle.asm"
WigglytuffAnimationIdle: INCLUDE "gfx/pokemon/wigglytuff/anim_idle.asm"
BittybatAnimationIdle: INCLUDE "gfx/pokemon/bittybat/anim_idle.asm"
ZubatAnimationIdle: INCLUDE "gfx/pokemon/zubat/anim_idle.asm"
GolbatAnimationIdle: INCLUDE "gfx/pokemon/golbat/anim_idle.asm"
OddishAnimationIdle: INCLUDE "gfx/pokemon/oddish/anim_idle.asm"
GloomAnimationIdle: INCLUDE "gfx/pokemon/gloom/anim_idle.asm"
VileplumeAnimationIdle: INCLUDE "gfx/pokemon/vileplume/anim_idle.asm"
ParasporAnimationIdle: INCLUDE "gfx/pokemon/paraspor/anim_idle.asm"
ParasAnimationIdle: INCLUDE "gfx/pokemon/paras/anim_idle.asm"
ParasectAnimationIdle: INCLUDE "gfx/pokemon/parasect/anim_idle.asm"
VenonatAnimationIdle: INCLUDE "gfx/pokemon/venonat/anim_idle.asm"
VenomothAnimationIdle: INCLUDE "gfx/pokemon/venomoth/anim_idle.asm"
DiglettAnimationIdle: INCLUDE "gfx/pokemon/diglett/anim_idle.asm"
DugtrioAnimationIdle: INCLUDE "gfx/pokemon/dugtrio/anim_idle.asm"
CoinpurAnimationIdle: INCLUDE "gfx/pokemon/coinpur/anim_idle.asm"
MeowthAnimationIdle: INCLUDE "gfx/pokemon/meowth/anim_idle.asm"
PersianAnimationIdle: INCLUDE "gfx/pokemon/persian/anim_idle.asm"
PerrserkerAnimationIdle: INCLUDE "gfx/pokemon/perrserker/anim_idle.asm"
PsyduckAnimationIdle: INCLUDE "gfx/pokemon/psyduck/anim_idle.asm"
GolduckAnimationIdle: INCLUDE "gfx/pokemon/golduck/anim_idle.asm"
MankeyAnimationIdle: INCLUDE "gfx/pokemon/mankey/anim_idle.asm"
PrimeapeAnimationIdle: INCLUDE "gfx/pokemon/primeape/anim_idle.asm"
AnnihilapeAnimationIdle: INCLUDE "gfx/pokemon/annihilape/anim_idle.asm"
PupperonAnimationIdle: INCLUDE "gfx/pokemon/pupperon/anim_idle.asm"
GrowlitheAnimationIdle: INCLUDE "gfx/pokemon/growlithe/anim_idle.asm"
ArcanineAnimationIdle: INCLUDE "gfx/pokemon/arcanine/anim_idle.asm"
PoliwagAnimationIdle: INCLUDE "gfx/pokemon/poliwag/anim_idle.asm"
@ -208,6 +222,9 @@ WooperAnimationIdle: INCLUDE "gfx/pokemon/wooper/anim_idle.asm"
QuagsireAnimationIdle: INCLUDE "gfx/pokemon/quagsire/anim_idle.asm"
EspeonAnimationIdle: INCLUDE "gfx/pokemon/espeon/anim_idle.asm"
UmbreonAnimationIdle: INCLUDE "gfx/pokemon/umbreon/anim_idle.asm"
LeafeonAnimationIdle: INCLUDE "gfx/pokemon/leafeon/anim_idle.asm"
GlaceonAnimationIdle: INCLUDE "gfx/pokemon/glaceon/anim_idle.asm"
SylveonAnimationIdle: INCLUDE "gfx/pokemon/sylveon/anim_idle.asm"
MurkrowAnimationIdle: INCLUDE "gfx/pokemon/murkrow/anim_idle.asm"
SlowkingAnimationIdle: INCLUDE "gfx/pokemon/slowking/anim_idle.asm"
MisdreavusAnimationIdle: INCLUDE "gfx/pokemon/misdreavus/anim_idle.asm"