Split items/ and trainers/ into their data/ and engine/ components

Move some data into a pokemon/ subdirectory

555 files changed, 605 insertions, 588 deletions

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
index d6d272107..d6d272107 100644
--- a/items/item_attributes.asm
+++ b/data/items/item_attributes.asm
diff --git a/items/item_descriptions.asm b/data/items/item_descriptions.asm
index 40e91b2c9..40e91b2c9 100644
--- a/items/item_descriptions.asm
+++ b/data/items/item_descriptions.asm
diff --git a/items/item_names.asm b/data/items/item_names.asm
index f44100ab3..f44100ab3 100644
--- a/items/item_names.asm
+++ b/data/items/item_names.asm
diff --git a/items/marts.asm b/data/items/marts.asm
index cd17ca36b..cd17ca36b 100644
--- a/items/marts.asm
+++ b/data/items/marts.asm
diff --git a/data/landmarks.asm b/data/maps/landmarks.asm
index 0b927aaf6..0b927aaf6 100644
--- a/data/landmarks.asm
+++ b/data/maps/landmarks.asm
diff --git a/data/map_triggers.asm b/data/maps/map_triggers.asm
index b2ba1222a..b2ba1222a 100644
--- a/data/map_triggers.asm
+++ b/data/maps/map_triggers.asm
diff --git a/data/mapgroup_roofs.asm b/data/maps/mapgroup_roofs.asm
index 0cad8a0e3..0cad8a0e3 100644
--- a/data/mapgroup_roofs.asm
+++ b/data/maps/mapgroup_roofs.asm
diff --git a/data/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm
index 2b0cd89fe..2b0cd89fe 100644
--- a/data/outdoor_sprites.asm
+++ b/data/maps/outdoor_sprites.asm
diff --git a/data/spawn_points.asm b/data/maps/spawn_points.asm
index 49ba362d7..49ba362d7 100644
--- a/data/spawn_points.asm
+++ b/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
index a2520320a..a2520320a 100644
--- a/data/base_stats/abra.asm
+++ b/data/pokemon/base_stats/abra.asm
diff --git a/data/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm
index 897311399..897311399 100644
--- a/data/base_stats/aerodactyl.asm
+++ b/data/pokemon/base_stats/aerodactyl.asm
diff --git a/data/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm
index 839bff358..839bff358 100644
--- a/data/base_stats/aipom.asm
+++ b/data/pokemon/base_stats/aipom.asm
diff --git a/data/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm
index d0647e268..d0647e268 100644
--- a/data/base_stats/alakazam.asm
+++ b/data/pokemon/base_stats/alakazam.asm
diff --git a/data/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm
index ec361a08d..ec361a08d 100644
--- a/data/base_stats/ampharos.asm
+++ b/data/pokemon/base_stats/ampharos.asm
diff --git a/data/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm
index ed84e5dc8..ed84e5dc8 100644
--- a/data/base_stats/arbok.asm
+++ b/data/pokemon/base_stats/arbok.asm
diff --git a/data/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm
index d543bb8da..d543bb8da 100644
--- a/data/base_stats/arcanine.asm
+++ b/data/pokemon/base_stats/arcanine.asm
diff --git a/data/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm
index 8a436f624..8a436f624 100644
--- a/data/base_stats/ariados.asm
+++ b/data/pokemon/base_stats/ariados.asm
diff --git a/data/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm
index ddf85599b..ddf85599b 100644
--- a/data/base_stats/articuno.asm
+++ b/data/pokemon/base_stats/articuno.asm
diff --git a/data/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm
index c4286ad5d..c4286ad5d 100644
--- a/data/base_stats/azumarill.asm
+++ b/data/pokemon/base_stats/azumarill.asm
diff --git a/data/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm
index 82caf4ae7..82caf4ae7 100644
--- a/data/base_stats/bayleef.asm
+++ b/data/pokemon/base_stats/bayleef.asm
diff --git a/data/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm
index c76accff8..c76accff8 100644
--- a/data/base_stats/beedrill.asm
+++ b/data/pokemon/base_stats/beedrill.asm
diff --git a/data/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm
index 9131b2b38..9131b2b38 100644
--- a/data/base_stats/bellossom.asm
+++ b/data/pokemon/base_stats/bellossom.asm
diff --git a/data/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm
index 94a8ded6b..94a8ded6b 100644
--- a/data/base_stats/bellsprout.asm
+++ b/data/pokemon/base_stats/bellsprout.asm
diff --git a/data/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm
index 7bb267d72..7bb267d72 100644
--- a/data/base_stats/blastoise.asm
+++ b/data/pokemon/base_stats/blastoise.asm
diff --git a/data/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm
index dc1c9a02b..dc1c9a02b 100644
--- a/data/base_stats/blissey.asm
+++ b/data/pokemon/base_stats/blissey.asm
diff --git a/data/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm
index bc843bcd3..bc843bcd3 100644
--- a/data/base_stats/bulbasaur.asm
+++ b/data/pokemon/base_stats/bulbasaur.asm
diff --git a/data/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm
index 24b142e60..24b142e60 100644
--- a/data/base_stats/butterfree.asm
+++ b/data/pokemon/base_stats/butterfree.asm
diff --git a/data/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm
index cdac5bf26..cdac5bf26 100644
--- a/data/base_stats/caterpie.asm
+++ b/data/pokemon/base_stats/caterpie.asm
diff --git a/data/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm
index c955ae2a1..c955ae2a1 100644
--- a/data/base_stats/celebi.asm
+++ b/data/pokemon/base_stats/celebi.asm
diff --git a/data/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm
index 1ae3af6fe..1ae3af6fe 100644
--- a/data/base_stats/chansey.asm
+++ b/data/pokemon/base_stats/chansey.asm
diff --git a/data/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm
index 8d32f3f91..8d32f3f91 100644
--- a/data/base_stats/charizard.asm
+++ b/data/pokemon/base_stats/charizard.asm
diff --git a/data/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm
index 98383865c..98383865c 100644
--- a/data/base_stats/charmander.asm
+++ b/data/pokemon/base_stats/charmander.asm
diff --git a/data/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm
index 9f7f32b51..9f7f32b51 100644
--- a/data/base_stats/charmeleon.asm
+++ b/data/pokemon/base_stats/charmeleon.asm
diff --git a/data/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm
index fdf120402..fdf120402 100644
--- a/data/base_stats/chikorita.asm
+++ b/data/pokemon/base_stats/chikorita.asm
diff --git a/data/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm
index caa5d06e1..caa5d06e1 100644
--- a/data/base_stats/chinchou.asm
+++ b/data/pokemon/base_stats/chinchou.asm
diff --git a/data/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm
index e5978e387..e5978e387 100644
--- a/data/base_stats/clefable.asm
+++ b/data/pokemon/base_stats/clefable.asm
diff --git a/data/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm
index 54089b5cc..54089b5cc 100644
--- a/data/base_stats/clefairy.asm
+++ b/data/pokemon/base_stats/clefairy.asm
diff --git a/data/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm
index 98e77e968..98e77e968 100644
--- a/data/base_stats/cleffa.asm
+++ b/data/pokemon/base_stats/cleffa.asm
diff --git a/data/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm
index 4119dbec2..4119dbec2 100644
--- a/data/base_stats/cloyster.asm
+++ b/data/pokemon/base_stats/cloyster.asm
diff --git a/data/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm
index dddf30644..dddf30644 100644
--- a/data/base_stats/corsola.asm
+++ b/data/pokemon/base_stats/corsola.asm
diff --git a/data/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm
index 71c012079..71c012079 100644
--- a/data/base_stats/crobat.asm
+++ b/data/pokemon/base_stats/crobat.asm
diff --git a/data/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm
index 8dbd57632..8dbd57632 100644
--- a/data/base_stats/croconaw.asm
+++ b/data/pokemon/base_stats/croconaw.asm
diff --git a/data/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm
index dc15c8773..dc15c8773 100644
--- a/data/base_stats/cubone.asm
+++ b/data/pokemon/base_stats/cubone.asm
diff --git a/data/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm
index 137e8c78d..137e8c78d 100644
--- a/data/base_stats/cyndaquil.asm
+++ b/data/pokemon/base_stats/cyndaquil.asm
diff --git a/data/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm
index 8ddb23e7c..8ddb23e7c 100644
--- a/data/base_stats/delibird.asm
+++ b/data/pokemon/base_stats/delibird.asm
diff --git a/data/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm
index 951a1e87e..951a1e87e 100644
--- a/data/base_stats/dewgong.asm
+++ b/data/pokemon/base_stats/dewgong.asm
diff --git a/data/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm
index b93947622..b93947622 100644
--- a/data/base_stats/diglett.asm
+++ b/data/pokemon/base_stats/diglett.asm
diff --git a/data/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm
index b88780bed..b88780bed 100644
--- a/data/base_stats/ditto.asm
+++ b/data/pokemon/base_stats/ditto.asm
diff --git a/data/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm
index 6f8463663..6f8463663 100644
--- a/data/base_stats/dodrio.asm
+++ b/data/pokemon/base_stats/dodrio.asm
diff --git a/data/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm
index 1ef229455..1ef229455 100644
--- a/data/base_stats/doduo.asm
+++ b/data/pokemon/base_stats/doduo.asm
diff --git a/data/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm
index ee0418de0..ee0418de0 100644
--- a/data/base_stats/donphan.asm
+++ b/data/pokemon/base_stats/donphan.asm
diff --git a/data/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm
index e0ca4b8e9..e0ca4b8e9 100644
--- a/data/base_stats/dragonair.asm
+++ b/data/pokemon/base_stats/dragonair.asm
diff --git a/data/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm
index 8ca777e96..8ca777e96 100644
--- a/data/base_stats/dragonite.asm
+++ b/data/pokemon/base_stats/dragonite.asm
diff --git a/data/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm
index c1c173c86..c1c173c86 100644
--- a/data/base_stats/dratini.asm
+++ b/data/pokemon/base_stats/dratini.asm
diff --git a/data/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm
index 5aa756351..5aa756351 100644
--- a/data/base_stats/drowzee.asm
+++ b/data/pokemon/base_stats/drowzee.asm
diff --git a/data/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm
index e245f8320..e245f8320 100644
--- a/data/base_stats/dugtrio.asm
+++ b/data/pokemon/base_stats/dugtrio.asm
diff --git a/data/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm
index 5cbdb5807..5cbdb5807 100644
--- a/data/base_stats/dunsparce.asm
+++ b/data/pokemon/base_stats/dunsparce.asm
diff --git a/data/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm
index 79bbafbcf..79bbafbcf 100644
--- a/data/base_stats/eevee.asm
+++ b/data/pokemon/base_stats/eevee.asm
diff --git a/data/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm
index 0aa84fde2..0aa84fde2 100644
--- a/data/base_stats/ekans.asm
+++ b/data/pokemon/base_stats/ekans.asm
diff --git a/data/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm
index 29cdf9018..29cdf9018 100644
--- a/data/base_stats/electabuzz.asm
+++ b/data/pokemon/base_stats/electabuzz.asm
diff --git a/data/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm
index 44d92de66..44d92de66 100644
--- a/data/base_stats/electrode.asm
+++ b/data/pokemon/base_stats/electrode.asm
diff --git a/data/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm
index a1f871586..a1f871586 100644
--- a/data/base_stats/elekid.asm
+++ b/data/pokemon/base_stats/elekid.asm
diff --git a/data/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm
index 63f5f0af6..63f5f0af6 100644
--- a/data/base_stats/entei.asm
+++ b/data/pokemon/base_stats/entei.asm
diff --git a/data/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm
index 5748ded74..5748ded74 100644
--- a/data/base_stats/espeon.asm
+++ b/data/pokemon/base_stats/espeon.asm
diff --git a/data/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm
index 3cd83b6c9..3cd83b6c9 100644
--- a/data/base_stats/exeggcute.asm
+++ b/data/pokemon/base_stats/exeggcute.asm
diff --git a/data/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm
index d5c466f21..d5c466f21 100644
--- a/data/base_stats/exeggutor.asm
+++ b/data/pokemon/base_stats/exeggutor.asm
diff --git a/data/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm
index 8da2b08a4..8da2b08a4 100644
--- a/data/base_stats/farfetch_d.asm
+++ b/data/pokemon/base_stats/farfetch_d.asm
diff --git a/data/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm
index 2ce86b1bf..2ce86b1bf 100644
--- a/data/base_stats/fearow.asm
+++ b/data/pokemon/base_stats/fearow.asm
diff --git a/data/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm
index c59ca6ffb..c59ca6ffb 100644
--- a/data/base_stats/feraligatr.asm
+++ b/data/pokemon/base_stats/feraligatr.asm
diff --git a/data/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm
index 2cf5e15bc..2cf5e15bc 100644
--- a/data/base_stats/flaaffy.asm
+++ b/data/pokemon/base_stats/flaaffy.asm
diff --git a/data/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm
index 00faecec6..00faecec6 100644
--- a/data/base_stats/flareon.asm
+++ b/data/pokemon/base_stats/flareon.asm
diff --git a/data/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm
index 08fec2745..08fec2745 100644
--- a/data/base_stats/forretress.asm
+++ b/data/pokemon/base_stats/forretress.asm
diff --git a/data/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm
index 3e3b7a656..3e3b7a656 100644
--- a/data/base_stats/furret.asm
+++ b/data/pokemon/base_stats/furret.asm
diff --git a/data/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm
index cda05fe05..cda05fe05 100644
--- a/data/base_stats/gastly.asm
+++ b/data/pokemon/base_stats/gastly.asm
diff --git a/data/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm
index 9b9cc3310..9b9cc3310 100644
--- a/data/base_stats/gengar.asm
+++ b/data/pokemon/base_stats/gengar.asm
diff --git a/data/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm
index 86b627107..86b627107 100644
--- a/data/base_stats/geodude.asm
+++ b/data/pokemon/base_stats/geodude.asm
diff --git a/data/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm
index 7391367cf..7391367cf 100644
--- a/data/base_stats/girafarig.asm
+++ b/data/pokemon/base_stats/girafarig.asm
diff --git a/data/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm
index 5bb7fdca8..5bb7fdca8 100644
--- a/data/base_stats/gligar.asm
+++ b/data/pokemon/base_stats/gligar.asm
diff --git a/data/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm
index 33cea01f2..33cea01f2 100644
--- a/data/base_stats/gloom.asm
+++ b/data/pokemon/base_stats/gloom.asm
diff --git a/data/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm
index 06769b880..06769b880 100644
--- a/data/base_stats/golbat.asm
+++ b/data/pokemon/base_stats/golbat.asm
diff --git a/data/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm
index 314852a3e..314852a3e 100644
--- a/data/base_stats/goldeen.asm
+++ b/data/pokemon/base_stats/goldeen.asm
diff --git a/data/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm
index 9c4dbb5f5..9c4dbb5f5 100644
--- a/data/base_stats/golduck.asm
+++ b/data/pokemon/base_stats/golduck.asm
diff --git a/data/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm
index 9a9f04451..9a9f04451 100644
--- a/data/base_stats/golem.asm
+++ b/data/pokemon/base_stats/golem.asm
diff --git a/data/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm
index 088e17dd8..088e17dd8 100644
--- a/data/base_stats/granbull.asm
+++ b/data/pokemon/base_stats/granbull.asm
diff --git a/data/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm
index dfbeb770c..dfbeb770c 100644
--- a/data/base_stats/graveler.asm
+++ b/data/pokemon/base_stats/graveler.asm
diff --git a/data/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm
index 86dacd1e6..86dacd1e6 100644
--- a/data/base_stats/grimer.asm
+++ b/data/pokemon/base_stats/grimer.asm
diff --git a/data/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm
index ef5cc53b3..ef5cc53b3 100644
--- a/data/base_stats/growlithe.asm
+++ b/data/pokemon/base_stats/growlithe.asm
diff --git a/data/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm
index 1bdceff88..1bdceff88 100644
--- a/data/base_stats/gyarados.asm
+++ b/data/pokemon/base_stats/gyarados.asm
diff --git a/data/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm
index 0db7406c1..0db7406c1 100644
--- a/data/base_stats/haunter.asm
+++ b/data/pokemon/base_stats/haunter.asm
diff --git a/data/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm
index 1f81d9c7b..1f81d9c7b 100644
--- a/data/base_stats/heracross.asm
+++ b/data/pokemon/base_stats/heracross.asm
diff --git a/data/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm
index 3eeb23dd4..3eeb23dd4 100644
--- a/data/base_stats/hitmonchan.asm
+++ b/data/pokemon/base_stats/hitmonchan.asm
diff --git a/data/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm
index a31352209..a31352209 100644
--- a/data/base_stats/hitmonlee.asm
+++ b/data/pokemon/base_stats/hitmonlee.asm
diff --git a/data/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm
index 532b8a6d8..532b8a6d8 100644
--- a/data/base_stats/hitmontop.asm
+++ b/data/pokemon/base_stats/hitmontop.asm
diff --git a/data/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm
index 311bbf6cf..311bbf6cf 100644
--- a/data/base_stats/ho_oh.asm
+++ b/data/pokemon/base_stats/ho_oh.asm
diff --git a/data/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm
index 0442fe414..0442fe414 100644
--- a/data/base_stats/hoothoot.asm
+++ b/data/pokemon/base_stats/hoothoot.asm
diff --git a/data/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm
index b1918d699..b1918d699 100644
--- a/data/base_stats/hoppip.asm
+++ b/data/pokemon/base_stats/hoppip.asm
diff --git a/data/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm
index 3296f52af..3296f52af 100644
--- a/data/base_stats/horsea.asm
+++ b/data/pokemon/base_stats/horsea.asm
diff --git a/data/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm
index 234832675..234832675 100644
--- a/data/base_stats/houndoom.asm
+++ b/data/pokemon/base_stats/houndoom.asm
diff --git a/data/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm
index f743cd81e..f743cd81e 100644
--- a/data/base_stats/houndour.asm
+++ b/data/pokemon/base_stats/houndour.asm
diff --git a/data/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm
index 6c132b6bf..6c132b6bf 100644
--- a/data/base_stats/hypno.asm
+++ b/data/pokemon/base_stats/hypno.asm
diff --git a/data/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm
index fbf32ecca..fbf32ecca 100644
--- a/data/base_stats/igglybuff.asm
+++ b/data/pokemon/base_stats/igglybuff.asm
diff --git a/data/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm
index 7d98b4b6d..7d98b4b6d 100644
--- a/data/base_stats/ivysaur.asm
+++ b/data/pokemon/base_stats/ivysaur.asm
diff --git a/data/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm
index 0f4ea788e..0f4ea788e 100644
--- a/data/base_stats/jigglypuff.asm
+++ b/data/pokemon/base_stats/jigglypuff.asm
diff --git a/data/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm
index 665a40d1d..665a40d1d 100644
--- a/data/base_stats/jolteon.asm
+++ b/data/pokemon/base_stats/jolteon.asm
diff --git a/data/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm
index 623fbe82d..623fbe82d 100644
--- a/data/base_stats/jumpluff.asm
+++ b/data/pokemon/base_stats/jumpluff.asm
diff --git a/data/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm
index c47a4315d..c47a4315d 100644
--- a/data/base_stats/jynx.asm
+++ b/data/pokemon/base_stats/jynx.asm
diff --git a/data/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm
index 9a38cbcba..9a38cbcba 100644
--- a/data/base_stats/kabuto.asm
+++ b/data/pokemon/base_stats/kabuto.asm
diff --git a/data/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm
index b8de99fa1..b8de99fa1 100644
--- a/data/base_stats/kabutops.asm
+++ b/data/pokemon/base_stats/kabutops.asm
diff --git a/data/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm
index 6a4e56f13..6a4e56f13 100644
--- a/data/base_stats/kadabra.asm
+++ b/data/pokemon/base_stats/kadabra.asm
diff --git a/data/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm
index 83241fbcd..83241fbcd 100644
--- a/data/base_stats/kakuna.asm
+++ b/data/pokemon/base_stats/kakuna.asm
diff --git a/data/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm
index 21af227f0..21af227f0 100644
--- a/data/base_stats/kangaskhan.asm
+++ b/data/pokemon/base_stats/kangaskhan.asm
diff --git a/data/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm
index e62d0f23e..e62d0f23e 100644
--- a/data/base_stats/kingdra.asm
+++ b/data/pokemon/base_stats/kingdra.asm
diff --git a/data/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm
index 01ac23a99..01ac23a99 100644
--- a/data/base_stats/kingler.asm
+++ b/data/pokemon/base_stats/kingler.asm
diff --git a/data/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm
index 70e8bd114..70e8bd114 100644
--- a/data/base_stats/koffing.asm
+++ b/data/pokemon/base_stats/koffing.asm
diff --git a/data/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm
index 60ce4c7f4..60ce4c7f4 100644
--- a/data/base_stats/krabby.asm
+++ b/data/pokemon/base_stats/krabby.asm
diff --git a/data/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm
index f5b747fad..f5b747fad 100644
--- a/data/base_stats/lanturn.asm
+++ b/data/pokemon/base_stats/lanturn.asm
diff --git a/data/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm
index 9477b6791..9477b6791 100644
--- a/data/base_stats/lapras.asm
+++ b/data/pokemon/base_stats/lapras.asm
diff --git a/data/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm
index 7de66ca7f..7de66ca7f 100644
--- a/data/base_stats/larvitar.asm
+++ b/data/pokemon/base_stats/larvitar.asm
diff --git a/data/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm
index 84a06c092..84a06c092 100644
--- a/data/base_stats/ledian.asm
+++ b/data/pokemon/base_stats/ledian.asm
diff --git a/data/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm
index 68a20d1ea..68a20d1ea 100644
--- a/data/base_stats/ledyba.asm
+++ b/data/pokemon/base_stats/ledyba.asm
diff --git a/data/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm
index 0f8f351da..0f8f351da 100644
--- a/data/base_stats/lickitung.asm
+++ b/data/pokemon/base_stats/lickitung.asm
diff --git a/data/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm
index 3a4109ab9..3a4109ab9 100644
--- a/data/base_stats/lugia.asm
+++ b/data/pokemon/base_stats/lugia.asm
diff --git a/data/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm
index bb716cf25..bb716cf25 100644
--- a/data/base_stats/machamp.asm
+++ b/data/pokemon/base_stats/machamp.asm
diff --git a/data/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm
index 79caf8c70..79caf8c70 100644
--- a/data/base_stats/machoke.asm
+++ b/data/pokemon/base_stats/machoke.asm
diff --git a/data/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm
index 6b0cbaab7..6b0cbaab7 100644
--- a/data/base_stats/machop.asm
+++ b/data/pokemon/base_stats/machop.asm
diff --git a/data/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm
index 478dfb8b8..478dfb8b8 100644
--- a/data/base_stats/magby.asm
+++ b/data/pokemon/base_stats/magby.asm
diff --git a/data/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm
index 45493135b..45493135b 100644
--- a/data/base_stats/magcargo.asm
+++ b/data/pokemon/base_stats/magcargo.asm
diff --git a/data/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm
index 2519b475b..2519b475b 100644
--- a/data/base_stats/magikarp.asm
+++ b/data/pokemon/base_stats/magikarp.asm
diff --git a/data/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm
index ea14c66cd..ea14c66cd 100644
--- a/data/base_stats/magmar.asm
+++ b/data/pokemon/base_stats/magmar.asm
diff --git a/data/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm
index 19a85a9a1..19a85a9a1 100644
--- a/data/base_stats/magnemite.asm
+++ b/data/pokemon/base_stats/magnemite.asm
diff --git a/data/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm
index 5fdbe68f4..5fdbe68f4 100644
--- a/data/base_stats/magneton.asm
+++ b/data/pokemon/base_stats/magneton.asm
diff --git a/data/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm
index 77cc260d4..77cc260d4 100644
--- a/data/base_stats/mankey.asm
+++ b/data/pokemon/base_stats/mankey.asm
diff --git a/data/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm
index bfe113428..bfe113428 100644
--- a/data/base_stats/mantine.asm
+++ b/data/pokemon/base_stats/mantine.asm
diff --git a/data/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm
index cc190b664..cc190b664 100644
--- a/data/base_stats/mareep.asm
+++ b/data/pokemon/base_stats/mareep.asm
diff --git a/data/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm
index 73708d1df..73708d1df 100644
--- a/data/base_stats/marill.asm
+++ b/data/pokemon/base_stats/marill.asm
diff --git a/data/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm
index 3e04b9697..3e04b9697 100644
--- a/data/base_stats/marowak.asm
+++ b/data/pokemon/base_stats/marowak.asm
diff --git a/data/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm
index cf1125003..cf1125003 100644
--- a/data/base_stats/meganium.asm
+++ b/data/pokemon/base_stats/meganium.asm
diff --git a/data/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm
index f177f0efd..f177f0efd 100644
--- a/data/base_stats/meowth.asm
+++ b/data/pokemon/base_stats/meowth.asm
diff --git a/data/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm
index e26e31fc5..e26e31fc5 100644
--- a/data/base_stats/metapod.asm
+++ b/data/pokemon/base_stats/metapod.asm
diff --git a/data/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm
index e2bac0040..e2bac0040 100644
--- a/data/base_stats/mew.asm
+++ b/data/pokemon/base_stats/mew.asm
diff --git a/data/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm
index 28da9f404..28da9f404 100644
--- a/data/base_stats/mewtwo.asm
+++ b/data/pokemon/base_stats/mewtwo.asm
diff --git a/data/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm
index 63ed422bc..63ed422bc 100644
--- a/data/base_stats/miltank.asm
+++ b/data/pokemon/base_stats/miltank.asm
diff --git a/data/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm
index dc730ad9a..dc730ad9a 100644
--- a/data/base_stats/misdreavus.asm
+++ b/data/pokemon/base_stats/misdreavus.asm
diff --git a/data/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm
index bf70c2821..bf70c2821 100644
--- a/data/base_stats/moltres.asm
+++ b/data/pokemon/base_stats/moltres.asm
diff --git a/data/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm
index d7042d55a..d7042d55a 100644
--- a/data/base_stats/mr__mime.asm
+++ b/data/pokemon/base_stats/mr__mime.asm
diff --git a/data/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm
index 30c6414fd..30c6414fd 100644
--- a/data/base_stats/muk.asm
+++ b/data/pokemon/base_stats/muk.asm
diff --git a/data/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm
index 7f459e8aa..7f459e8aa 100644
--- a/data/base_stats/murkrow.asm
+++ b/data/pokemon/base_stats/murkrow.asm
diff --git a/data/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm
index 9d00ce7eb..9d00ce7eb 100644
--- a/data/base_stats/natu.asm
+++ b/data/pokemon/base_stats/natu.asm
diff --git a/data/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm
index 316f71e87..316f71e87 100644
--- a/data/base_stats/nidoking.asm
+++ b/data/pokemon/base_stats/nidoking.asm
diff --git a/data/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm
index e9d2ae611..e9d2ae611 100644
--- a/data/base_stats/nidoqueen.asm
+++ b/data/pokemon/base_stats/nidoqueen.asm
diff --git a/data/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm
index 1cd53b17a..1cd53b17a 100644
--- a/data/base_stats/nidoran_f.asm
+++ b/data/pokemon/base_stats/nidoran_f.asm
diff --git a/data/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm
index cf0c1e1b2..cf0c1e1b2 100644
--- a/data/base_stats/nidoran_m.asm
+++ b/data/pokemon/base_stats/nidoran_m.asm
diff --git a/data/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm
index 42b3aebf8..42b3aebf8 100644
--- a/data/base_stats/nidorina.asm
+++ b/data/pokemon/base_stats/nidorina.asm
diff --git a/data/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm
index f31e8df3d..f31e8df3d 100644
--- a/data/base_stats/nidorino.asm
+++ b/data/pokemon/base_stats/nidorino.asm
diff --git a/data/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm
index 5fd84b886..5fd84b886 100644
--- a/data/base_stats/ninetales.asm
+++ b/data/pokemon/base_stats/ninetales.asm
diff --git a/data/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm
index e2c8565bd..e2c8565bd 100644
--- a/data/base_stats/noctowl.asm
+++ b/data/pokemon/base_stats/noctowl.asm
diff --git a/data/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm
index 80b5ad97a..80b5ad97a 100644
--- a/data/base_stats/octillery.asm
+++ b/data/pokemon/base_stats/octillery.asm
diff --git a/data/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm
index df75f6485..df75f6485 100644
--- a/data/base_stats/oddish.asm
+++ b/data/pokemon/base_stats/oddish.asm
diff --git a/data/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm
index 6278f4e3c..6278f4e3c 100644
--- a/data/base_stats/omanyte.asm
+++ b/data/pokemon/base_stats/omanyte.asm
diff --git a/data/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm
index d3f3b15e1..d3f3b15e1 100644
--- a/data/base_stats/omastar.asm
+++ b/data/pokemon/base_stats/omastar.asm
diff --git a/data/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm
index 2fc5bd175..2fc5bd175 100644
--- a/data/base_stats/onix.asm
+++ b/data/pokemon/base_stats/onix.asm
diff --git a/data/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm
index d86a51765..d86a51765 100644
--- a/data/base_stats/paras.asm
+++ b/data/pokemon/base_stats/paras.asm
diff --git a/data/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm
index 5c4320fd3..5c4320fd3 100644
--- a/data/base_stats/parasect.asm
+++ b/data/pokemon/base_stats/parasect.asm
diff --git a/data/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm
index fd2677e16..fd2677e16 100644
--- a/data/base_stats/persian.asm
+++ b/data/pokemon/base_stats/persian.asm
diff --git a/data/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm
index 93a26d43c..93a26d43c 100644
--- a/data/base_stats/phanpy.asm
+++ b/data/pokemon/base_stats/phanpy.asm
diff --git a/data/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm
index da497bdf8..da497bdf8 100644
--- a/data/base_stats/pichu.asm
+++ b/data/pokemon/base_stats/pichu.asm
diff --git a/data/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm
index 35222d2be..35222d2be 100644
--- a/data/base_stats/pidgeot.asm
+++ b/data/pokemon/base_stats/pidgeot.asm
diff --git a/data/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm
index 13b2d8e0c..13b2d8e0c 100644
--- a/data/base_stats/pidgeotto.asm
+++ b/data/pokemon/base_stats/pidgeotto.asm
diff --git a/data/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm
index 0290f1717..0290f1717 100644
--- a/data/base_stats/pidgey.asm
+++ b/data/pokemon/base_stats/pidgey.asm
diff --git a/data/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm
index cd998aead..cd998aead 100644
--- a/data/base_stats/pikachu.asm
+++ b/data/pokemon/base_stats/pikachu.asm
diff --git a/data/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm
index dd8bf950b..dd8bf950b 100644
--- a/data/base_stats/piloswine.asm
+++ b/data/pokemon/base_stats/piloswine.asm
diff --git a/data/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm
index 2c27a9913..2c27a9913 100644
--- a/data/base_stats/pineco.asm
+++ b/data/pokemon/base_stats/pineco.asm
diff --git a/data/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm
index 697bba44c..697bba44c 100644
--- a/data/base_stats/pinsir.asm
+++ b/data/pokemon/base_stats/pinsir.asm
diff --git a/data/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm
index dd11f5080..dd11f5080 100644
--- a/data/base_stats/politoed.asm
+++ b/data/pokemon/base_stats/politoed.asm
diff --git a/data/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm
index fb362450c..fb362450c 100644
--- a/data/base_stats/poliwag.asm
+++ b/data/pokemon/base_stats/poliwag.asm
diff --git a/data/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm
index d0d461164..d0d461164 100644
--- a/data/base_stats/poliwhirl.asm
+++ b/data/pokemon/base_stats/poliwhirl.asm
diff --git a/data/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm
index 5745daee7..5745daee7 100644
--- a/data/base_stats/poliwrath.asm
+++ b/data/pokemon/base_stats/poliwrath.asm
diff --git a/data/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm
index 5c1f77c98..5c1f77c98 100644
--- a/data/base_stats/ponyta.asm
+++ b/data/pokemon/base_stats/ponyta.asm
diff --git a/data/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm
index b0c99914b..b0c99914b 100644
--- a/data/base_stats/porygon.asm
+++ b/data/pokemon/base_stats/porygon.asm
diff --git a/data/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm
index 9e049a156..9e049a156 100644
--- a/data/base_stats/porygon2.asm
+++ b/data/pokemon/base_stats/porygon2.asm
diff --git a/data/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm
index 249f9bee4..249f9bee4 100644
--- a/data/base_stats/primeape.asm
+++ b/data/pokemon/base_stats/primeape.asm
diff --git a/data/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm
index 261fdde99..261fdde99 100644
--- a/data/base_stats/psyduck.asm
+++ b/data/pokemon/base_stats/psyduck.asm
diff --git a/data/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm
index 63c0a41a7..63c0a41a7 100644
--- a/data/base_stats/pupitar.asm
+++ b/data/pokemon/base_stats/pupitar.asm
diff --git a/data/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm
index 0f49866e7..0f49866e7 100644
--- a/data/base_stats/quagsire.asm
+++ b/data/pokemon/base_stats/quagsire.asm
diff --git a/data/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm
index efadeda06..efadeda06 100644
--- a/data/base_stats/quilava.asm
+++ b/data/pokemon/base_stats/quilava.asm
diff --git a/data/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm
index 70648e5fd..70648e5fd 100644
--- a/data/base_stats/qwilfish.asm
+++ b/data/pokemon/base_stats/qwilfish.asm
diff --git a/data/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm
index cdc5193cd..cdc5193cd 100644
--- a/data/base_stats/raichu.asm
+++ b/data/pokemon/base_stats/raichu.asm
diff --git a/data/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm
index a68f16181..a68f16181 100644
--- a/data/base_stats/raikou.asm
+++ b/data/pokemon/base_stats/raikou.asm
diff --git a/data/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm
index 0167e7439..0167e7439 100644
--- a/data/base_stats/rapidash.asm
+++ b/data/pokemon/base_stats/rapidash.asm
diff --git a/data/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm
index 1cfc65906..1cfc65906 100644
--- a/data/base_stats/raticate.asm
+++ b/data/pokemon/base_stats/raticate.asm
diff --git a/data/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm
index 13c21e889..13c21e889 100644
--- a/data/base_stats/rattata.asm
+++ b/data/pokemon/base_stats/rattata.asm
diff --git a/data/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm
index 10ae15479..10ae15479 100644
--- a/data/base_stats/remoraid.asm
+++ b/data/pokemon/base_stats/remoraid.asm
diff --git a/data/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm
index cdcfb4cad..cdcfb4cad 100644
--- a/data/base_stats/rhydon.asm
+++ b/data/pokemon/base_stats/rhydon.asm
diff --git a/data/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm
index 67d438751..67d438751 100644
--- a/data/base_stats/rhyhorn.asm
+++ b/data/pokemon/base_stats/rhyhorn.asm
diff --git a/data/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm
index cc0a4c492..cc0a4c492 100644
--- a/data/base_stats/sandshrew.asm
+++ b/data/pokemon/base_stats/sandshrew.asm
diff --git a/data/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm
index 75f66b363..75f66b363 100644
--- a/data/base_stats/sandslash.asm
+++ b/data/pokemon/base_stats/sandslash.asm
diff --git a/data/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm
index 127110c7a..127110c7a 100644
--- a/data/base_stats/scizor.asm
+++ b/data/pokemon/base_stats/scizor.asm
diff --git a/data/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm
index 4c4779f0f..4c4779f0f 100644
--- a/data/base_stats/scyther.asm
+++ b/data/pokemon/base_stats/scyther.asm
diff --git a/data/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm
index b4dc47c20..b4dc47c20 100644
--- a/data/base_stats/seadra.asm
+++ b/data/pokemon/base_stats/seadra.asm
diff --git a/data/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm
index 4d6d2f91e..4d6d2f91e 100644
--- a/data/base_stats/seaking.asm
+++ b/data/pokemon/base_stats/seaking.asm
diff --git a/data/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm
index 39b44fad8..39b44fad8 100644
--- a/data/base_stats/seel.asm
+++ b/data/pokemon/base_stats/seel.asm
diff --git a/data/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm
index 12e120087..12e120087 100644
--- a/data/base_stats/sentret.asm
+++ b/data/pokemon/base_stats/sentret.asm
diff --git a/data/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm
index fb60ff262..fb60ff262 100644
--- a/data/base_stats/shellder.asm
+++ b/data/pokemon/base_stats/shellder.asm
diff --git a/data/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm
index 7cd31ad79..7cd31ad79 100644
--- a/data/base_stats/shuckle.asm
+++ b/data/pokemon/base_stats/shuckle.asm
diff --git a/data/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm
index cf271b39f..cf271b39f 100644
--- a/data/base_stats/skarmory.asm
+++ b/data/pokemon/base_stats/skarmory.asm
diff --git a/data/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm
index 46bbc8a8c..46bbc8a8c 100644
--- a/data/base_stats/skiploom.asm
+++ b/data/pokemon/base_stats/skiploom.asm
diff --git a/data/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm
index 12e172238..12e172238 100644
--- a/data/base_stats/slowbro.asm
+++ b/data/pokemon/base_stats/slowbro.asm
diff --git a/data/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm
index 7307ca826..7307ca826 100644
--- a/data/base_stats/slowking.asm
+++ b/data/pokemon/base_stats/slowking.asm
diff --git a/data/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm
index 36bf88af2..36bf88af2 100644
--- a/data/base_stats/slowpoke.asm
+++ b/data/pokemon/base_stats/slowpoke.asm
diff --git a/data/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm
index a760dd40e..a760dd40e 100644
--- a/data/base_stats/slugma.asm
+++ b/data/pokemon/base_stats/slugma.asm
diff --git a/data/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm
index d80443acf..d80443acf 100644
--- a/data/base_stats/smeargle.asm
+++ b/data/pokemon/base_stats/smeargle.asm
diff --git a/data/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm
index 69d74d5e8..69d74d5e8 100644
--- a/data/base_stats/smoochum.asm
+++ b/data/pokemon/base_stats/smoochum.asm
diff --git a/data/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm
index 3abea4b7a..3abea4b7a 100644
--- a/data/base_stats/sneasel.asm
+++ b/data/pokemon/base_stats/sneasel.asm
diff --git a/data/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm
index 0efe599c5..0efe599c5 100644
--- a/data/base_stats/snorlax.asm
+++ b/data/pokemon/base_stats/snorlax.asm
diff --git a/data/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm
index 00d94a3cb..00d94a3cb 100644
--- a/data/base_stats/snubbull.asm
+++ b/data/pokemon/base_stats/snubbull.asm
diff --git a/data/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm
index b94e3559c..b94e3559c 100644
--- a/data/base_stats/spearow.asm
+++ b/data/pokemon/base_stats/spearow.asm
diff --git a/data/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm
index d9ca7679f..d9ca7679f 100644
--- a/data/base_stats/spinarak.asm
+++ b/data/pokemon/base_stats/spinarak.asm
diff --git a/data/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm
index 1d9faa25d..1d9faa25d 100644
--- a/data/base_stats/squirtle.asm
+++ b/data/pokemon/base_stats/squirtle.asm
diff --git a/data/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm
index 1978739e7..1978739e7 100644
--- a/data/base_stats/stantler.asm
+++ b/data/pokemon/base_stats/stantler.asm
diff --git a/data/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm
index aa60f18d2..aa60f18d2 100644
--- a/data/base_stats/starmie.asm
+++ b/data/pokemon/base_stats/starmie.asm
diff --git a/data/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm
index d0520c3cc..d0520c3cc 100644
--- a/data/base_stats/staryu.asm
+++ b/data/pokemon/base_stats/staryu.asm
diff --git a/data/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm
index df5d8940c..df5d8940c 100644
--- a/data/base_stats/steelix.asm
+++ b/data/pokemon/base_stats/steelix.asm
diff --git a/data/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm
index 1c6c33984..1c6c33984 100644
--- a/data/base_stats/sudowoodo.asm
+++ b/data/pokemon/base_stats/sudowoodo.asm
diff --git a/data/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm
index 04ece5516..04ece5516 100644
--- a/data/base_stats/suicune.asm
+++ b/data/pokemon/base_stats/suicune.asm
diff --git a/data/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm
index 97974939c..97974939c 100644
--- a/data/base_stats/sunflora.asm
+++ b/data/pokemon/base_stats/sunflora.asm
diff --git a/data/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm
index 054625425..054625425 100644
--- a/data/base_stats/sunkern.asm
+++ b/data/pokemon/base_stats/sunkern.asm
diff --git a/data/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm
index 37f1dd67d..37f1dd67d 100644
--- a/data/base_stats/swinub.asm
+++ b/data/pokemon/base_stats/swinub.asm
diff --git a/data/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm
index 9bb27ffca..9bb27ffca 100644
--- a/data/base_stats/tangela.asm
+++ b/data/pokemon/base_stats/tangela.asm
diff --git a/data/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm
index 553458e83..553458e83 100644
--- a/data/base_stats/tauros.asm
+++ b/data/pokemon/base_stats/tauros.asm
diff --git a/data/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm
index d636aed87..d636aed87 100644
--- a/data/base_stats/teddiursa.asm
+++ b/data/pokemon/base_stats/teddiursa.asm
diff --git a/data/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm
index b13879b47..b13879b47 100644
--- a/data/base_stats/tentacool.asm
+++ b/data/pokemon/base_stats/tentacool.asm
diff --git a/data/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm
index a678d13a8..a678d13a8 100644
--- a/data/base_stats/tentacruel.asm
+++ b/data/pokemon/base_stats/tentacruel.asm
diff --git a/data/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm
index 51249de6d..51249de6d 100644
--- a/data/base_stats/togepi.asm
+++ b/data/pokemon/base_stats/togepi.asm
diff --git a/data/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm
index 4fc94103d..4fc94103d 100644
--- a/data/base_stats/togetic.asm
+++ b/data/pokemon/base_stats/togetic.asm
diff --git a/data/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm
index 1753d5af0..1753d5af0 100644
--- a/data/base_stats/totodile.asm
+++ b/data/pokemon/base_stats/totodile.asm
diff --git a/data/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm
index 698a4e0a0..698a4e0a0 100644
--- a/data/base_stats/typhlosion.asm
+++ b/data/pokemon/base_stats/typhlosion.asm
diff --git a/data/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm
index b695007f1..b695007f1 100644
--- a/data/base_stats/tyranitar.asm
+++ b/data/pokemon/base_stats/tyranitar.asm
diff --git a/data/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm
index 4e5e7ee43..4e5e7ee43 100644
--- a/data/base_stats/tyrogue.asm
+++ b/data/pokemon/base_stats/tyrogue.asm
diff --git a/data/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm
index dbda2b3b6..dbda2b3b6 100644
--- a/data/base_stats/umbreon.asm
+++ b/data/pokemon/base_stats/umbreon.asm
diff --git a/data/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm
index 0b13f3eca..0b13f3eca 100644
--- a/data/base_stats/unown.asm
+++ b/data/pokemon/base_stats/unown.asm
diff --git a/data/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm
index 7aa8a4265..7aa8a4265 100644
--- a/data/base_stats/ursaring.asm
+++ b/data/pokemon/base_stats/ursaring.asm
diff --git a/data/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm
index 0e55a1946..0e55a1946 100644
--- a/data/base_stats/vaporeon.asm
+++ b/data/pokemon/base_stats/vaporeon.asm
diff --git a/data/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm
index 4e813b3aa..4e813b3aa 100644
--- a/data/base_stats/venomoth.asm
+++ b/data/pokemon/base_stats/venomoth.asm
diff --git a/data/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm
index 5db99f8a1..5db99f8a1 100644
--- a/data/base_stats/venonat.asm
+++ b/data/pokemon/base_stats/venonat.asm
diff --git a/data/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm
index f5d6a3a33..f5d6a3a33 100644
--- a/data/base_stats/venusaur.asm
+++ b/data/pokemon/base_stats/venusaur.asm
diff --git a/data/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm
index 0efade3ad..0efade3ad 100644
--- a/data/base_stats/victreebel.asm
+++ b/data/pokemon/base_stats/victreebel.asm
diff --git a/data/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm
index 12170e167..12170e167 100644
--- a/data/base_stats/vileplume.asm
+++ b/data/pokemon/base_stats/vileplume.asm
diff --git a/data/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm
index 7c2255729..7c2255729 100644
--- a/data/base_stats/voltorb.asm
+++ b/data/pokemon/base_stats/voltorb.asm
diff --git a/data/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm
index 9cea11f93..9cea11f93 100644
--- a/data/base_stats/vulpix.asm
+++ b/data/pokemon/base_stats/vulpix.asm
diff --git a/data/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm
index 437342a8b..437342a8b 100644
--- a/data/base_stats/wartortle.asm
+++ b/data/pokemon/base_stats/wartortle.asm
diff --git a/data/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm
index b47a720ec..b47a720ec 100644
--- a/data/base_stats/weedle.asm
+++ b/data/pokemon/base_stats/weedle.asm
diff --git a/data/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm
index 4a70c5bb2..4a70c5bb2 100644
--- a/data/base_stats/weepinbell.asm
+++ b/data/pokemon/base_stats/weepinbell.asm
diff --git a/data/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm
index 49161c69b..49161c69b 100644
--- a/data/base_stats/weezing.asm
+++ b/data/pokemon/base_stats/weezing.asm
diff --git a/data/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm
index ff1910c0e..ff1910c0e 100644
--- a/data/base_stats/wigglytuff.asm
+++ b/data/pokemon/base_stats/wigglytuff.asm
diff --git a/data/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm
index c476dd828..c476dd828 100644
--- a/data/base_stats/wobbuffet.asm
+++ b/data/pokemon/base_stats/wobbuffet.asm
diff --git a/data/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm
index 6e621fe4b..6e621fe4b 100644
--- a/data/base_stats/wooper.asm
+++ b/data/pokemon/base_stats/wooper.asm
diff --git a/data/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm
index 77388858e..77388858e 100644
--- a/data/base_stats/xatu.asm
+++ b/data/pokemon/base_stats/xatu.asm
diff --git a/data/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm
index 98449c720..98449c720 100644
--- a/data/base_stats/yanma.asm
+++ b/data/pokemon/base_stats/yanma.asm
diff --git a/data/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm
index 44c1a8e82..44c1a8e82 100644
--- a/data/base_stats/zapdos.asm
+++ b/data/pokemon/base_stats/zapdos.asm
diff --git a/data/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm
index e8fd33ea2..e8fd33ea2 100644
--- a/data/base_stats/zubat.asm
+++ b/data/pokemon/base_stats/zubat.asm
diff --git a/audio/cry_headers.asm b/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
index be3b263cd..be3b263cd 100644
--- a/data/pokedex/entries/abra.asm
+++ b/data/pokemon/dex_entries/abra.asm
diff --git a/data/pokedex/entries/aerodactyl.asm b/data/pokemon/dex_entries/aerodactyl.asm
index d6189500b..d6189500b 100644
--- a/data/pokedex/entries/aerodactyl.asm
+++ b/data/pokemon/dex_entries/aerodactyl.asm
diff --git a/data/pokedex/entries/aipom.asm b/data/pokemon/dex_entries/aipom.asm
index 3fadb9169..3fadb9169 100644
--- a/data/pokedex/entries/aipom.asm
+++ b/data/pokemon/dex_entries/aipom.asm
diff --git a/data/pokedex/entries/alakazam.asm b/data/pokemon/dex_entries/alakazam.asm
index 1d34fa1f7..1d34fa1f7 100644
--- a/data/pokedex/entries/alakazam.asm
+++ b/data/pokemon/dex_entries/alakazam.asm
diff --git a/data/pokedex/entries/ampharos.asm b/data/pokemon/dex_entries/ampharos.asm
index 1f48fe322..1f48fe322 100644
--- a/data/pokedex/entries/ampharos.asm
+++ b/data/pokemon/dex_entries/ampharos.asm
diff --git a/data/pokedex/entries/arbok.asm b/data/pokemon/dex_entries/arbok.asm
index c5d5b7704..c5d5b7704 100644
--- a/data/pokedex/entries/arbok.asm
+++ b/data/pokemon/dex_entries/arbok.asm
diff --git a/data/pokedex/entries/arcanine.asm b/data/pokemon/dex_entries/arcanine.asm
index e319bcb6a..e319bcb6a 100644
--- a/data/pokedex/entries/arcanine.asm
+++ b/data/pokemon/dex_entries/arcanine.asm
diff --git a/data/pokedex/entries/ariados.asm b/data/pokemon/dex_entries/ariados.asm
index a27d13fef..a27d13fef 100644
--- a/data/pokedex/entries/ariados.asm
+++ b/data/pokemon/dex_entries/ariados.asm
diff --git a/data/pokedex/entries/articuno.asm b/data/pokemon/dex_entries/articuno.asm
index 92b297d28..92b297d28 100644
--- a/data/pokedex/entries/articuno.asm
+++ b/data/pokemon/dex_entries/articuno.asm
diff --git a/data/pokedex/entries/azumarill.asm b/data/pokemon/dex_entries/azumarill.asm
index bdbc83d1d..bdbc83d1d 100644
--- a/data/pokedex/entries/azumarill.asm
+++ b/data/pokemon/dex_entries/azumarill.asm
diff --git a/data/pokedex/entries/bayleef.asm b/data/pokemon/dex_entries/bayleef.asm
index ac66dccd5..ac66dccd5 100644
--- a/data/pokedex/entries/bayleef.asm
+++ b/data/pokemon/dex_entries/bayleef.asm
diff --git a/data/pokedex/entries/beedrill.asm b/data/pokemon/dex_entries/beedrill.asm
index 505396ca1..505396ca1 100644
--- a/data/pokedex/entries/beedrill.asm
+++ b/data/pokemon/dex_entries/beedrill.asm
diff --git a/data/pokedex/entries/bellossom.asm b/data/pokemon/dex_entries/bellossom.asm
index 0d13ed65d..0d13ed65d 100644
--- a/data/pokedex/entries/bellossom.asm
+++ b/data/pokemon/dex_entries/bellossom.asm
diff --git a/data/pokedex/entries/bellsprout.asm b/data/pokemon/dex_entries/bellsprout.asm
index fcd42c125..fcd42c125 100644
--- a/data/pokedex/entries/bellsprout.asm
+++ b/data/pokemon/dex_entries/bellsprout.asm
diff --git a/data/pokedex/entries/blastoise.asm b/data/pokemon/dex_entries/blastoise.asm
index ea2a18d05..ea2a18d05 100644
--- a/data/pokedex/entries/blastoise.asm
+++ b/data/pokemon/dex_entries/blastoise.asm
diff --git a/data/pokedex/entries/blissey.asm b/data/pokemon/dex_entries/blissey.asm
index 10151a398..10151a398 100644
--- a/data/pokedex/entries/blissey.asm
+++ b/data/pokemon/dex_entries/blissey.asm
diff --git a/data/pokedex/entries/bulbasaur.asm b/data/pokemon/dex_entries/bulbasaur.asm
index fdfe39c8c..fdfe39c8c 100644
--- a/data/pokedex/entries/bulbasaur.asm
+++ b/data/pokemon/dex_entries/bulbasaur.asm
diff --git a/data/pokedex/entries/butterfree.asm b/data/pokemon/dex_entries/butterfree.asm
index edf9e2599..edf9e2599 100644
--- a/data/pokedex/entries/butterfree.asm
+++ b/data/pokemon/dex_entries/butterfree.asm
diff --git a/data/pokedex/entries/caterpie.asm b/data/pokemon/dex_entries/caterpie.asm
index 940aa014f..940aa014f 100644
--- a/data/pokedex/entries/caterpie.asm
+++ b/data/pokemon/dex_entries/caterpie.asm
diff --git a/data/pokedex/entries/celebi.asm b/data/pokemon/dex_entries/celebi.asm
index 3922d1749..3922d1749 100644
--- a/data/pokedex/entries/celebi.asm
+++ b/data/pokemon/dex_entries/celebi.asm
diff --git a/data/pokedex/entries/chansey.asm b/data/pokemon/dex_entries/chansey.asm
index fd45cf121..fd45cf121 100644
--- a/data/pokedex/entries/chansey.asm
+++ b/data/pokemon/dex_entries/chansey.asm
diff --git a/data/pokedex/entries/charizard.asm b/data/pokemon/dex_entries/charizard.asm
index 53a542fb5..53a542fb5 100644
--- a/data/pokedex/entries/charizard.asm
+++ b/data/pokemon/dex_entries/charizard.asm
diff --git a/data/pokedex/entries/charmander.asm b/data/pokemon/dex_entries/charmander.asm
index a89b138f8..a89b138f8 100644
--- a/data/pokedex/entries/charmander.asm
+++ b/data/pokemon/dex_entries/charmander.asm
diff --git a/data/pokedex/entries/charmeleon.asm b/data/pokemon/dex_entries/charmeleon.asm
index 2891764c3..2891764c3 100644
--- a/data/pokedex/entries/charmeleon.asm
+++ b/data/pokemon/dex_entries/charmeleon.asm
diff --git a/data/pokedex/entries/chikorita.asm b/data/pokemon/dex_entries/chikorita.asm
index 3ba17e1f8..3ba17e1f8 100644
--- a/data/pokedex/entries/chikorita.asm
+++ b/data/pokemon/dex_entries/chikorita.asm
diff --git a/data/pokedex/entries/chinchou.asm b/data/pokemon/dex_entries/chinchou.asm
index 22d887859..22d887859 100644
--- a/data/pokedex/entries/chinchou.asm
+++ b/data/pokemon/dex_entries/chinchou.asm
diff --git a/data/pokedex/entries/clefable.asm b/data/pokemon/dex_entries/clefable.asm
index 240d70eb5..240d70eb5 100644
--- a/data/pokedex/entries/clefable.asm
+++ b/data/pokemon/dex_entries/clefable.asm
diff --git a/data/pokedex/entries/clefairy.asm b/data/pokemon/dex_entries/clefairy.asm
index b5973b21a..b5973b21a 100644
--- a/data/pokedex/entries/clefairy.asm
+++ b/data/pokemon/dex_entries/clefairy.asm
diff --git a/data/pokedex/entries/cleffa.asm b/data/pokemon/dex_entries/cleffa.asm
index 897bb2501..897bb2501 100644
--- a/data/pokedex/entries/cleffa.asm
+++ b/data/pokemon/dex_entries/cleffa.asm
diff --git a/data/pokedex/entries/cloyster.asm b/data/pokemon/dex_entries/cloyster.asm
index b1eaf80b9..b1eaf80b9 100644
--- a/data/pokedex/entries/cloyster.asm
+++ b/data/pokemon/dex_entries/cloyster.asm
diff --git a/data/pokedex/entries/corsola.asm b/data/pokemon/dex_entries/corsola.asm
index 52fbd0c44..52fbd0c44 100644
--- a/data/pokedex/entries/corsola.asm
+++ b/data/pokemon/dex_entries/corsola.asm
diff --git a/data/pokedex/entries/crobat.asm b/data/pokemon/dex_entries/crobat.asm
index 107683110..107683110 100644
--- a/data/pokedex/entries/crobat.asm
+++ b/data/pokemon/dex_entries/crobat.asm
diff --git a/data/pokedex/entries/croconaw.asm b/data/pokemon/dex_entries/croconaw.asm
index 0edcf80cc..0edcf80cc 100644
--- a/data/pokedex/entries/croconaw.asm
+++ b/data/pokemon/dex_entries/croconaw.asm
diff --git a/data/pokedex/entries/cubone.asm b/data/pokemon/dex_entries/cubone.asm
index 911377864..911377864 100644
--- a/data/pokedex/entries/cubone.asm
+++ b/data/pokemon/dex_entries/cubone.asm
diff --git a/data/pokedex/entries/cyndaquil.asm b/data/pokemon/dex_entries/cyndaquil.asm
index 47329d37f..47329d37f 100644
--- a/data/pokedex/entries/cyndaquil.asm
+++ b/data/pokemon/dex_entries/cyndaquil.asm
diff --git a/data/pokedex/entries/delibird.asm b/data/pokemon/dex_entries/delibird.asm
index 2c998d8be..2c998d8be 100644
--- a/data/pokedex/entries/delibird.asm
+++ b/data/pokemon/dex_entries/delibird.asm
diff --git a/data/pokedex/entries/dewgong.asm b/data/pokemon/dex_entries/dewgong.asm
index a3ff9b6f5..a3ff9b6f5 100644
--- a/data/pokedex/entries/dewgong.asm
+++ b/data/pokemon/dex_entries/dewgong.asm
diff --git a/data/pokedex/entries/diglett.asm b/data/pokemon/dex_entries/diglett.asm
index 469d9311d..469d9311d 100644
--- a/data/pokedex/entries/diglett.asm
+++ b/data/pokemon/dex_entries/diglett.asm
diff --git a/data/pokedex/entries/ditto.asm b/data/pokemon/dex_entries/ditto.asm
index 5a838b5b8..5a838b5b8 100644
--- a/data/pokedex/entries/ditto.asm
+++ b/data/pokemon/dex_entries/ditto.asm
diff --git a/data/pokedex/entries/dodrio.asm b/data/pokemon/dex_entries/dodrio.asm
index ef495b99b..ef495b99b 100644
--- a/data/pokedex/entries/dodrio.asm
+++ b/data/pokemon/dex_entries/dodrio.asm
diff --git a/data/pokedex/entries/doduo.asm b/data/pokemon/dex_entries/doduo.asm
index 124469457..124469457 100644
--- a/data/pokedex/entries/doduo.asm
+++ b/data/pokemon/dex_entries/doduo.asm
diff --git a/data/pokedex/entries/donphan.asm b/data/pokemon/dex_entries/donphan.asm
index 4dc489938..4dc489938 100644
--- a/data/pokedex/entries/donphan.asm
+++ b/data/pokemon/dex_entries/donphan.asm
diff --git a/data/pokedex/entries/dragonair.asm b/data/pokemon/dex_entries/dragonair.asm
index cef4f8f29..cef4f8f29 100644
--- a/data/pokedex/entries/dragonair.asm
+++ b/data/pokemon/dex_entries/dragonair.asm
diff --git a/data/pokedex/entries/dragonite.asm b/data/pokemon/dex_entries/dragonite.asm
index bbbc6cff0..bbbc6cff0 100644
--- a/data/pokedex/entries/dragonite.asm
+++ b/data/pokemon/dex_entries/dragonite.asm
diff --git a/data/pokedex/entries/dratini.asm b/data/pokemon/dex_entries/dratini.asm
index ef16aa20c..ef16aa20c 100644
--- a/data/pokedex/entries/dratini.asm
+++ b/data/pokemon/dex_entries/dratini.asm
diff --git a/data/pokedex/entries/drowzee.asm b/data/pokemon/dex_entries/drowzee.asm
index 34ae54435..34ae54435 100644
--- a/data/pokedex/entries/drowzee.asm
+++ b/data/pokemon/dex_entries/drowzee.asm
diff --git a/data/pokedex/entries/dugtrio.asm b/data/pokemon/dex_entries/dugtrio.asm
index 829e2aa09..829e2aa09 100644
--- a/data/pokedex/entries/dugtrio.asm
+++ b/data/pokemon/dex_entries/dugtrio.asm
diff --git a/data/pokedex/entries/dunsparce.asm b/data/pokemon/dex_entries/dunsparce.asm
index 7a9d812f3..7a9d812f3 100644
--- a/data/pokedex/entries/dunsparce.asm
+++ b/data/pokemon/dex_entries/dunsparce.asm
diff --git a/data/pokedex/entries/eevee.asm b/data/pokemon/dex_entries/eevee.asm
index 3081a5829..3081a5829 100644
--- a/data/pokedex/entries/eevee.asm
+++ b/data/pokemon/dex_entries/eevee.asm
diff --git a/data/pokedex/entries/ekans.asm b/data/pokemon/dex_entries/ekans.asm
index 23faa4854..23faa4854 100644
--- a/data/pokedex/entries/ekans.asm
+++ b/data/pokemon/dex_entries/ekans.asm
diff --git a/data/pokedex/entries/electabuzz.asm b/data/pokemon/dex_entries/electabuzz.asm
index e6bf15587..e6bf15587 100644
--- a/data/pokedex/entries/electabuzz.asm
+++ b/data/pokemon/dex_entries/electabuzz.asm
diff --git a/data/pokedex/entries/electrode.asm b/data/pokemon/dex_entries/electrode.asm
index 48d523c69..48d523c69 100644
--- a/data/pokedex/entries/electrode.asm
+++ b/data/pokemon/dex_entries/electrode.asm
diff --git a/data/pokedex/entries/elekid.asm b/data/pokemon/dex_entries/elekid.asm
index 6a046bda4..6a046bda4 100644
--- a/data/pokedex/entries/elekid.asm
+++ b/data/pokemon/dex_entries/elekid.asm
diff --git a/data/pokedex/entries/entei.asm b/data/pokemon/dex_entries/entei.asm
index 3784a898c..3784a898c 100644
--- a/data/pokedex/entries/entei.asm
+++ b/data/pokemon/dex_entries/entei.asm
diff --git a/data/pokedex/entries/espeon.asm b/data/pokemon/dex_entries/espeon.asm
index 059b01fbe..059b01fbe 100644
--- a/data/pokedex/entries/espeon.asm
+++ b/data/pokemon/dex_entries/espeon.asm
diff --git a/data/pokedex/entries/exeggcute.asm b/data/pokemon/dex_entries/exeggcute.asm
index 01453955e..01453955e 100644
--- a/data/pokedex/entries/exeggcute.asm
+++ b/data/pokemon/dex_entries/exeggcute.asm
diff --git a/data/pokedex/entries/exeggutor.asm b/data/pokemon/dex_entries/exeggutor.asm
index abefffd69..abefffd69 100644
--- a/data/pokedex/entries/exeggutor.asm
+++ b/data/pokemon/dex_entries/exeggutor.asm
diff --git a/data/pokedex/entries/farfetch_d.asm b/data/pokemon/dex_entries/farfetch_d.asm
index c9e756a6a..c9e756a6a 100644
--- a/data/pokedex/entries/farfetch_d.asm
+++ b/data/pokemon/dex_entries/farfetch_d.asm
diff --git a/data/pokedex/entries/fearow.asm b/data/pokemon/dex_entries/fearow.asm
index 90de6a612..90de6a612 100644
--- a/data/pokedex/entries/fearow.asm
+++ b/data/pokemon/dex_entries/fearow.asm
diff --git a/data/pokedex/entries/feraligatr.asm b/data/pokemon/dex_entries/feraligatr.asm
index cb3672c92..cb3672c92 100644
--- a/data/pokedex/entries/feraligatr.asm
+++ b/data/pokemon/dex_entries/feraligatr.asm
diff --git a/data/pokedex/entries/flaaffy.asm b/data/pokemon/dex_entries/flaaffy.asm
index 04bcc0668..04bcc0668 100644
--- a/data/pokedex/entries/flaaffy.asm
+++ b/data/pokemon/dex_entries/flaaffy.asm
diff --git a/data/pokedex/entries/flareon.asm b/data/pokemon/dex_entries/flareon.asm
index ba3e0399d..ba3e0399d 100644
--- a/data/pokedex/entries/flareon.asm
+++ b/data/pokemon/dex_entries/flareon.asm
diff --git a/data/pokedex/entries/forretress.asm b/data/pokemon/dex_entries/forretress.asm
index 8644b4b39..8644b4b39 100644
--- a/data/pokedex/entries/forretress.asm
+++ b/data/pokemon/dex_entries/forretress.asm
diff --git a/data/pokedex/entries/furret.asm b/data/pokemon/dex_entries/furret.asm
index 653a3dead..653a3dead 100644
--- a/data/pokedex/entries/furret.asm
+++ b/data/pokemon/dex_entries/furret.asm
diff --git a/data/pokedex/entries/gastly.asm b/data/pokemon/dex_entries/gastly.asm
index db7f6d57d..db7f6d57d 100644
--- a/data/pokedex/entries/gastly.asm
+++ b/data/pokemon/dex_entries/gastly.asm
diff --git a/data/pokedex/entries/gengar.asm b/data/pokemon/dex_entries/gengar.asm
index e9650fb39..e9650fb39 100644
--- a/data/pokedex/entries/gengar.asm
+++ b/data/pokemon/dex_entries/gengar.asm
diff --git a/data/pokedex/entries/geodude.asm b/data/pokemon/dex_entries/geodude.asm
index 389ce042a..389ce042a 100644
--- a/data/pokedex/entries/geodude.asm
+++ b/data/pokemon/dex_entries/geodude.asm
diff --git a/data/pokedex/entries/girafarig.asm b/data/pokemon/dex_entries/girafarig.asm
index 527aa9807..527aa9807 100644
--- a/data/pokedex/entries/girafarig.asm
+++ b/data/pokemon/dex_entries/girafarig.asm
diff --git a/data/pokedex/entries/gligar.asm b/data/pokemon/dex_entries/gligar.asm
index 43c4c95ce..43c4c95ce 100644
--- a/data/pokedex/entries/gligar.asm
+++ b/data/pokemon/dex_entries/gligar.asm
diff --git a/data/pokedex/entries/gloom.asm b/data/pokemon/dex_entries/gloom.asm
index 0552a8d0c..0552a8d0c 100644
--- a/data/pokedex/entries/gloom.asm
+++ b/data/pokemon/dex_entries/gloom.asm
diff --git a/data/pokedex/entries/golbat.asm b/data/pokemon/dex_entries/golbat.asm
index 434108bf4..434108bf4 100644
--- a/data/pokedex/entries/golbat.asm
+++ b/data/pokemon/dex_entries/golbat.asm
diff --git a/data/pokedex/entries/goldeen.asm b/data/pokemon/dex_entries/goldeen.asm
index 101edf434..101edf434 100644
--- a/data/pokedex/entries/goldeen.asm
+++ b/data/pokemon/dex_entries/goldeen.asm
diff --git a/data/pokedex/entries/golduck.asm b/data/pokemon/dex_entries/golduck.asm
index b38cfd2dc..b38cfd2dc 100644
--- a/data/pokedex/entries/golduck.asm
+++ b/data/pokemon/dex_entries/golduck.asm
diff --git a/data/pokedex/entries/golem.asm b/data/pokemon/dex_entries/golem.asm
index dbb5a8e3d..dbb5a8e3d 100644
--- a/data/pokedex/entries/golem.asm
+++ b/data/pokemon/dex_entries/golem.asm
diff --git a/data/pokedex/entries/granbull.asm b/data/pokemon/dex_entries/granbull.asm
index 15f3e194c..15f3e194c 100644
--- a/data/pokedex/entries/granbull.asm
+++ b/data/pokemon/dex_entries/granbull.asm
diff --git a/data/pokedex/entries/graveler.asm b/data/pokemon/dex_entries/graveler.asm
index 3bf04148c..3bf04148c 100644
--- a/data/pokedex/entries/graveler.asm
+++ b/data/pokemon/dex_entries/graveler.asm
diff --git a/data/pokedex/entries/grimer.asm b/data/pokemon/dex_entries/grimer.asm
index bda09cf94..bda09cf94 100644
--- a/data/pokedex/entries/grimer.asm
+++ b/data/pokemon/dex_entries/grimer.asm
diff --git a/data/pokedex/entries/growlithe.asm b/data/pokemon/dex_entries/growlithe.asm
index cd261d886..cd261d886 100644
--- a/data/pokedex/entries/growlithe.asm
+++ b/data/pokemon/dex_entries/growlithe.asm
diff --git a/data/pokedex/entries/gyarados.asm b/data/pokemon/dex_entries/gyarados.asm
index 767380680..767380680 100644
--- a/data/pokedex/entries/gyarados.asm
+++ b/data/pokemon/dex_entries/gyarados.asm
diff --git a/data/pokedex/entries/haunter.asm b/data/pokemon/dex_entries/haunter.asm
index 6efe4b15c..6efe4b15c 100644
--- a/data/pokedex/entries/haunter.asm
+++ b/data/pokemon/dex_entries/haunter.asm
diff --git a/data/pokedex/entries/heracross.asm b/data/pokemon/dex_entries/heracross.asm
index ed709b526..ed709b526 100644
--- a/data/pokedex/entries/heracross.asm
+++ b/data/pokemon/dex_entries/heracross.asm
diff --git a/data/pokedex/entries/hitmonchan.asm b/data/pokemon/dex_entries/hitmonchan.asm
index e5686b1a5..e5686b1a5 100644
--- a/data/pokedex/entries/hitmonchan.asm
+++ b/data/pokemon/dex_entries/hitmonchan.asm
diff --git a/data/pokedex/entries/hitmonlee.asm b/data/pokemon/dex_entries/hitmonlee.asm
index 0215d3bdc..0215d3bdc 100644
--- a/data/pokedex/entries/hitmonlee.asm
+++ b/data/pokemon/dex_entries/hitmonlee.asm
diff --git a/data/pokedex/entries/hitmontop.asm b/data/pokemon/dex_entries/hitmontop.asm
index 14175ec8a..14175ec8a 100644
--- a/data/pokedex/entries/hitmontop.asm
+++ b/data/pokemon/dex_entries/hitmontop.asm
diff --git a/data/pokedex/entries/ho_oh.asm b/data/pokemon/dex_entries/ho_oh.asm
index 1d74cd058..1d74cd058 100644
--- a/data/pokedex/entries/ho_oh.asm
+++ b/data/pokemon/dex_entries/ho_oh.asm
diff --git a/data/pokedex/entries/hoothoot.asm b/data/pokemon/dex_entries/hoothoot.asm
index 88039eea8..88039eea8 100644
--- a/data/pokedex/entries/hoothoot.asm
+++ b/data/pokemon/dex_entries/hoothoot.asm
diff --git a/data/pokedex/entries/hoppip.asm b/data/pokemon/dex_entries/hoppip.asm
index 734ddc766..734ddc766 100644
--- a/data/pokedex/entries/hoppip.asm
+++ b/data/pokemon/dex_entries/hoppip.asm
diff --git a/data/pokedex/entries/horsea.asm b/data/pokemon/dex_entries/horsea.asm
index dd50057e7..dd50057e7 100644
--- a/data/pokedex/entries/horsea.asm
+++ b/data/pokemon/dex_entries/horsea.asm
diff --git a/data/pokedex/entries/houndoom.asm b/data/pokemon/dex_entries/houndoom.asm
index 6a21602f3..6a21602f3 100644
--- a/data/pokedex/entries/houndoom.asm
+++ b/data/pokemon/dex_entries/houndoom.asm
diff --git a/data/pokedex/entries/houndour.asm b/data/pokemon/dex_entries/houndour.asm
index 5fa89fe85..5fa89fe85 100644
--- a/data/pokedex/entries/houndour.asm
+++ b/data/pokemon/dex_entries/houndour.asm
diff --git a/data/pokedex/entries/hypno.asm b/data/pokemon/dex_entries/hypno.asm
index 2309a6bfa..2309a6bfa 100644
--- a/data/pokedex/entries/hypno.asm
+++ b/data/pokemon/dex_entries/hypno.asm
diff --git a/data/pokedex/entries/igglybuff.asm b/data/pokemon/dex_entries/igglybuff.asm
index aa1c1cabf..aa1c1cabf 100644
--- a/data/pokedex/entries/igglybuff.asm
+++ b/data/pokemon/dex_entries/igglybuff.asm
diff --git a/data/pokedex/entries/ivysaur.asm b/data/pokemon/dex_entries/ivysaur.asm
index 66d16d323..66d16d323 100644
--- a/data/pokedex/entries/ivysaur.asm
+++ b/data/pokemon/dex_entries/ivysaur.asm
diff --git a/data/pokedex/entries/jigglypuff.asm b/data/pokemon/dex_entries/jigglypuff.asm
index 01a3b4480..01a3b4480 100644
--- a/data/pokedex/entries/jigglypuff.asm
+++ b/data/pokemon/dex_entries/jigglypuff.asm
diff --git a/data/pokedex/entries/jolteon.asm b/data/pokemon/dex_entries/jolteon.asm
index 9b9149d9a..9b9149d9a 100644
--- a/data/pokedex/entries/jolteon.asm
+++ b/data/pokemon/dex_entries/jolteon.asm
diff --git a/data/pokedex/entries/jumpluff.asm b/data/pokemon/dex_entries/jumpluff.asm
index 0aade0b75..0aade0b75 100644
--- a/data/pokedex/entries/jumpluff.asm
+++ b/data/pokemon/dex_entries/jumpluff.asm
diff --git a/data/pokedex/entries/jynx.asm b/data/pokemon/dex_entries/jynx.asm
index b4b9eac8c..b4b9eac8c 100644
--- a/data/pokedex/entries/jynx.asm
+++ b/data/pokemon/dex_entries/jynx.asm
diff --git a/data/pokedex/entries/kabuto.asm b/data/pokemon/dex_entries/kabuto.asm
index 9231fb9be..9231fb9be 100644
--- a/data/pokedex/entries/kabuto.asm
+++ b/data/pokemon/dex_entries/kabuto.asm
diff --git a/data/pokedex/entries/kabutops.asm b/data/pokemon/dex_entries/kabutops.asm
index 8f5e1348b..8f5e1348b 100644
--- a/data/pokedex/entries/kabutops.asm
+++ b/data/pokemon/dex_entries/kabutops.asm
diff --git a/data/pokedex/entries/kadabra.asm b/data/pokemon/dex_entries/kadabra.asm
index 26226724f..26226724f 100644
--- a/data/pokedex/entries/kadabra.asm
+++ b/data/pokemon/dex_entries/kadabra.asm
diff --git a/data/pokedex/entries/kakuna.asm b/data/pokemon/dex_entries/kakuna.asm
index 469e14bf6..469e14bf6 100644
--- a/data/pokedex/entries/kakuna.asm
+++ b/data/pokemon/dex_entries/kakuna.asm
diff --git a/data/pokedex/entries/kangaskhan.asm b/data/pokemon/dex_entries/kangaskhan.asm
index ec2050845..ec2050845 100644
--- a/data/pokedex/entries/kangaskhan.asm
+++ b/data/pokemon/dex_entries/kangaskhan.asm
diff --git a/data/pokedex/entries/kingdra.asm b/data/pokemon/dex_entries/kingdra.asm
index 555601b51..555601b51 100644
--- a/data/pokedex/entries/kingdra.asm
+++ b/data/pokemon/dex_entries/kingdra.asm
diff --git a/data/pokedex/entries/kingler.asm b/data/pokemon/dex_entries/kingler.asm
index 25685d517..25685d517 100644
--- a/data/pokedex/entries/kingler.asm
+++ b/data/pokemon/dex_entries/kingler.asm
diff --git a/data/pokedex/entries/koffing.asm b/data/pokemon/dex_entries/koffing.asm
index 20bde8671..20bde8671 100644
--- a/data/pokedex/entries/koffing.asm
+++ b/data/pokemon/dex_entries/koffing.asm
diff --git a/data/pokedex/entries/krabby.asm b/data/pokemon/dex_entries/krabby.asm
index 2435cd64d..2435cd64d 100644
--- a/data/pokedex/entries/krabby.asm
+++ b/data/pokemon/dex_entries/krabby.asm
diff --git a/data/pokedex/entries/lanturn.asm b/data/pokemon/dex_entries/lanturn.asm
index 3aa2b5523..3aa2b5523 100644
--- a/data/pokedex/entries/lanturn.asm
+++ b/data/pokemon/dex_entries/lanturn.asm
diff --git a/data/pokedex/entries/lapras.asm b/data/pokemon/dex_entries/lapras.asm
index 550d6e12c..550d6e12c 100644
--- a/data/pokedex/entries/lapras.asm
+++ b/data/pokemon/dex_entries/lapras.asm
diff --git a/data/pokedex/entries/larvitar.asm b/data/pokemon/dex_entries/larvitar.asm
index 14ec08c7b..14ec08c7b 100644
--- a/data/pokedex/entries/larvitar.asm
+++ b/data/pokemon/dex_entries/larvitar.asm
diff --git a/data/pokedex/entries/ledian.asm b/data/pokemon/dex_entries/ledian.asm
index a112aa722..a112aa722 100644
--- a/data/pokedex/entries/ledian.asm
+++ b/data/pokemon/dex_entries/ledian.asm
diff --git a/data/pokedex/entries/ledyba.asm b/data/pokemon/dex_entries/ledyba.asm
index 1e62ab4b1..1e62ab4b1 100644
--- a/data/pokedex/entries/ledyba.asm
+++ b/data/pokemon/dex_entries/ledyba.asm
diff --git a/data/pokedex/entries/lickitung.asm b/data/pokemon/dex_entries/lickitung.asm
index 0003f14dc..0003f14dc 100644
--- a/data/pokedex/entries/lickitung.asm
+++ b/data/pokemon/dex_entries/lickitung.asm
diff --git a/data/pokedex/entries/lugia.asm b/data/pokemon/dex_entries/lugia.asm
index c15345300..c15345300 100644
--- a/data/pokedex/entries/lugia.asm
+++ b/data/pokemon/dex_entries/lugia.asm
diff --git a/data/pokedex/entries/machamp.asm b/data/pokemon/dex_entries/machamp.asm
index 0ff42bf5f..0ff42bf5f 100644
--- a/data/pokedex/entries/machamp.asm
+++ b/data/pokemon/dex_entries/machamp.asm
diff --git a/data/pokedex/entries/machoke.asm b/data/pokemon/dex_entries/machoke.asm
index 53523a832..53523a832 100644
--- a/data/pokedex/entries/machoke.asm
+++ b/data/pokemon/dex_entries/machoke.asm
diff --git a/data/pokedex/entries/machop.asm b/data/pokemon/dex_entries/machop.asm
index aba71bc04..aba71bc04 100644
--- a/data/pokedex/entries/machop.asm
+++ b/data/pokemon/dex_entries/machop.asm
diff --git a/data/pokedex/entries/magby.asm b/data/pokemon/dex_entries/magby.asm
index 53f9e1129..53f9e1129 100644
--- a/data/pokedex/entries/magby.asm
+++ b/data/pokemon/dex_entries/magby.asm
diff --git a/data/pokedex/entries/magcargo.asm b/data/pokemon/dex_entries/magcargo.asm
index 5f1122906..5f1122906 100644
--- a/data/pokedex/entries/magcargo.asm
+++ b/data/pokemon/dex_entries/magcargo.asm
diff --git a/data/pokedex/entries/magikarp.asm b/data/pokemon/dex_entries/magikarp.asm
index 765840899..765840899 100644
--- a/data/pokedex/entries/magikarp.asm
+++ b/data/pokemon/dex_entries/magikarp.asm
diff --git a/data/pokedex/entries/magmar.asm b/data/pokemon/dex_entries/magmar.asm
index 1bfa961f9..1bfa961f9 100644
--- a/data/pokedex/entries/magmar.asm
+++ b/data/pokemon/dex_entries/magmar.asm
diff --git a/data/pokedex/entries/magnemite.asm b/data/pokemon/dex_entries/magnemite.asm
index e7703e050..e7703e050 100644
--- a/data/pokedex/entries/magnemite.asm
+++ b/data/pokemon/dex_entries/magnemite.asm
diff --git a/data/pokedex/entries/magneton.asm b/data/pokemon/dex_entries/magneton.asm
index 115506ad6..115506ad6 100644
--- a/data/pokedex/entries/magneton.asm
+++ b/data/pokemon/dex_entries/magneton.asm
diff --git a/data/pokedex/entries/mankey.asm b/data/pokemon/dex_entries/mankey.asm
index 59dfc4919..59dfc4919 100644
--- a/data/pokedex/entries/mankey.asm
+++ b/data/pokemon/dex_entries/mankey.asm
diff --git a/data/pokedex/entries/mantine.asm b/data/pokemon/dex_entries/mantine.asm
index 880c4f179..880c4f179 100644
--- a/data/pokedex/entries/mantine.asm
+++ b/data/pokemon/dex_entries/mantine.asm
diff --git a/data/pokedex/entries/mareep.asm b/data/pokemon/dex_entries/mareep.asm
index 94f78ee31..94f78ee31 100644
--- a/data/pokedex/entries/mareep.asm
+++ b/data/pokemon/dex_entries/mareep.asm
diff --git a/data/pokedex/entries/marill.asm b/data/pokemon/dex_entries/marill.asm
index 6afbc2902..6afbc2902 100644
--- a/data/pokedex/entries/marill.asm
+++ b/data/pokemon/dex_entries/marill.asm
diff --git a/data/pokedex/entries/marowak.asm b/data/pokemon/dex_entries/marowak.asm
index 01baf04e3..01baf04e3 100644
--- a/data/pokedex/entries/marowak.asm
+++ b/data/pokemon/dex_entries/marowak.asm
diff --git a/data/pokedex/entries/meganium.asm b/data/pokemon/dex_entries/meganium.asm
index dead64ff5..dead64ff5 100644
--- a/data/pokedex/entries/meganium.asm
+++ b/data/pokemon/dex_entries/meganium.asm
diff --git a/data/pokedex/entries/meowth.asm b/data/pokemon/dex_entries/meowth.asm
index 9fe66977b..9fe66977b 100644
--- a/data/pokedex/entries/meowth.asm
+++ b/data/pokemon/dex_entries/meowth.asm
diff --git a/data/pokedex/entries/metapod.asm b/data/pokemon/dex_entries/metapod.asm
index b2c6b78b7..b2c6b78b7 100644
--- a/data/pokedex/entries/metapod.asm
+++ b/data/pokemon/dex_entries/metapod.asm
diff --git a/data/pokedex/entries/mew.asm b/data/pokemon/dex_entries/mew.asm
index 9da7f6a17..9da7f6a17 100644
--- a/data/pokedex/entries/mew.asm
+++ b/data/pokemon/dex_entries/mew.asm
diff --git a/data/pokedex/entries/mewtwo.asm b/data/pokemon/dex_entries/mewtwo.asm
index eb41ebb90..eb41ebb90 100644
--- a/data/pokedex/entries/mewtwo.asm
+++ b/data/pokemon/dex_entries/mewtwo.asm
diff --git a/data/pokedex/entries/miltank.asm b/data/pokemon/dex_entries/miltank.asm
index 1f85ef668..1f85ef668 100644
--- a/data/pokedex/entries/miltank.asm
+++ b/data/pokemon/dex_entries/miltank.asm
diff --git a/data/pokedex/entries/misdreavus.asm b/data/pokemon/dex_entries/misdreavus.asm
index c3f1b002a..c3f1b002a 100644
--- a/data/pokedex/entries/misdreavus.asm
+++ b/data/pokemon/dex_entries/misdreavus.asm
diff --git a/data/pokedex/entries/moltres.asm b/data/pokemon/dex_entries/moltres.asm
index f459d622e..f459d622e 100644
--- a/data/pokedex/entries/moltres.asm
+++ b/data/pokemon/dex_entries/moltres.asm
diff --git a/data/pokedex/entries/mr__mime.asm b/data/pokemon/dex_entries/mr__mime.asm
index dce25be67..dce25be67 100644
--- a/data/pokedex/entries/mr__mime.asm
+++ b/data/pokemon/dex_entries/mr__mime.asm
diff --git a/data/pokedex/entries/muk.asm b/data/pokemon/dex_entries/muk.asm
index 49512c99f..49512c99f 100644
--- a/data/pokedex/entries/muk.asm
+++ b/data/pokemon/dex_entries/muk.asm
diff --git a/data/pokedex/entries/murkrow.asm b/data/pokemon/dex_entries/murkrow.asm
index 6a0f42145..6a0f42145 100644
--- a/data/pokedex/entries/murkrow.asm
+++ b/data/pokemon/dex_entries/murkrow.asm
diff --git a/data/pokedex/entries/natu.asm b/data/pokemon/dex_entries/natu.asm
index 20958dbff..20958dbff 100644
--- a/data/pokedex/entries/natu.asm
+++ b/data/pokemon/dex_entries/natu.asm
diff --git a/data/pokedex/entries/nidoking.asm b/data/pokemon/dex_entries/nidoking.asm
index 97c203064..97c203064 100644
--- a/data/pokedex/entries/nidoking.asm
+++ b/data/pokemon/dex_entries/nidoking.asm
diff --git a/data/pokedex/entries/nidoqueen.asm b/data/pokemon/dex_entries/nidoqueen.asm
index c0f711eb4..c0f711eb4 100644
--- a/data/pokedex/entries/nidoqueen.asm
+++ b/data/pokemon/dex_entries/nidoqueen.asm
diff --git a/data/pokedex/entries/nidoran_f.asm b/data/pokemon/dex_entries/nidoran_f.asm
index 4e7299b0d..4e7299b0d 100644
--- a/data/pokedex/entries/nidoran_f.asm
+++ b/data/pokemon/dex_entries/nidoran_f.asm
diff --git a/data/pokedex/entries/nidoran_m.asm b/data/pokemon/dex_entries/nidoran_m.asm
index 8970afc36..8970afc36 100644
--- a/data/pokedex/entries/nidoran_m.asm
+++ b/data/pokemon/dex_entries/nidoran_m.asm
diff --git a/data/pokedex/entries/nidorina.asm b/data/pokemon/dex_entries/nidorina.asm
index 93c1e164d..93c1e164d 100644
--- a/data/pokedex/entries/nidorina.asm
+++ b/data/pokemon/dex_entries/nidorina.asm
diff --git a/data/pokedex/entries/nidorino.asm b/data/pokemon/dex_entries/nidorino.asm
index 6b1403ad2..6b1403ad2 100644
--- a/data/pokedex/entries/nidorino.asm
+++ b/data/pokemon/dex_entries/nidorino.asm
diff --git a/data/pokedex/entries/ninetales.asm b/data/pokemon/dex_entries/ninetales.asm
index fd3a66ffb..fd3a66ffb 100644
--- a/data/pokedex/entries/ninetales.asm
+++ b/data/pokemon/dex_entries/ninetales.asm
diff --git a/data/pokedex/entries/noctowl.asm b/data/pokemon/dex_entries/noctowl.asm
index b939cfe05..b939cfe05 100644
--- a/data/pokedex/entries/noctowl.asm
+++ b/data/pokemon/dex_entries/noctowl.asm
diff --git a/data/pokedex/entries/octillery.asm b/data/pokemon/dex_entries/octillery.asm
index 902c1bf9a..902c1bf9a 100644
--- a/data/pokedex/entries/octillery.asm
+++ b/data/pokemon/dex_entries/octillery.asm
diff --git a/data/pokedex/entries/oddish.asm b/data/pokemon/dex_entries/oddish.asm
index 84560c113..84560c113 100644
--- a/data/pokedex/entries/oddish.asm
+++ b/data/pokemon/dex_entries/oddish.asm
diff --git a/data/pokedex/entries/omanyte.asm b/data/pokemon/dex_entries/omanyte.asm
index 9f7948fe0..9f7948fe0 100644
--- a/data/pokedex/entries/omanyte.asm
+++ b/data/pokemon/dex_entries/omanyte.asm
diff --git a/data/pokedex/entries/omastar.asm b/data/pokemon/dex_entries/omastar.asm
index 65ba92356..65ba92356 100644
--- a/data/pokedex/entries/omastar.asm
+++ b/data/pokemon/dex_entries/omastar.asm
diff --git a/data/pokedex/entries/onix.asm b/data/pokemon/dex_entries/onix.asm
index f0f88fcff..f0f88fcff 100644
--- a/data/pokedex/entries/onix.asm
+++ b/data/pokemon/dex_entries/onix.asm
diff --git a/data/pokedex/entries/paras.asm b/data/pokemon/dex_entries/paras.asm
index 152e1fcc0..152e1fcc0 100644
--- a/data/pokedex/entries/paras.asm
+++ b/data/pokemon/dex_entries/paras.asm
diff --git a/data/pokedex/entries/parasect.asm b/data/pokemon/dex_entries/parasect.asm
index bd912212e..bd912212e 100644
--- a/data/pokedex/entries/parasect.asm
+++ b/data/pokemon/dex_entries/parasect.asm
diff --git a/data/pokedex/entries/persian.asm b/data/pokemon/dex_entries/persian.asm
index 7ce74f6f8..7ce74f6f8 100644
--- a/data/pokedex/entries/persian.asm
+++ b/data/pokemon/dex_entries/persian.asm
diff --git a/data/pokedex/entries/phanpy.asm b/data/pokemon/dex_entries/phanpy.asm
index a7393e546..a7393e546 100644
--- a/data/pokedex/entries/phanpy.asm
+++ b/data/pokemon/dex_entries/phanpy.asm
diff --git a/data/pokedex/entries/pichu.asm b/data/pokemon/dex_entries/pichu.asm
index b31976aaf..b31976aaf 100644
--- a/data/pokedex/entries/pichu.asm
+++ b/data/pokemon/dex_entries/pichu.asm
diff --git a/data/pokedex/entries/pidgeot.asm b/data/pokemon/dex_entries/pidgeot.asm
index 16a877427..16a877427 100644
--- a/data/pokedex/entries/pidgeot.asm
+++ b/data/pokemon/dex_entries/pidgeot.asm
diff --git a/data/pokedex/entries/pidgeotto.asm b/data/pokemon/dex_entries/pidgeotto.asm
index 1ab6fde5c..1ab6fde5c 100644
--- a/data/pokedex/entries/pidgeotto.asm
+++ b/data/pokemon/dex_entries/pidgeotto.asm
diff --git a/data/pokedex/entries/pidgey.asm b/data/pokemon/dex_entries/pidgey.asm
index 491dfb9b9..491dfb9b9 100644
--- a/data/pokedex/entries/pidgey.asm
+++ b/data/pokemon/dex_entries/pidgey.asm
diff --git a/data/pokedex/entries/pikachu.asm b/data/pokemon/dex_entries/pikachu.asm
index 680e24673..680e24673 100644
--- a/data/pokedex/entries/pikachu.asm
+++ b/data/pokemon/dex_entries/pikachu.asm
diff --git a/data/pokedex/entries/piloswine.asm b/data/pokemon/dex_entries/piloswine.asm
index 326ea4503..326ea4503 100644
--- a/data/pokedex/entries/piloswine.asm
+++ b/data/pokemon/dex_entries/piloswine.asm
diff --git a/data/pokedex/entries/pineco.asm b/data/pokemon/dex_entries/pineco.asm
index 9781b094e..9781b094e 100644
--- a/data/pokedex/entries/pineco.asm
+++ b/data/pokemon/dex_entries/pineco.asm
diff --git a/data/pokedex/entries/pinsir.asm b/data/pokemon/dex_entries/pinsir.asm
index c236b3594..c236b3594 100644
--- a/data/pokedex/entries/pinsir.asm
+++ b/data/pokemon/dex_entries/pinsir.asm
diff --git a/data/pokedex/entries/politoed.asm b/data/pokemon/dex_entries/politoed.asm
index 0dea3d572..0dea3d572 100644
--- a/data/pokedex/entries/politoed.asm
+++ b/data/pokemon/dex_entries/politoed.asm
diff --git a/data/pokedex/entries/poliwag.asm b/data/pokemon/dex_entries/poliwag.asm
index d21677cc4..d21677cc4 100644
--- a/data/pokedex/entries/poliwag.asm
+++ b/data/pokemon/dex_entries/poliwag.asm
diff --git a/data/pokedex/entries/poliwhirl.asm b/data/pokemon/dex_entries/poliwhirl.asm
index 69a6ee206..69a6ee206 100644
--- a/data/pokedex/entries/poliwhirl.asm
+++ b/data/pokemon/dex_entries/poliwhirl.asm
diff --git a/data/pokedex/entries/poliwrath.asm b/data/pokemon/dex_entries/poliwrath.asm
index bb3e7dda5..bb3e7dda5 100644
--- a/data/pokedex/entries/poliwrath.asm
+++ b/data/pokemon/dex_entries/poliwrath.asm
diff --git a/data/pokedex/entries/ponyta.asm b/data/pokemon/dex_entries/ponyta.asm
index fa123cde1..fa123cde1 100644
--- a/data/pokedex/entries/ponyta.asm
+++ b/data/pokemon/dex_entries/ponyta.asm
diff --git a/data/pokedex/entries/porygon.asm b/data/pokemon/dex_entries/porygon.asm
index 9a73c9623..9a73c9623 100644
--- a/data/pokedex/entries/porygon.asm
+++ b/data/pokemon/dex_entries/porygon.asm
diff --git a/data/pokedex/entries/porygon2.asm b/data/pokemon/dex_entries/porygon2.asm
index 8591e0039..8591e0039 100644
--- a/data/pokedex/entries/porygon2.asm
+++ b/data/pokemon/dex_entries/porygon2.asm
diff --git a/data/pokedex/entries/primeape.asm b/data/pokemon/dex_entries/primeape.asm
index 7d7f211cc..7d7f211cc 100644
--- a/data/pokedex/entries/primeape.asm
+++ b/data/pokemon/dex_entries/primeape.asm
diff --git a/data/pokedex/entries/psyduck.asm b/data/pokemon/dex_entries/psyduck.asm
index 088b4ff76..088b4ff76 100644
--- a/data/pokedex/entries/psyduck.asm
+++ b/data/pokemon/dex_entries/psyduck.asm
diff --git a/data/pokedex/entries/pupitar.asm b/data/pokemon/dex_entries/pupitar.asm
index d35e457ad..d35e457ad 100644
--- a/data/pokedex/entries/pupitar.asm
+++ b/data/pokemon/dex_entries/pupitar.asm
diff --git a/data/pokedex/entries/quagsire.asm b/data/pokemon/dex_entries/quagsire.asm
index 053058d54..053058d54 100644
--- a/data/pokedex/entries/quagsire.asm
+++ b/data/pokemon/dex_entries/quagsire.asm
diff --git a/data/pokedex/entries/quilava.asm b/data/pokemon/dex_entries/quilava.asm
index aaf8069af..aaf8069af 100644
--- a/data/pokedex/entries/quilava.asm
+++ b/data/pokemon/dex_entries/quilava.asm
diff --git a/data/pokedex/entries/qwilfish.asm b/data/pokemon/dex_entries/qwilfish.asm
index d9529146f..d9529146f 100644
--- a/data/pokedex/entries/qwilfish.asm
+++ b/data/pokemon/dex_entries/qwilfish.asm
diff --git a/data/pokedex/entries/raichu.asm b/data/pokemon/dex_entries/raichu.asm
index 886aef283..886aef283 100644
--- a/data/pokedex/entries/raichu.asm
+++ b/data/pokemon/dex_entries/raichu.asm
diff --git a/data/pokedex/entries/raikou.asm b/data/pokemon/dex_entries/raikou.asm
index 315eb84ae..315eb84ae 100644
--- a/data/pokedex/entries/raikou.asm
+++ b/data/pokemon/dex_entries/raikou.asm
diff --git a/data/pokedex/entries/rapidash.asm b/data/pokemon/dex_entries/rapidash.asm
index ae98e2cb8..ae98e2cb8 100644
--- a/data/pokedex/entries/rapidash.asm
+++ b/data/pokemon/dex_entries/rapidash.asm
diff --git a/data/pokedex/entries/raticate.asm b/data/pokemon/dex_entries/raticate.asm
index f009c29aa..f009c29aa 100644
--- a/data/pokedex/entries/raticate.asm
+++ b/data/pokemon/dex_entries/raticate.asm
diff --git a/data/pokedex/entries/rattata.asm b/data/pokemon/dex_entries/rattata.asm
index 0a066eb74..0a066eb74 100644
--- a/data/pokedex/entries/rattata.asm
+++ b/data/pokemon/dex_entries/rattata.asm
diff --git a/data/pokedex/entries/remoraid.asm b/data/pokemon/dex_entries/remoraid.asm
index aaa6f1a49..aaa6f1a49 100644
--- a/data/pokedex/entries/remoraid.asm
+++ b/data/pokemon/dex_entries/remoraid.asm
diff --git a/data/pokedex/entries/rhydon.asm b/data/pokemon/dex_entries/rhydon.asm
index c820666b3..c820666b3 100644
--- a/data/pokedex/entries/rhydon.asm
+++ b/data/pokemon/dex_entries/rhydon.asm
diff --git a/data/pokedex/entries/rhyhorn.asm b/data/pokemon/dex_entries/rhyhorn.asm
index b2f26e204..b2f26e204 100644
--- a/data/pokedex/entries/rhyhorn.asm
+++ b/data/pokemon/dex_entries/rhyhorn.asm
diff --git a/data/pokedex/entries/sandshrew.asm b/data/pokemon/dex_entries/sandshrew.asm
index 2ef83f9c3..2ef83f9c3 100644
--- a/data/pokedex/entries/sandshrew.asm
+++ b/data/pokemon/dex_entries/sandshrew.asm
diff --git a/data/pokedex/entries/sandslash.asm b/data/pokemon/dex_entries/sandslash.asm
index fd2492f91..fd2492f91 100644
--- a/data/pokedex/entries/sandslash.asm
+++ b/data/pokemon/dex_entries/sandslash.asm
diff --git a/data/pokedex/entries/scizor.asm b/data/pokemon/dex_entries/scizor.asm
index a000a6586..a000a6586 100644
--- a/data/pokedex/entries/scizor.asm
+++ b/data/pokemon/dex_entries/scizor.asm
diff --git a/data/pokedex/entries/scyther.asm b/data/pokemon/dex_entries/scyther.asm
index ca47c46b6..ca47c46b6 100644
--- a/data/pokedex/entries/scyther.asm
+++ b/data/pokemon/dex_entries/scyther.asm
diff --git a/data/pokedex/entries/seadra.asm b/data/pokemon/dex_entries/seadra.asm
index 91731c64a..91731c64a 100644
--- a/data/pokedex/entries/seadra.asm
+++ b/data/pokemon/dex_entries/seadra.asm
diff --git a/data/pokedex/entries/seaking.asm b/data/pokemon/dex_entries/seaking.asm
index 0d7d1fe48..0d7d1fe48 100644
--- a/data/pokedex/entries/seaking.asm
+++ b/data/pokemon/dex_entries/seaking.asm
diff --git a/data/pokedex/entries/seel.asm b/data/pokemon/dex_entries/seel.asm
index 53d179097..53d179097 100644
--- a/data/pokedex/entries/seel.asm
+++ b/data/pokemon/dex_entries/seel.asm
diff --git a/data/pokedex/entries/sentret.asm b/data/pokemon/dex_entries/sentret.asm
index 9e70418c8..9e70418c8 100644
--- a/data/pokedex/entries/sentret.asm
+++ b/data/pokemon/dex_entries/sentret.asm
diff --git a/data/pokedex/entries/shellder.asm b/data/pokemon/dex_entries/shellder.asm
index 0c7553c43..0c7553c43 100644
--- a/data/pokedex/entries/shellder.asm
+++ b/data/pokemon/dex_entries/shellder.asm
diff --git a/data/pokedex/entries/shuckle.asm b/data/pokemon/dex_entries/shuckle.asm
index 3795942e3..3795942e3 100644
--- a/data/pokedex/entries/shuckle.asm
+++ b/data/pokemon/dex_entries/shuckle.asm
diff --git a/data/pokedex/entries/skarmory.asm b/data/pokemon/dex_entries/skarmory.asm
index 2558065af..2558065af 100644
--- a/data/pokedex/entries/skarmory.asm
+++ b/data/pokemon/dex_entries/skarmory.asm
diff --git a/data/pokedex/entries/skiploom.asm b/data/pokemon/dex_entries/skiploom.asm
index f6e62266c..f6e62266c 100644
--- a/data/pokedex/entries/skiploom.asm
+++ b/data/pokemon/dex_entries/skiploom.asm
diff --git a/data/pokedex/entries/slowbro.asm b/data/pokemon/dex_entries/slowbro.asm
index fdfb36e98..fdfb36e98 100644
--- a/data/pokedex/entries/slowbro.asm
+++ b/data/pokemon/dex_entries/slowbro.asm
diff --git a/data/pokedex/entries/slowking.asm b/data/pokemon/dex_entries/slowking.asm
index f52bdb1b7..f52bdb1b7 100644
--- a/data/pokedex/entries/slowking.asm
+++ b/data/pokemon/dex_entries/slowking.asm
diff --git a/data/pokedex/entries/slowpoke.asm b/data/pokemon/dex_entries/slowpoke.asm
index 2341758f8..2341758f8 100644
--- a/data/pokedex/entries/slowpoke.asm
+++ b/data/pokemon/dex_entries/slowpoke.asm
diff --git a/data/pokedex/entries/slugma.asm b/data/pokemon/dex_entries/slugma.asm
index ea1fc01f2..ea1fc01f2 100644
--- a/data/pokedex/entries/slugma.asm
+++ b/data/pokemon/dex_entries/slugma.asm
diff --git a/data/pokedex/entries/smeargle.asm b/data/pokemon/dex_entries/smeargle.asm
index 8b265c1ea..8b265c1ea 100644
--- a/data/pokedex/entries/smeargle.asm
+++ b/data/pokemon/dex_entries/smeargle.asm
diff --git a/data/pokedex/entries/smoochum.asm b/data/pokemon/dex_entries/smoochum.asm
index b619b1720..b619b1720 100644
--- a/data/pokedex/entries/smoochum.asm
+++ b/data/pokemon/dex_entries/smoochum.asm
diff --git a/data/pokedex/entries/sneasel.asm b/data/pokemon/dex_entries/sneasel.asm
index 5c1e70f09..5c1e70f09 100644
--- a/data/pokedex/entries/sneasel.asm
+++ b/data/pokemon/dex_entries/sneasel.asm
diff --git a/data/pokedex/entries/snorlax.asm b/data/pokemon/dex_entries/snorlax.asm
index e56651fb8..e56651fb8 100644
--- a/data/pokedex/entries/snorlax.asm
+++ b/data/pokemon/dex_entries/snorlax.asm
diff --git a/data/pokedex/entries/snubbull.asm b/data/pokemon/dex_entries/snubbull.asm
index 97b27ed8f..97b27ed8f 100644
--- a/data/pokedex/entries/snubbull.asm
+++ b/data/pokemon/dex_entries/snubbull.asm
diff --git a/data/pokedex/entries/spearow.asm b/data/pokemon/dex_entries/spearow.asm
index 16b89d22f..16b89d22f 100644
--- a/data/pokedex/entries/spearow.asm
+++ b/data/pokemon/dex_entries/spearow.asm
diff --git a/data/pokedex/entries/spinarak.asm b/data/pokemon/dex_entries/spinarak.asm
index e6e4c7203..e6e4c7203 100644
--- a/data/pokedex/entries/spinarak.asm
+++ b/data/pokemon/dex_entries/spinarak.asm
diff --git a/data/pokedex/entries/squirtle.asm b/data/pokemon/dex_entries/squirtle.asm
index 6fd442a13..6fd442a13 100644
--- a/data/pokedex/entries/squirtle.asm
+++ b/data/pokemon/dex_entries/squirtle.asm
diff --git a/data/pokedex/entries/stantler.asm b/data/pokemon/dex_entries/stantler.asm
index 0fce8f2b5..0fce8f2b5 100644
--- a/data/pokedex/entries/stantler.asm
+++ b/data/pokemon/dex_entries/stantler.asm
diff --git a/data/pokedex/entries/starmie.asm b/data/pokemon/dex_entries/starmie.asm
index 83393b9c2..83393b9c2 100644
--- a/data/pokedex/entries/starmie.asm
+++ b/data/pokemon/dex_entries/starmie.asm
diff --git a/data/pokedex/entries/staryu.asm b/data/pokemon/dex_entries/staryu.asm
index 9f1fadc9c..9f1fadc9c 100644
--- a/data/pokedex/entries/staryu.asm
+++ b/data/pokemon/dex_entries/staryu.asm
diff --git a/data/pokedex/entries/steelix.asm b/data/pokemon/dex_entries/steelix.asm
index 6bbfe6c28..6bbfe6c28 100644
--- a/data/pokedex/entries/steelix.asm
+++ b/data/pokemon/dex_entries/steelix.asm
diff --git a/data/pokedex/entries/sudowoodo.asm b/data/pokemon/dex_entries/sudowoodo.asm
index 060db1d8d..060db1d8d 100644
--- a/data/pokedex/entries/sudowoodo.asm
+++ b/data/pokemon/dex_entries/sudowoodo.asm
diff --git a/data/pokedex/entries/suicune.asm b/data/pokemon/dex_entries/suicune.asm
index c60c002f7..c60c002f7 100644
--- a/data/pokedex/entries/suicune.asm
+++ b/data/pokemon/dex_entries/suicune.asm
diff --git a/data/pokedex/entries/sunflora.asm b/data/pokemon/dex_entries/sunflora.asm
index 2d0e78111..2d0e78111 100644
--- a/data/pokedex/entries/sunflora.asm
+++ b/data/pokemon/dex_entries/sunflora.asm
diff --git a/data/pokedex/entries/sunkern.asm b/data/pokemon/dex_entries/sunkern.asm
index 680e1799e..680e1799e 100644
--- a/data/pokedex/entries/sunkern.asm
+++ b/data/pokemon/dex_entries/sunkern.asm
diff --git a/data/pokedex/entries/swinub.asm b/data/pokemon/dex_entries/swinub.asm
index 3e6d61dc8..3e6d61dc8 100644
--- a/data/pokedex/entries/swinub.asm
+++ b/data/pokemon/dex_entries/swinub.asm
diff --git a/data/pokedex/entries/tangela.asm b/data/pokemon/dex_entries/tangela.asm
index 4e011b082..4e011b082 100644
--- a/data/pokedex/entries/tangela.asm
+++ b/data/pokemon/dex_entries/tangela.asm
diff --git a/data/pokedex/entries/tauros.asm b/data/pokemon/dex_entries/tauros.asm
index bd7851165..bd7851165 100644
--- a/data/pokedex/entries/tauros.asm
+++ b/data/pokemon/dex_entries/tauros.asm
diff --git a/data/pokedex/entries/teddiursa.asm b/data/pokemon/dex_entries/teddiursa.asm
index 35b32c322..35b32c322 100644
--- a/data/pokedex/entries/teddiursa.asm
+++ b/data/pokemon/dex_entries/teddiursa.asm
diff --git a/data/pokedex/entries/tentacool.asm b/data/pokemon/dex_entries/tentacool.asm
index 5ed4b4fa0..5ed4b4fa0 100644
--- a/data/pokedex/entries/tentacool.asm
+++ b/data/pokemon/dex_entries/tentacool.asm
diff --git a/data/pokedex/entries/tentacruel.asm b/data/pokemon/dex_entries/tentacruel.asm
index 27dad758f..27dad758f 100644
--- a/data/pokedex/entries/tentacruel.asm
+++ b/data/pokemon/dex_entries/tentacruel.asm
diff --git a/data/pokedex/entries/togepi.asm b/data/pokemon/dex_entries/togepi.asm
index eb185b1f1..eb185b1f1 100644
--- a/data/pokedex/entries/togepi.asm
+++ b/data/pokemon/dex_entries/togepi.asm
diff --git a/data/pokedex/entries/togetic.asm b/data/pokemon/dex_entries/togetic.asm
index 7d1519d73..7d1519d73 100644
--- a/data/pokedex/entries/togetic.asm
+++ b/data/pokemon/dex_entries/togetic.asm
diff --git a/data/pokedex/entries/totodile.asm b/data/pokemon/dex_entries/totodile.asm
index 78a1b761e..78a1b761e 100644
--- a/data/pokedex/entries/totodile.asm
+++ b/data/pokemon/dex_entries/totodile.asm
diff --git a/data/pokedex/entries/typhlosion.asm b/data/pokemon/dex_entries/typhlosion.asm
index e11823cf5..e11823cf5 100644
--- a/data/pokedex/entries/typhlosion.asm
+++ b/data/pokemon/dex_entries/typhlosion.asm
diff --git a/data/pokedex/entries/tyranitar.asm b/data/pokemon/dex_entries/tyranitar.asm
index 9786a6430..9786a6430 100644
--- a/data/pokedex/entries/tyranitar.asm
+++ b/data/pokemon/dex_entries/tyranitar.asm
diff --git a/data/pokedex/entries/tyrogue.asm b/data/pokemon/dex_entries/tyrogue.asm
index d8900c160..d8900c160 100644
--- a/data/pokedex/entries/tyrogue.asm
+++ b/data/pokemon/dex_entries/tyrogue.asm
diff --git a/data/pokedex/entries/umbreon.asm b/data/pokemon/dex_entries/umbreon.asm
index 483322f18..483322f18 100644
--- a/data/pokedex/entries/umbreon.asm
+++ b/data/pokemon/dex_entries/umbreon.asm
diff --git a/data/pokedex/entries/unown.asm b/data/pokemon/dex_entries/unown.asm
index 5be078b8a..5be078b8a 100644
--- a/data/pokedex/entries/unown.asm
+++ b/data/pokemon/dex_entries/unown.asm
diff --git a/data/pokedex/entries/ursaring.asm b/data/pokemon/dex_entries/ursaring.asm
index acf7626f9..acf7626f9 100644
--- a/data/pokedex/entries/ursaring.asm
+++ b/data/pokemon/dex_entries/ursaring.asm
diff --git a/data/pokedex/entries/vaporeon.asm b/data/pokemon/dex_entries/vaporeon.asm
index 36617899f..36617899f 100644
--- a/data/pokedex/entries/vaporeon.asm
+++ b/data/pokemon/dex_entries/vaporeon.asm
diff --git a/data/pokedex/entries/venomoth.asm b/data/pokemon/dex_entries/venomoth.asm
index 4ff583940..4ff583940 100644
--- a/data/pokedex/entries/venomoth.asm
+++ b/data/pokemon/dex_entries/venomoth.asm
diff --git a/data/pokedex/entries/venonat.asm b/data/pokemon/dex_entries/venonat.asm
index 8e52b4c82..8e52b4c82 100644
--- a/data/pokedex/entries/venonat.asm
+++ b/data/pokemon/dex_entries/venonat.asm
diff --git a/data/pokedex/entries/venusaur.asm b/data/pokemon/dex_entries/venusaur.asm
index 1b9cc6e43..1b9cc6e43 100644
--- a/data/pokedex/entries/venusaur.asm
+++ b/data/pokemon/dex_entries/venusaur.asm
diff --git a/data/pokedex/entries/victreebel.asm b/data/pokemon/dex_entries/victreebel.asm
index 552051572..552051572 100644
--- a/data/pokedex/entries/victreebel.asm
+++ b/data/pokemon/dex_entries/victreebel.asm
diff --git a/data/pokedex/entries/vileplume.asm b/data/pokemon/dex_entries/vileplume.asm
index cf2ea191d..cf2ea191d 100644
--- a/data/pokedex/entries/vileplume.asm
+++ b/data/pokemon/dex_entries/vileplume.asm
diff --git a/data/pokedex/entries/voltorb.asm b/data/pokemon/dex_entries/voltorb.asm
index 5a532e2d0..5a532e2d0 100644
--- a/data/pokedex/entries/voltorb.asm
+++ b/data/pokemon/dex_entries/voltorb.asm
diff --git a/data/pokedex/entries/vulpix.asm b/data/pokemon/dex_entries/vulpix.asm
index f5bbd03a1..f5bbd03a1 100644
--- a/data/pokedex/entries/vulpix.asm
+++ b/data/pokemon/dex_entries/vulpix.asm
diff --git a/data/pokedex/entries/wartortle.asm b/data/pokemon/dex_entries/wartortle.asm
index 927af5fd2..927af5fd2 100644
--- a/data/pokedex/entries/wartortle.asm
+++ b/data/pokemon/dex_entries/wartortle.asm
diff --git a/data/pokedex/entries/weedle.asm b/data/pokemon/dex_entries/weedle.asm
index 9b81fa11d..9b81fa11d 100644
--- a/data/pokedex/entries/weedle.asm
+++ b/data/pokemon/dex_entries/weedle.asm
diff --git a/data/pokedex/entries/weepinbell.asm b/data/pokemon/dex_entries/weepinbell.asm
index 81eb7c215..81eb7c215 100644
--- a/data/pokedex/entries/weepinbell.asm
+++ b/data/pokemon/dex_entries/weepinbell.asm
diff --git a/data/pokedex/entries/weezing.asm b/data/pokemon/dex_entries/weezing.asm
index 1a7b268fd..1a7b268fd 100644
--- a/data/pokedex/entries/weezing.asm
+++ b/data/pokemon/dex_entries/weezing.asm
diff --git a/data/pokedex/entries/wigglytuff.asm b/data/pokemon/dex_entries/wigglytuff.asm
index 8ba563cce..8ba563cce 100644
--- a/data/pokedex/entries/wigglytuff.asm
+++ b/data/pokemon/dex_entries/wigglytuff.asm
diff --git a/data/pokedex/entries/wobbuffet.asm b/data/pokemon/dex_entries/wobbuffet.asm
index 95aae69ab..95aae69ab 100644
--- a/data/pokedex/entries/wobbuffet.asm
+++ b/data/pokemon/dex_entries/wobbuffet.asm
diff --git a/data/pokedex/entries/wooper.asm b/data/pokemon/dex_entries/wooper.asm
index d612f2070..d612f2070 100644
--- a/data/pokedex/entries/wooper.asm
+++ b/data/pokemon/dex_entries/wooper.asm
diff --git a/data/pokedex/entries/xatu.asm b/data/pokemon/dex_entries/xatu.asm
index 21a53d8fc..21a53d8fc 100644
--- a/data/pokedex/entries/xatu.asm
+++ b/data/pokemon/dex_entries/xatu.asm
diff --git a/data/pokedex/entries/yanma.asm b/data/pokemon/dex_entries/yanma.asm
index 9843ad289..9843ad289 100644
--- a/data/pokedex/entries/yanma.asm
+++ b/data/pokemon/dex_entries/yanma.asm
diff --git a/data/pokedex/entries/zapdos.asm b/data/pokemon/dex_entries/zapdos.asm
index ea61198a0..ea61198a0 100644
--- a/data/pokedex/entries/zapdos.asm
+++ b/data/pokemon/dex_entries/zapdos.asm
diff --git a/data/pokedex/entries/zubat.asm b/data/pokemon/dex_entries/zubat.asm
index 8232f8bd6..8232f8bd6 100644
--- a/data/pokedex/entries/zubat.asm
+++ b/data/pokemon/dex_entries/zubat.asm
diff --git a/data/pokedex/entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm
index c4ddc7280..c4ddc7280 100644
--- a/data/pokedex/entry_pointers.asm
+++ b/data/pokemon/dex_entry_pointers.asm
diff --git a/data/pokedex/order_alpha.asm b/data/pokemon/dex_order_alpha.asm
index 8fcb0acd1..8fcb0acd1 100644
--- a/data/pokedex/order_alpha.asm
+++ b/data/pokemon/dex_order_alpha.asm
diff --git a/data/pokedex/order_new.asm b/data/pokemon/dex_order_new.asm
index bf7e3d298..bf7e3d298 100644
--- a/data/pokedex/order_new.asm
+++ b/data/pokemon/dex_order_new.asm
diff --git a/data/egg_move_pointers.asm b/data/pokemon/egg_move_pointers.asm
index caa9ed7c0..caa9ed7c0 100644
--- a/data/egg_move_pointers.asm
+++ b/data/pokemon/egg_move_pointers.asm
diff --git a/data/egg_moves.asm b/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
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
index f6582e786..f6582e786 100644
--- a/data/evos_attacks_pointers.asm
+++ b/data/pokemon/evos_attacks_pointers.asm
diff --git a/data/mon_menu_icons.asm b/data/pokemon/menu_icons.asm
index 360b206a2..360b206a2 100644
--- a/data/mon_menu_icons.asm
+++ b/data/pokemon/menu_icons.asm
diff --git a/data/pokemon_names.asm b/data/pokemon/pokemon_names.asm
index 266b0c020..266b0c020 100644
--- a/data/pokemon_names.asm
+++ b/data/pokemon/pokemon_names.asm
diff --git a/trainers/encounter_music.asm b/data/trainers/encounter_music.asm
index cd0348d81..cd0348d81 100644
--- a/trainers/encounter_music.asm
+++ b/data/trainers/encounter_music.asm
diff --git a/trainers/gendered_trainers.asm b/data/trainers/gendered_trainers.asm
index 98cfec2ac..98cfec2ac 100644
--- a/trainers/gendered_trainers.asm
+++ b/data/trainers/gendered_trainers.asm
diff --git a/trainers/trainers.asm b/data/trainers/parties.asm
index e96cfd895..e96cfd895 100644
--- a/trainers/trainers.asm
+++ b/data/trainers/parties.asm
diff --git a/trainers/trainer_pointers.asm b/data/trainers/party_pointers.asm
index c0b3d4538..c0b3d4538 100644
--- a/trainers/trainer_pointers.asm
+++ b/data/trainers/party_pointers.asm
diff --git a/trainers/attributes.asm b/data/trainers/trainer_attributes.asm
index 224e460c9..224e460c9 100644
--- a/trainers/attributes.asm
+++ b/data/trainers/trainer_attributes.asm
diff --git a/trainers/dvs.asm b/data/trainers/trainer_dvs.asm
index 503c468d3..503c468d3 100644
--- a/trainers/dvs.asm
+++ b/data/trainers/trainer_dvs.asm
diff --git a/items/item_effects.asm b/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
index 7fb4d3e38..7fb4d3e38 100755
--- a/items/pokeball_wobble.asm
+++ b/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
index dfb8d3682..dfb8d3682 100644
--- a/trainers/read_attributes.asm
+++ b/engine/read_trainer_attributes.asm
diff --git a/trainers/read_party.asm b/engine/read_trainer_party.asm
index 9b7727a84..9b7727a84 100755
--- a/trainers/read_party.asm
+++ b/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
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