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 @@ ButterfreeBitmasks: INCLUDE "gfx/pokemon/butterfree/bitmask.asm"
WeedleBitmasks: INCLUDE "gfx/pokemon/weedle/bitmask.asm"
KakunaBitmasks: INCLUDE "gfx/pokemon/kakuna/bitmask.asm"
BeedrillBitmasks: INCLUDE "gfx/pokemon/beedrill/bitmask.asm"
GentlarvaBitmasks: INCLUDE "gfx/pokemon/gentlarva/bitmask.asm"
PupalBitmasks: INCLUDE "gfx/pokemon/pupal/bitmask.asm"
CarapthorBitmasks: INCLUDE "gfx/pokemon/carapthor/bitmask.asm"
KotoraBitmasks: INCLUDE "gfx/pokemon/kotora/bitmask.asm"
GaotoraBitmasks: INCLUDE "gfx/pokemon/gaotora/bitmask.asm"
GorotoraBitmasks: INCLUDE "gfx/pokemon/gorotora/bitmask.asm"
RaitoraBitmasks: INCLUDE "gfx/pokemon/raitora/bitmask.asm"
PidgeyBitmasks: INCLUDE "gfx/pokemon/pidgey/bitmask.asm"
PidgeottoBitmasks: INCLUDE "gfx/pokemon/pidgeotto/bitmask.asm"
PidgeotBitmasks: INCLUDE "gfx/pokemon/pidgeot/bitmask.asm"
@ -36,27 +43,34 @@ NidokingBitmasks: INCLUDE "gfx/pokemon/nidoking/bitmask.asm"
NidoreignBitmasks: INCLUDE "gfx/pokemon/nidoreign/bitmask.asm"
ClefairyBitmasks: INCLUDE "gfx/pokemon/clefairy/bitmask.asm"
ClefableBitmasks: INCLUDE "gfx/pokemon/clefable/bitmask.asm"
VulpiiiBitmasks: INCLUDE "gfx/pokemon/vulpiii/bitmask.asm"
VulpixBitmasks: INCLUDE "gfx/pokemon/vulpix/bitmask.asm"
NinetalesBitmasks: INCLUDE "gfx/pokemon/ninetales/bitmask.asm"
JigglypuffBitmasks: INCLUDE "gfx/pokemon/jigglypuff/bitmask.asm"
WigglytuffBitmasks: INCLUDE "gfx/pokemon/wigglytuff/bitmask.asm"
BittybatBitmasks: INCLUDE "gfx/pokemon/bittybat/bitmask.asm"
ZubatBitmasks: INCLUDE "gfx/pokemon/zubat/bitmask.asm"
GolbatBitmasks: INCLUDE "gfx/pokemon/golbat/bitmask.asm"
OddishBitmasks: INCLUDE "gfx/pokemon/oddish/bitmask.asm"
GloomBitmasks: INCLUDE "gfx/pokemon/gloom/bitmask.asm"
VileplumeBitmasks: INCLUDE "gfx/pokemon/vileplume/bitmask.asm"
ParasporBitmasks: INCLUDE "gfx/pokemon/paraspor/bitmask.asm"
ParasBitmasks: INCLUDE "gfx/pokemon/paras/bitmask.asm"
ParasectBitmasks: INCLUDE "gfx/pokemon/parasect/bitmask.asm"
VenonatBitmasks: INCLUDE "gfx/pokemon/venonat/bitmask.asm"
VenomothBitmasks: INCLUDE "gfx/pokemon/venomoth/bitmask.asm"
DiglettBitmasks: INCLUDE "gfx/pokemon/diglett/bitmask.asm"
DugtrioBitmasks: INCLUDE "gfx/pokemon/dugtrio/bitmask.asm"
CoinpurBitmasks: INCLUDE "gfx/pokemon/coinpur/bitmask.asm"
MeowthBitmasks: INCLUDE "gfx/pokemon/meowth/bitmask.asm"
PersianBitmasks: INCLUDE "gfx/pokemon/persian/bitmask.asm"
PerrserkerBitmasks: INCLUDE "gfx/pokemon/perrserker/bitmask.asm"
PsyduckBitmasks: INCLUDE "gfx/pokemon/psyduck/bitmask.asm"
GolduckBitmasks: INCLUDE "gfx/pokemon/golduck/bitmask.asm"
MankeyBitmasks: INCLUDE "gfx/pokemon/mankey/bitmask.asm"
PrimeapeBitmasks: INCLUDE "gfx/pokemon/primeape/bitmask.asm"
AnnihilapeBitmasks: INCLUDE "gfx/pokemon/annihilape/bitmask.asm"
PupperonBitmasks: INCLUDE "gfx/pokemon/pupperon/bitmask.asm"
GrowlitheBitmasks: INCLUDE "gfx/pokemon/growlithe/bitmask.asm"
ArcanineBitmasks: INCLUDE "gfx/pokemon/arcanine/bitmask.asm"
PoliwagBitmasks: INCLUDE "gfx/pokemon/poliwag/bitmask.asm"
@ -208,6 +222,9 @@ WooperBitmasks: INCLUDE "gfx/pokemon/wooper/bitmask.asm"
QuagsireBitmasks: INCLUDE "gfx/pokemon/quagsire/bitmask.asm"
EspeonBitmasks: INCLUDE "gfx/pokemon/espeon/bitmask.asm"
UmbreonBitmasks: INCLUDE "gfx/pokemon/umbreon/bitmask.asm"
LeafeonBitmasks: INCLUDE "gfx/pokemon/leafeon/bitmask.asm"
GlaceonBitmasks: INCLUDE "gfx/pokemon/glaceon/bitmask.asm"
SylveonBitmasks: INCLUDE "gfx/pokemon/sylveon/bitmask.asm"
MurkrowBitmasks: INCLUDE "gfx/pokemon/murkrow/bitmask.asm"
SlowkingBitmasks: INCLUDE "gfx/pokemon/slowking/bitmask.asm"
MisdreavusBitmasks: INCLUDE "gfx/pokemon/misdreavus/bitmask.asm"