276 files changed, 349 insertions, 349 deletions

diff --git a/contents.asm b/contents.asm
index c13fffc7..5d65c938 100644
--- a/contents.asm
+++ b/contents.asm
@@ -13,12 +13,12 @@ TILESETS_7                EQU $77
 TILESETS_8                EQU $78
 
 
-; data/egg_moves.o
+; data/pokemon/egg_moves.o
 
 EGG_MOVES                 EQU $8
 
 
-; data/evos_attacks.o
+; data/pokemon/evos_attacks.o
 
 EVOS_ATTACKS              EQU $10
 
diff --git a/data/base_stats.asm b/data/base_stats.asm
deleted file mode 100644
index b3e67d9a..00000000
--- a/data/base_stats.asm
+++ /dev/null
@@ -1,253 +0,0 @@
-BaseData0::
-INCLUDE "data/base_stats/bulbasaur.asm"
-BaseData1::
-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/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
new file mode 100644
index 00000000..1e1fdd27
--- /dev/null
+++ b/data/pokemon/base_stats.asm
@@ -0,0 +1,253 @@
+BaseData0::
+INCLUDE "data/pokemon/base_stats/bulbasaur.asm"
+BaseData1::
+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 1856a2fd..1856a2fd 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 c3c3b4c7..c3c3b4c7 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 6226a452..6226a452 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 086a1bb4..086a1bb4 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 3c5626d8..3c5626d8 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 3b82c180..3b82c180 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 ce255499..ce255499 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 f0572464..f0572464 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 5e8167ba..5e8167ba 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 c5a47615..c5a47615 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 e94ecaa3..e94ecaa3 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 254ee749..254ee749 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 0dde920c..0dde920c 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 d8f6c6c1..d8f6c6c1 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 122e4c65..122e4c65 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 1a437a24..1a437a24 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 70a264a6..70a264a6 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 80f28896..80f28896 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 ebaee52f..ebaee52f 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 29f61843..29f61843 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 2d0e84f4..2d0e84f4 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 522d213e..522d213e 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 34c14cb8..34c14cb8 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 5c7794cd..5c7794cd 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 c572e866..c572e866 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 93ca3cae..93ca3cae 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 95262df0..95262df0 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 8e167723..8e167723 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 322a3695..322a3695 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 f8da41cc..f8da41cc 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 b6eaa47c..b6eaa47c 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 c2e9b310..c2e9b310 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 ce22048e..ce22048e 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 9a87a8a6..9a87a8a6 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 d6a9f865..d6a9f865 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 9f4db9f9..9f4db9f9 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 19135700..19135700 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 3bcc864e..3bcc864e 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 fda952a0..fda952a0 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 5530f780..5530f780 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 554bb5db..554bb5db 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 28517d41..28517d41 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 a437457e..a437457e 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 e99d05e6..e99d05e6 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 9b5516fa..9b5516fa 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 31b6da7e..31b6da7e 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 4a607365..4a607365 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 6ba6fc52..6ba6fc52 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 b13c544b..b13c544b 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 81ee3555..81ee3555 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 e584527e..e584527e 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 771780a7..771780a7 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 c0d30fcd..c0d30fcd 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 6db3cc3e..6db3cc3e 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 33f50bfb..33f50bfb 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 b657f71c..b657f71c 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 34d7db13..34d7db13 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 55c12ffc..55c12ffc 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 2d6af343..2d6af343 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 78263e34..78263e34 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 9ac1d8e0..9ac1d8e0 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 3c0312d1..3c0312d1 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 9a8e56e8..9a8e56e8 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 2344f62d..2344f62d 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 69cf1bad..69cf1bad 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 6659adfc..6659adfc 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 030e5647..030e5647 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 0b114eff..0b114eff 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 527f022a..527f022a 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 f0238e12..f0238e12 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 7f0552c2..7f0552c2 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 81dfed80..81dfed80 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 bced4b43..bced4b43 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 d27186c2..d27186c2 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 17570b16..17570b16 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 834a1c97..834a1c97 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 2b289ede..2b289ede 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 1929f567..1929f567 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 b7b0abbd..b7b0abbd 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 a75cf79d..a75cf79d 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 c8260e7d..c8260e7d 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 7753c3bd..7753c3bd 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 a2c53ca3..a2c53ca3 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 af3eb7c8..af3eb7c8 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 c9c1f639..c9c1f639 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 a9574bce..a9574bce 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 2c284096..2c284096 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 3339872f..3339872f 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 d0b82cb6..d0b82cb6 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 d661fa94..d661fa94 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 85dcc73e..85dcc73e 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 79e0ed73..79e0ed73 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 aebfce67..aebfce67 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 38d5e57d..38d5e57d 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 060c13a6..060c13a6 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 948d89ae..948d89ae 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 23f37107..23f37107 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 03682199..03682199 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 b0cdf9a7..b0cdf9a7 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 0cdf2b74..0cdf2b74 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 c48ad4c6..c48ad4c6 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 1958b1ce..1958b1ce 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 ac049ac4..ac049ac4 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 bb0e1990..bb0e1990 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 9851a985..9851a985 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 54ec9eab..54ec9eab 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 046ebc0b..046ebc0b 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 df595b8c..df595b8c 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 4115fd7a..4115fd7a 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 37f7c147..37f7c147 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 2beb8188..2beb8188 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 14bb7160..14bb7160 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 aa7b6297..aa7b6297 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 091fe739..091fe739 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 355aee6d..355aee6d 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 60f0ae04..60f0ae04 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 84c9c30a..84c9c30a 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 6a245c78..6a245c78 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 d8620a4e..d8620a4e 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 9b1e15ac..9b1e15ac 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 e7ba32b3..e7ba32b3 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 dbe56475..dbe56475 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 50c0e6c6..50c0e6c6 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 5253d178..5253d178 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 46b26f01..46b26f01 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 6c187a9d..6c187a9d 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 d8f45a05..d8f45a05 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 952f53a0..952f53a0 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 159c7525..159c7525 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 100c33f4..100c33f4 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 26405aa5..26405aa5 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 575b0cd7..575b0cd7 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 c356605c..c356605c 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 bc360bc8..bc360bc8 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 e57559c9..e57559c9 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 4c692f73..4c692f73 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 d041042e..d041042e 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 d13e9607..d13e9607 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 8739ce26..8739ce26 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 0c004b1f..0c004b1f 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 a946e883..a946e883 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 c336a633..c336a633 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 be3c87d0..be3c87d0 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 238144bc..238144bc 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 307382c4..307382c4 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 34befe1d..34befe1d 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 fedbc122..fedbc122 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 24910f46..24910f46 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 d0db4bd3..d0db4bd3 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 b1a81d7e..b1a81d7e 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 69e4317a..69e4317a 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 dc937f1a..dc937f1a 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 1051395a..1051395a 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 7ec7f883..7ec7f883 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 d945188d..d945188d 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 40a9a5fb..40a9a5fb 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 be3607b3..be3607b3 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 9689c83b..9689c83b 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 5dfc5494..5dfc5494 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 e5a110c1..e5a110c1 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 0c1306ee..0c1306ee 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 bf3ca929..bf3ca929 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 2711aa89..2711aa89 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 4c06d861..4c06d861 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 889b4a56..889b4a56 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 818e7ff5..818e7ff5 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 e26cfc4a..e26cfc4a 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 6b90592d..6b90592d 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 f8df9a0f..f8df9a0f 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 828e813a..828e813a 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 d180b44a..d180b44a 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 7a7e753f..7a7e753f 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 d95ff0e9..d95ff0e9 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 98f0782f..98f0782f 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 5ffaf7da..5ffaf7da 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 58662b46..58662b46 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 5bd9e1c5..5bd9e1c5 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 c6355251..c6355251 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 8d5bf96b..8d5bf96b 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 e3684e5e..e3684e5e 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 361e003a..361e003a 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 ac5ac1ac..ac5ac1ac 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 9218ba8c..9218ba8c 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 0190aa5c..0190aa5c 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 717a872c..717a872c 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 53288890..53288890 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 1067ccb3..1067ccb3 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 af9bfc93..af9bfc93 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 7de34847..7de34847 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 f43abfaa..f43abfaa 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 9543366b..9543366b 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 873d410a..873d410a 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 1b66348e..1b66348e 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 86b69a62..86b69a62 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 ef76037f..ef76037f 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 334803e0..334803e0 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 dab6b1ac..dab6b1ac 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 1a1743ce..1a1743ce 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 699bf846..699bf846 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 250d37fd..250d37fd 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 2694300d..2694300d 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 f7363ca2..f7363ca2 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 20b79b26..20b79b26 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 939c11b5..939c11b5 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 9bd0bcb6..9bd0bcb6 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 fc537900..fc537900 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 e422d750..e422d750 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 bc1d997f..bc1d997f 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 0ba0d4b8..0ba0d4b8 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 9ab141b9..9ab141b9 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 69410ba8..69410ba8 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 18e95852..18e95852 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 11c3d031..11c3d031 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 9d13d562..9d13d562 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 2abe525c..2abe525c 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 8ec14fb9..8ec14fb9 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 c75e83a3..c75e83a3 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 f9a6be4f..f9a6be4f 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 bf539b28..bf539b28 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 d67ba30c..d67ba30c 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 81eebe7b..81eebe7b 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 ebbfd26e..ebbfd26e 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 fd23df31..fd23df31 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 8d156f51..8d156f51 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 de55594b..de55594b 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 46521a06..46521a06 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 31adbd15..31adbd15 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 78f09ec1..78f09ec1 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 c128a7b9..c128a7b9 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 fadc9d9f..fadc9d9f 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 0b5308aa..0b5308aa 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 5e917136..5e917136 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 981fdc31..981fdc31 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 c31068c8..c31068c8 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 92e7de20..92e7de20 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 88b839a0..88b839a0 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 85701718..85701718 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 5160c052..5160c052 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 b4d9b153..b4d9b153 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 f0bd2404..f0bd2404 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 28b0d42c..28b0d42c 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 f11ee09e..f11ee09e 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 c85075e9..c85075e9 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 8a0d25bc..8a0d25bc 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 0edc4dea..0edc4dea 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 52613993..52613993 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 8449cda1..8449cda1 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 b5ef9696..b5ef9696 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 6fe69d8c..6fe69d8c 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 4999c463..4999c463 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 882d8d43..882d8d43 100644
--- a/data/base_stats/zubat.asm
+++ b/data/pokemon/base_stats/zubat.asm
diff --git a/data/egg_move_pointers.asm b/data/pokemon/egg_move_pointers.asm
index 11665f23..11665f23 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 d48f3698..6145e560 100644
--- a/data/egg_moves.asm
+++ b/data/pokemon/egg_moves.asm
@@ -10,7 +10,7 @@ SECTION "Egg Moves", ROMX, BANK[EGG_MOVES]
 ; 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 0a0bba54..ab181be8 100644
--- a/data/evos_attacks.asm
+++ b/data/pokemon/evos_attacks.asm
@@ -4,7 +4,7 @@ INCLUDE "includes.asm"
 SECTION "Evolutions and Attacks", ROMX, BANK[EVOS_ATTACKS]
 
 
-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 4ce10b10..4ce10b10 100644
--- a/data/evos_attacks_pointers.asm
+++ b/data/pokemon/evos_attacks_pointers.asm
diff --git a/data/pokemon_names.asm b/data/pokemon/names.asm
index 06b1a6e5..06b1a6e5 100644
--- a/data/pokemon_names.asm
+++ b/data/pokemon/names.asm
diff --git a/engine/color.asm b/engine/color.asm
index 0f73ff99..b379cdc1 100755
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1499,13 +1499,13 @@ Pointers_b6ce:
 	db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark
 
 TilesetBGPalette: ; b75e
-INCLUDE "tilesets/bg.pal"
+INCLUDE "gfx/tilesets/bg.pal"
 
 MapObjectPals:: ; b8ae
-INCLUDE "tilesets/ob.pal"
+INCLUDE "gfx/tilesets/ob.pal"
 
 RoofPals: ; b9ae
-INCLUDE "tilesets/roof.pal"
+INCLUDE "gfx/tilesets/roof.pal"
 
 Palettes_ba86:
 	RGB 27, 31, 27
diff --git a/engine/events/haircut.asm b/engine/events/haircut.asm
new file mode 100755
index 00000000..2365e74f
--- /dev/null
+++ b/engine/events/haircut.asm
@@ -0,0 +1,81 @@
+BillsGrandfather:
+	callba Function50000
+	jr c, .asm_74e2
+	ld a, [wd004]
+	ld [wScriptVar], a
+	ld [wd151], a
+	call GetPokemonName
+	jp Function7542
+
+.asm_74e2
+	xor a
+	ld [wScriptVar], a
+	ret
+
+Function74e7:
+	ld hl, Data_752d
+	jr asm_74f4
+
+Function74ec:
+	ld hl, Data_7536
+	jr asm_74f4
+
+Function74f1:
+	ld hl, Data_753f
+asm_74f4
+	push hl
+	callba Function50000
+	pop hl
+	jr c, .asm_7522
+	ld a, [wCurPartySpecies]
+	cp EGG
+	jr z, .asm_7527
+	push hl
+	call GetCurNick
+	call Function7542
+	pop hl
+	call Random
+.asm_7510
+	sub [hl]
+	jr c, .asm_7518
+	inc hl
+	inc hl
+	inc hl
+	jr .asm_7510
+
+.asm_7518
+	inc hl
+	ld a, [hli]
+	ld [wScriptVar], a
+	ld c, [hl]
+	call ChangeHappiness
+	ret
+
+.asm_7522
+	xor a
+	ld [wScriptVar], a
+	ret
+
+.asm_7527
+	ld a, $1
+	ld [wScriptVar], a
+	ret
+
+Data_752d:
+	db $4c, $02, $09
+	db $80, $03, $0a
+	db $ff, $04, $0b
+
+Data_7536:
+	db $9a, $02, $0c
+	db $4c, $03, $0d
+	db $ff, $04, $0e
+
+Data_753f:
+	db $ff, $02, $12
+
+Function7542: ; 7542 (1:7542)
+	ld hl, wStringBuffer1
+	ld de, wStringBuffer3
+	ld bc, MON_NAME_LENGTH
+	jp CopyBytes
diff --git a/event/happiness_egg.asm b/engine/events/happiness_egg.asm
index 5a7a8ba3..5a7a8ba3 100755
--- a/event/happiness_egg.asm
+++ b/engine/events/happiness_egg.asm
diff --git a/event/overworld.asm b/engine/events/overworld.asm
index fc9a1102..fc9a1102 100755
--- a/event/overworld.asm
+++ b/engine/events/overworld.asm
diff --git a/event/special.asm b/engine/events/shuckle.asm
index 51b4377c..82d0427e 100755
--- a/event/special.asm
+++ b/engine/events/shuckle.asm
@@ -112,85 +112,3 @@ ReturnShuckle:
 	ld a, $4
 	ld [wScriptVar], a
 	ret
-
-BillsGrandfather:
-	callba Function50000
-	jr c, .asm_74e2
-	ld a, [wd004]
-	ld [wScriptVar], a
-	ld [wd151], a
-	call GetPokemonName
-	jp Function7542
-
-.asm_74e2
-	xor a
-	ld [wScriptVar], a
-	ret
-
-Function74e7:
-	ld hl, Data_752d
-	jr asm_74f4
-
-Function74ec:
-	ld hl, Data_7536
-	jr asm_74f4
-
-Function74f1:
-	ld hl, Data_753f
-asm_74f4
-	push hl
-	callba Function50000
-	pop hl
-	jr c, .asm_7522
-	ld a, [wCurPartySpecies]
-	cp EGG
-	jr z, .asm_7527
-	push hl
-	call GetCurNick
-	call Function7542
-	pop hl
-	call Random
-.asm_7510
-	sub [hl]
-	jr c, .asm_7518
-	inc hl
-	inc hl
-	inc hl
-	jr .asm_7510
-
-.asm_7518
-	inc hl
-	ld a, [hli]
-	ld [wScriptVar], a
-	ld c, [hl]
-	call ChangeHappiness
-	ret
-
-.asm_7522
-	xor a
-	ld [wScriptVar], a
-	ret
-
-.asm_7527
-	ld a, $1
-	ld [wScriptVar], a
-	ret
-
-Data_752d:
-	db $4c, $02, $09
-	db $80, $03, $0a
-	db $ff, $04, $0b
-
-Data_7536:
-	db $9a, $02, $0c
-	db $4c, $03, $0d
-	db $ff, $04, $0e
-
-Data_753f:
-	db $ff, $02, $12
-
-Function7542: ; 7542 (1:7542)
-	ld hl, wStringBuffer1
-	ld de, wStringBuffer3
-	ld bc, MON_NAME_LENGTH
-	jp CopyBytes
diff --git a/gfx.py b/gfx.py
index 04aecb5f..289319d1 100644
--- a/gfx.py
+++ b/gfx.py
@@ -28,7 +28,7 @@ base_stats = None
 def get_base_stats():
     global base_stats
     if not base_stats:
-        base_stats = recursive_read('data/base_stats.asm')
+        base_stats = recursive_read('data/pokemon/base_stats.asm')
     return base_stats
 
 def get_pokemon_dimensions(name):
diff --git a/tilesets/bg.pal b/gfx/tilesets/bg.pal
index 0b088472..0b088472 100644
--- a/tilesets/bg.pal
+++ b/gfx/tilesets/bg.pal
diff --git a/tilesets/house.pal b/gfx/tilesets/house.pal
index 2d6d5179..2d6d5179 100644
--- a/tilesets/house.pal
+++ b/gfx/tilesets/house.pal
diff --git a/tilesets/ice_path.pal b/gfx/tilesets/ice_path.pal
index f92281d7..f92281d7 100644
--- a/tilesets/ice_path.pal
+++ b/gfx/tilesets/ice_path.pal
diff --git a/tilesets/ob.pal b/gfx/tilesets/ob.pal
index f9fa6699..f9fa6699 100644
--- a/tilesets/ob.pal
+++ b/gfx/tilesets/ob.pal
diff --git a/tilesets/palette_maps.asm b/gfx/tilesets/palette_maps.asm
index 9b2346fc..9b2346fc 100755
--- a/tilesets/palette_maps.asm
+++ b/gfx/tilesets/palette_maps.asm
diff --git a/tilesets/radio_tower.pal b/gfx/tilesets/radio_tower.pal
index 5799b6f7..5799b6f7 100644
--- a/tilesets/radio_tower.pal
+++ b/gfx/tilesets/radio_tower.pal
diff --git a/tilesets/roof.pal b/gfx/tilesets/roof.pal
index cef531c0..cef531c0 100644
--- a/tilesets/roof.pal
+++ b/gfx/tilesets/roof.pal
diff --git a/home.asm b/home.asm
index cae40bd8..4a81dc4b 100644
--- a/home.asm
+++ b/home.asm
@@ -1,8 +1,8 @@
 INCLUDE "includes.asm"
 
 ; rst vectors
-INCLUDE "rst.asm"
-INCLUDE "interrupts.asm"
+INCLUDE "home/rst.asm"
+INCLUDE "home/interrupts.asm"
 
 SECTION "start", ROM0
 Start::
diff --git a/interrupts.asm b/home/interrupts.asm
index 2b0d9e0f..2b0d9e0f 100755
--- a/interrupts.asm
+++ b/home/interrupts.asm
diff --git a/rst.asm b/home/rst.asm
index 1c9b5f6e..1c9b5f6e 100644
--- a/rst.asm
+++ b/home/rst.asm
diff --git a/main.asm b/main.asm
index 235b72c2..3d802515 100644
--- a/main.asm
+++ b/main.asm
@@ -205,8 +205,9 @@ INCLUDE "engine/math.asm"
 ItemAttributes:
 INCLUDE "items/item_attributes.asm"
 INCLUDE "engine/overworld/npc_movement.asm"
-INCLUDE "event/happiness_egg.asm"
-INCLUDE "event/special.asm"
+INCLUDE "engine/events/happiness_egg.asm"
+INCLUDE "engine/events/shuckle.asm"
+INCLUDE "engine/events/haircut.asm"
 
 SECTION "bank2", ROMX, BANK[$2]
 SwapTextboxPalettes::
@@ -314,7 +315,7 @@ ScrollBGMapPalettes:: ; 804f (2:404f)
 	jr nz, .asm_8055
 	ret
 
-INCLUDE "tilesets/palette_maps.asm"
+INCLUDE "gfx/tilesets/palette_maps.asm"
 
 Unknown85d7:
 	rept 26 ; NUM_MAP_GROUPS
@@ -407,7 +408,7 @@ FlagPredef:
 	ret
 
 INCLUDE "engine/health.asm"
-INCLUDE "event/overworld.asm"
+INCLUDE "engine/events/overworld.asm"
 INCLUDE "engine/items.asm"
 INCLUDE "engine/overworld/player_step.asm"
 INCLUDE "engine/anim_hp_bar.asm"