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

@ -16,6 +16,13 @@ PokedexDataPointerTable:
dba WeedlePokedexEntry
dba KakunaPokedexEntry
dba BeedrillPokedexEntry
dba GentlarvaPokedexEntry
dba PupalPokedexEntry
dba CarapthorPokedexEntry
dba KotoraPokedexEntry
dba GaotoraPokedexEntry
dba GorotoraPokedexEntry
dba RaitoraPokedexEntry
dba PidgeyPokedexEntry
dba PidgeottoPokedexEntry
dba PidgeotPokedexEntry
@ -39,27 +46,34 @@ PokedexDataPointerTable:
dba NidoreignPokedexEntry
dba ClefairyPokedexEntry
dba ClefablePokedexEntry
dba VulpiiiPokedexEntry
dba VulpixPokedexEntry
dba NinetalesPokedexEntry
dba JigglypuffPokedexEntry
dba WigglytuffPokedexEntry
dba BittybatPokedexEntry
dba ZubatPokedexEntry
dba GolbatPokedexEntry
dba OddishPokedexEntry
dba GloomPokedexEntry
dba VileplumePokedexEntry
dba ParasporPokedexEntry
dba ParasPokedexEntry
dba ParasectPokedexEntry
dba VenonatPokedexEntry
dba VenomothPokedexEntry
dba DiglettPokedexEntry
dba DugtrioPokedexEntry
dba CoinpurPokedexEntry
dba MeowthPokedexEntry
dba PersianPokedexEntry
dba PerrserkerPokedexEntry
dba PsyduckPokedexEntry
dba GolduckPokedexEntry
dba MankeyPokedexEntry
dba PrimeapePokedexEntry
dba AnnihilapePokedexEntry
dba PupperonPokedexEntry
dba GrowlithePokedexEntry
dba ArcaninePokedexEntry
dba PoliwagPokedexEntry
@ -211,6 +225,9 @@ PokedexDataPointerTable:
dba QuagsirePokedexEntry
dba EspeonPokedexEntry
dba UmbreonPokedexEntry
dba LeafeonPokedexEntry
dba GlaceonPokedexEntry
dba SylveonPokedexEntry
dba MurkrowPokedexEntry
dba SlowkingPokedexEntry
dba MisdreavusPokedexEntry