diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 7ac9d10ee..f9cc7ec77 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -367,71 +367,71 @@ MAX_OUTDOOR_SPRITES EQU 23 const_def const SPRITE_ANIM_FRAMESET_00 - const SPRITE_ANIM_FRAMESET_01 - const SPRITE_ANIM_FRAMESET_02 - const SPRITE_ANIM_FRAMESET_03 - const SPRITE_ANIM_FRAMESET_04 - const SPRITE_ANIM_FRAMESET_05 - const SPRITE_ANIM_FRAMESET_06 + const SPRITE_ANIM_FRAMESET_PARTY_MON + const SPRITE_ANIM_FRAMESET_02 ; unused? + const SPRITE_ANIM_FRAMESET_03 ; unused? + const SPRITE_ANIM_FRAMESET_04 ; unused? + const SPRITE_ANIM_FRAMESET_05 ; unused? + const SPRITE_ANIM_FRAMESET_06 ; unused? const SPRITE_ANIM_FRAMESET_07 - const SPRITE_ANIM_FRAMESET_08 - const SPRITE_ANIM_FRAMESET_09 + const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR + const SPRITE_ANIM_FRAMESET_09 ; unused? const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO const SPRITE_ANIM_FRAMESET_0B const SPRITE_ANIM_FRAMESET_0C - const SPRITE_ANIM_FRAMESET_SLOT_GOLEM + const SPRITE_ANIM_FRAMESET_SLOTS_GOLEM const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY - const SPRITE_ANIM_FRAMESET_0F + const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY_2 const SPRITE_ANIM_FRAMESET_SLOTS_EGG const SPRITE_ANIM_FRAMESET_WALK_CYCLE - const SPRITE_ANIM_FRAMESET_12 - const SPRITE_ANIM_FRAMESET_13 - const SPRITE_ANIM_FRAMESET_14 - const SPRITE_ANIM_FRAMESET_15 - const SPRITE_ANIM_FRAMESET_16 + const SPRITE_ANIM_FRAMESET_STILL_CURSOR + const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL + const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0 + const SPRITE_ANIM_FRAMESET_TRADE_POOF + const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE const SPRITE_ANIM_FRAMESET_TRADEMON_ICON const SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE - const SPRITE_ANIM_FRAMESET_19 - const SPRITE_ANIM_FRAMESET_1A - const SPRITE_ANIM_FRAMESET_1B - const SPRITE_ANIM_FRAMESET_1C + const SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT + const SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB + const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED + const SPRITE_ANIM_FRAMESET_1C ; unused? const SPRITE_ANIM_FRAMESET_LEAF - const SPRITE_ANIM_FRAMESET_1E - const SPRITE_ANIM_FRAMESET_1F - const SPRITE_ANIM_FRAMESET_20 - const SPRITE_ANIM_FRAMESET_21 - const SPRITE_ANIM_FRAMESET_22 - const SPRITE_ANIM_FRAMESET_23 + const SPRITE_ANIM_FRAMESET_CUT_TREE + const SPRITE_ANIM_FRAMESET_EGG_CRACK + const SPRITE_ANIM_FRAMESET_EGG_HATCH + const SPRITE_ANIM_FRAMESET_21 ; unused? + const SPRITE_ANIM_FRAMESET_22 ; unused? + const SPRITE_ANIM_FRAMESET_23 ; unused? const SPRITE_ANIM_FRAMESET_24 - const SPRITE_ANIM_FRAMESET_25 + const SPRITE_ANIM_FRAMESET_HEADBUTT const SPRITE_ANIM_FRAMESET_26 - const SPRITE_ANIM_FRAMESET_27 - const SPRITE_ANIM_FRAMESET_28 - const SPRITE_ANIM_FRAMESET_29 - const SPRITE_ANIM_FRAMESET_2A - const SPRITE_ANIM_FRAMESET_2B - const SPRITE_ANIM_FRAMESET_2C - const SPRITE_ANIM_FRAMESET_2D - const SPRITE_ANIM_FRAMESET_2E + const SPRITE_ANIM_FRAMESET_27 ; unused? + const SPRITE_ANIM_FRAMESET_28 ; unused? + const SPRITE_ANIM_FRAMESET_29 ; unused? + const SPRITE_ANIM_FRAMESET_2A ; unused? + const SPRITE_ANIM_FRAMESET_2B ; unused? + const SPRITE_ANIM_FRAMESET_2C ; unused? + const SPRITE_ANIM_FRAMESET_BLUE_WALK + const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE const SPRITE_ANIM_FRAMESET_2F const SPRITE_ANIM_FRAMESET_30 const SPRITE_ANIM_FRAMESET_31 const SPRITE_ANIM_FRAMESET_32 const SPRITE_ANIM_FRAMESET_33 const SPRITE_ANIM_FRAMESET_34 - const SPRITE_ANIM_FRAMESET_35 - const SPRITE_ANIM_FRAMESET_36 - const SPRITE_ANIM_FRAMESET_37 - const SPRITE_ANIM_FRAMESET_38 - const SPRITE_ANIM_FRAMESET_39 - const SPRITE_ANIM_FRAMESET_3A - const SPRITE_ANIM_FRAMESET_3B - const SPRITE_ANIM_FRAMESET_3C - const SPRITE_ANIM_FRAMESET_3D - const SPRITE_ANIM_FRAMESET_3E - const SPRITE_ANIM_FRAMESET_3F - const SPRITE_ANIM_FRAMESET_40 - const SPRITE_ANIM_FRAMESET_41 + const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE + const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_2 + const SPRITE_ANIM_FRAMESET_INTRO_PICHU + const SPRITE_ANIM_FRAMESET_INTRO_WOOPER + const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1 + const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_2 + const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_3 + const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_4 + const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F_2 + const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY + const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F + const SPRITE_ANIM_FRAMESET_CELEBI_LEFT + const SPRITE_ANIM_FRAMESET_CELEBI_RIGHT const_def const SPRITE_ANIM_SEQ_NULL diff --git a/data/pokedex/entries/063.asm b/data/pokedex/entries/abra.asm similarity index 100% rename from data/pokedex/entries/063.asm rename to data/pokedex/entries/abra.asm diff --git a/data/pokedex/entries/142.asm b/data/pokedex/entries/aerodactyl.asm similarity index 100% rename from data/pokedex/entries/142.asm rename to data/pokedex/entries/aerodactyl.asm diff --git a/data/pokedex/entries/190.asm b/data/pokedex/entries/aipom.asm similarity index 100% rename from data/pokedex/entries/190.asm rename to data/pokedex/entries/aipom.asm diff --git a/data/pokedex/entries/065.asm b/data/pokedex/entries/alakazam.asm similarity index 100% rename from data/pokedex/entries/065.asm rename to data/pokedex/entries/alakazam.asm diff --git a/data/pokedex/entries/181.asm b/data/pokedex/entries/ampharos.asm similarity index 100% rename from data/pokedex/entries/181.asm rename to data/pokedex/entries/ampharos.asm diff --git a/data/pokedex/entries/024.asm b/data/pokedex/entries/arbok.asm similarity index 100% rename from data/pokedex/entries/024.asm rename to data/pokedex/entries/arbok.asm diff --git a/data/pokedex/entries/059.asm b/data/pokedex/entries/arcanine.asm similarity index 100% rename from data/pokedex/entries/059.asm rename to data/pokedex/entries/arcanine.asm diff --git a/data/pokedex/entries/168.asm b/data/pokedex/entries/ariados.asm similarity index 100% rename from data/pokedex/entries/168.asm rename to data/pokedex/entries/ariados.asm diff --git a/data/pokedex/entries/144.asm b/data/pokedex/entries/articuno.asm similarity index 100% rename from data/pokedex/entries/144.asm rename to data/pokedex/entries/articuno.asm diff --git a/data/pokedex/entries/184.asm b/data/pokedex/entries/azumarill.asm similarity index 100% rename from data/pokedex/entries/184.asm rename to data/pokedex/entries/azumarill.asm diff --git a/data/pokedex/entries/153.asm b/data/pokedex/entries/bayleef.asm similarity index 100% rename from data/pokedex/entries/153.asm rename to data/pokedex/entries/bayleef.asm diff --git a/data/pokedex/entries/015.asm b/data/pokedex/entries/beedrill.asm similarity index 100% rename from data/pokedex/entries/015.asm rename to data/pokedex/entries/beedrill.asm diff --git a/data/pokedex/entries/182.asm b/data/pokedex/entries/bellossom.asm similarity index 100% rename from data/pokedex/entries/182.asm rename to data/pokedex/entries/bellossom.asm diff --git a/data/pokedex/entries/069.asm b/data/pokedex/entries/bellsprout.asm similarity index 100% rename from data/pokedex/entries/069.asm rename to data/pokedex/entries/bellsprout.asm diff --git a/data/pokedex/entries/009.asm b/data/pokedex/entries/blastoise.asm similarity index 100% rename from data/pokedex/entries/009.asm rename to data/pokedex/entries/blastoise.asm diff --git a/data/pokedex/entries/242.asm b/data/pokedex/entries/blissey.asm similarity index 100% rename from data/pokedex/entries/242.asm rename to data/pokedex/entries/blissey.asm diff --git a/data/pokedex/entries/001.asm b/data/pokedex/entries/bulbasaur.asm similarity index 100% rename from data/pokedex/entries/001.asm rename to data/pokedex/entries/bulbasaur.asm diff --git a/data/pokedex/entries/012.asm b/data/pokedex/entries/butterfree.asm similarity index 100% rename from data/pokedex/entries/012.asm rename to data/pokedex/entries/butterfree.asm diff --git a/data/pokedex/entries/010.asm b/data/pokedex/entries/caterpie.asm similarity index 100% rename from data/pokedex/entries/010.asm rename to data/pokedex/entries/caterpie.asm diff --git a/data/pokedex/entries/251.asm b/data/pokedex/entries/celebi.asm similarity index 100% rename from data/pokedex/entries/251.asm rename to data/pokedex/entries/celebi.asm diff --git a/data/pokedex/entries/113.asm b/data/pokedex/entries/chansey.asm similarity index 100% rename from data/pokedex/entries/113.asm rename to data/pokedex/entries/chansey.asm diff --git a/data/pokedex/entries/006.asm b/data/pokedex/entries/charizard.asm similarity index 100% rename from data/pokedex/entries/006.asm rename to data/pokedex/entries/charizard.asm diff --git a/data/pokedex/entries/004.asm b/data/pokedex/entries/charmander.asm similarity index 100% rename from data/pokedex/entries/004.asm rename to data/pokedex/entries/charmander.asm diff --git a/data/pokedex/entries/005.asm b/data/pokedex/entries/charmeleon.asm similarity index 100% rename from data/pokedex/entries/005.asm rename to data/pokedex/entries/charmeleon.asm diff --git a/data/pokedex/entries/152.asm b/data/pokedex/entries/chikorita.asm similarity index 100% rename from data/pokedex/entries/152.asm rename to data/pokedex/entries/chikorita.asm diff --git a/data/pokedex/entries/170.asm b/data/pokedex/entries/chinchou.asm similarity index 100% rename from data/pokedex/entries/170.asm rename to data/pokedex/entries/chinchou.asm diff --git a/data/pokedex/entries/036.asm b/data/pokedex/entries/clefable.asm similarity index 100% rename from data/pokedex/entries/036.asm rename to data/pokedex/entries/clefable.asm diff --git a/data/pokedex/entries/035.asm b/data/pokedex/entries/clefairy.asm similarity index 100% rename from data/pokedex/entries/035.asm rename to data/pokedex/entries/clefairy.asm diff --git a/data/pokedex/entries/173.asm b/data/pokedex/entries/cleffa.asm similarity index 100% rename from data/pokedex/entries/173.asm rename to data/pokedex/entries/cleffa.asm diff --git a/data/pokedex/entries/091.asm b/data/pokedex/entries/cloyster.asm similarity index 100% rename from data/pokedex/entries/091.asm rename to data/pokedex/entries/cloyster.asm diff --git a/data/pokedex/entries/222.asm b/data/pokedex/entries/corsola.asm similarity index 100% rename from data/pokedex/entries/222.asm rename to data/pokedex/entries/corsola.asm diff --git a/data/pokedex/entries/169.asm b/data/pokedex/entries/crobat.asm similarity index 100% rename from data/pokedex/entries/169.asm rename to data/pokedex/entries/crobat.asm diff --git a/data/pokedex/entries/159.asm b/data/pokedex/entries/croconaw.asm similarity index 100% rename from data/pokedex/entries/159.asm rename to data/pokedex/entries/croconaw.asm diff --git a/data/pokedex/entries/104.asm b/data/pokedex/entries/cubone.asm similarity index 100% rename from data/pokedex/entries/104.asm rename to data/pokedex/entries/cubone.asm diff --git a/data/pokedex/entries/155.asm b/data/pokedex/entries/cyndaquil.asm similarity index 100% rename from data/pokedex/entries/155.asm rename to data/pokedex/entries/cyndaquil.asm diff --git a/data/pokedex/entries/225.asm b/data/pokedex/entries/delibird.asm similarity index 100% rename from data/pokedex/entries/225.asm rename to data/pokedex/entries/delibird.asm diff --git a/data/pokedex/entries/087.asm b/data/pokedex/entries/dewgong.asm similarity index 100% rename from data/pokedex/entries/087.asm rename to data/pokedex/entries/dewgong.asm diff --git a/data/pokedex/entries/050.asm b/data/pokedex/entries/diglett.asm similarity index 100% rename from data/pokedex/entries/050.asm rename to data/pokedex/entries/diglett.asm diff --git a/data/pokedex/entries/132.asm b/data/pokedex/entries/ditto.asm similarity index 100% rename from data/pokedex/entries/132.asm rename to data/pokedex/entries/ditto.asm diff --git a/data/pokedex/entries/085.asm b/data/pokedex/entries/dodrio.asm similarity index 100% rename from data/pokedex/entries/085.asm rename to data/pokedex/entries/dodrio.asm diff --git a/data/pokedex/entries/084.asm b/data/pokedex/entries/doduo.asm similarity index 100% rename from data/pokedex/entries/084.asm rename to data/pokedex/entries/doduo.asm diff --git a/data/pokedex/entries/232.asm b/data/pokedex/entries/donphan.asm similarity index 100% rename from data/pokedex/entries/232.asm rename to data/pokedex/entries/donphan.asm diff --git a/data/pokedex/entries/148.asm b/data/pokedex/entries/dragonair.asm similarity index 100% rename from data/pokedex/entries/148.asm rename to data/pokedex/entries/dragonair.asm diff --git a/data/pokedex/entries/149.asm b/data/pokedex/entries/dragonite.asm similarity index 100% rename from data/pokedex/entries/149.asm rename to data/pokedex/entries/dragonite.asm diff --git a/data/pokedex/entries/147.asm b/data/pokedex/entries/dratini.asm similarity index 100% rename from data/pokedex/entries/147.asm rename to data/pokedex/entries/dratini.asm diff --git a/data/pokedex/entries/096.asm b/data/pokedex/entries/drowzee.asm similarity index 100% rename from data/pokedex/entries/096.asm rename to data/pokedex/entries/drowzee.asm diff --git a/data/pokedex/entries/051.asm b/data/pokedex/entries/dugtrio.asm similarity index 100% rename from data/pokedex/entries/051.asm rename to data/pokedex/entries/dugtrio.asm diff --git a/data/pokedex/entries/206.asm b/data/pokedex/entries/dunsparce.asm similarity index 100% rename from data/pokedex/entries/206.asm rename to data/pokedex/entries/dunsparce.asm diff --git a/data/pokedex/entries/133.asm b/data/pokedex/entries/eevee.asm similarity index 100% rename from data/pokedex/entries/133.asm rename to data/pokedex/entries/eevee.asm diff --git a/data/pokedex/entries/023.asm b/data/pokedex/entries/ekans.asm similarity index 100% rename from data/pokedex/entries/023.asm rename to data/pokedex/entries/ekans.asm diff --git a/data/pokedex/entries/125.asm b/data/pokedex/entries/electabuzz.asm similarity index 100% rename from data/pokedex/entries/125.asm rename to data/pokedex/entries/electabuzz.asm diff --git a/data/pokedex/entries/101.asm b/data/pokedex/entries/electrode.asm similarity index 100% rename from data/pokedex/entries/101.asm rename to data/pokedex/entries/electrode.asm diff --git a/data/pokedex/entries/239.asm b/data/pokedex/entries/elekid.asm similarity index 100% rename from data/pokedex/entries/239.asm rename to data/pokedex/entries/elekid.asm diff --git a/data/pokedex/entries/244.asm b/data/pokedex/entries/entei.asm similarity index 100% rename from data/pokedex/entries/244.asm rename to data/pokedex/entries/entei.asm diff --git a/data/pokedex/entries/196.asm b/data/pokedex/entries/espeon.asm similarity index 100% rename from data/pokedex/entries/196.asm rename to data/pokedex/entries/espeon.asm diff --git a/data/pokedex/entries/102.asm b/data/pokedex/entries/exeggcute.asm similarity index 100% rename from data/pokedex/entries/102.asm rename to data/pokedex/entries/exeggcute.asm diff --git a/data/pokedex/entries/103.asm b/data/pokedex/entries/exeggutor.asm similarity index 100% rename from data/pokedex/entries/103.asm rename to data/pokedex/entries/exeggutor.asm diff --git a/data/pokedex/entries/083.asm b/data/pokedex/entries/farfetch_d.asm similarity index 100% rename from data/pokedex/entries/083.asm rename to data/pokedex/entries/farfetch_d.asm diff --git a/data/pokedex/entries/022.asm b/data/pokedex/entries/fearow.asm similarity index 100% rename from data/pokedex/entries/022.asm rename to data/pokedex/entries/fearow.asm diff --git a/data/pokedex/entries/160.asm b/data/pokedex/entries/feraligatr.asm similarity index 100% rename from data/pokedex/entries/160.asm rename to data/pokedex/entries/feraligatr.asm diff --git a/data/pokedex/entries/180.asm b/data/pokedex/entries/flaaffy.asm similarity index 100% rename from data/pokedex/entries/180.asm rename to data/pokedex/entries/flaaffy.asm diff --git a/data/pokedex/entries/136.asm b/data/pokedex/entries/flareon.asm similarity index 100% rename from data/pokedex/entries/136.asm rename to data/pokedex/entries/flareon.asm diff --git a/data/pokedex/entries/205.asm b/data/pokedex/entries/forretress.asm similarity index 100% rename from data/pokedex/entries/205.asm rename to data/pokedex/entries/forretress.asm diff --git a/data/pokedex/entries/162.asm b/data/pokedex/entries/furret.asm similarity index 100% rename from data/pokedex/entries/162.asm rename to data/pokedex/entries/furret.asm diff --git a/data/pokedex/entries/092.asm b/data/pokedex/entries/gastly.asm similarity index 100% rename from data/pokedex/entries/092.asm rename to data/pokedex/entries/gastly.asm diff --git a/data/pokedex/entries/094.asm b/data/pokedex/entries/gengar.asm similarity index 100% rename from data/pokedex/entries/094.asm rename to data/pokedex/entries/gengar.asm diff --git a/data/pokedex/entries/074.asm b/data/pokedex/entries/geodude.asm similarity index 100% rename from data/pokedex/entries/074.asm rename to data/pokedex/entries/geodude.asm diff --git a/data/pokedex/entries/203.asm b/data/pokedex/entries/girafarig.asm similarity index 100% rename from data/pokedex/entries/203.asm rename to data/pokedex/entries/girafarig.asm diff --git a/data/pokedex/entries/207.asm b/data/pokedex/entries/gligar.asm similarity index 100% rename from data/pokedex/entries/207.asm rename to data/pokedex/entries/gligar.asm diff --git a/data/pokedex/entries/044.asm b/data/pokedex/entries/gloom.asm similarity index 100% rename from data/pokedex/entries/044.asm rename to data/pokedex/entries/gloom.asm diff --git a/data/pokedex/entries/042.asm b/data/pokedex/entries/golbat.asm similarity index 100% rename from data/pokedex/entries/042.asm rename to data/pokedex/entries/golbat.asm diff --git a/data/pokedex/entries/118.asm b/data/pokedex/entries/goldeen.asm similarity index 100% rename from data/pokedex/entries/118.asm rename to data/pokedex/entries/goldeen.asm diff --git a/data/pokedex/entries/055.asm b/data/pokedex/entries/golduck.asm similarity index 100% rename from data/pokedex/entries/055.asm rename to data/pokedex/entries/golduck.asm diff --git a/data/pokedex/entries/076.asm b/data/pokedex/entries/golem.asm similarity index 100% rename from data/pokedex/entries/076.asm rename to data/pokedex/entries/golem.asm diff --git a/data/pokedex/entries/210.asm b/data/pokedex/entries/granbull.asm similarity index 100% rename from data/pokedex/entries/210.asm rename to data/pokedex/entries/granbull.asm diff --git a/data/pokedex/entries/075.asm b/data/pokedex/entries/graveler.asm similarity index 100% rename from data/pokedex/entries/075.asm rename to data/pokedex/entries/graveler.asm diff --git a/data/pokedex/entries/088.asm b/data/pokedex/entries/grimer.asm similarity index 100% rename from data/pokedex/entries/088.asm rename to data/pokedex/entries/grimer.asm diff --git a/data/pokedex/entries/058.asm b/data/pokedex/entries/growlithe.asm similarity index 100% rename from data/pokedex/entries/058.asm rename to data/pokedex/entries/growlithe.asm diff --git a/data/pokedex/entries/130.asm b/data/pokedex/entries/gyarados.asm similarity index 100% rename from data/pokedex/entries/130.asm rename to data/pokedex/entries/gyarados.asm diff --git a/data/pokedex/entries/093.asm b/data/pokedex/entries/haunter.asm similarity index 100% rename from data/pokedex/entries/093.asm rename to data/pokedex/entries/haunter.asm diff --git a/data/pokedex/entries/214.asm b/data/pokedex/entries/heracross.asm similarity index 100% rename from data/pokedex/entries/214.asm rename to data/pokedex/entries/heracross.asm diff --git a/data/pokedex/entries/107.asm b/data/pokedex/entries/hitmonchan.asm similarity index 100% rename from data/pokedex/entries/107.asm rename to data/pokedex/entries/hitmonchan.asm diff --git a/data/pokedex/entries/106.asm b/data/pokedex/entries/hitmonlee.asm similarity index 100% rename from data/pokedex/entries/106.asm rename to data/pokedex/entries/hitmonlee.asm diff --git a/data/pokedex/entries/237.asm b/data/pokedex/entries/hitmontop.asm similarity index 100% rename from data/pokedex/entries/237.asm rename to data/pokedex/entries/hitmontop.asm diff --git a/data/pokedex/entries/250.asm b/data/pokedex/entries/ho_oh.asm similarity index 100% rename from data/pokedex/entries/250.asm rename to data/pokedex/entries/ho_oh.asm diff --git a/data/pokedex/entries/163.asm b/data/pokedex/entries/hoothoot.asm similarity index 100% rename from data/pokedex/entries/163.asm rename to data/pokedex/entries/hoothoot.asm diff --git a/data/pokedex/entries/187.asm b/data/pokedex/entries/hoppip.asm similarity index 100% rename from data/pokedex/entries/187.asm rename to data/pokedex/entries/hoppip.asm diff --git a/data/pokedex/entries/116.asm b/data/pokedex/entries/horsea.asm similarity index 100% rename from data/pokedex/entries/116.asm rename to data/pokedex/entries/horsea.asm diff --git a/data/pokedex/entries/229.asm b/data/pokedex/entries/houndoom.asm similarity index 100% rename from data/pokedex/entries/229.asm rename to data/pokedex/entries/houndoom.asm diff --git a/data/pokedex/entries/228.asm b/data/pokedex/entries/houndour.asm similarity index 100% rename from data/pokedex/entries/228.asm rename to data/pokedex/entries/houndour.asm diff --git a/data/pokedex/entries/097.asm b/data/pokedex/entries/hypno.asm similarity index 100% rename from data/pokedex/entries/097.asm rename to data/pokedex/entries/hypno.asm diff --git a/data/pokedex/entries/174.asm b/data/pokedex/entries/igglybuff.asm similarity index 100% rename from data/pokedex/entries/174.asm rename to data/pokedex/entries/igglybuff.asm diff --git a/data/pokedex/entries/002.asm b/data/pokedex/entries/ivysaur.asm similarity index 100% rename from data/pokedex/entries/002.asm rename to data/pokedex/entries/ivysaur.asm diff --git a/data/pokedex/entries/039.asm b/data/pokedex/entries/jigglypuff.asm similarity index 100% rename from data/pokedex/entries/039.asm rename to data/pokedex/entries/jigglypuff.asm diff --git a/data/pokedex/entries/135.asm b/data/pokedex/entries/jolteon.asm similarity index 100% rename from data/pokedex/entries/135.asm rename to data/pokedex/entries/jolteon.asm diff --git a/data/pokedex/entries/189.asm b/data/pokedex/entries/jumpluff.asm similarity index 100% rename from data/pokedex/entries/189.asm rename to data/pokedex/entries/jumpluff.asm diff --git a/data/pokedex/entries/124.asm b/data/pokedex/entries/jynx.asm similarity index 100% rename from data/pokedex/entries/124.asm rename to data/pokedex/entries/jynx.asm diff --git a/data/pokedex/entries/140.asm b/data/pokedex/entries/kabuto.asm similarity index 100% rename from data/pokedex/entries/140.asm rename to data/pokedex/entries/kabuto.asm diff --git a/data/pokedex/entries/141.asm b/data/pokedex/entries/kabutops.asm similarity index 100% rename from data/pokedex/entries/141.asm rename to data/pokedex/entries/kabutops.asm diff --git a/data/pokedex/entries/064.asm b/data/pokedex/entries/kadabra.asm similarity index 100% rename from data/pokedex/entries/064.asm rename to data/pokedex/entries/kadabra.asm diff --git a/data/pokedex/entries/014.asm b/data/pokedex/entries/kakuna.asm similarity index 100% rename from data/pokedex/entries/014.asm rename to data/pokedex/entries/kakuna.asm diff --git a/data/pokedex/entries/115.asm b/data/pokedex/entries/kangaskhan.asm similarity index 100% rename from data/pokedex/entries/115.asm rename to data/pokedex/entries/kangaskhan.asm diff --git a/data/pokedex/entries/230.asm b/data/pokedex/entries/kingdra.asm similarity index 100% rename from data/pokedex/entries/230.asm rename to data/pokedex/entries/kingdra.asm diff --git a/data/pokedex/entries/099.asm b/data/pokedex/entries/kingler.asm similarity index 100% rename from data/pokedex/entries/099.asm rename to data/pokedex/entries/kingler.asm diff --git a/data/pokedex/entries/109.asm b/data/pokedex/entries/koffing.asm similarity index 100% rename from data/pokedex/entries/109.asm rename to data/pokedex/entries/koffing.asm diff --git a/data/pokedex/entries/098.asm b/data/pokedex/entries/krabby.asm similarity index 100% rename from data/pokedex/entries/098.asm rename to data/pokedex/entries/krabby.asm diff --git a/data/pokedex/entries/171.asm b/data/pokedex/entries/lanturn.asm similarity index 100% rename from data/pokedex/entries/171.asm rename to data/pokedex/entries/lanturn.asm diff --git a/data/pokedex/entries/131.asm b/data/pokedex/entries/lapras.asm similarity index 100% rename from data/pokedex/entries/131.asm rename to data/pokedex/entries/lapras.asm diff --git a/data/pokedex/entries/246.asm b/data/pokedex/entries/larvitar.asm similarity index 100% rename from data/pokedex/entries/246.asm rename to data/pokedex/entries/larvitar.asm diff --git a/data/pokedex/entries/166.asm b/data/pokedex/entries/ledian.asm similarity index 100% rename from data/pokedex/entries/166.asm rename to data/pokedex/entries/ledian.asm diff --git a/data/pokedex/entries/165.asm b/data/pokedex/entries/ledyba.asm similarity index 100% rename from data/pokedex/entries/165.asm rename to data/pokedex/entries/ledyba.asm diff --git a/data/pokedex/entries/108.asm b/data/pokedex/entries/lickitung.asm similarity index 100% rename from data/pokedex/entries/108.asm rename to data/pokedex/entries/lickitung.asm diff --git a/data/pokedex/entries/249.asm b/data/pokedex/entries/lugia.asm similarity index 100% rename from data/pokedex/entries/249.asm rename to data/pokedex/entries/lugia.asm diff --git a/data/pokedex/entries/068.asm b/data/pokedex/entries/machamp.asm similarity index 100% rename from data/pokedex/entries/068.asm rename to data/pokedex/entries/machamp.asm diff --git a/data/pokedex/entries/067.asm b/data/pokedex/entries/machoke.asm similarity index 100% rename from data/pokedex/entries/067.asm rename to data/pokedex/entries/machoke.asm diff --git a/data/pokedex/entries/066.asm b/data/pokedex/entries/machop.asm similarity index 100% rename from data/pokedex/entries/066.asm rename to data/pokedex/entries/machop.asm diff --git a/data/pokedex/entries/240.asm b/data/pokedex/entries/magby.asm similarity index 100% rename from data/pokedex/entries/240.asm rename to data/pokedex/entries/magby.asm diff --git a/data/pokedex/entries/219.asm b/data/pokedex/entries/magcargo.asm similarity index 100% rename from data/pokedex/entries/219.asm rename to data/pokedex/entries/magcargo.asm diff --git a/data/pokedex/entries/129.asm b/data/pokedex/entries/magikarp.asm similarity index 100% rename from data/pokedex/entries/129.asm rename to data/pokedex/entries/magikarp.asm diff --git a/data/pokedex/entries/126.asm b/data/pokedex/entries/magmar.asm similarity index 100% rename from data/pokedex/entries/126.asm rename to data/pokedex/entries/magmar.asm diff --git a/data/pokedex/entries/081.asm b/data/pokedex/entries/magnemite.asm similarity index 100% rename from data/pokedex/entries/081.asm rename to data/pokedex/entries/magnemite.asm diff --git a/data/pokedex/entries/082.asm b/data/pokedex/entries/magneton.asm similarity index 100% rename from data/pokedex/entries/082.asm rename to data/pokedex/entries/magneton.asm diff --git a/data/pokedex/entries/056.asm b/data/pokedex/entries/mankey.asm similarity index 100% rename from data/pokedex/entries/056.asm rename to data/pokedex/entries/mankey.asm diff --git a/data/pokedex/entries/226.asm b/data/pokedex/entries/mantine.asm similarity index 100% rename from data/pokedex/entries/226.asm rename to data/pokedex/entries/mantine.asm diff --git a/data/pokedex/entries/179.asm b/data/pokedex/entries/mareep.asm similarity index 100% rename from data/pokedex/entries/179.asm rename to data/pokedex/entries/mareep.asm diff --git a/data/pokedex/entries/183.asm b/data/pokedex/entries/marill.asm similarity index 100% rename from data/pokedex/entries/183.asm rename to data/pokedex/entries/marill.asm diff --git a/data/pokedex/entries/105.asm b/data/pokedex/entries/marowak.asm similarity index 100% rename from data/pokedex/entries/105.asm rename to data/pokedex/entries/marowak.asm diff --git a/data/pokedex/entries/154.asm b/data/pokedex/entries/meganium.asm similarity index 100% rename from data/pokedex/entries/154.asm rename to data/pokedex/entries/meganium.asm diff --git a/data/pokedex/entries/052.asm b/data/pokedex/entries/meowth.asm similarity index 100% rename from data/pokedex/entries/052.asm rename to data/pokedex/entries/meowth.asm diff --git a/data/pokedex/entries/011.asm b/data/pokedex/entries/metapod.asm similarity index 100% rename from data/pokedex/entries/011.asm rename to data/pokedex/entries/metapod.asm diff --git a/data/pokedex/entries/151.asm b/data/pokedex/entries/mew.asm similarity index 100% rename from data/pokedex/entries/151.asm rename to data/pokedex/entries/mew.asm diff --git a/data/pokedex/entries/150.asm b/data/pokedex/entries/mewtwo.asm similarity index 100% rename from data/pokedex/entries/150.asm rename to data/pokedex/entries/mewtwo.asm diff --git a/data/pokedex/entries/241.asm b/data/pokedex/entries/miltank.asm similarity index 100% rename from data/pokedex/entries/241.asm rename to data/pokedex/entries/miltank.asm diff --git a/data/pokedex/entries/200.asm b/data/pokedex/entries/misdreavus.asm similarity index 100% rename from data/pokedex/entries/200.asm rename to data/pokedex/entries/misdreavus.asm diff --git a/data/pokedex/entries/146.asm b/data/pokedex/entries/moltres.asm similarity index 100% rename from data/pokedex/entries/146.asm rename to data/pokedex/entries/moltres.asm diff --git a/data/pokedex/entries/122.asm b/data/pokedex/entries/mr__mime.asm similarity index 100% rename from data/pokedex/entries/122.asm rename to data/pokedex/entries/mr__mime.asm diff --git a/data/pokedex/entries/089.asm b/data/pokedex/entries/muk.asm similarity index 100% rename from data/pokedex/entries/089.asm rename to data/pokedex/entries/muk.asm diff --git a/data/pokedex/entries/198.asm b/data/pokedex/entries/murkrow.asm similarity index 100% rename from data/pokedex/entries/198.asm rename to data/pokedex/entries/murkrow.asm diff --git a/data/pokedex/entries/177.asm b/data/pokedex/entries/natu.asm similarity index 100% rename from data/pokedex/entries/177.asm rename to data/pokedex/entries/natu.asm diff --git a/data/pokedex/entries/034.asm b/data/pokedex/entries/nidoking.asm similarity index 100% rename from data/pokedex/entries/034.asm rename to data/pokedex/entries/nidoking.asm diff --git a/data/pokedex/entries/031.asm b/data/pokedex/entries/nidoqueen.asm similarity index 100% rename from data/pokedex/entries/031.asm rename to data/pokedex/entries/nidoqueen.asm diff --git a/data/pokedex/entries/029.asm b/data/pokedex/entries/nidoran_f.asm similarity index 100% rename from data/pokedex/entries/029.asm rename to data/pokedex/entries/nidoran_f.asm diff --git a/data/pokedex/entries/032.asm b/data/pokedex/entries/nidoran_m.asm similarity index 100% rename from data/pokedex/entries/032.asm rename to data/pokedex/entries/nidoran_m.asm diff --git a/data/pokedex/entries/030.asm b/data/pokedex/entries/nidorina.asm similarity index 100% rename from data/pokedex/entries/030.asm rename to data/pokedex/entries/nidorina.asm diff --git a/data/pokedex/entries/033.asm b/data/pokedex/entries/nidorino.asm similarity index 100% rename from data/pokedex/entries/033.asm rename to data/pokedex/entries/nidorino.asm diff --git a/data/pokedex/entries/038.asm b/data/pokedex/entries/ninetales.asm similarity index 100% rename from data/pokedex/entries/038.asm rename to data/pokedex/entries/ninetales.asm diff --git a/data/pokedex/entries/164.asm b/data/pokedex/entries/noctowl.asm similarity index 100% rename from data/pokedex/entries/164.asm rename to data/pokedex/entries/noctowl.asm diff --git a/data/pokedex/entries/224.asm b/data/pokedex/entries/octillery.asm similarity index 100% rename from data/pokedex/entries/224.asm rename to data/pokedex/entries/octillery.asm diff --git a/data/pokedex/entries/043.asm b/data/pokedex/entries/oddish.asm similarity index 100% rename from data/pokedex/entries/043.asm rename to data/pokedex/entries/oddish.asm diff --git a/data/pokedex/entries/138.asm b/data/pokedex/entries/omanyte.asm similarity index 100% rename from data/pokedex/entries/138.asm rename to data/pokedex/entries/omanyte.asm diff --git a/data/pokedex/entries/139.asm b/data/pokedex/entries/omastar.asm similarity index 100% rename from data/pokedex/entries/139.asm rename to data/pokedex/entries/omastar.asm diff --git a/data/pokedex/entries/095.asm b/data/pokedex/entries/onix.asm similarity index 100% rename from data/pokedex/entries/095.asm rename to data/pokedex/entries/onix.asm diff --git a/data/pokedex/entries/046.asm b/data/pokedex/entries/paras.asm similarity index 100% rename from data/pokedex/entries/046.asm rename to data/pokedex/entries/paras.asm diff --git a/data/pokedex/entries/047.asm b/data/pokedex/entries/parasect.asm similarity index 100% rename from data/pokedex/entries/047.asm rename to data/pokedex/entries/parasect.asm diff --git a/data/pokedex/entries/053.asm b/data/pokedex/entries/persian.asm similarity index 100% rename from data/pokedex/entries/053.asm rename to data/pokedex/entries/persian.asm diff --git a/data/pokedex/entries/231.asm b/data/pokedex/entries/phanpy.asm similarity index 100% rename from data/pokedex/entries/231.asm rename to data/pokedex/entries/phanpy.asm diff --git a/data/pokedex/entries/172.asm b/data/pokedex/entries/pichu.asm similarity index 100% rename from data/pokedex/entries/172.asm rename to data/pokedex/entries/pichu.asm diff --git a/data/pokedex/entries/018.asm b/data/pokedex/entries/pidgeot.asm similarity index 100% rename from data/pokedex/entries/018.asm rename to data/pokedex/entries/pidgeot.asm diff --git a/data/pokedex/entries/017.asm b/data/pokedex/entries/pidgeotto.asm similarity index 100% rename from data/pokedex/entries/017.asm rename to data/pokedex/entries/pidgeotto.asm diff --git a/data/pokedex/entries/016.asm b/data/pokedex/entries/pidgey.asm similarity index 100% rename from data/pokedex/entries/016.asm rename to data/pokedex/entries/pidgey.asm diff --git a/data/pokedex/entries/025.asm b/data/pokedex/entries/pikachu.asm similarity index 100% rename from data/pokedex/entries/025.asm rename to data/pokedex/entries/pikachu.asm diff --git a/data/pokedex/entries/221.asm b/data/pokedex/entries/piloswine.asm similarity index 100% rename from data/pokedex/entries/221.asm rename to data/pokedex/entries/piloswine.asm diff --git a/data/pokedex/entries/204.asm b/data/pokedex/entries/pineco.asm similarity index 100% rename from data/pokedex/entries/204.asm rename to data/pokedex/entries/pineco.asm diff --git a/data/pokedex/entries/127.asm b/data/pokedex/entries/pinsir.asm similarity index 100% rename from data/pokedex/entries/127.asm rename to data/pokedex/entries/pinsir.asm diff --git a/data/pokedex/entries/186.asm b/data/pokedex/entries/politoed.asm similarity index 100% rename from data/pokedex/entries/186.asm rename to data/pokedex/entries/politoed.asm diff --git a/data/pokedex/entries/060.asm b/data/pokedex/entries/poliwag.asm similarity index 100% rename from data/pokedex/entries/060.asm rename to data/pokedex/entries/poliwag.asm diff --git a/data/pokedex/entries/061.asm b/data/pokedex/entries/poliwhirl.asm similarity index 100% rename from data/pokedex/entries/061.asm rename to data/pokedex/entries/poliwhirl.asm diff --git a/data/pokedex/entries/062.asm b/data/pokedex/entries/poliwrath.asm similarity index 100% rename from data/pokedex/entries/062.asm rename to data/pokedex/entries/poliwrath.asm diff --git a/data/pokedex/entries/077.asm b/data/pokedex/entries/ponyta.asm similarity index 100% rename from data/pokedex/entries/077.asm rename to data/pokedex/entries/ponyta.asm diff --git a/data/pokedex/entries/137.asm b/data/pokedex/entries/porygon.asm similarity index 100% rename from data/pokedex/entries/137.asm rename to data/pokedex/entries/porygon.asm diff --git a/data/pokedex/entries/233.asm b/data/pokedex/entries/porygon2.asm similarity index 100% rename from data/pokedex/entries/233.asm rename to data/pokedex/entries/porygon2.asm diff --git a/data/pokedex/entries/057.asm b/data/pokedex/entries/primeape.asm similarity index 100% rename from data/pokedex/entries/057.asm rename to data/pokedex/entries/primeape.asm diff --git a/data/pokedex/entries/054.asm b/data/pokedex/entries/psyduck.asm similarity index 100% rename from data/pokedex/entries/054.asm rename to data/pokedex/entries/psyduck.asm diff --git a/data/pokedex/entries/247.asm b/data/pokedex/entries/pupitar.asm similarity index 100% rename from data/pokedex/entries/247.asm rename to data/pokedex/entries/pupitar.asm diff --git a/data/pokedex/entries/195.asm b/data/pokedex/entries/quagsire.asm similarity index 100% rename from data/pokedex/entries/195.asm rename to data/pokedex/entries/quagsire.asm diff --git a/data/pokedex/entries/156.asm b/data/pokedex/entries/quilava.asm similarity index 100% rename from data/pokedex/entries/156.asm rename to data/pokedex/entries/quilava.asm diff --git a/data/pokedex/entries/211.asm b/data/pokedex/entries/qwilfish.asm similarity index 100% rename from data/pokedex/entries/211.asm rename to data/pokedex/entries/qwilfish.asm diff --git a/data/pokedex/entries/026.asm b/data/pokedex/entries/raichu.asm similarity index 100% rename from data/pokedex/entries/026.asm rename to data/pokedex/entries/raichu.asm diff --git a/data/pokedex/entries/243.asm b/data/pokedex/entries/raikou.asm similarity index 100% rename from data/pokedex/entries/243.asm rename to data/pokedex/entries/raikou.asm diff --git a/data/pokedex/entries/078.asm b/data/pokedex/entries/rapidash.asm similarity index 100% rename from data/pokedex/entries/078.asm rename to data/pokedex/entries/rapidash.asm diff --git a/data/pokedex/entries/020.asm b/data/pokedex/entries/raticate.asm similarity index 100% rename from data/pokedex/entries/020.asm rename to data/pokedex/entries/raticate.asm diff --git a/data/pokedex/entries/019.asm b/data/pokedex/entries/rattata.asm similarity index 100% rename from data/pokedex/entries/019.asm rename to data/pokedex/entries/rattata.asm diff --git a/data/pokedex/entries/223.asm b/data/pokedex/entries/remoraid.asm similarity index 100% rename from data/pokedex/entries/223.asm rename to data/pokedex/entries/remoraid.asm diff --git a/data/pokedex/entries/112.asm b/data/pokedex/entries/rhydon.asm similarity index 100% rename from data/pokedex/entries/112.asm rename to data/pokedex/entries/rhydon.asm diff --git a/data/pokedex/entries/111.asm b/data/pokedex/entries/rhyhorn.asm similarity index 100% rename from data/pokedex/entries/111.asm rename to data/pokedex/entries/rhyhorn.asm diff --git a/data/pokedex/entries/027.asm b/data/pokedex/entries/sandshrew.asm similarity index 100% rename from data/pokedex/entries/027.asm rename to data/pokedex/entries/sandshrew.asm diff --git a/data/pokedex/entries/028.asm b/data/pokedex/entries/sandslash.asm similarity index 100% rename from data/pokedex/entries/028.asm rename to data/pokedex/entries/sandslash.asm diff --git a/data/pokedex/entries/212.asm b/data/pokedex/entries/scizor.asm similarity index 100% rename from data/pokedex/entries/212.asm rename to data/pokedex/entries/scizor.asm diff --git a/data/pokedex/entries/123.asm b/data/pokedex/entries/scyther.asm similarity index 100% rename from data/pokedex/entries/123.asm rename to data/pokedex/entries/scyther.asm diff --git a/data/pokedex/entries/117.asm b/data/pokedex/entries/seadra.asm similarity index 100% rename from data/pokedex/entries/117.asm rename to data/pokedex/entries/seadra.asm diff --git a/data/pokedex/entries/119.asm b/data/pokedex/entries/seaking.asm similarity index 100% rename from data/pokedex/entries/119.asm rename to data/pokedex/entries/seaking.asm diff --git a/data/pokedex/entries/086.asm b/data/pokedex/entries/seel.asm similarity index 100% rename from data/pokedex/entries/086.asm rename to data/pokedex/entries/seel.asm diff --git a/data/pokedex/entries/161.asm b/data/pokedex/entries/sentret.asm similarity index 100% rename from data/pokedex/entries/161.asm rename to data/pokedex/entries/sentret.asm diff --git a/data/pokedex/entries/090.asm b/data/pokedex/entries/shellder.asm similarity index 100% rename from data/pokedex/entries/090.asm rename to data/pokedex/entries/shellder.asm diff --git a/data/pokedex/entries/213.asm b/data/pokedex/entries/shuckle.asm similarity index 100% rename from data/pokedex/entries/213.asm rename to data/pokedex/entries/shuckle.asm diff --git a/data/pokedex/entries/227.asm b/data/pokedex/entries/skarmory.asm similarity index 100% rename from data/pokedex/entries/227.asm rename to data/pokedex/entries/skarmory.asm diff --git a/data/pokedex/entries/188.asm b/data/pokedex/entries/skiploom.asm similarity index 100% rename from data/pokedex/entries/188.asm rename to data/pokedex/entries/skiploom.asm diff --git a/data/pokedex/entries/080.asm b/data/pokedex/entries/slowbro.asm similarity index 100% rename from data/pokedex/entries/080.asm rename to data/pokedex/entries/slowbro.asm diff --git a/data/pokedex/entries/199.asm b/data/pokedex/entries/slowking.asm similarity index 100% rename from data/pokedex/entries/199.asm rename to data/pokedex/entries/slowking.asm diff --git a/data/pokedex/entries/079.asm b/data/pokedex/entries/slowpoke.asm similarity index 100% rename from data/pokedex/entries/079.asm rename to data/pokedex/entries/slowpoke.asm diff --git a/data/pokedex/entries/218.asm b/data/pokedex/entries/slugma.asm similarity index 100% rename from data/pokedex/entries/218.asm rename to data/pokedex/entries/slugma.asm diff --git a/data/pokedex/entries/235.asm b/data/pokedex/entries/smeargle.asm similarity index 100% rename from data/pokedex/entries/235.asm rename to data/pokedex/entries/smeargle.asm diff --git a/data/pokedex/entries/238.asm b/data/pokedex/entries/smoochum.asm similarity index 100% rename from data/pokedex/entries/238.asm rename to data/pokedex/entries/smoochum.asm diff --git a/data/pokedex/entries/215.asm b/data/pokedex/entries/sneasel.asm similarity index 100% rename from data/pokedex/entries/215.asm rename to data/pokedex/entries/sneasel.asm diff --git a/data/pokedex/entries/143.asm b/data/pokedex/entries/snorlax.asm similarity index 100% rename from data/pokedex/entries/143.asm rename to data/pokedex/entries/snorlax.asm diff --git a/data/pokedex/entries/209.asm b/data/pokedex/entries/snubbull.asm similarity index 100% rename from data/pokedex/entries/209.asm rename to data/pokedex/entries/snubbull.asm diff --git a/data/pokedex/entries/021.asm b/data/pokedex/entries/spearow.asm similarity index 100% rename from data/pokedex/entries/021.asm rename to data/pokedex/entries/spearow.asm diff --git a/data/pokedex/entries/167.asm b/data/pokedex/entries/spinarak.asm similarity index 100% rename from data/pokedex/entries/167.asm rename to data/pokedex/entries/spinarak.asm diff --git a/data/pokedex/entries/007.asm b/data/pokedex/entries/squirtle.asm similarity index 100% rename from data/pokedex/entries/007.asm rename to data/pokedex/entries/squirtle.asm diff --git a/data/pokedex/entries/234.asm b/data/pokedex/entries/stantler.asm similarity index 100% rename from data/pokedex/entries/234.asm rename to data/pokedex/entries/stantler.asm diff --git a/data/pokedex/entries/121.asm b/data/pokedex/entries/starmie.asm similarity index 100% rename from data/pokedex/entries/121.asm rename to data/pokedex/entries/starmie.asm diff --git a/data/pokedex/entries/120.asm b/data/pokedex/entries/staryu.asm similarity index 100% rename from data/pokedex/entries/120.asm rename to data/pokedex/entries/staryu.asm diff --git a/data/pokedex/entries/208.asm b/data/pokedex/entries/steelix.asm similarity index 100% rename from data/pokedex/entries/208.asm rename to data/pokedex/entries/steelix.asm diff --git a/data/pokedex/entries/185.asm b/data/pokedex/entries/sudowoodo.asm similarity index 100% rename from data/pokedex/entries/185.asm rename to data/pokedex/entries/sudowoodo.asm diff --git a/data/pokedex/entries/245.asm b/data/pokedex/entries/suicune.asm similarity index 100% rename from data/pokedex/entries/245.asm rename to data/pokedex/entries/suicune.asm diff --git a/data/pokedex/entries/192.asm b/data/pokedex/entries/sunflora.asm similarity index 100% rename from data/pokedex/entries/192.asm rename to data/pokedex/entries/sunflora.asm diff --git a/data/pokedex/entries/191.asm b/data/pokedex/entries/sunkern.asm similarity index 100% rename from data/pokedex/entries/191.asm rename to data/pokedex/entries/sunkern.asm diff --git a/data/pokedex/entries/220.asm b/data/pokedex/entries/swinub.asm similarity index 100% rename from data/pokedex/entries/220.asm rename to data/pokedex/entries/swinub.asm diff --git a/data/pokedex/entries/114.asm b/data/pokedex/entries/tangela.asm similarity index 100% rename from data/pokedex/entries/114.asm rename to data/pokedex/entries/tangela.asm diff --git a/data/pokedex/entries/128.asm b/data/pokedex/entries/tauros.asm similarity index 100% rename from data/pokedex/entries/128.asm rename to data/pokedex/entries/tauros.asm diff --git a/data/pokedex/entries/216.asm b/data/pokedex/entries/teddiursa.asm similarity index 100% rename from data/pokedex/entries/216.asm rename to data/pokedex/entries/teddiursa.asm diff --git a/data/pokedex/entries/072.asm b/data/pokedex/entries/tentacool.asm similarity index 100% rename from data/pokedex/entries/072.asm rename to data/pokedex/entries/tentacool.asm diff --git a/data/pokedex/entries/073.asm b/data/pokedex/entries/tentacruel.asm similarity index 100% rename from data/pokedex/entries/073.asm rename to data/pokedex/entries/tentacruel.asm diff --git a/data/pokedex/entries/175.asm b/data/pokedex/entries/togepi.asm similarity index 100% rename from data/pokedex/entries/175.asm rename to data/pokedex/entries/togepi.asm diff --git a/data/pokedex/entries/176.asm b/data/pokedex/entries/togetic.asm similarity index 100% rename from data/pokedex/entries/176.asm rename to data/pokedex/entries/togetic.asm diff --git a/data/pokedex/entries/158.asm b/data/pokedex/entries/totodile.asm similarity index 100% rename from data/pokedex/entries/158.asm rename to data/pokedex/entries/totodile.asm diff --git a/data/pokedex/entries/157.asm b/data/pokedex/entries/typhlosion.asm similarity index 100% rename from data/pokedex/entries/157.asm rename to data/pokedex/entries/typhlosion.asm diff --git a/data/pokedex/entries/248.asm b/data/pokedex/entries/tyranitar.asm similarity index 100% rename from data/pokedex/entries/248.asm rename to data/pokedex/entries/tyranitar.asm diff --git a/data/pokedex/entries/236.asm b/data/pokedex/entries/tyrogue.asm similarity index 100% rename from data/pokedex/entries/236.asm rename to data/pokedex/entries/tyrogue.asm diff --git a/data/pokedex/entries/197.asm b/data/pokedex/entries/umbreon.asm similarity index 100% rename from data/pokedex/entries/197.asm rename to data/pokedex/entries/umbreon.asm diff --git a/data/pokedex/entries/201.asm b/data/pokedex/entries/unown.asm similarity index 100% rename from data/pokedex/entries/201.asm rename to data/pokedex/entries/unown.asm diff --git a/data/pokedex/entries/217.asm b/data/pokedex/entries/ursaring.asm similarity index 100% rename from data/pokedex/entries/217.asm rename to data/pokedex/entries/ursaring.asm diff --git a/data/pokedex/entries/134.asm b/data/pokedex/entries/vaporeon.asm similarity index 100% rename from data/pokedex/entries/134.asm rename to data/pokedex/entries/vaporeon.asm diff --git a/data/pokedex/entries/049.asm b/data/pokedex/entries/venomoth.asm similarity index 100% rename from data/pokedex/entries/049.asm rename to data/pokedex/entries/venomoth.asm diff --git a/data/pokedex/entries/048.asm b/data/pokedex/entries/venonat.asm similarity index 100% rename from data/pokedex/entries/048.asm rename to data/pokedex/entries/venonat.asm diff --git a/data/pokedex/entries/003.asm b/data/pokedex/entries/venusaur.asm similarity index 100% rename from data/pokedex/entries/003.asm rename to data/pokedex/entries/venusaur.asm diff --git a/data/pokedex/entries/071.asm b/data/pokedex/entries/victreebel.asm similarity index 100% rename from data/pokedex/entries/071.asm rename to data/pokedex/entries/victreebel.asm diff --git a/data/pokedex/entries/045.asm b/data/pokedex/entries/vileplume.asm similarity index 100% rename from data/pokedex/entries/045.asm rename to data/pokedex/entries/vileplume.asm diff --git a/data/pokedex/entries/100.asm b/data/pokedex/entries/voltorb.asm similarity index 100% rename from data/pokedex/entries/100.asm rename to data/pokedex/entries/voltorb.asm diff --git a/data/pokedex/entries/037.asm b/data/pokedex/entries/vulpix.asm similarity index 100% rename from data/pokedex/entries/037.asm rename to data/pokedex/entries/vulpix.asm diff --git a/data/pokedex/entries/008.asm b/data/pokedex/entries/wartortle.asm similarity index 100% rename from data/pokedex/entries/008.asm rename to data/pokedex/entries/wartortle.asm diff --git a/data/pokedex/entries/013.asm b/data/pokedex/entries/weedle.asm similarity index 100% rename from data/pokedex/entries/013.asm rename to data/pokedex/entries/weedle.asm diff --git a/data/pokedex/entries/070.asm b/data/pokedex/entries/weepinbell.asm similarity index 100% rename from data/pokedex/entries/070.asm rename to data/pokedex/entries/weepinbell.asm diff --git a/data/pokedex/entries/110.asm b/data/pokedex/entries/weezing.asm similarity index 100% rename from data/pokedex/entries/110.asm rename to data/pokedex/entries/weezing.asm diff --git a/data/pokedex/entries/040.asm b/data/pokedex/entries/wigglytuff.asm similarity index 100% rename from data/pokedex/entries/040.asm rename to data/pokedex/entries/wigglytuff.asm diff --git a/data/pokedex/entries/202.asm b/data/pokedex/entries/wobbuffet.asm similarity index 100% rename from data/pokedex/entries/202.asm rename to data/pokedex/entries/wobbuffet.asm diff --git a/data/pokedex/entries/194.asm b/data/pokedex/entries/wooper.asm similarity index 100% rename from data/pokedex/entries/194.asm rename to data/pokedex/entries/wooper.asm diff --git a/data/pokedex/entries/178.asm b/data/pokedex/entries/xatu.asm similarity index 100% rename from data/pokedex/entries/178.asm rename to data/pokedex/entries/xatu.asm diff --git a/data/pokedex/entries/193.asm b/data/pokedex/entries/yanma.asm similarity index 100% rename from data/pokedex/entries/193.asm rename to data/pokedex/entries/yanma.asm diff --git a/data/pokedex/entries/145.asm b/data/pokedex/entries/zapdos.asm similarity index 100% rename from data/pokedex/entries/145.asm rename to data/pokedex/entries/zapdos.asm diff --git a/data/pokedex/entries/041.asm b/data/pokedex/entries/zubat.asm similarity index 100% rename from data/pokedex/entries/041.asm rename to data/pokedex/entries/zubat.asm diff --git a/data/pokedex/entries_1.asm b/data/pokedex/entries_1.asm index f45bba49f..7f3c04cd6 100644 --- a/data/pokedex/entries_1.asm +++ b/data/pokedex/entries_1.asm @@ -1,64 +1,64 @@ -BulbasaurPokedexEntry:: INCLUDE "data/pokedex/entries/001.asm" -IvysaurPokedexEntry:: INCLUDE "data/pokedex/entries/002.asm" -VenusaurPokedexEntry:: INCLUDE "data/pokedex/entries/003.asm" -CharmanderPokedexEntry:: INCLUDE "data/pokedex/entries/004.asm" -CharmeleonPokedexEntry:: INCLUDE "data/pokedex/entries/005.asm" -CharizardPokedexEntry:: INCLUDE "data/pokedex/entries/006.asm" -SquirtlePokedexEntry:: INCLUDE "data/pokedex/entries/007.asm" -WartortlePokedexEntry:: INCLUDE "data/pokedex/entries/008.asm" -BlastoisePokedexEntry:: INCLUDE "data/pokedex/entries/009.asm" -CaterpiePokedexEntry:: INCLUDE "data/pokedex/entries/010.asm" -MetapodPokedexEntry:: INCLUDE "data/pokedex/entries/011.asm" -ButterfreePokedexEntry:: INCLUDE "data/pokedex/entries/012.asm" -WeedlePokedexEntry:: INCLUDE "data/pokedex/entries/013.asm" -KakunaPokedexEntry:: INCLUDE "data/pokedex/entries/014.asm" -BeedrillPokedexEntry:: INCLUDE "data/pokedex/entries/015.asm" -PidgeyPokedexEntry:: INCLUDE "data/pokedex/entries/016.asm" -PidgeottoPokedexEntry:: INCLUDE "data/pokedex/entries/017.asm" -PidgeotPokedexEntry:: INCLUDE "data/pokedex/entries/018.asm" -RattataPokedexEntry:: INCLUDE "data/pokedex/entries/019.asm" -RaticatePokedexEntry:: INCLUDE "data/pokedex/entries/020.asm" -SpearowPokedexEntry:: INCLUDE "data/pokedex/entries/021.asm" -FearowPokedexEntry:: INCLUDE "data/pokedex/entries/022.asm" -EkansPokedexEntry:: INCLUDE "data/pokedex/entries/023.asm" -ArbokPokedexEntry:: INCLUDE "data/pokedex/entries/024.asm" -PikachuPokedexEntry:: INCLUDE "data/pokedex/entries/025.asm" -RaichuPokedexEntry:: INCLUDE "data/pokedex/entries/026.asm" -SandshrewPokedexEntry:: INCLUDE "data/pokedex/entries/027.asm" -SandslashPokedexEntry:: INCLUDE "data/pokedex/entries/028.asm" -NidoranFPokedexEntry:: INCLUDE "data/pokedex/entries/029.asm" -NidorinaPokedexEntry:: INCLUDE "data/pokedex/entries/030.asm" -NidoqueenPokedexEntry:: INCLUDE "data/pokedex/entries/031.asm" -NidoranMPokedexEntry:: INCLUDE "data/pokedex/entries/032.asm" -NidorinoPokedexEntry:: INCLUDE "data/pokedex/entries/033.asm" -NidokingPokedexEntry:: INCLUDE "data/pokedex/entries/034.asm" -ClefairyPokedexEntry:: INCLUDE "data/pokedex/entries/035.asm" -ClefablePokedexEntry:: INCLUDE "data/pokedex/entries/036.asm" -VulpixPokedexEntry:: INCLUDE "data/pokedex/entries/037.asm" -NinetalesPokedexEntry:: INCLUDE "data/pokedex/entries/038.asm" -JigglypuffPokedexEntry:: INCLUDE "data/pokedex/entries/039.asm" -WigglytuffPokedexEntry:: INCLUDE "data/pokedex/entries/040.asm" -ZubatPokedexEntry:: INCLUDE "data/pokedex/entries/041.asm" -GolbatPokedexEntry:: INCLUDE "data/pokedex/entries/042.asm" -OddishPokedexEntry:: INCLUDE "data/pokedex/entries/043.asm" -GloomPokedexEntry:: INCLUDE "data/pokedex/entries/044.asm" -VileplumePokedexEntry:: INCLUDE "data/pokedex/entries/045.asm" -ParasPokedexEntry:: INCLUDE "data/pokedex/entries/046.asm" -ParasectPokedexEntry:: INCLUDE "data/pokedex/entries/047.asm" -VenonatPokedexEntry:: INCLUDE "data/pokedex/entries/048.asm" -VenomothPokedexEntry:: INCLUDE "data/pokedex/entries/049.asm" -DiglettPokedexEntry:: INCLUDE "data/pokedex/entries/050.asm" -DugtrioPokedexEntry:: INCLUDE "data/pokedex/entries/051.asm" -MeowthPokedexEntry:: INCLUDE "data/pokedex/entries/052.asm" -PersianPokedexEntry:: INCLUDE "data/pokedex/entries/053.asm" -PsyduckPokedexEntry:: INCLUDE "data/pokedex/entries/054.asm" -GolduckPokedexEntry:: INCLUDE "data/pokedex/entries/055.asm" -MankeyPokedexEntry:: INCLUDE "data/pokedex/entries/056.asm" -PrimeapePokedexEntry:: INCLUDE "data/pokedex/entries/057.asm" -GrowlithePokedexEntry:: INCLUDE "data/pokedex/entries/058.asm" -ArcaninePokedexEntry:: INCLUDE "data/pokedex/entries/059.asm" -PoliwagPokedexEntry:: INCLUDE "data/pokedex/entries/060.asm" -PoliwhirlPokedexEntry:: INCLUDE "data/pokedex/entries/061.asm" -PoliwrathPokedexEntry:: INCLUDE "data/pokedex/entries/062.asm" -AbraPokedexEntry:: INCLUDE "data/pokedex/entries/063.asm" -KadabraPokedexEntry:: INCLUDE "data/pokedex/entries/064.asm" +BulbasaurPokedexEntry:: INCLUDE "data/pokedex/entries/bulbasaur.asm" +IvysaurPokedexEntry:: INCLUDE "data/pokedex/entries/ivysaur.asm" +VenusaurPokedexEntry:: INCLUDE "data/pokedex/entries/venusaur.asm" +CharmanderPokedexEntry:: INCLUDE "data/pokedex/entries/charmander.asm" +CharmeleonPokedexEntry:: INCLUDE "data/pokedex/entries/charmeleon.asm" +CharizardPokedexEntry:: INCLUDE "data/pokedex/entries/charizard.asm" +SquirtlePokedexEntry:: INCLUDE "data/pokedex/entries/squirtle.asm" +WartortlePokedexEntry:: INCLUDE "data/pokedex/entries/wartortle.asm" +BlastoisePokedexEntry:: INCLUDE "data/pokedex/entries/blastoise.asm" +CaterpiePokedexEntry:: INCLUDE "data/pokedex/entries/caterpie.asm" +MetapodPokedexEntry:: INCLUDE "data/pokedex/entries/metapod.asm" +ButterfreePokedexEntry:: INCLUDE "data/pokedex/entries/butterfree.asm" +WeedlePokedexEntry:: INCLUDE "data/pokedex/entries/weedle.asm" +KakunaPokedexEntry:: INCLUDE "data/pokedex/entries/kakuna.asm" +BeedrillPokedexEntry:: INCLUDE "data/pokedex/entries/beedrill.asm" +PidgeyPokedexEntry:: INCLUDE "data/pokedex/entries/pidgey.asm" +PidgeottoPokedexEntry:: INCLUDE "data/pokedex/entries/pidgeotto.asm" +PidgeotPokedexEntry:: INCLUDE "data/pokedex/entries/pidgeot.asm" +RattataPokedexEntry:: INCLUDE "data/pokedex/entries/rattata.asm" +RaticatePokedexEntry:: INCLUDE "data/pokedex/entries/raticate.asm" +SpearowPokedexEntry:: INCLUDE "data/pokedex/entries/spearow.asm" +FearowPokedexEntry:: INCLUDE "data/pokedex/entries/fearow.asm" +EkansPokedexEntry:: INCLUDE "data/pokedex/entries/ekans.asm" +ArbokPokedexEntry:: INCLUDE "data/pokedex/entries/arbok.asm" +PikachuPokedexEntry:: INCLUDE "data/pokedex/entries/pikachu.asm" +RaichuPokedexEntry:: INCLUDE "data/pokedex/entries/raichu.asm" +SandshrewPokedexEntry:: INCLUDE "data/pokedex/entries/sandshrew.asm" +SandslashPokedexEntry:: INCLUDE "data/pokedex/entries/sandslash.asm" +NidoranFPokedexEntry:: INCLUDE "data/pokedex/entries/nidoran_f.asm" +NidorinaPokedexEntry:: INCLUDE "data/pokedex/entries/nidorina.asm" +NidoqueenPokedexEntry:: INCLUDE "data/pokedex/entries/nidoqueen.asm" +NidoranMPokedexEntry:: INCLUDE "data/pokedex/entries/nidoran_m.asm" +NidorinoPokedexEntry:: INCLUDE "data/pokedex/entries/nidorino.asm" +NidokingPokedexEntry:: INCLUDE "data/pokedex/entries/nidoking.asm" +ClefairyPokedexEntry:: INCLUDE "data/pokedex/entries/clefairy.asm" +ClefablePokedexEntry:: INCLUDE "data/pokedex/entries/clefable.asm" +VulpixPokedexEntry:: INCLUDE "data/pokedex/entries/vulpix.asm" +NinetalesPokedexEntry:: INCLUDE "data/pokedex/entries/ninetales.asm" +JigglypuffPokedexEntry:: INCLUDE "data/pokedex/entries/jigglypuff.asm" +WigglytuffPokedexEntry:: INCLUDE "data/pokedex/entries/wigglytuff.asm" +ZubatPokedexEntry:: INCLUDE "data/pokedex/entries/zubat.asm" +GolbatPokedexEntry:: INCLUDE "data/pokedex/entries/golbat.asm" +OddishPokedexEntry:: INCLUDE "data/pokedex/entries/oddish.asm" +GloomPokedexEntry:: INCLUDE "data/pokedex/entries/gloom.asm" +VileplumePokedexEntry:: INCLUDE "data/pokedex/entries/vileplume.asm" +ParasPokedexEntry:: INCLUDE "data/pokedex/entries/paras.asm" +ParasectPokedexEntry:: INCLUDE "data/pokedex/entries/parasect.asm" +VenonatPokedexEntry:: INCLUDE "data/pokedex/entries/venonat.asm" +VenomothPokedexEntry:: INCLUDE "data/pokedex/entries/venomoth.asm" +DiglettPokedexEntry:: INCLUDE "data/pokedex/entries/diglett.asm" +DugtrioPokedexEntry:: INCLUDE "data/pokedex/entries/dugtrio.asm" +MeowthPokedexEntry:: INCLUDE "data/pokedex/entries/meowth.asm" +PersianPokedexEntry:: INCLUDE "data/pokedex/entries/persian.asm" +PsyduckPokedexEntry:: INCLUDE "data/pokedex/entries/psyduck.asm" +GolduckPokedexEntry:: INCLUDE "data/pokedex/entries/golduck.asm" +MankeyPokedexEntry:: INCLUDE "data/pokedex/entries/mankey.asm" +PrimeapePokedexEntry:: INCLUDE "data/pokedex/entries/primeape.asm" +GrowlithePokedexEntry:: INCLUDE "data/pokedex/entries/growlithe.asm" +ArcaninePokedexEntry:: INCLUDE "data/pokedex/entries/arcanine.asm" +PoliwagPokedexEntry:: INCLUDE "data/pokedex/entries/poliwag.asm" +PoliwhirlPokedexEntry:: INCLUDE "data/pokedex/entries/poliwhirl.asm" +PoliwrathPokedexEntry:: INCLUDE "data/pokedex/entries/poliwrath.asm" +AbraPokedexEntry:: INCLUDE "data/pokedex/entries/abra.asm" +KadabraPokedexEntry:: INCLUDE "data/pokedex/entries/kadabra.asm" diff --git a/data/pokedex/entries_2.asm b/data/pokedex/entries_2.asm index 2561d6c3e..881986d92 100644 --- a/data/pokedex/entries_2.asm +++ b/data/pokedex/entries_2.asm @@ -1,64 +1,64 @@ -AlakazamPokedexEntry:: INCLUDE "data/pokedex/entries/065.asm" -MachopPokedexEntry:: INCLUDE "data/pokedex/entries/066.asm" -MachokePokedexEntry:: INCLUDE "data/pokedex/entries/067.asm" -MachampPokedexEntry:: INCLUDE "data/pokedex/entries/068.asm" -BellsproutPokedexEntry:: INCLUDE "data/pokedex/entries/069.asm" -WeepinbellPokedexEntry:: INCLUDE "data/pokedex/entries/070.asm" -VictreebelPokedexEntry:: INCLUDE "data/pokedex/entries/071.asm" -TentacoolPokedexEntry:: INCLUDE "data/pokedex/entries/072.asm" -TentacruelPokedexEntry:: INCLUDE "data/pokedex/entries/073.asm" -GeodudePokedexEntry:: INCLUDE "data/pokedex/entries/074.asm" -GravelerPokedexEntry:: INCLUDE "data/pokedex/entries/075.asm" -GolemPokedexEntry:: INCLUDE "data/pokedex/entries/076.asm" -PonytaPokedexEntry:: INCLUDE "data/pokedex/entries/077.asm" -RapidashPokedexEntry:: INCLUDE "data/pokedex/entries/078.asm" -SlowpokePokedexEntry:: INCLUDE "data/pokedex/entries/079.asm" -SlowbroPokedexEntry:: INCLUDE "data/pokedex/entries/080.asm" -MagnemitePokedexEntry:: INCLUDE "data/pokedex/entries/081.asm" -MagnetonPokedexEntry:: INCLUDE "data/pokedex/entries/082.asm" -FarfetchDPokedexEntry:: INCLUDE "data/pokedex/entries/083.asm" -DoduoPokedexEntry:: INCLUDE "data/pokedex/entries/084.asm" -DodrioPokedexEntry:: INCLUDE "data/pokedex/entries/085.asm" -SeelPokedexEntry:: INCLUDE "data/pokedex/entries/086.asm" -DewgongPokedexEntry:: INCLUDE "data/pokedex/entries/087.asm" -GrimerPokedexEntry:: INCLUDE "data/pokedex/entries/088.asm" -MukPokedexEntry:: INCLUDE "data/pokedex/entries/089.asm" -ShellderPokedexEntry:: INCLUDE "data/pokedex/entries/090.asm" -CloysterPokedexEntry:: INCLUDE "data/pokedex/entries/091.asm" -GastlyPokedexEntry:: INCLUDE "data/pokedex/entries/092.asm" -HaunterPokedexEntry:: INCLUDE "data/pokedex/entries/093.asm" -GengarPokedexEntry:: INCLUDE "data/pokedex/entries/094.asm" -OnixPokedexEntry:: INCLUDE "data/pokedex/entries/095.asm" -DrowzeePokedexEntry:: INCLUDE "data/pokedex/entries/096.asm" -HypnoPokedexEntry:: INCLUDE "data/pokedex/entries/097.asm" -KrabbyPokedexEntry:: INCLUDE "data/pokedex/entries/098.asm" -KinglerPokedexEntry:: INCLUDE "data/pokedex/entries/099.asm" -VoltorbPokedexEntry:: INCLUDE "data/pokedex/entries/100.asm" -ElectrodePokedexEntry:: INCLUDE "data/pokedex/entries/101.asm" -ExeggcutePokedexEntry:: INCLUDE "data/pokedex/entries/102.asm" -ExeggutorPokedexEntry:: INCLUDE "data/pokedex/entries/103.asm" -CubonePokedexEntry:: INCLUDE "data/pokedex/entries/104.asm" -MarowakPokedexEntry:: INCLUDE "data/pokedex/entries/105.asm" -HitmonleePokedexEntry:: INCLUDE "data/pokedex/entries/106.asm" -HitmonchanPokedexEntry:: INCLUDE "data/pokedex/entries/107.asm" -LickitungPokedexEntry:: INCLUDE "data/pokedex/entries/108.asm" -KoffingPokedexEntry:: INCLUDE "data/pokedex/entries/109.asm" -WeezingPokedexEntry:: INCLUDE "data/pokedex/entries/110.asm" -RhyhornPokedexEntry:: INCLUDE "data/pokedex/entries/111.asm" -RhydonPokedexEntry:: INCLUDE "data/pokedex/entries/112.asm" -ChanseyPokedexEntry:: INCLUDE "data/pokedex/entries/113.asm" -TangelaPokedexEntry:: INCLUDE "data/pokedex/entries/114.asm" -KangaskhanPokedexEntry:: INCLUDE "data/pokedex/entries/115.asm" -HorseaPokedexEntry:: INCLUDE "data/pokedex/entries/116.asm" -SeadraPokedexEntry:: INCLUDE "data/pokedex/entries/117.asm" -GoldeenPokedexEntry:: INCLUDE "data/pokedex/entries/118.asm" -SeakingPokedexEntry:: INCLUDE "data/pokedex/entries/119.asm" -StaryuPokedexEntry:: INCLUDE "data/pokedex/entries/120.asm" -StarmiePokedexEntry:: INCLUDE "data/pokedex/entries/121.asm" -MrMimePokedexEntry:: INCLUDE "data/pokedex/entries/122.asm" -ScytherPokedexEntry:: INCLUDE "data/pokedex/entries/123.asm" -JynxPokedexEntry:: INCLUDE "data/pokedex/entries/124.asm" -ElectabuzzPokedexEntry:: INCLUDE "data/pokedex/entries/125.asm" -MagmarPokedexEntry:: INCLUDE "data/pokedex/entries/126.asm" -PinsirPokedexEntry:: INCLUDE "data/pokedex/entries/127.asm" -TaurosPokedexEntry:: INCLUDE "data/pokedex/entries/128.asm" +AlakazamPokedexEntry:: INCLUDE "data/pokedex/entries/alakazam.asm" +MachopPokedexEntry:: INCLUDE "data/pokedex/entries/machop.asm" +MachokePokedexEntry:: INCLUDE "data/pokedex/entries/machoke.asm" +MachampPokedexEntry:: INCLUDE "data/pokedex/entries/machamp.asm" +BellsproutPokedexEntry:: INCLUDE "data/pokedex/entries/bellsprout.asm" +WeepinbellPokedexEntry:: INCLUDE "data/pokedex/entries/weepinbell.asm" +VictreebelPokedexEntry:: INCLUDE "data/pokedex/entries/victreebel.asm" +TentacoolPokedexEntry:: INCLUDE "data/pokedex/entries/tentacool.asm" +TentacruelPokedexEntry:: INCLUDE "data/pokedex/entries/tentacruel.asm" +GeodudePokedexEntry:: INCLUDE "data/pokedex/entries/geodude.asm" +GravelerPokedexEntry:: INCLUDE "data/pokedex/entries/graveler.asm" +GolemPokedexEntry:: INCLUDE "data/pokedex/entries/golem.asm" +PonytaPokedexEntry:: INCLUDE "data/pokedex/entries/ponyta.asm" +RapidashPokedexEntry:: INCLUDE "data/pokedex/entries/rapidash.asm" +SlowpokePokedexEntry:: INCLUDE "data/pokedex/entries/slowpoke.asm" +SlowbroPokedexEntry:: INCLUDE "data/pokedex/entries/slowbro.asm" +MagnemitePokedexEntry:: INCLUDE "data/pokedex/entries/magnemite.asm" +MagnetonPokedexEntry:: INCLUDE "data/pokedex/entries/magneton.asm" +FarfetchDPokedexEntry:: INCLUDE "data/pokedex/entries/farfetch_d.asm" +DoduoPokedexEntry:: INCLUDE "data/pokedex/entries/doduo.asm" +DodrioPokedexEntry:: INCLUDE "data/pokedex/entries/dodrio.asm" +SeelPokedexEntry:: INCLUDE "data/pokedex/entries/seel.asm" +DewgongPokedexEntry:: INCLUDE "data/pokedex/entries/dewgong.asm" +GrimerPokedexEntry:: INCLUDE "data/pokedex/entries/grimer.asm" +MukPokedexEntry:: INCLUDE "data/pokedex/entries/muk.asm" +ShellderPokedexEntry:: INCLUDE "data/pokedex/entries/shellder.asm" +CloysterPokedexEntry:: INCLUDE "data/pokedex/entries/cloyster.asm" +GastlyPokedexEntry:: INCLUDE "data/pokedex/entries/gastly.asm" +HaunterPokedexEntry:: INCLUDE "data/pokedex/entries/haunter.asm" +GengarPokedexEntry:: INCLUDE "data/pokedex/entries/gengar.asm" +OnixPokedexEntry:: INCLUDE "data/pokedex/entries/onix.asm" +DrowzeePokedexEntry:: INCLUDE "data/pokedex/entries/drowzee.asm" +HypnoPokedexEntry:: INCLUDE "data/pokedex/entries/hypno.asm" +KrabbyPokedexEntry:: INCLUDE "data/pokedex/entries/krabby.asm" +KinglerPokedexEntry:: INCLUDE "data/pokedex/entries/kingler.asm" +VoltorbPokedexEntry:: INCLUDE "data/pokedex/entries/voltorb.asm" +ElectrodePokedexEntry:: INCLUDE "data/pokedex/entries/electrode.asm" +ExeggcutePokedexEntry:: INCLUDE "data/pokedex/entries/exeggcute.asm" +ExeggutorPokedexEntry:: INCLUDE "data/pokedex/entries/exeggutor.asm" +CubonePokedexEntry:: INCLUDE "data/pokedex/entries/cubone.asm" +MarowakPokedexEntry:: INCLUDE "data/pokedex/entries/marowak.asm" +HitmonleePokedexEntry:: INCLUDE "data/pokedex/entries/hitmonlee.asm" +HitmonchanPokedexEntry:: INCLUDE "data/pokedex/entries/hitmonchan.asm" +LickitungPokedexEntry:: INCLUDE "data/pokedex/entries/lickitung.asm" +KoffingPokedexEntry:: INCLUDE "data/pokedex/entries/koffing.asm" +WeezingPokedexEntry:: INCLUDE "data/pokedex/entries/weezing.asm" +RhyhornPokedexEntry:: INCLUDE "data/pokedex/entries/rhyhorn.asm" +RhydonPokedexEntry:: INCLUDE "data/pokedex/entries/rhydon.asm" +ChanseyPokedexEntry:: INCLUDE "data/pokedex/entries/chansey.asm" +TangelaPokedexEntry:: INCLUDE "data/pokedex/entries/tangela.asm" +KangaskhanPokedexEntry:: INCLUDE "data/pokedex/entries/kangaskhan.asm" +HorseaPokedexEntry:: INCLUDE "data/pokedex/entries/horsea.asm" +SeadraPokedexEntry:: INCLUDE "data/pokedex/entries/seadra.asm" +GoldeenPokedexEntry:: INCLUDE "data/pokedex/entries/goldeen.asm" +SeakingPokedexEntry:: INCLUDE "data/pokedex/entries/seaking.asm" +StaryuPokedexEntry:: INCLUDE "data/pokedex/entries/staryu.asm" +StarmiePokedexEntry:: INCLUDE "data/pokedex/entries/starmie.asm" +MrMimePokedexEntry:: INCLUDE "data/pokedex/entries/mr__mime.asm" +ScytherPokedexEntry:: INCLUDE "data/pokedex/entries/scyther.asm" +JynxPokedexEntry:: INCLUDE "data/pokedex/entries/jynx.asm" +ElectabuzzPokedexEntry:: INCLUDE "data/pokedex/entries/electabuzz.asm" +MagmarPokedexEntry:: INCLUDE "data/pokedex/entries/magmar.asm" +PinsirPokedexEntry:: INCLUDE "data/pokedex/entries/pinsir.asm" +TaurosPokedexEntry:: INCLUDE "data/pokedex/entries/tauros.asm" diff --git a/data/pokedex/entries_3.asm b/data/pokedex/entries_3.asm index 8aa1c28c1..869252baa 100644 --- a/data/pokedex/entries_3.asm +++ b/data/pokedex/entries_3.asm @@ -1,64 +1,64 @@ -MagikarpPokedexEntry:: INCLUDE "data/pokedex/entries/129.asm" -GyaradosPokedexEntry:: INCLUDE "data/pokedex/entries/130.asm" -LaprasPokedexEntry:: INCLUDE "data/pokedex/entries/131.asm" -DittoPokedexEntry:: INCLUDE "data/pokedex/entries/132.asm" -EeveePokedexEntry:: INCLUDE "data/pokedex/entries/133.asm" -VaporeonPokedexEntry:: INCLUDE "data/pokedex/entries/134.asm" -JolteonPokedexEntry:: INCLUDE "data/pokedex/entries/135.asm" -FlareonPokedexEntry:: INCLUDE "data/pokedex/entries/136.asm" -PorygonPokedexEntry:: INCLUDE "data/pokedex/entries/137.asm" -OmanytePokedexEntry:: INCLUDE "data/pokedex/entries/138.asm" -OmastarPokedexEntry:: INCLUDE "data/pokedex/entries/139.asm" -KabutoPokedexEntry:: INCLUDE "data/pokedex/entries/140.asm" -KabutopsPokedexEntry:: INCLUDE "data/pokedex/entries/141.asm" -AerodactylPokedexEntry:: INCLUDE "data/pokedex/entries/142.asm" -SnorlaxPokedexEntry:: INCLUDE "data/pokedex/entries/143.asm" -ArticunoPokedexEntry:: INCLUDE "data/pokedex/entries/144.asm" -ZapdosPokedexEntry:: INCLUDE "data/pokedex/entries/145.asm" -MoltresPokedexEntry:: INCLUDE "data/pokedex/entries/146.asm" -DratiniPokedexEntry:: INCLUDE "data/pokedex/entries/147.asm" -DragonairPokedexEntry:: INCLUDE "data/pokedex/entries/148.asm" -DragonitePokedexEntry:: INCLUDE "data/pokedex/entries/149.asm" -MewtwoPokedexEntry:: INCLUDE "data/pokedex/entries/150.asm" -MewPokedexEntry:: INCLUDE "data/pokedex/entries/151.asm" -ChikoritaPokedexEntry:: INCLUDE "data/pokedex/entries/152.asm" -BayleefPokedexEntry:: INCLUDE "data/pokedex/entries/153.asm" -MeganiumPokedexEntry:: INCLUDE "data/pokedex/entries/154.asm" -CyndaquilPokedexEntry:: INCLUDE "data/pokedex/entries/155.asm" -QuilavaPokedexEntry:: INCLUDE "data/pokedex/entries/156.asm" -TyphlosionPokedexEntry:: INCLUDE "data/pokedex/entries/157.asm" -TotodilePokedexEntry:: INCLUDE "data/pokedex/entries/158.asm" -CroconawPokedexEntry:: INCLUDE "data/pokedex/entries/159.asm" -FeraligatrPokedexEntry:: INCLUDE "data/pokedex/entries/160.asm" -SentretPokedexEntry:: INCLUDE "data/pokedex/entries/161.asm" -FurretPokedexEntry:: INCLUDE "data/pokedex/entries/162.asm" -HoothootPokedexEntry:: INCLUDE "data/pokedex/entries/163.asm" -NoctowlPokedexEntry:: INCLUDE "data/pokedex/entries/164.asm" -LedybaPokedexEntry:: INCLUDE "data/pokedex/entries/165.asm" -LedianPokedexEntry:: INCLUDE "data/pokedex/entries/166.asm" -SpinarakPokedexEntry:: INCLUDE "data/pokedex/entries/167.asm" -AriadosPokedexEntry:: INCLUDE "data/pokedex/entries/168.asm" -CrobatPokedexEntry:: INCLUDE "data/pokedex/entries/169.asm" -ChinchouPokedexEntry:: INCLUDE "data/pokedex/entries/170.asm" -LanturnPokedexEntry:: INCLUDE "data/pokedex/entries/171.asm" -PichuPokedexEntry:: INCLUDE "data/pokedex/entries/172.asm" -CleffaPokedexEntry:: INCLUDE "data/pokedex/entries/173.asm" -IgglybuffPokedexEntry:: INCLUDE "data/pokedex/entries/174.asm" -TogepiPokedexEntry:: INCLUDE "data/pokedex/entries/175.asm" -TogeticPokedexEntry:: INCLUDE "data/pokedex/entries/176.asm" -NatuPokedexEntry:: INCLUDE "data/pokedex/entries/177.asm" -XatuPokedexEntry:: INCLUDE "data/pokedex/entries/178.asm" -MareepPokedexEntry:: INCLUDE "data/pokedex/entries/179.asm" -FlaaffyPokedexEntry:: INCLUDE "data/pokedex/entries/180.asm" -AmpharosPokedexEntry:: INCLUDE "data/pokedex/entries/181.asm" -BellossomPokedexEntry:: INCLUDE "data/pokedex/entries/182.asm" -MarillPokedexEntry:: INCLUDE "data/pokedex/entries/183.asm" -AzumarillPokedexEntry:: INCLUDE "data/pokedex/entries/184.asm" -SudowoodoPokedexEntry:: INCLUDE "data/pokedex/entries/185.asm" -PolitoedPokedexEntry:: INCLUDE "data/pokedex/entries/186.asm" -HoppipPokedexEntry:: INCLUDE "data/pokedex/entries/187.asm" -SkiploomPokedexEntry:: INCLUDE "data/pokedex/entries/188.asm" -JumpluffPokedexEntry:: INCLUDE "data/pokedex/entries/189.asm" -AipomPokedexEntry:: INCLUDE "data/pokedex/entries/190.asm" -SunkernPokedexEntry:: INCLUDE "data/pokedex/entries/191.asm" -SunfloraPokedexEntry:: INCLUDE "data/pokedex/entries/192.asm" +MagikarpPokedexEntry:: INCLUDE "data/pokedex/entries/magikarp.asm" +GyaradosPokedexEntry:: INCLUDE "data/pokedex/entries/gyarados.asm" +LaprasPokedexEntry:: INCLUDE "data/pokedex/entries/lapras.asm" +DittoPokedexEntry:: INCLUDE "data/pokedex/entries/ditto.asm" +EeveePokedexEntry:: INCLUDE "data/pokedex/entries/eevee.asm" +VaporeonPokedexEntry:: INCLUDE "data/pokedex/entries/vaporeon.asm" +JolteonPokedexEntry:: INCLUDE "data/pokedex/entries/jolteon.asm" +FlareonPokedexEntry:: INCLUDE "data/pokedex/entries/flareon.asm" +PorygonPokedexEntry:: INCLUDE "data/pokedex/entries/porygon.asm" +OmanytePokedexEntry:: INCLUDE "data/pokedex/entries/omanyte.asm" +OmastarPokedexEntry:: INCLUDE "data/pokedex/entries/omastar.asm" +KabutoPokedexEntry:: INCLUDE "data/pokedex/entries/kabuto.asm" +KabutopsPokedexEntry:: INCLUDE "data/pokedex/entries/kabutops.asm" +AerodactylPokedexEntry:: INCLUDE "data/pokedex/entries/aerodactyl.asm" +SnorlaxPokedexEntry:: INCLUDE "data/pokedex/entries/snorlax.asm" +ArticunoPokedexEntry:: INCLUDE "data/pokedex/entries/articuno.asm" +ZapdosPokedexEntry:: INCLUDE "data/pokedex/entries/zapdos.asm" +MoltresPokedexEntry:: INCLUDE "data/pokedex/entries/moltres.asm" +DratiniPokedexEntry:: INCLUDE "data/pokedex/entries/dratini.asm" +DragonairPokedexEntry:: INCLUDE "data/pokedex/entries/dragonair.asm" +DragonitePokedexEntry:: INCLUDE "data/pokedex/entries/dragonite.asm" +MewtwoPokedexEntry:: INCLUDE "data/pokedex/entries/mewtwo.asm" +MewPokedexEntry:: INCLUDE "data/pokedex/entries/mew.asm" +ChikoritaPokedexEntry:: INCLUDE "data/pokedex/entries/chikorita.asm" +BayleefPokedexEntry:: INCLUDE "data/pokedex/entries/bayleef.asm" +MeganiumPokedexEntry:: INCLUDE "data/pokedex/entries/meganium.asm" +CyndaquilPokedexEntry:: INCLUDE "data/pokedex/entries/cyndaquil.asm" +QuilavaPokedexEntry:: INCLUDE "data/pokedex/entries/quilava.asm" +TyphlosionPokedexEntry:: INCLUDE "data/pokedex/entries/typhlosion.asm" +TotodilePokedexEntry:: INCLUDE "data/pokedex/entries/totodile.asm" +CroconawPokedexEntry:: INCLUDE "data/pokedex/entries/croconaw.asm" +FeraligatrPokedexEntry:: INCLUDE "data/pokedex/entries/feraligatr.asm" +SentretPokedexEntry:: INCLUDE "data/pokedex/entries/sentret.asm" +FurretPokedexEntry:: INCLUDE "data/pokedex/entries/furret.asm" +HoothootPokedexEntry:: INCLUDE "data/pokedex/entries/hoothoot.asm" +NoctowlPokedexEntry:: INCLUDE "data/pokedex/entries/noctowl.asm" +LedybaPokedexEntry:: INCLUDE "data/pokedex/entries/ledyba.asm" +LedianPokedexEntry:: INCLUDE "data/pokedex/entries/ledian.asm" +SpinarakPokedexEntry:: INCLUDE "data/pokedex/entries/spinarak.asm" +AriadosPokedexEntry:: INCLUDE "data/pokedex/entries/ariados.asm" +CrobatPokedexEntry:: INCLUDE "data/pokedex/entries/crobat.asm" +ChinchouPokedexEntry:: INCLUDE "data/pokedex/entries/chinchou.asm" +LanturnPokedexEntry:: INCLUDE "data/pokedex/entries/lanturn.asm" +PichuPokedexEntry:: INCLUDE "data/pokedex/entries/pichu.asm" +CleffaPokedexEntry:: INCLUDE "data/pokedex/entries/cleffa.asm" +IgglybuffPokedexEntry:: INCLUDE "data/pokedex/entries/igglybuff.asm" +TogepiPokedexEntry:: INCLUDE "data/pokedex/entries/togepi.asm" +TogeticPokedexEntry:: INCLUDE "data/pokedex/entries/togetic.asm" +NatuPokedexEntry:: INCLUDE "data/pokedex/entries/natu.asm" +XatuPokedexEntry:: INCLUDE "data/pokedex/entries/xatu.asm" +MareepPokedexEntry:: INCLUDE "data/pokedex/entries/mareep.asm" +FlaaffyPokedexEntry:: INCLUDE "data/pokedex/entries/flaaffy.asm" +AmpharosPokedexEntry:: INCLUDE "data/pokedex/entries/ampharos.asm" +BellossomPokedexEntry:: INCLUDE "data/pokedex/entries/bellossom.asm" +MarillPokedexEntry:: INCLUDE "data/pokedex/entries/marill.asm" +AzumarillPokedexEntry:: INCLUDE "data/pokedex/entries/azumarill.asm" +SudowoodoPokedexEntry:: INCLUDE "data/pokedex/entries/sudowoodo.asm" +PolitoedPokedexEntry:: INCLUDE "data/pokedex/entries/politoed.asm" +HoppipPokedexEntry:: INCLUDE "data/pokedex/entries/hoppip.asm" +SkiploomPokedexEntry:: INCLUDE "data/pokedex/entries/skiploom.asm" +JumpluffPokedexEntry:: INCLUDE "data/pokedex/entries/jumpluff.asm" +AipomPokedexEntry:: INCLUDE "data/pokedex/entries/aipom.asm" +SunkernPokedexEntry:: INCLUDE "data/pokedex/entries/sunkern.asm" +SunfloraPokedexEntry:: INCLUDE "data/pokedex/entries/sunflora.asm" diff --git a/data/pokedex/entries_4.asm b/data/pokedex/entries_4.asm index 846a4b91a..240f87e3e 100644 --- a/data/pokedex/entries_4.asm +++ b/data/pokedex/entries_4.asm @@ -1,59 +1,59 @@ -YanmaPokedexEntry:: INCLUDE "data/pokedex/entries/193.asm" -WooperPokedexEntry:: INCLUDE "data/pokedex/entries/194.asm" -QuagsirePokedexEntry:: INCLUDE "data/pokedex/entries/195.asm" -EspeonPokedexEntry:: INCLUDE "data/pokedex/entries/196.asm" -UmbreonPokedexEntry:: INCLUDE "data/pokedex/entries/197.asm" -MurkrowPokedexEntry:: INCLUDE "data/pokedex/entries/198.asm" -SlowkingPokedexEntry:: INCLUDE "data/pokedex/entries/199.asm" -MisdreavusPokedexEntry:: INCLUDE "data/pokedex/entries/200.asm" -UnownPokedexEntry:: INCLUDE "data/pokedex/entries/201.asm" -WobbuffetPokedexEntry:: INCLUDE "data/pokedex/entries/202.asm" -GirafarigPokedexEntry:: INCLUDE "data/pokedex/entries/203.asm" -PinecoPokedexEntry:: INCLUDE "data/pokedex/entries/204.asm" -ForretressPokedexEntry:: INCLUDE "data/pokedex/entries/205.asm" -DunsparcePokedexEntry:: INCLUDE "data/pokedex/entries/206.asm" -GligarPokedexEntry:: INCLUDE "data/pokedex/entries/207.asm" -SteelixPokedexEntry:: INCLUDE "data/pokedex/entries/208.asm" -SnubbullPokedexEntry:: INCLUDE "data/pokedex/entries/209.asm" -GranbullPokedexEntry:: INCLUDE "data/pokedex/entries/210.asm" -QwilfishPokedexEntry:: INCLUDE "data/pokedex/entries/211.asm" -ScizorPokedexEntry:: INCLUDE "data/pokedex/entries/212.asm" -ShucklePokedexEntry:: INCLUDE "data/pokedex/entries/213.asm" -HeracrossPokedexEntry:: INCLUDE "data/pokedex/entries/214.asm" -SneaselPokedexEntry:: INCLUDE "data/pokedex/entries/215.asm" -TeddiursaPokedexEntry:: INCLUDE "data/pokedex/entries/216.asm" -UrsaringPokedexEntry:: INCLUDE "data/pokedex/entries/217.asm" -SlugmaPokedexEntry:: INCLUDE "data/pokedex/entries/218.asm" -MagcargoPokedexEntry:: INCLUDE "data/pokedex/entries/219.asm" -SwinubPokedexEntry:: INCLUDE "data/pokedex/entries/220.asm" -PiloswinePokedexEntry:: INCLUDE "data/pokedex/entries/221.asm" -CorsolaPokedexEntry:: INCLUDE "data/pokedex/entries/222.asm" -RemoraidPokedexEntry:: INCLUDE "data/pokedex/entries/223.asm" -OctilleryPokedexEntry:: INCLUDE "data/pokedex/entries/224.asm" -DelibirdPokedexEntry:: INCLUDE "data/pokedex/entries/225.asm" -MantinePokedexEntry:: INCLUDE "data/pokedex/entries/226.asm" -SkarmoryPokedexEntry:: INCLUDE "data/pokedex/entries/227.asm" -HoundourPokedexEntry:: INCLUDE "data/pokedex/entries/228.asm" -HoundoomPokedexEntry:: INCLUDE "data/pokedex/entries/229.asm" -KingdraPokedexEntry:: INCLUDE "data/pokedex/entries/230.asm" -PhanpyPokedexEntry:: INCLUDE "data/pokedex/entries/231.asm" -DonphanPokedexEntry:: INCLUDE "data/pokedex/entries/232.asm" -Porygon2PokedexEntry:: INCLUDE "data/pokedex/entries/233.asm" -StantlerPokedexEntry:: INCLUDE "data/pokedex/entries/234.asm" -SmearglePokedexEntry:: INCLUDE "data/pokedex/entries/235.asm" -TyroguePokedexEntry:: INCLUDE "data/pokedex/entries/236.asm" -HitmontopPokedexEntry:: INCLUDE "data/pokedex/entries/237.asm" -SmoochumPokedexEntry:: INCLUDE "data/pokedex/entries/238.asm" -ElekidPokedexEntry:: INCLUDE "data/pokedex/entries/239.asm" -MagbyPokedexEntry:: INCLUDE "data/pokedex/entries/240.asm" -MiltankPokedexEntry:: INCLUDE "data/pokedex/entries/241.asm" -BlisseyPokedexEntry:: INCLUDE "data/pokedex/entries/242.asm" -RaikouPokedexEntry:: INCLUDE "data/pokedex/entries/243.asm" -EnteiPokedexEntry:: INCLUDE "data/pokedex/entries/244.asm" -SuicunePokedexEntry:: INCLUDE "data/pokedex/entries/245.asm" -LarvitarPokedexEntry:: INCLUDE "data/pokedex/entries/246.asm" -PupitarPokedexEntry:: INCLUDE "data/pokedex/entries/247.asm" -TyranitarPokedexEntry:: INCLUDE "data/pokedex/entries/248.asm" -LugiaPokedexEntry:: INCLUDE "data/pokedex/entries/249.asm" -HoOhPokedexEntry:: INCLUDE "data/pokedex/entries/250.asm" -CelebiPokedexEntry:: INCLUDE "data/pokedex/entries/251.asm" +YanmaPokedexEntry:: INCLUDE "data/pokedex/entries/yanma.asm" +WooperPokedexEntry:: INCLUDE "data/pokedex/entries/wooper.asm" +QuagsirePokedexEntry:: INCLUDE "data/pokedex/entries/quagsire.asm" +EspeonPokedexEntry:: INCLUDE "data/pokedex/entries/espeon.asm" +UmbreonPokedexEntry:: INCLUDE "data/pokedex/entries/umbreon.asm" +MurkrowPokedexEntry:: INCLUDE "data/pokedex/entries/murkrow.asm" +SlowkingPokedexEntry:: INCLUDE "data/pokedex/entries/slowking.asm" +MisdreavusPokedexEntry:: INCLUDE "data/pokedex/entries/misdreavus.asm" +UnownPokedexEntry:: INCLUDE "data/pokedex/entries/unown.asm" +WobbuffetPokedexEntry:: INCLUDE "data/pokedex/entries/wobbuffet.asm" +GirafarigPokedexEntry:: INCLUDE "data/pokedex/entries/girafarig.asm" +PinecoPokedexEntry:: INCLUDE "data/pokedex/entries/pineco.asm" +ForretressPokedexEntry:: INCLUDE "data/pokedex/entries/forretress.asm" +DunsparcePokedexEntry:: INCLUDE "data/pokedex/entries/dunsparce.asm" +GligarPokedexEntry:: INCLUDE "data/pokedex/entries/gligar.asm" +SteelixPokedexEntry:: INCLUDE "data/pokedex/entries/steelix.asm" +SnubbullPokedexEntry:: INCLUDE "data/pokedex/entries/snubbull.asm" +GranbullPokedexEntry:: INCLUDE "data/pokedex/entries/granbull.asm" +QwilfishPokedexEntry:: INCLUDE "data/pokedex/entries/qwilfish.asm" +ScizorPokedexEntry:: INCLUDE "data/pokedex/entries/scizor.asm" +ShucklePokedexEntry:: INCLUDE "data/pokedex/entries/shuckle.asm" +HeracrossPokedexEntry:: INCLUDE "data/pokedex/entries/heracross.asm" +SneaselPokedexEntry:: INCLUDE "data/pokedex/entries/sneasel.asm" +TeddiursaPokedexEntry:: INCLUDE "data/pokedex/entries/teddiursa.asm" +UrsaringPokedexEntry:: INCLUDE "data/pokedex/entries/ursaring.asm" +SlugmaPokedexEntry:: INCLUDE "data/pokedex/entries/slugma.asm" +MagcargoPokedexEntry:: INCLUDE "data/pokedex/entries/magcargo.asm" +SwinubPokedexEntry:: INCLUDE "data/pokedex/entries/swinub.asm" +PiloswinePokedexEntry:: INCLUDE "data/pokedex/entries/piloswine.asm" +CorsolaPokedexEntry:: INCLUDE "data/pokedex/entries/corsola.asm" +RemoraidPokedexEntry:: INCLUDE "data/pokedex/entries/remoraid.asm" +OctilleryPokedexEntry:: INCLUDE "data/pokedex/entries/octillery.asm" +DelibirdPokedexEntry:: INCLUDE "data/pokedex/entries/delibird.asm" +MantinePokedexEntry:: INCLUDE "data/pokedex/entries/mantine.asm" +SkarmoryPokedexEntry:: INCLUDE "data/pokedex/entries/skarmory.asm" +HoundourPokedexEntry:: INCLUDE "data/pokedex/entries/houndour.asm" +HoundoomPokedexEntry:: INCLUDE "data/pokedex/entries/houndoom.asm" +KingdraPokedexEntry:: INCLUDE "data/pokedex/entries/kingdra.asm" +PhanpyPokedexEntry:: INCLUDE "data/pokedex/entries/phanpy.asm" +DonphanPokedexEntry:: INCLUDE "data/pokedex/entries/donphan.asm" +Porygon2PokedexEntry:: INCLUDE "data/pokedex/entries/porygon2.asm" +StantlerPokedexEntry:: INCLUDE "data/pokedex/entries/stantler.asm" +SmearglePokedexEntry:: INCLUDE "data/pokedex/entries/smeargle.asm" +TyroguePokedexEntry:: INCLUDE "data/pokedex/entries/tyrogue.asm" +HitmontopPokedexEntry:: INCLUDE "data/pokedex/entries/hitmontop.asm" +SmoochumPokedexEntry:: INCLUDE "data/pokedex/entries/smoochum.asm" +ElekidPokedexEntry:: INCLUDE "data/pokedex/entries/elekid.asm" +MagbyPokedexEntry:: INCLUDE "data/pokedex/entries/magby.asm" +MiltankPokedexEntry:: INCLUDE "data/pokedex/entries/miltank.asm" +BlisseyPokedexEntry:: INCLUDE "data/pokedex/entries/blissey.asm" +RaikouPokedexEntry:: INCLUDE "data/pokedex/entries/raikou.asm" +EnteiPokedexEntry:: INCLUDE "data/pokedex/entries/entei.asm" +SuicunePokedexEntry:: INCLUDE "data/pokedex/entries/suicune.asm" +LarvitarPokedexEntry:: INCLUDE "data/pokedex/entries/larvitar.asm" +PupitarPokedexEntry:: INCLUDE "data/pokedex/entries/pupitar.asm" +TyranitarPokedexEntry:: INCLUDE "data/pokedex/entries/tyranitar.asm" +LugiaPokedexEntry:: INCLUDE "data/pokedex/entries/lugia.asm" +HoOhPokedexEntry:: INCLUDE "data/pokedex/entries/ho_oh.asm" +CelebiPokedexEntry:: INCLUDE "data/pokedex/entries/celebi.asm" diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index 1c0d7cd3e..fbb2dbc97 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -1622,7 +1622,7 @@ CrystalIntro_InitUnownAnim: ; e51dc (39:51dc) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld [hl], $8 - ld a, $3c + ld a, SPRITE_ANIM_FRAMESET_INTRO_UNOWN_4 call ReinitSpriteAnimFrame pop de @@ -1632,7 +1632,7 @@ CrystalIntro_InitUnownAnim: ; e51dc (39:51dc) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld [hl], $18 - ld a, $3b + ld a, SPRITE_ANIM_FRAMESET_INTRO_UNOWN_3 call ReinitSpriteAnimFrame pop de @@ -1642,7 +1642,7 @@ CrystalIntro_InitUnownAnim: ; e51dc (39:51dc) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld [hl], $28 - ld a, $39 + ld a, SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1 call ReinitSpriteAnimFrame pop de @@ -1651,7 +1651,7 @@ CrystalIntro_InitUnownAnim: ; e51dc (39:51dc) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld [hl], $38 - ld a, $3a + ld a, SPRITE_ANIM_FRAMESET_INTRO_UNOWN_2 call ReinitSpriteAnimFrame ret diff --git a/engine/specials.asm b/engine/specials.asm index 2d9b6f998..2548cf076 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -138,7 +138,7 @@ SpecialsPointers:: ; c029 add_special Function11b879 add_special Function11b920 add_special Function11b93b - add_special Function1700b0 + add_special BattleTowerRoomMenu add_special Function1700ba add_special Function170114 add_special BattleTowerBattle @@ -161,7 +161,7 @@ SpecialsPointers:: ; c029 add_special Special_Menu_ChallengeExplanationCancel add_special Function17d2b6 add_special Function17d2ce - add_special Function17f53d + add_special BattleTowerMobileError add_special AskMobileOrCable add_special SpecialHoOhChamber add_special Function102142 diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 132c0fb5a..ed7fe20ad 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -367,7 +367,7 @@ DoAnimFrame: ; 8d24b cp $2 ret nz ld [hl], $3 - ld a, $f + ld a, SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY_2 call _ReinitSpriteAnimFrame ret @@ -431,7 +431,7 @@ DoAnimFrame: ; 8d24b ; 8d493 .sixteen_zero ; 8d493 - ld a, $14 + ld a, SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0 call _ReinitSpriteAnimFrame ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX @@ -780,7 +780,7 @@ DoAnimFrame: ; 8d24b ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc ld [hl], a - ld a, $36 + ld a, SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_2 call _ReinitSpriteAnimFrame ret @@ -834,7 +834,7 @@ DoAnimFrame: ; 8d24b ld a, [wcf64] cp $40 ret nz - ld a, $3d + ld a, SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F_2 call _ReinitSpriteAnimFrame ret diff --git a/engine/sprites.asm b/engine/sprites.asm index 70240e0e0..b358275eb 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -552,51 +552,51 @@ BrokenGetStdGraphics: ; 8d1ac SpriteAnimSeqData: ; 8d1c4 ; frameset sequence, tile - db SPRITE_ANIM_FRAMESET_01, SPRITE_ANIM_SEQ_01, $00 ; 00 + db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_SEQ_01, $00 ; 00 db SPRITE_ANIM_FRAMESET_07, SPRITE_ANIM_SEQ_04, $00 ; 01 - db SPRITE_ANIM_FRAMESET_08, SPRITE_ANIM_SEQ_05, $05 ; 02 + db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_05, $05 ; 02 db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO, SPRITE_ANIM_SEQ_GAMEFREAK_LOGO, $00 ; 03 db SPRITE_ANIM_FRAMESET_0B, SPRITE_ANIM_SEQ_07, $06 ; 04 gs intro star db SPRITE_ANIM_FRAMESET_0C, SPRITE_ANIM_SEQ_08, $06 ; 05 gs intro sparkle - db SPRITE_ANIM_FRAMESET_SLOT_GOLEM, SPRITE_ANIM_SEQ_SLOT_GOLEM, $07 ; 06 slots golem + db SPRITE_ANIM_FRAMESET_SLOTS_GOLEM, SPRITE_ANIM_SEQ_SLOT_GOLEM, $07 ; 06 slots golem db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY, SPRITE_ANIM_SEQ_SLOTS_CHANSEY, $07 ; 07 slots chansey db SPRITE_ANIM_FRAMESET_SLOTS_EGG, SPRITE_ANIM_SEQ_SLOTS_EGG, $07 ; 08 slots egg - db SPRITE_ANIM_FRAMESET_08, SPRITE_ANIM_SEQ_0C, $05 ; 09 + db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_0C, $05 ; 09 db SPRITE_ANIM_FRAMESET_WALK_CYCLE, SPRITE_ANIM_SEQ_NULL, $00 ; 0a walk cycle - db SPRITE_ANIM_FRAMESET_12, SPRITE_ANIM_SEQ_0D, $08 ; 0b - db SPRITE_ANIM_FRAMESET_12, SPRITE_ANIM_SEQ_0E, $08 ; 0c - db SPRITE_ANIM_FRAMESET_12, SPRITE_ANIM_SEQ_0F, $08 ; 0d - db SPRITE_ANIM_FRAMESET_13, SPRITE_ANIM_SEQ_10, $00 ; 0e - db SPRITE_ANIM_FRAMESET_15, SPRITE_ANIM_SEQ_NULL, $00 ; 0f - db SPRITE_ANIM_FRAMESET_16, SPRITE_ANIM_SEQ_11, $00 ; 10 + db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0D, $08 ; 0b + db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0E, $08 ; 0c + db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0F, $08 ; 0d + db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL, SPRITE_ANIM_SEQ_10, $00 ; 0e + db SPRITE_ANIM_FRAMESET_TRADE_POOF, SPRITE_ANIM_SEQ_NULL, $00 ; 0f + db SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE, SPRITE_ANIM_SEQ_11, $00 ; 10 db SPRITE_ANIM_FRAMESET_TRADEMON_ICON, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 ; 11 db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 ; 12 - db SPRITE_ANIM_FRAMESET_19, SPRITE_ANIM_SEQ_13, $00 ; 13 - db SPRITE_ANIM_FRAMESET_1A, SPRITE_ANIM_SEQ_14, $00 ; 14 radio tuning knob - db SPRITE_ANIM_FRAMESET_1B, SPRITE_ANIM_SEQ_NULL, $00 ; 15 chris on magnet train + db SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT, SPRITE_ANIM_SEQ_13, $00 ; 13 + db SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB, SPRITE_ANIM_SEQ_14, $00 ; 14 radio tuning knob + db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED, SPRITE_ANIM_SEQ_NULL, $00 ; 15 chris on magnet train db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_15, $00 ; 16 leaves when cutting down a tree - db SPRITE_ANIM_FRAMESET_1E, SPRITE_ANIM_SEQ_NULL, $00 ; 17 + db SPRITE_ANIM_FRAMESET_CUT_TREE, SPRITE_ANIM_SEQ_NULL, $00 ; 17 db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_FLY_LEAF, $00 ; 18 flying leaves - db SPRITE_ANIM_FRAMESET_1F, SPRITE_ANIM_SEQ_NULL, $00 ; 19 + db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_SEQ_NULL, $00 ; 19 db SPRITE_ANIM_FRAMESET_24, SPRITE_ANIM_SEQ_19, $00 ; 1a - db SPRITE_ANIM_FRAMESET_25, SPRITE_ANIM_SEQ_NULL, $00 ; 1b headbutt - db SPRITE_ANIM_FRAMESET_20, SPRITE_ANIM_SEQ_13, $00 ; 1c + db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, $00 ; 1b headbutt + db SPRITE_ANIM_FRAMESET_EGG_HATCH, SPRITE_ANIM_SEQ_13, $00 ; 1c db SPRITE_ANIM_FRAMESET_26, SPRITE_ANIM_SEQ_1A, $00 ; 1d - db SPRITE_ANIM_FRAMESET_2D, SPRITE_ANIM_SEQ_NULL, $00 ; 1e kris on map - db SPRITE_ANIM_FRAMESET_2E, SPRITE_ANIM_SEQ_NULL, $00 ; 1f kris on magnet train + db SPRITE_ANIM_FRAMESET_BLUE_WALK, SPRITE_ANIM_SEQ_NULL, $00 ; 1e kris on map + db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE, SPRITE_ANIM_SEQ_NULL, $00 ; 1f kris on magnet train db SPRITE_ANIM_FRAMESET_2F, SPRITE_ANIM_SEQ_NULL, $00 ; 20 db SPRITE_ANIM_FRAMESET_30, SPRITE_ANIM_SEQ_NULL, $00 ; 21 db SPRITE_ANIM_FRAMESET_31, SPRITE_ANIM_SEQ_NULL, $00 ; 22 db SPRITE_ANIM_FRAMESET_32, SPRITE_ANIM_SEQ_1B, $00 ; 23 db SPRITE_ANIM_FRAMESET_33, SPRITE_ANIM_SEQ_1C, $00 ; 24 db SPRITE_ANIM_FRAMESET_34, SPRITE_ANIM_SEQ_NULL, $00 ; 25 - db SPRITE_ANIM_FRAMESET_35, SPRITE_ANIM_SEQ_1D, $00 ; 26 - db SPRITE_ANIM_FRAMESET_37, SPRITE_ANIM_SEQ_1E, $00 ; 27 - db SPRITE_ANIM_FRAMESET_38, SPRITE_ANIM_SEQ_1E, $00 ; 28 - db SPRITE_ANIM_FRAMESET_39, SPRITE_ANIM_SEQ_20, $00 ; 29 intro unown - db SPRITE_ANIM_FRAMESET_3F, SPRITE_ANIM_SEQ_21, $00 ; 2a - db SPRITE_ANIM_FRAMESET_3E, SPRITE_ANIM_SEQ_22, $00 ; 2b - db SPRITE_ANIM_FRAMESET_40, SPRITE_ANIM_SEQ_NULL, $00 ; 2c + db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE, SPRITE_ANIM_SEQ_1D, $00 ; 26 + db SPRITE_ANIM_FRAMESET_INTRO_PICHU, SPRITE_ANIM_SEQ_1E, $00 ; 27 + db SPRITE_ANIM_FRAMESET_INTRO_WOOPER, SPRITE_ANIM_SEQ_1E, $00 ; 28 + db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1, SPRITE_ANIM_SEQ_20, $00 ; 29 intro unown + db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F, SPRITE_ANIM_SEQ_21, $00 ; 2a + db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_SEQ_22, $00 ; 2b + db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_SEQ_NULL, $00 ; 2c ; 8d24b INCLUDE "engine/sprite_anims.asm" ; DoAnimFrame diff --git a/event/celebi.asm b/event/celebi.asm index 05f26fe2e..7c8646ec7 100755 --- a/event/celebi.asm +++ b/event/celebi.asm @@ -214,14 +214,14 @@ UpdateCelebiPosition: ; 49aa2 (12:5aa2) jr nc, .left ld hl, SPRITEANIMSTRUCT_FRAMESET_ID add hl, bc - ld a, $41 + ld a, SPRITE_ANIM_FRAMESET_CELEBI_RIGHT call ReinitSpriteAnimFrame jr .done .left ld hl, SPRITEANIMSTRUCT_FRAMESET_ID add hl, bc - ld a, $40 + ld a, SPRITE_ANIM_FRAMESET_CELEBI_LEFT call ReinitSpriteAnimFrame .done ret @@ -231,7 +231,7 @@ UpdateCelebiPosition: ; 49aa2 (12:5aa2) pop af ld hl, SPRITEANIMSTRUCT_FRAMESET_ID add hl, bc - ld a, $40 + ld a, SPRITE_ANIM_FRAMESET_CELEBI_LEFT call ReinitSpriteAnimFrame ret diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 1ee2c8163..6cf6bdd50 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -71,11 +71,11 @@ Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc writetext Text_WantToGoIntoABattleRoom writebyte $1 special Special_Menu_ChallengeExplanationCancel - if_equal $1, Script_ChoseChallenge + if_equal $1, Script_ChooseChallenge if_equal $2, Script_BattleTowerExplanation jump Script_BattleTowerHopeToServeYouAgain -Script_ChoseChallenge: ; 0x9e40f +Script_ChooseChallenge: ; 0x9e40f writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM special BattleTowerAction special SpecialCheckForBattleTowerRules @@ -89,9 +89,9 @@ Script_ChoseChallenge: ; 0x9e40f dotrigger $1 writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [s1_be4f] special BattleTowerAction - special Function1700b0 + special BattleTowerRoomMenu if_equal $a, Script_Menu_ChallengeExplanationCancel - if_not_equal $0, UnknownScript_0x9e550 + if_not_equal $0, Script_MobileError writebyte BATTLETOWERACTION_11 special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom @@ -159,7 +159,7 @@ Script_BattleTowerHopeToServeYouAgain: end UnreferencedScript_0x9e4b6: - special Function17f53d + special BattleTowerMobileError closetext end @@ -178,7 +178,7 @@ UnreferencedScript_0x9e4be: special BattleTowerAction special Function1700ba if_equal $a, Script_Menu_ChallengeExplanationCancel - if_not_equal $0, UnknownScript_0x9e550 + if_not_equal $0, Script_MobileError writetext Text_ReceivedAListOfLeadersOnTheHonorRoll spriteface BATTLETOWER1F_RECEPTIONIST, LEFT writetext Text_PleaseConfirmOnThisMonitor @@ -237,8 +237,8 @@ Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549 waitbutton jump Script_Menu_ChallengeExplanationCancel -UnknownScript_0x9e550: - special Function17f53d +Script_MobileError: + special BattleTowerMobileError closetext end diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm index ee14c2778..54948591c 100755 --- a/misc/battle_tower_5c.asm +++ b/misc/battle_tower_5c.asm @@ -1,7 +1,7 @@ -Function1700b0: ; 1700b0 +BattleTowerRoomMenu: ; 1700b0 ; special call InitBattleTowerChallengeRAM - callba Function118121 + callba _BattleTowerRoomMenu ret ; 1700ba diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 33dbdb091..8cd0311f0 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -326,7 +326,7 @@ Function10020b: ; 10020b ld a, $01 ld [rSVBK], a - callba Function17f555 + callba DisplayMobileError pop af ld [rSVBK], a diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 0bfc7da38..d6743acc2 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -7533,7 +7533,7 @@ Function117bb6: .asm_117bd0 ld a, $2 ld [wc303], a - callba Function17f555 + callba DisplayMobileError ld a, $80 ld [wJumptableIndex], a ret diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 9d8196888..48fed0f33 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -10,7 +10,7 @@ Function118007: ; 118007 ld [wcd38], a asm_11800b - call Function1183cb + call BattleTowerRoomMenu_InitRAM ld a, $18 ld [wcd33], a ld a, $19 @@ -32,7 +32,7 @@ asm_11800b .skip call Function1184a5 - call Function11a8fa + call BattleTowerRoomMenu_WriteMessage callba Function115dd3 callba Function11619d call DelayFrame @@ -42,16 +42,16 @@ asm_11800b jr nz, .loop pop af ld [rSVBK], a - call Function118452 + call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu -Function11805e: ; 11805e (46:405e) +BattleTowerRoomMenu_DoNothing: ; 11805e (46:405e) ret ; 11805f Function11805f: ; 11805f ld a, $1 ld [wcd38], a - call Function1183cb + call BattleTowerRoomMenu_InitRAM ld a, $18 ld [wcd33], a ld a, $19 @@ -73,7 +73,7 @@ Function11805f: ; 11805f .asm_118090 call Function11857c - call Function11a8fa + call BattleTowerRoomMenu_WriteMessage callba Function115dd3 callba Function11619d call DelayFrame @@ -83,13 +83,13 @@ Function11805f: ; 11805f jr nz, .asm_11807d pop af ld [rSVBK], a - call Function118452 + call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu ret ; 1180b8 Function1180b8: ; 1180b8 - call Function1183cb + call BattleTowerRoomMenu_InitRAM ld a, $22 ld [wcd33], a ld a, $23 @@ -119,7 +119,7 @@ Function1180b8: ; 1180b8 .asm_1180f2 call Function1184ec - call Function11a8fa + call BattleTowerRoomMenu_WriteMessage callba Function115dd3 callba Function11619d call DelayFrame @@ -129,7 +129,7 @@ Function1180b8: ; 1180b8 jr nz, .asm_1180d1 pop af ld [rSVBK], a - call Function118452 + call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu ret ; 11811a @@ -139,11 +139,11 @@ Function11811a: ; 11811a ld [wcd38], a jr Function118125 -Function118121: ; 118121 +_BattleTowerRoomMenu: ; 118121 xor a ld [wcd38], a Function118125: ; 118125 - call Function1183cb + call BattleTowerRoomMenu_InitRAM ld a, $3 ld [wcd33], a ld a, $d @@ -163,8 +163,8 @@ Function118125: ; 118125 ld a, [wcd34] ld [wcf66], a .skip - call Function11854d - call Function11a8fa + call BattleTowerRoomMenu_Jumptable + call BattleTowerRoomMenu_WriteMessage callba Function115dd3 callba Function11619d call DelayFrame @@ -176,7 +176,7 @@ Function118125: ; 118125 ld [w3_d000], a pop af ld [rSVBK], a - call Function118452 + call BattleTowerRoomMenu_Cleanup call Function118180 call ReturnToMapFromSubmenu ret @@ -229,7 +229,7 @@ Function118180: ; 118180 ; 1181da Function1181da: ; 1181da - call Function1183cb + call BattleTowerRoomMenu_InitRAM ld a, $2 ld [wcd38], a ld a, $21 @@ -253,7 +253,7 @@ Function1181da: ; 1181da .asm_11820b call Function1185c3 - call Function11a8fa + call BattleTowerRoomMenu_WriteMessage callba Function115dd3 callba Function11619d call DelayFrame @@ -263,13 +263,13 @@ Function1181da: ; 1181da jr nz, .asm_1181f8 pop af ld [rSVBK], a - call Function118452 + call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu ret ; 118233 Function118233: ; 118233 - call Function1183cb + call BattleTowerRoomMenu_InitRAM ld a, $1b ld [wcd33], a ld a, $1c @@ -291,7 +291,7 @@ Function118233: ; 118233 .asm_11825f call Function118624 - call Function11a8fa + call BattleTowerRoomMenu_WriteMessage callba Function115dd3 callba Function11619d call DelayFrame @@ -301,12 +301,12 @@ Function118233: ; 118233 jr nz, .asm_11824c pop af ld [rSVBK], a - call Function118452 + call BattleTowerRoomMenu_Cleanup ret ; 118284 Function118284: ; 118284 - call Function1183cb + call BattleTowerRoomMenu_InitRAM ld a, $19 ld [wcd33], a ld a, $1e @@ -327,7 +327,7 @@ Function118284: ; 118284 ld [wcf66], a .asm_1182b0 call Function1186f5 - call Function11a8fa + call BattleTowerRoomMenu_WriteMessage callba Function115dd3 callba Function11619d call DelayFrame @@ -337,13 +337,13 @@ Function118284: ; 118284 jr nz, .asm_11829d pop af ld [rSVBK], a - call Function118452 + call BattleTowerRoomMenu_Cleanup ret ; 1182d5 (46:42d5) Function1182d5: ; 1182d5 - call Function1183cb + call BattleTowerRoomMenu_InitRAM ld a, $18 ld [wcd33], a ld a, $19 @@ -365,7 +365,7 @@ Function1182d5: ; 1182d5 .asm_118301 call Function118746 - call Function11a8fa + call BattleTowerRoomMenu_WriteMessage callba Function115dd3 callba Function11619d call DelayFrame @@ -375,13 +375,13 @@ Function1182d5: ; 1182d5 jr nz, .asm_1182ee pop af ld [rSVBK], a - call Function118452 + call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu ret ; 118329 Function118329: ; 118329 - call Function1183cb + call BattleTowerRoomMenu_InitRAM ld a, $15 ld [wcd33], a ld a, $16 @@ -403,7 +403,7 @@ Function118329: ; 118329 .asm_118355 call Function118671 - call Function11a8fa + call BattleTowerRoomMenu_WriteMessage callba Function115dd3 callba Function11619d call DelayFrame @@ -413,12 +413,12 @@ Function118329: ; 118329 jr nz, .asm_118342 pop af ld [rSVBK], a - call Function118452 + call BattleTowerRoomMenu_Cleanup ret ; 11837a Function11837a: ; 11837a - call Function1183cb + call BattleTowerRoomMenu_InitRAM ld a, $16 ld [wcd33], a ld a, $17 @@ -440,7 +440,7 @@ Function11837a: ; 11837a .asm_1183a6 call Function1186b2 - call Function11a8fa + call BattleTowerRoomMenu_WriteMessage callba Function115dd3 callba Function11619d call DelayFrame @@ -450,11 +450,11 @@ Function11837a: ; 11837a jr nz, .asm_118393 pop af ld [rSVBK], a - call Function118452 + call BattleTowerRoomMenu_Cleanup ret ; 1183cb -Function1183cb: ; 1183cb +BattleTowerRoomMenu_InitRAM: ; 1183cb di ld a, [rIE] ld [wcd32], a @@ -511,7 +511,7 @@ Function118440: ; 118440 ret ; 118452 -Function118452: ; 118452 +BattleTowerRoomMenu_Cleanup: ; 118452 di xor a ld [hMobileReceive], a @@ -590,9 +590,9 @@ Function1184a5: ; 1184a5 dw Function118e76 dw Function118e7e dw Function11878d - dw Function11805e + dw BattleTowerRoomMenu_DoNothing dw Function118e76 - dw Function118e87 + dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 ; 1184ec @@ -635,36 +635,36 @@ Function1184ec: ; 1184ec dw Function118e76 dw Function118e7e dw Function11878d - dw Function11805e + dw BattleTowerRoomMenu_DoNothing dw Function118e76 - dw Function118e87 + dw BattleTowerRoomMenu_CallRoomMenu2 dw Function119b45 dw Function11878d dw Function119ac9 dw Function118e76 ; 11854d -Function11854d: ; 11854d +BattleTowerRoomMenu_Jumptable: ; 11854d jumptable .Jumptable, wcf66 ; 11855c .Jumptable: ; 11855c - dw Function118922 - dw Function118936 - dw Function118982 - dw Function11805e - dw Function119ca2 - dw Function119cab - dw Function119cb8 - dw Function119cc3 - dw Function119cdf - dw Function119cec - dw Function119c97 - dw Function119cab - dw Function119cb8 - dw Function118e76 - dw Function118e87 - dw Function118e76 + dw BattleTowerRoomMenu_PickLevelMessage + dw BattleTowerRoomMenu_PlacePickLevelMenu + dw BattleTowerRoomMenu_UpdatePickLevelMenu + dw BattleTowerRoomMenu_DoNothing + dw BattleTowerRoomMenu_PartyMonTopsThisLevelMessage + dw BattleTowerRoomMenu_WaitForMessage + dw BattleTowerRoomMenu_DelayRestartMenu + dw BattleTowerRoomMenu_QuitMessage + dw BattleTowerRoomMenu_PlaceYesNoMenu + dw BattleTowerRoomMenu_UpdateYesNoMenu + dw BattleTowerRoomMenu_UberRestrictionMessage + dw BattleTowerRoomMenu_WaitForMessage + dw BattleTowerRoomMenu_DelayRestartMenu + dw Function118e76 ; mobile + dw BattleTowerRoomMenu_CallRoomMenu2 ; mobile + dw Function118e76 ; mobile ; 11857c Function11857c: ; 11857c @@ -696,9 +696,9 @@ Function11857c: ; 11857c dw Function118e76 dw Function118e7e dw Function11878d - dw Function11805e + dw BattleTowerRoomMenu_DoNothing dw Function118e76 - dw Function118e87 + dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 ; 1185c3 @@ -740,12 +740,12 @@ Function1185c3: ; 1185c3 dw Function118e76 dw Function118e7e dw Function11878d - dw Function11805e + dw BattleTowerRoomMenu_DoNothing dw Function118e76 - dw Function118e87 - dw Function119cc3 - dw Function119cdf - dw Function119cec + dw BattleTowerRoomMenu_CallRoomMenu2 + dw BattleTowerRoomMenu_QuitMessage + dw BattleTowerRoomMenu_PlaceYesNoMenu + dw BattleTowerRoomMenu_UpdateYesNoMenu dw Function11914e dw Function118e76 ; 118624 @@ -782,9 +782,9 @@ Function118624: ; 118624 dw Function118e76 dw Function118e7e dw Function11878d - dw Function11805e + dw BattleTowerRoomMenu_DoNothing dw Function118e76 - dw Function118e87 + dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 ; 118671 @@ -814,9 +814,9 @@ Function118671: ; 118671 dw Function118e76 dw Function118e7e dw Function11878d - dw Function11805e + dw BattleTowerRoomMenu_DoNothing dw Function118e76 - dw Function118e87 + dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 ; 1186b2 @@ -847,9 +847,9 @@ Function1186b2: ; 1186b2 dw Function118e76 dw Function118e7e dw Function11878d - dw Function11805e + dw BattleTowerRoomMenu_DoNothing dw Function118e76 - dw Function118e87 + dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 ; 1186f5 @@ -883,13 +883,13 @@ Function1186f5: ; 1186f5 (46:46f5) dw Function118e76 dw Function118e7e dw Function11878d - dw Function11805e + dw BattleTowerRoomMenu_DoNothing dw Function11967d dw Function119685 dw Function119665 dw Function11966d dw Function118e76 - dw Function118e87 + dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 ; 118746 (46:4746) @@ -922,9 +922,9 @@ Function118746: ; 118746 dw Function118e76 dw Function118e7e dw Function11878d - dw Function11805e + dw BattleTowerRoomMenu_DoNothing dw Function118e76 - dw Function118e87 + dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 ; 11878d @@ -942,7 +942,7 @@ Function11878d: ; 11878d (46:478d) ld a, $3 ld [rSVBK], a .asm_1187a7 - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable .asm_1187aa call Function118821 ret c @@ -1065,12 +1065,12 @@ asm_11886f ld [BGMapPalBuffer], a ld a, $0 ld [wcd3c], a - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable ld a, [wcd33] ld [wMobileInactivityTimerSeconds], a Function118880: ; 118880 (46:4880) - call Function119ed8 + call BattleTowerRoomMenu2 ret c xor a ld [wcf64], a @@ -1095,8 +1095,8 @@ Function118896: ; 118896 jp Function119e2b .asm_1188aa - call Function119e2e - jp Function119e2e + call BattleTowerRoomMenu_IncrementJumptable + jp BattleTowerRoomMenu_IncrementJumptable ; 1188b0 Function1188b0: ; 1188b0 (46:48b0) @@ -1157,16 +1157,16 @@ Function118903: ; 118903 (46:4903) callba Function115e18 ld a, $8 ld [wcd3c], a - call Function119ed8 - jp Function119e2e + call BattleTowerRoomMenu2 + jp BattleTowerRoomMenu_IncrementJumptable Function11891c: ; 11891c call Function118b42 - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable -Function118922: ; 118922 +BattleTowerRoomMenu_PickLevelMessage: ; 118922 ld a, [wcd38] and a jr nz, .asm_11892d @@ -1177,10 +1177,10 @@ Function118922: ; 118922 ld hl, Text_CheckBattleRoomListByMaxLevel .asm_118930 - call Function11a9c0 - call Function119e2e + call BattleTowerRoomMenu_SetMessage + call BattleTowerRoomMenu_IncrementJumptable -Function118936: +BattleTowerRoomMenu_PlacePickLevelMenu: ld a, [$c31a] and a ret nz @@ -1217,9 +1217,9 @@ Function118936: ld [wcd4c], a ld a, $3 ld [rSVBK], a - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable -Function118982: +BattleTowerRoomMenu_UpdatePickLevelMenu: hlcoord 13, 8 ld de, String_119d07 call PlaceString @@ -1268,21 +1268,21 @@ Function118982: call PlaceString ld hl, hJoyPressed ld a, [hl] - and $2 - jr nz, .asm_118a39 + and B_BUTTON + jr nz, .b_button ld a, [hl] - and $1 - jr nz, .asm_118a01 + and A_BUTTON + jr nz, .a_button ld a, [hl] - and $80 - jr nz, .asm_1189e6 + and D_DOWN + jr nz, .d_down ld a, [hl] - and $40 - jr nz, .asm_1189f2 + and D_UP + jr nz, .d_up .asm_1189e5 ret -.asm_1189e6 +.d_down ld hl, wcd4f dec [hl] jr nz, .asm_1189e5 @@ -1290,7 +1290,7 @@ Function118982: ld [hl], a jr .asm_1189e5 -.asm_1189f2 +.d_up ld a, [wcd4a] ld hl, wcd4f inc [hl] @@ -1300,7 +1300,7 @@ Function118982: ld [hl], a jr .asm_1189e5 -.asm_118a01 +.a_button call PlayClickSFX ld a, [wcd4f] ld hl, wcd4a @@ -1328,9 +1328,9 @@ Function118982: .asm_118a30 ld a, [wcd4f] ld [w3_d800], a - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable -.asm_118a39 +.b_button call PlayClickSFX .asm_118a3c @@ -1426,7 +1426,7 @@ Function118ae4: push hl ld a, $8 ld [wcd3c], a - call Function119ed8 + call BattleTowerRoomMenu2 pop hl ld c, $0 ld de, wcc60 @@ -1456,7 +1456,7 @@ Function118b10: push bc ld a, $8 ld [wcd3c], a - call Function119ed8 + call BattleTowerRoomMenu2 call Function118b24 pop bc pop de @@ -1596,7 +1596,7 @@ Function118d35: ; 118d35 jr nz, .asm_118d7b .asm_118d78 - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable .asm_118d7b ld a, $d3 @@ -1608,7 +1608,7 @@ Function118d80: ; 118d80 ld a, [wcd38] and a jr z, .asm_118d8e - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable jr asm_118d9f .asm_118d8e @@ -1616,10 +1616,10 @@ Function118d80: ; 118d80 ld [wcd3c], a ld a, $12 ld [wMobileInactivityTimerSeconds], a - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable Function118d9b: - call Function119ed8 + call BattleTowerRoomMenu2 ret c asm_118d9f @@ -1678,7 +1678,7 @@ Function118ded: ; 118ded ld [rSVBK], a .asm_118e03 - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable ; 118e06 Function118e06: ; 118e06 @@ -1763,18 +1763,19 @@ Function118e6d: ; 118e6d (46:4e6d) jp Function119e2b Function118e76: ; 118e76 (46:4e76) + ; Call $c in BattleTowerRoomMenu2 ld a, $c ld [wcd3c], a - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable Function118e7e: ; 118e7e (46:4e7e) - call Function119ed8 + call BattleTowerRoomMenu2 ret c ld a, $36 jp Function119e2b -Function118e87: ; 118e87 (46:4e87) - call Function119ed8 +BattleTowerRoomMenu_CallRoomMenu2: ; 118e87 (46:4e87) + call BattleTowerRoomMenu2 ret c ld a, [wcd33] ld [wcf66], a @@ -1804,7 +1805,7 @@ Function118eb0: ; 118eb0 call CopyBytes call Function1192cc ret c - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable ; 118ec6 Function118ec6: ; 118ec6 @@ -1835,11 +1836,11 @@ Function118ec6: ; 118ec6 ld [wMobileInactivityTimerFrames], a ld a, $1c ld [wcd47], a - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable ; 118f0d Function118f0d: ; 118f0d - call Function119ed8 + call BattleTowerRoomMenu2 ret c call Function118440 @@ -1856,7 +1857,7 @@ Function118f14: and a jr z, .DontSendSaveFile ld hl, Text_SaveFileWillBeSent - call Function11a9c0 + call BattleTowerRoomMenu_SetMessage .DontSendSaveFile: ld a, [wcd57] @@ -1876,11 +1877,11 @@ Function118f14: ld [wMobileInactivityTimerFrames], a ld a, $1c ld [wcd47], a - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable ; 118f5e Function118f5e: ; 118f5e - call Function119ed8 + call BattleTowerRoomMenu2 ret c call Function118440 call DelayFrame @@ -1927,8 +1928,8 @@ Function118f68: jp Function119e2b .asm_118fba - call Function119e2e - jp Function119e2e + call BattleTowerRoomMenu_IncrementJumptable + jp BattleTowerRoomMenu_IncrementJumptable ; 118fc0 Function118fc0: ; 118fc0 @@ -1960,15 +1961,15 @@ Function118fc0: ; 118fc0 ld hl, Text_ReadingNews .asm_118ff5 - call Function11a9c0 + call BattleTowerRoomMenu_SetMessage jr Function119009 .asm_118ffa ld hl, Text_ReadingNews - call Function11a9c0 - call Function119e2e - call Function119e2e - jp Function119e2e + call BattleTowerRoomMenu_SetMessage + call BattleTowerRoomMenu_IncrementJumptable + call BattleTowerRoomMenu_IncrementJumptable + jp BattleTowerRoomMenu_IncrementJumptable Function119009: call Function118440 @@ -2062,7 +2063,7 @@ Function119054: ; 119054 pop af ld [rSVBK], a call CloseSRAM - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable ; 1190d0 Function1190d0: ; 1190d0 @@ -2121,12 +2122,12 @@ Function1190ec: ; 1190ec ld [rSVBK], a call CloseSRAM ld hl, Text_ReceivedNews - call Function11a9c0 - jp Function119e2e + call BattleTowerRoomMenu_SetMessage + jp BattleTowerRoomMenu_IncrementJumptable ; 11914e Function11914e: ; 11914e - call Function119ed8 + call BattleTowerRoomMenu2 ret c ld a, $1c ld [wcf66], a @@ -2153,7 +2154,7 @@ Function11915d: ; 11915d inc hl dec c jr nz, .asm_119176 - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable jr .asm_11918e .asm_119184 @@ -2506,7 +2507,7 @@ Function119300: ; 119300 Function119380: ; 119380 ld a, $80 ld [wcd49], a - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable ; 119388 Function119388: ; 119388 @@ -2519,15 +2520,15 @@ Function119388: ; 119388 ld [wcd3c], a ld a, $10 ld [wMobileInactivityTimerSeconds], a - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable Function1193a0: - call Function119ed8 + call BattleTowerRoomMenu2 ret c call DelayFrame ld a, $8 ld [wcd3c], a - call Function119ed8 + call BattleTowerRoomMenu2 ld hl, $c346 ld a, wd000 % $100 ld [hli], a @@ -2566,15 +2567,15 @@ Function1193e3: ; 1193e3 ld [wcd3c], a ld a, $11 ld [wMobileInactivityTimerSeconds], a - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable Function1193fb: - call Function119ed8 + call BattleTowerRoomMenu2 ret c call DelayFrame ld a, $8 ld [wcd3c], a - call Function119ed8 + call BattleTowerRoomMenu2 ld de, w3_d000 ld bc, $1000 jp Function118b10 @@ -2613,7 +2614,7 @@ Function119413: ; 119413 ld a, $3 ld [rSVBK], a call CloseSRAM - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable ; 119451 Function119451: ; 119451 (46:5451) @@ -2900,8 +2901,8 @@ Function1195f8: ; 1195f8 (46:55f8) ld [wMobileInactivityTimerFrames], a ld a, $14 ld [wcd47], a - call Function119e2e - jp Function119e2e + call BattleTowerRoomMenu_IncrementJumptable + jp BattleTowerRoomMenu_IncrementJumptable Function119612: ; 119612 (46:5612) ld a, $14 @@ -2912,10 +2913,10 @@ Function119612: ; 119612 (46:5612) ld [wMobileInactivityTimerFrames], a ld a, $14 ld [wcd47], a - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable Function119629: ; 119629 (46:5629) - call Function119ed8 + call BattleTowerRoomMenu2 ret c ld a, $60 ld l, a @@ -2928,15 +2929,15 @@ Function119629: ; 119629 (46:5629) ld [wMobileInactivityTimerSeconds], a ld a, $14 ld [wcd47], a - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable Function119648: ; 119648 (46:5648) - call Function119ed8 + call BattleTowerRoomMenu2 ret c call DelayFrame ld a, $8 ld [wcd3c], a - call Function119ed8 + call BattleTowerRoomMenu2 call Function118b24 ld de, w3_d000 ld bc, $1000 @@ -2946,10 +2947,10 @@ Function119648: ; 119648 (46:5648) Function119665: ; 119665 (46:5665) ld a, $1a ld [wcd3c], a - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable Function11966d: ; 11966d (46:566d) - call Function119ed8 + call BattleTowerRoomMenu2 ret c ld a, [wcd47] ld [wcf66], a @@ -2960,10 +2961,10 @@ Function11966d: ; 11966d (46:566d) Function11967d: ; 11967d (46:567d) ld a, $18 ld [wcd3c], a - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable Function119685: ; 119685 (46:5685) - call Function119ed8 + call BattleTowerRoomMenu2 ret c ld a, $14 ld [wcf66], a @@ -3167,7 +3168,7 @@ Function1196f2: ; 1196f2 and $f call Function1197bf ld [hli], a - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable ; 119798 Function119798: ; 119798 @@ -3220,10 +3221,10 @@ Function1197c9: ; 1197c9 ld [wcd3c], a ld a, $12 ld [wMobileInactivityTimerSeconds], a - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable Function1197dc: - call Function119ed8 + call BattleTowerRoomMenu2 ret c call DelayFrame ld hl, wd002 @@ -3271,7 +3272,7 @@ Function119800: ; 119800 pop af ld [wJumptableIndex], a callba Function115dc3 - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable ; 11984e Function11984e: ; 11984e @@ -3307,12 +3308,12 @@ Function11984e: ; 11984e pop af ld [wJumptableIndex], a callba Function115dc3 - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable .asm_1198a0 ld a, $a ld [wc300], a - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable .asm_1198a8 callba Function17005a @@ -3341,13 +3342,13 @@ Function11984e: ; 11984e pop af ld [wJumptableIndex], a callba Function115dc3 - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable ; 1198ee Function1198ee: ; 1198ee ld hl, Text_RegisteringRecord - call Function11a9c0 - call Function119e2e + call BattleTowerRoomMenu_SetMessage + call BattleTowerRoomMenu_IncrementJumptable Function1198f7: ld a, [$c31a] @@ -3385,7 +3386,7 @@ Function1198f7: Function119937: ; 119937 callba Function1707f4 - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable ; 119940 Function119940: ; 119940 @@ -3412,7 +3413,7 @@ Function119940: ; 119940 Function119954: ; 119954 ld a, $1c ld [wcd3c], a - call Function119ed8 + call BattleTowerRoomMenu2 ld hl, $c608 ld de, wc3cd .asm_119962 @@ -3472,7 +3473,7 @@ Function1199b4: ; 1199b4 ld a, [wd000 + 129] cp $7 jr nc, .asm_1199c7 - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable jp Function1199ca .asm_1199c7 @@ -3634,7 +3635,7 @@ INCBIN "data/mobile/x-game-result.txt" Function119b0d: ; 119b0d ld a, $8 ld [wcd3c], a - call Function119ed8 + call BattleTowerRoomMenu2 ld a, [w3_d090] cp $1 jr z, .asm_119b23 @@ -3691,7 +3692,7 @@ Function119b6b: ; 119b6b ld a, [w3_d090] cp $1 jr z, .asm_119b75 - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable .asm_119b75 ld a, [w3_d100] @@ -3814,7 +3815,7 @@ Function119b6b: ; 119b6b ld de, $c608 ld bc, $0069 call CopyBytes - jp Function119e2e + jp BattleTowerRoomMenu_IncrementJumptable ; 119c3e Function119c3e: ; 119c3e @@ -3884,26 +3885,29 @@ Function119c3e: ; 119c3e ret ; 119c97 -Function119c97: ; 119c97 +BattleTowerRoomMenu_UberRestrictionMessage: ; 119c97 ld hl, Text_UberRestriction - call Function11a9c0 - call Function119e2e - jr Function119cab + call BattleTowerRoomMenu_SetMessage + call BattleTowerRoomMenu_IncrementJumptable + jr BattleTowerRoomMenu_WaitForMessage -Function119ca2: +BattleTowerRoomMenu_PartyMonTopsThisLevelMessage: ld hl, Text_PartyMonTopsThisLevel - call Function11a9c0 - call Function119e2e + call BattleTowerRoomMenu_SetMessage + call BattleTowerRoomMenu_IncrementJumptable -Function119cab: +BattleTowerRoomMenu_WaitForMessage: ld a, [$c31a] and a ret nz ld a, $80 ld [wcd50], a - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable -Function119cb8: +BattleTowerRoomMenu_DelayRestartMenu: + ; Loops while (--[wcd50] != 0), + ; to create some sort of "delay" after the message is written on the screen, + ; before starting the menu again. ld hl, wcd50 dec [hl] ret nz @@ -3912,7 +3916,7 @@ Function119cb8: ret ; 119cc3 -Function119cc3: ; 119cc3 +BattleTowerRoomMenu_QuitMessage: ; 119cc3 ld a, [wcd38] and a jr z, .asm_119cd1 @@ -3929,19 +3933,20 @@ Function119cc3: ; 119cc3 ld hl, Text_ExitGymLeaderHonorRoll .asm_119cd9 - call Function11a9c0 - call Function119e2e + call BattleTowerRoomMenu_SetMessage + call BattleTowerRoomMenu_IncrementJumptable -Function119cdf: +BattleTowerRoomMenu_PlaceYesNoMenu: ld a, [$c31a] and a ret nz ld a, $f ld [wcd3c], a - call Function119e2e + call BattleTowerRoomMenu_IncrementJumptable -Function119cec: - call Function119ed8 +BattleTowerRoomMenu_UpdateYesNoMenu: + ; Only ever called when [wcd3c] is $10 + call BattleTowerRoomMenu2 ret c ld a, [wMobileInactivityTimerFrames] ld [wcf66], a @@ -4094,7 +4099,7 @@ BattleTower_UbersCheck: ; 119dd1 (46:5dd1) Function119e2b: ; 119e2b (46:5e2b) call Function3e32 -Function119e2e: ; 119e2e (46:5e2e) +BattleTowerRoomMenu_IncrementJumptable: ; 119e2e (46:5e2e) ld hl, wcf66 inc [hl] ret @@ -4238,7 +4243,7 @@ Function119ec2: ; 119ec2 (46:5ec2) call CloseSRAM ret -Function119ed8: ; 119ed8 (46:5ed8) +BattleTowerRoomMenu2: ; 119ed8 (46:5ed8) ld a, [rSVBK] ld [wcd8c], a ld a, $1 @@ -4271,8 +4276,8 @@ Function119ed8: ; 119ed8 (46:5ed8) dw Function11a2e6 dw Function11a302 dw Function11a33a - dw Function11a207 - dw Function11a235 + dw BattleTowerRoomMenu2_PlaceYesNoMenu + dw BattleTowerRoomMenu2_UpdateYesNoMenu dw Function11a357 dw Function11a36b dw Function11a38d @@ -4293,7 +4298,7 @@ Function119ed8: ; 119ed8 (46:5ed8) Function119f3f: ; 119f3f call Function11a5b9 - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 119f45 Function119f45: ; 119f45 @@ -4302,7 +4307,7 @@ Function119f45: ; 119f45 call PlaceString ld a, $80 ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 119f56 Function119f56: ; 119f56 @@ -4321,7 +4326,7 @@ Function119f56: ; 119f56 call PlaceString ld a, $80 ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 119f76 Function119f76: ; 119f76 @@ -4341,7 +4346,7 @@ Function119f76: ; 119f76 call Function11a5f5 xor a ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 119f98 Function119f98: ; 119f98 @@ -4505,7 +4510,7 @@ Function11a113: ; 11a113 Function11a129: ; 11a129 ld a, $80 ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a131 Function11a131: ; 11a131 @@ -4542,7 +4547,7 @@ Function11a14b: ; 11a14b call PlaceString ld a, $80 ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a16d Function11a16d: ; 11a16d @@ -4563,7 +4568,7 @@ Function11a16d: ; 11a16d call Function11a5f5 xor a ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a192 Function11a192: ; 11a192 @@ -4633,7 +4638,7 @@ Function11a1ff: ; 11a1ff jr .asm_11a1ff ; 11a207 -Function11a207: ; 11a207 +BattleTowerRoomMenu2_PlaceYesNoMenu: ; 11a207 ld hl, MenuDataHeader_11a2de call LoadMenuDataHeader call MenuBox @@ -4650,29 +4655,29 @@ Function11a207: ; 11a207 ld [hl], a xor a ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a235 -Function11a235: ; 11a235 +BattleTowerRoomMenu2_UpdateYesNoMenu: ; 11a235 ld hl, hJoyPressed ld a, [hl] and A_BUTTON - jr nz, .asm_11a28f + jr nz, .a_button ld a, [hl] and B_BUTTON - jr nz, .asm_11a2c1 + jr nz, .b_button ld a, [hl] and D_UP - jr nz, .asm_11a251 + jr nz, .d_up ld a, [hl] and D_DOWN - jr nz, .asm_11a270 + jr nz, .d_down .asm_11a24c call Function11a9f0 scf ret -.asm_11a251 +.d_up xor a ld [wcd8a], a ld [wcd8b], a @@ -4689,7 +4694,7 @@ Function11a235: ; 11a235 ld [hl], a jr .asm_11a24c -.asm_11a270 +.d_down xor a ld [wcd8a], a ld [wcd8b], a @@ -4706,36 +4711,36 @@ Function11a235: ; 11a235 ld [hl], a jr .asm_11a24c -.asm_11a28f +.a_button xor a ld [wcd8a], a ld [wcd8b], a call PlayClickSFX ld a, [wMobileInactivityTimerMinutes] and a - jr nz, .asm_11a2c4 + jr nz, .exit_no_carry call ExitMenu callba ReloadMapPart ld a, [wMobileInactivityTimerFrames] cp $0 jr z, .asm_11a2b4 ld a, [wcd47] - jr .asm_11a2b7 + jr .exit_carry .asm_11a2b4 ld a, [wcd33] -.asm_11a2b7 +.exit_carry ld [wcf66], a ld a, $a ld [wc300], a scf ret -.asm_11a2c1 +.b_button call PlayClickSFX -.asm_11a2c4 +.exit_no_carry call ExitMenu callba ReloadMapPart and a @@ -4775,7 +4780,7 @@ Function11a2e6: ; 11a2e6 call PlaceString ld a, $80 ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a302 Function11a302: ; 11a302 @@ -4802,7 +4807,7 @@ Function11a302: ; 11a302 call PrintNum ld a, $80 ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a33a Function11a33a: ; 11a33a @@ -4829,7 +4834,7 @@ Function11a357: ; 11a357 call PlaceString ld a, $80 ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a36b Function11a36b: ; 11a36b @@ -4849,7 +4854,7 @@ Function11a36b: ; 11a36b call Function11a5f5 xor a ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a38d Function11a38d: ; 11a38d @@ -4885,7 +4890,7 @@ Function11a3c5: ; 11a3c5 call PlaceString ld a, $80 ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a3d9 Function11a3d9: ; 11a3d9 @@ -4904,7 +4909,7 @@ Function11a3d9: ; 11a3d9 call PlaceString ld a, $80 ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a3f9 Function11a3f9: ; 11a3f9 @@ -4924,7 +4929,7 @@ Function11a3f9: ; 11a3f9 call Function11a5f5 xor a ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a41b Function11a41b: ; 11a41b @@ -4960,7 +4965,7 @@ Function11a452: ; 11a452 call PlaceString ld a, $80 ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a466 Function11a466: ; 11a466 @@ -4970,7 +4975,7 @@ Function11a466: ; 11a466 call PlaceString ld a, $80 ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a47a Function11a47a: ; 11a47a @@ -4995,7 +5000,7 @@ Function11a488: ; 11a488 call Function11a5f5 xor a ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a49e Function11a49e: ; 11a49e @@ -5042,7 +5047,7 @@ Function11a4e8: ; 11a4e8 call Function11a5f5 xor a ld [wMobileInactivityTimerMinutes], a - jp Function11a5b0 + jp BattleTowerRoomMenu2_IncrementJumptable ; 11a4fe Function11a4fe: ; 11a4fe @@ -5144,7 +5149,7 @@ Function11a536: ; 11a536 ret ; 11a5b0 -Function11a5b0: ; 11a5b0 +BattleTowerRoomMenu2_IncrementJumptable: ; 11a5b0 ld a, [wcd3c] inc a ld [wcd3c], a @@ -5437,12 +5442,12 @@ x = x + 256 endr ; 11a8fa -Function11a8fa: ; 11a8fa +BattleTowerRoomMenu_WriteMessage: ; 11a8fa jumptable .Jumptable, $c31a ; 11a909 .Jumptable: ; 11a909 - dw Function11a970 + dw BattleTowerRoomMenu_WriteMessage_DoNothing dw Function11a90f dw Function11a971 ; 11a90f @@ -5505,7 +5510,7 @@ Function11a90f: ; 11a90f ld a, $3 ld [rSVBK], a -Function11a970: +BattleTowerRoomMenu_WriteMessage_DoNothing: ret ; 11a971 @@ -5558,7 +5563,7 @@ Function11a971: ; 11a971 ret ; 11a9c0 -Function11a9c0: ; 11a9c0 +BattleTowerRoomMenu_SetMessage: ; 11a9c0 ld a, l ld [$c31b], a ld a, h diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index d181de745..2f1f1555c 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -324,7 +324,7 @@ Function1719c8: ; 1719c8 (5c:59c8) ret Function1719d6: ; 1719d6 (5c:59d6) - callba Function1183cb + callba BattleTowerRoomMenu_InitRAM call Function1719ed ld a, [rSVBK] push af @@ -412,7 +412,7 @@ Function171a5d: ; 171a5d (5c:5a5d) push af ld a, $1 ld [rSVBK], a - callba Function118452 + callba BattleTowerRoomMenu_Cleanup pop af ld [rSVBK], a ld a, $a @@ -457,7 +457,7 @@ Function171aec: ; 171aec (5c:5aec) push af ld a, $1 ld [rSVBK], a - callba Function118452 + callba BattleTowerRoomMenu_Cleanup pop af ld [rSVBK], a hlcoord 2, 6 @@ -658,7 +658,7 @@ Function171c41: ; 171c41 (5c:5c41) callba Function106464 ld a, $2 ld [wc303], a - callba Function17f555 + callba DisplayMobileError asm_171c60: ; 171c60 (5c:5c60) ld a, $80 ld [wcd49], a diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index e94a51ad8..061b1357f 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -3003,7 +3003,7 @@ Function17e309: ; 17e309 call ClearScreen call Function17e349 call Function17d5f6 - callba Function17f555 + callba DisplayMobileError call Function17e349 call Function17dcaf xor a @@ -4623,7 +4623,7 @@ Function17f524: ; 17f524 jr .asm_17f536 ; 17f53d -Function17f53d: ; 17f53d +BattleTowerMobileError: ; 17f53d call FadeToMenu xor a ld [wc303], a @@ -4632,7 +4632,7 @@ Function17f53d: ; 17f53d ld a, $1 ld [rSVBK], a - call Function17f555 + call DisplayMobileError pop af ld [rSVBK], a @@ -4640,7 +4640,7 @@ Function17f53d: ; 17f53d ret ; 17f555 -Function17f555: ; 17f555 +DisplayMobileError: ; 17f555 .loop call JoyTextDelay call .RunJumptable