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

Move some data into a pokemon/ subdirectory

531 files changed, 12560 insertions, 526 deletions

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/data/items/item_attributes.asm b/data/items/item_attributes.asm
new file mode 100644
index 000000000..d6d272107
--- /dev/null
+++ b/data/items/item_attributes.asm
@@ -0,0 +1,521 @@
+item_attribute: MACRO
+; price, held effect, parameter, property, pocket, field menu, battle menu
+	dw \1
+	db \2, \3, \4, \5
+	dn \6, \7
+ENDM
+
+ItemAttributes: ; 67c1
+; entries correspond to constants/item_constants.asm
+; MASTER BALL
+	item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; ULTRA BALL
+	item_attribute 1200, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; BRIGHTPOWDER
+	item_attribute 10, HELD_BRIGHTPOWDER, 20, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; GREAT BALL
+	item_attribute 600, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; # BALL
+	item_attribute 200, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BICYCLE
+	item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+; MOON STONE
+	item_attribute 0, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; ANTIDOTE
+	item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; BURN HEAL
+	item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; ICE HEAL
+	item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; AWAKENING
+	item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; PARLYZ HEAL
+	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; FULL RESTORE
+	item_attribute 3000, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; MAX POTION
+	item_attribute 2500, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; HYPER POTION
+	item_attribute 1200, 0, 200, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; SUPER POTION
+	item_attribute 700, 0, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; POTION
+	item_attribute 300, 0, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; ESCAPE ROPE
+	item_attribute 550, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+; REPEL
+	item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+; MAX ELIXER
+	item_attribute 4500, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; FIRE STONE
+	item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; THUNDERSTONE
+	item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; WATER STONE
+	item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; HP UP
+	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; PROTEIN
+	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; IRON
+	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; CARBOS
+	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; LUCKY PUNCH
+	item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; CALCIUM
+	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; RARE CANDY
+	item_attribute 4800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; X ACCURACY
+	item_attribute 950, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; LEAF STONE
+	item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; METAL POWDER
+	item_attribute 10, HELD_METAL_POWDER, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; NUGGET
+	item_attribute 10000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; # DOLL
+	item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; FULL HEAL
+	item_attribute 600, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; REVIVE
+	item_attribute 1500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; MAX REVIVE
+	item_attribute 4000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; GUARD SPEC.
+	item_attribute 700, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; SUPER REPEL
+	item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+; MAX REPEL
+	item_attribute 700, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+; DIRE HIT
+	item_attribute 650, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; FRESH WATER
+	item_attribute 200, 0, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; SODA POP
+	item_attribute 300, 0, 60, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; LEMONADE
+	item_attribute 350, 0, 80, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; X ATTACK
+	item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; X DEFEND
+	item_attribute 550, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; X SPEED
+	item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; X SPECIAL
+	item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; COIN CASE
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+; ITEMFINDER
+	item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; EXP.SHARE
+	item_attribute 3000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; OLD ROD
+	item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+; GOOD ROD
+	item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+; SILVER LEAF
+	item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; SUPER ROD
+	item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+; PP UP
+	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; ETHER
+	item_attribute 1200, 0, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; MAX ETHER
+	item_attribute 2000, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; ELIXER
+	item_attribute 3000, 0, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; RED SCALE
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; SECRETPOTION
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; S.S.TICKET
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; MYSTERY EGG
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; CLEAR BELL
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; SILVER WING
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; MOOMOO MILK
+	item_attribute 500, 0, 100, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; QUICK CLAW
+	item_attribute 100, HELD_QUICK_CLAW, 60, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; PSNCUREBERRY
+	item_attribute 10, HELD_HEAL_POISON, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; GOLD LEAF
+	item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; SOFT SAND
+	item_attribute 100, HELD_GROUND_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; SHARP BEAK
+	item_attribute 100, HELD_FLYING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; PRZCUREBERRY
+	item_attribute 10, HELD_HEAL_PARALYZE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; BURNT BERRY
+	item_attribute 10, HELD_HEAL_FREEZE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; ICE BERRY
+	item_attribute 10, HELD_HEAL_BURN, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; POISON BARB
+	item_attribute 100, HELD_POISON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; KING'S ROCK
+	item_attribute 100, HELD_TRADE_EVOLVE, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BITTER BERRY
+	item_attribute 10, HELD_HEAL_CONFUSION, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_PARTY
+; MINT BERRY
+	item_attribute 10, HELD_HEAL_SLEEP, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; RED APRICORN
+	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TINYMUSHROOM
+	item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BIG MUSHROOM
+	item_attribute 5000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; SILVERPOWDER
+	item_attribute 100, HELD_BUG_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BLU APRICORN
+	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; AMULET COIN
+	item_attribute 100, HELD_AMULET_COIN, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; YLW APRICORN
+	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; GRN APRICORN
+	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; CLEANSE TAG
+	item_attribute 200, HELD_CLEANSE_TAG, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; MYSTIC WATER
+	item_attribute 100, HELD_WATER_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TWISTEDSPOON
+	item_attribute 100, HELD_PSYCHIC_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; WHT APRICORN
+	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BLACKBELT
+	item_attribute 100, HELD_FIGHTING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BLK APRICORN
+	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; PNK APRICORN
+	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BLACKGLASSES
+	item_attribute 100, HELD_DARK_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; SLOWPOKETAIL
+	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; PINK BOW
+	item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; STICK
+	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; SMOKE BALL
+	item_attribute 200, HELD_ESCAPE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; NEVERMELTICE
+	item_attribute 100, HELD_ICE_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; MAGNET
+	item_attribute 100, HELD_ELECTRIC_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; MIRACLEBERRY
+	item_attribute 10, HELD_HEAL_STATUS, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; PEARL
+	item_attribute 1400, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BIG PEARL
+	item_attribute 7500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; EVERSTONE
+	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; SPELL TAG
+	item_attribute 100, HELD_GHOST_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; RAGECANDYBAR
+	item_attribute 300, 0, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; GS BALL
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BLUE CARD
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+; MIRACLE SEED
+	item_attribute 100, HELD_GRASS_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; THICK CLUB
+	item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; FOCUS BAND
+	item_attribute 200, HELD_FOCUS_BAND, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; ENERGYPOWDER
+	item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; ENERGY ROOT
+	item_attribute 800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; HEAL POWDER
+	item_attribute 450, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; REVIVAL HERB
+	item_attribute 2800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; HARD STONE
+	item_attribute 100, HELD_ROCK_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; LUCKY EGG
+	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; CARD KEY
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+; MACHINE PART
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; EGG TICKET
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; LOST ITEM
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; STARDUST
+	item_attribute 2000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; STAR PIECE
+	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BASEMENT KEY
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+; PASS
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; CHARCOAL
+	item_attribute 9800, HELD_FIRE_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BERRY JUICE
+	item_attribute 100, HELD_BERRY, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; SCOPE LENS
+	item_attribute 200, HELD_CRITICAL_UP, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; METAL COAT
+	item_attribute 100, HELD_STEEL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; DRAGON FANG
+	item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; LEFTOVERS
+	item_attribute 200, HELD_LEFTOVERS, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; MYSTERYBERRY
+	item_attribute 10, HELD_RESTORE_PP, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; DRAGON SCALE
+	item_attribute 2100, HELD_DRAGON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BERSERK GENE
+	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; SACRED ASH
+	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+; HEAVY BALL
+	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; FLOWER MAIL
+	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; LEVEL BALL
+	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; LURE BALL
+	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; FAST BALL
+	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; LIGHT BALL
+	item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; FRIEND BALL
+	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; MOON BALL
+	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; LOVE BALL
+	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; NORMAL BOX
+	item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+; GORGEOUS BOX
+	item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+; SUN STONE
+	item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; POLKADOT BOW
+	item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; UP-GRADE
+	item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BERRY
+	item_attribute 10, HELD_BERRY, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; GOLD BERRY
+	item_attribute 10, HELD_BERRY, 30, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+; SQUIRTBOTTLE
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; PARK BALL
+	item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+; RAINBOW WING
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BRICK PIECE
+	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; SURF MAIL
+	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; LITEBLUEMAIL
+	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; PORTRAITMAIL
+	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; LOVELY MAIL
+	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; EON MAIL
+	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; MORPH MAIL
+	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; BLUESKY MAIL
+	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; MUSIC MAIL
+	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; MIRAGE MAIL
+	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TM01
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM02
+	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM03
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM04
+	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TM05
+	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM06
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM07
+	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM08
+	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM09
+	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM10
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM11
+	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM12
+	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM13
+	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM14
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM15
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM16
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM17
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM18
+	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM19
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM20
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM21
+	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM22
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM23
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM24
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM25
+	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM26
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM27
+	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM28
+	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TM29
+	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM30
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM31
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM32
+	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM33
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM34
+	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM35
+	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM36
+	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM37
+	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM38
+	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM39
+	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM40
+	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM41
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM42
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM43
+	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM44
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM45
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM46
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM47
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM48
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM49
+	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TM50
+	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; HM01
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; HM02
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; HM03
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; HM04
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; HM05
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; HM06
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; HM07
+	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; TERU-SAMA
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; ?
+	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
diff --git a/data/items/item_descriptions.asm b/data/items/item_descriptions.asm
new file mode 100644
index 000000000..40e91b2c9
--- /dev/null
+++ b/data/items/item_descriptions.asm
@@ -0,0 +1,1042 @@
+PrintItemDescription: ; 0x1c8955
+; Print the description for item [CurSpecies] at de.
+
+	ld a, [CurSpecies]
+	cp TM01
+	jr c, .not_a_tm
+
+	ld [CurItem], a
+	push de
+	callba GetTMHMItemMove
+	pop hl
+	ld a, [wd265]
+	ld [CurSpecies], a
+	predef PrintMoveDesc
+	ret
+
+.not_a_tm
+	push de
+	ld hl, ItemDescriptions
+	ld a, [CurSpecies]
+	dec a
+	ld c, a
+	ld b, 0
+	add hl, bc
+	add hl, bc
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	pop hl
+	jp PlaceString
+; 0x1c8987
+
+
+ItemDescriptions:
+	dw MasterBallDesc
+	dw UltraBallDesc
+	dw BrightpowderDesc
+	dw GreatBallDesc
+	dw PokeBallDesc
+	dw TeruSama1Desc
+	dw BicycleDesc
+	dw MoonStoneDesc
+	dw AntidoteDesc
+	dw BurnHealDesc
+	dw IceHealDesc
+	dw AwakeningDesc
+	dw ParlyzHealDesc
+	dw FullRestoreDesc
+	dw MaxPotionDesc
+	dw HyperPotionDesc
+	dw SuperPotionDesc
+	dw PotionDesc
+	dw EscapeRopeDesc
+	dw RepelDesc
+	dw MaxElixerDesc
+	dw FireStoneDesc
+	dw ThunderStoneDesc
+	dw WaterStoneDesc
+	dw TeruSama2Desc
+	dw HPUpDesc
+	dw ProteinDesc
+	dw IronDesc
+	dw CarbosDesc
+	dw LuckyPunchDesc
+	dw CalciumDesc
+	dw RareCandyDesc
+	dw XAccuracyDesc
+	dw LeafStoneDesc
+	dw MetalPowderDesc
+	dw NuggetDesc
+	dw PokeDollDesc
+	dw FullHealDesc
+	dw ReviveDesc
+	dw MaxReviveDesc
+	dw GuardSpecDesc
+	dw SuperRepelDesc
+	dw MaxRepelDesc
+	dw DireHitDesc
+	dw TeruSama3Desc
+	dw FreshWaterDesc
+	dw SodaPopDesc
+	dw LemonadeDesc
+	dw XAttackDesc
+	dw TeruSama4Desc
+	dw XDefendDesc
+	dw XSpeedDesc
+	dw XSpecialDesc
+	dw CoinCaseDesc
+	dw ItemfinderDesc
+	dw TeruSama5Desc
+	dw ExpShareDesc
+	dw OldRodDesc
+	dw GoodRodDesc
+	dw SilverLeafDesc
+	dw SuperRodDesc
+	dw PPUpDesc
+	dw EtherDesc
+	dw MaxEtherDesc
+	dw ElixerDesc
+	dw RedScaleDesc
+	dw SecretPotionDesc
+	dw SSTicketDesc
+	dw MysteryEggDesc
+	dw ClearBellDesc
+	dw SilverWingDesc
+	dw MoomooMilkDesc
+	dw QuickClawDesc
+	dw PsnCureBerryDesc
+	dw GoldLeafDesc
+	dw SoftSandDesc
+	dw SharpBeakDesc
+	dw PrzCureBerryDesc
+	dw BurntBerryDesc
+	dw IceBerryDesc
+	dw PoisonBarbDesc
+	dw KingsRockDesc
+	dw BitterBerryDesc
+	dw MintBerryDesc
+	dw RedApricornDesc
+	dw TinyMushroomDesc
+	dw BigMushroomDesc
+	dw SilverPowderDesc
+	dw BluApricornDesc
+	dw TeruSama6Desc
+	dw AmuletCoinDesc
+	dw YlwApricornDesc
+	dw GrnApricornDesc
+	dw CleanseTagDesc
+	dw MysticWaterDesc
+	dw TwistedSpoonDesc
+	dw WhtApricornDesc
+	dw BlackbeltDesc
+	dw BlkApricornDesc
+	dw TeruSama7Desc
+	dw PnkApricornDesc
+	dw BlackGlassesDesc
+	dw SlowpokeTailDesc
+	dw PinkBowDesc
+	dw StickDesc
+	dw SmokeBallDesc
+	dw NeverMeltIceDesc
+	dw MagnetDesc
+	dw MiracleBerryDesc
+	dw PearlDesc
+	dw BigPearlDesc
+	dw EverStoneDesc
+	dw SpellTagDesc
+	dw RageCandyBarDesc
+	dw GSBallDesc
+	dw BlueCardDesc
+	dw MiracleSeedDesc
+	dw ThickClubDesc
+	dw FocusBandDesc
+	dw TeruSama8Desc
+	dw EnergyPowderDesc
+	dw EnergyRootDesc
+	dw HealPowderDesc
+	dw RevivalHerbDesc
+	dw HardStoneDesc
+	dw LuckyEggDesc
+	dw CardKeyDesc
+	dw MachinePartDesc
+	dw EggTicketDesc
+	dw LostItemDesc
+	dw StardustDesc
+	dw StarPieceDesc
+	dw BasementKeyDesc
+	dw PassDesc
+	dw TeruSama9Desc
+	dw TeruSama10Desc
+	dw TeruSama11Desc
+	dw CharcoalDesc
+	dw BerryJuiceDesc
+	dw ScopeLensDesc
+	dw TeruSama12Desc
+	dw TeruSama13Desc
+	dw MetalCoatDesc
+	dw DragonFangDesc
+	dw TeruSama14Desc
+	dw LeftoversDesc
+	dw TeruSama15Desc
+	dw TeruSama16Desc
+	dw TeruSama17Desc
+	dw MysteryBerryDesc
+	dw DragonScaleDesc
+	dw BerserkGeneDesc
+	dw TeruSama18Desc
+	dw TeruSama19Desc
+	dw TeruSama20Desc
+	dw SacredAshDesc
+	dw HeavyBallDesc
+	dw FlowerMailDesc
+	dw LevelBallDesc
+	dw LureBallDesc
+	dw FastBallDesc
+	dw TeruSama21Desc
+	dw LightBallDesc
+	dw FriendBallDesc
+	dw MoonBallDesc
+	dw LoveBallDesc
+	dw NormalBoxDesc
+	dw GorgeousBoxDesc
+	dw SunStoneDesc
+	dw PolkadotBowDesc
+	dw TeruSama22Desc
+	dw UpGradeDesc
+	dw BerryDesc
+	dw GoldBerryDesc
+	dw SquirtBottleDesc
+	dw TeruSama23Desc
+	dw ParkBallDesc
+	dw RainbowWingDesc
+	dw TeruSama24Desc
+	dw BrickPieceDesc
+	dw SurfMailDesc
+	dw LiteBlueMailDesc
+	dw PortraitMailDesc
+	dw LovelyMailDesc
+	dw EonMailDesc
+	dw MorphMailDesc
+	dw BlueSkyMailDesc
+	dw MusicMailDesc
+	dw MewMailDesc
+	dw TeruSama25Desc
+	dw TeruSama26Desc
+	dw TeruSama26Desc
+	dw TeruSama26Desc
+	dw TeruSama26Desc
+	dw TeruSama26Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama27Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama28Desc
+	dw TeruSama29Desc
+	dw TeruSama30Desc
+	dw TeruSama31Desc
+	dw TeruSama32Desc
+	dw TeruSama33Desc
+
+MasterBallDesc:
+	db   "The best BALL. It"
+	next "never misses.@"
+
+UltraBallDesc:
+	db   "A BALL with a high"
+	next "rate of success.@"
+
+BrightpowderDesc:
+	db   "Lowers the foe's"
+	next "accuracy. (HOLD)@"
+
+GreatBallDesc:
+	db   "A BALL with a de-"
+	next "cent success rate.@"
+
+PokeBallDesc:
+	db   "An item for catch-"
+	next "ing #MON.@"
+
+TeruSama1Desc:
+	db   "?@"
+
+BicycleDesc:
+	db   "A collapsible bike"
+	next "for fast movement.@"
+
+MoonStoneDesc:
+	db   "Evolves certain"
+	next "kinds of #MON.@"
+
+AntidoteDesc:
+	db   "Cures poisoned"
+	next "#MON.@"
+
+BurnHealDesc:
+	db   "Heals burned"
+	next "#MON.@"
+
+IceHealDesc:
+	db   "Defrosts frozen"
+	next "#MON.@"
+
+AwakeningDesc:
+	db   "Awakens sleeping"
+	next "#MON.@"
+
+ParlyzHealDesc:
+	db   "Heals paralyzed"
+	next "#MON.@"
+
+FullRestoreDesc:
+	db   "Fully restores HP"
+	next "& status.@"
+
+MaxPotionDesc:
+	db   "Fully restores"
+	next "#MON HP.@"
+
+HyperPotionDesc:
+	db   "Restores #MON"
+	next "HP by 200.@"
+
+SuperPotionDesc:
+	db   "Restores #MON"
+	next "HP by 50.@"
+
+PotionDesc:
+	db   "Restores #MON"
+	next "HP by 20.@"
+
+EscapeRopeDesc:
+	db   "Use for escaping"
+	next "from caves, etc.@"
+
+RepelDesc:
+	db   "Repels weak #-"
+	next "MON for 100 steps.@"
+
+MaxElixerDesc:
+	db   "Fully restores the"
+	next "PP of one #MON.@"
+
+FireStoneDesc:
+	db   "Evolves certain"
+	next "kinds of #MON.@"
+
+ThunderStoneDesc:
+	db   "Evolves certain"
+	next "kinds of #MON.@"
+
+WaterStoneDesc:
+	db   "Evolves certain"
+	next "kinds of #MON.@"
+
+TeruSama2Desc:
+	db   "?@"
+
+HPUpDesc:
+	db   "Raises the HP of"
+	next "one #MON.@"
+
+ProteinDesc:
+	db   "Raises ATTACK of"
+	next "one #MON.@"
+
+IronDesc:
+	db   "Raises DEFENSE of"
+	next "one #MON.@"
+
+CarbosDesc:
+	db   "Raises SPEED of"
+	next "one #MON.@"
+
+LuckyPunchDesc:
+	db   "Ups critical hit"
+	next "ratio of CHANSEY.@"
+
+CalciumDesc:
+	db   "Ups SPECIAL stats"
+	next "of one #MON.@"
+
+RareCandyDesc:
+	db   "Raises level of a"
+	next "#MON by one.@"
+
+XAccuracyDesc:
+	db   "Raises accuracy."
+	next "(1 BTL)@"
+
+LeafStoneDesc:
+	db   "Evolves certain"
+	next "kinds of #MON.@"
+
+MetalPowderDesc:
+	db   "Raises DEFENSE of"
+	next "DITTO. (HOLD)@"
+
+NuggetDesc:
+	db   "Made of pure gold."
+	next "Sell high.@"
+
+PokeDollDesc:
+	db   "Use to escape from"
+	next "a wild #MON.@"
+
+FullHealDesc:
+	db   "Eliminates all"
+	next "status problems.@"
+
+ReviveDesc:
+	db   "Restores a fainted"
+	next "#MON to 1/2 HP.@"
+
+MaxReviveDesc:
+	db   "Fully restores a"
+	next "fainted #MON.@"
+
+GuardSpecDesc:
+	db   "Prevents stats"
+	next "reduction. (1 BTL)@"
+
+SuperRepelDesc:
+	db   "Repels weak #-"
+	next "MON for 200 steps.@"
+
+MaxRepelDesc:
+	db   "Repels weak #-"
+	next "MON for 250 steps.@"
+
+DireHitDesc:
+	db   "Ups critical hit"
+	next "ratio. (1 BTL)@"
+
+TeruSama3Desc:
+	db   "?@"
+
+FreshWaterDesc:
+	db   "Restores #MON"
+	next "HP by 50.@"
+
+SodaPopDesc:
+	db   "Restores #MON"
+	next "HP by 60.@"
+
+LemonadeDesc:
+	db   "Restores #MON"
+	next "HP by 80.@"
+
+XAttackDesc:
+	db   "Raises ATTACK."
+	next "(1 BTL)@"
+
+TeruSama4Desc:
+	db   "?@"
+
+XDefendDesc:
+	db   "Raises DEFENSE."
+	next "(1 BTL)@"
+
+XSpeedDesc:
+	db   "Raises SPEED."
+	next "(1 BTL)@"
+
+XSpecialDesc:
+	db   "Raises SPECIAL"
+	next "ATTACK. (1 BTL)@"
+
+CoinCaseDesc:
+	db   "Holds up to 9,999"
+	next "game coins.@"
+
+ItemfinderDesc:
+	db   "Checks for unseen"
+	next "items in the area.@"
+
+TeruSama5Desc:
+	db   "?@"
+
+ExpShareDesc:
+	db   "Shares battle EXP."
+	next "Points. (HOLD)@"
+
+OldRodDesc:
+	db   "Use by water to"
+	next "fish for #MON.@"
+
+GoodRodDesc:
+	db   "A good ROD for"
+	next "catching #MON.@"
+
+SilverLeafDesc:
+	db   "A strange, silver-"
+	next "colored leaf.@"
+
+SuperRodDesc:
+	db   "The best ROD for"
+	next "catching #MON.@"
+
+PPUpDesc:
+	db   "Raises max PP of"
+	next "a selected move.@"
+
+EtherDesc:
+	db   "Restores PP of one"
+	next "move by 10.@"
+
+MaxEtherDesc:
+	db   "Fully restores PP"
+	next "of one move.@"
+
+ElixerDesc:
+	db   "Restores PP of all"
+	next "moves by 10.@"
+
+RedScaleDesc:
+	db   "A scale from the"
+	next "red GYARADOS.@"
+
+SecretPotionDesc:
+	db   "Fully heals any"
+	next "#MON.@"
+
+SSTicketDesc:
+	db   "A ticket for the"
+	next "S.S.AQUA.@"
+
+MysteryEggDesc:
+	db   "An EGG obtained"
+	next "from MR.#MON.@"
+
+ClearBellDesc:
+	db   "Makes a gentle"
+	next "ringing.@"
+
+SilverWingDesc:
+	db   "A strange, silver-"
+	next "colored feather.@"
+
+MoomooMilkDesc:
+	db   "Restores #MON"
+	next "HP by 100.@"
+
+QuickClawDesc:
+	db   "Raises 1st strike"
+	next "ratio. (HOLD)@"
+
+PsnCureBerryDesc:
+	db   "A self-cure for"
+	next "poison. (HOLD)@"
+
+GoldLeafDesc:
+	db   "A strange, gold-"
+	next "colored leaf.@"
+
+SoftSandDesc:
+	db   "Powers up ground-"
+	next "type moves. (HOLD)@"
+
+SharpBeakDesc:
+	db   "Powers up flying-"
+	next "type moves. (HOLD)@"
+
+PrzCureBerryDesc:
+	db   "A self-cure for"
+	next "paralysis. (HOLD)@"
+
+BurntBerryDesc:
+	db   "A self-cure for"
+	next "freezing. (HOLD)@"
+
+IceBerryDesc:
+	db   "A self-heal for a"
+	next "burn. (HOLD)@"
+
+PoisonBarbDesc:
+	db   "Powers up poison-"
+	next "type moves. (HOLD)@"
+
+KingsRockDesc:
+	db   "May make the foe"
+	next "flinch. (HOLD)@"
+
+BitterBerryDesc:
+	db   "A self-cure for"
+	next "confusion. (HOLD)@"
+
+MintBerryDesc:
+	db   "A self-awakening"
+	next "for sleep. (HOLD)@"
+
+RedApricornDesc:
+	db   "A red APRICORN.@"
+
+TinyMushroomDesc:
+	db   "An ordinary mush-"
+	next "room. Sell low.@"
+
+BigMushroomDesc:
+	db   "A rare mushroom."
+	next "Sell high.@"
+
+SilverPowderDesc:
+	db   "Powers up bug-type"
+	next "moves. (HOLD)@"
+
+BluApricornDesc:
+	db   "A blue APRICORN.@"
+
+TeruSama6Desc:
+	db   "?@"
+
+AmuletCoinDesc:
+	db   "Doubles monetary"
+	next "earnings. (HOLD)@"
+
+YlwApricornDesc:
+	db   "A yellow APRICORN.@"
+
+GrnApricornDesc:
+	db   "A green APRICORN.@"
+
+CleanseTagDesc:
+	db   "Helps repel wild"
+	next "#MON. (HOLD)@"
+
+MysticWaterDesc:
+	db   "Powers up water-"
+	next "type moves. (HOLD)@"
+
+TwistedSpoonDesc:
+	db   "Powers up psychic-"
+	next "type moves. (HOLD)@"
+
+WhtApricornDesc:
+	db   "A white APRICORN.@"
+
+BlackbeltDesc:
+	db   "Boosts fighting-"
+	next "type moves. (HOLD)@"
+
+BlkApricornDesc:
+	db   "A black APRICORN."
+	next "@"
+
+TeruSama7Desc:
+	db   "?@"
+
+PnkApricornDesc:
+	db   "A pink APRICORN."
+	next "@"
+
+BlackGlassesDesc:
+	db   "Powers up dark-"
+	next "type moves. (HOLD)@"
+
+SlowpokeTailDesc:
+	db   "Very tasty. Sell"
+	next "high.@"
+
+PinkBowDesc:
+	db   "Powers up normal-"
+	next "type moves. (HOLD)@"
+
+StickDesc:
+	db   "An ordinary stick."
+	next "Sell low.@"
+
+SmokeBallDesc:
+	db   "Escape from wild"
+	next "#MON. (HOLD)@"
+
+NeverMeltIceDesc:
+	db   "Powers up ice-type"
+	next "moves. (HOLD)@"
+
+MagnetDesc:
+	db   "Boosts electric-"
+	next "type moves. (HOLD)@"
+
+MiracleBerryDesc:
+	db   "Cures all status"
+	next "problems. (HOLD)@"
+
+PearlDesc:
+	db   "A beautiful pearl."
+	next "Sell low.@"
+
+BigPearlDesc:
+	db   "A big, beautiful"
+	next "pearl. Sell high.@"
+
+EverStoneDesc:
+	db   "Stops evolution."
+	next "(HOLD)@"
+
+SpellTagDesc:
+	db   "Powers up ghost-"
+	next "type moves. (HOLD)@"
+
+RageCandyBarDesc:
+	db   "Restores #MON"
+	next "HP by 20.@"
+
+GSBallDesc:
+	db   "The mysterious"
+	next "BALL.@"
+
+BlueCardDesc:
+	db   "Card to save"
+	next "points.@"
+
+MiracleSeedDesc:
+	db   "Powers up grass-"
+	next "type moves. (HOLD)@"
+
+ThickClubDesc:
+	db   "A bone of some"
+	next "sort. Sell low.@"
+
+FocusBandDesc:
+	db   "May prevent faint-"
+	next "ing. (HOLD)@"
+
+TeruSama8Desc:
+	db   "?@"
+
+EnergyPowderDesc:
+	db   "Restores #MON"
+	next "HP by 50. Bitter.@"
+
+EnergyRootDesc:
+	db   "Restores #MON"
+	next "HP by 200. Bitter.@"
+
+HealPowderDesc:
+	db   "Cures all status"
+	next "problems. Bitter.@"
+
+RevivalHerbDesc:
+	db   "Revives fainted"
+	next "#MON. Bitter.@"
+
+HardStoneDesc:
+	db   "Powers up rock-"
+	next "type moves. (HOLD)@"
+
+LuckyEggDesc:
+	db   "Earns extra EXP."
+	next "points. (HOLD)@"
+
+CardKeyDesc:
+	db   "Opens shutters in"
+	next "the RADIO TOWER.@"
+
+MachinePartDesc:
+	db   "A machine part for"
+	next "the POWER PLANT.@"
+
+EggTicketDesc:
+	db   "May use at Golden-"
+	next "rod trade corner.@"
+
+LostItemDesc:
+	db   "The # DOLL lost"
+	next "by the COPYCAT.@"
+
+StardustDesc:
+	db   "Pretty, red sand."
+	next "Sell high.@"
+
+StarPieceDesc:
+	db   "A hunk of red gem."
+	next "Sell very high.@"
+
+BasementKeyDesc:
+	db   "Opens doors.@"
+
+PassDesc:
+	db   "A ticket for the"
+	next "MAGNET TRAIN.@"
+
+TeruSama9Desc:
+	db   "?@"
+
+TeruSama10Desc:
+	db   "?@"
+
+TeruSama11Desc:
+	db   "?@"
+
+CharcoalDesc:
+	db   "Powers up fire-"
+	next "type moves. (HOLD)@"
+
+BerryJuiceDesc:
+	db   "Restores #MON"
+	next "HP by 20.@"
+
+ScopeLensDesc:
+	db   "Raises critical"
+	next "hit ratio. (HOLD)@"
+
+TeruSama12Desc:
+	db   "?@"
+
+TeruSama13Desc:
+	db   "?@"
+
+MetalCoatDesc:
+	db   "Powers up steel-"
+	next "type moves. (HOLD)@"
+
+DragonFangDesc:
+	db   "Powers up dragon-"
+	next "type moves. (HOLD)@"
+
+TeruSama14Desc:
+	db   "?@"
+
+LeftoversDesc:
+	db   "Restores HP during"
+	next "battle. (HOLD)@"
+
+TeruSama15Desc:
+	db   "?@"
+
+TeruSama16Desc:
+	db   "?@"
+
+TeruSama17Desc:
+	db   "?@"
+
+MysteryBerryDesc:
+	db   "A self-restore"
+	next "for PP. (HOLD)@"
+
+DragonScaleDesc:
+	db   "A rare dragon-type"
+	next "item.@"
+
+BerserkGeneDesc:
+	db   "Boosts ATTACK but"
+	next "causes confusion.@"
+
+TeruSama18Desc:
+	db   "?@"
+
+TeruSama19Desc:
+	db   "?@"
+
+TeruSama20Desc:
+	db   "?@"
+
+SacredAshDesc:
+	db   "Fully revives all"
+	next "fainted #MON.@"
+
+HeavyBallDesc:
+	db   "A BALL for catch-"
+	next "ing heavy #MON.@"
+
+FlowerMailDesc:
+	db   "Flower-print MAIL."
+	next "(HOLD)@"
+
+LevelBallDesc:
+	db   "A BALL for lower-"
+	next "level #MON.@"
+
+LureBallDesc:
+	db   "A BALL for #MON"
+	next "hooked by a ROD.@"
+
+FastBallDesc:
+	db   "A BALL for catch-"
+	next "ing fast #MON.@"
+
+TeruSama21Desc:
+	db   "?@"
+
+LightBallDesc:
+	db   "An odd, electrical"
+	next "orb. (HOLD)@"
+
+FriendBallDesc:
+	db   "A BALL that makes"
+	next "#MON friendly.@"
+
+MoonBallDesc:
+	db   "A BALL for MOON"
+	next "STONE evolvers.@"
+
+LoveBallDesc:
+	db   "For catching the"
+	next "opposite gender.@"
+
+NormalBoxDesc:
+	db   "Open it and see"
+	next "what's inside.@"
+
+GorgeousBoxDesc:
+	db   "Open it and see"
+	next "what's inside.@"
+
+SunStoneDesc:
+	db   "Evolves certain"
+	next "kinds of #MON.@"
+
+PolkadotBowDesc:
+	db   "Powers up normal-"
+	next "type moves. (HOLD)@"
+
+TeruSama22Desc:
+	db   "?@"
+
+UpGradeDesc:
+	db   "A mysterious box"
+	next "made by SILPH CO.@"
+
+BerryDesc:
+	db   "A self-restore"
+	next "item. (10HP, HOLD)@"
+
+GoldBerryDesc:
+	db   "A self-restore"
+	next "item. (30HP, HOLD)@"
+
+SquirtBottleDesc:
+	db   "A bottle used for"
+	next "watering plants.@"
+
+TeruSama23Desc:
+	db   "?@"
+
+ParkBallDesc:
+	db   "The Bug-Catching"
+	next "Contest BALL.@"
+
+RainbowWingDesc:
+	db   "A mystical feather"
+	next "of rainbow colors.@"
+
+TeruSama24Desc:
+	db   "?@"
+
+BrickPieceDesc:
+	db   "A rare chunk of"
+	next "tile.@"
+
+SurfMailDesc:
+	db   "LAPRAS-print MAIL."
+	next "(HOLD)@"
+
+LiteBlueMailDesc:
+	db   "DRATINI-print"
+	next "MAIL. (HOLD)@"
+
+PortraitMailDesc:
+	db   "MAIL featuring the"
+	next "holder's likeness.@"
+
+LovelyMailDesc:
+	db   "Heart-print MAIL."
+	next "(HOLD)@"
+
+EonMailDesc:
+	db   "EEVEE-print MAIL."
+	next "(HOLD)@"
+
+MorphMailDesc:
+	db   "DITTO-print MAIL."
+	next "(HOLD)@"
+
+BlueSkyMailDesc:
+	db   "Sky-print MAIL."
+	next "(HOLD)@"
+
+MusicMailDesc:
+	db   "NATU-print MAIL."
+	next "(HOLD)@"
+
+MewMailDesc:
+	db   "MEW-print MAIL."
+	next "(HOLD)@"
+
+TeruSama25Desc:
+	db   "?@"
+
+TeruSama26Desc:
+	db   "?@"
+
+TeruSama27Desc:
+	db   "?@"
+
+TeruSama28Desc:
+	db   "?@"
+
+TeruSama29Desc:
+	db   "?@"
+
+TeruSama30Desc:
+	db   "?@"
+
+TeruSama31Desc:
+	db   "?@"
+
+TeruSama32Desc:
+	db   "?@"
+
+TeruSama33Desc:
+	db   "?@"
diff --git a/data/items/item_names.asm b/data/items/item_names.asm
new file mode 100644
index 000000000..f44100ab3
--- /dev/null
+++ b/data/items/item_names.asm
@@ -0,0 +1,257 @@
+ItemNames::
+	db "MASTER BALL@"
+	db "ULTRA BALL@"
+	db "BRIGHTPOWDER@"
+	db "GREAT BALL@"
+	db "# BALL@"
+	db "TERU-SAMA@"
+	db "BICYCLE@"
+	db "MOON STONE@"
+	db "ANTIDOTE@"
+	db "BURN HEAL@"
+	db "ICE HEAL@"
+	db "AWAKENING@"
+	db "PARLYZ HEAL@"
+	db "FULL RESTORE@"
+	db "MAX POTION@"
+	db "HYPER POTION@"
+	db "SUPER POTION@"
+	db "POTION@"
+	db "ESCAPE ROPE@"
+	db "REPEL@"
+	db "MAX ELIXER@"
+	db "FIRE STONE@"
+	db "THUNDERSTONE@"
+	db "WATER STONE@"
+	db "TERU-SAMA@"
+	db "HP UP@"
+	db "PROTEIN@"
+	db "IRON@"
+	db "CARBOS@"
+	db "LUCKY PUNCH@"
+	db "CALCIUM@"
+	db "RARE CANDY@"
+	db "X ACCURACY@"
+	db "LEAF STONE@"
+	db "METAL POWDER@"
+	db "NUGGET@"
+	db "# DOLL@"
+	db "FULL HEAL@"
+	db "REVIVE@"
+	db "MAX REVIVE@"
+	db "GUARD SPEC.@"
+	db "SUPER REPEL@"
+	db "MAX REPEL@"
+	db "DIRE HIT@"
+	db "TERU-SAMA@"
+	db "FRESH WATER@"
+	db "SODA POP@"
+	db "LEMONADE@"
+	db "X ATTACK@"
+	db "TERU-SAMA@"
+	db "X DEFEND@"
+	db "X SPEED@"
+	db "X SPECIAL@"
+	db "COIN CASE@"
+	db "ITEMFINDER@"
+	db "TERU-SAMA@"
+	db "EXP.SHARE@"
+	db "OLD ROD@"
+	db "GOOD ROD@"
+	db "SILVER LEAF@"
+	db "SUPER ROD@"
+	db "PP UP@"
+	db "ETHER@"
+	db "MAX ETHER@"
+	db "ELIXER@"
+	db "RED SCALE@"
+	db "SECRETPOTION@"
+	db "S.S.TICKET@"
+	db "MYSTERY EGG@"
+	db "CLEAR BELL@"
+	db "SILVER WING@"
+	db "MOOMOO MILK@"
+	db "QUICK CLAW@"
+	db "PSNCUREBERRY@"
+	db "GOLD LEAF@"
+	db "SOFT SAND@"
+	db "SHARP BEAK@"
+	db "PRZCUREBERRY@"
+	db "BURNT BERRY@"
+	db "ICE BERRY@"
+	db "POISON BARB@"
+	db "KING'S ROCK@"
+	db "BITTER BERRY@"
+	db "MINT BERRY@"
+	db "RED APRICORN@"
+	db "TINYMUSHROOM@"
+	db "BIG MUSHROOM@"
+	db "SILVERPOWDER@"
+	db "BLU APRICORN@"
+	db "TERU-SAMA@"
+	db "AMULET COIN@"
+	db "YLW APRICORN@"
+	db "GRN APRICORN@"
+	db "CLEANSE TAG@"
+	db "MYSTIC WATER@"
+	db "TWISTEDSPOON@"
+	db "WHT APRICORN@"
+	db "BLACKBELT@"
+	db "BLK APRICORN@"
+	db "TERU-SAMA@"
+	db "PNK APRICORN@"
+	db "BLACKGLASSES@"
+	db "SLOWPOKETAIL@"
+	db "PINK BOW@"
+	db "STICK@"
+	db "SMOKE BALL@"
+	db "NEVERMELTICE@"
+	db "MAGNET@"
+	db "MIRACLEBERRY@"
+	db "PEARL@"
+	db "BIG PEARL@"
+	db "EVERSTONE@"
+	db "SPELL TAG@"
+	db "RAGECANDYBAR@"
+	db "GS BALL@"
+	db "BLUE CARD@"
+	db "MIRACLE SEED@"
+	db "THICK CLUB@"
+	db "FOCUS BAND@"
+	db "TERU-SAMA@"
+	db "ENERGYPOWDER@"
+	db "ENERGY ROOT@"
+	db "HEAL POWDER@"
+	db "REVIVAL HERB@"
+	db "HARD STONE@"
+	db "LUCKY EGG@"
+	db "CARD KEY@"
+	db "MACHINE PART@"
+	db "EGG TICKET@"
+	db "LOST ITEM@"
+	db "STARDUST@"
+	db "STAR PIECE@"
+	db "BASEMENT KEY@"
+	db "PASS@"
+	db "TERU-SAMA@"
+	db "TERU-SAMA@"
+	db "TERU-SAMA@"
+	db "CHARCOAL@"
+	db "BERRY JUICE@"
+	db "SCOPE LENS@"
+	db "TERU-SAMA@"
+	db "TERU-SAMA@"
+	db "METAL COAT@"
+	db "DRAGON FANG@"
+	db "TERU-SAMA@"
+	db "LEFTOVERS@"
+	db "TERU-SAMA@"
+	db "TERU-SAMA@"
+	db "TERU-SAMA@"
+	db "MYSTERYBERRY@"
+	db "DRAGON SCALE@"
+	db "BERSERK GENE@"
+	db "TERU-SAMA@"
+	db "TERU-SAMA@"
+	db "TERU-SAMA@"
+	db "SACRED ASH@"
+	db "HEAVY BALL@"
+	db "FLOWER MAIL@"
+	db "LEVEL BALL@"
+	db "LURE BALL@"
+	db "FAST BALL@"
+	db "TERU-SAMA@"
+	db "LIGHT BALL@"
+	db "FRIEND BALL@"
+	db "MOON BALL@"
+	db "LOVE BALL@"
+	db "NORMAL BOX@"
+	db "GORGEOUS BOX@"
+	db "SUN STONE@"
+	db "POLKADOT BOW@"
+	db "TERU-SAMA@"
+	db "UP-GRADE@"
+	db "BERRY@"
+	db "GOLD BERRY@"
+	db "SQUIRTBOTTLE@"
+	db "TERU-SAMA@"
+	db "PARK BALL@"
+	db "RAINBOW WING@"
+	db "TERU-SAMA@"
+	db "BRICK PIECE@"
+	db "SURF MAIL@"
+	db "LITEBLUEMAIL@"
+	db "PORTRAITMAIL@"
+	db "LOVELY MAIL@"
+	db "EON MAIL@"
+	db "MORPH MAIL@"
+	db "BLUESKY MAIL@"
+	db "MUSIC MAIL@"
+	db "MIRAGE MAIL@"
+	db "TERU-SAMA@"
+	db "TM01@"
+	db "TM02@"
+	db "TM03@"
+	db "TM04@"
+	db "TERU-SAMA@"
+	db "TM05@"
+	db "TM06@"
+	db "TM07@"
+	db "TM08@"
+	db "TM09@"
+	db "TM10@"
+	db "TM11@"
+	db "TM12@"
+	db "TM13@"
+	db "TM14@"
+	db "TM15@"
+	db "TM16@"
+	db "TM17@"
+	db "TM18@"
+	db "TM19@"
+	db "TM20@"
+	db "TM21@"
+	db "TM22@"
+	db "TM23@"
+	db "TM24@"
+	db "TM25@"
+	db "TM26@"
+	db "TM27@"
+	db "TM28@"
+	db "TERU-SAMA@"
+	db "TM29@"
+	db "TM30@"
+	db "TM31@"
+	db "TM32@"
+	db "TM33@"
+	db "TM34@"
+	db "TM35@"
+	db "TM36@"
+	db "TM37@"
+	db "TM38@"
+	db "TM39@"
+	db "TM40@"
+	db "TM41@"
+	db "TM42@"
+	db "TM43@"
+	db "TM44@"
+	db "TM45@"
+	db "TM46@"
+	db "TM47@"
+	db "TM48@"
+	db "TM49@"
+	db "TM50@"
+	db "HM01@"
+	db "HM02@"
+	db "HM03@"
+	db "HM04@"
+	db "HM05@"
+	db "HM06@"
+	db "HM07@"
+	db "TERU-SAMA@"
+	db "TERU-SAMA@"
+	db "TERU-SAMA@"
+	db "TERU-SAMA@"
+	db "TERU-SAMA@"
+	db "TERU-SAMA@"
+	db "?@"
diff --git a/data/items/marts.asm b/data/items/marts.asm
new file mode 100644
index 000000000..cd17ca36b
--- /dev/null
+++ b/data/items/marts.asm
@@ -0,0 +1,442 @@
+Marts: ; 160a9
+	dw MartCherrygrove
+	dw MartCherrygroveDex
+	dw MartViolet
+	dw MartAzalea
+	dw MartCianwood
+	dw MartGoldenrod2F1
+	dw MartGoldenrod2F2
+	dw MartGoldenrod3F
+	dw MartGoldenrod4F
+	dw MartGoldenrod5F1
+	dw MartGoldenrod5F2
+	dw MartGoldenrod5F3
+	dw MartGoldenrod5F4
+	dw MartOlivine
+	dw MartEcruteak
+	dw MartMahogany1
+	dw MartMahogany2
+	dw MartBlackthorn
+	dw MartViridian
+	dw MartPewter
+	dw MartCerulean
+	dw MartLavender
+	dw MartVermilion
+	dw MartCeladon2F1
+	dw MartCeladon2F2
+	dw MartCeladon3F
+	dw MartCeladon4F
+	dw MartCeladon5F1
+	dw MartCeladon5F2
+	dw MartFuchsia
+	dw MartSaffron
+	dw MartMtMoon
+	dw MartIndigoPlateau
+	dw MartUnderground
+MartsEnd
+; 160ed
+
+
+MartCherrygrove: ; 160ed
+	db 4 ; # items
+	db POTION
+	db ANTIDOTE
+	db PARLYZ_HEAL
+	db AWAKENING
+	db $ff
+; 160f3
+
+MartCherrygroveDex: ; 160f3
+	db 5 ; # items
+	db POKE_BALL
+	db POTION
+	db ANTIDOTE
+	db PARLYZ_HEAL
+	db AWAKENING
+	db $ff
+; 160fa
+
+MartViolet: ; 160fa
+	db 10 ; # items
+	db POKE_BALL
+	db POTION
+	db ESCAPE_ROPE
+	db ANTIDOTE
+	db PARLYZ_HEAL
+	db AWAKENING
+	db X_DEFEND
+	db X_ATTACK
+	db X_SPEED
+	db FLOWER_MAIL
+	db $ff
+; 16106
+
+MartAzalea: ; 16106
+	db 9 ; # items
+	db CHARCOAL
+	db POKE_BALL
+	db POTION
+	db SUPER_POTION
+	db ESCAPE_ROPE
+	db REPEL
+	db ANTIDOTE
+	db PARLYZ_HEAL
+	db FLOWER_MAIL
+	db $ff
+; 16111
+
+MartCianwood: ; 16111
+	db 5 ; # items
+	db POTION
+	db SUPER_POTION
+	db HYPER_POTION
+	db FULL_HEAL
+	db REVIVE
+	db $ff
+; 16118
+
+MartGoldenrod2F1: ; 16118
+	db 7 ; # items
+	db POTION
+	db SUPER_POTION
+	db ANTIDOTE
+	db PARLYZ_HEAL
+	db AWAKENING
+	db BURN_HEAL
+	db ICE_HEAL
+	db $ff
+; 16121
+
+MartGoldenrod2F2: ; 16121
+	db 8 ; # items
+	db POKE_BALL
+	db GREAT_BALL
+	db ESCAPE_ROPE
+	db REPEL
+	db REVIVE
+	db FULL_HEAL
+	db POKE_DOLL
+	db FLOWER_MAIL
+	db $ff
+; 1612b
+
+MartGoldenrod3F: ; 1612b
+	db 7 ; # items
+	db X_SPEED
+	db X_SPECIAL
+	db X_DEFEND
+	db X_ATTACK
+	db DIRE_HIT
+	db GUARD_SPEC
+	db X_ACCURACY
+	db $ff
+; 16134
+
+MartGoldenrod4F: ; 16134
+	db 5 ; # items
+	db PROTEIN
+	db IRON
+	db CARBOS
+	db CALCIUM
+	db HP_UP
+	db $ff
+; 1613b
+
+MartGoldenrod5F1: ; 1613b
+	db 3 ; # items
+	db TM_THUNDERPUNCH
+	db TM_FIRE_PUNCH
+	db TM_ICE_PUNCH
+	db $ff
+; 16140
+
+MartGoldenrod5F2: ; 16140
+	db 4 ; # items
+	db TM_THUNDERPUNCH
+	db TM_FIRE_PUNCH
+	db TM_ICE_PUNCH
+	db TM_HEADBUTT
+	db $ff
+; 16146
+
+MartGoldenrod5F3: ; 16146
+	db 4 ; # items
+	db TM_THUNDERPUNCH
+	db TM_FIRE_PUNCH
+	db TM_ICE_PUNCH
+	db TM_ROCK_SMASH
+	db $ff
+; 1614c
+
+MartGoldenrod5F4: ; 1614c
+	db 5 ; # items
+	db TM_THUNDERPUNCH
+	db TM_FIRE_PUNCH
+	db TM_ICE_PUNCH
+	db TM_HEADBUTT
+	db TM_ROCK_SMASH
+	db $ff
+; 16153
+
+MartOlivine: ; 16153
+	db 9 ; # items
+	db GREAT_BALL
+	db SUPER_POTION
+	db HYPER_POTION
+	db ANTIDOTE
+	db PARLYZ_HEAL
+	db AWAKENING
+	db ICE_HEAL
+	db SUPER_REPEL
+	db SURF_MAIL
+	db $ff
+; 1615e
+
+MartEcruteak: ; 1615e
+	db 10 ; # items
+	db POKE_BALL
+	db GREAT_BALL
+	db POTION
+	db SUPER_POTION
+	db ANTIDOTE
+	db PARLYZ_HEAL
+	db AWAKENING
+	db BURN_HEAL
+	db ICE_HEAL
+	db REVIVE
+	db $ff
+; 1616a
+
+MartMahogany1: ; 1616a
+	db 4 ; # items
+	db TINYMUSHROOM
+	db SLOWPOKETAIL
+	db POKE_BALL
+	db POTION
+	db $ff
+; 16170
+
+MartMahogany2: ; 16170
+	db 9 ; # items
+	db RAGECANDYBAR
+	db GREAT_BALL
+	db SUPER_POTION
+	db HYPER_POTION
+	db ANTIDOTE
+	db PARLYZ_HEAL
+	db SUPER_REPEL
+	db REVIVE
+	db FLOWER_MAIL
+	db $ff
+; 1617b
+
+MartBlackthorn: ; 1617b
+	db 9 ; # items
+	db GREAT_BALL
+	db ULTRA_BALL
+	db HYPER_POTION
+	db MAX_POTION
+	db FULL_HEAL
+	db REVIVE
+	db MAX_REPEL
+	db X_DEFEND
+	db X_ATTACK
+	db $ff
+; 16186
+
+MartViridian: ; 16186
+	db 9 ; # items
+	db ULTRA_BALL
+	db HYPER_POTION
+	db FULL_HEAL
+	db REVIVE
+	db ANTIDOTE
+	db PARLYZ_HEAL
+	db AWAKENING
+	db BURN_HEAL
+	db FLOWER_MAIL
+	db $ff
+; 16191
+
+MartPewter: ; 16191
+	db 7 ; # items
+	db GREAT_BALL
+	db SUPER_POTION
+	db SUPER_REPEL
+	db ANTIDOTE
+	db PARLYZ_HEAL
+	db AWAKENING
+	db BURN_HEAL
+	db $ff
+; 1619a
+
+MartCerulean: ; 1619a
+	db 9 ; # items
+	db GREAT_BALL
+	db ULTRA_BALL
+	db SUPER_POTION
+	db SUPER_REPEL
+	db FULL_HEAL
+	db X_DEFEND
+	db X_ATTACK
+	db DIRE_HIT
+	db SURF_MAIL
+	db $ff
+; 161a5
+
+MartLavender: ; 161a5
+	db 8 ; # items
+	db GREAT_BALL
+	db POTION
+	db SUPER_POTION
+	db MAX_REPEL
+	db ANTIDOTE
+	db PARLYZ_HEAL
+	db AWAKENING
+	db BURN_HEAL
+	db $ff
+; 161af
+
+MartVermilion: ; 161af
+	db 8 ; # items
+	db ULTRA_BALL
+	db SUPER_POTION
+	db HYPER_POTION
+	db REVIVE
+	db PARLYZ_HEAL
+	db AWAKENING
+	db BURN_HEAL
+	db LITEBLUEMAIL
+	db $ff
+; 161b9
+
+MartCeladon2F1: ; 161b9
+	db 7 ; # items
+	db POTION
+	db SUPER_POTION
+	db HYPER_POTION
+	db MAX_POTION
+	db REVIVE
+	db SUPER_REPEL
+	db MAX_REPEL
+	db $ff
+; 161c2
+
+MartCeladon2F2: ; 161c2
+	db 10 ; # items
+	db POKE_BALL
+	db GREAT_BALL
+	db ULTRA_BALL
+	db ESCAPE_ROPE
+	db FULL_HEAL
+	db ANTIDOTE
+	db BURN_HEAL
+	db ICE_HEAL
+	db AWAKENING
+	db PARLYZ_HEAL
+	db $ff
+; 161ce
+
+MartCeladon3F: ; 161ce
+	db 5 ; # items
+	db TM_HIDDEN_POWER
+	db TM_SUNNY_DAY
+	db TM_PROTECT
+	db TM_RAIN_DANCE
+	db TM_SANDSTORM
+	db $ff
+; 161d5
+
+MartCeladon4F: ; 161d5
+	db 3 ; # items
+	db POKE_DOLL
+	db LOVELY_MAIL
+	db SURF_MAIL
+	db $ff
+; 161da
+
+MartCeladon5F1: ; 161da
+	db 5 ; # items
+	db HP_UP
+	db PROTEIN
+	db IRON
+	db CARBOS
+	db CALCIUM
+	db $ff
+; 161e1
+
+MartCeladon5F2: ; 161e1
+	db 7 ; # items
+	db X_ACCURACY
+	db GUARD_SPEC
+	db DIRE_HIT
+	db X_ATTACK
+	db X_DEFEND
+	db X_SPEED
+	db X_SPECIAL
+	db $ff
+; 161ea
+
+MartFuchsia: ; 161ea
+	db 7 ; # items
+	db GREAT_BALL
+	db ULTRA_BALL
+	db SUPER_POTION
+	db HYPER_POTION
+	db FULL_HEAL
+	db MAX_REPEL
+	db FLOWER_MAIL
+	db $ff
+; 161f3
+
+MartSaffron: ; 161f3
+	db 8 ; # items
+	db GREAT_BALL
+	db ULTRA_BALL
+	db HYPER_POTION
+	db MAX_POTION
+	db FULL_HEAL
+	db X_ATTACK
+	db X_DEFEND
+	db FLOWER_MAIL
+	db $ff
+; 161fd
+
+MartMtMoon: ; 161fd
+	db 6 ; # items
+	db POKE_DOLL
+	db FRESH_WATER
+	db SODA_POP
+	db LEMONADE
+	db REPEL
+	db PORTRAITMAIL
+	db $ff
+; 16205
+
+MartIndigoPlateau: ; 16205
+	db 7 ; # items
+	db ULTRA_BALL
+	db MAX_REPEL
+	db HYPER_POTION
+	db MAX_POTION
+	db FULL_RESTORE
+	db REVIVE
+	db FULL_HEAL
+	db $ff
+; 1620e
+
+MartUnderground: ; 1620e
+	db 4 ; # items
+	db ENERGYPOWDER
+	db ENERGY_ROOT
+	db HEAL_POWDER
+	db REVIVAL_HERB
+	db $ff
+; 16214
+
+DefaultMart: ; 16214
+	db 2 ; # items
+	db POKE_BALL
+	db POTION
+	db $ff
+; 16218
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/data/pokemon/cry_headers.asm b/data/pokemon/cry_headers.asm
new file mode 100644
index 000000000..0651fa7f1
--- /dev/null
+++ b/data/pokemon/cry_headers.asm
@@ -0,0 +1,259 @@
+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
+VenusaurCryHeader:    cry_header CRY_BULBASAUR,   $000,  $140
+CharmanderCryHeader:  cry_header CRY_CHARMANDER,  $060,  $0c0
+CharmeleonCryHeader:  cry_header CRY_CHARMANDER,  $020,  $0c0
+CharizardCryHeader:   cry_header CRY_CHARMANDER,  $000,  $100
+SquirtleCryHeader:    cry_header CRY_SQUIRTLE,    $060,  $0c0
+WartortleCryHeader:   cry_header CRY_SQUIRTLE,    $020,  $0c0
+BlastoiseCryHeader:   cry_header CRY_BLASTOISE,   $000,  $100
+CaterpieCryHeader:    cry_header CRY_CATERPIE,    $080,  $0a0
+MetapodCryHeader:     cry_header CRY_METAPOD,     $0cc,  $081
+ButterfreeCryHeader:  cry_header CRY_CATERPIE,    $077,  $0c0
+WeedleCryHeader:      cry_header CRY_WEEDLE,      $0ee,  $081
+KakunaCryHeader:      cry_header CRY_BLASTOISE,   $0ff,  $081
+BeedrillCryHeader:    cry_header CRY_BLASTOISE,   $060,  $100
+PidgeyCryHeader:      cry_header CRY_PIDGEY,      $0df,  $084
+PidgeottoCryHeader:   cry_header CRY_PIDGEOTTO,   $028,  $140
+PidgeotCryHeader:     cry_header CRY_PIDGEOTTO,   $011,  $17f
+RattataCryHeader:     cry_header CRY_RATTATA,     $000,  $100
+RaticateCryHeader:    cry_header CRY_RATTATA,     $020,  $17f
+SpearowCryHeader:     cry_header CRY_SPEAROW,     $000,  $100
+FearowCryHeader:      cry_header CRY_FEAROW,      $040,  $120
+EkansCryHeader:       cry_header CRY_EKANS,       $012,  $0c0
+ArbokCryHeader:       cry_header CRY_EKANS,       $0e0,  $090
+PikachuCryHeader:     cry_header CRY_BULBASAUR,   $0ee,  $081
+RaichuCryHeader:      cry_header CRY_RAICHU,      $0ee,  $088
+SandshrewCryHeader:   cry_header CRY_NIDORAN_M,   $020,  $0c0
+SandslashCryHeader:   cry_header CRY_NIDORAN_M,   $0ff,  $17f
+NidoranFCryHeader:    cry_header CRY_NIDORAN_F,   $000,  $100
+NidorinaCryHeader:    cry_header CRY_NIDORAN_F,   $02c,  $160
+NidoqueenCryHeader:   cry_header CRY_NIDOQUEEN,   $000,  $100
+NidoranMCryHeader:    cry_header CRY_NIDORAN_M,   $000,  $100
+NidorinoCryHeader:    cry_header CRY_NIDORAN_M,   $02c,  $140
+NidokingCryHeader:    cry_header CRY_RAICHU,      $000,  $100
+ClefairyCryHeader:    cry_header CRY_CLEFAIRY,    $0cc,  $081
+ClefableCryHeader:    cry_header CRY_CLEFAIRY,    $0aa,  $0a0
+VulpixCryHeader:      cry_header CRY_VULPIX,      $04f,  $090
+NinetalesCryHeader:   cry_header CRY_VULPIX,      $088,  $0e0
+JigglypuffCryHeader:  cry_header CRY_PIDGEY,      $0ff,  $0b5
+WigglytuffCryHeader:  cry_header CRY_PIDGEY,      $068,  $0e0
+ZubatCryHeader:       cry_header CRY_SQUIRTLE,    $0e0,  $100
+GolbatCryHeader:      cry_header CRY_SQUIRTLE,    $0fa,  $100
+OddishCryHeader:      cry_header CRY_ODDISH,      $0dd,  $081
+GloomCryHeader:       cry_header CRY_ODDISH,      $0aa,  $0c0
+VileplumeCryHeader:   cry_header CRY_VILEPLUME,   $022,  $17f
+ParasCryHeader:       cry_header CRY_PARAS,       $020,  $160
+ParasectCryHeader:    cry_header CRY_PARAS,       $042,  $17f
+VenonatCryHeader:     cry_header CRY_VENONAT,     $044,  $0c0
+VenomothCryHeader:    cry_header CRY_VENONAT,     $029,  $100
+DiglettCryHeader:     cry_header CRY_DIGLETT,     $0aa,  $081
+DugtrioCryHeader:     cry_header CRY_DIGLETT,     $02a,  $090
+MeowthCryHeader:      cry_header CRY_CLEFAIRY,    $077,  $090
+PersianCryHeader:     cry_header CRY_CLEFAIRY,    $099,  $17f
+PsyduckCryHeader:     cry_header CRY_PSYDUCK,     $020,  $0e0
+GolduckCryHeader:     cry_header CRY_PSYDUCK,     $0ff,  $0c0
+MankeyCryHeader:      cry_header CRY_NIDOQUEEN,   $0dd,  $0e0
+PrimeapeCryHeader:    cry_header CRY_NIDOQUEEN,   $0af,  $0c0
+GrowlitheCryHeader:   cry_header CRY_GROWLITHE,   $020,  $0c0
+ArcanineCryHeader:    cry_header CRY_WEEDLE,      $000,  $100
+PoliwagCryHeader:     cry_header CRY_PIDGEY,      $0ff,  $17f
+PoliwhirlCryHeader:   cry_header CRY_PIDGEY,      $077,  $0e0
+PoliwrathCryHeader:   cry_header CRY_PIDGEY,      $000,  $17f
+AbraCryHeader:        cry_header CRY_METAPOD,     $0c0,  $081
+KadabraCryHeader:     cry_header CRY_METAPOD,     $0a8,  $140
+AlakazamCryHeader:    cry_header CRY_METAPOD,     $098,  $17f
+MachopCryHeader:      cry_header CRY_GROWLITHE,   $0ee,  $081
+MachokeCryHeader:     cry_header CRY_GROWLITHE,   $048,  $0e0
+MachampCryHeader:     cry_header CRY_GROWLITHE,   $008,  $140
+BellsproutCryHeader:  cry_header CRY_PSYDUCK,     $055,  $081
+WeepinbellCryHeader:  cry_header CRY_WEEPINBELL,  $044,  $0a0
+VictreebelCryHeader:  cry_header CRY_WEEPINBELL,  $066,  $14c
+TentacoolCryHeader:   cry_header CRY_VENONAT,     $000,  $100
+TentacruelCryHeader:  cry_header CRY_VENONAT,     $0ee,  $17f
+GeodudeCryHeader:     cry_header CRY_VULPIX,      $0f0,  $090
+GravelerCryHeader:    cry_header CRY_VULPIX,      $000,  $100
+GolemCryHeader:       cry_header CRY_GOLEM,       $0e0,  $0c0
+PonytaCryHeader:      cry_header CRY_WEEPINBELL,  $000,  $100
+RapidashCryHeader:    cry_header CRY_WEEPINBELL,  $020,  $140
+SlowpokeCryHeader:    cry_header CRY_SLOWPOKE,    $000,  $100
+SlowbroCryHeader:     cry_header CRY_GROWLITHE,   $000,  $100
+MagnemiteCryHeader:   cry_header CRY_METAPOD,     $080,  $0e0
+MagnetonCryHeader:    cry_header CRY_METAPOD,     $020,  $140
+FarfetchDCryHeader:   cry_header CRY_SPEAROW,     $0dd,  $081
+DoduoCryHeader:       cry_header CRY_DIGLETT,     $0bb,  $081
+DodrioCryHeader:      cry_header CRY_DIGLETT,     $099,  $0a0
+SeelCryHeader:        cry_header CRY_SEEL,        $088,  $140
+DewgongCryHeader:     cry_header CRY_SEEL,        $023,  $17f
+GrimerCryHeader:      cry_header CRY_GRIMER,      $000,  $100
+MukCryHeader:         cry_header CRY_MUK,         $0ef,  $17f
+ShellderCryHeader:    cry_header CRY_FEAROW,      $000,  $100
+CloysterCryHeader:    cry_header CRY_FEAROW,      $06f,  $160
+GastlyCryHeader:      cry_header CRY_METAPOD,     $000,  $100
+HaunterCryHeader:     cry_header CRY_METAPOD,     $030,  $0c0
+GengarCryHeader:      cry_header CRY_MUK,         $000,  $17f
+OnixCryHeader:        cry_header CRY_EKANS,       $0ff,  $140
+DrowzeeCryHeader:     cry_header CRY_DROWZEE,     $088,  $0a0
+HypnoCryHeader:       cry_header CRY_DROWZEE,     $0ee,  $0c0
+KrabbyCryHeader:      cry_header CRY_KRABBY,      $020,  $160
+KinglerCryHeader:     cry_header CRY_KRABBY,      $0ee,  $160
+VoltorbCryHeader:     cry_header CRY_VOLTORB,     $0ed,  $100
+ElectrodeCryHeader:   cry_header CRY_VOLTORB,     $0a8,  $110
+ExeggcuteCryHeader:   cry_header CRY_DIGLETT,     $000,  $100
+ExeggutorCryHeader:   cry_header CRY_DROWZEE,     $000,  $100
+CuboneCryHeader:      cry_header CRY_CLEFAIRY,    $000,  $100
+MarowakCryHeader:     cry_header CRY_ODDISH,      $04f,  $0e0
+HitmonleeCryHeader:   cry_header CRY_GOLEM,       $080,  $140
+HitmonchanCryHeader:  cry_header CRY_SEEL,        $0ee,  $140
+LickitungCryHeader:   cry_header CRY_SEEL,        $000,  $100
+KoffingCryHeader:     cry_header CRY_GOLEM,       $0e6,  $15d
+WeezingCryHeader:     cry_header CRY_GOLEM,       $0ff,  $17f
+RhyhornCryHeader:     cry_header CRY_CHARMANDER,  $000,  $100
+RhydonCryHeader:      cry_header CRY_RHYDON,      $000,  $100
+ChanseyCryHeader:     cry_header CRY_PIDGEOTTO,   $00a,  $140
+TangelaCryHeader:     cry_header CRY_GOLEM,       $000,  $100
+KangaskhanCryHeader:  cry_header CRY_KANGASKHAN,  $000,  $100
+HorseaCryHeader:      cry_header CRY_CLEFAIRY,    $099,  $090
+SeadraCryHeader:      cry_header CRY_CLEFAIRY,    $03c,  $081
+GoldeenCryHeader:     cry_header CRY_CATERPIE,    $080,  $0c0
+SeakingCryHeader:     cry_header CRY_CATERPIE,    $010,  $17f
+StaryuCryHeader:      cry_header CRY_PARAS,       $002,  $0a0
+StarmieCryHeader:     cry_header CRY_PARAS,       $000,  $100
+MrMimeCryHeader:      cry_header CRY_KRABBY,      $008,  $0c0
+ScytherCryHeader:     cry_header CRY_CATERPIE,    $000,  $100
+JynxCryHeader:        cry_header CRY_DROWZEE,     $0ff,  $17f
+ElectabuzzCryHeader:  cry_header CRY_VOLTORB,     $08f,  $17f
+MagmarCryHeader:      cry_header CRY_CHARMANDER,  $0ff,  $0b0
+PinsirCryHeader:      cry_header CRY_PIDGEOTTO,   $000,  $100
+TaurosCryHeader:      cry_header CRY_SQUIRTLE,    $011,  $0c0
+MagikarpCryHeader:    cry_header CRY_EKANS,       $080,  $080
+GyaradosCryHeader:    cry_header CRY_EKANS,       $000,  $100
+LaprasCryHeader:      cry_header CRY_LAPRAS,      $000,  $100
+DittoCryHeader:       cry_header CRY_PIDGEY,      $0ff,  $17f
+EeveeCryHeader:       cry_header CRY_VENONAT,     $088,  $0e0
+VaporeonCryHeader:    cry_header CRY_VENONAT,     $0aa,  $17f
+JolteonCryHeader:     cry_header CRY_VENONAT,     $03d,  $100
+FlareonCryHeader:     cry_header CRY_VENONAT,     $010,  $0a0
+PorygonCryHeader:     cry_header CRY_WEEPINBELL,  $0aa,  $17f
+OmanyteCryHeader:     cry_header CRY_GROWLITHE,   $0f0,  $081
+OmastarCryHeader:     cry_header CRY_GROWLITHE,   $0ff,  $0c0
+KabutoCryHeader:      cry_header CRY_CATERPIE,    $0bb,  $0c0
+KabutopsCryHeader:    cry_header CRY_FEAROW,      $0ee,  $081
+AerodactylCryHeader:  cry_header CRY_VILEPLUME,   $020,  $170
+SnorlaxCryHeader:     cry_header CRY_GRIMER,      $055,  $081
+ArticunoCryHeader:    cry_header CRY_RAICHU,      $080,  $0c0
+ZapdosCryHeader:      cry_header CRY_FEAROW,      $0ff,  $100
+MoltresCryHeader:     cry_header CRY_RAICHU,      $0f8,  $0c0
+DratiniCryHeader:     cry_header CRY_BULBASAUR,   $060,  $0c0
+DragonairCryHeader:   cry_header CRY_BULBASAUR,   $040,  $100
+DragoniteCryHeader:   cry_header CRY_BULBASAUR,   $03c,  $140
+MewtwoCryHeader:      cry_header CRY_PARAS,       $099,  $17f
+MewCryHeader:         cry_header CRY_PARAS,       $0ee,  $17f
+ChikoritaCryHeader:   cry_header CRY_CHIKORITA,  -$010,  $0b0
+BayleefCryHeader:     cry_header CRY_CHIKORITA,  -$022,  $120
+MeganiumCryHeader:    cry_header CRY_CHIKORITA,  -$0b7,  $200
+CyndaquilCryHeader:   cry_header CRY_CYNDAQUIL,   $347,  $080
+QuilavaCryHeader:     cry_header CRY_CYNDAQUIL,   $321,  $120
+TyphlosionCryHeader:  cry_header CRY_TYPHLOSION,  $f00,  $0d4
+TotodileCryHeader:    cry_header CRY_TOTODILE,    $46c,  $0e8
+CroconawCryHeader:    cry_header CRY_TOTODILE,    $440,  $110
+FeraligatrCryHeader:  cry_header CRY_TOTODILE,    $3fc,  $180
+SentretCryHeader:     cry_header CRY_SENTRET,     $08a,  $0b8
+FurretCryHeader:      cry_header CRY_SENTRET,     $06b,  $102
+HoothootCryHeader:    cry_header CRY_HOOTHOOT,    $091,  $0d8
+NoctowlCryHeader:     cry_header CRY_HOOTHOOT,    $000,  $1a0
+LedybaCryHeader:      cry_header CRY_LEDYBA,      $000,  $0de
+LedianCryHeader:      cry_header CRY_LEDYBA,     -$096,  $138
+SpinarakCryHeader:    cry_header CRY_SPINARAK,    $011,  $200
+AriadosCryHeader:     cry_header CRY_SPINARAK,   -$0ae,  $1e2
+CrobatCryHeader:      cry_header CRY_SQUIRTLE,   -$010,  $140
+ChinchouCryHeader:    cry_header CRY_CYNDAQUIL,   $3c9,  $140
+LanturnCryHeader:     cry_header CRY_CYNDAQUIL,   $2d0,  $110
+PichuCryHeader:       cry_header CRY_PICHU,       $000,  $140
+CleffaCryHeader:      cry_header CRY_CLEFFA,      $061,  $091
+IgglybuffCryHeader:   cry_header CRY_CHIKORITA,   $0e8,  $0e8
+TogepiCryHeader:      cry_header CRY_TOGEPI,      $010,  $100
+TogeticCryHeader:     cry_header CRY_TOGETIC,     $03b,  $038
+NatuCryHeader:        cry_header CRY_NATU,       -$067,  $100
+XatuCryHeader:        cry_header CRY_NATU,       -$0a7,  $168
+MareepCryHeader:      cry_header CRY_MAREEP,      $022,  $0d8
+FlaaffyCryHeader:     cry_header CRY_MAREEP,     -$007,  $180
+AmpharosCryHeader:    cry_header CRY_AMPHAROS,   -$07c,  $0e8
+BellossomCryHeader:   cry_header CRY_CLEFFA,      $084,  $150
+MarillCryHeader:      cry_header CRY_MARILL,      $11b,  $120
+AzumarillCryHeader:   cry_header CRY_MARILL,      $0b6,  $180
+SudowoodoCryHeader:   cry_header CRY_CLEFFA,      $f40,  $180
+PolitoedCryHeader:    cry_header CRY_CLEFFA,     -$2a3,  $1c8
+HoppipCryHeader:      cry_header CRY_CLEFFA,      $03b,  $0c8
+SkiploomCryHeader:    cry_header CRY_CLEFFA,      $027,  $138
+JumpluffCryHeader:    cry_header CRY_CLEFFA,      $000,  $180
+AipomCryHeader:       cry_header CRY_AIPOM,      -$051,  $0e8
+SunkernCryHeader:     cry_header CRY_MARILL,      $12b,  $0b8
+SunfloraCryHeader:    cry_header CRY_SUNFLORA,   -$020,  $180
+YanmaCryHeader:       cry_header CRY_TOTODILE,    $031,  $0c8
+WooperCryHeader:      cry_header CRY_WOOPER,      $093,  $0af
+QuagsireCryHeader:    cry_header CRY_WOOPER,     -$0c6,  $140
+EspeonCryHeader:      cry_header CRY_AIPOM,       $0a2,  $140
+UmbreonCryHeader:     cry_header CRY_VENONAT,    -$0e9,  $0f0
+MurkrowCryHeader:     cry_header CRY_MARILL,     -$01f,  $180
+SlowkingCryHeader:    cry_header CRY_SLOWKING,    $104,  $200
+MisdreavusCryHeader:  cry_header CRY_HOOTHOOT,    $130,  $0e8
+UnownCryHeader:       cry_header CRY_HOOTHOOT,    $162,  $100
+WobbuffetCryHeader:   cry_header CRY_AMPHAROS,    $27b,  $144
+GirafarigCryHeader:   cry_header CRY_GIRAFARIG,   $041,  $200
+PinecoCryHeader:      cry_header CRY_SLOWKING,    $080,  $100
+ForretressCryHeader:  cry_header CRY_SLOWKING,    $000,  $180
+DunsparceCryHeader:   cry_header CRY_DUNSPARCE,   $1c4,  $100
+GligarCryHeader:      cry_header CRY_GLIGAR,     -$102,  $100
+SteelixCryHeader:     cry_header CRY_TYPHLOSION,  $0ef,  $0f7
+SnubbullCryHeader:    cry_header CRY_DUNSPARCE,   $112,  $0e8
+GranbullCryHeader:    cry_header CRY_DUNSPARCE,   $000,  $180
+QwilfishCryHeader:    cry_header CRY_SLOWKING,    $160,  $0e0
+ScizorCryHeader:      cry_header CRY_AMPHAROS,    $000,  $160
+ShuckleCryHeader:     cry_header CRY_DUNSPARCE,   $290,  $0a8
+HeracrossCryHeader:   cry_header CRY_AMPHAROS,    $035,  $0e0
+SneaselCryHeader:     cry_header CRY_WOOPER,      $053,  $0af
+TeddiursaCryHeader:   cry_header CRY_TEDDIURSA,   $7a2,  $06e
+UrsaringCryHeader:    cry_header CRY_TEDDIURSA,   $640,  $0d8
+SlugmaCryHeader:      cry_header CRY_SLUGMA,     -$1d8,  $140
+MagcargoCryHeader:    cry_header CRY_MAGCARGO,   -$20d,  $1c0
+SwinubCryHeader:      cry_header CRY_CYNDAQUIL,   $1fe,  $140
+PiloswineCryHeader:   cry_header CRY_MAGCARGO,   -$109,  $100
+CorsolaCryHeader:     cry_header CRY_MAGCARGO,    $0a1,  $0e8
+RemoraidCryHeader:    cry_header CRY_SUNFLORA,    $00d,  $100
+OctilleryCryHeader:   cry_header CRY_TOTODILE,    $000,  $180
+DelibirdCryHeader:    cry_header CRY_TEDDIURSA,   $002,  $06a
+MantineCryHeader:     cry_header CRY_MANTINE,    -$0be,  $0f0
+SkarmoryCryHeader:    cry_header CRY_AMPHAROS,    $8a9,  $180
+HoundourCryHeader:    cry_header CRY_CYNDAQUIL,   $039,  $140
+HoundoomCryHeader:    cry_header CRY_TOTODILE,   -$10a,  $100
+KingdraCryHeader:     cry_header CRY_SLUGMA,      $2fb,  $100
+PhanpyCryHeader:      cry_header CRY_SENTRET,     $048,  $230
+DonphanCryHeader:     cry_header CRY_DONPHAN,     $000,  $1a0
+Porygon2CryHeader:    cry_header CRY_GIRAFARIG,   $073,  $240
+StantlerCryHeader:    cry_header CRY_AIPOM,      -$160,  $180
+SmeargleCryHeader:    cry_header CRY_PICHU,      -$21a,  $1f0
+TyrogueCryHeader:     cry_header CRY_AIPOM,       $02c,  $108
+HitmontopCryHeader:   cry_header CRY_SLUGMA,      $000,  $100
+SmoochumCryHeader:    cry_header CRY_MARILL,      $068,  $100
+ElekidCryHeader:      cry_header CRY_SUNFLORA,   -$2d8,  $0b4
+MagbyCryHeader:       cry_header CRY_TEDDIURSA,   $176,  $03a
+MiltankCryHeader:     cry_header CRY_GLIGAR,     -$1cd,  $1a0
+BlisseyCryHeader:     cry_header CRY_SLOWKING,    $293,  $140
+RaikouCryHeader:      cry_header CRY_RAIKOU,      $22e,  $120
+EnteiCryHeader:       cry_header CRY_ENTEI,       $000,  $1a0
+SuicuneCryHeader:     cry_header CRY_MAGCARGO,    $000,  $180
+LarvitarCryHeader:    cry_header CRY_RAIKOU,      $05f,  $0d0
+PupitarCryHeader:     cry_header CRY_SPINARAK,   -$1db,  $150
+TyranitarCryHeader:   cry_header CRY_RAIKOU,     -$100,  $180
+LugiaCryHeader:       cry_header CRY_TYPHLOSION,  $000,  $100
+HoOhCryHeader:        cry_header CRY_AIPOM,       $000,  $180
+CelebiCryHeader:      cry_header CRY_ENTEI,       $14a,  $111
+CryHeader252:         cry_header CRY_NIDORAN_M,      0,     0
+CryHeader253:         cry_header CRY_NIDORAN_M,      0,     0
+CryHeader254:         cry_header CRY_NIDORAN_M,      0,     0
+CryHeader255:         cry_header CRY_NIDORAN_M,      0,     0
+; f2d81
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/data/trainers/encounter_music.asm b/data/trainers/encounter_music.asm
new file mode 100644
index 000000000..cd0348d81
--- /dev/null
+++ b/data/trainers/encounter_music.asm
@@ -0,0 +1,75 @@
+; What music plays when a trainer notices you
+
+TrainerEncounterMusic::
+; entries correspond to trainer classes (see constants/trainer_constants.asm)
+    db MUSIC_HIKER_ENCOUNTER       ; none
+    db MUSIC_YOUNGSTER_ENCOUNTER   ; falkner
+    db MUSIC_LASS_ENCOUNTER        ; whitney
+    db MUSIC_YOUNGSTER_ENCOUNTER   ; bugsy
+    db MUSIC_OFFICER_ENCOUNTER     ; morty
+    db MUSIC_OFFICER_ENCOUNTER     ; pryce
+    db MUSIC_LASS_ENCOUNTER        ; jasmine
+    db MUSIC_OFFICER_ENCOUNTER     ; chuck
+    db MUSIC_BEAUTY_ENCOUNTER      ; clair
+    db MUSIC_RIVAL_ENCOUNTER       ; rival1
+    db MUSIC_HIKER_ENCOUNTER       ; pokemon_prof
+    db MUSIC_HIKER_ENCOUNTER       ; will
+    db MUSIC_HIKER_ENCOUNTER       ; cal
+    db MUSIC_OFFICER_ENCOUNTER     ; bruno
+    db MUSIC_HIKER_ENCOUNTER       ; karen
+    db MUSIC_HIKER_ENCOUNTER       ; koga
+    db MUSIC_OFFICER_ENCOUNTER     ; champion
+    db MUSIC_YOUNGSTER_ENCOUNTER   ; brock
+    db MUSIC_LASS_ENCOUNTER        ; misty
+    db MUSIC_OFFICER_ENCOUNTER     ; lt_surge
+    db MUSIC_ROCKET_ENCOUNTER      ; scientist
+    db MUSIC_OFFICER_ENCOUNTER     ; erika
+    db MUSIC_YOUNGSTER_ENCOUNTER   ; youngster
+    db MUSIC_YOUNGSTER_ENCOUNTER   ; schoolboy
+    db MUSIC_YOUNGSTER_ENCOUNTER   ; bird_keeper
+    db MUSIC_LASS_ENCOUNTER        ; lass
+    db MUSIC_LASS_ENCOUNTER        ; janine
+    db MUSIC_HIKER_ENCOUNTER       ; cooltrainerm
+    db MUSIC_BEAUTY_ENCOUNTER      ; cooltrainerf
+    db MUSIC_BEAUTY_ENCOUNTER      ; beauty
+    db MUSIC_POKEMANIAC_ENCOUNTER  ; pokemaniac
+    db MUSIC_ROCKET_ENCOUNTER      ; gruntm
+    db MUSIC_HIKER_ENCOUNTER       ; gentleman
+    db MUSIC_BEAUTY_ENCOUNTER      ; skier
+    db MUSIC_BEAUTY_ENCOUNTER      ; teacher
+    db MUSIC_BEAUTY_ENCOUNTER      ; sabrina
+    db MUSIC_YOUNGSTER_ENCOUNTER   ; bug_catcher
+    db MUSIC_HIKER_ENCOUNTER       ; fisher
+    db MUSIC_HIKER_ENCOUNTER       ; swimmerm
+    db MUSIC_BEAUTY_ENCOUNTER      ; swimmerf
+    db MUSIC_HIKER_ENCOUNTER       ; sailor
+    db MUSIC_POKEMANIAC_ENCOUNTER  ; super_nerd
+    db MUSIC_RIVAL_ENCOUNTER       ; rival2
+    db MUSIC_HIKER_ENCOUNTER       ; guitarist
+    db MUSIC_HIKER_ENCOUNTER       ; hiker
+    db MUSIC_HIKER_ENCOUNTER       ; biker
+    db MUSIC_OFFICER_ENCOUNTER     ; blaine
+    db MUSIC_POKEMANIAC_ENCOUNTER  ; burglar
+    db MUSIC_HIKER_ENCOUNTER       ; firebreather
+    db MUSIC_POKEMANIAC_ENCOUNTER  ; juggler
+    db MUSIC_HIKER_ENCOUNTER       ; blackbelt_t
+    db MUSIC_ROCKET_ENCOUNTER      ; executivem
+    db MUSIC_YOUNGSTER_ENCOUNTER   ; psychic_t
+    db MUSIC_LASS_ENCOUNTER        ; picnicker
+    db MUSIC_YOUNGSTER_ENCOUNTER   ; camper
+    db MUSIC_ROCKET_ENCOUNTER      ; executivef
+    db MUSIC_SAGE_ENCOUNTER        ; sage
+    db MUSIC_SAGE_ENCOUNTER        ; medium
+    db MUSIC_HIKER_ENCOUNTER       ; boarder
+    db MUSIC_HIKER_ENCOUNTER       ; pokefanm
+    db MUSIC_KIMONO_ENCOUNTER      ; kimono_girl
+    db MUSIC_LASS_ENCOUNTER        ; twins
+    db MUSIC_BEAUTY_ENCOUNTER      ; pokefanf
+    db MUSIC_HIKER_ENCOUNTER       ; red
+    db MUSIC_RIVAL_ENCOUNTER       ; blue
+    db MUSIC_HIKER_ENCOUNTER       ; officer
+    db MUSIC_ROCKET_ENCOUNTER      ; gruntf
+    db MUSIC_HIKER_ENCOUNTER       ; mysticalman
+    db MUSIC_HIKER_ENCOUNTER
+    db MUSIC_HIKER_ENCOUNTER
+    db MUSIC_HIKER_ENCOUNTER
diff --git a/data/trainers/gendered_trainers.asm b/data/trainers/gendered_trainers.asm
new file mode 100644
index 000000000..98cfec2ac
--- /dev/null
+++ b/data/trainers/gendered_trainers.asm
@@ -0,0 +1,40 @@
+MaleTrainers: ; 4e95d
+	db BURGLAR
+	db YOUNGSTER
+	db SCHOOLBOY
+	db BIRD_KEEPER
+	db POKEMANIAC
+	db GENTLEMAN
+	db BUG_CATCHER
+	db FISHER
+	db SWIMMERM
+	db SAILOR
+	db SUPER_NERD
+	db GUITARIST
+	db HIKER
+	db FIREBREATHER
+	db BLACKBELT_T
+	db PSYCHIC_T
+	db CAMPER
+	db COOLTRAINERM
+	db BOARDER
+	db JUGGLER
+	db POKEFANM
+	db OFFICER
+	db SAGE
+	db BIKER
+	db SCIENTIST
+MaleTrainersEnd
+
+FemaleTrainers: ; 4e976
+	db MEDIUM
+	db LASS
+	db BEAUTY
+	db SKIER
+	db TEACHER
+	db SWIMMERF
+	db PICNICKER
+	db KIMONO_GIRL
+	db POKEFANF
+	db COOLTRAINERF
+FemaleTrainersEnd
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
new file mode 100644
index 000000000..e96cfd895
--- /dev/null
+++ b/data/trainers/parties.asm
@@ -0,0 +1,8829 @@
+Trainers:
+
+; All trainers follow a basic structure:
+	; Name
+		; String in format "TEXT@"
+	; Type
+		; TRAINERTYPE_NORMAL:     level, species
+		; TRAINERTYPE_MOVES:      level, species, moves
+		; TRAINERTYPE_ITEM:       level, species, item
+		; TRAINERTYPE_ITEM_MOVES: level, species, item, moves
+	; Party
+		; Up to six monsters following the data type
+	; $ff
+
+
+FalknerGroup:
+; ================================
+; ================
+
+	; FALKNER (1)
+	db "FALKNER@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 7, PIDGEY
+		db TACKLE
+		db MUD_SLAP
+		db 0
+		db 0
+
+	db 9, PIDGEOTTO
+		db TACKLE
+		db MUD_SLAP
+		db GUST
+		db 0
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+WhitneyGroup:
+; ================================
+; ================
+
+	; WHITNEY (1)
+	db "WHITNEY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 18, CLEFAIRY
+		db DOUBLESLAP
+		db MIMIC
+		db ENCORE
+		db METRONOME
+
+	db 20, MILTANK
+		db ROLLOUT
+		db ATTRACT
+		db STOMP
+		db MILK_DRINK
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+BugsyGroup:
+; ================================
+; ================
+
+	; BUGSY (1)
+	db "BUGSY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 14, METAPOD
+		db TACKLE
+		db STRING_SHOT
+		db HARDEN
+		db 0
+
+	db 14, KAKUNA
+		db POISON_STING
+		db STRING_SHOT
+		db HARDEN
+		db 0
+
+	db 16, SCYTHER
+		db QUICK_ATTACK
+		db LEER
+		db FURY_CUTTER
+		db 0
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+MortyGroup:
+; ================================
+; ================
+
+	; MORTY (1)
+	db "MORTY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 21, GASTLY
+		db LICK
+		db SPITE
+		db MEAN_LOOK
+		db CURSE
+
+	db 21, HAUNTER
+		db HYPNOSIS
+		db MIMIC
+		db CURSE
+		db NIGHT_SHADE
+
+	db 25, GENGAR
+		db HYPNOSIS
+		db SHADOW_BALL
+		db MEAN_LOOK
+		db DREAM_EATER
+
+	db 23, HAUNTER
+		db SPITE
+		db MEAN_LOOK
+		db MIMIC
+		db NIGHT_SHADE
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+PryceGroup:
+; ================================
+; ================
+
+	; PRYCE (1)
+	db "PRYCE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 27, SEEL
+		db HEADBUTT
+		db ICY_WIND
+		db AURORA_BEAM
+		db REST
+
+	db 29, DEWGONG
+		db HEADBUTT
+		db ICY_WIND
+		db AURORA_BEAM
+		db REST
+
+	db 31, PILOSWINE
+		db ICY_WIND
+		db FURY_ATTACK
+		db MIST
+		db BLIZZARD
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+JasmineGroup:
+; ================================
+; ================
+
+	; JASMINE (1)
+	db "JASMINE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 30, MAGNEMITE
+		db THUNDERBOLT
+		db SUPERSONIC
+		db SONICBOOM
+		db THUNDER_WAVE
+
+	db 30, MAGNEMITE
+		db THUNDERBOLT
+		db SUPERSONIC
+		db SONICBOOM
+		db THUNDER_WAVE
+
+	db 35, STEELIX
+		db SCREECH
+		db SUNNY_DAY
+		db ROCK_THROW
+		db IRON_TAIL
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+ChuckGroup:
+; ================================
+; ================
+
+	; CHUCK (1)
+	db "CHUCK@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 27, PRIMEAPE
+		db LEER
+		db RAGE
+		db KARATE_CHOP
+		db FURY_SWIPES
+
+	db 30, POLIWRATH
+		db HYPNOSIS
+		db MIND_READER
+		db SURF
+		db DYNAMICPUNCH
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+ClairGroup:
+; ================================
+; ================
+
+	; CLAIR (1)
+	db "CLAIR@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 37, DRAGONAIR
+		db THUNDER_WAVE
+		db SURF
+		db SLAM
+		db DRAGONBREATH
+
+	db 37, DRAGONAIR
+		db THUNDER_WAVE
+		db THUNDERBOLT
+		db SLAM
+		db DRAGONBREATH
+
+	db 37, DRAGONAIR
+		db THUNDER_WAVE
+		db ICE_BEAM
+		db SLAM
+		db DRAGONBREATH
+
+	db 40, KINGDRA
+		db SMOKESCREEN
+		db SURF
+		db HYPER_BEAM
+		db DRAGONBREATH
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+Rival1Group:
+; ================================
+; ================
+
+	; RIVAL1 (1)
+	db "?@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 5, CHIKORITA
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (2)
+	db "?@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 5, CYNDAQUIL
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (3)
+	db "?@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 5, TOTODILE
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (4)
+	db "?@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 12, GASTLY
+	db 14, ZUBAT
+	db 16, BAYLEEF
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (5)
+	db "?@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 12, GASTLY
+	db 14, ZUBAT
+	db 16, QUILAVA
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (6)
+	db "?@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 12, GASTLY
+	db 14, ZUBAT
+	db 16, CROCONAW
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (7)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 20, HAUNTER
+		db LICK
+		db SPITE
+		db MEAN_LOOK
+		db CURSE
+
+	db 18, MAGNEMITE
+		db TACKLE
+		db THUNDERSHOCK
+		db SUPERSONIC
+		db SONICBOOM
+
+	db 20, ZUBAT
+		db LEECH_LIFE
+		db SUPERSONIC
+		db BITE
+		db CONFUSE_RAY
+
+	db 22, BAYLEEF
+		db GROWL
+		db REFLECT
+		db RAZOR_LEAF
+		db POISONPOWDER
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (8)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 20, HAUNTER
+		db LICK
+		db SPITE
+		db MEAN_LOOK
+		db CURSE
+
+	db 18, MAGNEMITE
+		db TACKLE
+		db THUNDERSHOCK
+		db SUPERSONIC
+		db SONICBOOM
+
+	db 20, ZUBAT
+		db LEECH_LIFE
+		db SUPERSONIC
+		db BITE
+		db CONFUSE_RAY
+
+	db 22, QUILAVA
+		db LEER
+		db SMOKESCREEN
+		db EMBER
+		db QUICK_ATTACK
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (9)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 20, HAUNTER
+		db LICK
+		db SPITE
+		db MEAN_LOOK
+		db CURSE
+
+	db 18, MAGNEMITE
+		db TACKLE
+		db THUNDERSHOCK
+		db SUPERSONIC
+		db SONICBOOM
+
+	db 20, ZUBAT
+		db LEECH_LIFE
+		db SUPERSONIC
+		db BITE
+		db CONFUSE_RAY
+
+	db 22, CROCONAW
+		db LEER
+		db RAGE
+		db WATER_GUN
+		db BITE
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (10)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 30, GOLBAT
+		db LEECH_LIFE
+		db BITE
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db 28, MAGNEMITE
+		db TACKLE
+		db THUNDERSHOCK
+		db SONICBOOM
+		db THUNDER_WAVE
+
+	db 30, HAUNTER
+		db LICK
+		db MEAN_LOOK
+		db CURSE
+		db SHADOW_BALL
+
+	db 32, SNEASEL
+		db LEER
+		db QUICK_ATTACK
+		db SCREECH
+		db FAINT_ATTACK
+
+	db 32, MEGANIUM
+		db REFLECT
+		db RAZOR_LEAF
+		db POISONPOWDER
+		db BODY_SLAM
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (11)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 30, GOLBAT
+		db LEECH_LIFE
+		db BITE
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db 28, MAGNEMITE
+		db TACKLE
+		db THUNDERSHOCK
+		db SONICBOOM
+		db THUNDER_WAVE
+
+	db 30, HAUNTER
+		db LICK
+		db MEAN_LOOK
+		db CURSE
+		db SHADOW_BALL
+
+	db 32, SNEASEL
+		db LEER
+		db QUICK_ATTACK
+		db SCREECH
+		db FAINT_ATTACK
+
+	db 32, QUILAVA
+		db SMOKESCREEN
+		db EMBER
+		db QUICK_ATTACK
+		db FLAME_WHEEL
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (12)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 30, GOLBAT
+		db LEECH_LIFE
+		db BITE
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db 28, MAGNEMITE
+		db TACKLE
+		db THUNDERSHOCK
+		db SONICBOOM
+		db THUNDER_WAVE
+
+	db 30, HAUNTER
+		db LICK
+		db MEAN_LOOK
+		db CURSE
+		db SHADOW_BALL
+
+	db 32, SNEASEL
+		db LEER
+		db QUICK_ATTACK
+		db SCREECH
+		db FAINT_ATTACK
+
+	db 32, FERALIGATR
+		db RAGE
+		db WATER_GUN
+		db BITE
+		db SCARY_FACE
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (13)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 34, SNEASEL
+		db QUICK_ATTACK
+		db SCREECH
+		db FAINT_ATTACK
+		db FURY_CUTTER
+
+	db 36, GOLBAT
+		db LEECH_LIFE
+		db BITE
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db 35, MAGNETON
+		db THUNDERSHOCK
+		db SONICBOOM
+		db THUNDER_WAVE
+		db SWIFT
+
+	db 35, HAUNTER
+		db MEAN_LOOK
+		db CURSE
+		db SHADOW_BALL
+		db CONFUSE_RAY
+
+	db 35, KADABRA
+		db DISABLE
+		db PSYBEAM
+		db RECOVER
+		db FUTURE_SIGHT
+
+	db 38, MEGANIUM
+		db REFLECT
+		db RAZOR_LEAF
+		db POISONPOWDER
+		db BODY_SLAM
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (14)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 34, SNEASEL
+		db QUICK_ATTACK
+		db SCREECH
+		db FAINT_ATTACK
+		db FURY_CUTTER
+
+	db 36, GOLBAT
+		db LEECH_LIFE
+		db BITE
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db 35, MAGNETON
+		db THUNDERSHOCK
+		db SONICBOOM
+		db THUNDER_WAVE
+		db SWIFT
+
+	db 35, HAUNTER
+		db MEAN_LOOK
+		db CURSE
+		db SHADOW_BALL
+		db CONFUSE_RAY
+
+	db 35, KADABRA
+		db DISABLE
+		db PSYBEAM
+		db RECOVER
+		db FUTURE_SIGHT
+
+	db 38, TYPHLOSION
+		db SMOKESCREEN
+		db EMBER
+		db QUICK_ATTACK
+		db FLAME_WHEEL
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL1 (15)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 34, SNEASEL
+		db QUICK_ATTACK
+		db SCREECH
+		db FAINT_ATTACK
+		db FURY_CUTTER
+
+	db 36, GOLBAT
+		db LEECH_LIFE
+		db BITE
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db 34, MAGNETON
+		db THUNDERSHOCK
+		db SONICBOOM
+		db THUNDER_WAVE
+		db SWIFT
+
+	db 35, HAUNTER
+		db MEAN_LOOK
+		db CURSE
+		db SHADOW_BALL
+		db CONFUSE_RAY
+
+	db 35, KADABRA
+		db DISABLE
+		db PSYBEAM
+		db RECOVER
+		db FUTURE_SIGHT
+
+	db 38, FERALIGATR
+		db RAGE
+		db WATER_GUN
+		db SCARY_FACE
+		db SLASH
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+PokemonProfGroup:
+; ================================
+; ================
+; ================================
+
+
+WillGroup:
+; ================================
+; ================
+
+	; WILL (1)
+	db "WILL@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 40, XATU
+		db QUICK_ATTACK
+		db FUTURE_SIGHT
+		db CONFUSE_RAY
+		db PSYCHIC_M
+
+	db 41, JYNX
+		db DOUBLESLAP
+		db LOVELY_KISS
+		db ICE_PUNCH
+		db PSYCHIC_M
+
+	db 41, EXEGGUTOR
+		db REFLECT
+		db LEECH_SEED
+		db EGG_BOMB
+		db PSYCHIC_M
+
+	db 41, SLOWBRO
+		db CURSE
+		db AMNESIA
+		db BODY_SLAM
+		db PSYCHIC_M
+
+	db 42, XATU
+		db QUICK_ATTACK
+		db FUTURE_SIGHT
+		db CONFUSE_RAY
+		db PSYCHIC_M
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+PKMNTrainerGroup:
+; ================================
+; ================
+
+	; CAL (1)
+	db "CAL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 10, CHIKORITA
+	db 10, CYNDAQUIL
+	db 10, TOTODILE
+
+	db $ff ; end
+
+; ================
+
+	; CAL (2)
+	db "CAL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, BAYLEEF
+	db 30, QUILAVA
+	db 30, CROCONAW
+
+	db $ff ; end
+
+; ================
+
+	; CAL (3)
+	db "CAL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 50, MEGANIUM
+	db 50, TYPHLOSION
+	db 50, FERALIGATR
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+BrunoGroup:
+; ================================
+; ================
+
+	; BRUNO (1)
+	db "BRUNO@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 42, HITMONTOP
+		db PURSUIT
+		db QUICK_ATTACK
+		db DIG
+		db DETECT
+
+	db 42, HITMONLEE
+		db SWAGGER
+		db DOUBLE_KICK
+		db HI_JUMP_KICK
+		db FORESIGHT
+
+	db 42, HITMONCHAN
+		db THUNDERPUNCH
+		db ICE_PUNCH
+		db FIRE_PUNCH
+		db MACH_PUNCH
+
+	db 43, ONIX
+		db BIND
+		db EARTHQUAKE
+		db SANDSTORM
+		db ROCK_SLIDE
+
+	db 46, MACHAMP
+		db ROCK_SLIDE
+		db FORESIGHT
+		db VITAL_THROW
+		db CROSS_CHOP
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+KarenGroup:
+; ================================
+; ================
+
+	; KAREN (1)
+	db "KAREN@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 42, UMBREON
+		db SAND_ATTACK
+		db CONFUSE_RAY
+		db FAINT_ATTACK
+		db MEAN_LOOK
+
+	db 42, VILEPLUME
+		db STUN_SPORE
+		db ACID
+		db MOONLIGHT
+		db PETAL_DANCE
+
+	db 45, GENGAR
+		db LICK
+		db SPITE
+		db CURSE
+		db DESTINY_BOND
+
+	db 44, MURKROW
+		db QUICK_ATTACK
+		db WHIRLWIND
+		db PURSUIT
+		db FAINT_ATTACK
+
+	db 47, HOUNDOOM
+		db ROAR
+		db PURSUIT
+		db FLAMETHROWER
+		db CRUNCH
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+KogaGroup:
+; ================================
+; ================
+
+	; KOGA (1)
+	db "KOGA@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 40, ARIADOS
+		db DOUBLE_TEAM
+		db SPIDER_WEB
+		db BATON_PASS
+		db GIGA_DRAIN
+
+	db 41, VENOMOTH
+		db SUPERSONIC
+		db GUST
+		db PSYCHIC_M
+		db TOXIC
+
+	db 43, FORRETRESS
+		db PROTECT
+		db SWIFT
+		db EXPLOSION
+		db SPIKES
+
+	db 42, MUK
+		db MINIMIZE
+		db ACID_ARMOR
+		db SLUDGE_BOMB
+		db TOXIC
+
+	db 44, CROBAT
+		db DOUBLE_TEAM
+		db QUICK_ATTACK
+		db WING_ATTACK
+		db TOXIC
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+ChampionGroup:
+; ================================
+; ================
+
+	; CHAMPION (1)
+	db "LANCE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 44, GYARADOS
+		db FLAIL
+		db RAIN_DANCE
+		db SURF
+		db HYPER_BEAM
+
+	db 47, DRAGONITE
+		db THUNDER_WAVE
+		db TWISTER
+		db THUNDER
+		db HYPER_BEAM
+
+	db 47, DRAGONITE
+		db THUNDER_WAVE
+		db TWISTER
+		db BLIZZARD
+		db HYPER_BEAM
+
+	db 46, AERODACTYL
+		db WING_ATTACK
+		db ANCIENTPOWER
+		db ROCK_SLIDE
+		db HYPER_BEAM
+
+	db 46, CHARIZARD
+		db FLAMETHROWER
+		db WING_ATTACK
+		db SLASH
+		db HYPER_BEAM
+
+	db 50, DRAGONITE
+		db FIRE_BLAST
+		db SAFEGUARD
+		db OUTRAGE
+		db HYPER_BEAM
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+BrockGroup:
+; ================================
+; ================
+
+	; BROCK (1)
+	db "BROCK@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 41, GRAVELER
+		db DEFENSE_CURL
+		db ROCK_SLIDE
+		db ROLLOUT
+		db EARTHQUAKE
+
+	db 41, RHYHORN
+		db FURY_ATTACK
+		db SCARY_FACE
+		db EARTHQUAKE
+		db HORN_DRILL
+
+	db 42, OMASTAR
+		db BITE
+		db SURF
+		db PROTECT
+		db SPIKE_CANNON
+
+	db 44, ONIX
+		db BIND
+		db ROCK_SLIDE
+		db BIDE
+		db SANDSTORM
+
+	db 42, KABUTOPS
+		db SLASH
+		db SURF
+		db ENDURE
+		db GIGA_DRAIN
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+MistyGroup:
+; ================================
+; ================
+
+	; MISTY (1)
+	db "MISTY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 42, GOLDUCK
+		db SURF
+		db DISABLE
+		db PSYCH_UP
+		db PSYCHIC_M
+
+	db 42, QUAGSIRE
+		db SURF
+		db AMNESIA
+		db EARTHQUAKE
+		db RAIN_DANCE
+
+	db 44, LAPRAS
+		db SURF
+		db PERISH_SONG
+		db BLIZZARD
+		db RAIN_DANCE
+
+	db 47, STARMIE
+		db SURF
+		db CONFUSE_RAY
+		db RECOVER
+		db ICE_BEAM
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+LtSurgeGroup:
+; ================================
+; ================
+
+	; LT_SURGE (1)
+	db "LT.SURGE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 44, RAICHU
+		db THUNDER_WAVE
+		db QUICK_ATTACK
+		db THUNDERBOLT
+		db THUNDER
+
+	db 40, ELECTRODE
+		db SCREECH
+		db DOUBLE_TEAM
+		db SWIFT
+		db EXPLOSION
+
+	db 40, MAGNETON
+		db LOCK_ON
+		db DOUBLE_TEAM
+		db SWIFT
+		db ZAP_CANNON
+
+	db 40, ELECTRODE
+		db SCREECH
+		db DOUBLE_TEAM
+		db SWIFT
+		db EXPLOSION
+
+	db 46, ELECTABUZZ
+		db QUICK_ATTACK
+		db THUNDERPUNCH
+		db LIGHT_SCREEN
+		db THUNDER
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+ScientistGroup:
+; ================================
+; ================
+
+	; SCIENTIST (1)
+	db "ROSS@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 22, KOFFING
+	db 22, KOFFING
+
+	db $ff ; end
+
+; ================
+
+	; SCIENTIST (2)
+	db "MITCH@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, DITTO
+
+	db $ff ; end
+
+; ================
+
+	; SCIENTIST (3)
+	db "JED@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, MAGNEMITE
+	db 20, MAGNEMITE
+	db 20, MAGNEMITE
+
+	db $ff ; end
+
+; ================
+
+	; SCIENTIST (4)
+	db "MARC@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, MAGNEMITE
+	db 27, MAGNEMITE
+	db 27, MAGNEMITE
+
+	db $ff ; end
+
+; ================
+
+	; SCIENTIST (5)
+	db "RICH@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 30, PORYGON
+		db CONVERSION
+		db CONVERSION2
+		db RECOVER
+		db TRI_ATTACK
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+ErikaGroup:
+; ================================
+; ================
+
+	; ERIKA (1)
+	db "ERIKA@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 42, TANGELA
+		db VINE_WHIP
+		db BIND
+		db GIGA_DRAIN
+		db SLEEP_POWDER
+
+	db 41, JUMPLUFF
+		db MEGA_DRAIN
+		db LEECH_SEED
+		db COTTON_SPORE
+		db GIGA_DRAIN
+
+	db 46, VICTREEBEL
+		db SUNNY_DAY
+		db SYNTHESIS
+		db ACID
+		db RAZOR_LEAF
+
+	db 46, BELLOSSOM
+		db SUNNY_DAY
+		db SYNTHESIS
+		db PETAL_DANCE
+		db SOLARBEAM
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+YoungsterGroup:
+; ================================
+; ================
+
+	; YOUNGSTER (1)
+	db "JOEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 4, RATTATA
+
+	db $ff ; end
+
+; ================
+
+	; YOUNGSTER (2)
+	db "MIKEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 2, PIDGEY
+	db 4, RATTATA
+
+	db $ff ; end
+
+; ================
+
+	; YOUNGSTER (3)
+	db "ALBERT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 6, RATTATA
+	db 8, ZUBAT
+
+	db $ff ; end
+
+; ================
+
+	; YOUNGSTER (4)
+	db "GORDON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 10, WOOPER
+
+	db $ff ; end
+
+; ================
+
+	; YOUNGSTER (5)
+	db "SAMUEL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 7, RATTATA
+	db 10, SANDSHREW
+	db 8, SPEAROW
+	db 8, SPEAROW
+
+	db $ff ; end
+
+; ================
+
+	; YOUNGSTER (6)
+	db "IAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 10, MANKEY
+	db 12, DIGLETT
+
+	db $ff ; end
+
+; ================
+
+	; YOUNGSTER (7)
+	db "JOEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, RATTATA
+
+	db $ff ; end
+
+; ================
+
+	; YOUNGSTER (8)
+	db "JOEY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 21, RATICATE
+		db TAIL_WHIP
+		db QUICK_ATTACK
+		db HYPER_FANG
+		db SCARY_FACE
+
+	db $ff ; end
+
+; ================
+
+	; YOUNGSTER (9)
+	db "WARREN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 35, FEAROW
+
+	db $ff ; end
+
+; ================
+
+	; YOUNGSTER (10)
+	db "JIMMY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 33, RATICATE
+	db 33, ARBOK
+
+	db $ff ; end
+
+; ================
+
+	; YOUNGSTER (11)
+	db "OWEN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 35, GROWLITHE
+
+	db $ff ; end
+
+; ================
+
+	; YOUNGSTER (12)
+	db "JASON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 33, SANDSLASH
+	db 33, CROBAT
+
+	db $ff ; end
+
+; ================
+
+	; YOUNGSTER (13)
+	db "JOEY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 30, RATICATE
+		db TAIL_WHIP
+		db QUICK_ATTACK
+		db HYPER_FANG
+		db PURSUIT
+
+	db $ff ; end
+
+; ================
+
+	; YOUNGSTER (14)
+	db "JOEY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 37, RATICATE
+		db HYPER_BEAM
+		db QUICK_ATTACK
+		db HYPER_FANG
+		db PURSUIT
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+SchoolboyGroup:
+; ================================
+; ================
+
+	; SCHOOLBOY (1)
+	db "JACK@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 12, ODDISH
+	db 15, VOLTORB
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (2)
+	db "KIPP@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, VOLTORB
+	db 27, MAGNEMITE
+	db 31, VOLTORB
+	db 31, MAGNETON
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (3)
+	db "ALAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 16, TANGELA
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (4)
+	db "JOHNNY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 29, BELLSPROUT
+	db 31, WEEPINBELL
+	db 33, VICTREEBEL
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (5)
+	db "DANNY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 31, JYNX
+	db 31, ELECTABUZZ
+	db 31, MAGMAR
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (6)
+	db "TOMMY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, XATU
+	db 34, ALAKAZAM
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (7)
+	db "DUDLEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 35, ODDISH
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (8)
+	db "JOE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 33, TANGELA
+	db 33, VAPOREON
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (9)
+	db "BILLY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, PARAS
+	db 27, PARAS
+	db 27, POLIWHIRL
+	db 35, DITTO
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (10)
+	db "CHAD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 19, MR__MIME
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (11)
+	db "NATE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, LEDIAN
+	db 32, EXEGGUTOR
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (12)
+	db "RICKY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, AIPOM
+	db 32, DITTO
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (13)
+	db "JACK@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 14, ODDISH
+	db 17, VOLTORB
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (14)
+	db "JACK@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, GLOOM
+	db 31, ELECTRODE
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (15)
+	db "ALAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, TANGELA
+	db 17, YANMA
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (16)
+	db "ALAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, NATU
+	db 22, TANGELA
+	db 20, QUAGSIRE
+	db 25, YANMA
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (17)
+	db "CHAD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 19, MR__MIME
+	db 19, MAGNEMITE
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (18)
+	db "CHAD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, MR__MIME
+	db 31, MAGNETON
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (19)
+	db "JACK@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, GLOOM
+	db 33, GROWLITHE
+	db 33, ELECTRODE
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (20)
+	db "JACK@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 35, ELECTRODE
+		db SCREECH
+		db SONICBOOM
+		db ROLLOUT
+		db LIGHT_SCREEN
+
+	db 35, GROWLITHE
+		db SUNNY_DAY
+		db LEER
+		db TAKE_DOWN
+		db FLAME_WHEEL
+
+	db 37, VILEPLUME
+		db SOLARBEAM
+		db SLEEP_POWDER
+		db ACID
+		db MOONLIGHT
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (21)
+	db "ALAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, NATU
+	db 27, TANGELA
+	db 30, QUAGSIRE
+	db 30, YANMA
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (22)
+	db "ALAN@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 35, XATU
+		db PECK
+		db NIGHT_SHADE
+		db SWIFT
+		db FUTURE_SIGHT
+
+	db 32, TANGELA
+		db POISONPOWDER
+		db VINE_WHIP
+		db BIND
+		db MEGA_DRAIN
+
+	db 32, YANMA
+		db QUICK_ATTACK
+		db DOUBLE_TEAM
+		db SONICBOOM
+		db SUPERSONIC
+
+	db 35, QUAGSIRE
+		db TAIL_WHIP
+		db SLAM
+		db AMNESIA
+		db EARTHQUAKE
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (23)
+	db "CHAD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, MR__MIME
+	db 34, MAGNETON
+
+	db $ff ; end
+
+; ================
+
+	; SCHOOLBOY (24)
+	db "CHAD@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 34, MR__MIME
+		db PSYCHIC_M
+		db LIGHT_SCREEN
+		db REFLECT
+		db ENCORE
+
+	db 38, MAGNETON
+		db ZAP_CANNON
+		db THUNDER_WAVE
+		db LOCK_ON
+		db SWIFT
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+BirdKeeperGroup:
+; ================================
+; ================
+
+	; BIRD_KEEPER (1)
+	db "ROD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 7, PIDGEY
+	db 7, PIDGEY
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (2)
+	db "ABE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 9, SPEAROW
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (3)
+	db "BRYAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 12, PIDGEY
+	db 14, PIDGEOTTO
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (4)
+	db "THEO@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, PIDGEY
+	db 15, PIDGEY
+	db 19, PIDGEY
+	db 15, PIDGEY
+	db 15, PIDGEY
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (5)
+	db "TOBY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, DODUO
+	db 16, DODUO
+	db 17, DODUO
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (6)
+	db "DENIS@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 18, SPEAROW
+	db 20, FEAROW
+	db 18, SPEAROW
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (7)
+	db "VANCE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 25, PIDGEOTTO
+	db 25, PIDGEOTTO
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (8)
+	db "HANK@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 12, PIDGEY
+	db 34, PIDGEOT
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (9)
+	db "ROY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 29, FEAROW
+	db 35, FEAROW
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (10)
+	db "BORIS@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, DODUO
+	db 28, DODUO
+	db 32, DODRIO
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (11)
+	db "BOB@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, NOCTOWL
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (12)
+	db "JOSE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 36, FARFETCH_D
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (13)
+	db "PETER@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 6, PIDGEY
+	db 6, PIDGEY
+	db 8, SPEAROW
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (14)
+	db "JOSE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, FARFETCH_D
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (15)
+	db "PERRY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, FARFETCH_D
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (16)
+	db "BRET@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, PIDGEOTTO
+	db 32, FEAROW
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (17)
+	db "JOSE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 40, FARFETCH_D
+		db FURY_ATTACK
+		db DETECT
+		db FLY
+		db SLASH
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (18)
+	db "VANCE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, PIDGEOTTO
+	db 32, PIDGEOTTO
+
+	db $ff ; end
+
+; ================
+
+	; BIRD_KEEPER (19)
+	db "VANCE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 38, PIDGEOT
+		db TOXIC
+		db QUICK_ATTACK
+		db WHIRLWIND
+		db FLY
+
+	db 38, PIDGEOT
+		db SWIFT
+		db DETECT
+		db STEEL_WING
+		db FLY
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+LassGroup:
+; ================================
+; ================
+
+	; LASS (1)
+	db "CARRIE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 18, SNUBBULL
+		db SCARY_FACE
+		db CHARM
+		db BITE
+		db LICK
+
+	db $ff ; end
+
+; ================
+
+	; LASS (2)
+	db "BRIDGET@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, JIGGLYPUFF
+	db 15, JIGGLYPUFF
+	db 15, JIGGLYPUFF
+
+	db $ff ; end
+
+; ================
+
+	; LASS (3)
+	db "ALICE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, GLOOM
+	db 34, ARBOK
+	db 30, GLOOM
+
+	db $ff ; end
+
+; ================
+
+	; LASS (4)
+	db "KRISE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 12, ODDISH
+	db 15, CUBONE
+
+	db $ff ; end
+
+; ================
+
+	; LASS (5)
+	db "CONNIE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 21, MARILL
+
+	db $ff ; end
+
+; ================
+
+	; LASS (6)
+	db "LINDA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, BULBASAUR
+	db 32, IVYSAUR
+	db 34, VENUSAUR
+
+	db $ff ; end
+
+; ================
+
+	; LASS (7)
+	db "LAURA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, GLOOM
+	db 31, PIDGEOTTO
+	db 31, BELLOSSOM
+
+	db $ff ; end
+
+; ================
+
+	; LASS (8)
+	db "SHANNON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 29, PARAS
+	db 29, PARAS
+	db 32, PARASECT
+
+	db $ff ; end
+
+; ================
+
+	; LASS (9)
+	db "MICHELLE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, SKIPLOOM
+	db 33, HOPPIP
+	db 34, JUMPLUFF
+
+	db $ff ; end
+
+; ================
+
+	; LASS (10)
+	db "DANA@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 18, FLAAFFY
+		db TACKLE
+		db GROWL
+		db THUNDERSHOCK
+		db THUNDER_WAVE
+
+	db 18, PSYDUCK
+		db SCRATCH
+		db TAIL_WHIP
+		db DISABLE
+		db CONFUSION
+
+	db $ff ; end
+
+; ================
+
+	; LASS (11)
+	db "ELLEN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, WIGGLYTUFF
+	db 34, GRANBULL
+
+	db $ff ; end
+
+; ================
+
+	; LASS (12)
+	db "CONNIE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 21, MARILL
+
+	db $ff ; end
+
+; ================
+
+	; LASS (13)
+	db "CONNIE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 21, MARILL
+
+	db $ff ; end
+
+; ================
+
+	; LASS (14)
+	db "DANA@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 21, FLAAFFY
+		db TACKLE
+		db GROWL
+		db THUNDERSHOCK
+		db THUNDER_WAVE
+
+	db 21, PSYDUCK
+		db SCRATCH
+		db TAIL_WHIP
+		db DISABLE
+		db CONFUSION
+
+	db $ff ; end
+
+; ================
+
+	; LASS (15)
+	db "DANA@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 29, PSYDUCK
+		db SCRATCH
+		db DISABLE
+		db CONFUSION
+		db SCREECH
+
+	db 29, AMPHAROS
+		db TACKLE
+		db THUNDERSHOCK
+		db THUNDER_WAVE
+		db COTTON_SPORE
+
+	db $ff ; end
+
+; ================
+
+	; LASS (16)
+	db "DANA@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 32, PSYDUCK
+		db SCRATCH
+		db DISABLE
+		db CONFUSION
+		db SCREECH
+
+	db 32, AMPHAROS
+		db TACKLE
+		db THUNDERPUNCH
+		db THUNDER_WAVE
+		db COTTON_SPORE
+
+	db $ff ; end
+
+; ================
+
+	; LASS (17)
+	db "DANA@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 36, AMPHAROS
+		db SWIFT
+		db THUNDERPUNCH
+		db THUNDER_WAVE
+		db COTTON_SPORE
+
+	db 36, GOLDUCK
+		db DISABLE
+		db SURF
+		db PSYCHIC_M
+		db SCREECH
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+JanineGroup:
+; ================================
+; ================
+
+	; JANINE (1)
+	db "JANINE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 36, CROBAT
+		db SCREECH
+		db SUPERSONIC
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db 36, WEEZING
+		db SMOG
+		db SLUDGE_BOMB
+		db TOXIC
+		db EXPLOSION
+
+	db 36, WEEZING
+		db SMOG
+		db SLUDGE_BOMB
+		db TOXIC
+		db EXPLOSION
+
+	db 33, ARIADOS
+		db SCARY_FACE
+		db GIGA_DRAIN
+		db STRING_SHOT
+		db NIGHT_SHADE
+
+	db 39, VENOMOTH
+		db FORESIGHT
+		db DOUBLE_TEAM
+		db GUST
+		db PSYCHIC_M
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+CooltrainerMGroup:
+; ================================
+; ================
+
+	; COOLTRAINERM (1)
+	db "NICK@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 26, CHARMANDER
+		db EMBER
+		db SMOKESCREEN
+		db RAGE
+		db SCARY_FACE
+
+	db 26, SQUIRTLE
+		db WITHDRAW
+		db WATER_GUN
+		db BITE
+		db CURSE
+
+	db 26, BULBASAUR
+		db LEECH_SEED
+		db POISONPOWDER
+		db SLEEP_POWDER
+		db RAZOR_LEAF
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (2)
+	db "AARON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, IVYSAUR
+	db 24, CHARMELEON
+	db 24, WARTORTLE
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (3)
+	db "PAUL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, DRATINI
+	db 34, DRATINI
+	db 34, DRATINI
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (4)
+	db "CODY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, HORSEA
+	db 36, SEADRA
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (5)
+	db "MIKE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 37, DRAGONAIR
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (6)
+	db "GAVEN@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 35, VICTREEBEL
+		db WRAP
+		db TOXIC
+		db ACID
+		db RAZOR_LEAF
+
+	db 35, KINGLER
+		db BUBBLEBEAM
+		db STOMP
+		db GUILLOTINE
+		db PROTECT
+
+	db 35, FLAREON
+		db SAND_ATTACK
+		db QUICK_ATTACK
+		db BITE
+		db FIRE_SPIN
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (7)
+	db "GAVEN@"
+	db TRAINERTYPE_ITEM_MOVES
+
+	; party
+
+	db 39, VICTREEBEL, NO_ITEM
+		db GIGA_DRAIN
+		db TOXIC
+		db SLUDGE_BOMB
+		db RAZOR_LEAF
+
+	db 39, KINGLER, KINGS_ROCK
+		db SURF
+		db STOMP
+		db GUILLOTINE
+		db BLIZZARD
+
+	db 39, FLAREON, NO_ITEM
+		db FLAMETHROWER
+		db QUICK_ATTACK
+		db BITE
+		db FIRE_SPIN
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (8)
+	db "RYAN@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 25, PIDGEOT
+		db SAND_ATTACK
+		db QUICK_ATTACK
+		db WHIRLWIND
+		db WING_ATTACK
+
+	db 27, ELECTABUZZ
+		db THUNDERPUNCH
+		db LIGHT_SCREEN
+		db SWIFT
+		db SCREECH
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (9)
+	db "JAKE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 33, PARASECT
+		db LEECH_LIFE
+		db SPORE
+		db SLASH
+		db SWORDS_DANCE
+
+	db 35, GOLDUCK
+		db CONFUSION
+		db SCREECH
+		db PSYCH_UP
+		db FURY_SWIPES
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (10)
+	db "GAVEN@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 32, VICTREEBEL
+		db WRAP
+		db TOXIC
+		db ACID
+		db RAZOR_LEAF
+
+	db 32, KINGLER
+		db BUBBLEBEAM
+		db STOMP
+		db GUILLOTINE
+		db PROTECT
+
+	db 32, FLAREON
+		db SAND_ATTACK
+		db QUICK_ATTACK
+		db BITE
+		db FIRE_SPIN
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (11)
+	db "BLAKE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 33, MAGNETON
+		db THUNDERBOLT
+		db SUPERSONIC
+		db SWIFT
+		db SCREECH
+
+	db 31, QUAGSIRE
+		db WATER_GUN
+		db SLAM
+		db AMNESIA
+		db EARTHQUAKE
+
+	db 31, EXEGGCUTE
+		db LEECH_SEED
+		db CONFUSION
+		db SLEEP_POWDER
+		db SOLARBEAM
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (12)
+	db "BRIAN@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 35, SANDSLASH
+		db SAND_ATTACK
+		db POISON_STING
+		db SLASH
+		db SWIFT
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (13)
+	db "ERICK@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 10, BULBASAUR
+	db 10, CHARMANDER
+	db 10, SQUIRTLE
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (14)
+	db "ANDY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 10, BULBASAUR
+	db 10, CHARMANDER
+	db 10, SQUIRTLE
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (15)
+	db "TYLER@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 10, BULBASAUR
+	db 10, CHARMANDER
+	db 10, SQUIRTLE
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (16)
+	db "SEAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 35, FLAREON
+	db 35, TANGELA
+	db 35, TAUROS
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (17)
+	db "KEVIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 38, RHYHORN
+	db 35, CHARMELEON
+	db 35, WARTORTLE
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (18)
+	db "STEVE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 14, BULBASAUR
+	db 14, CHARMANDER
+	db 14, SQUIRTLE
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (19)
+	db "ALLEN@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 27, CHARMELEON
+		db EMBER
+		db SMOKESCREEN
+		db RAGE
+		db SCARY_FACE
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERM (20)
+	db "DARIN@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 37, DRAGONAIR
+		db WRAP
+		db SURF
+		db DRAGON_RAGE
+		db SLAM
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+CooltrainerFGroup:
+; ================================
+; ================
+
+	; COOLTRAINERF (1)
+	db "GWEN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 26, EEVEE
+	db 22, FLAREON
+	db 22, VAPOREON
+	db 22, JOLTEON
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (2)
+	db "LOIS@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 25, SKIPLOOM
+		db SYNTHESIS
+		db POISONPOWDER
+		db MEGA_DRAIN
+		db LEECH_SEED
+
+	db 25, NINETALES
+		db EMBER
+		db QUICK_ATTACK
+		db CONFUSE_RAY
+		db SAFEGUARD
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (3)
+	db "FRAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 37, SEADRA
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (4)
+	db "LOLA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, DRATINI
+	db 36, DRAGONAIR
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (5)
+	db "KATE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 26, SHELLDER
+	db 28, CLOYSTER
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (6)
+	db "IRENE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 22, GOLDEEN
+	db 24, SEAKING
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (7)
+	db "KELLY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, MARILL
+	db 24, WARTORTLE
+	db 24, WARTORTLE
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (8)
+	db "JOYCE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 36, PIKACHU
+		db QUICK_ATTACK
+		db DOUBLE_TEAM
+		db THUNDERBOLT
+		db THUNDER
+
+	db 32, BLASTOISE
+		db BITE
+		db CURSE
+		db SURF
+		db RAIN_DANCE
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (9)
+	db "BETH@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 36, RAPIDASH
+		db STOMP
+		db FIRE_SPIN
+		db FURY_ATTACK
+		db AGILITY
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (10)
+	db "REENA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 31, STARMIE
+	db 33, NIDOQUEEN
+	db 31, STARMIE
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (11)
+	db "MEGAN@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 32, BULBASAUR
+		db GROWL
+		db LEECH_SEED
+		db POISONPOWDER
+		db RAZOR_LEAF
+
+	db 32, IVYSAUR
+		db GROWL
+		db LEECH_SEED
+		db POISONPOWDER
+		db RAZOR_LEAF
+
+	db 32, VENUSAUR
+		db BODY_SLAM
+		db SLEEP_POWDER
+		db RAZOR_LEAF
+		db SWEET_SCENT
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (12)
+	db "BETH@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 39, RAPIDASH
+		db STOMP
+		db FIRE_SPIN
+		db FURY_ATTACK
+		db AGILITY
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (13)
+	db "CAROL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 35, ELECTRODE
+	db 35, STARMIE
+	db 35, NINETALES
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (14)
+	db "QUINN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 38, IVYSAUR
+	db 38, STARMIE
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (15)
+	db "EMMA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, POLIWHIRL
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (16)
+	db "CYBIL@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 25, BUTTERFREE
+		db CONFUSION
+		db SLEEP_POWDER
+		db WHIRLWIND
+		db GUST
+
+	db 25, BELLOSSOM
+		db ABSORB
+		db STUN_SPORE
+		db ACID
+		db SOLARBEAM
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (17)
+	db "JENN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, STARYU
+	db 26, STARMIE
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (18)
+	db "BETH@"
+	db TRAINERTYPE_ITEM_MOVES
+
+	; party
+
+	db 43, RAPIDASH, FOCUS_BAND
+		db STOMP
+		db FIRE_SPIN
+		db FURY_ATTACK
+		db FIRE_BLAST
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (19)
+	db "REENA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, STARMIE
+	db 36, NIDOQUEEN
+	db 34, STARMIE
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (20)
+	db "REENA@"
+	db TRAINERTYPE_ITEM_MOVES
+
+	; party
+
+	db 38, STARMIE, NO_ITEM
+		db DOUBLE_TEAM
+		db PSYCHIC_M
+		db WATERFALL
+		db CONFUSE_RAY
+
+	db 40, NIDOQUEEN, PINK_BOW
+		db EARTHQUAKE
+		db DOUBLE_KICK
+		db TOXIC
+		db BODY_SLAM
+
+	db 38, STARMIE, NO_ITEM
+		db BLIZZARD
+		db PSYCHIC_M
+		db WATERFALL
+		db RECOVER
+
+	db $ff ; end
+
+; ================
+
+	; COOLTRAINERF (21)
+	db "CARA@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 33, HORSEA
+		db SMOKESCREEN
+		db LEER
+		db WHIRLPOOL
+		db TWISTER
+
+	db 33, HORSEA
+		db SMOKESCREEN
+		db LEER
+		db WHIRLPOOL
+		db TWISTER
+
+	db 35, SEADRA
+		db SWIFT
+		db LEER
+		db WATERFALL
+		db TWISTER
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+BeautyGroup:
+; ================================
+; ================
+
+	; BEAUTY (1)
+	db "VICTORIA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 9, SENTRET
+	db 13, SENTRET
+	db 17, SENTRET
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (2)
+	db "SAMANTHA@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 16, MEOWTH
+		db SCRATCH
+		db GROWL
+		db BITE
+		db PAY_DAY
+
+	db 16, MEOWTH
+		db SCRATCH
+		db GROWL
+		db BITE
+		db SLASH
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (3)
+	db "JULIE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, SENTRET
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (4)
+	db "JACLYN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, SENTRET
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (5)
+	db "BRENDA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 16, FURRET
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (6)
+	db "CASSIE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, VILEPLUME
+	db 34, BUTTERFREE
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (7)
+	db "CAROLINE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, MARILL
+	db 32, SEEL
+	db 30, MARILL
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (8)
+	db "CARLENE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, SENTRET
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (9)
+	db "JESSICA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, SENTRET
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (10)
+	db "RACHAEL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, SENTRET
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (11)
+	db "ANGELICA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, SENTRET
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (12)
+	db "KENDRA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, SENTRET
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (13)
+	db "VERONICA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, SENTRET
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (14)
+	db "JULIA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, PARAS
+	db 32, EXEGGCUTE
+	db 35, PARASECT
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (15)
+	db "THERESA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, SENTRET
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (16)
+	db "VALERIE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 17, HOPPIP
+		db SYNTHESIS
+		db TAIL_WHIP
+		db TACKLE
+		db POISONPOWDER
+
+	db 17, SKIPLOOM
+		db SYNTHESIS
+		db TAIL_WHIP
+		db TACKLE
+		db STUN_SPORE
+
+	db $ff ; end
+
+; ================
+
+	; BEAUTY (17)
+	db "OLIVIA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 19, CORSOLA
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+PokemaniacGroup:
+; ================================
+; ================
+
+	; POKEMANIAC (1)
+	db "LARRY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 10, SLOWPOKE
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (2)
+	db "ANDREW@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, MAROWAK
+	db 24, MAROWAK
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (3)
+	db "CALVIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 26, KANGASKHAN
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (4)
+	db "SHANE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 16, NIDORINA
+	db 16, NIDORINO
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (5)
+	db "BEN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 19, SLOWBRO
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (6)
+	db "BRENT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 19, LICKITUNG
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (7)
+	db "RON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 19, NIDOKING
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (8)
+	db "ETHAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 31, RHYHORN
+	db 31, RHYDON
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (9)
+	db "BRENT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 25, KANGASKHAN
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (10)
+	db "BRENT@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 36, PORYGON
+		db RECOVER
+		db PSYCHIC_M
+		db CONVERSION2
+		db TRI_ATTACK
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (11)
+	db "ISSAC@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 12, LICKITUNG
+		db LICK
+		db SUPERSONIC
+		db CUT
+		db 0
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (12)
+	db "DONALD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 10, SLOWPOKE
+	db 10, SLOWPOKE
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (13)
+	db "ZACH@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, RHYHORN
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (14)
+	db "BRENT@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 41, CHANSEY
+		db ROLLOUT
+		db ATTRACT
+		db EGG_BOMB
+		db SOFTBOILED
+
+	db $ff ; end
+
+; ================
+
+	; POKEMANIAC (15)
+	db "MILLER@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, NIDOKING
+	db 17, NIDOQUEEN
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+GruntMGroup:
+; ================================
+; ================
+
+	; GRUNTM (1)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 14, KOFFING
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (2)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 7, RATTATA
+	db 9, ZUBAT
+	db 9, ZUBAT
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (3)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, RATICATE
+	db 24, RATICATE
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (4)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 23, GRIMER
+	db 23, GRIMER
+	db 25, MUK
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (5)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 21, RATTATA
+	db 21, RATTATA
+	db 23, RATTATA
+	db 23, RATTATA
+	db 23, RATTATA
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (6)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 26, ZUBAT
+	db 26, ZUBAT
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (7)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 23, KOFFING
+	db 23, GRIMER
+	db 23, ZUBAT
+	db 23, RATTATA
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (8)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 26, WEEZING
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (9)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, RATICATE
+	db 26, KOFFING
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (10)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 22, ZUBAT
+	db 24, GOLBAT
+	db 22, GRIMER
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (11)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 23, MUK
+	db 23, KOFFING
+	db 25, RATTATA
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (12)
+	db "EXECUTIVE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 33, HOUNDOUR
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (13)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, RATTATA
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (14)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, RATICATE
+	db 24, GOLBAT
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (15)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 26, GRIMER
+	db 23, WEEZING
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (16)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 16, RATTATA
+	db 16, RATTATA
+	db 16, RATTATA
+	db 16, RATTATA
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (17)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 18, GOLBAT
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (18)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, RATTATA
+	db 17, ZUBAT
+	db 17, RATTATA
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (19)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 18, VENONAT
+	db 18, VENONAT
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (20)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, DROWZEE
+	db 19, ZUBAT
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (21)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 16, ZUBAT
+	db 17, GRIMER
+	db 18, RATTATA
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (22)
+	db "EXECUTIVE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 36, GOLBAT
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (23)
+	db "EXECUTIVE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, KOFFING
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (24)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 25, KOFFING
+	db 25, KOFFING
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (25)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, KOFFING
+	db 24, MUK
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (26)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, RATTATA
+	db 15, RATTATA
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (27)
+	db "EXECUTIVE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 22, ZUBAT
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (28)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 19, RATICATE
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (29)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 9, RATTATA
+	db 9, RATTATA
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (30)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 25, GOLBAT
+	db 25, GOLBAT
+	db 30, ARBOK
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTM (31)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, GOLBAT
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+GentlemanGroup:
+; ================================
+; ================
+
+	; GENTLEMAN (1)
+	db "PRESTON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 18, GROWLITHE
+	db 18, GROWLITHE
+
+	db $ff ; end
+
+; ================
+
+	; GENTLEMAN (2)
+	db "EDWARD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 33, PERSIAN
+
+	db $ff ; end
+
+; ================
+
+	; GENTLEMAN (3)
+	db "GREGORY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 37, PIKACHU
+	db 33, FLAAFFY
+
+	db $ff ; end
+
+; ================
+
+	; GENTLEMAN (4)
+	db "VIRGIL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, PONYTA
+
+	db $ff ; end
+
+; ================
+
+	; GENTLEMAN (5)
+	db "ALFRED@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, NOCTOWL
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+SkierGroup:
+; ================================
+; ================
+
+	; SKIER (1)
+	db "ROXANNE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, JYNX
+
+	db $ff ; end
+
+; ================
+
+	; SKIER (2)
+	db "CLARISSA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, DEWGONG
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+TeacherGroup:
+; ================================
+; ================
+
+	; TEACHER (1)
+	db "COLETTE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 36, CLEFAIRY
+
+	db $ff ; end
+
+; ================
+
+	; TEACHER (2)
+	db "HILLARY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, AIPOM
+	db 36, CUBONE
+
+	db $ff ; end
+
+; ================
+
+	; TEACHER (3)
+	db "SHIRLEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 35, JIGGLYPUFF
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+SabrinaGroup:
+; ================================
+; ================
+
+	; SABRINA (1)
+	db "SABRINA@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 46, ESPEON
+		db SAND_ATTACK
+		db QUICK_ATTACK
+		db SWIFT
+		db PSYCHIC_M
+
+	db 46, MR__MIME
+		db BARRIER
+		db REFLECT
+		db BATON_PASS
+		db PSYCHIC_M
+
+	db 48, ALAKAZAM
+		db RECOVER
+		db FUTURE_SIGHT
+		db PSYCHIC_M
+		db REFLECT
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+BugCatcherGroup:
+; ================================
+; ================
+
+	; BUG_CATCHER (1)
+	db "DON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 3, CATERPIE
+	db 3, CATERPIE
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (2)
+	db "ROB@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, BEEDRILL
+	db 32, BUTTERFREE
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (3)
+	db "ED@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, BEEDRILL
+	db 30, BEEDRILL
+	db 30, BEEDRILL
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (4)
+	db "WADE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 2, CATERPIE
+	db 2, CATERPIE
+	db 3, WEEDLE
+	db 2, CATERPIE
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (5)
+	db "BENNY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 7, WEEDLE
+	db 9, KAKUNA
+	db 12, BEEDRILL
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (6)
+	db "AL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 12, CATERPIE
+	db 12, WEEDLE
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (7)
+	db "JOSH@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 13, PARAS
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (8)
+	db "ARNIE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, VENONAT
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (9)
+	db "KEN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, ARIADOS
+	db 32, PINSIR
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (10)
+	db "WADE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 9, METAPOD
+	db 9, METAPOD
+	db 10, KAKUNA
+	db 9, METAPOD
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (11)
+	db "WADE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 14, BUTTERFREE
+	db 14, BUTTERFREE
+	db 15, BEEDRILL
+	db 14, BUTTERFREE
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (12)
+	db "DOUG@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, ARIADOS
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (13)
+	db "ARNIE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 19, VENONAT
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (14)
+	db "ARNIE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 28, VENOMOTH
+		db DISABLE
+		db SUPERSONIC
+		db CONFUSION
+		db LEECH_LIFE
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (15)
+	db "WADE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 24, BUTTERFREE
+		db CONFUSION
+		db POISONPOWDER
+		db SUPERSONIC
+		db WHIRLWIND
+
+	db 24, BUTTERFREE
+		db CONFUSION
+		db STUN_SPORE
+		db SUPERSONIC
+		db WHIRLWIND
+
+	db 25, BEEDRILL
+		db FURY_ATTACK
+		db FOCUS_ENERGY
+		db TWINEEDLE
+		db RAGE
+
+	db 24, BUTTERFREE
+		db CONFUSION
+		db SLEEP_POWDER
+		db SUPERSONIC
+		db WHIRLWIND
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (16)
+	db "WADE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 30, BUTTERFREE
+		db CONFUSION
+		db POISONPOWDER
+		db SUPERSONIC
+		db GUST
+
+	db 30, BUTTERFREE
+		db CONFUSION
+		db STUN_SPORE
+		db SUPERSONIC
+		db GUST
+
+	db 32, BEEDRILL
+		db FURY_ATTACK
+		db PURSUIT
+		db TWINEEDLE
+		db DOUBLE_TEAM
+
+	db 34, BUTTERFREE
+		db PSYBEAM
+		db SLEEP_POWDER
+		db GUST
+		db WHIRLWIND
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (17)
+	db "ARNIE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 36, VENOMOTH
+		db GUST
+		db SUPERSONIC
+		db PSYBEAM
+		db LEECH_LIFE
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (18)
+	db "ARNIE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 40, VENOMOTH
+		db GUST
+		db SUPERSONIC
+		db PSYCHIC_M
+		db TOXIC
+
+	db $ff ; end
+
+; ================
+
+	; BUG_CATCHER (19)
+	db "WAYNE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 8, LEDYBA
+	db 10, PARAS
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+FisherGroup:
+; ================================
+; ================
+
+	; FISHER (1)
+	db "JUSTIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 5, MAGIKARP
+	db 5, MAGIKARP
+	db 15, MAGIKARP
+	db 5, MAGIKARP
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (2)
+	db "RALPH@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 10, GOLDEEN
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (3)
+	db "ARNOLD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, TENTACRUEL
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (4)
+	db "KYLE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, SEAKING
+	db 31, POLIWHIRL
+	db 31, SEAKING
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (5)
+	db "HENRY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 8, POLIWAG
+	db 8, POLIWAG
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (6)
+	db "MARVIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 10, MAGIKARP
+	db 10, GYARADOS
+	db 15, MAGIKARP
+	db 15, GYARADOS
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (7)
+	db "TULLY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 18, QWILFISH
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (8)
+	db "ANDRE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, GYARADOS
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (9)
+	db "RAYMOND@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 22, MAGIKARP
+	db 22, MAGIKARP
+	db 22, MAGIKARP
+	db 22, MAGIKARP
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (10)
+	db "WILTON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 23, GOLDEEN
+	db 23, GOLDEEN
+	db 25, SEAKING
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (11)
+	db "EDGAR@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 25, REMORAID
+		db LOCK_ON
+		db PSYBEAM
+		db AURORA_BEAM
+		db BUBBLEBEAM
+
+	db 25, REMORAID
+		db LOCK_ON
+		db PSYBEAM
+		db AURORA_BEAM
+		db BUBBLEBEAM
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (12)
+	db "JONAH@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 25, SHELLDER
+	db 29, OCTILLERY
+	db 25, REMORAID
+	db 29, CLOYSTER
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (13)
+	db "MARTIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, REMORAID
+	db 32, REMORAID
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (14)
+	db "STEPHEN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 25, MAGIKARP
+	db 25, MAGIKARP
+	db 31, QWILFISH
+	db 31, TENTACRUEL
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (15)
+	db "BARNEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, GYARADOS
+	db 30, GYARADOS
+	db 30, GYARADOS
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (16)
+	db "RALPH@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, GOLDEEN
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (17)
+	db "RALPH@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, QWILFISH
+	db 19, GOLDEEN
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (18)
+	db "TULLY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 23, QWILFISH
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (19)
+	db "TULLY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, GOLDEEN
+	db 32, GOLDEEN
+	db 32, QWILFISH
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (20)
+	db "WILTON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 29, GOLDEEN
+	db 29, GOLDEEN
+	db 32, SEAKING
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (21)
+	db "SCOTT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, QWILFISH
+	db 30, QWILFISH
+	db 34, SEAKING
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (22)
+	db "WILTON@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 34, SEAKING
+		db SUPERSONIC
+		db WATERFALL
+		db FLAIL
+		db FURY_ATTACK
+
+	db 34, SEAKING
+		db SUPERSONIC
+		db WATERFALL
+		db FLAIL
+		db FURY_ATTACK
+
+	db 38, REMORAID
+		db PSYBEAM
+		db AURORA_BEAM
+		db BUBBLEBEAM
+		db HYPER_BEAM
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (23)
+	db "RALPH@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, QWILFISH
+	db 32, GOLDEEN
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (24)
+	db "RALPH@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 35, QWILFISH
+		db TOXIC
+		db MINIMIZE
+		db SURF
+		db PIN_MISSILE
+
+	db 39, SEAKING
+		db ENDURE
+		db FLAIL
+		db FURY_ATTACK
+		db WATERFALL
+
+	db $ff ; end
+
+; ================
+
+	; FISHER (25)
+	db "TULLY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 34, SEAKING
+		db SUPERSONIC
+		db RAIN_DANCE
+		db WATERFALL
+		db FURY_ATTACK
+
+	db 34, SEAKING
+		db SUPERSONIC
+		db RAIN_DANCE
+		db WATERFALL
+		db FURY_ATTACK
+
+	db 37, QWILFISH
+		db ROLLOUT
+		db SURF
+		db PIN_MISSILE
+		db TAKE_DOWN
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+SwimmerMGroup:
+; ================================
+; ================
+
+	; SWIMMERM (1)
+	db "HAROLD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, REMORAID
+	db 30, SEADRA
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (2)
+	db "SIMON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, TENTACOOL
+	db 20, TENTACOOL
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (3)
+	db "RANDALL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 18, SHELLDER
+	db 20, WARTORTLE
+	db 18, SHELLDER
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (4)
+	db "CHARLIE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 21, SHELLDER
+	db 19, TENTACOOL
+	db 19, TENTACRUEL
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (5)
+	db "GEORGE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 16, TENTACOOL
+	db 17, TENTACOOL
+	db 16, TENTACOOL
+	db 19, STARYU
+	db 17, TENTACOOL
+	db 19, REMORAID
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (6)
+	db "BERKE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 23, QWILFISH
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (7)
+	db "KIRK@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, GYARADOS
+	db 20, GYARADOS
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (8)
+	db "MATHEW@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 23, KRABBY
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (9)
+	db "HAL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, SEEL
+	db 25, DEWGONG
+	db 24, SEEL
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (10)
+	db "PATON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 26, PILOSWINE
+	db 26, PILOSWINE
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (11)
+	db "DARYL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, SHELLDER
+	db 25, CLOYSTER
+	db 24, SHELLDER
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (12)
+	db "WALTER@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, HORSEA
+	db 15, HORSEA
+	db 20, SEADRA
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (13)
+	db "TONY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 13, STARYU
+	db 18, STARMIE
+	db 16, HORSEA
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (14)
+	db "JEROME@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 26, SEADRA
+	db 28, TENTACOOL
+	db 30, TENTACRUEL
+	db 28, GOLDEEN
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (15)
+	db "TUCKER@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, SHELLDER
+	db 34, CLOYSTER
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (16)
+	db "RICK@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 13, STARYU
+	db 18, STARMIE
+	db 16, HORSEA
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (17)
+	db "CAMERON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, MARILL
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (18)
+	db "SETH@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 29, QUAGSIRE
+	db 29, OCTILLERY
+	db 32, QUAGSIRE
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (19)
+	db "JAMES@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 13, STARYU
+	db 18, STARMIE
+	db 16, HORSEA
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (20)
+	db "LEWIS@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 13, STARYU
+	db 18, STARMIE
+	db 16, HORSEA
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERM (21)
+	db "PARKER@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, HORSEA
+	db 32, HORSEA
+	db 35, SEADRA
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+SwimmerFGroup:
+; ================================
+; ================
+
+	; SWIMMERF (1)
+	db "ELAINE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 21, STARYU
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (2)
+	db "PAULA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 19, STARYU
+	db 19, SHELLDER
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (3)
+	db "KAYLEE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 18, GOLDEEN
+	db 20, GOLDEEN
+	db 20, SEAKING
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (4)
+	db "SUSIE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 20, PSYDUCK
+		db SCRATCH
+		db TAIL_WHIP
+		db DISABLE
+		db CONFUSION
+
+	db 22, GOLDEEN
+		db PECK
+		db TAIL_WHIP
+		db SUPERSONIC
+		db HORN_ATTACK
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (5)
+	db "DENISE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 22, SEEL
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (6)
+	db "KARA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, STARYU
+	db 20, STARMIE
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (7)
+	db "WENDY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 21, HORSEA
+		db BUBBLE
+		db SMOKESCREEN
+		db LEER
+		db WATER_GUN
+
+	db 21, HORSEA
+		db DRAGON_RAGE
+		db SMOKESCREEN
+		db LEER
+		db WATER_GUN
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (8)
+	db "LISA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, JYNX
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (9)
+	db "JILL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, DEWGONG
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (10)
+	db "MARY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, SEAKING
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (11)
+	db "KATIE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 33, DEWGONG
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (12)
+	db "DAWN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, SEAKING
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (13)
+	db "TARA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, SEAKING
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (14)
+	db "NICOLE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 29, MARILL
+	db 29, MARILL
+	db 32, LAPRAS
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (15)
+	db "LORI@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, STARMIE
+	db 32, STARMIE
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (16)
+	db "JODY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, SEAKING
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (17)
+	db "NIKKI@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, SEEL
+	db 28, SEEL
+	db 28, SEEL
+	db 28, DEWGONG
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (18)
+	db "DIANA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 37, GOLDUCK
+
+	db $ff ; end
+
+; ================
+
+	; SWIMMERF (19)
+	db "BRIANA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 35, SEAKING
+	db 35, SEAKING
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+SailorGroup:
+; ================================
+; ================
+
+	; SAILOR (1)
+	db "EUGENE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, POLIWHIRL
+	db 17, RATICATE
+	db 19, KRABBY
+
+	db $ff ; end
+
+; ================
+
+	; SAILOR (2)
+	db "HUEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 18, POLIWAG
+	db 18, POLIWHIRL
+
+	db $ff ; end
+
+; ================
+
+	; SAILOR (3)
+	db "TERRELL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, POLIWHIRL
+
+	db $ff ; end
+
+; ================
+
+	; SAILOR (4)
+	db "KENT@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 18, KRABBY
+		db BUBBLE
+		db LEER
+		db VICEGRIP
+		db HARDEN
+
+	db 20, KRABBY
+		db BUBBLEBEAM
+		db LEER
+		db VICEGRIP
+		db HARDEN
+
+	db $ff ; end
+
+; ================
+
+	; SAILOR (5)
+	db "ERNEST@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 18, MACHOP
+	db 18, MACHOP
+	db 18, POLIWHIRL
+
+	db $ff ; end
+
+; ================
+
+	; SAILOR (6)
+	db "JEFF@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, RATICATE
+	db 32, RATICATE
+
+	db $ff ; end
+
+; ================
+
+	; SAILOR (7)
+	db "GARRETT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, KINGLER
+
+	db $ff ; end
+
+; ================
+
+	; SAILOR (8)
+	db "KENNETH@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, MACHOP
+	db 28, MACHOP
+	db 28, POLIWRATH
+	db 28, MACHOP
+
+	db $ff ; end
+
+; ================
+
+	; SAILOR (9)
+	db "STANLY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 31, MACHOP
+	db 33, MACHOKE
+	db 26, PSYDUCK
+
+	db $ff ; end
+
+; ================
+
+	; SAILOR (10)
+	db "HARRY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 19, WOOPER
+
+	db $ff ; end
+
+; ================
+
+	; SAILOR (11)
+	db "HUEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, POLIWHIRL
+	db 28, POLIWHIRL
+
+	db $ff ; end
+
+; ================
+
+	; SAILOR (12)
+	db "HUEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, POLIWHIRL
+	db 34, POLIWRATH
+
+	db $ff ; end
+
+; ================
+
+	; SAILOR (13)
+	db "HUEY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 38, POLITOED
+		db WHIRLPOOL
+		db RAIN_DANCE
+		db BODY_SLAM
+		db PERISH_SONG
+
+	db 38, POLIWRATH
+		db SURF
+		db STRENGTH
+		db ICE_PUNCH
+		db SUBMISSION
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+SuperNerdGroup:
+; ================================
+; ================
+
+	; SUPER_NERD (1)
+	db "STAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, GRIMER
+
+	db $ff ; end
+
+; ================
+
+	; SUPER_NERD (2)
+	db "ERIC@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 11, GRIMER
+	db 11, GRIMER
+
+	db $ff ; end
+
+; ================
+
+	; SUPER_NERD (3)
+	db "GREGG@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, MAGNEMITE
+	db 20, MAGNEMITE
+	db 20, MAGNEMITE
+
+	db $ff ; end
+
+; ================
+
+	; SUPER_NERD (4)
+	db "JAY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 22, KOFFING
+	db 22, KOFFING
+
+	db $ff ; end
+
+; ================
+
+	; SUPER_NERD (5)
+	db "DAVE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, DITTO
+
+	db $ff ; end
+
+; ================
+
+	; SUPER_NERD (6)
+	db "SAM@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, GRIMER
+	db 34, MUK
+
+	db $ff ; end
+
+; ================
+
+	; SUPER_NERD (7)
+	db "TOM@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, MAGNEMITE
+	db 32, MAGNEMITE
+	db 32, MAGNEMITE
+
+	db $ff ; end
+
+; ================
+
+	; SUPER_NERD (8)
+	db "PAT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 36, PORYGON
+
+	db $ff ; end
+
+; ================
+
+	; SUPER_NERD (9)
+	db "SHAWN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 31, MAGNEMITE
+	db 33, MUK
+	db 31, MAGNEMITE
+
+	db $ff ; end
+
+; ================
+
+	; SUPER_NERD (10)
+	db "TERU@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 7, MAGNEMITE
+	db 11, VOLTORB
+	db 7, MAGNEMITE
+	db 9, MAGNEMITE
+
+	db $ff ; end
+
+; ================
+
+	; SUPER_NERD (11)
+	db "RUSS@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, MAGNEMITE
+	db 27, MAGNEMITE
+	db 27, MAGNEMITE
+
+	db $ff ; end
+
+; ================
+
+	; SUPER_NERD (12)
+	db "NORTON@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 30, PORYGON
+		db CONVERSION
+		db CONVERSION2
+		db RECOVER
+		db TRI_ATTACK
+
+	db $ff ; end
+
+; ================
+
+	; SUPER_NERD (13)
+	db "HUGH@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 39, SEADRA
+		db SMOKESCREEN
+		db TWISTER
+		db SURF
+		db WATERFALL
+
+	db $ff ; end
+
+; ================
+
+	; SUPER_NERD (14)
+	db "MARKUS@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 19, SLOWPOKE
+		db CURSE
+		db WATER_GUN
+		db GROWL
+		db STRENGTH
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+Rival2Group:
+; ================================
+; ================
+
+	; RIVAL2 (1)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 41, SNEASEL
+		db QUICK_ATTACK
+		db SCREECH
+		db FAINT_ATTACK
+		db FURY_CUTTER
+
+	db 42, GOLBAT
+		db LEECH_LIFE
+		db BITE
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db 41, MAGNETON
+		db THUNDERSHOCK
+		db SONICBOOM
+		db THUNDER_WAVE
+		db SWIFT
+
+	db 43, GENGAR
+		db MEAN_LOOK
+		db CURSE
+		db SHADOW_BALL
+		db CONFUSE_RAY
+
+	db 43, ALAKAZAM
+		db DISABLE
+		db RECOVER
+		db FUTURE_SIGHT
+		db PSYCHIC_M
+
+	db 45, MEGANIUM
+		db RAZOR_LEAF
+		db POISONPOWDER
+		db BODY_SLAM
+		db LIGHT_SCREEN
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL2 (2)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 41, SNEASEL
+		db QUICK_ATTACK
+		db SCREECH
+		db FAINT_ATTACK
+		db FURY_CUTTER
+
+	db 42, GOLBAT
+		db LEECH_LIFE
+		db BITE
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db 41, MAGNETON
+		db THUNDERSHOCK
+		db SONICBOOM
+		db THUNDER_WAVE
+		db SWIFT
+
+	db 43, GENGAR
+		db MEAN_LOOK
+		db CURSE
+		db SHADOW_BALL
+		db CONFUSE_RAY
+
+	db 43, ALAKAZAM
+		db DISABLE
+		db RECOVER
+		db FUTURE_SIGHT
+		db PSYCHIC_M
+
+	db 45, TYPHLOSION
+		db SMOKESCREEN
+		db QUICK_ATTACK
+		db FLAME_WHEEL
+		db SWIFT
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL2 (3)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 41, SNEASEL
+		db QUICK_ATTACK
+		db SCREECH
+		db FAINT_ATTACK
+		db FURY_CUTTER
+
+	db 42, GOLBAT
+		db LEECH_LIFE
+		db BITE
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db 41, MAGNETON
+		db THUNDERSHOCK
+		db SONICBOOM
+		db THUNDER_WAVE
+		db SWIFT
+
+	db 43, GENGAR
+		db MEAN_LOOK
+		db CURSE
+		db SHADOW_BALL
+		db CONFUSE_RAY
+
+	db 43, ALAKAZAM
+		db DISABLE
+		db RECOVER
+		db FUTURE_SIGHT
+		db PSYCHIC_M
+
+	db 45, FERALIGATR
+		db RAGE
+		db WATER_GUN
+		db SCARY_FACE
+		db SLASH
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL2 (4)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 45, SNEASEL
+		db QUICK_ATTACK
+		db SCREECH
+		db FAINT_ATTACK
+		db FURY_CUTTER
+
+	db 48, CROBAT
+		db TOXIC
+		db BITE
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db 45, MAGNETON
+		db THUNDER
+		db SONICBOOM
+		db THUNDER_WAVE
+		db SWIFT
+
+	db 46, GENGAR
+		db MEAN_LOOK
+		db CURSE
+		db SHADOW_BALL
+		db CONFUSE_RAY
+
+	db 46, ALAKAZAM
+		db RECOVER
+		db FUTURE_SIGHT
+		db PSYCHIC_M
+		db REFLECT
+
+	db 50, MEGANIUM
+		db GIGA_DRAIN
+		db BODY_SLAM
+		db LIGHT_SCREEN
+		db SAFEGUARD
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL2 (5)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 45, SNEASEL
+		db QUICK_ATTACK
+		db SCREECH
+		db FAINT_ATTACK
+		db FURY_CUTTER
+
+	db 48, CROBAT
+		db TOXIC
+		db BITE
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db 45, MAGNETON
+		db THUNDER
+		db SONICBOOM
+		db THUNDER_WAVE
+		db SWIFT
+
+	db 46, GENGAR
+		db MEAN_LOOK
+		db CURSE
+		db SHADOW_BALL
+		db CONFUSE_RAY
+
+	db 46, ALAKAZAM
+		db RECOVER
+		db FUTURE_SIGHT
+		db PSYCHIC_M
+		db REFLECT
+
+	db 50, TYPHLOSION
+		db SMOKESCREEN
+		db QUICK_ATTACK
+		db FIRE_BLAST
+		db SWIFT
+
+	db $ff ; end
+
+; ================
+
+	; RIVAL2 (6)
+	db "?@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 45, SNEASEL
+		db QUICK_ATTACK
+		db SCREECH
+		db FAINT_ATTACK
+		db FURY_CUTTER
+
+	db 48, CROBAT
+		db TOXIC
+		db BITE
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db 45, MAGNETON
+		db THUNDER
+		db SONICBOOM
+		db THUNDER_WAVE
+		db SWIFT
+
+	db 46, GENGAR
+		db MEAN_LOOK
+		db CURSE
+		db SHADOW_BALL
+		db CONFUSE_RAY
+
+	db 46, ALAKAZAM
+		db RECOVER
+		db FUTURE_SIGHT
+		db PSYCHIC_M
+		db REFLECT
+
+	db 50, FERALIGATR
+		db SURF
+		db RAIN_DANCE
+		db SLASH
+		db SCREECH
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+GuitaristGroup:
+; ================================
+; ================
+
+	; GUITARIST (1)
+	db "CLYDE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, ELECTABUZZ
+
+	db $ff ; end
+
+; ================
+
+	; GUITARIST (2)
+	db "VINCENT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, MAGNEMITE
+	db 33, VOLTORB
+	db 32, MAGNEMITE
+	db 32, MAGNEMITE
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+HikerGroup:
+; ================================
+; ================
+
+	; HIKER (1)
+	db "ANTHONY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 16, GEODUDE
+	db 18, MACHAMP
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (2)
+	db "RUSSELL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 4, GEODUDE
+	db 6, GEODUDE
+	db 8, GEODUDE
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (3)
+	db "PHILLIP@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 23, GEODUDE
+	db 23, GEODUDE
+	db 23, GRAVELER
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (4)
+	db "LEONARD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 23, GEODUDE
+	db 25, MACHOP
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (5)
+	db "ANTHONY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 11, GEODUDE
+	db 11, MACHOP
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (6)
+	db "BENJAMIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 14, DIGLETT
+	db 14, GEODUDE
+	db 16, DUGTRIO
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (7)
+	db "ERIK@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, MACHOP
+	db 27, GRAVELER
+	db 27, MACHOP
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (8)
+	db "MICHAEL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 25, GEODUDE
+	db 25, GRAVELER
+	db 25, GOLEM
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (9)
+	db "PARRY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 35, ONIX
+	db 33, SWINUB
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (10)
+	db "TIMOTHY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 27, DIGLETT
+		db MAGNITUDE
+		db DIG
+		db SAND_ATTACK
+		db SLASH
+
+	db 27, DUGTRIO
+		db MAGNITUDE
+		db DIG
+		db SAND_ATTACK
+		db SLASH
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (11)
+	db "BAILEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 13, GEODUDE
+	db 13, GEODUDE
+	db 13, GEODUDE
+	db 13, GEODUDE
+	db 13, GEODUDE
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (12)
+	db "ANTHONY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 25, GRAVELER
+	db 27, GRAVELER
+	db 29, MACHOKE
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (13)
+	db "TIM@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 31, GRAVELER
+	db 31, GRAVELER
+	db 31, GRAVELER
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (14)
+	db "NOLAND@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 31, SANDSLASH
+	db 33, GOLEM
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (15)
+	db "SIDNEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, DUGTRIO
+	db 32, ONIX
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (16)
+	db "KENNY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, SANDSLASH
+	db 29, GRAVELER
+	db 31, GOLEM
+	db 29, GRAVELER
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (17)
+	db "JIM@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 35, MACHAMP
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (18)
+	db "DANIEL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 11, ONIX
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (19)
+	db "PARRY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 35, PILOSWINE
+		db EARTHQUAKE
+		db BLIZZARD
+		db REST
+		db TAKE_DOWN
+
+	db 35, DUGTRIO
+		db MAGNITUDE
+		db DIG
+		db MUD_SLAP
+		db SLASH
+
+	db 38, STEELIX
+		db DIG
+		db IRON_TAIL
+		db SANDSTORM
+		db SLAM
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (20)
+	db "PARRY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 29, ONIX
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (21)
+	db "ANTHONY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, GRAVELER
+	db 30, GRAVELER
+	db 32, MACHOKE
+
+	db $ff ; end
+
+; ================
+
+	; HIKER (22)
+	db "ANTHONY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 34, GRAVELER
+		db MAGNITUDE
+		db SELFDESTRUCT
+		db DEFENSE_CURL
+		db ROLLOUT
+
+	db 36, GOLEM
+		db MAGNITUDE
+		db SELFDESTRUCT
+		db DEFENSE_CURL
+		db ROLLOUT
+
+	db 34, MACHOKE
+		db KARATE_CHOP
+		db VITAL_THROW
+		db HEADBUTT
+		db DIG
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+BikerGroup:
+; ================================
+; ================
+
+	; BIKER (1)
+	db "BENNY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, KOFFING
+	db 20, KOFFING
+	db 20, KOFFING
+
+	db $ff ; end
+
+; ================
+
+	; BIKER (2)
+	db "KAZU@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, KOFFING
+	db 20, KOFFING
+	db 20, KOFFING
+
+	db $ff ; end
+
+; ================
+
+	; BIKER (3)
+	db "DWAYNE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, KOFFING
+	db 28, KOFFING
+	db 29, KOFFING
+	db 30, KOFFING
+
+	db $ff ; end
+
+; ================
+
+	; BIKER (4)
+	db "HARRIS@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, FLAREON
+
+	db $ff ; end
+
+; ================
+
+	; BIKER (5)
+	db "ZEKE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, KOFFING
+	db 32, KOFFING
+
+	db $ff ; end
+
+; ================
+
+	; BIKER (6)
+	db "CHARLES@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, KOFFING
+	db 30, CHARMELEON
+	db 30, WEEZING
+
+	db $ff ; end
+
+; ================
+
+	; BIKER (7)
+	db "RILEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, WEEZING
+
+	db $ff ; end
+
+; ================
+
+	; BIKER (8)
+	db "JOEL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, MAGMAR
+	db 32, MAGMAR
+
+	db $ff ; end
+
+; ================
+
+	; BIKER (9)
+	db "GLENN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, KOFFING
+	db 30, MAGMAR
+	db 32, WEEZING
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+BlaineGroup:
+; ================================
+; ================
+
+	; BLAINE (1)
+	db "BLAINE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 45, MAGCARGO
+		db CURSE
+		db SMOG
+		db FLAMETHROWER
+		db ROCK_SLIDE
+
+	db 45, MAGMAR
+		db THUNDERPUNCH
+		db FIRE_PUNCH
+		db SUNNY_DAY
+		db CONFUSE_RAY
+
+	db 50, RAPIDASH
+		db QUICK_ATTACK
+		db FIRE_SPIN
+		db FURY_ATTACK
+		db FIRE_BLAST
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+BurglarGroup:
+; ================================
+; ================
+
+	; BURGLAR (1)
+	db "DUNCAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 23, KOFFING
+	db 25, MAGMAR
+	db 23, KOFFING
+
+	db $ff ; end
+
+; ================
+
+	; BURGLAR (2)
+	db "EDDIE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 26, GROWLITHE
+		db ROAR
+		db EMBER
+		db LEER
+		db TAKE_DOWN
+
+	db 24, KOFFING
+		db TACKLE
+		db SMOG
+		db SLUDGE
+		db SMOKESCREEN
+
+	db $ff ; end
+
+; ================
+
+	; BURGLAR (3)
+	db "COREY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 25, KOFFING
+	db 28, MAGMAR
+	db 25, KOFFING
+	db 30, KOFFING
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+FirebreatherGroup:
+; ================================
+; ================
+
+	; FIREBREATHER (1)
+	db "OTIS@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 29, MAGMAR
+	db 32, WEEZING
+	db 29, MAGMAR
+
+	db $ff ; end
+
+; ================
+
+	; FIREBREATHER (2)
+	db "DICK@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, CHARMELEON
+
+	db $ff ; end
+
+; ================
+
+	; FIREBREATHER (3)
+	db "NED@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, KOFFING
+	db 16, GROWLITHE
+	db 15, KOFFING
+
+	db $ff ; end
+
+; ================
+
+	; FIREBREATHER (4)
+	db "BURT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, KOFFING
+	db 32, SLUGMA
+
+	db $ff ; end
+
+; ================
+
+	; FIREBREATHER (5)
+	db "BILL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 6, KOFFING
+	db 6, KOFFING
+
+	db $ff ; end
+
+; ================
+
+	; FIREBREATHER (6)
+	db "WALT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 11, MAGMAR
+	db 13, MAGMAR
+
+	db $ff ; end
+
+; ================
+
+	; FIREBREATHER (7)
+	db "RAY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 9, VULPIX
+
+	db $ff ; end
+
+; ================
+
+	; FIREBREATHER (8)
+	db "LYLE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, KOFFING
+	db 31, FLAREON
+	db 28, KOFFING
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+JugglerGroup:
+; ================================
+; ================
+
+	; JUGGLER (1)
+	db "IRWIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 2, VOLTORB
+	db 6, VOLTORB
+	db 10, VOLTORB
+	db 14, VOLTORB
+
+	db $ff ; end
+
+; ================
+
+	; JUGGLER (2)
+	db "FRITZ@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 29, MR__MIME
+	db 29, MAGMAR
+	db 29, MACHOKE
+
+	db $ff ; end
+
+; ================
+
+	; JUGGLER (3)
+	db "HORTON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 33, ELECTRODE
+	db 33, ELECTRODE
+	db 33, ELECTRODE
+	db 33, ELECTRODE
+
+	db $ff ; end
+
+; ================
+
+	; JUGGLER (4)
+	db "IRWIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 6, VOLTORB
+	db 10, VOLTORB
+	db 14, VOLTORB
+	db 18, VOLTORB
+
+	db $ff ; end
+
+; ================
+
+	; JUGGLER (5)
+	db "IRWIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 18, VOLTORB
+	db 22, VOLTORB
+	db 26, VOLTORB
+	db 30, ELECTRODE
+
+	db $ff ; end
+
+; ================
+
+	; JUGGLER (6)
+	db "IRWIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 18, VOLTORB
+	db 22, VOLTORB
+	db 26, VOLTORB
+	db 30, ELECTRODE
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+BlackbeltGroup:
+; ================================
+; ================
+
+	; BLACKBELT_T (1)
+	db "KENJI@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 27, ONIX
+	db 30, HITMONLEE
+	db 27, ONIX
+	db 32, MACHOKE
+
+	db $ff ; end
+
+; ================
+
+	; BLACKBELT_T (2)
+	db "YOSHI@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 27, HITMONLEE
+		db DOUBLE_KICK
+		db MEDITATE
+		db JUMP_KICK
+		db FOCUS_ENERGY
+
+	db $ff ; end
+
+; ================
+
+	; BLACKBELT_T (3)
+	db "KENJI@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 33, ONIX
+		db BIND
+		db ROCK_THROW
+		db TOXIC
+		db DIG
+
+	db 38, MACHAMP
+		db HEADBUTT
+		db SWAGGER
+		db THUNDERPUNCH
+		db VITAL_THROW
+
+	db 33, STEELIX
+		db EARTHQUAKE
+		db ROCK_THROW
+		db IRON_TAIL
+		db SANDSTORM
+
+	db 36, HITMONLEE
+		db DOUBLE_TEAM
+		db HI_JUMP_KICK
+		db MUD_SLAP
+		db SWIFT
+
+	db $ff ; end
+
+; ================
+
+	; BLACKBELT_T (4)
+	db "LAO@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 27, HITMONCHAN
+		db COMET_PUNCH
+		db THUNDERPUNCH
+		db ICE_PUNCH
+		db FIRE_PUNCH
+
+	db $ff ; end
+
+; ================
+
+	; BLACKBELT_T (5)
+	db "NOB@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 25, MACHOP
+		db LEER
+		db FOCUS_ENERGY
+		db KARATE_CHOP
+		db SEISMIC_TOSS
+
+	db 25, MACHOKE
+		db LEER
+		db KARATE_CHOP
+		db SEISMIC_TOSS
+		db ROCK_SLIDE
+
+	db $ff ; end
+
+; ================
+
+	; BLACKBELT_T (6)
+	db "KIYO@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, HITMONLEE
+	db 34, HITMONCHAN
+
+	db $ff ; end
+
+; ================
+
+	; BLACKBELT_T (7)
+	db "LUNG@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 23, MANKEY
+	db 23, MANKEY
+	db 25, PRIMEAPE
+
+	db $ff ; end
+
+; ================
+
+	; BLACKBELT_T (8)
+	db "KENJI@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 28, MACHOKE
+
+	db $ff ; end
+
+; ================
+
+	; BLACKBELT_T (9)
+	db "WAI@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, MACHOKE
+	db 32, MACHOKE
+	db 34, MACHOKE
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+ExecutiveMGroup:
+; ================================
+; ================
+
+	; EXECUTIVEM (1)
+	db "EXECUTIVE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 33, HOUNDOUR
+		db EMBER
+		db ROAR
+		db BITE
+		db FAINT_ATTACK
+
+	db 33, KOFFING
+		db TACKLE
+		db SLUDGE
+		db SMOKESCREEN
+		db HAZE
+
+	db 35, HOUNDOOM
+		db EMBER
+		db SMOG
+		db BITE
+		db FAINT_ATTACK
+
+	db $ff ; end
+
+; ================
+
+	; EXECUTIVEM (2)
+	db "EXECUTIVE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 36, GOLBAT
+		db LEECH_LIFE
+		db BITE
+		db CONFUSE_RAY
+		db WING_ATTACK
+
+	db $ff ; end
+
+; ================
+
+	; EXECUTIVEM (3)
+	db "EXECUTIVE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 30, KOFFING
+		db TACKLE
+		db SELFDESTRUCT
+		db SLUDGE
+		db SMOKESCREEN
+
+	db 30, KOFFING
+		db TACKLE
+		db SELFDESTRUCT
+		db SLUDGE
+		db SMOKESCREEN
+
+	db 30, KOFFING
+		db TACKLE
+		db SELFDESTRUCT
+		db SLUDGE
+		db SMOKESCREEN
+
+	db 32, WEEZING
+		db TACKLE
+		db EXPLOSION
+		db SLUDGE
+		db SMOKESCREEN
+
+	db 30, KOFFING
+		db TACKLE
+		db SELFDESTRUCT
+		db SLUDGE
+		db SMOKESCREEN
+
+	db 30, KOFFING
+		db TACKLE
+		db SMOG
+		db SLUDGE
+		db SMOKESCREEN
+
+	db $ff ; end
+
+; ================
+
+	; EXECUTIVEM (4)
+	db "EXECUTIVE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 22, ZUBAT
+	db 24, RATICATE
+	db 22, KOFFING
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+PsychicGroup:
+; ================================
+; ================
+
+	; PSYCHIC_T (1)
+	db "NATHAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 26, GIRAFARIG
+
+	db $ff ; end
+
+; ================
+
+	; PSYCHIC_T (2)
+	db "FRANKLIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 37, KADABRA
+
+	db $ff ; end
+
+; ================
+
+	; PSYCHIC_T (3)
+	db "HERMAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, EXEGGCUTE
+	db 30, EXEGGCUTE
+	db 30, EXEGGUTOR
+
+	db $ff ; end
+
+; ================
+
+	; PSYCHIC_T (4)
+	db "FIDEL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, XATU
+
+	db $ff ; end
+
+; ================
+
+	; PSYCHIC_T (5)
+	db "GREG@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 17, DROWZEE
+		db HYPNOSIS
+		db DISABLE
+		db DREAM_EATER
+		db 0
+
+	db $ff ; end
+
+; ================
+
+	; PSYCHIC_T (6)
+	db "NORMAN@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 17, SLOWPOKE
+		db TACKLE
+		db GROWL
+		db WATER_GUN
+		db 0
+
+	db 20, SLOWPOKE
+		db CURSE
+		db BODY_SLAM
+		db WATER_GUN
+		db CONFUSION
+
+	db $ff ; end
+
+; ================
+
+	; PSYCHIC_T (7)
+	db "MARK@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 13, ABRA
+		db TELEPORT
+		db FLASH
+		db 0
+		db 0
+
+	db 13, ABRA
+		db TELEPORT
+		db FLASH
+		db 0
+		db 0
+
+	db 15, KADABRA
+		db TELEPORT
+		db KINESIS
+		db CONFUSION
+		db 0
+
+	db $ff ; end
+
+; ================
+
+	; PSYCHIC_T (8)
+	db "PHIL@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 24, NATU
+		db LEER
+		db NIGHT_SHADE
+		db FUTURE_SIGHT
+		db CONFUSE_RAY
+
+	db 26, KADABRA
+		db DISABLE
+		db PSYBEAM
+		db RECOVER
+		db FUTURE_SIGHT
+
+	db $ff ; end
+
+; ================
+
+	; PSYCHIC_T (9)
+	db "RICHARD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 36, ESPEON
+
+	db $ff ; end
+
+; ================
+
+	; PSYCHIC_T (10)
+	db "GILBERT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, STARMIE
+	db 30, EXEGGCUTE
+	db 34, GIRAFARIG
+
+	db $ff ; end
+
+; ================
+
+	; PSYCHIC_T (11)
+	db "JARED@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, MR__MIME
+	db 32, EXEGGCUTE
+	db 35, EXEGGCUTE
+
+	db $ff ; end
+
+; ================
+
+	; PSYCHIC_T (12)
+	db "RODNEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 29, DROWZEE
+	db 33, HYPNO
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+PicnickerGroup:
+; ================================
+; ================
+
+	; PICNICKER (1)
+	db "LIZ@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 9, NIDORAN_F
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (2)
+	db "GINA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 9, HOPPIP
+	db 9, HOPPIP
+	db 12, BULBASAUR
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (3)
+	db "BROOKE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 16, PIKACHU
+		db THUNDERSHOCK
+		db GROWL
+		db QUICK_ATTACK
+		db DOUBLE_TEAM
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (4)
+	db "KIM@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, VULPIX
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (5)
+	db "CINDY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 36, NIDOQUEEN
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (6)
+	db "HOPE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, FLAAFFY
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (7)
+	db "SHARON@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 31, FURRET
+	db 33, RAPIDASH
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (8)
+	db "DEBRA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 33, SEAKING
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (9)
+	db "GINA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 14, HOPPIP
+	db 14, HOPPIP
+	db 17, IVYSAUR
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (10)
+	db "ERIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 16, PONYTA
+	db 16, PONYTA
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (11)
+	db "LIZ@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, WEEPINBELL
+	db 15, NIDORINA
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (12)
+	db "LIZ@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 19, WEEPINBELL
+	db 19, NIDORINO
+	db 21, NIDOQUEEN
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (13)
+	db "HEIDI@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, SKIPLOOM
+	db 32, SKIPLOOM
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (14)
+	db "EDNA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, NIDORINA
+	db 34, RAICHU
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (15)
+	db "GINA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 26, SKIPLOOM
+	db 26, SKIPLOOM
+	db 29, IVYSAUR
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (16)
+	db "TIFFANY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 31, CLEFAIRY
+		db ENCORE
+		db SING
+		db DOUBLESLAP
+		db MINIMIZE
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (17)
+	db "TIFFANY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 37, CLEFAIRY
+		db ENCORE
+		db DOUBLESLAP
+		db MINIMIZE
+		db METRONOME
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (18)
+	db "ERIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, PONYTA
+	db 32, PONYTA
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (19)
+	db "TANYA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 37, EXEGGUTOR
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (20)
+	db "TIFFANY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 20, CLEFAIRY
+		db ENCORE
+		db SING
+		db DOUBLESLAP
+		db MINIMIZE
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (21)
+	db "ERIN@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 36, PONYTA
+		db DOUBLE_TEAM
+		db STOMP
+		db FIRE_SPIN
+		db SUNNY_DAY
+
+	db 34, RAICHU
+		db SWIFT
+		db MUD_SLAP
+		db QUICK_ATTACK
+		db THUNDERBOLT
+
+	db 36, PONYTA
+		db DOUBLE_TEAM
+		db STOMP
+		db FIRE_SPIN
+		db SUNNY_DAY
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (22)
+	db "LIZ@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, WEEPINBELL
+	db 26, NIDORINO
+	db 26, NIDOQUEEN
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (23)
+	db "LIZ@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 30, WEEPINBELL
+		db SLEEP_POWDER
+		db POISONPOWDER
+		db STUN_SPORE
+		db SLUDGE_BOMB
+
+	db 32, NIDOKING
+		db EARTHQUAKE
+		db DOUBLE_KICK
+		db POISON_STING
+		db IRON_TAIL
+
+	db 32, NIDOQUEEN
+		db EARTHQUAKE
+		db DOUBLE_KICK
+		db TAIL_WHIP
+		db BODY_SLAM
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (24)
+	db "GINA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, SKIPLOOM
+	db 30, SKIPLOOM
+	db 32, IVYSAUR
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (25)
+	db "GINA@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 33, JUMPLUFF
+		db STUN_SPORE
+		db SUNNY_DAY
+		db LEECH_SEED
+		db COTTON_SPORE
+
+	db 33, JUMPLUFF
+		db SUNNY_DAY
+		db SLEEP_POWDER
+		db LEECH_SEED
+		db COTTON_SPORE
+
+	db 38, VENUSAUR
+		db SOLARBEAM
+		db RAZOR_LEAF
+		db HEADBUTT
+		db MUD_SLAP
+
+	db $ff ; end
+
+; ================
+
+	; PICNICKER (26)
+	db "TIFFANY@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 43, CLEFAIRY
+		db METRONOME
+		db ENCORE
+		db MOONLIGHT
+		db MINIMIZE
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+CamperGroup:
+; ================================
+; ================
+
+	; CAMPER (1)
+	db "ROLAND@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 9, NIDORAN_M
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (2)
+	db "TODD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 14, PSYDUCK
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (3)
+	db "IVAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 10, DIGLETT
+	db 10, ZUBAT
+	db 14, DIGLETT
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (4)
+	db "ELLIOT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 13, SANDSHREW
+	db 15, MARILL
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (5)
+	db "BARRY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 36, NIDOKING
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (6)
+	db "LLOYD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, NIDOKING
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (7)
+	db "DEAN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 33, GOLDUCK
+	db 31, SANDSLASH
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (8)
+	db "SID@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, DUGTRIO
+	db 29, PRIMEAPE
+	db 29, POLIWRATH
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (9)
+	db "HARVEY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, NIDORINO
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (10)
+	db "DALE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 15, NIDORINO
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (11)
+	db "TED@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, MANKEY
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (12)
+	db "TODD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, GEODUDE
+	db 17, GEODUDE
+	db 23, PSYDUCK
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (13)
+	db "TODD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 23, GEODUDE
+	db 23, GEODUDE
+	db 26, PSYDUCK
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (14)
+	db "THOMAS@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 33, GRAVELER
+	db 36, GRAVELER
+	db 40, GOLBAT
+	db 42, GOLDUCK
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (15)
+	db "LEROY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 33, GRAVELER
+	db 36, GRAVELER
+	db 40, GOLBAT
+	db 42, GOLDUCK
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (16)
+	db "DAVID@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 33, GRAVELER
+	db 36, GRAVELER
+	db 40, GOLBAT
+	db 42, GOLDUCK
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (17)
+	db "JOHN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 33, GRAVELER
+	db 36, GRAVELER
+	db 40, GOLBAT
+	db 42, GOLDUCK
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (18)
+	db "JERRY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 37, SANDSLASH
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (19)
+	db "SPENCER@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, SANDSHREW
+	db 17, SANDSLASH
+	db 19, ZUBAT
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (20)
+	db "TODD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, GRAVELER
+	db 30, GRAVELER
+	db 30, SLUGMA
+	db 32, PSYDUCK
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (21)
+	db "TODD@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 33, GRAVELER
+		db SELFDESTRUCT
+		db ROCK_THROW
+		db HARDEN
+		db MAGNITUDE
+
+	db 33, GRAVELER
+		db SELFDESTRUCT
+		db ROCK_THROW
+		db HARDEN
+		db MAGNITUDE
+
+	db 36, MAGCARGO
+		db ROCK_THROW
+		db HARDEN
+		db AMNESIA
+		db FLAMETHROWER
+
+	db 34, GOLDUCK
+		db DISABLE
+		db PSYCHIC_M
+		db SURF
+		db PSYCH_UP
+
+	db $ff ; end
+
+; ================
+
+	; CAMPER (22)
+	db "QUENTIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 30, FEAROW
+	db 30, PRIMEAPE
+	db 30, TAUROS
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+ExecutiveFGroup:
+; ================================
+; ================
+
+	; EXECUTIVEF (1)
+	db "EXECUTIVE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 32, ARBOK
+		db WRAP
+		db POISON_STING
+		db BITE
+		db GLARE
+
+	db 32, VILEPLUME
+		db ABSORB
+		db SWEET_SCENT
+		db SLEEP_POWDER
+		db ACID
+
+	db 32, MURKROW
+		db PECK
+		db PURSUIT
+		db HAZE
+		db NIGHT_SHADE
+
+	db $ff ; end
+
+; ================
+
+	; EXECUTIVEF (2)
+	db "EXECUTIVE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 23, ARBOK
+		db WRAP
+		db LEER
+		db POISON_STING
+		db BITE
+
+	db 23, GLOOM
+		db ABSORB
+		db SWEET_SCENT
+		db SLEEP_POWDER
+		db ACID
+
+	db 25, MURKROW
+		db PECK
+		db PURSUIT
+		db HAZE
+		db 0
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+SageGroup:
+; ================================
+; ================
+
+	; SAGE (1)
+	db "CHOW@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 3, BELLSPROUT
+	db 3, BELLSPROUT
+	db 3, BELLSPROUT
+
+	db $ff ; end
+
+; ================
+
+	; SAGE (2)
+	db "NICO@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 3, BELLSPROUT
+	db 3, BELLSPROUT
+	db 3, BELLSPROUT
+
+	db $ff ; end
+
+; ================
+
+	; SAGE (3)
+	db "JIN@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 6, BELLSPROUT
+
+	db $ff ; end
+
+; ================
+
+	; SAGE (4)
+	db "TROY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 7, BELLSPROUT
+	db 7, HOOTHOOT
+
+	db $ff ; end
+
+; ================
+
+	; SAGE (5)
+	db "JEFFREY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 22, HAUNTER
+
+	db $ff ; end
+
+; ================
+
+	; SAGE (6)
+	db "PING@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 16, GASTLY
+	db 16, GASTLY
+	db 16, GASTLY
+	db 16, GASTLY
+	db 16, GASTLY
+
+	db $ff ; end
+
+; ================
+
+	; SAGE (7)
+	db "EDMOND@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 3, BELLSPROUT
+	db 3, BELLSPROUT
+	db 3, BELLSPROUT
+
+	db $ff ; end
+
+; ================
+
+	; SAGE (8)
+	db "NEAL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 6, BELLSPROUT
+
+	db $ff ; end
+
+; ================
+
+	; SAGE (9)
+	db "LI@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 7, BELLSPROUT
+	db 7, BELLSPROUT
+	db 10, HOOTHOOT
+
+	db $ff ; end
+
+; ================
+
+	; SAGE (10)
+	db "GAKU@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, NOCTOWL
+	db 32, FLAREON
+
+	db $ff ; end
+
+; ================
+
+	; SAGE (11)
+	db "MASA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, NOCTOWL
+	db 32, JOLTEON
+
+	db $ff ; end
+
+; ================
+
+	; SAGE (12)
+	db "KOJI@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 32, NOCTOWL
+	db 32, VAPOREON
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+MediumGroup:
+; ================================
+; ================
+
+	; MEDIUM (1)
+	db "MARTHA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 18, GASTLY
+	db 20, HAUNTER
+	db 20, GASTLY
+
+	db $ff ; end
+
+; ================
+
+	; MEDIUM (2)
+	db "GRACE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, HAUNTER
+	db 20, HAUNTER
+
+	db $ff ; end
+
+; ================
+
+	; MEDIUM (3)
+	db "BETHANY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 25, HAUNTER
+
+	db $ff ; end
+
+; ================
+
+	; MEDIUM (4)
+	db "MARGRET@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 25, HAUNTER
+
+	db $ff ; end
+
+; ================
+
+	; MEDIUM (5)
+	db "ETHEL@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 25, HAUNTER
+
+	db $ff ; end
+
+; ================
+
+	; MEDIUM (6)
+	db "REBECCA@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 35, DROWZEE
+	db 35, HYPNO
+
+	db $ff ; end
+
+; ================
+
+	; MEDIUM (7)
+	db "DORIS@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 34, SLOWPOKE
+	db 36, SLOWBRO
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+BoarderGroup:
+; ================================
+; ================
+
+	; BOARDER (1)
+	db "RONALD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, SEEL
+	db 25, DEWGONG
+	db 24, SEEL
+
+	db $ff ; end
+
+; ================
+
+	; BOARDER (2)
+	db "BRAD@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 26, SWINUB
+	db 26, SWINUB
+
+	db $ff ; end
+
+; ================
+
+	; BOARDER (3)
+	db "DOUGLAS@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 24, SHELLDER
+	db 25, CLOYSTER
+	db 24, SHELLDER
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+PokefanMGroup:
+; ================================
+; ================
+
+	; POKEFANM (1)
+	db "WILLIAM@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 14, RAICHU, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANM (2)
+	db "DEREK@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 17, PIKACHU, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANM (3)
+	db "ROBERT@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 33, QUAGSIRE, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANM (4)
+	db "JOSHUA@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 23, PIKACHU, BERRY
+	db 23, PIKACHU, BERRY
+	db 23, PIKACHU, BERRY
+	db 23, PIKACHU, BERRY
+	db 23, PIKACHU, BERRY
+	db 23, PIKACHU, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANM (5)
+	db "CARTER@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 29, BULBASAUR, BERRY
+	db 29, CHARMANDER, BERRY
+	db 29, SQUIRTLE, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANM (6)
+	db "TREVOR@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 33, PSYDUCK, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANM (7)
+	db "BRANDON@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 13, SNUBBULL, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANM (8)
+	db "JEREMY@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 28, MEOWTH, BERRY
+	db 28, MEOWTH, BERRY
+	db 28, MEOWTH, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANM (9)
+	db "COLIN@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 32, DELIBIRD, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANM (10)
+	db "DEREK@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 19, PIKACHU, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANM (11)
+	db "DEREK@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 36, PIKACHU, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANM (12)
+	db "ALEX@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 29, NIDOKING, BERRY
+	db 29, SLOWKING, BERRY
+	db 29, SEAKING, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANM (13)
+	db "REX@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 35, PHANPY, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANM (14)
+	db "ALLAN@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 35, TEDDIURSA, BERRY
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+KimonoGirlGroup:
+; ================================
+; ================
+
+	; KIMONO_GIRL (1)
+	db "NAOKO@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 20, SKIPLOOM
+	db 20, VULPIX
+	db 18, SKIPLOOM
+
+	db $ff ; end
+
+; ================
+
+	; KIMONO_GIRL (2)
+	db "NAOKO@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, FLAREON
+
+	db $ff ; end
+
+; ================
+
+	; KIMONO_GIRL (3)
+	db "SAYO@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, ESPEON
+
+	db $ff ; end
+
+; ================
+
+	; KIMONO_GIRL (4)
+	db "ZUKI@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, UMBREON
+
+	db $ff ; end
+
+; ================
+
+	; KIMONO_GIRL (5)
+	db "KUNI@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, VAPOREON
+
+	db $ff ; end
+
+; ================
+
+	; KIMONO_GIRL (6)
+	db "MIKI@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, JOLTEON
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+TwinsGroup:
+; ================================
+; ================
+
+	; TWINS (1)
+	db "AMY & MAY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 10, SPINARAK
+	db 10, LEDYBA
+
+	db $ff ; end
+
+; ================
+
+	; TWINS (2)
+	db "ANN & ANNE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 16, CLEFAIRY
+		db GROWL
+		db ENCORE
+		db DOUBLESLAP
+		db METRONOME
+
+	db 16, JIGGLYPUFF
+		db SING
+		db DEFENSE_CURL
+		db POUND
+		db DISABLE
+
+	db $ff ; end
+
+; ================
+
+	; TWINS (3)
+	db "ANN & ANNE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 16, JIGGLYPUFF
+		db SING
+		db DEFENSE_CURL
+		db POUND
+		db DISABLE
+
+	db 16, CLEFAIRY
+		db GROWL
+		db ENCORE
+		db DOUBLESLAP
+		db METRONOME
+
+	db $ff ; end
+
+; ================
+
+	; TWINS (4)
+	db "AMY & MAY@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 10, LEDYBA
+	db 10, SPINARAK
+
+	db $ff ; end
+
+; ================
+
+	; TWINS (5)
+	db "JO & ZOE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 35, VICTREEBEL
+	db 35, VILEPLUME
+
+	db $ff ; end
+
+; ================
+
+	; TWINS (6)
+	db "JO & ZOE@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 35, VILEPLUME
+	db 35, VICTREEBEL
+
+	db $ff ; end
+
+; ================
+
+	; TWINS (7)
+	db "MEG & PEG@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 31, TEDDIURSA
+	db 31, PHANPY
+
+	db $ff ; end
+
+; ================
+
+	; TWINS (8)
+	db "MEG & PEG@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 31, PHANPY
+	db 31, TEDDIURSA
+
+	db $ff ; end
+
+; ================
+
+	; TWINS (9)
+	db "LEA & PIA@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 35, DRATINI
+		db THUNDER_WAVE
+		db TWISTER
+		db FLAMETHROWER
+		db HEADBUTT
+
+	db 35, DRATINI
+		db THUNDER_WAVE
+		db TWISTER
+		db ICE_BEAM
+		db HEADBUTT
+
+	db $ff ; end
+
+; ================
+
+	; TWINS (10)
+	db "LEA & PIA@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 38, DRATINI
+		db THUNDER_WAVE
+		db TWISTER
+		db ICE_BEAM
+		db HEADBUTT
+
+	db 38, DRATINI
+		db THUNDER_WAVE
+		db TWISTER
+		db FLAMETHROWER
+		db HEADBUTT
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+PokefanFGroup:
+; ================================
+; ================
+
+	; POKEFANF (1)
+	db "BEVERLY@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 14, SNUBBULL, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANF (2)
+	db "RUTH@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 17, PIKACHU, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANF (3)
+	db "BEVERLY@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 18, SNUBBULL, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANF (4)
+	db "BEVERLY@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 30, GRANBULL, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANF (5)
+	db "GEORGIA@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 23, SENTRET, BERRY
+	db 23, SENTRET, BERRY
+	db 23, SENTRET, BERRY
+	db 28, FURRET, BERRY
+	db 23, SENTRET, BERRY
+
+	db $ff ; end
+
+; ================
+
+	; POKEFANF (6)
+	db "JAIME@"
+	db TRAINERTYPE_ITEM
+
+	; party
+	db 16, MEOWTH, BERRY
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+RedGroup:
+; ================================
+; ================
+
+	; RED (1)
+	db "RED@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 81, PIKACHU
+		db CHARM
+		db QUICK_ATTACK
+		db THUNDERBOLT
+		db THUNDER
+
+	db 73, ESPEON
+		db MUD_SLAP
+		db REFLECT
+		db SWIFT
+		db PSYCHIC_M
+
+	db 75, SNORLAX
+		db AMNESIA
+		db SNORE
+		db REST
+		db BODY_SLAM
+
+	db 77, VENUSAUR
+		db SUNNY_DAY
+		db GIGA_DRAIN
+		db SYNTHESIS
+		db SOLARBEAM
+
+	db 77, CHARIZARD
+		db FLAMETHROWER
+		db WING_ATTACK
+		db SLASH
+		db FIRE_SPIN
+
+	db 77, BLASTOISE
+		db RAIN_DANCE
+		db SURF
+		db BLIZZARD
+		db WHIRLPOOL
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+BlueGroup:
+; ================================
+; ================
+
+	; BLUE (1)
+	db "BLUE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 56, PIDGEOT
+		db QUICK_ATTACK
+		db WHIRLWIND
+		db WING_ATTACK
+		db MIRROR_MOVE
+
+	db 54, ALAKAZAM
+		db DISABLE
+		db RECOVER
+		db PSYCHIC_M
+		db REFLECT
+
+	db 56, RHYDON
+		db FURY_ATTACK
+		db SANDSTORM
+		db ROCK_SLIDE
+		db EARTHQUAKE
+
+	db 58, GYARADOS
+		db TWISTER
+		db HYDRO_PUMP
+		db RAIN_DANCE
+		db HYPER_BEAM
+
+	db 58, EXEGGUTOR
+		db SUNNY_DAY
+		db LEECH_SEED
+		db EGG_BOMB
+		db SOLARBEAM
+
+	db 58, ARCANINE
+		db ROAR
+		db SWIFT
+		db FLAMETHROWER
+		db EXTREMESPEED
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+OfficerGroup:
+; ================================
+; ================
+
+	; OFFICER (1)
+	db "KEITH@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 17, GROWLITHE
+
+	db $ff ; end
+
+; ================
+
+	; OFFICER (2)
+	db "DIRK@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 14, GROWLITHE
+	db 14, GROWLITHE
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+GruntFGroup:
+; ================================
+; ================
+
+	; GRUNTF (1)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 9, ZUBAT
+	db 11, EKANS
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTF (2)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 26, ARBOK
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTF (3)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 25, GLOOM
+	db 25, GLOOM
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTF (4)
+	db "GRUNT@"
+	db TRAINERTYPE_NORMAL
+
+	; party
+	db 21, EKANS
+	db 23, ODDISH
+	db 21, EKANS
+	db 24, GLOOM
+
+	db $ff ; end
+
+; ================
+
+	; GRUNTF (5)
+	db "GRUNT@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 18, EKANS
+		db WRAP
+		db LEER
+		db POISON_STING
+		db BITE
+
+	db 18, GLOOM
+		db ABSORB
+		db SWEET_SCENT
+		db STUN_SPORE
+		db SLEEP_POWDER
+
+	db $ff ; end
+
+; ================
+; ================================
+
+
+MysticalmanGroup:
+; ================================
+; ================
+
+	; MYSTICALMAN (1)
+	db "EUSINE@"
+	db TRAINERTYPE_MOVES
+
+	; party
+
+	db 23, DROWZEE
+		db DREAM_EATER
+		db HYPNOSIS
+		db DISABLE
+		db CONFUSION
+
+	db 23, HAUNTER
+		db LICK
+		db HYPNOSIS
+		db MEAN_LOOK
+		db CURSE
+
+	db 25, ELECTRODE
+		db SCREECH
+		db SONICBOOM
+		db THUNDER
+		db ROLLOUT
+
+	db $ff ; end
+
+; ================
+; ================================
diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm
new file mode 100644
index 000000000..c0b3d4538
--- /dev/null
+++ b/data/trainers/party_pointers.asm
@@ -0,0 +1,70 @@
+; Each trainer class has its own group. See trainers.asm.
+
+TrainerGroups: ; 0x39999
+	dw FalknerGroup
+	dw WhitneyGroup
+	dw BugsyGroup
+	dw MortyGroup
+	dw PryceGroup
+	dw JasmineGroup
+	dw ChuckGroup
+	dw ClairGroup
+	dw Rival1Group
+	dw PokemonProfGroup
+	dw WillGroup
+	dw PKMNTrainerGroup
+	dw BrunoGroup
+	dw KarenGroup
+	dw KogaGroup
+	dw ChampionGroup
+	dw BrockGroup
+	dw MistyGroup
+	dw LtSurgeGroup
+	dw ScientistGroup
+	dw ErikaGroup
+	dw YoungsterGroup
+	dw SchoolboyGroup
+	dw BirdKeeperGroup
+	dw LassGroup
+	dw JanineGroup
+	dw CooltrainerMGroup
+	dw CooltrainerFGroup
+	dw BeautyGroup
+	dw PokemaniacGroup
+	dw GruntMGroup
+	dw GentlemanGroup
+	dw SkierGroup
+	dw TeacherGroup
+	dw SabrinaGroup
+	dw BugCatcherGroup
+	dw FisherGroup
+	dw SwimmerMGroup
+	dw SwimmerFGroup
+	dw SailorGroup
+	dw SuperNerdGroup
+	dw Rival2Group
+	dw GuitaristGroup
+	dw HikerGroup
+	dw BikerGroup
+	dw BlaineGroup
+	dw BurglarGroup
+	dw FirebreatherGroup
+	dw JugglerGroup
+	dw BlackbeltGroup
+	dw ExecutiveMGroup
+	dw PsychicGroup
+	dw PicnickerGroup
+	dw CamperGroup
+	dw ExecutiveFGroup
+	dw SageGroup
+	dw MediumGroup
+	dw BoarderGroup
+	dw PokefanMGroup
+	dw KimonoGirlGroup
+	dw TwinsGroup
+	dw PokefanFGroup
+	dw RedGroup
+	dw BlueGroup
+	dw OfficerGroup
+	dw GruntFGroup
+	dw MysticalmanGroup
diff --git a/data/trainers/trainer_attributes.asm b/data/trainers/trainer_attributes.asm
new file mode 100644
index 000000000..224e460c9
--- /dev/null
+++ b/data/trainers/trainer_attributes.asm
@@ -0,0 +1,406 @@
+TrainerClassAttributes: ; 3959c
+; entries correspond to trainer classes (see constants/trainer_constants.asm)
+
+; Falkner
+	db 0, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Whitney
+	db 0, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Bugsy
+	db 0, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Morty
+	db 0, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Pryce
+	db HYPER_POTION, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Jasmine
+	db HYPER_POTION, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Chuck
+	db FULL_HEAL, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Clair
+	db FULL_HEAL, HYPER_POTION ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Rival1
+	db 0, 0 ; items
+	db 15 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Pokemon Prof
+	db 0, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_AGGRESSIVE + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Will
+	db MAX_POTION, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Cal
+	db 0, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Bruno
+	db MAX_POTION, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Karen
+	db FULL_HEAL, MAX_POTION ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Koga
+	db FULL_HEAL, FULL_RESTORE ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Champion
+	db FULL_HEAL, FULL_RESTORE ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Brock
+	db HYPER_POTION, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Misty
+	db FULL_HEAL, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Lt Surge
+	db HYPER_POTION, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Scientist
+	db 0, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Erika
+	db HYPER_POTION, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Youngster
+	db 0, 0 ; items
+	db 4 ; base reward
+	dw AI_BASIC + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Schoolboy
+	db 0, 0 ; items
+	db 8 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
+	dw CONTEXT_USE + SWITCH_OFTEN
+
+; Bird Keeper
+	db 0, 0 ; items
+	db 6 ; base reward
+	dw AI_BASIC + AI_TYPES + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Lass
+	db 0, 0 ; items
+	db 6 ; base reward
+	dw AI_BASIC + AI_CAUTIOUS + AI_STATUS
+	dw CONTEXT_USE + SWITCH_OFTEN
+
+; Janine
+	db DIRE_HIT, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Cooltrainerm
+	db 0, 0 ; items
+	db 12 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Cooltrainerf
+	db 0, 0 ; items
+	db 12 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Beauty
+	db 0, 0 ; items
+	db 22 ; base reward
+	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Pokemaniac
+	db 0, 0 ; items
+	db 15 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_AGGRESSIVE + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Gruntm
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Gentleman
+	db 0, 0 ; items
+	db 18 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_AGGRESSIVE + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Skier
+	db 0, 0 ; items
+	db 18 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Teacher
+	db 0, 0 ; items
+	db 18 ; base reward
+	dw AI_BASIC + AI_OPPORTUNIST + AI_AGGRESSIVE + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Sabrina
+	db HYPER_POTION, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Bug Catcher
+	db 0, 0 ; items
+	db 4 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Fisher
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
+	dw CONTEXT_USE + SWITCH_OFTEN
+
+; Swimmerm
+	db 0, 0 ; items
+	db 2 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OFFENSIVE + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Swimmerf
+	db 0, 0 ; items
+	db 5 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Sailor
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Super Nerd
+	db 0, 0 ; items
+	db 8 ; base reward
+	dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Rival2
+	db 0, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Guitarist
+	db 0, 0 ; items
+	db 8 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Hiker
+	db 0, 0 ; items
+	db 8 ; base reward
+	dw AI_BASIC + AI_OFFENSIVE + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Biker
+	db 0, 0 ; items
+	db 8 ; base reward
+	dw AI_BASIC + AI_TYPES + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Blaine
+	db MAX_POTION, FULL_HEAL ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Burglar
+	db 0, 0 ; items
+	db 22 ; base reward
+	dw AI_BASIC + AI_OFFENSIVE + AI_CAUTIOUS + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Firebreather
+	db 0, 0 ; items
+	db 12 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Juggler
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Blackbelt T
+	db 0, 0 ; items
+	db 6 ; base reward
+	dw AI_BASIC + AI_OFFENSIVE + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Executivem
+	db 0, 0 ; items
+	db 18 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Psychic T
+	db 0, 0 ; items
+	db 8 ; base reward
+	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Picnicker
+	db 0, 0 ; items
+	db 5 ; base reward
+	dw AI_BASIC + AI_CAUTIOUS + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Camper
+	db 0, 0 ; items
+	db 5 ; base reward
+	dw AI_BASIC + AI_CAUTIOUS + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Executivef
+	db 0, 0 ; items
+	db 18 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Sage
+	db 0, 0 ; items
+	db 8 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Medium
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Boarder
+	db 0, 0 ; items
+	db 18 ; base reward
+	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Pokefanm
+	db 0, 0 ; items
+	db 20 ; base reward
+	dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Kimono Girl
+	db 0, 0 ; items
+	db 18 ; base reward
+	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Twins
+	db 0, 0 ; items
+	db 5 ; base reward
+	dw NO_AI
+	dw CONTEXT_USE + SWITCH_OFTEN
+
+; Pokefanf
+	db 0, 0 ; items
+	db 20 ; base reward
+	dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Red
+	db FULL_RESTORE, FULL_RESTORE ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Blue
+	db FULL_RESTORE, FULL_RESTORE ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Officer
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Gruntf
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; Mysticalman
+	db 0, 0 ; items
+	db 25 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+
+; 39771
diff --git a/data/trainers/trainer_dvs.asm b/data/trainers/trainer_dvs.asm
new file mode 100644
index 000000000..503c468d3
--- /dev/null
+++ b/data/trainers/trainer_dvs.asm
@@ -0,0 +1,93 @@
+GetTrainerDVs: ; 270c4
+; Return the DVs of OtherTrainerClass in bc
+
+	push hl
+	ld a, [OtherTrainerClass]
+	dec a
+	ld c, a
+	ld b, 0
+
+	ld hl, TrainerClassDVs
+	add hl, bc
+	add hl, bc
+
+	ld a, [hli]
+	ld b, a
+	ld c, [hl]
+
+	pop hl
+	ret
+; 270d6
+
+TrainerClassDVs: ; 270d6
+; entries correspond to trainer classes (see constants/trainer_constants.asm)
+	;  Atk  Spd
+	;  Def  Spc
+	db $9A, $77 ; falkner
+	db $88, $88 ; bugsy
+	db $98, $88 ; whitney
+	db $98, $88 ; morty
+	db $98, $88 ; pryce
+	db $98, $88 ; jasmine
+	db $98, $88 ; chuck
+	db $7C, $DD ; clair
+	db $DD, $DD ; rival1
+	db $98, $88 ; pokemon prof
+	db $DC, $DD ; will
+	db $DC, $DD ; cal
+	db $DC, $DD ; bruno
+	db $7F, $DF ; karen
+	db $DC, $DD ; koga
+	db $DC, $DD ; champion
+	db $98, $88 ; brock
+	db $78, $88 ; misty
+	db $98, $88 ; lt surge
+	db $98, $88 ; scientist
+	db $78, $88 ; erika
+	db $98, $88 ; youngster
+	db $98, $88 ; schoolboy
+	db $98, $88 ; bird keeper
+	db $58, $88 ; lass
+	db $98, $88 ; janine
+	db $D8, $C8 ; cooltrainerm
+	db $7C, $C8 ; cooltrainerf
+	db $69, $C8 ; beauty
+	db $98, $88 ; pokemaniac
+	db $D8, $A8 ; gruntm
+	db $98, $88 ; gentleman
+	db $98, $88 ; skier
+	db $68, $88 ; teacher
+	db $7D, $87 ; sabrina
+	db $98, $88 ; bug catcher
+	db $98, $88 ; fisher
+	db $98, $88 ; swimmerm
+	db $78, $88 ; swimmerf
+	db $98, $88 ; sailor
+	db $98, $88 ; super nerd
+	db $98, $88 ; rival2
+	db $98, $88 ; guitarist
+	db $A8, $88 ; hiker
+	db $98, $88 ; biker
+	db $98, $88 ; blaine
+	db $98, $88 ; burglar
+	db $98, $88 ; firebreather
+	db $98, $88 ; juggler
+	db $98, $88 ; blackbelt
+	db $D8, $A8 ; executivem
+	db $98, $88 ; psychic
+	db $6A, $A8 ; picnicker
+	db $98, $88 ; camper
+	db $7E, $A8 ; executivef
+	db $98, $88 ; sage
+	db $78, $88 ; medium
+	db $98, $88 ; boarder
+	db $98, $88 ; pokefanm
+	db $68, $8A ; kimono girl
+	db $68, $A8 ; twins
+	db $6D, $88 ; pokefanf
+	db $FD, $DE ; red
+	db $9D, $DD ; blue
+	db $98, $88 ; officer
+	db $7E, $A8 ; gruntf
+	db $98, $88 ; mysticalman
+; 2715c