diff --git a/FAQ.md b/FAQ.md index a02f22629..1cf0ea139 100644 --- a/FAQ.md +++ b/FAQ.md @@ -1,27 +1,43 @@ # FAQ + +## Questions + +- [What is pokecrystal11.gbc?](#what-is-pokecrystal11gbc) +- [Can't build ROM; "ERROR: `UNION` already defined"](#cant-build-rom-error-union-already-defined) +- [Can't build ROM; "Segmentation fault" from `rgbgfx`](#cant-build-rom-segmentation-fault-from-rgbgfx) +- [Can't build ROM; "Section is too big" or "Unable to place section in bank"](#cant-build-rom-section-is-too-big-or-unable-to-place-section-in-bank) +- [How do I edit maps?](#how-do-i-edit-maps) +- [I need more help!](#i-need-more-help) + + ## What is pokecrystal11.gbc? Version 1.1 of Pokémon Crystal, which fixed some issues with the initial international release. `make crystal11` defines `CRYSTAL11` so the assembly builds the changed version. + ## Can't build ROM; "ERROR: `UNION` already defined" Download [**rgbds 0.3.3**](rgbds). Earlier versions will not work. + ## Can't build ROM; "Segmentation fault" from `rgbgfx` If you are using 64-bit Windows, download [**64-bit Cygwin**](cygwin) and [**64-bit rgbds**](rgbds). + ## Can't build ROM; "Section is too big" or "Unable to place section in bank" If you have not changed any of the asm, make sure you have the latest version of pokecrystal and the correct version of rgbds (see [INSTALL.md](INSTALL.md)). If you added or changed any code, it has to fit in the **memory banks**. The 2MB ROM is divided into 128 banks of 4KB each, numbered $00 to $7F. The linkerscript **pokecrystal.link** lists which **`SECTION`**s go in which banks. Try moving some code into a new section. + ## How do I edit maps? For `asm` scripts, read [docs/map_scripts.md](docs/map_scripts.md). For `blk` layouts, try [crowdmap](crowdmap) or [Polished Map](polished-map). + ## I need more help! Try asking on IRC or Discord (see [README.md](README.md)). diff --git a/Makefile b/Makefile index d3158c341..8d4aa7900 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,9 @@ audio.o \ maps.o \ engine/events.o \ engine/credits.o \ -data/egg_moves.o \ -data/evos_attacks.o \ -data/pokedex/entries.o \ +data/pokemon/egg_moves.o \ +data/pokemon/evos_attacks.o \ +data/pokemon/dex_entries.o \ misc/crystal_misc.o \ text/common_text.o \ gfx/pics.o diff --git a/audio.asm b/audio.asm index 452fed76d..c358e4d9b 100644 --- a/audio.asm +++ b/audio.asm @@ -4,7 +4,7 @@ INCLUDE "includes.asm" SECTION "Audio", ROMX INCLUDE "audio/engine.asm" -INCLUDE "trainers/encounter_music.asm" +INCLUDE "data/trainers/encounter_music.asm" INCLUDE "audio/music_pointers.asm" INCLUDE "audio/music/nothing.asm" INCLUDE "audio/cry_pointers.asm" @@ -157,6 +157,6 @@ INCLUDE "audio/sfx_crystal.asm" SECTION "Cries", ROMX -CryHeaders:: INCLUDE "audio/cry_headers.asm" +INCLUDE "data/pokemon/cry_headers.asm" INCLUDE "audio/cries.asm" diff --git a/constants/item_constants.asm b/constants/item_constants.asm index d9cd99a34..f03cf2735 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -1,9 +1,9 @@ ; item ids ; indexes for: -; - ItemAttributes (see items/item_attributes.asm) -; - ItemDescriptions (see items/item_descriptions.asm) -; - ItemEffects (see items/item_effects.asm) -; - ItemNames (see items/item_names.asm) +; - ItemAttributes (see data/items/item_attributes.asm) +; - ItemDescriptions (see data/items/item_descriptions.asm) +; - ItemEffects (see engine/item_effects.asm) +; - ItemNames (see data/items/item_names.asm) const_def const NO_ITEM ; $00 const MASTER_BALL ; $01 @@ -372,7 +372,7 @@ const_value SET 70 const HELD_78 const HELD_FOCUS_BAND -; item_attribute struct members (see items/item_attributes.asm) +; item_attribute struct members (see data/items/item_attributes.asm) const_def const ITEMATTR_PRICE const ITEMATTR_PRICE_HI @@ -397,7 +397,7 @@ ITEMMENU_CLOSE EQU 6 const MARTTYPE_PHARMACY const MARTTYPE_ROOFTOP -; Marts indexes (see items/marts.asm) +; Marts indexes (see data/items/marts.asm) const_def const MART_CHERRYGROVE const MART_CHERRYGROVE_DEX diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index e53d44d04..0b29b8e03 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -1,4 +1,4 @@ -; Landmarks indexes (see data/landmarks.asm) +; Landmarks indexes (see data/maps/landmarks.asm) const_def ; Johto landmarks diff --git a/constants/map_constants.asm b/constants/map_constants.asm index be73faf9e..7d1a00677 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -127,7 +127,7 @@ SLIDING EQU 3 EMOTE_OBJECT EQU 7 -; SpawnPoints indexes (see data/spawn_points.asm) +; SpawnPoints indexes (see data/maps/spawn_points.asm) const_value = -1 const SPAWN_N_A const SPAWN_HOME diff --git a/constants/map_dimension_constants.asm b/constants/map_dimension_constants.asm index 7f668ba1c..714bbe02b 100644 --- a/constants/map_dimension_constants.asm +++ b/constants/map_dimension_constants.asm @@ -16,8 +16,8 @@ endm ; map group ids ; `newgroup` indexes are for: ; - MapGroupPointers (see maps/map_headers.asm) -; - OutdoorSprites (see data/outdoor_sprites.asm) -; - MapGroupRoofs (see data/mapgroup_roofs.asm) +; - OutdoorSprites (see data/maps/outdoor_sprites.asm) +; - MapGroupRoofs (see data/maps/mapgroup_roofs.asm) ; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see maps/map_headers.asm) const_def diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 14635d729..7af42d3d6 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -1,21 +1,21 @@ ; pokemon ids ; indexes for: -; - CryHeaders (see audio/cry_headers.asm) -; - BaseData (see data/base_stats.asm) -; - EggMovePointers (see data/egg_move_pointers.asm) -; - EvosAttacksPointers (see data/evos_attacks_pointers.asm) -; - PokemonNames (see data/pokemon_names.asm) -; - PokedexDataPointerTable (see data/pokedex/entry_pointers.asm) +; - CryHeaders (see data/pokemon/cry_headers.asm) +; - BaseData (see data/pokemon/base_stats.asm) +; - EggMovePointers (see data/pokemon/egg_move_pointers.asm) +; - EvosAttacksPointers (see data/pokemon/evos_attacks_pointers.asm) +; - PokemonNames (see data/pokemon/pokemon_names.asm) +; - PokedexDataPointerTable (see data/pokemon/dex_entry_pointers.asm) ; - AnimationPointers (see gfx/pics/anim_pointers.asm) ; - BitmasksPointers (see gfx/pics/bitmask_pointers.asm) ; - AnimationExtraPointers (see gfx/pics/extra_pointers.asm) ; - FramesPointers (see gfx/pics/frame_pointers.asm) ; - PokemonPalettes (see gfx/pics/palette_pointers.asm) ; - PicPointers (see gfx/pics/pic_pointers.asm) -; - AlphabeticalPokedexOrder (see data/pokedex/order_alpha.asm) -; - NewPokedexOrder (see data/pokedex/order_new.asm) -; - MonMenuIcons (see data/mon_menu_icons.asm) -; - Pokered_MonIndices (see engine/time_capsule/conversion.asm) +; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm) +; - NewPokedexOrder (see data/pokemon/dex_order_new.asm) +; - MonMenuIcons (see data/pokemon/menu_icons.asm) +; - Pokered_MonIndices (see data/time_capsule/mon_order.asm) ; - SortedPokemon (see misc/fixed_words.asm) const_value set 1 const BULBASAUR ; 01 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 13387fb21..e3af35bbe 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -1,4 +1,4 @@ -; base data struct members (see data/base_stats/*.asm) +; base data struct members (see data/pokemon/base_stats/*.asm) BASE_DEX_NO EQUS "(BaseDexNo - CurBaseData)" BASE_STATS EQUS "(BaseStats - CurBaseData)" BASE_HP EQUS "(BaseHP - CurBaseData)" @@ -145,7 +145,7 @@ PARTY_LENGTH EQU 6 const ICON_BIGMON -; evolution types (used in data/evos_attacks.asm) +; evolution types (used in data/pokemon/evos_attacks.asm) const_value SET 1 const EVOLVE_LEVEL const EVOLVE_ITEM diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index f2b6a3ec8..d6e543611 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -5,12 +5,12 @@ ENDM ; trainer class ids ; `trainerclass` indexes are for: -; - TrainerClassAttributes (see trainers/attributes.asm) -; - TrainerClassDVs (see trainers/dvs.asm) -; - TrainerEncounterMusic (see trainers/encounter_music.asm) -; - TrainerGroups (see trainers/trainer_pointers.asm) -; - BTTrainerClassGenders (see misc/battle_tower_47.asm) -; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see trainers/trainers.asm) +; - TrainerClassAttributes (see data/trainers/trainer_attributes.asm) +; - TrainerClassDVs (see data/trainers/trainer_dvs.asm) +; - TrainerEncounterMusic (see data/trainers/encounter_music.asm) +; - TrainerGroups (see data/trainers/party_pointers.asm) +; - BTTrainerClassGenders (see data/trainers/gendered_trainers.asm) +; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see data/trainers/parties.asm) enum_start CHRIS EQU __enum__ trainerclass TRAINER_NONE ; 0 @@ -677,7 +677,7 @@ KRIS EQU __enum__ NUM_TRAINER_CLASSES EQU __enum__ -; TrainerClassAttributes fields (see trainers/attributes.asm) +; TrainerClassAttributes fields (see data/trainers/trainer_attributes.asm) const_def const TRNATTR_ITEM1 const TRNATTR_ITEM2 diff --git a/data/base_stats.asm b/data/base_stats.asm deleted file mode 100644 index 808a996a6..000000000 --- a/data/base_stats.asm +++ /dev/null @@ -1,252 +0,0 @@ -BaseData:: -INCLUDE "data/base_stats/bulbasaur.asm" -INCLUDE "data/base_stats/ivysaur.asm" -INCLUDE "data/base_stats/venusaur.asm" -INCLUDE "data/base_stats/charmander.asm" -INCLUDE "data/base_stats/charmeleon.asm" -INCLUDE "data/base_stats/charizard.asm" -INCLUDE "data/base_stats/squirtle.asm" -INCLUDE "data/base_stats/wartortle.asm" -INCLUDE "data/base_stats/blastoise.asm" -INCLUDE "data/base_stats/caterpie.asm" -INCLUDE "data/base_stats/metapod.asm" -INCLUDE "data/base_stats/butterfree.asm" -INCLUDE "data/base_stats/weedle.asm" -INCLUDE "data/base_stats/kakuna.asm" -INCLUDE "data/base_stats/beedrill.asm" -INCLUDE "data/base_stats/pidgey.asm" -INCLUDE "data/base_stats/pidgeotto.asm" -INCLUDE "data/base_stats/pidgeot.asm" -INCLUDE "data/base_stats/rattata.asm" -INCLUDE "data/base_stats/raticate.asm" -INCLUDE "data/base_stats/spearow.asm" -INCLUDE "data/base_stats/fearow.asm" -INCLUDE "data/base_stats/ekans.asm" -INCLUDE "data/base_stats/arbok.asm" -INCLUDE "data/base_stats/pikachu.asm" -INCLUDE "data/base_stats/raichu.asm" -INCLUDE "data/base_stats/sandshrew.asm" -INCLUDE "data/base_stats/sandslash.asm" -INCLUDE "data/base_stats/nidoran_f.asm" -INCLUDE "data/base_stats/nidorina.asm" -INCLUDE "data/base_stats/nidoqueen.asm" -INCLUDE "data/base_stats/nidoran_m.asm" -INCLUDE "data/base_stats/nidorino.asm" -INCLUDE "data/base_stats/nidoking.asm" -INCLUDE "data/base_stats/clefairy.asm" -INCLUDE "data/base_stats/clefable.asm" -INCLUDE "data/base_stats/vulpix.asm" -INCLUDE "data/base_stats/ninetales.asm" -INCLUDE "data/base_stats/jigglypuff.asm" -INCLUDE "data/base_stats/wigglytuff.asm" -INCLUDE "data/base_stats/zubat.asm" -INCLUDE "data/base_stats/golbat.asm" -INCLUDE "data/base_stats/oddish.asm" -INCLUDE "data/base_stats/gloom.asm" -INCLUDE "data/base_stats/vileplume.asm" -INCLUDE "data/base_stats/paras.asm" -INCLUDE "data/base_stats/parasect.asm" -INCLUDE "data/base_stats/venonat.asm" -INCLUDE "data/base_stats/venomoth.asm" -INCLUDE "data/base_stats/diglett.asm" -INCLUDE "data/base_stats/dugtrio.asm" -INCLUDE "data/base_stats/meowth.asm" -INCLUDE "data/base_stats/persian.asm" -INCLUDE "data/base_stats/psyduck.asm" -INCLUDE "data/base_stats/golduck.asm" -INCLUDE "data/base_stats/mankey.asm" -INCLUDE "data/base_stats/primeape.asm" -INCLUDE "data/base_stats/growlithe.asm" -INCLUDE "data/base_stats/arcanine.asm" -INCLUDE "data/base_stats/poliwag.asm" -INCLUDE "data/base_stats/poliwhirl.asm" -INCLUDE "data/base_stats/poliwrath.asm" -INCLUDE "data/base_stats/abra.asm" -INCLUDE "data/base_stats/kadabra.asm" -INCLUDE "data/base_stats/alakazam.asm" -INCLUDE "data/base_stats/machop.asm" -INCLUDE "data/base_stats/machoke.asm" -INCLUDE "data/base_stats/machamp.asm" -INCLUDE "data/base_stats/bellsprout.asm" -INCLUDE "data/base_stats/weepinbell.asm" -INCLUDE "data/base_stats/victreebel.asm" -INCLUDE "data/base_stats/tentacool.asm" -INCLUDE "data/base_stats/tentacruel.asm" -INCLUDE "data/base_stats/geodude.asm" -INCLUDE "data/base_stats/graveler.asm" -INCLUDE "data/base_stats/golem.asm" -INCLUDE "data/base_stats/ponyta.asm" -INCLUDE "data/base_stats/rapidash.asm" -INCLUDE "data/base_stats/slowpoke.asm" -INCLUDE "data/base_stats/slowbro.asm" -INCLUDE "data/base_stats/magnemite.asm" -INCLUDE "data/base_stats/magneton.asm" -INCLUDE "data/base_stats/farfetch_d.asm" -INCLUDE "data/base_stats/doduo.asm" -INCLUDE "data/base_stats/dodrio.asm" -INCLUDE "data/base_stats/seel.asm" -INCLUDE "data/base_stats/dewgong.asm" -INCLUDE "data/base_stats/grimer.asm" -INCLUDE "data/base_stats/muk.asm" -INCLUDE "data/base_stats/shellder.asm" -INCLUDE "data/base_stats/cloyster.asm" -INCLUDE "data/base_stats/gastly.asm" -INCLUDE "data/base_stats/haunter.asm" -INCLUDE "data/base_stats/gengar.asm" -INCLUDE "data/base_stats/onix.asm" -INCLUDE "data/base_stats/drowzee.asm" -INCLUDE "data/base_stats/hypno.asm" -INCLUDE "data/base_stats/krabby.asm" -INCLUDE "data/base_stats/kingler.asm" -INCLUDE "data/base_stats/voltorb.asm" -INCLUDE "data/base_stats/electrode.asm" -INCLUDE "data/base_stats/exeggcute.asm" -INCLUDE "data/base_stats/exeggutor.asm" -INCLUDE "data/base_stats/cubone.asm" -INCLUDE "data/base_stats/marowak.asm" -INCLUDE "data/base_stats/hitmonlee.asm" -INCLUDE "data/base_stats/hitmonchan.asm" -INCLUDE "data/base_stats/lickitung.asm" -INCLUDE "data/base_stats/koffing.asm" -INCLUDE "data/base_stats/weezing.asm" -INCLUDE "data/base_stats/rhyhorn.asm" -INCLUDE "data/base_stats/rhydon.asm" -INCLUDE "data/base_stats/chansey.asm" -INCLUDE "data/base_stats/tangela.asm" -INCLUDE "data/base_stats/kangaskhan.asm" -INCLUDE "data/base_stats/horsea.asm" -INCLUDE "data/base_stats/seadra.asm" -INCLUDE "data/base_stats/goldeen.asm" -INCLUDE "data/base_stats/seaking.asm" -INCLUDE "data/base_stats/staryu.asm" -INCLUDE "data/base_stats/starmie.asm" -INCLUDE "data/base_stats/mr__mime.asm" -INCLUDE "data/base_stats/scyther.asm" -INCLUDE "data/base_stats/jynx.asm" -INCLUDE "data/base_stats/electabuzz.asm" -INCLUDE "data/base_stats/magmar.asm" -INCLUDE "data/base_stats/pinsir.asm" -INCLUDE "data/base_stats/tauros.asm" -INCLUDE "data/base_stats/magikarp.asm" -INCLUDE "data/base_stats/gyarados.asm" -INCLUDE "data/base_stats/lapras.asm" -INCLUDE "data/base_stats/ditto.asm" -INCLUDE "data/base_stats/eevee.asm" -INCLUDE "data/base_stats/vaporeon.asm" -INCLUDE "data/base_stats/jolteon.asm" -INCLUDE "data/base_stats/flareon.asm" -INCLUDE "data/base_stats/porygon.asm" -INCLUDE "data/base_stats/omanyte.asm" -INCLUDE "data/base_stats/omastar.asm" -INCLUDE "data/base_stats/kabuto.asm" -INCLUDE "data/base_stats/kabutops.asm" -INCLUDE "data/base_stats/aerodactyl.asm" -INCLUDE "data/base_stats/snorlax.asm" -INCLUDE "data/base_stats/articuno.asm" -INCLUDE "data/base_stats/zapdos.asm" -INCLUDE "data/base_stats/moltres.asm" -INCLUDE "data/base_stats/dratini.asm" -INCLUDE "data/base_stats/dragonair.asm" -INCLUDE "data/base_stats/dragonite.asm" -INCLUDE "data/base_stats/mewtwo.asm" -INCLUDE "data/base_stats/mew.asm" -INCLUDE "data/base_stats/chikorita.asm" -INCLUDE "data/base_stats/bayleef.asm" -INCLUDE "data/base_stats/meganium.asm" -INCLUDE "data/base_stats/cyndaquil.asm" -INCLUDE "data/base_stats/quilava.asm" -INCLUDE "data/base_stats/typhlosion.asm" -INCLUDE "data/base_stats/totodile.asm" -INCLUDE "data/base_stats/croconaw.asm" -INCLUDE "data/base_stats/feraligatr.asm" -INCLUDE "data/base_stats/sentret.asm" -INCLUDE "data/base_stats/furret.asm" -INCLUDE "data/base_stats/hoothoot.asm" -INCLUDE "data/base_stats/noctowl.asm" -INCLUDE "data/base_stats/ledyba.asm" -INCLUDE "data/base_stats/ledian.asm" -INCLUDE "data/base_stats/spinarak.asm" -INCLUDE "data/base_stats/ariados.asm" -INCLUDE "data/base_stats/crobat.asm" -INCLUDE "data/base_stats/chinchou.asm" -INCLUDE "data/base_stats/lanturn.asm" -INCLUDE "data/base_stats/pichu.asm" -INCLUDE "data/base_stats/cleffa.asm" -INCLUDE "data/base_stats/igglybuff.asm" -INCLUDE "data/base_stats/togepi.asm" -INCLUDE "data/base_stats/togetic.asm" -INCLUDE "data/base_stats/natu.asm" -INCLUDE "data/base_stats/xatu.asm" -INCLUDE "data/base_stats/mareep.asm" -INCLUDE "data/base_stats/flaaffy.asm" -INCLUDE "data/base_stats/ampharos.asm" -INCLUDE "data/base_stats/bellossom.asm" -INCLUDE "data/base_stats/marill.asm" -INCLUDE "data/base_stats/azumarill.asm" -INCLUDE "data/base_stats/sudowoodo.asm" -INCLUDE "data/base_stats/politoed.asm" -INCLUDE "data/base_stats/hoppip.asm" -INCLUDE "data/base_stats/skiploom.asm" -INCLUDE "data/base_stats/jumpluff.asm" -INCLUDE "data/base_stats/aipom.asm" -INCLUDE "data/base_stats/sunkern.asm" -INCLUDE "data/base_stats/sunflora.asm" -INCLUDE "data/base_stats/yanma.asm" -INCLUDE "data/base_stats/wooper.asm" -INCLUDE "data/base_stats/quagsire.asm" -INCLUDE "data/base_stats/espeon.asm" -INCLUDE "data/base_stats/umbreon.asm" -INCLUDE "data/base_stats/murkrow.asm" -INCLUDE "data/base_stats/slowking.asm" -INCLUDE "data/base_stats/misdreavus.asm" -INCLUDE "data/base_stats/unown.asm" -INCLUDE "data/base_stats/wobbuffet.asm" -INCLUDE "data/base_stats/girafarig.asm" -INCLUDE "data/base_stats/pineco.asm" -INCLUDE "data/base_stats/forretress.asm" -INCLUDE "data/base_stats/dunsparce.asm" -INCLUDE "data/base_stats/gligar.asm" -INCLUDE "data/base_stats/steelix.asm" -INCLUDE "data/base_stats/snubbull.asm" -INCLUDE "data/base_stats/granbull.asm" -INCLUDE "data/base_stats/qwilfish.asm" -INCLUDE "data/base_stats/scizor.asm" -INCLUDE "data/base_stats/shuckle.asm" -INCLUDE "data/base_stats/heracross.asm" -INCLUDE "data/base_stats/sneasel.asm" -INCLUDE "data/base_stats/teddiursa.asm" -INCLUDE "data/base_stats/ursaring.asm" -INCLUDE "data/base_stats/slugma.asm" -INCLUDE "data/base_stats/magcargo.asm" -INCLUDE "data/base_stats/swinub.asm" -INCLUDE "data/base_stats/piloswine.asm" -INCLUDE "data/base_stats/corsola.asm" -INCLUDE "data/base_stats/remoraid.asm" -INCLUDE "data/base_stats/octillery.asm" -INCLUDE "data/base_stats/delibird.asm" -INCLUDE "data/base_stats/mantine.asm" -INCLUDE "data/base_stats/skarmory.asm" -INCLUDE "data/base_stats/houndour.asm" -INCLUDE "data/base_stats/houndoom.asm" -INCLUDE "data/base_stats/kingdra.asm" -INCLUDE "data/base_stats/phanpy.asm" -INCLUDE "data/base_stats/donphan.asm" -INCLUDE "data/base_stats/porygon2.asm" -INCLUDE "data/base_stats/stantler.asm" -INCLUDE "data/base_stats/smeargle.asm" -INCLUDE "data/base_stats/tyrogue.asm" -INCLUDE "data/base_stats/hitmontop.asm" -INCLUDE "data/base_stats/smoochum.asm" -INCLUDE "data/base_stats/elekid.asm" -INCLUDE "data/base_stats/magby.asm" -INCLUDE "data/base_stats/miltank.asm" -INCLUDE "data/base_stats/blissey.asm" -INCLUDE "data/base_stats/raikou.asm" -INCLUDE "data/base_stats/entei.asm" -INCLUDE "data/base_stats/suicune.asm" -INCLUDE "data/base_stats/larvitar.asm" -INCLUDE "data/base_stats/pupitar.asm" -INCLUDE "data/base_stats/tyranitar.asm" -INCLUDE "data/base_stats/lugia.asm" -INCLUDE "data/base_stats/ho_oh.asm" -INCLUDE "data/base_stats/celebi.asm" diff --git a/items/item_attributes.asm b/data/items/item_attributes.asm similarity index 100% rename from items/item_attributes.asm rename to data/items/item_attributes.asm diff --git a/items/item_descriptions.asm b/data/items/item_descriptions.asm similarity index 100% rename from items/item_descriptions.asm rename to data/items/item_descriptions.asm diff --git a/items/item_names.asm b/data/items/item_names.asm similarity index 100% rename from items/item_names.asm rename to data/items/item_names.asm diff --git a/items/marts.asm b/data/items/marts.asm similarity index 100% rename from items/marts.asm rename to data/items/marts.asm diff --git a/data/landmarks.asm b/data/maps/landmarks.asm similarity index 100% rename from data/landmarks.asm rename to data/maps/landmarks.asm diff --git a/data/map_triggers.asm b/data/maps/map_triggers.asm similarity index 100% rename from data/map_triggers.asm rename to data/maps/map_triggers.asm diff --git a/data/mapgroup_roofs.asm b/data/maps/mapgroup_roofs.asm similarity index 100% rename from data/mapgroup_roofs.asm rename to data/maps/mapgroup_roofs.asm diff --git a/data/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm similarity index 100% rename from data/outdoor_sprites.asm rename to data/maps/outdoor_sprites.asm diff --git a/data/spawn_points.asm b/data/maps/spawn_points.asm similarity index 100% rename from data/spawn_points.asm rename to data/maps/spawn_points.asm diff --git a/data/pokedex/entries.asm b/data/pokedex/entries.asm deleted file mode 100644 index a12cdd3f4..000000000 --- a/data/pokedex/entries.asm +++ /dev/null @@ -1,272 +0,0 @@ -INCLUDE "includes.asm" - - -SECTION "Pokedex Entries 001-064", ROMX - -PokedexEntries1:: -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" - - -SECTION "Pokedex Entries 065-128", ROMX - -PokedexEntries2:: -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" - - -SECTION "Pokedex Entries 129-192", ROMX - -PokedexEntries3:: -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" - - -SECTION "Pokedex Entries 193-251", ROMX - -PokedexEntries4:: -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/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm new file mode 100644 index 000000000..8a6435a40 --- /dev/null +++ b/data/pokemon/base_stats.asm @@ -0,0 +1,252 @@ +BaseData:: +INCLUDE "data/pokemon/base_stats/bulbasaur.asm" +INCLUDE "data/pokemon/base_stats/ivysaur.asm" +INCLUDE "data/pokemon/base_stats/venusaur.asm" +INCLUDE "data/pokemon/base_stats/charmander.asm" +INCLUDE "data/pokemon/base_stats/charmeleon.asm" +INCLUDE "data/pokemon/base_stats/charizard.asm" +INCLUDE "data/pokemon/base_stats/squirtle.asm" +INCLUDE "data/pokemon/base_stats/wartortle.asm" +INCLUDE "data/pokemon/base_stats/blastoise.asm" +INCLUDE "data/pokemon/base_stats/caterpie.asm" +INCLUDE "data/pokemon/base_stats/metapod.asm" +INCLUDE "data/pokemon/base_stats/butterfree.asm" +INCLUDE "data/pokemon/base_stats/weedle.asm" +INCLUDE "data/pokemon/base_stats/kakuna.asm" +INCLUDE "data/pokemon/base_stats/beedrill.asm" +INCLUDE "data/pokemon/base_stats/pidgey.asm" +INCLUDE "data/pokemon/base_stats/pidgeotto.asm" +INCLUDE "data/pokemon/base_stats/pidgeot.asm" +INCLUDE "data/pokemon/base_stats/rattata.asm" +INCLUDE "data/pokemon/base_stats/raticate.asm" +INCLUDE "data/pokemon/base_stats/spearow.asm" +INCLUDE "data/pokemon/base_stats/fearow.asm" +INCLUDE "data/pokemon/base_stats/ekans.asm" +INCLUDE "data/pokemon/base_stats/arbok.asm" +INCLUDE "data/pokemon/base_stats/pikachu.asm" +INCLUDE "data/pokemon/base_stats/raichu.asm" +INCLUDE "data/pokemon/base_stats/sandshrew.asm" +INCLUDE "data/pokemon/base_stats/sandslash.asm" +INCLUDE "data/pokemon/base_stats/nidoran_f.asm" +INCLUDE "data/pokemon/base_stats/nidorina.asm" +INCLUDE "data/pokemon/base_stats/nidoqueen.asm" +INCLUDE "data/pokemon/base_stats/nidoran_m.asm" +INCLUDE "data/pokemon/base_stats/nidorino.asm" +INCLUDE "data/pokemon/base_stats/nidoking.asm" +INCLUDE "data/pokemon/base_stats/clefairy.asm" +INCLUDE "data/pokemon/base_stats/clefable.asm" +INCLUDE "data/pokemon/base_stats/vulpix.asm" +INCLUDE "data/pokemon/base_stats/ninetales.asm" +INCLUDE "data/pokemon/base_stats/jigglypuff.asm" +INCLUDE "data/pokemon/base_stats/wigglytuff.asm" +INCLUDE "data/pokemon/base_stats/zubat.asm" +INCLUDE "data/pokemon/base_stats/golbat.asm" +INCLUDE "data/pokemon/base_stats/oddish.asm" +INCLUDE "data/pokemon/base_stats/gloom.asm" +INCLUDE "data/pokemon/base_stats/vileplume.asm" +INCLUDE "data/pokemon/base_stats/paras.asm" +INCLUDE "data/pokemon/base_stats/parasect.asm" +INCLUDE "data/pokemon/base_stats/venonat.asm" +INCLUDE "data/pokemon/base_stats/venomoth.asm" +INCLUDE "data/pokemon/base_stats/diglett.asm" +INCLUDE "data/pokemon/base_stats/dugtrio.asm" +INCLUDE "data/pokemon/base_stats/meowth.asm" +INCLUDE "data/pokemon/base_stats/persian.asm" +INCLUDE "data/pokemon/base_stats/psyduck.asm" +INCLUDE "data/pokemon/base_stats/golduck.asm" +INCLUDE "data/pokemon/base_stats/mankey.asm" +INCLUDE "data/pokemon/base_stats/primeape.asm" +INCLUDE "data/pokemon/base_stats/growlithe.asm" +INCLUDE "data/pokemon/base_stats/arcanine.asm" +INCLUDE "data/pokemon/base_stats/poliwag.asm" +INCLUDE "data/pokemon/base_stats/poliwhirl.asm" +INCLUDE "data/pokemon/base_stats/poliwrath.asm" +INCLUDE "data/pokemon/base_stats/abra.asm" +INCLUDE "data/pokemon/base_stats/kadabra.asm" +INCLUDE "data/pokemon/base_stats/alakazam.asm" +INCLUDE "data/pokemon/base_stats/machop.asm" +INCLUDE "data/pokemon/base_stats/machoke.asm" +INCLUDE "data/pokemon/base_stats/machamp.asm" +INCLUDE "data/pokemon/base_stats/bellsprout.asm" +INCLUDE "data/pokemon/base_stats/weepinbell.asm" +INCLUDE "data/pokemon/base_stats/victreebel.asm" +INCLUDE "data/pokemon/base_stats/tentacool.asm" +INCLUDE "data/pokemon/base_stats/tentacruel.asm" +INCLUDE "data/pokemon/base_stats/geodude.asm" +INCLUDE "data/pokemon/base_stats/graveler.asm" +INCLUDE "data/pokemon/base_stats/golem.asm" +INCLUDE "data/pokemon/base_stats/ponyta.asm" +INCLUDE "data/pokemon/base_stats/rapidash.asm" +INCLUDE "data/pokemon/base_stats/slowpoke.asm" +INCLUDE "data/pokemon/base_stats/slowbro.asm" +INCLUDE "data/pokemon/base_stats/magnemite.asm" +INCLUDE "data/pokemon/base_stats/magneton.asm" +INCLUDE "data/pokemon/base_stats/farfetch_d.asm" +INCLUDE "data/pokemon/base_stats/doduo.asm" +INCLUDE "data/pokemon/base_stats/dodrio.asm" +INCLUDE "data/pokemon/base_stats/seel.asm" +INCLUDE "data/pokemon/base_stats/dewgong.asm" +INCLUDE "data/pokemon/base_stats/grimer.asm" +INCLUDE "data/pokemon/base_stats/muk.asm" +INCLUDE "data/pokemon/base_stats/shellder.asm" +INCLUDE "data/pokemon/base_stats/cloyster.asm" +INCLUDE "data/pokemon/base_stats/gastly.asm" +INCLUDE "data/pokemon/base_stats/haunter.asm" +INCLUDE "data/pokemon/base_stats/gengar.asm" +INCLUDE "data/pokemon/base_stats/onix.asm" +INCLUDE "data/pokemon/base_stats/drowzee.asm" +INCLUDE "data/pokemon/base_stats/hypno.asm" +INCLUDE "data/pokemon/base_stats/krabby.asm" +INCLUDE "data/pokemon/base_stats/kingler.asm" +INCLUDE "data/pokemon/base_stats/voltorb.asm" +INCLUDE "data/pokemon/base_stats/electrode.asm" +INCLUDE "data/pokemon/base_stats/exeggcute.asm" +INCLUDE "data/pokemon/base_stats/exeggutor.asm" +INCLUDE "data/pokemon/base_stats/cubone.asm" +INCLUDE "data/pokemon/base_stats/marowak.asm" +INCLUDE "data/pokemon/base_stats/hitmonlee.asm" +INCLUDE "data/pokemon/base_stats/hitmonchan.asm" +INCLUDE "data/pokemon/base_stats/lickitung.asm" +INCLUDE "data/pokemon/base_stats/koffing.asm" +INCLUDE "data/pokemon/base_stats/weezing.asm" +INCLUDE "data/pokemon/base_stats/rhyhorn.asm" +INCLUDE "data/pokemon/base_stats/rhydon.asm" +INCLUDE "data/pokemon/base_stats/chansey.asm" +INCLUDE "data/pokemon/base_stats/tangela.asm" +INCLUDE "data/pokemon/base_stats/kangaskhan.asm" +INCLUDE "data/pokemon/base_stats/horsea.asm" +INCLUDE "data/pokemon/base_stats/seadra.asm" +INCLUDE "data/pokemon/base_stats/goldeen.asm" +INCLUDE "data/pokemon/base_stats/seaking.asm" +INCLUDE "data/pokemon/base_stats/staryu.asm" +INCLUDE "data/pokemon/base_stats/starmie.asm" +INCLUDE "data/pokemon/base_stats/mr__mime.asm" +INCLUDE "data/pokemon/base_stats/scyther.asm" +INCLUDE "data/pokemon/base_stats/jynx.asm" +INCLUDE "data/pokemon/base_stats/electabuzz.asm" +INCLUDE "data/pokemon/base_stats/magmar.asm" +INCLUDE "data/pokemon/base_stats/pinsir.asm" +INCLUDE "data/pokemon/base_stats/tauros.asm" +INCLUDE "data/pokemon/base_stats/magikarp.asm" +INCLUDE "data/pokemon/base_stats/gyarados.asm" +INCLUDE "data/pokemon/base_stats/lapras.asm" +INCLUDE "data/pokemon/base_stats/ditto.asm" +INCLUDE "data/pokemon/base_stats/eevee.asm" +INCLUDE "data/pokemon/base_stats/vaporeon.asm" +INCLUDE "data/pokemon/base_stats/jolteon.asm" +INCLUDE "data/pokemon/base_stats/flareon.asm" +INCLUDE "data/pokemon/base_stats/porygon.asm" +INCLUDE "data/pokemon/base_stats/omanyte.asm" +INCLUDE "data/pokemon/base_stats/omastar.asm" +INCLUDE "data/pokemon/base_stats/kabuto.asm" +INCLUDE "data/pokemon/base_stats/kabutops.asm" +INCLUDE "data/pokemon/base_stats/aerodactyl.asm" +INCLUDE "data/pokemon/base_stats/snorlax.asm" +INCLUDE "data/pokemon/base_stats/articuno.asm" +INCLUDE "data/pokemon/base_stats/zapdos.asm" +INCLUDE "data/pokemon/base_stats/moltres.asm" +INCLUDE "data/pokemon/base_stats/dratini.asm" +INCLUDE "data/pokemon/base_stats/dragonair.asm" +INCLUDE "data/pokemon/base_stats/dragonite.asm" +INCLUDE "data/pokemon/base_stats/mewtwo.asm" +INCLUDE "data/pokemon/base_stats/mew.asm" +INCLUDE "data/pokemon/base_stats/chikorita.asm" +INCLUDE "data/pokemon/base_stats/bayleef.asm" +INCLUDE "data/pokemon/base_stats/meganium.asm" +INCLUDE "data/pokemon/base_stats/cyndaquil.asm" +INCLUDE "data/pokemon/base_stats/quilava.asm" +INCLUDE "data/pokemon/base_stats/typhlosion.asm" +INCLUDE "data/pokemon/base_stats/totodile.asm" +INCLUDE "data/pokemon/base_stats/croconaw.asm" +INCLUDE "data/pokemon/base_stats/feraligatr.asm" +INCLUDE "data/pokemon/base_stats/sentret.asm" +INCLUDE "data/pokemon/base_stats/furret.asm" +INCLUDE "data/pokemon/base_stats/hoothoot.asm" +INCLUDE "data/pokemon/base_stats/noctowl.asm" +INCLUDE "data/pokemon/base_stats/ledyba.asm" +INCLUDE "data/pokemon/base_stats/ledian.asm" +INCLUDE "data/pokemon/base_stats/spinarak.asm" +INCLUDE "data/pokemon/base_stats/ariados.asm" +INCLUDE "data/pokemon/base_stats/crobat.asm" +INCLUDE "data/pokemon/base_stats/chinchou.asm" +INCLUDE "data/pokemon/base_stats/lanturn.asm" +INCLUDE "data/pokemon/base_stats/pichu.asm" +INCLUDE "data/pokemon/base_stats/cleffa.asm" +INCLUDE "data/pokemon/base_stats/igglybuff.asm" +INCLUDE "data/pokemon/base_stats/togepi.asm" +INCLUDE "data/pokemon/base_stats/togetic.asm" +INCLUDE "data/pokemon/base_stats/natu.asm" +INCLUDE "data/pokemon/base_stats/xatu.asm" +INCLUDE "data/pokemon/base_stats/mareep.asm" +INCLUDE "data/pokemon/base_stats/flaaffy.asm" +INCLUDE "data/pokemon/base_stats/ampharos.asm" +INCLUDE "data/pokemon/base_stats/bellossom.asm" +INCLUDE "data/pokemon/base_stats/marill.asm" +INCLUDE "data/pokemon/base_stats/azumarill.asm" +INCLUDE "data/pokemon/base_stats/sudowoodo.asm" +INCLUDE "data/pokemon/base_stats/politoed.asm" +INCLUDE "data/pokemon/base_stats/hoppip.asm" +INCLUDE "data/pokemon/base_stats/skiploom.asm" +INCLUDE "data/pokemon/base_stats/jumpluff.asm" +INCLUDE "data/pokemon/base_stats/aipom.asm" +INCLUDE "data/pokemon/base_stats/sunkern.asm" +INCLUDE "data/pokemon/base_stats/sunflora.asm" +INCLUDE "data/pokemon/base_stats/yanma.asm" +INCLUDE "data/pokemon/base_stats/wooper.asm" +INCLUDE "data/pokemon/base_stats/quagsire.asm" +INCLUDE "data/pokemon/base_stats/espeon.asm" +INCLUDE "data/pokemon/base_stats/umbreon.asm" +INCLUDE "data/pokemon/base_stats/murkrow.asm" +INCLUDE "data/pokemon/base_stats/slowking.asm" +INCLUDE "data/pokemon/base_stats/misdreavus.asm" +INCLUDE "data/pokemon/base_stats/unown.asm" +INCLUDE "data/pokemon/base_stats/wobbuffet.asm" +INCLUDE "data/pokemon/base_stats/girafarig.asm" +INCLUDE "data/pokemon/base_stats/pineco.asm" +INCLUDE "data/pokemon/base_stats/forretress.asm" +INCLUDE "data/pokemon/base_stats/dunsparce.asm" +INCLUDE "data/pokemon/base_stats/gligar.asm" +INCLUDE "data/pokemon/base_stats/steelix.asm" +INCLUDE "data/pokemon/base_stats/snubbull.asm" +INCLUDE "data/pokemon/base_stats/granbull.asm" +INCLUDE "data/pokemon/base_stats/qwilfish.asm" +INCLUDE "data/pokemon/base_stats/scizor.asm" +INCLUDE "data/pokemon/base_stats/shuckle.asm" +INCLUDE "data/pokemon/base_stats/heracross.asm" +INCLUDE "data/pokemon/base_stats/sneasel.asm" +INCLUDE "data/pokemon/base_stats/teddiursa.asm" +INCLUDE "data/pokemon/base_stats/ursaring.asm" +INCLUDE "data/pokemon/base_stats/slugma.asm" +INCLUDE "data/pokemon/base_stats/magcargo.asm" +INCLUDE "data/pokemon/base_stats/swinub.asm" +INCLUDE "data/pokemon/base_stats/piloswine.asm" +INCLUDE "data/pokemon/base_stats/corsola.asm" +INCLUDE "data/pokemon/base_stats/remoraid.asm" +INCLUDE "data/pokemon/base_stats/octillery.asm" +INCLUDE "data/pokemon/base_stats/delibird.asm" +INCLUDE "data/pokemon/base_stats/mantine.asm" +INCLUDE "data/pokemon/base_stats/skarmory.asm" +INCLUDE "data/pokemon/base_stats/houndour.asm" +INCLUDE "data/pokemon/base_stats/houndoom.asm" +INCLUDE "data/pokemon/base_stats/kingdra.asm" +INCLUDE "data/pokemon/base_stats/phanpy.asm" +INCLUDE "data/pokemon/base_stats/donphan.asm" +INCLUDE "data/pokemon/base_stats/porygon2.asm" +INCLUDE "data/pokemon/base_stats/stantler.asm" +INCLUDE "data/pokemon/base_stats/smeargle.asm" +INCLUDE "data/pokemon/base_stats/tyrogue.asm" +INCLUDE "data/pokemon/base_stats/hitmontop.asm" +INCLUDE "data/pokemon/base_stats/smoochum.asm" +INCLUDE "data/pokemon/base_stats/elekid.asm" +INCLUDE "data/pokemon/base_stats/magby.asm" +INCLUDE "data/pokemon/base_stats/miltank.asm" +INCLUDE "data/pokemon/base_stats/blissey.asm" +INCLUDE "data/pokemon/base_stats/raikou.asm" +INCLUDE "data/pokemon/base_stats/entei.asm" +INCLUDE "data/pokemon/base_stats/suicune.asm" +INCLUDE "data/pokemon/base_stats/larvitar.asm" +INCLUDE "data/pokemon/base_stats/pupitar.asm" +INCLUDE "data/pokemon/base_stats/tyranitar.asm" +INCLUDE "data/pokemon/base_stats/lugia.asm" +INCLUDE "data/pokemon/base_stats/ho_oh.asm" +INCLUDE "data/pokemon/base_stats/celebi.asm" diff --git a/data/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm similarity index 100% rename from data/base_stats/abra.asm rename to data/pokemon/base_stats/abra.asm diff --git a/data/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm similarity index 100% rename from data/base_stats/aerodactyl.asm rename to data/pokemon/base_stats/aerodactyl.asm diff --git a/data/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm similarity index 100% rename from data/base_stats/aipom.asm rename to data/pokemon/base_stats/aipom.asm diff --git a/data/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm similarity index 100% rename from data/base_stats/alakazam.asm rename to data/pokemon/base_stats/alakazam.asm diff --git a/data/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm similarity index 100% rename from data/base_stats/ampharos.asm rename to data/pokemon/base_stats/ampharos.asm diff --git a/data/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm similarity index 100% rename from data/base_stats/arbok.asm rename to data/pokemon/base_stats/arbok.asm diff --git a/data/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm similarity index 100% rename from data/base_stats/arcanine.asm rename to data/pokemon/base_stats/arcanine.asm diff --git a/data/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm similarity index 100% rename from data/base_stats/ariados.asm rename to data/pokemon/base_stats/ariados.asm diff --git a/data/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm similarity index 100% rename from data/base_stats/articuno.asm rename to data/pokemon/base_stats/articuno.asm diff --git a/data/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm similarity index 100% rename from data/base_stats/azumarill.asm rename to data/pokemon/base_stats/azumarill.asm diff --git a/data/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm similarity index 100% rename from data/base_stats/bayleef.asm rename to data/pokemon/base_stats/bayleef.asm diff --git a/data/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm similarity index 100% rename from data/base_stats/beedrill.asm rename to data/pokemon/base_stats/beedrill.asm diff --git a/data/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm similarity index 100% rename from data/base_stats/bellossom.asm rename to data/pokemon/base_stats/bellossom.asm diff --git a/data/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm similarity index 100% rename from data/base_stats/bellsprout.asm rename to data/pokemon/base_stats/bellsprout.asm diff --git a/data/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm similarity index 100% rename from data/base_stats/blastoise.asm rename to data/pokemon/base_stats/blastoise.asm diff --git a/data/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm similarity index 100% rename from data/base_stats/blissey.asm rename to data/pokemon/base_stats/blissey.asm diff --git a/data/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm similarity index 100% rename from data/base_stats/bulbasaur.asm rename to data/pokemon/base_stats/bulbasaur.asm diff --git a/data/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm similarity index 100% rename from data/base_stats/butterfree.asm rename to data/pokemon/base_stats/butterfree.asm diff --git a/data/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm similarity index 100% rename from data/base_stats/caterpie.asm rename to data/pokemon/base_stats/caterpie.asm diff --git a/data/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm similarity index 100% rename from data/base_stats/celebi.asm rename to data/pokemon/base_stats/celebi.asm diff --git a/data/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm similarity index 100% rename from data/base_stats/chansey.asm rename to data/pokemon/base_stats/chansey.asm diff --git a/data/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm similarity index 100% rename from data/base_stats/charizard.asm rename to data/pokemon/base_stats/charizard.asm diff --git a/data/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm similarity index 100% rename from data/base_stats/charmander.asm rename to data/pokemon/base_stats/charmander.asm diff --git a/data/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm similarity index 100% rename from data/base_stats/charmeleon.asm rename to data/pokemon/base_stats/charmeleon.asm diff --git a/data/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm similarity index 100% rename from data/base_stats/chikorita.asm rename to data/pokemon/base_stats/chikorita.asm diff --git a/data/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm similarity index 100% rename from data/base_stats/chinchou.asm rename to data/pokemon/base_stats/chinchou.asm diff --git a/data/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm similarity index 100% rename from data/base_stats/clefable.asm rename to data/pokemon/base_stats/clefable.asm diff --git a/data/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm similarity index 100% rename from data/base_stats/clefairy.asm rename to data/pokemon/base_stats/clefairy.asm diff --git a/data/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm similarity index 100% rename from data/base_stats/cleffa.asm rename to data/pokemon/base_stats/cleffa.asm diff --git a/data/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm similarity index 100% rename from data/base_stats/cloyster.asm rename to data/pokemon/base_stats/cloyster.asm diff --git a/data/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm similarity index 100% rename from data/base_stats/corsola.asm rename to data/pokemon/base_stats/corsola.asm diff --git a/data/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm similarity index 100% rename from data/base_stats/crobat.asm rename to data/pokemon/base_stats/crobat.asm diff --git a/data/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm similarity index 100% rename from data/base_stats/croconaw.asm rename to data/pokemon/base_stats/croconaw.asm diff --git a/data/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm similarity index 100% rename from data/base_stats/cubone.asm rename to data/pokemon/base_stats/cubone.asm diff --git a/data/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm similarity index 100% rename from data/base_stats/cyndaquil.asm rename to data/pokemon/base_stats/cyndaquil.asm diff --git a/data/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm similarity index 100% rename from data/base_stats/delibird.asm rename to data/pokemon/base_stats/delibird.asm diff --git a/data/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm similarity index 100% rename from data/base_stats/dewgong.asm rename to data/pokemon/base_stats/dewgong.asm diff --git a/data/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm similarity index 100% rename from data/base_stats/diglett.asm rename to data/pokemon/base_stats/diglett.asm diff --git a/data/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm similarity index 100% rename from data/base_stats/ditto.asm rename to data/pokemon/base_stats/ditto.asm diff --git a/data/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm similarity index 100% rename from data/base_stats/dodrio.asm rename to data/pokemon/base_stats/dodrio.asm diff --git a/data/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm similarity index 100% rename from data/base_stats/doduo.asm rename to data/pokemon/base_stats/doduo.asm diff --git a/data/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm similarity index 100% rename from data/base_stats/donphan.asm rename to data/pokemon/base_stats/donphan.asm diff --git a/data/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm similarity index 100% rename from data/base_stats/dragonair.asm rename to data/pokemon/base_stats/dragonair.asm diff --git a/data/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm similarity index 100% rename from data/base_stats/dragonite.asm rename to data/pokemon/base_stats/dragonite.asm diff --git a/data/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm similarity index 100% rename from data/base_stats/dratini.asm rename to data/pokemon/base_stats/dratini.asm diff --git a/data/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm similarity index 100% rename from data/base_stats/drowzee.asm rename to data/pokemon/base_stats/drowzee.asm diff --git a/data/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm similarity index 100% rename from data/base_stats/dugtrio.asm rename to data/pokemon/base_stats/dugtrio.asm diff --git a/data/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm similarity index 100% rename from data/base_stats/dunsparce.asm rename to data/pokemon/base_stats/dunsparce.asm diff --git a/data/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm similarity index 100% rename from data/base_stats/eevee.asm rename to data/pokemon/base_stats/eevee.asm diff --git a/data/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm similarity index 100% rename from data/base_stats/ekans.asm rename to data/pokemon/base_stats/ekans.asm diff --git a/data/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm similarity index 100% rename from data/base_stats/electabuzz.asm rename to data/pokemon/base_stats/electabuzz.asm diff --git a/data/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm similarity index 100% rename from data/base_stats/electrode.asm rename to data/pokemon/base_stats/electrode.asm diff --git a/data/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm similarity index 100% rename from data/base_stats/elekid.asm rename to data/pokemon/base_stats/elekid.asm diff --git a/data/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm similarity index 100% rename from data/base_stats/entei.asm rename to data/pokemon/base_stats/entei.asm diff --git a/data/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm similarity index 100% rename from data/base_stats/espeon.asm rename to data/pokemon/base_stats/espeon.asm diff --git a/data/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm similarity index 100% rename from data/base_stats/exeggcute.asm rename to data/pokemon/base_stats/exeggcute.asm diff --git a/data/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm similarity index 100% rename from data/base_stats/exeggutor.asm rename to data/pokemon/base_stats/exeggutor.asm diff --git a/data/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm similarity index 100% rename from data/base_stats/farfetch_d.asm rename to data/pokemon/base_stats/farfetch_d.asm diff --git a/data/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm similarity index 100% rename from data/base_stats/fearow.asm rename to data/pokemon/base_stats/fearow.asm diff --git a/data/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm similarity index 100% rename from data/base_stats/feraligatr.asm rename to data/pokemon/base_stats/feraligatr.asm diff --git a/data/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm similarity index 100% rename from data/base_stats/flaaffy.asm rename to data/pokemon/base_stats/flaaffy.asm diff --git a/data/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm similarity index 100% rename from data/base_stats/flareon.asm rename to data/pokemon/base_stats/flareon.asm diff --git a/data/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm similarity index 100% rename from data/base_stats/forretress.asm rename to data/pokemon/base_stats/forretress.asm diff --git a/data/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm similarity index 100% rename from data/base_stats/furret.asm rename to data/pokemon/base_stats/furret.asm diff --git a/data/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm similarity index 100% rename from data/base_stats/gastly.asm rename to data/pokemon/base_stats/gastly.asm diff --git a/data/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm similarity index 100% rename from data/base_stats/gengar.asm rename to data/pokemon/base_stats/gengar.asm diff --git a/data/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm similarity index 100% rename from data/base_stats/geodude.asm rename to data/pokemon/base_stats/geodude.asm diff --git a/data/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm similarity index 100% rename from data/base_stats/girafarig.asm rename to data/pokemon/base_stats/girafarig.asm diff --git a/data/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm similarity index 100% rename from data/base_stats/gligar.asm rename to data/pokemon/base_stats/gligar.asm diff --git a/data/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm similarity index 100% rename from data/base_stats/gloom.asm rename to data/pokemon/base_stats/gloom.asm diff --git a/data/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm similarity index 100% rename from data/base_stats/golbat.asm rename to data/pokemon/base_stats/golbat.asm diff --git a/data/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm similarity index 100% rename from data/base_stats/goldeen.asm rename to data/pokemon/base_stats/goldeen.asm diff --git a/data/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm similarity index 100% rename from data/base_stats/golduck.asm rename to data/pokemon/base_stats/golduck.asm diff --git a/data/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm similarity index 100% rename from data/base_stats/golem.asm rename to data/pokemon/base_stats/golem.asm diff --git a/data/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm similarity index 100% rename from data/base_stats/granbull.asm rename to data/pokemon/base_stats/granbull.asm diff --git a/data/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm similarity index 100% rename from data/base_stats/graveler.asm rename to data/pokemon/base_stats/graveler.asm diff --git a/data/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm similarity index 100% rename from data/base_stats/grimer.asm rename to data/pokemon/base_stats/grimer.asm diff --git a/data/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm similarity index 100% rename from data/base_stats/growlithe.asm rename to data/pokemon/base_stats/growlithe.asm diff --git a/data/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm similarity index 100% rename from data/base_stats/gyarados.asm rename to data/pokemon/base_stats/gyarados.asm diff --git a/data/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm similarity index 100% rename from data/base_stats/haunter.asm rename to data/pokemon/base_stats/haunter.asm diff --git a/data/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm similarity index 100% rename from data/base_stats/heracross.asm rename to data/pokemon/base_stats/heracross.asm diff --git a/data/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm similarity index 100% rename from data/base_stats/hitmonchan.asm rename to data/pokemon/base_stats/hitmonchan.asm diff --git a/data/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm similarity index 100% rename from data/base_stats/hitmonlee.asm rename to data/pokemon/base_stats/hitmonlee.asm diff --git a/data/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm similarity index 100% rename from data/base_stats/hitmontop.asm rename to data/pokemon/base_stats/hitmontop.asm diff --git a/data/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm similarity index 100% rename from data/base_stats/ho_oh.asm rename to data/pokemon/base_stats/ho_oh.asm diff --git a/data/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm similarity index 100% rename from data/base_stats/hoothoot.asm rename to data/pokemon/base_stats/hoothoot.asm diff --git a/data/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm similarity index 100% rename from data/base_stats/hoppip.asm rename to data/pokemon/base_stats/hoppip.asm diff --git a/data/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm similarity index 100% rename from data/base_stats/horsea.asm rename to data/pokemon/base_stats/horsea.asm diff --git a/data/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm similarity index 100% rename from data/base_stats/houndoom.asm rename to data/pokemon/base_stats/houndoom.asm diff --git a/data/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm similarity index 100% rename from data/base_stats/houndour.asm rename to data/pokemon/base_stats/houndour.asm diff --git a/data/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm similarity index 100% rename from data/base_stats/hypno.asm rename to data/pokemon/base_stats/hypno.asm diff --git a/data/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm similarity index 100% rename from data/base_stats/igglybuff.asm rename to data/pokemon/base_stats/igglybuff.asm diff --git a/data/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm similarity index 100% rename from data/base_stats/ivysaur.asm rename to data/pokemon/base_stats/ivysaur.asm diff --git a/data/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm similarity index 100% rename from data/base_stats/jigglypuff.asm rename to data/pokemon/base_stats/jigglypuff.asm diff --git a/data/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm similarity index 100% rename from data/base_stats/jolteon.asm rename to data/pokemon/base_stats/jolteon.asm diff --git a/data/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm similarity index 100% rename from data/base_stats/jumpluff.asm rename to data/pokemon/base_stats/jumpluff.asm diff --git a/data/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm similarity index 100% rename from data/base_stats/jynx.asm rename to data/pokemon/base_stats/jynx.asm diff --git a/data/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm similarity index 100% rename from data/base_stats/kabuto.asm rename to data/pokemon/base_stats/kabuto.asm diff --git a/data/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm similarity index 100% rename from data/base_stats/kabutops.asm rename to data/pokemon/base_stats/kabutops.asm diff --git a/data/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm similarity index 100% rename from data/base_stats/kadabra.asm rename to data/pokemon/base_stats/kadabra.asm diff --git a/data/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm similarity index 100% rename from data/base_stats/kakuna.asm rename to data/pokemon/base_stats/kakuna.asm diff --git a/data/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm similarity index 100% rename from data/base_stats/kangaskhan.asm rename to data/pokemon/base_stats/kangaskhan.asm diff --git a/data/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm similarity index 100% rename from data/base_stats/kingdra.asm rename to data/pokemon/base_stats/kingdra.asm diff --git a/data/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm similarity index 100% rename from data/base_stats/kingler.asm rename to data/pokemon/base_stats/kingler.asm diff --git a/data/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm similarity index 100% rename from data/base_stats/koffing.asm rename to data/pokemon/base_stats/koffing.asm diff --git a/data/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm similarity index 100% rename from data/base_stats/krabby.asm rename to data/pokemon/base_stats/krabby.asm diff --git a/data/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm similarity index 100% rename from data/base_stats/lanturn.asm rename to data/pokemon/base_stats/lanturn.asm diff --git a/data/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm similarity index 100% rename from data/base_stats/lapras.asm rename to data/pokemon/base_stats/lapras.asm diff --git a/data/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm similarity index 100% rename from data/base_stats/larvitar.asm rename to data/pokemon/base_stats/larvitar.asm diff --git a/data/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm similarity index 100% rename from data/base_stats/ledian.asm rename to data/pokemon/base_stats/ledian.asm diff --git a/data/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm similarity index 100% rename from data/base_stats/ledyba.asm rename to data/pokemon/base_stats/ledyba.asm diff --git a/data/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm similarity index 100% rename from data/base_stats/lickitung.asm rename to data/pokemon/base_stats/lickitung.asm diff --git a/data/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm similarity index 100% rename from data/base_stats/lugia.asm rename to data/pokemon/base_stats/lugia.asm diff --git a/data/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm similarity index 100% rename from data/base_stats/machamp.asm rename to data/pokemon/base_stats/machamp.asm diff --git a/data/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm similarity index 100% rename from data/base_stats/machoke.asm rename to data/pokemon/base_stats/machoke.asm diff --git a/data/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm similarity index 100% rename from data/base_stats/machop.asm rename to data/pokemon/base_stats/machop.asm diff --git a/data/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm similarity index 100% rename from data/base_stats/magby.asm rename to data/pokemon/base_stats/magby.asm diff --git a/data/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm similarity index 100% rename from data/base_stats/magcargo.asm rename to data/pokemon/base_stats/magcargo.asm diff --git a/data/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm similarity index 100% rename from data/base_stats/magikarp.asm rename to data/pokemon/base_stats/magikarp.asm diff --git a/data/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm similarity index 100% rename from data/base_stats/magmar.asm rename to data/pokemon/base_stats/magmar.asm diff --git a/data/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm similarity index 100% rename from data/base_stats/magnemite.asm rename to data/pokemon/base_stats/magnemite.asm diff --git a/data/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm similarity index 100% rename from data/base_stats/magneton.asm rename to data/pokemon/base_stats/magneton.asm diff --git a/data/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm similarity index 100% rename from data/base_stats/mankey.asm rename to data/pokemon/base_stats/mankey.asm diff --git a/data/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm similarity index 100% rename from data/base_stats/mantine.asm rename to data/pokemon/base_stats/mantine.asm diff --git a/data/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm similarity index 100% rename from data/base_stats/mareep.asm rename to data/pokemon/base_stats/mareep.asm diff --git a/data/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm similarity index 100% rename from data/base_stats/marill.asm rename to data/pokemon/base_stats/marill.asm diff --git a/data/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm similarity index 100% rename from data/base_stats/marowak.asm rename to data/pokemon/base_stats/marowak.asm diff --git a/data/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm similarity index 100% rename from data/base_stats/meganium.asm rename to data/pokemon/base_stats/meganium.asm diff --git a/data/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm similarity index 100% rename from data/base_stats/meowth.asm rename to data/pokemon/base_stats/meowth.asm diff --git a/data/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm similarity index 100% rename from data/base_stats/metapod.asm rename to data/pokemon/base_stats/metapod.asm diff --git a/data/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm similarity index 100% rename from data/base_stats/mew.asm rename to data/pokemon/base_stats/mew.asm diff --git a/data/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm similarity index 100% rename from data/base_stats/mewtwo.asm rename to data/pokemon/base_stats/mewtwo.asm diff --git a/data/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm similarity index 100% rename from data/base_stats/miltank.asm rename to data/pokemon/base_stats/miltank.asm diff --git a/data/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm similarity index 100% rename from data/base_stats/misdreavus.asm rename to data/pokemon/base_stats/misdreavus.asm diff --git a/data/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm similarity index 100% rename from data/base_stats/moltres.asm rename to data/pokemon/base_stats/moltres.asm diff --git a/data/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm similarity index 100% rename from data/base_stats/mr__mime.asm rename to data/pokemon/base_stats/mr__mime.asm diff --git a/data/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm similarity index 100% rename from data/base_stats/muk.asm rename to data/pokemon/base_stats/muk.asm diff --git a/data/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm similarity index 100% rename from data/base_stats/murkrow.asm rename to data/pokemon/base_stats/murkrow.asm diff --git a/data/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm similarity index 100% rename from data/base_stats/natu.asm rename to data/pokemon/base_stats/natu.asm diff --git a/data/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm similarity index 100% rename from data/base_stats/nidoking.asm rename to data/pokemon/base_stats/nidoking.asm diff --git a/data/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm similarity index 100% rename from data/base_stats/nidoqueen.asm rename to data/pokemon/base_stats/nidoqueen.asm diff --git a/data/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm similarity index 100% rename from data/base_stats/nidoran_f.asm rename to data/pokemon/base_stats/nidoran_f.asm diff --git a/data/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm similarity index 100% rename from data/base_stats/nidoran_m.asm rename to data/pokemon/base_stats/nidoran_m.asm diff --git a/data/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm similarity index 100% rename from data/base_stats/nidorina.asm rename to data/pokemon/base_stats/nidorina.asm diff --git a/data/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm similarity index 100% rename from data/base_stats/nidorino.asm rename to data/pokemon/base_stats/nidorino.asm diff --git a/data/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm similarity index 100% rename from data/base_stats/ninetales.asm rename to data/pokemon/base_stats/ninetales.asm diff --git a/data/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm similarity index 100% rename from data/base_stats/noctowl.asm rename to data/pokemon/base_stats/noctowl.asm diff --git a/data/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm similarity index 100% rename from data/base_stats/octillery.asm rename to data/pokemon/base_stats/octillery.asm diff --git a/data/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm similarity index 100% rename from data/base_stats/oddish.asm rename to data/pokemon/base_stats/oddish.asm diff --git a/data/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm similarity index 100% rename from data/base_stats/omanyte.asm rename to data/pokemon/base_stats/omanyte.asm diff --git a/data/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm similarity index 100% rename from data/base_stats/omastar.asm rename to data/pokemon/base_stats/omastar.asm diff --git a/data/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm similarity index 100% rename from data/base_stats/onix.asm rename to data/pokemon/base_stats/onix.asm diff --git a/data/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm similarity index 100% rename from data/base_stats/paras.asm rename to data/pokemon/base_stats/paras.asm diff --git a/data/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm similarity index 100% rename from data/base_stats/parasect.asm rename to data/pokemon/base_stats/parasect.asm diff --git a/data/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm similarity index 100% rename from data/base_stats/persian.asm rename to data/pokemon/base_stats/persian.asm diff --git a/data/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm similarity index 100% rename from data/base_stats/phanpy.asm rename to data/pokemon/base_stats/phanpy.asm diff --git a/data/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm similarity index 100% rename from data/base_stats/pichu.asm rename to data/pokemon/base_stats/pichu.asm diff --git a/data/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm similarity index 100% rename from data/base_stats/pidgeot.asm rename to data/pokemon/base_stats/pidgeot.asm diff --git a/data/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm similarity index 100% rename from data/base_stats/pidgeotto.asm rename to data/pokemon/base_stats/pidgeotto.asm diff --git a/data/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm similarity index 100% rename from data/base_stats/pidgey.asm rename to data/pokemon/base_stats/pidgey.asm diff --git a/data/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm similarity index 100% rename from data/base_stats/pikachu.asm rename to data/pokemon/base_stats/pikachu.asm diff --git a/data/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm similarity index 100% rename from data/base_stats/piloswine.asm rename to data/pokemon/base_stats/piloswine.asm diff --git a/data/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm similarity index 100% rename from data/base_stats/pineco.asm rename to data/pokemon/base_stats/pineco.asm diff --git a/data/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm similarity index 100% rename from data/base_stats/pinsir.asm rename to data/pokemon/base_stats/pinsir.asm diff --git a/data/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm similarity index 100% rename from data/base_stats/politoed.asm rename to data/pokemon/base_stats/politoed.asm diff --git a/data/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm similarity index 100% rename from data/base_stats/poliwag.asm rename to data/pokemon/base_stats/poliwag.asm diff --git a/data/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm similarity index 100% rename from data/base_stats/poliwhirl.asm rename to data/pokemon/base_stats/poliwhirl.asm diff --git a/data/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm similarity index 100% rename from data/base_stats/poliwrath.asm rename to data/pokemon/base_stats/poliwrath.asm diff --git a/data/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm similarity index 100% rename from data/base_stats/ponyta.asm rename to data/pokemon/base_stats/ponyta.asm diff --git a/data/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm similarity index 100% rename from data/base_stats/porygon.asm rename to data/pokemon/base_stats/porygon.asm diff --git a/data/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm similarity index 100% rename from data/base_stats/porygon2.asm rename to data/pokemon/base_stats/porygon2.asm diff --git a/data/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm similarity index 100% rename from data/base_stats/primeape.asm rename to data/pokemon/base_stats/primeape.asm diff --git a/data/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm similarity index 100% rename from data/base_stats/psyduck.asm rename to data/pokemon/base_stats/psyduck.asm diff --git a/data/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm similarity index 100% rename from data/base_stats/pupitar.asm rename to data/pokemon/base_stats/pupitar.asm diff --git a/data/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm similarity index 100% rename from data/base_stats/quagsire.asm rename to data/pokemon/base_stats/quagsire.asm diff --git a/data/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm similarity index 100% rename from data/base_stats/quilava.asm rename to data/pokemon/base_stats/quilava.asm diff --git a/data/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm similarity index 100% rename from data/base_stats/qwilfish.asm rename to data/pokemon/base_stats/qwilfish.asm diff --git a/data/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm similarity index 100% rename from data/base_stats/raichu.asm rename to data/pokemon/base_stats/raichu.asm diff --git a/data/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm similarity index 100% rename from data/base_stats/raikou.asm rename to data/pokemon/base_stats/raikou.asm diff --git a/data/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm similarity index 100% rename from data/base_stats/rapidash.asm rename to data/pokemon/base_stats/rapidash.asm diff --git a/data/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm similarity index 100% rename from data/base_stats/raticate.asm rename to data/pokemon/base_stats/raticate.asm diff --git a/data/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm similarity index 100% rename from data/base_stats/rattata.asm rename to data/pokemon/base_stats/rattata.asm diff --git a/data/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm similarity index 100% rename from data/base_stats/remoraid.asm rename to data/pokemon/base_stats/remoraid.asm diff --git a/data/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm similarity index 100% rename from data/base_stats/rhydon.asm rename to data/pokemon/base_stats/rhydon.asm diff --git a/data/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm similarity index 100% rename from data/base_stats/rhyhorn.asm rename to data/pokemon/base_stats/rhyhorn.asm diff --git a/data/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm similarity index 100% rename from data/base_stats/sandshrew.asm rename to data/pokemon/base_stats/sandshrew.asm diff --git a/data/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm similarity index 100% rename from data/base_stats/sandslash.asm rename to data/pokemon/base_stats/sandslash.asm diff --git a/data/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm similarity index 100% rename from data/base_stats/scizor.asm rename to data/pokemon/base_stats/scizor.asm diff --git a/data/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm similarity index 100% rename from data/base_stats/scyther.asm rename to data/pokemon/base_stats/scyther.asm diff --git a/data/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm similarity index 100% rename from data/base_stats/seadra.asm rename to data/pokemon/base_stats/seadra.asm diff --git a/data/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm similarity index 100% rename from data/base_stats/seaking.asm rename to data/pokemon/base_stats/seaking.asm diff --git a/data/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm similarity index 100% rename from data/base_stats/seel.asm rename to data/pokemon/base_stats/seel.asm diff --git a/data/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm similarity index 100% rename from data/base_stats/sentret.asm rename to data/pokemon/base_stats/sentret.asm diff --git a/data/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm similarity index 100% rename from data/base_stats/shellder.asm rename to data/pokemon/base_stats/shellder.asm diff --git a/data/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm similarity index 100% rename from data/base_stats/shuckle.asm rename to data/pokemon/base_stats/shuckle.asm diff --git a/data/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm similarity index 100% rename from data/base_stats/skarmory.asm rename to data/pokemon/base_stats/skarmory.asm diff --git a/data/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm similarity index 100% rename from data/base_stats/skiploom.asm rename to data/pokemon/base_stats/skiploom.asm diff --git a/data/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm similarity index 100% rename from data/base_stats/slowbro.asm rename to data/pokemon/base_stats/slowbro.asm diff --git a/data/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm similarity index 100% rename from data/base_stats/slowking.asm rename to data/pokemon/base_stats/slowking.asm diff --git a/data/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm similarity index 100% rename from data/base_stats/slowpoke.asm rename to data/pokemon/base_stats/slowpoke.asm diff --git a/data/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm similarity index 100% rename from data/base_stats/slugma.asm rename to data/pokemon/base_stats/slugma.asm diff --git a/data/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm similarity index 100% rename from data/base_stats/smeargle.asm rename to data/pokemon/base_stats/smeargle.asm diff --git a/data/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm similarity index 100% rename from data/base_stats/smoochum.asm rename to data/pokemon/base_stats/smoochum.asm diff --git a/data/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm similarity index 100% rename from data/base_stats/sneasel.asm rename to data/pokemon/base_stats/sneasel.asm diff --git a/data/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm similarity index 100% rename from data/base_stats/snorlax.asm rename to data/pokemon/base_stats/snorlax.asm diff --git a/data/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm similarity index 100% rename from data/base_stats/snubbull.asm rename to data/pokemon/base_stats/snubbull.asm diff --git a/data/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm similarity index 100% rename from data/base_stats/spearow.asm rename to data/pokemon/base_stats/spearow.asm diff --git a/data/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm similarity index 100% rename from data/base_stats/spinarak.asm rename to data/pokemon/base_stats/spinarak.asm diff --git a/data/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm similarity index 100% rename from data/base_stats/squirtle.asm rename to data/pokemon/base_stats/squirtle.asm diff --git a/data/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm similarity index 100% rename from data/base_stats/stantler.asm rename to data/pokemon/base_stats/stantler.asm diff --git a/data/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm similarity index 100% rename from data/base_stats/starmie.asm rename to data/pokemon/base_stats/starmie.asm diff --git a/data/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm similarity index 100% rename from data/base_stats/staryu.asm rename to data/pokemon/base_stats/staryu.asm diff --git a/data/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm similarity index 100% rename from data/base_stats/steelix.asm rename to data/pokemon/base_stats/steelix.asm diff --git a/data/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm similarity index 100% rename from data/base_stats/sudowoodo.asm rename to data/pokemon/base_stats/sudowoodo.asm diff --git a/data/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm similarity index 100% rename from data/base_stats/suicune.asm rename to data/pokemon/base_stats/suicune.asm diff --git a/data/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm similarity index 100% rename from data/base_stats/sunflora.asm rename to data/pokemon/base_stats/sunflora.asm diff --git a/data/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm similarity index 100% rename from data/base_stats/sunkern.asm rename to data/pokemon/base_stats/sunkern.asm diff --git a/data/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm similarity index 100% rename from data/base_stats/swinub.asm rename to data/pokemon/base_stats/swinub.asm diff --git a/data/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm similarity index 100% rename from data/base_stats/tangela.asm rename to data/pokemon/base_stats/tangela.asm diff --git a/data/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm similarity index 100% rename from data/base_stats/tauros.asm rename to data/pokemon/base_stats/tauros.asm diff --git a/data/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm similarity index 100% rename from data/base_stats/teddiursa.asm rename to data/pokemon/base_stats/teddiursa.asm diff --git a/data/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm similarity index 100% rename from data/base_stats/tentacool.asm rename to data/pokemon/base_stats/tentacool.asm diff --git a/data/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm similarity index 100% rename from data/base_stats/tentacruel.asm rename to data/pokemon/base_stats/tentacruel.asm diff --git a/data/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm similarity index 100% rename from data/base_stats/togepi.asm rename to data/pokemon/base_stats/togepi.asm diff --git a/data/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm similarity index 100% rename from data/base_stats/togetic.asm rename to data/pokemon/base_stats/togetic.asm diff --git a/data/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm similarity index 100% rename from data/base_stats/totodile.asm rename to data/pokemon/base_stats/totodile.asm diff --git a/data/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm similarity index 100% rename from data/base_stats/typhlosion.asm rename to data/pokemon/base_stats/typhlosion.asm diff --git a/data/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm similarity index 100% rename from data/base_stats/tyranitar.asm rename to data/pokemon/base_stats/tyranitar.asm diff --git a/data/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm similarity index 100% rename from data/base_stats/tyrogue.asm rename to data/pokemon/base_stats/tyrogue.asm diff --git a/data/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm similarity index 100% rename from data/base_stats/umbreon.asm rename to data/pokemon/base_stats/umbreon.asm diff --git a/data/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm similarity index 100% rename from data/base_stats/unown.asm rename to data/pokemon/base_stats/unown.asm diff --git a/data/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm similarity index 100% rename from data/base_stats/ursaring.asm rename to data/pokemon/base_stats/ursaring.asm diff --git a/data/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm similarity index 100% rename from data/base_stats/vaporeon.asm rename to data/pokemon/base_stats/vaporeon.asm diff --git a/data/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm similarity index 100% rename from data/base_stats/venomoth.asm rename to data/pokemon/base_stats/venomoth.asm diff --git a/data/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm similarity index 100% rename from data/base_stats/venonat.asm rename to data/pokemon/base_stats/venonat.asm diff --git a/data/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm similarity index 100% rename from data/base_stats/venusaur.asm rename to data/pokemon/base_stats/venusaur.asm diff --git a/data/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm similarity index 100% rename from data/base_stats/victreebel.asm rename to data/pokemon/base_stats/victreebel.asm diff --git a/data/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm similarity index 100% rename from data/base_stats/vileplume.asm rename to data/pokemon/base_stats/vileplume.asm diff --git a/data/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm similarity index 100% rename from data/base_stats/voltorb.asm rename to data/pokemon/base_stats/voltorb.asm diff --git a/data/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm similarity index 100% rename from data/base_stats/vulpix.asm rename to data/pokemon/base_stats/vulpix.asm diff --git a/data/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm similarity index 100% rename from data/base_stats/wartortle.asm rename to data/pokemon/base_stats/wartortle.asm diff --git a/data/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm similarity index 100% rename from data/base_stats/weedle.asm rename to data/pokemon/base_stats/weedle.asm diff --git a/data/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm similarity index 100% rename from data/base_stats/weepinbell.asm rename to data/pokemon/base_stats/weepinbell.asm diff --git a/data/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm similarity index 100% rename from data/base_stats/weezing.asm rename to data/pokemon/base_stats/weezing.asm diff --git a/data/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm similarity index 100% rename from data/base_stats/wigglytuff.asm rename to data/pokemon/base_stats/wigglytuff.asm diff --git a/data/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm similarity index 100% rename from data/base_stats/wobbuffet.asm rename to data/pokemon/base_stats/wobbuffet.asm diff --git a/data/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm similarity index 100% rename from data/base_stats/wooper.asm rename to data/pokemon/base_stats/wooper.asm diff --git a/data/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm similarity index 100% rename from data/base_stats/xatu.asm rename to data/pokemon/base_stats/xatu.asm diff --git a/data/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm similarity index 100% rename from data/base_stats/yanma.asm rename to data/pokemon/base_stats/yanma.asm diff --git a/data/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm similarity index 100% rename from data/base_stats/zapdos.asm rename to data/pokemon/base_stats/zapdos.asm diff --git a/data/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm similarity index 100% rename from data/base_stats/zubat.asm rename to data/pokemon/base_stats/zubat.asm diff --git a/audio/cry_headers.asm b/data/pokemon/cry_headers.asm similarity index 99% rename from audio/cry_headers.asm rename to data/pokemon/cry_headers.asm index 863539dc9..0651fa7f1 100644 --- a/audio/cry_headers.asm +++ b/data/pokemon/cry_headers.asm @@ -1,4 +1,5 @@ -; f2787 +CryHeaders:: ; f2787 +; entries correspond to constants/pokemon_constants.asm ; index, pitch, length BulbasaurCryHeader: cry_header CRY_BULBASAUR, $080, $081 IvysaurCryHeader: cry_header CRY_BULBASAUR, $020, $100 diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm new file mode 100644 index 000000000..92b9c6b06 --- /dev/null +++ b/data/pokemon/dex_entries.asm @@ -0,0 +1,272 @@ +INCLUDE "includes.asm" + + +SECTION "Pokedex Entries 001-064", ROMX + +PokedexEntries1:: +BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bulbasaur.asm" +IvysaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ivysaur.asm" +VenusaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venusaur.asm" +CharmanderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charmander.asm" +CharmeleonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charmeleon.asm" +CharizardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charizard.asm" +SquirtlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/squirtle.asm" +WartortlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/wartortle.asm" +BlastoisePokedexEntry:: INCLUDE "data/pokemon/dex_entries/blastoise.asm" +CaterpiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/caterpie.asm" +MetapodPokedexEntry:: INCLUDE "data/pokemon/dex_entries/metapod.asm" +ButterfreePokedexEntry:: INCLUDE "data/pokemon/dex_entries/butterfree.asm" +WeedlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/weedle.asm" +KakunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kakuna.asm" +BeedrillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/beedrill.asm" +PidgeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgey.asm" +PidgeottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgeotto.asm" +PidgeotPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgeot.asm" +RattataPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rattata.asm" +RaticatePokedexEntry:: INCLUDE "data/pokemon/dex_entries/raticate.asm" +SpearowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/spearow.asm" +FearowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/fearow.asm" +EkansPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ekans.asm" +ArbokPokedexEntry:: INCLUDE "data/pokemon/dex_entries/arbok.asm" +PikachuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pikachu.asm" +RaichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raichu.asm" +SandshrewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandshrew.asm" +SandslashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandslash.asm" +NidoranFPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoran_f.asm" +NidorinaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidorina.asm" +NidoqueenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoqueen.asm" +NidoranMPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoran_m.asm" +NidorinoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidorino.asm" +NidokingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoking.asm" +ClefairyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefairy.asm" +ClefablePokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefable.asm" +VulpixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vulpix.asm" +NinetalesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ninetales.asm" +JigglypuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jigglypuff.asm" +WigglytuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wigglytuff.asm" +ZubatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/zubat.asm" +GolbatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golbat.asm" +OddishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/oddish.asm" +GloomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gloom.asm" +VileplumePokedexEntry:: INCLUDE "data/pokemon/dex_entries/vileplume.asm" +ParasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/paras.asm" +ParasectPokedexEntry:: INCLUDE "data/pokemon/dex_entries/parasect.asm" +VenonatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venonat.asm" +VenomothPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venomoth.asm" +DiglettPokedexEntry:: INCLUDE "data/pokemon/dex_entries/diglett.asm" +DugtrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dugtrio.asm" +MeowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/meowth.asm" +PersianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/persian.asm" +PsyduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/psyduck.asm" +GolduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golduck.asm" +MankeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mankey.asm" +PrimeapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/primeape.asm" +GrowlithePokedexEntry:: INCLUDE "data/pokemon/dex_entries/growlithe.asm" +ArcaninePokedexEntry:: INCLUDE "data/pokemon/dex_entries/arcanine.asm" +PoliwagPokedexEntry:: INCLUDE "data/pokemon/dex_entries/poliwag.asm" +PoliwhirlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/poliwhirl.asm" +PoliwrathPokedexEntry:: INCLUDE "data/pokemon/dex_entries/poliwrath.asm" +AbraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/abra.asm" +KadabraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kadabra.asm" + + +SECTION "Pokedex Entries 065-128", ROMX + +PokedexEntries2:: +AlakazamPokedexEntry:: INCLUDE "data/pokemon/dex_entries/alakazam.asm" +MachopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/machop.asm" +MachokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/machoke.asm" +MachampPokedexEntry:: INCLUDE "data/pokemon/dex_entries/machamp.asm" +BellsproutPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bellsprout.asm" +WeepinbellPokedexEntry:: INCLUDE "data/pokemon/dex_entries/weepinbell.asm" +VictreebelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/victreebel.asm" +TentacoolPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tentacool.asm" +TentacruelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tentacruel.asm" +GeodudePokedexEntry:: INCLUDE "data/pokemon/dex_entries/geodude.asm" +GravelerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/graveler.asm" +GolemPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golem.asm" +PonytaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ponyta.asm" +RapidashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rapidash.asm" +SlowpokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowpoke.asm" +SlowbroPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowbro.asm" +MagnemitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnemite.asm" +MagnetonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magneton.asm" +FarfetchDPokedexEntry:: INCLUDE "data/pokemon/dex_entries/farfetch_d.asm" +DoduoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/doduo.asm" +DodrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dodrio.asm" +SeelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seel.asm" +DewgongPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dewgong.asm" +GrimerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/grimer.asm" +MukPokedexEntry:: INCLUDE "data/pokemon/dex_entries/muk.asm" +ShellderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/shellder.asm" +CloysterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cloyster.asm" +GastlyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gastly.asm" +HaunterPokedexEntry:: INCLUDE "data/pokemon/dex_entries/haunter.asm" +GengarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gengar.asm" +OnixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/onix.asm" +DrowzeePokedexEntry:: INCLUDE "data/pokemon/dex_entries/drowzee.asm" +HypnoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hypno.asm" +KrabbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/krabby.asm" +KinglerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kingler.asm" +VoltorbPokedexEntry:: INCLUDE "data/pokemon/dex_entries/voltorb.asm" +ElectrodePokedexEntry:: INCLUDE "data/pokemon/dex_entries/electrode.asm" +ExeggcutePokedexEntry:: INCLUDE "data/pokemon/dex_entries/exeggcute.asm" +ExeggutorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/exeggutor.asm" +CubonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/cubone.asm" +MarowakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/marowak.asm" +HitmonleePokedexEntry:: INCLUDE "data/pokemon/dex_entries/hitmonlee.asm" +HitmonchanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hitmonchan.asm" +LickitungPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lickitung.asm" +KoffingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/koffing.asm" +WeezingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/weezing.asm" +RhyhornPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rhyhorn.asm" +RhydonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rhydon.asm" +ChanseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/chansey.asm" +TangelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tangela.asm" +KangaskhanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kangaskhan.asm" +HorseaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/horsea.asm" +SeadraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seadra.asm" +GoldeenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/goldeen.asm" +SeakingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seaking.asm" +StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/staryu.asm" +StarmiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/starmie.asm" +MrMimePokedexEntry:: INCLUDE "data/pokemon/dex_entries/mr__mime.asm" +ScytherPokedexEntry:: INCLUDE "data/pokemon/dex_entries/scyther.asm" +JynxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jynx.asm" +ElectabuzzPokedexEntry:: INCLUDE "data/pokemon/dex_entries/electabuzz.asm" +MagmarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magmar.asm" +PinsirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pinsir.asm" +TaurosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tauros.asm" + + +SECTION "Pokedex Entries 129-192", ROMX + +PokedexEntries3:: +MagikarpPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magikarp.asm" +GyaradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gyarados.asm" +LaprasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lapras.asm" +DittoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ditto.asm" +EeveePokedexEntry:: INCLUDE "data/pokemon/dex_entries/eevee.asm" +VaporeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vaporeon.asm" +JolteonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jolteon.asm" +FlareonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/flareon.asm" +PorygonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/porygon.asm" +OmanytePokedexEntry:: INCLUDE "data/pokemon/dex_entries/omanyte.asm" +OmastarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/omastar.asm" +KabutoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kabuto.asm" +KabutopsPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kabutops.asm" +AerodactylPokedexEntry:: INCLUDE "data/pokemon/dex_entries/aerodactyl.asm" +SnorlaxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/snorlax.asm" +ArticunoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/articuno.asm" +ZapdosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/zapdos.asm" +MoltresPokedexEntry:: INCLUDE "data/pokemon/dex_entries/moltres.asm" +DratiniPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dratini.asm" +DragonairPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dragonair.asm" +DragonitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/dragonite.asm" +MewtwoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mewtwo.asm" +MewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mew.asm" +ChikoritaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/chikorita.asm" +BayleefPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bayleef.asm" +MeganiumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/meganium.asm" +CyndaquilPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cyndaquil.asm" +QuilavaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/quilava.asm" +TyphlosionPokedexEntry:: INCLUDE "data/pokemon/dex_entries/typhlosion.asm" +TotodilePokedexEntry:: INCLUDE "data/pokemon/dex_entries/totodile.asm" +CroconawPokedexEntry:: INCLUDE "data/pokemon/dex_entries/croconaw.asm" +FeraligatrPokedexEntry:: INCLUDE "data/pokemon/dex_entries/feraligatr.asm" +SentretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sentret.asm" +FurretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/furret.asm" +HoothootPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hoothoot.asm" +NoctowlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/noctowl.asm" +LedybaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ledyba.asm" +LedianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ledian.asm" +SpinarakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/spinarak.asm" +AriadosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ariados.asm" +CrobatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/crobat.asm" +ChinchouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/chinchou.asm" +LanturnPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lanturn.asm" +PichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pichu.asm" +CleffaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cleffa.asm" +IgglybuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/igglybuff.asm" +TogepiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togepi.asm" +TogeticPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togetic.asm" +NatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/natu.asm" +XatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/xatu.asm" +MareepPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mareep.asm" +FlaaffyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/flaaffy.asm" +AmpharosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ampharos.asm" +BellossomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bellossom.asm" +MarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/marill.asm" +AzumarillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/azumarill.asm" +SudowoodoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sudowoodo.asm" +PolitoedPokedexEntry:: INCLUDE "data/pokemon/dex_entries/politoed.asm" +HoppipPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hoppip.asm" +SkiploomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/skiploom.asm" +JumpluffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jumpluff.asm" +AipomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/aipom.asm" +SunkernPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunkern.asm" +SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunflora.asm" + + +SECTION "Pokedex Entries 193-251", ROMX + +PokedexEntries4:: +YanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/yanma.asm" +WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wooper.asm" +QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/quagsire.asm" +EspeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/espeon.asm" +UmbreonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/umbreon.asm" +MurkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/murkrow.asm" +SlowkingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowking.asm" +MisdreavusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/misdreavus.asm" +UnownPokedexEntry:: INCLUDE "data/pokemon/dex_entries/unown.asm" +WobbuffetPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wobbuffet.asm" +GirafarigPokedexEntry:: INCLUDE "data/pokemon/dex_entries/girafarig.asm" +PinecoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pineco.asm" +ForretressPokedexEntry:: INCLUDE "data/pokemon/dex_entries/forretress.asm" +DunsparcePokedexEntry:: INCLUDE "data/pokemon/dex_entries/dunsparce.asm" +GligarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gligar.asm" +SteelixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/steelix.asm" +SnubbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/snubbull.asm" +GranbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/granbull.asm" +QwilfishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/qwilfish.asm" +ScizorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/scizor.asm" +ShucklePokedexEntry:: INCLUDE "data/pokemon/dex_entries/shuckle.asm" +HeracrossPokedexEntry:: INCLUDE "data/pokemon/dex_entries/heracross.asm" +SneaselPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sneasel.asm" +TeddiursaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/teddiursa.asm" +UrsaringPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ursaring.asm" +SlugmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slugma.asm" +MagcargoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magcargo.asm" +SwinubPokedexEntry:: INCLUDE "data/pokemon/dex_entries/swinub.asm" +PiloswinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/piloswine.asm" +CorsolaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/corsola.asm" +RemoraidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/remoraid.asm" +OctilleryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/octillery.asm" +DelibirdPokedexEntry:: INCLUDE "data/pokemon/dex_entries/delibird.asm" +MantinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/mantine.asm" +SkarmoryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/skarmory.asm" +HoundourPokedexEntry:: INCLUDE "data/pokemon/dex_entries/houndour.asm" +HoundoomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/houndoom.asm" +KingdraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kingdra.asm" +PhanpyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/phanpy.asm" +DonphanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/donphan.asm" +Porygon2PokedexEntry:: INCLUDE "data/pokemon/dex_entries/porygon2.asm" +StantlerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/stantler.asm" +SmearglePokedexEntry:: INCLUDE "data/pokemon/dex_entries/smeargle.asm" +TyroguePokedexEntry:: INCLUDE "data/pokemon/dex_entries/tyrogue.asm" +HitmontopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hitmontop.asm" +SmoochumPokedexEntry:: INCLUDE "data/pokemon/dex_entries/smoochum.asm" +ElekidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/elekid.asm" +MagbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magby.asm" +MiltankPokedexEntry:: INCLUDE "data/pokemon/dex_entries/miltank.asm" +BlisseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/blissey.asm" +RaikouPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raikou.asm" +EnteiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/entei.asm" +SuicunePokedexEntry:: INCLUDE "data/pokemon/dex_entries/suicune.asm" +LarvitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/larvitar.asm" +PupitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupitar.asm" +TyranitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tyranitar.asm" +LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lugia.asm" +HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ho_oh.asm" +CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/celebi.asm" diff --git a/data/pokedex/entries/abra.asm b/data/pokemon/dex_entries/abra.asm similarity index 100% rename from data/pokedex/entries/abra.asm rename to data/pokemon/dex_entries/abra.asm diff --git a/data/pokedex/entries/aerodactyl.asm b/data/pokemon/dex_entries/aerodactyl.asm similarity index 100% rename from data/pokedex/entries/aerodactyl.asm rename to data/pokemon/dex_entries/aerodactyl.asm diff --git a/data/pokedex/entries/aipom.asm b/data/pokemon/dex_entries/aipom.asm similarity index 100% rename from data/pokedex/entries/aipom.asm rename to data/pokemon/dex_entries/aipom.asm diff --git a/data/pokedex/entries/alakazam.asm b/data/pokemon/dex_entries/alakazam.asm similarity index 100% rename from data/pokedex/entries/alakazam.asm rename to data/pokemon/dex_entries/alakazam.asm diff --git a/data/pokedex/entries/ampharos.asm b/data/pokemon/dex_entries/ampharos.asm similarity index 100% rename from data/pokedex/entries/ampharos.asm rename to data/pokemon/dex_entries/ampharos.asm diff --git a/data/pokedex/entries/arbok.asm b/data/pokemon/dex_entries/arbok.asm similarity index 100% rename from data/pokedex/entries/arbok.asm rename to data/pokemon/dex_entries/arbok.asm diff --git a/data/pokedex/entries/arcanine.asm b/data/pokemon/dex_entries/arcanine.asm similarity index 100% rename from data/pokedex/entries/arcanine.asm rename to data/pokemon/dex_entries/arcanine.asm diff --git a/data/pokedex/entries/ariados.asm b/data/pokemon/dex_entries/ariados.asm similarity index 100% rename from data/pokedex/entries/ariados.asm rename to data/pokemon/dex_entries/ariados.asm diff --git a/data/pokedex/entries/articuno.asm b/data/pokemon/dex_entries/articuno.asm similarity index 100% rename from data/pokedex/entries/articuno.asm rename to data/pokemon/dex_entries/articuno.asm diff --git a/data/pokedex/entries/azumarill.asm b/data/pokemon/dex_entries/azumarill.asm similarity index 100% rename from data/pokedex/entries/azumarill.asm rename to data/pokemon/dex_entries/azumarill.asm diff --git a/data/pokedex/entries/bayleef.asm b/data/pokemon/dex_entries/bayleef.asm similarity index 100% rename from data/pokedex/entries/bayleef.asm rename to data/pokemon/dex_entries/bayleef.asm diff --git a/data/pokedex/entries/beedrill.asm b/data/pokemon/dex_entries/beedrill.asm similarity index 100% rename from data/pokedex/entries/beedrill.asm rename to data/pokemon/dex_entries/beedrill.asm diff --git a/data/pokedex/entries/bellossom.asm b/data/pokemon/dex_entries/bellossom.asm similarity index 100% rename from data/pokedex/entries/bellossom.asm rename to data/pokemon/dex_entries/bellossom.asm diff --git a/data/pokedex/entries/bellsprout.asm b/data/pokemon/dex_entries/bellsprout.asm similarity index 100% rename from data/pokedex/entries/bellsprout.asm rename to data/pokemon/dex_entries/bellsprout.asm diff --git a/data/pokedex/entries/blastoise.asm b/data/pokemon/dex_entries/blastoise.asm similarity index 100% rename from data/pokedex/entries/blastoise.asm rename to data/pokemon/dex_entries/blastoise.asm diff --git a/data/pokedex/entries/blissey.asm b/data/pokemon/dex_entries/blissey.asm similarity index 100% rename from data/pokedex/entries/blissey.asm rename to data/pokemon/dex_entries/blissey.asm diff --git a/data/pokedex/entries/bulbasaur.asm b/data/pokemon/dex_entries/bulbasaur.asm similarity index 100% rename from data/pokedex/entries/bulbasaur.asm rename to data/pokemon/dex_entries/bulbasaur.asm diff --git a/data/pokedex/entries/butterfree.asm b/data/pokemon/dex_entries/butterfree.asm similarity index 100% rename from data/pokedex/entries/butterfree.asm rename to data/pokemon/dex_entries/butterfree.asm diff --git a/data/pokedex/entries/caterpie.asm b/data/pokemon/dex_entries/caterpie.asm similarity index 100% rename from data/pokedex/entries/caterpie.asm rename to data/pokemon/dex_entries/caterpie.asm diff --git a/data/pokedex/entries/celebi.asm b/data/pokemon/dex_entries/celebi.asm similarity index 100% rename from data/pokedex/entries/celebi.asm rename to data/pokemon/dex_entries/celebi.asm diff --git a/data/pokedex/entries/chansey.asm b/data/pokemon/dex_entries/chansey.asm similarity index 100% rename from data/pokedex/entries/chansey.asm rename to data/pokemon/dex_entries/chansey.asm diff --git a/data/pokedex/entries/charizard.asm b/data/pokemon/dex_entries/charizard.asm similarity index 100% rename from data/pokedex/entries/charizard.asm rename to data/pokemon/dex_entries/charizard.asm diff --git a/data/pokedex/entries/charmander.asm b/data/pokemon/dex_entries/charmander.asm similarity index 100% rename from data/pokedex/entries/charmander.asm rename to data/pokemon/dex_entries/charmander.asm diff --git a/data/pokedex/entries/charmeleon.asm b/data/pokemon/dex_entries/charmeleon.asm similarity index 100% rename from data/pokedex/entries/charmeleon.asm rename to data/pokemon/dex_entries/charmeleon.asm diff --git a/data/pokedex/entries/chikorita.asm b/data/pokemon/dex_entries/chikorita.asm similarity index 100% rename from data/pokedex/entries/chikorita.asm rename to data/pokemon/dex_entries/chikorita.asm diff --git a/data/pokedex/entries/chinchou.asm b/data/pokemon/dex_entries/chinchou.asm similarity index 100% rename from data/pokedex/entries/chinchou.asm rename to data/pokemon/dex_entries/chinchou.asm diff --git a/data/pokedex/entries/clefable.asm b/data/pokemon/dex_entries/clefable.asm similarity index 100% rename from data/pokedex/entries/clefable.asm rename to data/pokemon/dex_entries/clefable.asm diff --git a/data/pokedex/entries/clefairy.asm b/data/pokemon/dex_entries/clefairy.asm similarity index 100% rename from data/pokedex/entries/clefairy.asm rename to data/pokemon/dex_entries/clefairy.asm diff --git a/data/pokedex/entries/cleffa.asm b/data/pokemon/dex_entries/cleffa.asm similarity index 100% rename from data/pokedex/entries/cleffa.asm rename to data/pokemon/dex_entries/cleffa.asm diff --git a/data/pokedex/entries/cloyster.asm b/data/pokemon/dex_entries/cloyster.asm similarity index 100% rename from data/pokedex/entries/cloyster.asm rename to data/pokemon/dex_entries/cloyster.asm diff --git a/data/pokedex/entries/corsola.asm b/data/pokemon/dex_entries/corsola.asm similarity index 100% rename from data/pokedex/entries/corsola.asm rename to data/pokemon/dex_entries/corsola.asm diff --git a/data/pokedex/entries/crobat.asm b/data/pokemon/dex_entries/crobat.asm similarity index 100% rename from data/pokedex/entries/crobat.asm rename to data/pokemon/dex_entries/crobat.asm diff --git a/data/pokedex/entries/croconaw.asm b/data/pokemon/dex_entries/croconaw.asm similarity index 100% rename from data/pokedex/entries/croconaw.asm rename to data/pokemon/dex_entries/croconaw.asm diff --git a/data/pokedex/entries/cubone.asm b/data/pokemon/dex_entries/cubone.asm similarity index 100% rename from data/pokedex/entries/cubone.asm rename to data/pokemon/dex_entries/cubone.asm diff --git a/data/pokedex/entries/cyndaquil.asm b/data/pokemon/dex_entries/cyndaquil.asm similarity index 100% rename from data/pokedex/entries/cyndaquil.asm rename to data/pokemon/dex_entries/cyndaquil.asm diff --git a/data/pokedex/entries/delibird.asm b/data/pokemon/dex_entries/delibird.asm similarity index 100% rename from data/pokedex/entries/delibird.asm rename to data/pokemon/dex_entries/delibird.asm diff --git a/data/pokedex/entries/dewgong.asm b/data/pokemon/dex_entries/dewgong.asm similarity index 100% rename from data/pokedex/entries/dewgong.asm rename to data/pokemon/dex_entries/dewgong.asm diff --git a/data/pokedex/entries/diglett.asm b/data/pokemon/dex_entries/diglett.asm similarity index 100% rename from data/pokedex/entries/diglett.asm rename to data/pokemon/dex_entries/diglett.asm diff --git a/data/pokedex/entries/ditto.asm b/data/pokemon/dex_entries/ditto.asm similarity index 100% rename from data/pokedex/entries/ditto.asm rename to data/pokemon/dex_entries/ditto.asm diff --git a/data/pokedex/entries/dodrio.asm b/data/pokemon/dex_entries/dodrio.asm similarity index 100% rename from data/pokedex/entries/dodrio.asm rename to data/pokemon/dex_entries/dodrio.asm diff --git a/data/pokedex/entries/doduo.asm b/data/pokemon/dex_entries/doduo.asm similarity index 100% rename from data/pokedex/entries/doduo.asm rename to data/pokemon/dex_entries/doduo.asm diff --git a/data/pokedex/entries/donphan.asm b/data/pokemon/dex_entries/donphan.asm similarity index 100% rename from data/pokedex/entries/donphan.asm rename to data/pokemon/dex_entries/donphan.asm diff --git a/data/pokedex/entries/dragonair.asm b/data/pokemon/dex_entries/dragonair.asm similarity index 100% rename from data/pokedex/entries/dragonair.asm rename to data/pokemon/dex_entries/dragonair.asm diff --git a/data/pokedex/entries/dragonite.asm b/data/pokemon/dex_entries/dragonite.asm similarity index 100% rename from data/pokedex/entries/dragonite.asm rename to data/pokemon/dex_entries/dragonite.asm diff --git a/data/pokedex/entries/dratini.asm b/data/pokemon/dex_entries/dratini.asm similarity index 100% rename from data/pokedex/entries/dratini.asm rename to data/pokemon/dex_entries/dratini.asm diff --git a/data/pokedex/entries/drowzee.asm b/data/pokemon/dex_entries/drowzee.asm similarity index 100% rename from data/pokedex/entries/drowzee.asm rename to data/pokemon/dex_entries/drowzee.asm diff --git a/data/pokedex/entries/dugtrio.asm b/data/pokemon/dex_entries/dugtrio.asm similarity index 100% rename from data/pokedex/entries/dugtrio.asm rename to data/pokemon/dex_entries/dugtrio.asm diff --git a/data/pokedex/entries/dunsparce.asm b/data/pokemon/dex_entries/dunsparce.asm similarity index 100% rename from data/pokedex/entries/dunsparce.asm rename to data/pokemon/dex_entries/dunsparce.asm diff --git a/data/pokedex/entries/eevee.asm b/data/pokemon/dex_entries/eevee.asm similarity index 100% rename from data/pokedex/entries/eevee.asm rename to data/pokemon/dex_entries/eevee.asm diff --git a/data/pokedex/entries/ekans.asm b/data/pokemon/dex_entries/ekans.asm similarity index 100% rename from data/pokedex/entries/ekans.asm rename to data/pokemon/dex_entries/ekans.asm diff --git a/data/pokedex/entries/electabuzz.asm b/data/pokemon/dex_entries/electabuzz.asm similarity index 100% rename from data/pokedex/entries/electabuzz.asm rename to data/pokemon/dex_entries/electabuzz.asm diff --git a/data/pokedex/entries/electrode.asm b/data/pokemon/dex_entries/electrode.asm similarity index 100% rename from data/pokedex/entries/electrode.asm rename to data/pokemon/dex_entries/electrode.asm diff --git a/data/pokedex/entries/elekid.asm b/data/pokemon/dex_entries/elekid.asm similarity index 100% rename from data/pokedex/entries/elekid.asm rename to data/pokemon/dex_entries/elekid.asm diff --git a/data/pokedex/entries/entei.asm b/data/pokemon/dex_entries/entei.asm similarity index 100% rename from data/pokedex/entries/entei.asm rename to data/pokemon/dex_entries/entei.asm diff --git a/data/pokedex/entries/espeon.asm b/data/pokemon/dex_entries/espeon.asm similarity index 100% rename from data/pokedex/entries/espeon.asm rename to data/pokemon/dex_entries/espeon.asm diff --git a/data/pokedex/entries/exeggcute.asm b/data/pokemon/dex_entries/exeggcute.asm similarity index 100% rename from data/pokedex/entries/exeggcute.asm rename to data/pokemon/dex_entries/exeggcute.asm diff --git a/data/pokedex/entries/exeggutor.asm b/data/pokemon/dex_entries/exeggutor.asm similarity index 100% rename from data/pokedex/entries/exeggutor.asm rename to data/pokemon/dex_entries/exeggutor.asm diff --git a/data/pokedex/entries/farfetch_d.asm b/data/pokemon/dex_entries/farfetch_d.asm similarity index 100% rename from data/pokedex/entries/farfetch_d.asm rename to data/pokemon/dex_entries/farfetch_d.asm diff --git a/data/pokedex/entries/fearow.asm b/data/pokemon/dex_entries/fearow.asm similarity index 100% rename from data/pokedex/entries/fearow.asm rename to data/pokemon/dex_entries/fearow.asm diff --git a/data/pokedex/entries/feraligatr.asm b/data/pokemon/dex_entries/feraligatr.asm similarity index 100% rename from data/pokedex/entries/feraligatr.asm rename to data/pokemon/dex_entries/feraligatr.asm diff --git a/data/pokedex/entries/flaaffy.asm b/data/pokemon/dex_entries/flaaffy.asm similarity index 100% rename from data/pokedex/entries/flaaffy.asm rename to data/pokemon/dex_entries/flaaffy.asm diff --git a/data/pokedex/entries/flareon.asm b/data/pokemon/dex_entries/flareon.asm similarity index 100% rename from data/pokedex/entries/flareon.asm rename to data/pokemon/dex_entries/flareon.asm diff --git a/data/pokedex/entries/forretress.asm b/data/pokemon/dex_entries/forretress.asm similarity index 100% rename from data/pokedex/entries/forretress.asm rename to data/pokemon/dex_entries/forretress.asm diff --git a/data/pokedex/entries/furret.asm b/data/pokemon/dex_entries/furret.asm similarity index 100% rename from data/pokedex/entries/furret.asm rename to data/pokemon/dex_entries/furret.asm diff --git a/data/pokedex/entries/gastly.asm b/data/pokemon/dex_entries/gastly.asm similarity index 100% rename from data/pokedex/entries/gastly.asm rename to data/pokemon/dex_entries/gastly.asm diff --git a/data/pokedex/entries/gengar.asm b/data/pokemon/dex_entries/gengar.asm similarity index 100% rename from data/pokedex/entries/gengar.asm rename to data/pokemon/dex_entries/gengar.asm diff --git a/data/pokedex/entries/geodude.asm b/data/pokemon/dex_entries/geodude.asm similarity index 100% rename from data/pokedex/entries/geodude.asm rename to data/pokemon/dex_entries/geodude.asm diff --git a/data/pokedex/entries/girafarig.asm b/data/pokemon/dex_entries/girafarig.asm similarity index 100% rename from data/pokedex/entries/girafarig.asm rename to data/pokemon/dex_entries/girafarig.asm diff --git a/data/pokedex/entries/gligar.asm b/data/pokemon/dex_entries/gligar.asm similarity index 100% rename from data/pokedex/entries/gligar.asm rename to data/pokemon/dex_entries/gligar.asm diff --git a/data/pokedex/entries/gloom.asm b/data/pokemon/dex_entries/gloom.asm similarity index 100% rename from data/pokedex/entries/gloom.asm rename to data/pokemon/dex_entries/gloom.asm diff --git a/data/pokedex/entries/golbat.asm b/data/pokemon/dex_entries/golbat.asm similarity index 100% rename from data/pokedex/entries/golbat.asm rename to data/pokemon/dex_entries/golbat.asm diff --git a/data/pokedex/entries/goldeen.asm b/data/pokemon/dex_entries/goldeen.asm similarity index 100% rename from data/pokedex/entries/goldeen.asm rename to data/pokemon/dex_entries/goldeen.asm diff --git a/data/pokedex/entries/golduck.asm b/data/pokemon/dex_entries/golduck.asm similarity index 100% rename from data/pokedex/entries/golduck.asm rename to data/pokemon/dex_entries/golduck.asm diff --git a/data/pokedex/entries/golem.asm b/data/pokemon/dex_entries/golem.asm similarity index 100% rename from data/pokedex/entries/golem.asm rename to data/pokemon/dex_entries/golem.asm diff --git a/data/pokedex/entries/granbull.asm b/data/pokemon/dex_entries/granbull.asm similarity index 100% rename from data/pokedex/entries/granbull.asm rename to data/pokemon/dex_entries/granbull.asm diff --git a/data/pokedex/entries/graveler.asm b/data/pokemon/dex_entries/graveler.asm similarity index 100% rename from data/pokedex/entries/graveler.asm rename to data/pokemon/dex_entries/graveler.asm diff --git a/data/pokedex/entries/grimer.asm b/data/pokemon/dex_entries/grimer.asm similarity index 100% rename from data/pokedex/entries/grimer.asm rename to data/pokemon/dex_entries/grimer.asm diff --git a/data/pokedex/entries/growlithe.asm b/data/pokemon/dex_entries/growlithe.asm similarity index 100% rename from data/pokedex/entries/growlithe.asm rename to data/pokemon/dex_entries/growlithe.asm diff --git a/data/pokedex/entries/gyarados.asm b/data/pokemon/dex_entries/gyarados.asm similarity index 100% rename from data/pokedex/entries/gyarados.asm rename to data/pokemon/dex_entries/gyarados.asm diff --git a/data/pokedex/entries/haunter.asm b/data/pokemon/dex_entries/haunter.asm similarity index 100% rename from data/pokedex/entries/haunter.asm rename to data/pokemon/dex_entries/haunter.asm diff --git a/data/pokedex/entries/heracross.asm b/data/pokemon/dex_entries/heracross.asm similarity index 100% rename from data/pokedex/entries/heracross.asm rename to data/pokemon/dex_entries/heracross.asm diff --git a/data/pokedex/entries/hitmonchan.asm b/data/pokemon/dex_entries/hitmonchan.asm similarity index 100% rename from data/pokedex/entries/hitmonchan.asm rename to data/pokemon/dex_entries/hitmonchan.asm diff --git a/data/pokedex/entries/hitmonlee.asm b/data/pokemon/dex_entries/hitmonlee.asm similarity index 100% rename from data/pokedex/entries/hitmonlee.asm rename to data/pokemon/dex_entries/hitmonlee.asm diff --git a/data/pokedex/entries/hitmontop.asm b/data/pokemon/dex_entries/hitmontop.asm similarity index 100% rename from data/pokedex/entries/hitmontop.asm rename to data/pokemon/dex_entries/hitmontop.asm diff --git a/data/pokedex/entries/ho_oh.asm b/data/pokemon/dex_entries/ho_oh.asm similarity index 100% rename from data/pokedex/entries/ho_oh.asm rename to data/pokemon/dex_entries/ho_oh.asm diff --git a/data/pokedex/entries/hoothoot.asm b/data/pokemon/dex_entries/hoothoot.asm similarity index 100% rename from data/pokedex/entries/hoothoot.asm rename to data/pokemon/dex_entries/hoothoot.asm diff --git a/data/pokedex/entries/hoppip.asm b/data/pokemon/dex_entries/hoppip.asm similarity index 100% rename from data/pokedex/entries/hoppip.asm rename to data/pokemon/dex_entries/hoppip.asm diff --git a/data/pokedex/entries/horsea.asm b/data/pokemon/dex_entries/horsea.asm similarity index 100% rename from data/pokedex/entries/horsea.asm rename to data/pokemon/dex_entries/horsea.asm diff --git a/data/pokedex/entries/houndoom.asm b/data/pokemon/dex_entries/houndoom.asm similarity index 100% rename from data/pokedex/entries/houndoom.asm rename to data/pokemon/dex_entries/houndoom.asm diff --git a/data/pokedex/entries/houndour.asm b/data/pokemon/dex_entries/houndour.asm similarity index 100% rename from data/pokedex/entries/houndour.asm rename to data/pokemon/dex_entries/houndour.asm diff --git a/data/pokedex/entries/hypno.asm b/data/pokemon/dex_entries/hypno.asm similarity index 100% rename from data/pokedex/entries/hypno.asm rename to data/pokemon/dex_entries/hypno.asm diff --git a/data/pokedex/entries/igglybuff.asm b/data/pokemon/dex_entries/igglybuff.asm similarity index 100% rename from data/pokedex/entries/igglybuff.asm rename to data/pokemon/dex_entries/igglybuff.asm diff --git a/data/pokedex/entries/ivysaur.asm b/data/pokemon/dex_entries/ivysaur.asm similarity index 100% rename from data/pokedex/entries/ivysaur.asm rename to data/pokemon/dex_entries/ivysaur.asm diff --git a/data/pokedex/entries/jigglypuff.asm b/data/pokemon/dex_entries/jigglypuff.asm similarity index 100% rename from data/pokedex/entries/jigglypuff.asm rename to data/pokemon/dex_entries/jigglypuff.asm diff --git a/data/pokedex/entries/jolteon.asm b/data/pokemon/dex_entries/jolteon.asm similarity index 100% rename from data/pokedex/entries/jolteon.asm rename to data/pokemon/dex_entries/jolteon.asm diff --git a/data/pokedex/entries/jumpluff.asm b/data/pokemon/dex_entries/jumpluff.asm similarity index 100% rename from data/pokedex/entries/jumpluff.asm rename to data/pokemon/dex_entries/jumpluff.asm diff --git a/data/pokedex/entries/jynx.asm b/data/pokemon/dex_entries/jynx.asm similarity index 100% rename from data/pokedex/entries/jynx.asm rename to data/pokemon/dex_entries/jynx.asm diff --git a/data/pokedex/entries/kabuto.asm b/data/pokemon/dex_entries/kabuto.asm similarity index 100% rename from data/pokedex/entries/kabuto.asm rename to data/pokemon/dex_entries/kabuto.asm diff --git a/data/pokedex/entries/kabutops.asm b/data/pokemon/dex_entries/kabutops.asm similarity index 100% rename from data/pokedex/entries/kabutops.asm rename to data/pokemon/dex_entries/kabutops.asm diff --git a/data/pokedex/entries/kadabra.asm b/data/pokemon/dex_entries/kadabra.asm similarity index 100% rename from data/pokedex/entries/kadabra.asm rename to data/pokemon/dex_entries/kadabra.asm diff --git a/data/pokedex/entries/kakuna.asm b/data/pokemon/dex_entries/kakuna.asm similarity index 100% rename from data/pokedex/entries/kakuna.asm rename to data/pokemon/dex_entries/kakuna.asm diff --git a/data/pokedex/entries/kangaskhan.asm b/data/pokemon/dex_entries/kangaskhan.asm similarity index 100% rename from data/pokedex/entries/kangaskhan.asm rename to data/pokemon/dex_entries/kangaskhan.asm diff --git a/data/pokedex/entries/kingdra.asm b/data/pokemon/dex_entries/kingdra.asm similarity index 100% rename from data/pokedex/entries/kingdra.asm rename to data/pokemon/dex_entries/kingdra.asm diff --git a/data/pokedex/entries/kingler.asm b/data/pokemon/dex_entries/kingler.asm similarity index 100% rename from data/pokedex/entries/kingler.asm rename to data/pokemon/dex_entries/kingler.asm diff --git a/data/pokedex/entries/koffing.asm b/data/pokemon/dex_entries/koffing.asm similarity index 100% rename from data/pokedex/entries/koffing.asm rename to data/pokemon/dex_entries/koffing.asm diff --git a/data/pokedex/entries/krabby.asm b/data/pokemon/dex_entries/krabby.asm similarity index 100% rename from data/pokedex/entries/krabby.asm rename to data/pokemon/dex_entries/krabby.asm diff --git a/data/pokedex/entries/lanturn.asm b/data/pokemon/dex_entries/lanturn.asm similarity index 100% rename from data/pokedex/entries/lanturn.asm rename to data/pokemon/dex_entries/lanturn.asm diff --git a/data/pokedex/entries/lapras.asm b/data/pokemon/dex_entries/lapras.asm similarity index 100% rename from data/pokedex/entries/lapras.asm rename to data/pokemon/dex_entries/lapras.asm diff --git a/data/pokedex/entries/larvitar.asm b/data/pokemon/dex_entries/larvitar.asm similarity index 100% rename from data/pokedex/entries/larvitar.asm rename to data/pokemon/dex_entries/larvitar.asm diff --git a/data/pokedex/entries/ledian.asm b/data/pokemon/dex_entries/ledian.asm similarity index 100% rename from data/pokedex/entries/ledian.asm rename to data/pokemon/dex_entries/ledian.asm diff --git a/data/pokedex/entries/ledyba.asm b/data/pokemon/dex_entries/ledyba.asm similarity index 100% rename from data/pokedex/entries/ledyba.asm rename to data/pokemon/dex_entries/ledyba.asm diff --git a/data/pokedex/entries/lickitung.asm b/data/pokemon/dex_entries/lickitung.asm similarity index 100% rename from data/pokedex/entries/lickitung.asm rename to data/pokemon/dex_entries/lickitung.asm diff --git a/data/pokedex/entries/lugia.asm b/data/pokemon/dex_entries/lugia.asm similarity index 100% rename from data/pokedex/entries/lugia.asm rename to data/pokemon/dex_entries/lugia.asm diff --git a/data/pokedex/entries/machamp.asm b/data/pokemon/dex_entries/machamp.asm similarity index 100% rename from data/pokedex/entries/machamp.asm rename to data/pokemon/dex_entries/machamp.asm diff --git a/data/pokedex/entries/machoke.asm b/data/pokemon/dex_entries/machoke.asm similarity index 100% rename from data/pokedex/entries/machoke.asm rename to data/pokemon/dex_entries/machoke.asm diff --git a/data/pokedex/entries/machop.asm b/data/pokemon/dex_entries/machop.asm similarity index 100% rename from data/pokedex/entries/machop.asm rename to data/pokemon/dex_entries/machop.asm diff --git a/data/pokedex/entries/magby.asm b/data/pokemon/dex_entries/magby.asm similarity index 100% rename from data/pokedex/entries/magby.asm rename to data/pokemon/dex_entries/magby.asm diff --git a/data/pokedex/entries/magcargo.asm b/data/pokemon/dex_entries/magcargo.asm similarity index 100% rename from data/pokedex/entries/magcargo.asm rename to data/pokemon/dex_entries/magcargo.asm diff --git a/data/pokedex/entries/magikarp.asm b/data/pokemon/dex_entries/magikarp.asm similarity index 100% rename from data/pokedex/entries/magikarp.asm rename to data/pokemon/dex_entries/magikarp.asm diff --git a/data/pokedex/entries/magmar.asm b/data/pokemon/dex_entries/magmar.asm similarity index 100% rename from data/pokedex/entries/magmar.asm rename to data/pokemon/dex_entries/magmar.asm diff --git a/data/pokedex/entries/magnemite.asm b/data/pokemon/dex_entries/magnemite.asm similarity index 100% rename from data/pokedex/entries/magnemite.asm rename to data/pokemon/dex_entries/magnemite.asm diff --git a/data/pokedex/entries/magneton.asm b/data/pokemon/dex_entries/magneton.asm similarity index 100% rename from data/pokedex/entries/magneton.asm rename to data/pokemon/dex_entries/magneton.asm diff --git a/data/pokedex/entries/mankey.asm b/data/pokemon/dex_entries/mankey.asm similarity index 100% rename from data/pokedex/entries/mankey.asm rename to data/pokemon/dex_entries/mankey.asm diff --git a/data/pokedex/entries/mantine.asm b/data/pokemon/dex_entries/mantine.asm similarity index 100% rename from data/pokedex/entries/mantine.asm rename to data/pokemon/dex_entries/mantine.asm diff --git a/data/pokedex/entries/mareep.asm b/data/pokemon/dex_entries/mareep.asm similarity index 100% rename from data/pokedex/entries/mareep.asm rename to data/pokemon/dex_entries/mareep.asm diff --git a/data/pokedex/entries/marill.asm b/data/pokemon/dex_entries/marill.asm similarity index 100% rename from data/pokedex/entries/marill.asm rename to data/pokemon/dex_entries/marill.asm diff --git a/data/pokedex/entries/marowak.asm b/data/pokemon/dex_entries/marowak.asm similarity index 100% rename from data/pokedex/entries/marowak.asm rename to data/pokemon/dex_entries/marowak.asm diff --git a/data/pokedex/entries/meganium.asm b/data/pokemon/dex_entries/meganium.asm similarity index 100% rename from data/pokedex/entries/meganium.asm rename to data/pokemon/dex_entries/meganium.asm diff --git a/data/pokedex/entries/meowth.asm b/data/pokemon/dex_entries/meowth.asm similarity index 100% rename from data/pokedex/entries/meowth.asm rename to data/pokemon/dex_entries/meowth.asm diff --git a/data/pokedex/entries/metapod.asm b/data/pokemon/dex_entries/metapod.asm similarity index 100% rename from data/pokedex/entries/metapod.asm rename to data/pokemon/dex_entries/metapod.asm diff --git a/data/pokedex/entries/mew.asm b/data/pokemon/dex_entries/mew.asm similarity index 100% rename from data/pokedex/entries/mew.asm rename to data/pokemon/dex_entries/mew.asm diff --git a/data/pokedex/entries/mewtwo.asm b/data/pokemon/dex_entries/mewtwo.asm similarity index 100% rename from data/pokedex/entries/mewtwo.asm rename to data/pokemon/dex_entries/mewtwo.asm diff --git a/data/pokedex/entries/miltank.asm b/data/pokemon/dex_entries/miltank.asm similarity index 100% rename from data/pokedex/entries/miltank.asm rename to data/pokemon/dex_entries/miltank.asm diff --git a/data/pokedex/entries/misdreavus.asm b/data/pokemon/dex_entries/misdreavus.asm similarity index 100% rename from data/pokedex/entries/misdreavus.asm rename to data/pokemon/dex_entries/misdreavus.asm diff --git a/data/pokedex/entries/moltres.asm b/data/pokemon/dex_entries/moltres.asm similarity index 100% rename from data/pokedex/entries/moltres.asm rename to data/pokemon/dex_entries/moltres.asm diff --git a/data/pokedex/entries/mr__mime.asm b/data/pokemon/dex_entries/mr__mime.asm similarity index 100% rename from data/pokedex/entries/mr__mime.asm rename to data/pokemon/dex_entries/mr__mime.asm diff --git a/data/pokedex/entries/muk.asm b/data/pokemon/dex_entries/muk.asm similarity index 100% rename from data/pokedex/entries/muk.asm rename to data/pokemon/dex_entries/muk.asm diff --git a/data/pokedex/entries/murkrow.asm b/data/pokemon/dex_entries/murkrow.asm similarity index 100% rename from data/pokedex/entries/murkrow.asm rename to data/pokemon/dex_entries/murkrow.asm diff --git a/data/pokedex/entries/natu.asm b/data/pokemon/dex_entries/natu.asm similarity index 100% rename from data/pokedex/entries/natu.asm rename to data/pokemon/dex_entries/natu.asm diff --git a/data/pokedex/entries/nidoking.asm b/data/pokemon/dex_entries/nidoking.asm similarity index 100% rename from data/pokedex/entries/nidoking.asm rename to data/pokemon/dex_entries/nidoking.asm diff --git a/data/pokedex/entries/nidoqueen.asm b/data/pokemon/dex_entries/nidoqueen.asm similarity index 100% rename from data/pokedex/entries/nidoqueen.asm rename to data/pokemon/dex_entries/nidoqueen.asm diff --git a/data/pokedex/entries/nidoran_f.asm b/data/pokemon/dex_entries/nidoran_f.asm similarity index 100% rename from data/pokedex/entries/nidoran_f.asm rename to data/pokemon/dex_entries/nidoran_f.asm diff --git a/data/pokedex/entries/nidoran_m.asm b/data/pokemon/dex_entries/nidoran_m.asm similarity index 100% rename from data/pokedex/entries/nidoran_m.asm rename to data/pokemon/dex_entries/nidoran_m.asm diff --git a/data/pokedex/entries/nidorina.asm b/data/pokemon/dex_entries/nidorina.asm similarity index 100% rename from data/pokedex/entries/nidorina.asm rename to data/pokemon/dex_entries/nidorina.asm diff --git a/data/pokedex/entries/nidorino.asm b/data/pokemon/dex_entries/nidorino.asm similarity index 100% rename from data/pokedex/entries/nidorino.asm rename to data/pokemon/dex_entries/nidorino.asm diff --git a/data/pokedex/entries/ninetales.asm b/data/pokemon/dex_entries/ninetales.asm similarity index 100% rename from data/pokedex/entries/ninetales.asm rename to data/pokemon/dex_entries/ninetales.asm diff --git a/data/pokedex/entries/noctowl.asm b/data/pokemon/dex_entries/noctowl.asm similarity index 100% rename from data/pokedex/entries/noctowl.asm rename to data/pokemon/dex_entries/noctowl.asm diff --git a/data/pokedex/entries/octillery.asm b/data/pokemon/dex_entries/octillery.asm similarity index 100% rename from data/pokedex/entries/octillery.asm rename to data/pokemon/dex_entries/octillery.asm diff --git a/data/pokedex/entries/oddish.asm b/data/pokemon/dex_entries/oddish.asm similarity index 100% rename from data/pokedex/entries/oddish.asm rename to data/pokemon/dex_entries/oddish.asm diff --git a/data/pokedex/entries/omanyte.asm b/data/pokemon/dex_entries/omanyte.asm similarity index 100% rename from data/pokedex/entries/omanyte.asm rename to data/pokemon/dex_entries/omanyte.asm diff --git a/data/pokedex/entries/omastar.asm b/data/pokemon/dex_entries/omastar.asm similarity index 100% rename from data/pokedex/entries/omastar.asm rename to data/pokemon/dex_entries/omastar.asm diff --git a/data/pokedex/entries/onix.asm b/data/pokemon/dex_entries/onix.asm similarity index 100% rename from data/pokedex/entries/onix.asm rename to data/pokemon/dex_entries/onix.asm diff --git a/data/pokedex/entries/paras.asm b/data/pokemon/dex_entries/paras.asm similarity index 100% rename from data/pokedex/entries/paras.asm rename to data/pokemon/dex_entries/paras.asm diff --git a/data/pokedex/entries/parasect.asm b/data/pokemon/dex_entries/parasect.asm similarity index 100% rename from data/pokedex/entries/parasect.asm rename to data/pokemon/dex_entries/parasect.asm diff --git a/data/pokedex/entries/persian.asm b/data/pokemon/dex_entries/persian.asm similarity index 100% rename from data/pokedex/entries/persian.asm rename to data/pokemon/dex_entries/persian.asm diff --git a/data/pokedex/entries/phanpy.asm b/data/pokemon/dex_entries/phanpy.asm similarity index 100% rename from data/pokedex/entries/phanpy.asm rename to data/pokemon/dex_entries/phanpy.asm diff --git a/data/pokedex/entries/pichu.asm b/data/pokemon/dex_entries/pichu.asm similarity index 100% rename from data/pokedex/entries/pichu.asm rename to data/pokemon/dex_entries/pichu.asm diff --git a/data/pokedex/entries/pidgeot.asm b/data/pokemon/dex_entries/pidgeot.asm similarity index 100% rename from data/pokedex/entries/pidgeot.asm rename to data/pokemon/dex_entries/pidgeot.asm diff --git a/data/pokedex/entries/pidgeotto.asm b/data/pokemon/dex_entries/pidgeotto.asm similarity index 100% rename from data/pokedex/entries/pidgeotto.asm rename to data/pokemon/dex_entries/pidgeotto.asm diff --git a/data/pokedex/entries/pidgey.asm b/data/pokemon/dex_entries/pidgey.asm similarity index 100% rename from data/pokedex/entries/pidgey.asm rename to data/pokemon/dex_entries/pidgey.asm diff --git a/data/pokedex/entries/pikachu.asm b/data/pokemon/dex_entries/pikachu.asm similarity index 100% rename from data/pokedex/entries/pikachu.asm rename to data/pokemon/dex_entries/pikachu.asm diff --git a/data/pokedex/entries/piloswine.asm b/data/pokemon/dex_entries/piloswine.asm similarity index 100% rename from data/pokedex/entries/piloswine.asm rename to data/pokemon/dex_entries/piloswine.asm diff --git a/data/pokedex/entries/pineco.asm b/data/pokemon/dex_entries/pineco.asm similarity index 100% rename from data/pokedex/entries/pineco.asm rename to data/pokemon/dex_entries/pineco.asm diff --git a/data/pokedex/entries/pinsir.asm b/data/pokemon/dex_entries/pinsir.asm similarity index 100% rename from data/pokedex/entries/pinsir.asm rename to data/pokemon/dex_entries/pinsir.asm diff --git a/data/pokedex/entries/politoed.asm b/data/pokemon/dex_entries/politoed.asm similarity index 100% rename from data/pokedex/entries/politoed.asm rename to data/pokemon/dex_entries/politoed.asm diff --git a/data/pokedex/entries/poliwag.asm b/data/pokemon/dex_entries/poliwag.asm similarity index 100% rename from data/pokedex/entries/poliwag.asm rename to data/pokemon/dex_entries/poliwag.asm diff --git a/data/pokedex/entries/poliwhirl.asm b/data/pokemon/dex_entries/poliwhirl.asm similarity index 100% rename from data/pokedex/entries/poliwhirl.asm rename to data/pokemon/dex_entries/poliwhirl.asm diff --git a/data/pokedex/entries/poliwrath.asm b/data/pokemon/dex_entries/poliwrath.asm similarity index 100% rename from data/pokedex/entries/poliwrath.asm rename to data/pokemon/dex_entries/poliwrath.asm diff --git a/data/pokedex/entries/ponyta.asm b/data/pokemon/dex_entries/ponyta.asm similarity index 100% rename from data/pokedex/entries/ponyta.asm rename to data/pokemon/dex_entries/ponyta.asm diff --git a/data/pokedex/entries/porygon.asm b/data/pokemon/dex_entries/porygon.asm similarity index 100% rename from data/pokedex/entries/porygon.asm rename to data/pokemon/dex_entries/porygon.asm diff --git a/data/pokedex/entries/porygon2.asm b/data/pokemon/dex_entries/porygon2.asm similarity index 100% rename from data/pokedex/entries/porygon2.asm rename to data/pokemon/dex_entries/porygon2.asm diff --git a/data/pokedex/entries/primeape.asm b/data/pokemon/dex_entries/primeape.asm similarity index 100% rename from data/pokedex/entries/primeape.asm rename to data/pokemon/dex_entries/primeape.asm diff --git a/data/pokedex/entries/psyduck.asm b/data/pokemon/dex_entries/psyduck.asm similarity index 100% rename from data/pokedex/entries/psyduck.asm rename to data/pokemon/dex_entries/psyduck.asm diff --git a/data/pokedex/entries/pupitar.asm b/data/pokemon/dex_entries/pupitar.asm similarity index 100% rename from data/pokedex/entries/pupitar.asm rename to data/pokemon/dex_entries/pupitar.asm diff --git a/data/pokedex/entries/quagsire.asm b/data/pokemon/dex_entries/quagsire.asm similarity index 100% rename from data/pokedex/entries/quagsire.asm rename to data/pokemon/dex_entries/quagsire.asm diff --git a/data/pokedex/entries/quilava.asm b/data/pokemon/dex_entries/quilava.asm similarity index 100% rename from data/pokedex/entries/quilava.asm rename to data/pokemon/dex_entries/quilava.asm diff --git a/data/pokedex/entries/qwilfish.asm b/data/pokemon/dex_entries/qwilfish.asm similarity index 100% rename from data/pokedex/entries/qwilfish.asm rename to data/pokemon/dex_entries/qwilfish.asm diff --git a/data/pokedex/entries/raichu.asm b/data/pokemon/dex_entries/raichu.asm similarity index 100% rename from data/pokedex/entries/raichu.asm rename to data/pokemon/dex_entries/raichu.asm diff --git a/data/pokedex/entries/raikou.asm b/data/pokemon/dex_entries/raikou.asm similarity index 100% rename from data/pokedex/entries/raikou.asm rename to data/pokemon/dex_entries/raikou.asm diff --git a/data/pokedex/entries/rapidash.asm b/data/pokemon/dex_entries/rapidash.asm similarity index 100% rename from data/pokedex/entries/rapidash.asm rename to data/pokemon/dex_entries/rapidash.asm diff --git a/data/pokedex/entries/raticate.asm b/data/pokemon/dex_entries/raticate.asm similarity index 100% rename from data/pokedex/entries/raticate.asm rename to data/pokemon/dex_entries/raticate.asm diff --git a/data/pokedex/entries/rattata.asm b/data/pokemon/dex_entries/rattata.asm similarity index 100% rename from data/pokedex/entries/rattata.asm rename to data/pokemon/dex_entries/rattata.asm diff --git a/data/pokedex/entries/remoraid.asm b/data/pokemon/dex_entries/remoraid.asm similarity index 100% rename from data/pokedex/entries/remoraid.asm rename to data/pokemon/dex_entries/remoraid.asm diff --git a/data/pokedex/entries/rhydon.asm b/data/pokemon/dex_entries/rhydon.asm similarity index 100% rename from data/pokedex/entries/rhydon.asm rename to data/pokemon/dex_entries/rhydon.asm diff --git a/data/pokedex/entries/rhyhorn.asm b/data/pokemon/dex_entries/rhyhorn.asm similarity index 100% rename from data/pokedex/entries/rhyhorn.asm rename to data/pokemon/dex_entries/rhyhorn.asm diff --git a/data/pokedex/entries/sandshrew.asm b/data/pokemon/dex_entries/sandshrew.asm similarity index 100% rename from data/pokedex/entries/sandshrew.asm rename to data/pokemon/dex_entries/sandshrew.asm diff --git a/data/pokedex/entries/sandslash.asm b/data/pokemon/dex_entries/sandslash.asm similarity index 100% rename from data/pokedex/entries/sandslash.asm rename to data/pokemon/dex_entries/sandslash.asm diff --git a/data/pokedex/entries/scizor.asm b/data/pokemon/dex_entries/scizor.asm similarity index 100% rename from data/pokedex/entries/scizor.asm rename to data/pokemon/dex_entries/scizor.asm diff --git a/data/pokedex/entries/scyther.asm b/data/pokemon/dex_entries/scyther.asm similarity index 100% rename from data/pokedex/entries/scyther.asm rename to data/pokemon/dex_entries/scyther.asm diff --git a/data/pokedex/entries/seadra.asm b/data/pokemon/dex_entries/seadra.asm similarity index 100% rename from data/pokedex/entries/seadra.asm rename to data/pokemon/dex_entries/seadra.asm diff --git a/data/pokedex/entries/seaking.asm b/data/pokemon/dex_entries/seaking.asm similarity index 100% rename from data/pokedex/entries/seaking.asm rename to data/pokemon/dex_entries/seaking.asm diff --git a/data/pokedex/entries/seel.asm b/data/pokemon/dex_entries/seel.asm similarity index 100% rename from data/pokedex/entries/seel.asm rename to data/pokemon/dex_entries/seel.asm diff --git a/data/pokedex/entries/sentret.asm b/data/pokemon/dex_entries/sentret.asm similarity index 100% rename from data/pokedex/entries/sentret.asm rename to data/pokemon/dex_entries/sentret.asm diff --git a/data/pokedex/entries/shellder.asm b/data/pokemon/dex_entries/shellder.asm similarity index 100% rename from data/pokedex/entries/shellder.asm rename to data/pokemon/dex_entries/shellder.asm diff --git a/data/pokedex/entries/shuckle.asm b/data/pokemon/dex_entries/shuckle.asm similarity index 100% rename from data/pokedex/entries/shuckle.asm rename to data/pokemon/dex_entries/shuckle.asm diff --git a/data/pokedex/entries/skarmory.asm b/data/pokemon/dex_entries/skarmory.asm similarity index 100% rename from data/pokedex/entries/skarmory.asm rename to data/pokemon/dex_entries/skarmory.asm diff --git a/data/pokedex/entries/skiploom.asm b/data/pokemon/dex_entries/skiploom.asm similarity index 100% rename from data/pokedex/entries/skiploom.asm rename to data/pokemon/dex_entries/skiploom.asm diff --git a/data/pokedex/entries/slowbro.asm b/data/pokemon/dex_entries/slowbro.asm similarity index 100% rename from data/pokedex/entries/slowbro.asm rename to data/pokemon/dex_entries/slowbro.asm diff --git a/data/pokedex/entries/slowking.asm b/data/pokemon/dex_entries/slowking.asm similarity index 100% rename from data/pokedex/entries/slowking.asm rename to data/pokemon/dex_entries/slowking.asm diff --git a/data/pokedex/entries/slowpoke.asm b/data/pokemon/dex_entries/slowpoke.asm similarity index 100% rename from data/pokedex/entries/slowpoke.asm rename to data/pokemon/dex_entries/slowpoke.asm diff --git a/data/pokedex/entries/slugma.asm b/data/pokemon/dex_entries/slugma.asm similarity index 100% rename from data/pokedex/entries/slugma.asm rename to data/pokemon/dex_entries/slugma.asm diff --git a/data/pokedex/entries/smeargle.asm b/data/pokemon/dex_entries/smeargle.asm similarity index 100% rename from data/pokedex/entries/smeargle.asm rename to data/pokemon/dex_entries/smeargle.asm diff --git a/data/pokedex/entries/smoochum.asm b/data/pokemon/dex_entries/smoochum.asm similarity index 100% rename from data/pokedex/entries/smoochum.asm rename to data/pokemon/dex_entries/smoochum.asm diff --git a/data/pokedex/entries/sneasel.asm b/data/pokemon/dex_entries/sneasel.asm similarity index 100% rename from data/pokedex/entries/sneasel.asm rename to data/pokemon/dex_entries/sneasel.asm diff --git a/data/pokedex/entries/snorlax.asm b/data/pokemon/dex_entries/snorlax.asm similarity index 100% rename from data/pokedex/entries/snorlax.asm rename to data/pokemon/dex_entries/snorlax.asm diff --git a/data/pokedex/entries/snubbull.asm b/data/pokemon/dex_entries/snubbull.asm similarity index 100% rename from data/pokedex/entries/snubbull.asm rename to data/pokemon/dex_entries/snubbull.asm diff --git a/data/pokedex/entries/spearow.asm b/data/pokemon/dex_entries/spearow.asm similarity index 100% rename from data/pokedex/entries/spearow.asm rename to data/pokemon/dex_entries/spearow.asm diff --git a/data/pokedex/entries/spinarak.asm b/data/pokemon/dex_entries/spinarak.asm similarity index 100% rename from data/pokedex/entries/spinarak.asm rename to data/pokemon/dex_entries/spinarak.asm diff --git a/data/pokedex/entries/squirtle.asm b/data/pokemon/dex_entries/squirtle.asm similarity index 100% rename from data/pokedex/entries/squirtle.asm rename to data/pokemon/dex_entries/squirtle.asm diff --git a/data/pokedex/entries/stantler.asm b/data/pokemon/dex_entries/stantler.asm similarity index 100% rename from data/pokedex/entries/stantler.asm rename to data/pokemon/dex_entries/stantler.asm diff --git a/data/pokedex/entries/starmie.asm b/data/pokemon/dex_entries/starmie.asm similarity index 100% rename from data/pokedex/entries/starmie.asm rename to data/pokemon/dex_entries/starmie.asm diff --git a/data/pokedex/entries/staryu.asm b/data/pokemon/dex_entries/staryu.asm similarity index 100% rename from data/pokedex/entries/staryu.asm rename to data/pokemon/dex_entries/staryu.asm diff --git a/data/pokedex/entries/steelix.asm b/data/pokemon/dex_entries/steelix.asm similarity index 100% rename from data/pokedex/entries/steelix.asm rename to data/pokemon/dex_entries/steelix.asm diff --git a/data/pokedex/entries/sudowoodo.asm b/data/pokemon/dex_entries/sudowoodo.asm similarity index 100% rename from data/pokedex/entries/sudowoodo.asm rename to data/pokemon/dex_entries/sudowoodo.asm diff --git a/data/pokedex/entries/suicune.asm b/data/pokemon/dex_entries/suicune.asm similarity index 100% rename from data/pokedex/entries/suicune.asm rename to data/pokemon/dex_entries/suicune.asm diff --git a/data/pokedex/entries/sunflora.asm b/data/pokemon/dex_entries/sunflora.asm similarity index 100% rename from data/pokedex/entries/sunflora.asm rename to data/pokemon/dex_entries/sunflora.asm diff --git a/data/pokedex/entries/sunkern.asm b/data/pokemon/dex_entries/sunkern.asm similarity index 100% rename from data/pokedex/entries/sunkern.asm rename to data/pokemon/dex_entries/sunkern.asm diff --git a/data/pokedex/entries/swinub.asm b/data/pokemon/dex_entries/swinub.asm similarity index 100% rename from data/pokedex/entries/swinub.asm rename to data/pokemon/dex_entries/swinub.asm diff --git a/data/pokedex/entries/tangela.asm b/data/pokemon/dex_entries/tangela.asm similarity index 100% rename from data/pokedex/entries/tangela.asm rename to data/pokemon/dex_entries/tangela.asm diff --git a/data/pokedex/entries/tauros.asm b/data/pokemon/dex_entries/tauros.asm similarity index 100% rename from data/pokedex/entries/tauros.asm rename to data/pokemon/dex_entries/tauros.asm diff --git a/data/pokedex/entries/teddiursa.asm b/data/pokemon/dex_entries/teddiursa.asm similarity index 100% rename from data/pokedex/entries/teddiursa.asm rename to data/pokemon/dex_entries/teddiursa.asm diff --git a/data/pokedex/entries/tentacool.asm b/data/pokemon/dex_entries/tentacool.asm similarity index 100% rename from data/pokedex/entries/tentacool.asm rename to data/pokemon/dex_entries/tentacool.asm diff --git a/data/pokedex/entries/tentacruel.asm b/data/pokemon/dex_entries/tentacruel.asm similarity index 100% rename from data/pokedex/entries/tentacruel.asm rename to data/pokemon/dex_entries/tentacruel.asm diff --git a/data/pokedex/entries/togepi.asm b/data/pokemon/dex_entries/togepi.asm similarity index 100% rename from data/pokedex/entries/togepi.asm rename to data/pokemon/dex_entries/togepi.asm diff --git a/data/pokedex/entries/togetic.asm b/data/pokemon/dex_entries/togetic.asm similarity index 100% rename from data/pokedex/entries/togetic.asm rename to data/pokemon/dex_entries/togetic.asm diff --git a/data/pokedex/entries/totodile.asm b/data/pokemon/dex_entries/totodile.asm similarity index 100% rename from data/pokedex/entries/totodile.asm rename to data/pokemon/dex_entries/totodile.asm diff --git a/data/pokedex/entries/typhlosion.asm b/data/pokemon/dex_entries/typhlosion.asm similarity index 100% rename from data/pokedex/entries/typhlosion.asm rename to data/pokemon/dex_entries/typhlosion.asm diff --git a/data/pokedex/entries/tyranitar.asm b/data/pokemon/dex_entries/tyranitar.asm similarity index 100% rename from data/pokedex/entries/tyranitar.asm rename to data/pokemon/dex_entries/tyranitar.asm diff --git a/data/pokedex/entries/tyrogue.asm b/data/pokemon/dex_entries/tyrogue.asm similarity index 100% rename from data/pokedex/entries/tyrogue.asm rename to data/pokemon/dex_entries/tyrogue.asm diff --git a/data/pokedex/entries/umbreon.asm b/data/pokemon/dex_entries/umbreon.asm similarity index 100% rename from data/pokedex/entries/umbreon.asm rename to data/pokemon/dex_entries/umbreon.asm diff --git a/data/pokedex/entries/unown.asm b/data/pokemon/dex_entries/unown.asm similarity index 100% rename from data/pokedex/entries/unown.asm rename to data/pokemon/dex_entries/unown.asm diff --git a/data/pokedex/entries/ursaring.asm b/data/pokemon/dex_entries/ursaring.asm similarity index 100% rename from data/pokedex/entries/ursaring.asm rename to data/pokemon/dex_entries/ursaring.asm diff --git a/data/pokedex/entries/vaporeon.asm b/data/pokemon/dex_entries/vaporeon.asm similarity index 100% rename from data/pokedex/entries/vaporeon.asm rename to data/pokemon/dex_entries/vaporeon.asm diff --git a/data/pokedex/entries/venomoth.asm b/data/pokemon/dex_entries/venomoth.asm similarity index 100% rename from data/pokedex/entries/venomoth.asm rename to data/pokemon/dex_entries/venomoth.asm diff --git a/data/pokedex/entries/venonat.asm b/data/pokemon/dex_entries/venonat.asm similarity index 100% rename from data/pokedex/entries/venonat.asm rename to data/pokemon/dex_entries/venonat.asm diff --git a/data/pokedex/entries/venusaur.asm b/data/pokemon/dex_entries/venusaur.asm similarity index 100% rename from data/pokedex/entries/venusaur.asm rename to data/pokemon/dex_entries/venusaur.asm diff --git a/data/pokedex/entries/victreebel.asm b/data/pokemon/dex_entries/victreebel.asm similarity index 100% rename from data/pokedex/entries/victreebel.asm rename to data/pokemon/dex_entries/victreebel.asm diff --git a/data/pokedex/entries/vileplume.asm b/data/pokemon/dex_entries/vileplume.asm similarity index 100% rename from data/pokedex/entries/vileplume.asm rename to data/pokemon/dex_entries/vileplume.asm diff --git a/data/pokedex/entries/voltorb.asm b/data/pokemon/dex_entries/voltorb.asm similarity index 100% rename from data/pokedex/entries/voltorb.asm rename to data/pokemon/dex_entries/voltorb.asm diff --git a/data/pokedex/entries/vulpix.asm b/data/pokemon/dex_entries/vulpix.asm similarity index 100% rename from data/pokedex/entries/vulpix.asm rename to data/pokemon/dex_entries/vulpix.asm diff --git a/data/pokedex/entries/wartortle.asm b/data/pokemon/dex_entries/wartortle.asm similarity index 100% rename from data/pokedex/entries/wartortle.asm rename to data/pokemon/dex_entries/wartortle.asm diff --git a/data/pokedex/entries/weedle.asm b/data/pokemon/dex_entries/weedle.asm similarity index 100% rename from data/pokedex/entries/weedle.asm rename to data/pokemon/dex_entries/weedle.asm diff --git a/data/pokedex/entries/weepinbell.asm b/data/pokemon/dex_entries/weepinbell.asm similarity index 100% rename from data/pokedex/entries/weepinbell.asm rename to data/pokemon/dex_entries/weepinbell.asm diff --git a/data/pokedex/entries/weezing.asm b/data/pokemon/dex_entries/weezing.asm similarity index 100% rename from data/pokedex/entries/weezing.asm rename to data/pokemon/dex_entries/weezing.asm diff --git a/data/pokedex/entries/wigglytuff.asm b/data/pokemon/dex_entries/wigglytuff.asm similarity index 100% rename from data/pokedex/entries/wigglytuff.asm rename to data/pokemon/dex_entries/wigglytuff.asm diff --git a/data/pokedex/entries/wobbuffet.asm b/data/pokemon/dex_entries/wobbuffet.asm similarity index 100% rename from data/pokedex/entries/wobbuffet.asm rename to data/pokemon/dex_entries/wobbuffet.asm diff --git a/data/pokedex/entries/wooper.asm b/data/pokemon/dex_entries/wooper.asm similarity index 100% rename from data/pokedex/entries/wooper.asm rename to data/pokemon/dex_entries/wooper.asm diff --git a/data/pokedex/entries/xatu.asm b/data/pokemon/dex_entries/xatu.asm similarity index 100% rename from data/pokedex/entries/xatu.asm rename to data/pokemon/dex_entries/xatu.asm diff --git a/data/pokedex/entries/yanma.asm b/data/pokemon/dex_entries/yanma.asm similarity index 100% rename from data/pokedex/entries/yanma.asm rename to data/pokemon/dex_entries/yanma.asm diff --git a/data/pokedex/entries/zapdos.asm b/data/pokemon/dex_entries/zapdos.asm similarity index 100% rename from data/pokedex/entries/zapdos.asm rename to data/pokemon/dex_entries/zapdos.asm diff --git a/data/pokedex/entries/zubat.asm b/data/pokemon/dex_entries/zubat.asm similarity index 100% rename from data/pokedex/entries/zubat.asm rename to data/pokemon/dex_entries/zubat.asm diff --git a/data/pokedex/entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm similarity index 100% rename from data/pokedex/entry_pointers.asm rename to data/pokemon/dex_entry_pointers.asm diff --git a/data/pokedex/order_alpha.asm b/data/pokemon/dex_order_alpha.asm similarity index 100% rename from data/pokedex/order_alpha.asm rename to data/pokemon/dex_order_alpha.asm diff --git a/data/pokedex/order_new.asm b/data/pokemon/dex_order_new.asm similarity index 100% rename from data/pokedex/order_new.asm rename to data/pokemon/dex_order_new.asm diff --git a/data/egg_move_pointers.asm b/data/pokemon/egg_move_pointers.asm similarity index 100% rename from data/egg_move_pointers.asm rename to data/pokemon/egg_move_pointers.asm diff --git a/data/egg_moves.asm b/data/pokemon/egg_moves.asm similarity index 99% rename from data/egg_moves.asm rename to data/pokemon/egg_moves.asm index 2fcf47232..c1f9ae964 100644 --- a/data/egg_moves.asm +++ b/data/pokemon/egg_moves.asm @@ -10,7 +10,7 @@ SECTION "Egg Moves", ROMX ; and can only breed with Ditto. -INCLUDE "data/egg_move_pointers.asm" +INCLUDE "data/pokemon/egg_move_pointers.asm" EggMoves:: diff --git a/data/evos_attacks.asm b/data/pokemon/evos_attacks.asm similarity index 99% rename from data/evos_attacks.asm rename to data/pokemon/evos_attacks.asm index 749731812..f21febf87 100644 --- a/data/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -4,7 +4,7 @@ INCLUDE "includes.asm" SECTION "Evolutions and Attacks", ROMX -INCLUDE "data/evos_attacks_pointers.asm" +INCLUDE "data/pokemon/evos_attacks_pointers.asm" EvosAttacks:: diff --git a/data/evos_attacks_pointers.asm b/data/pokemon/evos_attacks_pointers.asm similarity index 100% rename from data/evos_attacks_pointers.asm rename to data/pokemon/evos_attacks_pointers.asm diff --git a/data/mon_menu_icons.asm b/data/pokemon/menu_icons.asm similarity index 100% rename from data/mon_menu_icons.asm rename to data/pokemon/menu_icons.asm diff --git a/data/pokemon_names.asm b/data/pokemon/pokemon_names.asm similarity index 100% rename from data/pokemon_names.asm rename to data/pokemon/pokemon_names.asm diff --git a/trainers/encounter_music.asm b/data/trainers/encounter_music.asm similarity index 100% rename from trainers/encounter_music.asm rename to data/trainers/encounter_music.asm diff --git a/trainers/gendered_trainers.asm b/data/trainers/gendered_trainers.asm similarity index 100% rename from trainers/gendered_trainers.asm rename to data/trainers/gendered_trainers.asm diff --git a/trainers/trainers.asm b/data/trainers/parties.asm similarity index 100% rename from trainers/trainers.asm rename to data/trainers/parties.asm diff --git a/trainers/trainer_pointers.asm b/data/trainers/party_pointers.asm similarity index 100% rename from trainers/trainer_pointers.asm rename to data/trainers/party_pointers.asm diff --git a/trainers/attributes.asm b/data/trainers/trainer_attributes.asm similarity index 100% rename from trainers/attributes.asm rename to data/trainers/trainer_attributes.asm diff --git a/trainers/dvs.asm b/data/trainers/trainer_dvs.asm similarity index 100% rename from trainers/dvs.asm rename to data/trainers/trainer_dvs.asm diff --git a/items/item_effects.asm b/engine/item_effects.asm similarity index 99% rename from items/item_effects.asm rename to engine/item_effects.asm index 25da8059c..b38b13874 100644 --- a/items/item_effects.asm +++ b/engine/item_effects.asm @@ -3310,4 +3310,4 @@ GetMthMoveOfCurrentMon: ; f969 ret ; f971 -INCLUDE "items/pokeball_wobble.asm" +INCLUDE "engine/pokeball_wobble.asm" diff --git a/engine/landmarks.asm b/engine/landmarks.asm index 5e904eae8..75605bbd9 100644 --- a/engine/landmarks.asm +++ b/engine/landmarks.asm @@ -47,7 +47,7 @@ GetLandmarkName:: ; 0x1ca8a5 ; 0x1ca8c3 -INCLUDE "data/landmarks.asm" +INCLUDE "data/maps/landmarks.asm" RegionCheck: ; 0x1caea1 diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 70c439863..18dc4f94b 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -466,7 +466,7 @@ ReadMonMenuIcon: ; 8eab3 ; 8eac4 -INCLUDE "data/mon_menu_icons.asm" +INCLUDE "data/pokemon/menu_icons.asm" INCLUDE "gfx/icon_pointers.asm" diff --git a/engine/overworld.asm b/engine/overworld.asm index 73115e479..90291b616 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -721,6 +721,6 @@ INCLUDE "data/emote_headers.asm" INCLUDE "data/sprite_mons.asm" -INCLUDE "data/outdoor_sprites.asm" +INCLUDE "data/maps/outdoor_sprites.asm" INCLUDE "gfx/sprite_headers.asm" diff --git a/items/pokeball_wobble.asm b/engine/pokeball_wobble.asm similarity index 100% rename from items/pokeball_wobble.asm rename to engine/pokeball_wobble.asm diff --git a/engine/pokedex.asm b/engine/pokedex.asm index c60396a40..a7a7a4860 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -1709,9 +1709,9 @@ Pokedex_ABCMode: ; 40c30 ret -INCLUDE "data/pokedex/order_alpha.asm" +INCLUDE "data/pokemon/dex_order_alpha.asm" -INCLUDE "data/pokedex/order_new.asm" +INCLUDE "data/pokemon/dex_order_new.asm" Pokedex_DisplayModeDescription: ; 40e5b diff --git a/trainers/read_attributes.asm b/engine/read_trainer_attributes.asm similarity index 100% rename from trainers/read_attributes.asm rename to engine/read_trainer_attributes.asm diff --git a/trainers/read_party.asm b/engine/read_trainer_party.asm similarity index 100% rename from trainers/read_party.asm rename to engine/read_trainer_party.asm diff --git a/engine/spawn_points.asm b/engine/spawn_points.asm index 5f9c07558..b8637da17 100644 --- a/engine/spawn_points.asm +++ b/engine/spawn_points.asm @@ -1,5 +1,5 @@ -INCLUDE "data/spawn_points.asm" +INCLUDE "data/maps/spawn_points.asm" LoadSpawnPoint: ; 1531f diff --git a/macros.asm b/macros.asm index 7bd0d6c4d..737ac9524 100644 --- a/macros.asm +++ b/macros.asm @@ -6,7 +6,7 @@ INCLUDE "macros/data.asm" INCLUDE "macros/code.asm" INCLUDE "macros/coords.asm" INCLUDE "macros/color.asm" -INCLUDE "macros/basestats.asm" +INCLUDE "macros/base_stats.asm" INCLUDE "macros/tilesets.asm" INCLUDE "macros/scripts/audio.asm" diff --git a/macros/basestats.asm b/macros/base_stats.asm similarity index 95% rename from macros/basestats.asm rename to macros/base_stats.asm index 1aa4f39c6..f7c841634 100644 --- a/macros/basestats.asm +++ b/macros/base_stats.asm @@ -1,4 +1,4 @@ -; Used in data/base_stats/*.asm +; Used in data/pokemon/base_stats/*.asm define: macro if !def(\1) diff --git a/main.asm b/main.asm index 876a06ef1..7b51225e7 100644 --- a/main.asm +++ b/main.asm @@ -236,7 +236,7 @@ CheckNickErrors:: ; 669f db -1 ; end INCLUDE "engine/math.asm" -INCLUDE "items/item_attributes.asm" +INCLUDE "data/items/item_attributes.asm" INCLUDE "engine/npc_movement.asm" INCLUDE "event/happiness_egg.asm" INCLUDE "event/special.asm" @@ -353,7 +353,7 @@ BugContest_SetCaughtContestMon: ; e6ce text_jump UnknownText_0x1c10c0 db "@" -INCLUDE "items/item_effects.asm" +INCLUDE "engine/item_effects.asm" KnowsMove: ; f9ea ld a, MON_MOVES @@ -608,7 +608,7 @@ INCLUDE "engine/map_setup.asm" INCLUDE "engine/pokecenter_pc.asm" INCLUDE "engine/mart.asm" INCLUDE "engine/money.asm" -INCLUDE "items/marts.asm" +INCLUDE "data/items/marts.asm" INCLUDE "event/mom.asm" INCLUDE "event/daycare.asm" INCLUDE "event/photo.asm" @@ -1028,7 +1028,7 @@ LevelUpHappinessMod: ; 2709e callab ChangeHappiness ret -INCLUDE "trainers/dvs.asm" +INCLUDE "data/trainers/trainer_dvs.asm" _ReturnToBattle_UseBall: ; 2715c call ClearBGPalettes @@ -1613,11 +1613,11 @@ SECTION "Enemy Trainers", ROMX INCLUDE "battle/ai/items.asm" INCLUDE "battle/ai/scoring.asm" -INCLUDE "trainers/read_attributes.asm" -INCLUDE "trainers/attributes.asm" -INCLUDE "trainers/read_party.asm" -INCLUDE "trainers/trainer_pointers.asm" -INCLUDE "trainers/trainers.asm" +INCLUDE "engine/read_trainer_attributes.asm" +INCLUDE "data/trainers/trainer_attributes.asm" +INCLUDE "engine/read_trainer_party.asm" +INCLUDE "data/trainers/party_pointers.asm" +INCLUDE "data/trainers/parties.asm" SECTION "Battle Core", ROMX @@ -1638,7 +1638,7 @@ SECTION "bank11", ROMX INCLUDE "engine/fruit_trees.asm" INCLUDE "battle/ai/move.asm" INCLUDE "engine/pokedex_2.asm" -INCLUDE "data/pokedex/entry_pointers.asm" +INCLUDE "data/pokemon/dex_entry_pointers.asm" INCLUDE "engine/mail.asm" @@ -2062,7 +2062,7 @@ CheckSave:: ; 4cffe ld c, $0 ret -INCLUDE "data/map_triggers.asm" +INCLUDE "data/maps/map_triggers.asm" _LoadMapPart:: ; 4d15b ld hl, wMisc @@ -3108,7 +3108,7 @@ GetMobileOTTrainerClass: ; mobile function ld a, [hl] ret -INCLUDE "trainers/gendered_trainers.asm" +INCLUDE "data/trainers/gendered_trainers.asm" INCLUDE "battle/sliding_intro.asm" @@ -4284,9 +4284,9 @@ INCLUDE "gfx/load_pics.asm" INCLUDE "engine/move_mon_wo_mail.asm" -INCLUDE "data/base_stats.asm" +INCLUDE "data/pokemon/base_stats.asm" -INCLUDE "data/pokemon_names.asm" +INCLUDE "data/pokemon/pokemon_names.asm" Unknown_53d84: ; unreferenced db $1a, $15 @@ -5194,8 +5194,8 @@ INCLUDE "text/phone/trainers1.asm" SECTION "bank72", ROMX -INCLUDE "items/item_names.asm" -INCLUDE "items/item_descriptions.asm" +INCLUDE "data/items/item_names.asm" +INCLUDE "data/items/item_descriptions.asm" INCLUDE "battle/move_names.asm" INCLUDE "engine/landmarks.asm" diff --git a/tilesets/roofs.asm b/tilesets/roofs.asm index 0e14f3cab..0e43854dd 100644 --- a/tilesets/roofs.asm +++ b/tilesets/roofs.asm @@ -17,7 +17,7 @@ LoadMapGroupRoof:: ; 1c000 ; 1c021 -INCLUDE "data/mapgroup_roofs.asm" +INCLUDE "data/maps/mapgroup_roofs.asm" Roofs: ; 1c03c diff --git a/wram.asm b/wram.asm index c58c76631..1a74682ca 100644 --- a/wram.asm +++ b/wram.asm @@ -2095,7 +2095,7 @@ UnownLetter:: db ; d234 wMoveSelectionMenuType:: db -; corresponds to the data/base_stats/*.asm contents +; corresponds to the data/pokemon/base_stats/*.asm contents CurBaseData:: ; d236 BaseDexNo:: db ; d236 BaseStats:: ; d237