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

@ -15,6 +15,13 @@ ButterfreeFrames: INCLUDE "gfx/pokemon/butterfree/frames.asm"
WeedleFrames: INCLUDE "gfx/pokemon/weedle/frames.asm"
KakunaFrames: INCLUDE "gfx/pokemon/kakuna/frames.asm"
BeedrillFrames: INCLUDE "gfx/pokemon/beedrill/frames.asm"
GentlarvaFrames: INCLUDE "gfx/pokemon/gentlarva/frames.asm"
PupalFrames: INCLUDE "gfx/pokemon/pupal/frames.asm"
CarapthorFrames: INCLUDE "gfx/pokemon/carapthor/frames.asm"
KotoraFrames: INCLUDE "gfx/pokemon/kotora/frames.asm"
GaotoraFrames: INCLUDE "gfx/pokemon/gaotora/frames.asm"
GorotoraFrames: INCLUDE "gfx/pokemon/gorotora/frames.asm"
RaitoraFrames: INCLUDE "gfx/pokemon/raitora/frames.asm"
PidgeyFrames: INCLUDE "gfx/pokemon/pidgey/frames.asm"
PidgeottoFrames: INCLUDE "gfx/pokemon/pidgeotto/frames.asm"
PidgeotFrames: INCLUDE "gfx/pokemon/pidgeot/frames.asm"
@ -38,27 +45,34 @@ NidokingFrames: INCLUDE "gfx/pokemon/nidoking/frames.asm"
NidoreignFrames: INCLUDE "gfx/pokemon/nidoreign/frames.asm"
ClefairyFrames: INCLUDE "gfx/pokemon/clefairy/frames.asm"
ClefableFrames: INCLUDE "gfx/pokemon/clefable/frames.asm"
VulpiiiFrames: INCLUDE "gfx/pokemon/vulpiii/frames.asm"
VulpixFrames: INCLUDE "gfx/pokemon/vulpix/frames.asm"
NinetalesFrames: INCLUDE "gfx/pokemon/ninetales/frames.asm"
JigglypuffFrames: INCLUDE "gfx/pokemon/jigglypuff/frames.asm"
WigglytuffFrames: INCLUDE "gfx/pokemon/wigglytuff/frames.asm"
BittybatFrames: INCLUDE "gfx/pokemon/bittybat/frames.asm"
ZubatFrames: INCLUDE "gfx/pokemon/zubat/frames.asm"
GolbatFrames: INCLUDE "gfx/pokemon/golbat/frames.asm"
OddishFrames: INCLUDE "gfx/pokemon/oddish/frames.asm"
GloomFrames: INCLUDE "gfx/pokemon/gloom/frames.asm"
VileplumeFrames: INCLUDE "gfx/pokemon/vileplume/frames.asm"
ParasporFrames: INCLUDE "gfx/pokemon/paraspor/frames.asm"
ParasFrames: INCLUDE "gfx/pokemon/paras/frames.asm"
ParasectFrames: INCLUDE "gfx/pokemon/parasect/frames.asm"
VenonatFrames: INCLUDE "gfx/pokemon/venonat/frames.asm"
VenomothFrames: INCLUDE "gfx/pokemon/venomoth/frames.asm"
DiglettFrames: INCLUDE "gfx/pokemon/diglett/frames.asm"
DugtrioFrames: INCLUDE "gfx/pokemon/dugtrio/frames.asm"
CoinpurFrames: INCLUDE "gfx/pokemon/coinpur/frames.asm"
MeowthFrames: INCLUDE "gfx/pokemon/meowth/frames.asm"
PersianFrames: INCLUDE "gfx/pokemon/persian/frames.asm"
PerrserkerFrames: INCLUDE "gfx/pokemon/perrserker/frames.asm"
PsyduckFrames: INCLUDE "gfx/pokemon/psyduck/frames.asm"
GolduckFrames: INCLUDE "gfx/pokemon/golduck/frames.asm"
MankeyFrames: INCLUDE "gfx/pokemon/mankey/frames.asm"
PrimeapeFrames: INCLUDE "gfx/pokemon/primeape/frames.asm"
AnnihilapeFrames: INCLUDE "gfx/pokemon/annihilape/frames.asm"
PupperonFrames: INCLUDE "gfx/pokemon/pupperon/frames.asm"
GrowlitheFrames: INCLUDE "gfx/pokemon/growlithe/frames.asm"
ArcanineFrames: INCLUDE "gfx/pokemon/arcanine/frames.asm"
PoliwagFrames: INCLUDE "gfx/pokemon/poliwag/frames.asm"