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 @@ ButterfreePokedexEntry:: INCLUDE "data/pokemon/dex_entries/butterfree.asm"
WeedlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/weedle.asm"
KakunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kakuna.asm"
BeedrillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/beedrill.asm"
KotoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kotora.asm"
GaotoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gaotora.asm"
GorotoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gorotora.asm"
RaitoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raitora.asm"
GentlarvaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gentlarva.asm"
PupalPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupal.asm"
CarapthorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/carapthor.asm"
PidgeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgey.asm"
PidgeottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgeotto.asm"
PidgeotPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgeot.asm"
@ -38,27 +45,34 @@ NidokingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoking.asm"
NidoreignPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoreign.asm"
ClefairyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefairy.asm"
ClefablePokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefable.asm"
VulpiiiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vulpiii.asm"
VulpixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vulpix.asm"
NinetalesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ninetales.asm"
JigglypuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jigglypuff.asm"
WigglytuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wigglytuff.asm"
BittybatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bittybat.asm"
ZubatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/zubat.asm"
GolbatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golbat.asm"
OddishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/oddish.asm"
GloomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gloom.asm"
VileplumePokedexEntry:: INCLUDE "data/pokemon/dex_entries/vileplume.asm"
ParasporPokedexEntry:: INCLUDE "data/pokemon/dex_entries/paraspor.asm"
ParasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/paras.asm"
ParasectPokedexEntry:: INCLUDE "data/pokemon/dex_entries/parasect.asm"
VenonatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venonat.asm"
VenomothPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venomoth.asm"
DiglettPokedexEntry:: INCLUDE "data/pokemon/dex_entries/diglett.asm"
DugtrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dugtrio.asm"
CoinpurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/coinpur.asm"
MeowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/meowth.asm"
PerrserkerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/perrserker.asm"
PersianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/persian.asm"
PsyduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/psyduck.asm"
GolduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golduck.asm"
MankeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mankey.asm"
PrimeapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/primeape.asm"
AnnihilapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/annihilape.asm"
PupperonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupperon.asm"
GrowlithePokedexEntry:: INCLUDE "data/pokemon/dex_entries/growlithe.asm"
ArcaninePokedexEntry:: INCLUDE "data/pokemon/dex_entries/arcanine.asm"
PoliwagPokedexEntry:: INCLUDE "data/pokemon/dex_entries/poliwag.asm"
@ -222,6 +236,9 @@ WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wooper.asm"
QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/quagsire.asm"
EspeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/espeon.asm"
UmbreonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/umbreon.asm"
LeafeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/leafeon.asm"
GlaceonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/glaceon.asm"
SylveonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sylveon.asm"
MurkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/murkrow.asm"
SlowkingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowking.asm"
MisdreavusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/misdreavus.asm"