diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/pokemon/dex_entries_gold.asm | 268 | ||||
| -rw-r--r-- | data/pokemon/dex_entries_silver.asm (renamed from data/pokemon/dex_entries.asm) | 269 | ||||
| -rw-r--r-- | data/sprite_anims/framesets.asm | 38 | ||||
| -rw-r--r-- | data/sprite_anims/oam.asm | 2 | ||||
| -rw-r--r-- | data/sprite_anims/sequences.asm | 2 | ||||
| -rw-r--r-- | data/text/battle.asm | 2 |
6 files changed, 291 insertions, 290 deletions
diff --git a/data/pokemon/dex_entries_gold.asm b/data/pokemon/dex_entries_gold.asm new file mode 100644 index 00000000..2d4a9029 --- /dev/null +++ b/data/pokemon/dex_entries_gold.asm @@ -0,0 +1,268 @@ +INCLUDE "constants.asm" + + +SECTION "Pokedex Entries 001-064", ROMX + +BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bulbasaur.asm" +IvysaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ivysaur.asm" +VenusaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/venusaur.asm" +CharmanderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/charmander.asm" +CharmeleonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/charmeleon.asm" +CharizardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/charizard.asm" +SquirtlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/squirtle.asm" +WartortlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wartortle.asm" +BlastoisePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/blastoise.asm" +CaterpiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/caterpie.asm" +MetapodPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/metapod.asm" +ButterfreePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/butterfree.asm" +WeedlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/weedle.asm" +KakunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kakuna.asm" +BeedrillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/beedrill.asm" +PidgeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pidgey.asm" +PidgeottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pidgeotto.asm" +PidgeotPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pidgeot.asm" +RattataPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rattata.asm" +RaticatePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/raticate.asm" +SpearowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/spearow.asm" +FearowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/fearow.asm" +EkansPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ekans.asm" +ArbokPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/arbok.asm" +PikachuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pikachu.asm" +RaichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/raichu.asm" +SandshrewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sandshrew.asm" +SandslashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sandslash.asm" +NidoranFPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoran_f.asm" +NidorinaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidorina.asm" +NidoqueenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoqueen.asm" +NidoranMPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoran_m.asm" +NidorinoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidorino.asm" +NidokingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoking.asm" +ClefairyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/clefairy.asm" +ClefablePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/clefable.asm" +VulpixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/vulpix.asm" +NinetalesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ninetales.asm" +JigglypuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jigglypuff.asm" +WigglytuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wigglytuff.asm" +ZubatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/zubat.asm" +GolbatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/golbat.asm" +OddishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/oddish.asm" +GloomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gloom.asm" +VileplumePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/vileplume.asm" +ParasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/paras.asm" +ParasectPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/parasect.asm" +VenonatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/venonat.asm" +VenomothPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/venomoth.asm" +DiglettPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/diglett.asm" +DugtrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dugtrio.asm" +MeowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/meowth.asm" +PersianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/persian.asm" +PsyduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/psyduck.asm" +GolduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/golduck.asm" +MankeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mankey.asm" +PrimeapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/primeape.asm" +GrowlithePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/growlithe.asm" +ArcaninePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/arcanine.asm" +PoliwagPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/poliwag.asm" +PoliwhirlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/poliwhirl.asm" +PoliwrathPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/poliwrath.asm" +AbraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/abra.asm" +KadabraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kadabra.asm" + + +SECTION "Pokedex Entries 065-128", ROMX + +AlakazamPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/alakazam.asm" +MachopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/machop.asm" +MachokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/machoke.asm" +MachampPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/machamp.asm" +BellsproutPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bellsprout.asm" +WeepinbellPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/weepinbell.asm" +VictreebelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/victreebel.asm" +TentacoolPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tentacool.asm" +TentacruelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tentacruel.asm" +GeodudePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/geodude.asm" +GravelerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/graveler.asm" +GolemPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/golem.asm" +PonytaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ponyta.asm" +RapidashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rapidash.asm" +SlowpokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slowpoke.asm" +SlowbroPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slowbro.asm" +MagnemitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magnemite.asm" +MagnetonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magneton.asm" +FarfetchDPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/farfetch_d.asm" +DoduoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/doduo.asm" +DodrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dodrio.asm" +SeelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/seel.asm" +DewgongPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dewgong.asm" +GrimerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/grimer.asm" +MukPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/muk.asm" +ShellderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/shellder.asm" +CloysterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cloyster.asm" +GastlyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gastly.asm" +HaunterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/haunter.asm" +GengarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gengar.asm" +OnixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/onix.asm" +DrowzeePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/drowzee.asm" +HypnoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hypno.asm" +KrabbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/krabby.asm" +KinglerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kingler.asm" +VoltorbPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/voltorb.asm" +ElectrodePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/electrode.asm" +ExeggcutePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/exeggcute.asm" +ExeggutorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/exeggutor.asm" +CubonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cubone.asm" +MarowakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/marowak.asm" +HitmonleePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hitmonlee.asm" +HitmonchanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hitmonchan.asm" +LickitungPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lickitung.asm" +KoffingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/koffing.asm" +WeezingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/weezing.asm" +RhyhornPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rhyhorn.asm" +RhydonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rhydon.asm" +ChanseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/chansey.asm" +TangelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tangela.asm" +KangaskhanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kangaskhan.asm" +HorseaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/horsea.asm" +SeadraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/seadra.asm" +GoldeenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/goldeen.asm" +SeakingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/seaking.asm" +StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/staryu.asm" +StarmiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/starmie.asm" +MrMimePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mr__mime.asm" +ScytherPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/scyther.asm" +JynxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jynx.asm" +ElectabuzzPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/electabuzz.asm" +MagmarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magmar.asm" +PinsirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pinsir.asm" +TaurosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tauros.asm" + + +SECTION "Pokedex Entries 129-192", ROMX + +MagikarpPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magikarp.asm" +GyaradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gyarados.asm" +LaprasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lapras.asm" +DittoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ditto.asm" +EeveePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/eevee.asm" +VaporeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/vaporeon.asm" +JolteonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jolteon.asm" +FlareonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/flareon.asm" +PorygonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/porygon.asm" +OmanytePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/omanyte.asm" +OmastarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/omastar.asm" +KabutoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kabuto.asm" +KabutopsPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kabutops.asm" +AerodactylPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/aerodactyl.asm" +SnorlaxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/snorlax.asm" +ArticunoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/articuno.asm" +ZapdosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/zapdos.asm" +MoltresPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/moltres.asm" +DratiniPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dratini.asm" +DragonairPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dragonair.asm" +DragonitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dragonite.asm" +MewtwoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mewtwo.asm" +MewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mew.asm" +ChikoritaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/chikorita.asm" +BayleefPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bayleef.asm" +MeganiumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/meganium.asm" +CyndaquilPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cyndaquil.asm" +QuilavaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/quilava.asm" +TyphlosionPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/typhlosion.asm" +TotodilePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/totodile.asm" +CroconawPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/croconaw.asm" +FeraligatrPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/feraligatr.asm" +SentretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sentret.asm" +FurretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/furret.asm" +HoothootPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hoothoot.asm" +NoctowlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/noctowl.asm" +LedybaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ledyba.asm" +LedianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ledian.asm" +SpinarakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/spinarak.asm" +AriadosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ariados.asm" +CrobatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/crobat.asm" +ChinchouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/chinchou.asm" +LanturnPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lanturn.asm" +PichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pichu.asm" +CleffaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cleffa.asm" +IgglybuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/igglybuff.asm" +TogepiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/togepi.asm" +TogeticPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/togetic.asm" +NatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/natu.asm" +XatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/xatu.asm" +MareepPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mareep.asm" +FlaaffyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/flaaffy.asm" +AmpharosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ampharos.asm" +BellossomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bellossom.asm" +MarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/marill.asm" +AzumarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/azumarill.asm" +SudowoodoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sudowoodo.asm" +PolitoedPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/politoed.asm" +HoppipPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hoppip.asm" +SkiploomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/skiploom.asm" +JumpluffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jumpluff.asm" +AipomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/aipom.asm" +SunkernPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sunkern.asm" +SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sunflora.asm" + + +SECTION "Pokedex Entries 193-251", ROMX + +YanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/yanma.asm" +WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wooper.asm" +QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/quagsire.asm" +EspeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/espeon.asm" +UmbreonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/umbreon.asm" +MurkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/murkrow.asm" +SlowkingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slowking.asm" +MisdreavusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/misdreavus.asm" +UnownPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/unown.asm" +WobbuffetPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wobbuffet.asm" +GirafarigPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/girafarig.asm" +PinecoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pineco.asm" +ForretressPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/forretress.asm" +DunsparcePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dunsparce.asm" +GligarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gligar.asm" +SteelixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/steelix.asm" +SnubbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/snubbull.asm" +GranbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/granbull.asm" +QwilfishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/qwilfish.asm" +ScizorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/scizor.asm" +ShucklePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/shuckle.asm" +HeracrossPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/heracross.asm" +SneaselPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sneasel.asm" +TeddiursaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/teddiursa.asm" +UrsaringPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ursaring.asm" +SlugmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slugma.asm" +MagcargoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magcargo.asm" +SwinubPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/swinub.asm" +PiloswinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/piloswine.asm" +CorsolaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/corsola.asm" +RemoraidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/remoraid.asm" +OctilleryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/octillery.asm" +DelibirdPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/delibird.asm" +MantinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mantine.asm" +SkarmoryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/skarmory.asm" +HoundourPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/houndour.asm" +HoundoomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/houndoom.asm" +KingdraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kingdra.asm" +PhanpyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/phanpy.asm" +DonphanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/donphan.asm" +Porygon2PokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/porygon2.asm" +StantlerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/stantler.asm" +SmearglePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/smeargle.asm" +TyroguePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tyrogue.asm" +HitmontopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hitmontop.asm" +SmoochumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/smoochum.asm" +ElekidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/elekid.asm" +MagbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magby.asm" +MiltankPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/miltank.asm" +BlisseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/blissey.asm" +RaikouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/raikou.asm" +EnteiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/entei.asm" +SuicunePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/suicune.asm" +LarvitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/larvitar.asm" +PupitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pupitar.asm" +TyranitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tyranitar.asm" +LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lugia.asm" +HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ho_oh.asm" +CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/celebi.asm" diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries_silver.asm index 6550eae4..0cf54646 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries_silver.asm @@ -1,274 +1,6 @@ INCLUDE "constants.asm" -IF DEF(_GOLD) -SECTION "Pokedex Entries 001-064", ROMX - -BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bulbasaur.asm" -IvysaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ivysaur.asm" -VenusaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/venusaur.asm" -CharmanderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/charmander.asm" -CharmeleonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/charmeleon.asm" -CharizardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/charizard.asm" -SquirtlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/squirtle.asm" -WartortlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wartortle.asm" -BlastoisePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/blastoise.asm" -CaterpiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/caterpie.asm" -MetapodPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/metapod.asm" -ButterfreePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/butterfree.asm" -WeedlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/weedle.asm" -KakunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kakuna.asm" -BeedrillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/beedrill.asm" -PidgeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pidgey.asm" -PidgeottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pidgeotto.asm" -PidgeotPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pidgeot.asm" -RattataPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rattata.asm" -RaticatePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/raticate.asm" -SpearowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/spearow.asm" -FearowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/fearow.asm" -EkansPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ekans.asm" -ArbokPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/arbok.asm" -PikachuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pikachu.asm" -RaichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/raichu.asm" -SandshrewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sandshrew.asm" -SandslashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sandslash.asm" -NidoranFPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoran_f.asm" -NidorinaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidorina.asm" -NidoqueenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoqueen.asm" -NidoranMPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoran_m.asm" -NidorinoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidorino.asm" -NidokingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/nidoking.asm" -ClefairyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/clefairy.asm" -ClefablePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/clefable.asm" -VulpixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/vulpix.asm" -NinetalesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ninetales.asm" -JigglypuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jigglypuff.asm" -WigglytuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wigglytuff.asm" -ZubatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/zubat.asm" -GolbatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/golbat.asm" -OddishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/oddish.asm" -GloomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gloom.asm" -VileplumePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/vileplume.asm" -ParasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/paras.asm" -ParasectPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/parasect.asm" -VenonatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/venonat.asm" -VenomothPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/venomoth.asm" -DiglettPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/diglett.asm" -DugtrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dugtrio.asm" -MeowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/meowth.asm" -PersianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/persian.asm" -PsyduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/psyduck.asm" -GolduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/golduck.asm" -MankeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mankey.asm" -PrimeapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/primeape.asm" -GrowlithePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/growlithe.asm" -ArcaninePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/arcanine.asm" -PoliwagPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/poliwag.asm" -PoliwhirlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/poliwhirl.asm" -PoliwrathPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/poliwrath.asm" -AbraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/abra.asm" -KadabraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kadabra.asm" - - -SECTION "Pokedex Entries 065-128", ROMX - -AlakazamPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/alakazam.asm" -MachopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/machop.asm" -MachokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/machoke.asm" -MachampPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/machamp.asm" -BellsproutPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bellsprout.asm" -WeepinbellPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/weepinbell.asm" -VictreebelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/victreebel.asm" -TentacoolPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tentacool.asm" -TentacruelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tentacruel.asm" -GeodudePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/geodude.asm" -GravelerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/graveler.asm" -GolemPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/golem.asm" -PonytaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ponyta.asm" -RapidashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rapidash.asm" -SlowpokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slowpoke.asm" -SlowbroPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slowbro.asm" -MagnemitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magnemite.asm" -MagnetonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magneton.asm" -FarfetchDPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/farfetch_d.asm" -DoduoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/doduo.asm" -DodrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dodrio.asm" -SeelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/seel.asm" -DewgongPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dewgong.asm" -GrimerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/grimer.asm" -MukPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/muk.asm" -ShellderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/shellder.asm" -CloysterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cloyster.asm" -GastlyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gastly.asm" -HaunterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/haunter.asm" -GengarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gengar.asm" -OnixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/onix.asm" -DrowzeePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/drowzee.asm" -HypnoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hypno.asm" -KrabbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/krabby.asm" -KinglerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kingler.asm" -VoltorbPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/voltorb.asm" -ElectrodePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/electrode.asm" -ExeggcutePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/exeggcute.asm" -ExeggutorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/exeggutor.asm" -CubonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cubone.asm" -MarowakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/marowak.asm" -HitmonleePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hitmonlee.asm" -HitmonchanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hitmonchan.asm" -LickitungPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lickitung.asm" -KoffingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/koffing.asm" -WeezingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/weezing.asm" -RhyhornPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rhyhorn.asm" -RhydonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/rhydon.asm" -ChanseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/chansey.asm" -TangelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tangela.asm" -KangaskhanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kangaskhan.asm" -HorseaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/horsea.asm" -SeadraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/seadra.asm" -GoldeenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/goldeen.asm" -SeakingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/seaking.asm" -StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/staryu.asm" -StarmiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/starmie.asm" -MrMimePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mr__mime.asm" -ScytherPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/scyther.asm" -JynxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jynx.asm" -ElectabuzzPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/electabuzz.asm" -MagmarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magmar.asm" -PinsirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pinsir.asm" -TaurosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tauros.asm" - - -SECTION "Pokedex Entries 129-192", ROMX - -MagikarpPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magikarp.asm" -GyaradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gyarados.asm" -LaprasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lapras.asm" -DittoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ditto.asm" -EeveePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/eevee.asm" -VaporeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/vaporeon.asm" -JolteonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jolteon.asm" -FlareonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/flareon.asm" -PorygonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/porygon.asm" -OmanytePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/omanyte.asm" -OmastarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/omastar.asm" -KabutoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kabuto.asm" -KabutopsPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kabutops.asm" -AerodactylPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/aerodactyl.asm" -SnorlaxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/snorlax.asm" -ArticunoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/articuno.asm" -ZapdosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/zapdos.asm" -MoltresPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/moltres.asm" -DratiniPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dratini.asm" -DragonairPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dragonair.asm" -DragonitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dragonite.asm" -MewtwoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mewtwo.asm" -MewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mew.asm" -ChikoritaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/chikorita.asm" -BayleefPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bayleef.asm" -MeganiumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/meganium.asm" -CyndaquilPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cyndaquil.asm" -QuilavaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/quilava.asm" -TyphlosionPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/typhlosion.asm" -TotodilePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/totodile.asm" -CroconawPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/croconaw.asm" -FeraligatrPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/feraligatr.asm" -SentretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sentret.asm" -FurretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/furret.asm" -HoothootPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hoothoot.asm" -NoctowlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/noctowl.asm" -LedybaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ledyba.asm" -LedianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ledian.asm" -SpinarakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/spinarak.asm" -AriadosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ariados.asm" -CrobatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/crobat.asm" -ChinchouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/chinchou.asm" -LanturnPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lanturn.asm" -PichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pichu.asm" -CleffaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/cleffa.asm" -IgglybuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/igglybuff.asm" -TogepiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/togepi.asm" -TogeticPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/togetic.asm" -NatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/natu.asm" -XatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/xatu.asm" -MareepPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mareep.asm" -FlaaffyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/flaaffy.asm" -AmpharosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ampharos.asm" -BellossomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bellossom.asm" -MarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/marill.asm" -AzumarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/azumarill.asm" -SudowoodoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sudowoodo.asm" -PolitoedPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/politoed.asm" -HoppipPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hoppip.asm" -SkiploomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/skiploom.asm" -JumpluffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/jumpluff.asm" -AipomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/aipom.asm" -SunkernPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sunkern.asm" -SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sunflora.asm" - - -SECTION "Pokedex Entries 193-251", ROMX - -YanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/yanma.asm" -WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wooper.asm" -QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/quagsire.asm" -EspeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/espeon.asm" -UmbreonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/umbreon.asm" -MurkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/murkrow.asm" -SlowkingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slowking.asm" -MisdreavusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/misdreavus.asm" -UnownPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/unown.asm" -WobbuffetPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/wobbuffet.asm" -GirafarigPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/girafarig.asm" -PinecoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pineco.asm" -ForretressPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/forretress.asm" -DunsparcePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/dunsparce.asm" -GligarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/gligar.asm" -SteelixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/steelix.asm" -SnubbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/snubbull.asm" -GranbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/granbull.asm" -QwilfishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/qwilfish.asm" -ScizorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/scizor.asm" -ShucklePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/shuckle.asm" -HeracrossPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/heracross.asm" -SneaselPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/sneasel.asm" -TeddiursaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/teddiursa.asm" -UrsaringPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ursaring.asm" -SlugmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/slugma.asm" -MagcargoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magcargo.asm" -SwinubPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/swinub.asm" -PiloswinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/piloswine.asm" -CorsolaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/corsola.asm" -RemoraidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/remoraid.asm" -OctilleryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/octillery.asm" -DelibirdPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/delibird.asm" -MantinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/mantine.asm" -SkarmoryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/skarmory.asm" -HoundourPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/houndour.asm" -HoundoomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/houndoom.asm" -KingdraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/kingdra.asm" -PhanpyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/phanpy.asm" -DonphanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/donphan.asm" -Porygon2PokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/porygon2.asm" -StantlerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/stantler.asm" -SmearglePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/smeargle.asm" -TyroguePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tyrogue.asm" -HitmontopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/hitmontop.asm" -SmoochumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/smoochum.asm" -ElekidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/elekid.asm" -MagbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/magby.asm" -MiltankPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/miltank.asm" -BlisseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/blissey.asm" -RaikouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/raikou.asm" -EnteiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/entei.asm" -SuicunePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/suicune.asm" -LarvitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/larvitar.asm" -PupitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/pupitar.asm" -TyranitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/tyranitar.asm" -LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/lugia.asm" -HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/ho_oh.asm" -CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/celebi.asm" -ENDC -IF DEF(_SILVER) SECTION "Pokedex Entries 001-064", ROMX BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/silver/bulbasaur.asm" @@ -534,4 +266,3 @@ TyranitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/silver/tyranitar.asm" LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/silver/lugia.asm" HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/silver/ho_oh.asm" CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/silver/celebi.asm" -ENDC diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index 78969b87..22b81d0b 100644 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -23,9 +23,9 @@ SpriteAnimFrameData: dw .Frameset_GSIntroCyndaquil dw .Frameset_GSIntroTotodile dw .Frameset_GSTitleTrail - dw .Frameset_GSIntroPikachu ; SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU - dw .Frameset_GSIntroPikachu2 ; SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_2 - dw .Frameset_GSIntroPikachu4 ; SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_3 + dw .Frameset_GSIntroPikachu + dw .Frameset_GSIntroPikachu2 + dw .Frameset_GSIntroPikachu4 dw .Frameset_TextEntryCursor dw .Frameset_TextEntryCursorBig dw .Frameset_GameFreakLogo @@ -46,7 +46,7 @@ SpriteAnimFrameData: dw .Frameset_EvolutionBallOfLight dw .Frameset_RadioTuningKnob dw .Frameset_MagnetTrainRed - dw .Frameset_Unused1C + dw .Frameset_Unused2E dw .Frameset_Leaf dw .Frameset_CutTree dw .Frameset_EggCrack @@ -94,12 +94,12 @@ SpriteAnimFrameData: dorestart .Frameset_GSIntroMagikarp: - frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1, $41 - frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2, $41 + frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1, 1, OAM_X_FLIP + frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2, 1, OAM_X_FLIP dorestart .Frameset_UnusedLapras: - frame SPRITE_ANIM_OAMSET_UNUSED_LAPRAS, $47 + frame SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS, 7, OAM_X_FLIP endanim .Frameset_GSIntroLapras: @@ -118,14 +118,14 @@ SpriteAnimFrameData: endanim .Frameset_GSIntroJigglypuff: - frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, $59 + frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, 25, OAM_X_FLIP frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3, 9 - frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, $19 + frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, 25 frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3, 9 dorestart .Frameset_GSIntroJigglypuff2: - frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2, 32 + frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2, 32 endanim .Frameset_GSIntroPikachu: @@ -139,7 +139,7 @@ SpriteAnimFrameData: endanim .Frameset_GSIntroPikachu3: - frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 32 + frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 32 endanim .Frameset_GSIntroPikachuTail: @@ -150,7 +150,7 @@ SpriteAnimFrameData: dorestart .Frameset_GSIntroPikachuTail2: - frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1, $1f + frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1, 31 endanim .Frameset_GSIntroFireball: @@ -160,15 +160,15 @@ SpriteAnimFrameData: delanim .Frameset_GSIntroChikorita: - frame SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA, $18 + frame SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA, 24 delanim .Frameset_GSIntroCyndaquil: - frame SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL, $58 + frame SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL, 24, OAM_X_FLIP delanim .Frameset_GSIntroTotodile: - frame SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE, $18 + frame SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE, 24 delanim .Frameset_GSTitleTrail: @@ -177,14 +177,14 @@ IF DEF(_GOLD) frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2, 1 dorestart ELIF DEF(_SILVER) - frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1, 32 + frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1, 32 endanim ENDC .Frameset_GSIntroPikachu4: frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2, 0 - frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 15 - frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4, 15 + frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 15 + frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4, 15 endanim .Frameset_TextEntryCursor: @@ -334,7 +334,7 @@ ENDC dowait 3 dorestart -.Frameset_Unused1C: +.Frameset_Unused2E: dowait 32 endanim diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index 91175fb0..a1380a1b 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -9,7 +9,7 @@ SpriteAnimOAMData: dbw $6e, .OAMData_GSIntroShellder ; SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_2 dbw $2d, .OAMData_GSIntroMagikarp ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1 dbw $4d, .OAMData_GSIntroMagikarp ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2 - dbw $60, .OAMData_UnusedLapras ; SPRITE_ANIM_OAMSET_UNUSED_LAPRAS + dbw $60, .OAMData_UnusedLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS dbw $00, .OAMData_GSIntroLapras1 ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1 dbw $00, .OAMData_GSIntroLapras2 ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2 dbw $06, .OAMData_GSIntroLapras3 ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm index 581d7268..725d1984 100644 --- a/data/sprite_anims/sequences.asm +++ b/data/sprite_anims/sequences.asm @@ -45,6 +45,6 @@ SpriteAnimSeqData: db SPRITE_ANIM_FRAMESET_CUT_TREE, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_CUT_TREE db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_FLY_LEAF, $00 ; SPRITE_ANIM_INDEX_FLY_LEAF db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_EGG_CRACK - db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA, SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH + db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA, SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_HEADBUTT db SPRITE_ANIM_FRAMESET_EGG_HATCH_1, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 ; SPRITE_ANIM_INDEX_EGG_HATCH diff --git a/data/text/battle.asm b/data/text/battle.asm index 58fad4a9..c82e24c4 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -1071,6 +1071,8 @@ BeatUpAttackText: line "attack!" done +; BUG: Pokémon names 8-10 characters long can overflow the textbox, +; printing as "Enemy 1234567890 can't": up to 21 characters, over 18. CantReceiveGiftText: text "<TARGET> can't" line "receive the gift!" |