264 files changed, 292 insertions, 255 deletions

diff --git a/data/items/names.asm b/data/items/names.asm
index e4cb9cd..1262553 100644
--- a/data/items/names.asm
+++ b/data/items/names.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "ItemNames", ROMX[$6FEC], BANK[$01]
+
 ItemNames::
 	db "マスターボール@"
 	db "ハイパーボール@"
diff --git a/data/moves/names.asm b/data/moves/names.asm
index f73cf98..bc6c21b 100644
--- a/data/moves/names.asm
+++ b/data/moves/names.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "MoveNames", ROMX[$52A1], BANK[$10]
+
 MoveNames::
 	db "はたく@"
 	db "からてチョップ@"
diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm
index c971bc7..454a7cd 100644
--- a/data/moves/tmhm_moves.asm
+++ b/data/moves/tmhm_moves.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "TM/HM Moves", ROMX[$52D1], BANK[$04]
+
 ; This is a nearly-sequential table of new moves.
 ; It was probably meant for easy testing, not as
 ; a final set of TM moves.
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index c959f3d..59715d5 100644
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Base Data", ROMX[$4F10], BANK[$14]
+
 tmhm: MACRO
 ; used in data/pokemon/base_stats/*.asm
 tms1 = 0 ; TM01-TM24 (24)
@@ -33,255 +37,255 @@ ENDM
 
 BaseData::
 MonBaseStats::
-INCLUDE "data/pokemon/base_stats/fushigidane.asm"
+INCLUDE "data/pokemon/base_stats/fushigidane.inc"
 MonBaseStatsEnd::
-INCLUDE "data/pokemon/base_stats/fushigisou.asm"
-INCLUDE "data/pokemon/base_stats/fushigibana.asm"
-INCLUDE "data/pokemon/base_stats/hitokage.asm"
-INCLUDE "data/pokemon/base_stats/lizardo.asm"
-INCLUDE "data/pokemon/base_stats/lizardon.asm"
-INCLUDE "data/pokemon/base_stats/zenigame.asm"
-INCLUDE "data/pokemon/base_stats/kameil.asm"
-INCLUDE "data/pokemon/base_stats/kamex.asm"
-INCLUDE "data/pokemon/base_stats/caterpie.asm"
-INCLUDE "data/pokemon/base_stats/transel.asm"
-INCLUDE "data/pokemon/base_stats/butterfree.asm"
-INCLUDE "data/pokemon/base_stats/beedle.asm"
-INCLUDE "data/pokemon/base_stats/cocoon.asm"
-INCLUDE "data/pokemon/base_stats/spear.asm"
-INCLUDE "data/pokemon/base_stats/poppo.asm"
-INCLUDE "data/pokemon/base_stats/pigeon.asm"
-INCLUDE "data/pokemon/base_stats/pigeot.asm"
-INCLUDE "data/pokemon/base_stats/koratta.asm"
-INCLUDE "data/pokemon/base_stats/ratta.asm"
-INCLUDE "data/pokemon/base_stats/onisuzume.asm"
-INCLUDE "data/pokemon/base_stats/onidrill.asm"
-INCLUDE "data/pokemon/base_stats/arbo.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/sand.asm"
-INCLUDE "data/pokemon/base_stats/sandpan.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/pippi.asm"
-INCLUDE "data/pokemon/base_stats/pixy.asm"
-INCLUDE "data/pokemon/base_stats/rokon.asm"
-INCLUDE "data/pokemon/base_stats/kyukon.asm"
-INCLUDE "data/pokemon/base_stats/purin.asm"
-INCLUDE "data/pokemon/base_stats/pukurin.asm"
-INCLUDE "data/pokemon/base_stats/zubat.asm"
-INCLUDE "data/pokemon/base_stats/golbat.asm"
-INCLUDE "data/pokemon/base_stats/nazonokusa.asm"
-INCLUDE "data/pokemon/base_stats/kusaihana.asm"
-INCLUDE "data/pokemon/base_stats/ruffresia.asm"
-INCLUDE "data/pokemon/base_stats/paras.asm"
-INCLUDE "data/pokemon/base_stats/parasect.asm"
-INCLUDE "data/pokemon/base_stats/kongpang.asm"
-INCLUDE "data/pokemon/base_stats/morphon.asm"
-INCLUDE "data/pokemon/base_stats/digda.asm"
-INCLUDE "data/pokemon/base_stats/dugtrio.asm"
-INCLUDE "data/pokemon/base_stats/nyarth.asm"
-INCLUDE "data/pokemon/base_stats/persian.asm"
-INCLUDE "data/pokemon/base_stats/koduck.asm"
-INCLUDE "data/pokemon/base_stats/golduck.asm"
-INCLUDE "data/pokemon/base_stats/mankey.asm"
-INCLUDE "data/pokemon/base_stats/okorizaru.asm"
-INCLUDE "data/pokemon/base_stats/gardie.asm"
-INCLUDE "data/pokemon/base_stats/windie.asm"
-INCLUDE "data/pokemon/base_stats/nyoromo.asm"
-INCLUDE "data/pokemon/base_stats/nyorozo.asm"
-INCLUDE "data/pokemon/base_stats/nyorobon.asm"
-INCLUDE "data/pokemon/base_stats/casey.asm"
-INCLUDE "data/pokemon/base_stats/yungerer.asm"
-INCLUDE "data/pokemon/base_stats/foodin.asm"
-INCLUDE "data/pokemon/base_stats/wanriky.asm"
-INCLUDE "data/pokemon/base_stats/goriky.asm"
-INCLUDE "data/pokemon/base_stats/kairiky.asm"
-INCLUDE "data/pokemon/base_stats/madatsubomi.asm"
-INCLUDE "data/pokemon/base_stats/utsudon.asm"
-INCLUDE "data/pokemon/base_stats/utsubot.asm"
-INCLUDE "data/pokemon/base_stats/menokurage.asm"
-INCLUDE "data/pokemon/base_stats/dokukurage.asm"
-INCLUDE "data/pokemon/base_stats/isitsubute.asm"
-INCLUDE "data/pokemon/base_stats/golone.asm"
-INCLUDE "data/pokemon/base_stats/golonya.asm"
-INCLUDE "data/pokemon/base_stats/ponyta.asm"
-INCLUDE "data/pokemon/base_stats/gallop.asm"
-INCLUDE "data/pokemon/base_stats/yadon.asm"
-INCLUDE "data/pokemon/base_stats/yadoran.asm"
-INCLUDE "data/pokemon/base_stats/coil.asm"
-INCLUDE "data/pokemon/base_stats/rarecoil.asm"
-INCLUDE "data/pokemon/base_stats/kamonegi.asm"
-INCLUDE "data/pokemon/base_stats/dodo.asm"
-INCLUDE "data/pokemon/base_stats/dodorio.asm"
-INCLUDE "data/pokemon/base_stats/pawou.asm"
-INCLUDE "data/pokemon/base_stats/jugon.asm"
-INCLUDE "data/pokemon/base_stats/betbeter.asm"
-INCLUDE "data/pokemon/base_stats/betbeton.asm"
-INCLUDE "data/pokemon/base_stats/shellder.asm"
-INCLUDE "data/pokemon/base_stats/parshen.asm"
-INCLUDE "data/pokemon/base_stats/ghos.asm"
-INCLUDE "data/pokemon/base_stats/ghost.asm"
-INCLUDE "data/pokemon/base_stats/gangar.asm"
-INCLUDE "data/pokemon/base_stats/iwark.asm"
-INCLUDE "data/pokemon/base_stats/sleepe.asm"
-INCLUDE "data/pokemon/base_stats/sleeper.asm"
-INCLUDE "data/pokemon/base_stats/crab.asm"
-INCLUDE "data/pokemon/base_stats/kingler.asm"
-INCLUDE "data/pokemon/base_stats/biriridama.asm"
-INCLUDE "data/pokemon/base_stats/marumine.asm"
-INCLUDE "data/pokemon/base_stats/tamatama.asm"
-INCLUDE "data/pokemon/base_stats/nassy.asm"
-INCLUDE "data/pokemon/base_stats/karakara.asm"
-INCLUDE "data/pokemon/base_stats/garagara.asm"
-INCLUDE "data/pokemon/base_stats/sawamular.asm"
-INCLUDE "data/pokemon/base_stats/ebiwalar.asm"
-INCLUDE "data/pokemon/base_stats/beroringa.asm"
-INCLUDE "data/pokemon/base_stats/dogars.asm"
-INCLUDE "data/pokemon/base_stats/matadogas.asm"
-INCLUDE "data/pokemon/base_stats/sihorn.asm"
-INCLUDE "data/pokemon/base_stats/sidon.asm"
-INCLUDE "data/pokemon/base_stats/lucky.asm"
-INCLUDE "data/pokemon/base_stats/monjara.asm"
-INCLUDE "data/pokemon/base_stats/garura.asm"
-INCLUDE "data/pokemon/base_stats/tattu.asm"
-INCLUDE "data/pokemon/base_stats/seadra.asm"
-INCLUDE "data/pokemon/base_stats/tosakinto.asm"
-INCLUDE "data/pokemon/base_stats/azumao.asm"
-INCLUDE "data/pokemon/base_stats/hitodeman.asm"
-INCLUDE "data/pokemon/base_stats/starmie.asm"
-INCLUDE "data/pokemon/base_stats/barrierd.asm"
-INCLUDE "data/pokemon/base_stats/strike.asm"
-INCLUDE "data/pokemon/base_stats/rougela.asm"
-INCLUDE "data/pokemon/base_stats/eleboo.asm"
-INCLUDE "data/pokemon/base_stats/boober.asm"
-INCLUDE "data/pokemon/base_stats/kailios.asm"
-INCLUDE "data/pokemon/base_stats/kentauros.asm"
-INCLUDE "data/pokemon/base_stats/koiking.asm"
-INCLUDE "data/pokemon/base_stats/gyarados.asm"
-INCLUDE "data/pokemon/base_stats/laplace.asm"
-INCLUDE "data/pokemon/base_stats/metamon.asm"
-INCLUDE "data/pokemon/base_stats/eievui.asm"
-INCLUDE "data/pokemon/base_stats/showers.asm"
-INCLUDE "data/pokemon/base_stats/thunders.asm"
-INCLUDE "data/pokemon/base_stats/booster.asm"
-INCLUDE "data/pokemon/base_stats/porygon.asm"
-INCLUDE "data/pokemon/base_stats/omnite.asm"
-INCLUDE "data/pokemon/base_stats/omstar.asm"
-INCLUDE "data/pokemon/base_stats/kabuto.asm"
-INCLUDE "data/pokemon/base_stats/kabutops.asm"
-INCLUDE "data/pokemon/base_stats/ptera.asm"
-INCLUDE "data/pokemon/base_stats/kabigon.asm"
-INCLUDE "data/pokemon/base_stats/freezer.asm"
-INCLUDE "data/pokemon/base_stats/thunder.asm"
-INCLUDE "data/pokemon/base_stats/fire.asm"
-INCLUDE "data/pokemon/base_stats/miniryu.asm"
-INCLUDE "data/pokemon/base_stats/hakuryu.asm"
-INCLUDE "data/pokemon/base_stats/kairyu.asm"
-INCLUDE "data/pokemon/base_stats/mewtwo.asm"
-INCLUDE "data/pokemon/base_stats/mew.asm"
-INCLUDE "data/pokemon/base_stats/happa.asm"
-INCLUDE "data/pokemon/base_stats/hanamogura.asm"
-INCLUDE "data/pokemon/base_stats/hanaryu.asm"
-INCLUDE "data/pokemon/base_stats/honoguma.asm"
-INCLUDE "data/pokemon/base_stats/volbear.asm"
-INCLUDE "data/pokemon/base_stats/dynabear.asm"
-INCLUDE "data/pokemon/base_stats/kurusu.asm"
-INCLUDE "data/pokemon/base_stats/aqua.asm"
-INCLUDE "data/pokemon/base_stats/aquaria.asm"
-INCLUDE "data/pokemon/base_stats/hoho.asm"
-INCLUDE "data/pokemon/base_stats/bobo.asm"
-INCLUDE "data/pokemon/base_stats/pachimee.asm"
-INCLUDE "data/pokemon/base_stats/mokoko.asm"
-INCLUDE "data/pokemon/base_stats/denryu.asm"
-INCLUDE "data/pokemon/base_stats/mikon.asm"
-INCLUDE "data/pokemon/base_stats/monja.asm"
-INCLUDE "data/pokemon/base_stats/jaranra.asm"
-INCLUDE "data/pokemon/base_stats/haneei.asm"
-INCLUDE "data/pokemon/base_stats/puku.asm"
-INCLUDE "data/pokemon/base_stats/shibirefugu.asm"
-INCLUDE "data/pokemon/base_stats/pichu.asm"
-INCLUDE "data/pokemon/base_stats/py.asm"
-INCLUDE "data/pokemon/base_stats/pupurin.asm"
-INCLUDE "data/pokemon/base_stats/mizuuo.asm"
-INCLUDE "data/pokemon/base_stats/naty.asm"
-INCLUDE "data/pokemon/base_stats/natio.asm"
-INCLUDE "data/pokemon/base_stats/gyopin.asm"
-INCLUDE "data/pokemon/base_stats/maril.asm"
-INCLUDE "data/pokemon/base_stats/manbo1.asm"
-INCLUDE "data/pokemon/base_stats/ikari.asm"
-INCLUDE "data/pokemon/base_stats/grotess.asm"
-INCLUDE "data/pokemon/base_stats/eksing.asm"
-INCLUDE "data/pokemon/base_stats/para.asm"
-INCLUDE "data/pokemon/base_stats/kokumo.asm"
-INCLUDE "data/pokemon/base_stats/twohead.asm"
-INCLUDE "data/pokemon/base_stats/yoroidori.asm"
-INCLUDE "data/pokemon/base_stats/animon.asm"
-INCLUDE "data/pokemon/base_stats/hinazu.asm"
-INCLUDE "data/pokemon/base_stats/sunny.asm"
-INCLUDE "data/pokemon/base_stats/paon.asm"
-INCLUDE "data/pokemon/base_stats/donphan.asm"
-INCLUDE "data/pokemon/base_stats/twinz.asm"
-INCLUDE "data/pokemon/base_stats/kirinriki.asm"
-INCLUDE "data/pokemon/base_stats/painter.asm"
-INCLUDE "data/pokemon/base_stats/kounya.asm"
-INCLUDE "data/pokemon/base_stats/rinrin.asm"
-INCLUDE "data/pokemon/base_stats/berurun.asm"
-INCLUDE "data/pokemon/base_stats/nyorotono.asm"
-INCLUDE "data/pokemon/base_stats/yadoking.asm"
-INCLUDE "data/pokemon/base_stats/annon.asm"
-INCLUDE "data/pokemon/base_stats/rediba.asm"
-INCLUDE "data/pokemon/base_stats/mitsuboshi.asm"
-INCLUDE "data/pokemon/base_stats/puchicorn.asm"
-INCLUDE "data/pokemon/base_stats/eifie.asm"
-INCLUDE "data/pokemon/base_stats/blacky.asm"
-INCLUDE "data/pokemon/base_stats/turban.asm"
-INCLUDE "data/pokemon/base_stats/betbaby.asm"
-INCLUDE "data/pokemon/base_stats/teppouo.asm"
-INCLUDE "data/pokemon/base_stats/okutank.asm"
-INCLUDE "data/pokemon/base_stats/gongu.asm"
-INCLUDE "data/pokemon/base_stats/kapoerer.asm"
-INCLUDE "data/pokemon/base_stats/pudie.asm"
-INCLUDE "data/pokemon/base_stats/haneko.asm"
-INCLUDE "data/pokemon/base_stats/poponeko.asm"
-INCLUDE "data/pokemon/base_stats/wataneko.asm"
-INCLUDE "data/pokemon/base_stats/baririna.asm"
-INCLUDE "data/pokemon/base_stats/lip.asm"
-INCLUDE "data/pokemon/base_stats/elebaby.asm"
-INCLUDE "data/pokemon/base_stats/booby.asm"
-INCLUDE "data/pokemon/base_stats/kireihana.asm"
-INCLUDE "data/pokemon/base_stats/tsubomitto.asm"
-INCLUDE "data/pokemon/base_stats/miltank.asm"
-INCLUDE "data/pokemon/base_stats/bombseeker.asm"
-INCLUDE "data/pokemon/base_stats/gift.asm"
-INCLUDE "data/pokemon/base_stats/kotora.asm"
-INCLUDE "data/pokemon/base_stats/raitora.asm"
-INCLUDE "data/pokemon/base_stats/madame.asm"
-INCLUDE "data/pokemon/base_stats/norowara.asm"
-INCLUDE "data/pokemon/base_stats/kyonpan.asm"
-INCLUDE "data/pokemon/base_stats/yamikarasu.asm"
-INCLUDE "data/pokemon/base_stats/happi.asm"
-INCLUDE "data/pokemon/base_stats/scissors.asm"
-INCLUDE "data/pokemon/base_stats/purakkusu.asm"
-INCLUDE "data/pokemon/base_stats/devil.asm"
-INCLUDE "data/pokemon/base_stats/helgaa.asm"
-INCLUDE "data/pokemon/base_stats/wolfman.asm"
-INCLUDE "data/pokemon/base_stats/warwolf.asm"
-INCLUDE "data/pokemon/base_stats/porygon2.asm"
-INCLUDE "data/pokemon/base_stats/nameil.asm"
-INCLUDE "data/pokemon/base_stats/haganeil.asm"
-INCLUDE "data/pokemon/base_stats/kingdra.asm"
-INCLUDE "data/pokemon/base_stats/rai.asm"
-INCLUDE "data/pokemon/base_stats/en.asm"
-INCLUDE "data/pokemon/base_stats/sui.asm"
-INCLUDE "data/pokemon/base_stats/nyula.asm"
-INCLUDE "data/pokemon/base_stats/houou.asm"
-INCLUDE "data/pokemon/base_stats/togepy.asm"
-INCLUDE "data/pokemon/base_stats/bulu.asm"
-INCLUDE "data/pokemon/base_stats/tail.asm"
-INCLUDE "data/pokemon/base_stats/leafy.asm"
+INCLUDE "data/pokemon/base_stats/fushigisou.inc"
+INCLUDE "data/pokemon/base_stats/fushigibana.inc"
+INCLUDE "data/pokemon/base_stats/hitokage.inc"
+INCLUDE "data/pokemon/base_stats/lizardo.inc"
+INCLUDE "data/pokemon/base_stats/lizardon.inc"
+INCLUDE "data/pokemon/base_stats/zenigame.inc"
+INCLUDE "data/pokemon/base_stats/kameil.inc"
+INCLUDE "data/pokemon/base_stats/kamex.inc"
+INCLUDE "data/pokemon/base_stats/caterpie.inc"
+INCLUDE "data/pokemon/base_stats/transel.inc"
+INCLUDE "data/pokemon/base_stats/butterfree.inc"
+INCLUDE "data/pokemon/base_stats/beedle.inc"
+INCLUDE "data/pokemon/base_stats/cocoon.inc"
+INCLUDE "data/pokemon/base_stats/spear.inc"
+INCLUDE "data/pokemon/base_stats/poppo.inc"
+INCLUDE "data/pokemon/base_stats/pigeon.inc"
+INCLUDE "data/pokemon/base_stats/pigeot.inc"
+INCLUDE "data/pokemon/base_stats/koratta.inc"
+INCLUDE "data/pokemon/base_stats/ratta.inc"
+INCLUDE "data/pokemon/base_stats/onisuzume.inc"
+INCLUDE "data/pokemon/base_stats/onidrill.inc"
+INCLUDE "data/pokemon/base_stats/arbo.inc"
+INCLUDE "data/pokemon/base_stats/arbok.inc"
+INCLUDE "data/pokemon/base_stats/pikachu.inc"
+INCLUDE "data/pokemon/base_stats/raichu.inc"
+INCLUDE "data/pokemon/base_stats/sand.inc"
+INCLUDE "data/pokemon/base_stats/sandpan.inc"
+INCLUDE "data/pokemon/base_stats/nidoran_f.inc"
+INCLUDE "data/pokemon/base_stats/nidorina.inc"
+INCLUDE "data/pokemon/base_stats/nidoqueen.inc"
+INCLUDE "data/pokemon/base_stats/nidoran_m.inc"
+INCLUDE "data/pokemon/base_stats/nidorino.inc"
+INCLUDE "data/pokemon/base_stats/nidoking.inc"
+INCLUDE "data/pokemon/base_stats/pippi.inc"
+INCLUDE "data/pokemon/base_stats/pixy.inc"
+INCLUDE "data/pokemon/base_stats/rokon.inc"
+INCLUDE "data/pokemon/base_stats/kyukon.inc"
+INCLUDE "data/pokemon/base_stats/purin.inc"
+INCLUDE "data/pokemon/base_stats/pukurin.inc"
+INCLUDE "data/pokemon/base_stats/zubat.inc"
+INCLUDE "data/pokemon/base_stats/golbat.inc"
+INCLUDE "data/pokemon/base_stats/nazonokusa.inc"
+INCLUDE "data/pokemon/base_stats/kusaihana.inc"
+INCLUDE "data/pokemon/base_stats/ruffresia.inc"
+INCLUDE "data/pokemon/base_stats/paras.inc"
+INCLUDE "data/pokemon/base_stats/parasect.inc"
+INCLUDE "data/pokemon/base_stats/kongpang.inc"
+INCLUDE "data/pokemon/base_stats/morphon.inc"
+INCLUDE "data/pokemon/base_stats/digda.inc"
+INCLUDE "data/pokemon/base_stats/dugtrio.inc"
+INCLUDE "data/pokemon/base_stats/nyarth.inc"
+INCLUDE "data/pokemon/base_stats/persian.inc"
+INCLUDE "data/pokemon/base_stats/koduck.inc"
+INCLUDE "data/pokemon/base_stats/golduck.inc"
+INCLUDE "data/pokemon/base_stats/mankey.inc"
+INCLUDE "data/pokemon/base_stats/okorizaru.inc"
+INCLUDE "data/pokemon/base_stats/gardie.inc"
+INCLUDE "data/pokemon/base_stats/windie.inc"
+INCLUDE "data/pokemon/base_stats/nyoromo.inc"
+INCLUDE "data/pokemon/base_stats/nyorozo.inc"
+INCLUDE "data/pokemon/base_stats/nyorobon.inc"
+INCLUDE "data/pokemon/base_stats/casey.inc"
+INCLUDE "data/pokemon/base_stats/yungerer.inc"
+INCLUDE "data/pokemon/base_stats/foodin.inc"
+INCLUDE "data/pokemon/base_stats/wanriky.inc"
+INCLUDE "data/pokemon/base_stats/goriky.inc"
+INCLUDE "data/pokemon/base_stats/kairiky.inc"
+INCLUDE "data/pokemon/base_stats/madatsubomi.inc"
+INCLUDE "data/pokemon/base_stats/utsudon.inc"
+INCLUDE "data/pokemon/base_stats/utsubot.inc"
+INCLUDE "data/pokemon/base_stats/menokurage.inc"
+INCLUDE "data/pokemon/base_stats/dokukurage.inc"
+INCLUDE "data/pokemon/base_stats/isitsubute.inc"
+INCLUDE "data/pokemon/base_stats/golone.inc"
+INCLUDE "data/pokemon/base_stats/golonya.inc"
+INCLUDE "data/pokemon/base_stats/ponyta.inc"
+INCLUDE "data/pokemon/base_stats/gallop.inc"
+INCLUDE "data/pokemon/base_stats/yadon.inc"
+INCLUDE "data/pokemon/base_stats/yadoran.inc"
+INCLUDE "data/pokemon/base_stats/coil.inc"
+INCLUDE "data/pokemon/base_stats/rarecoil.inc"
+INCLUDE "data/pokemon/base_stats/kamonegi.inc"
+INCLUDE "data/pokemon/base_stats/dodo.inc"
+INCLUDE "data/pokemon/base_stats/dodorio.inc"
+INCLUDE "data/pokemon/base_stats/pawou.inc"
+INCLUDE "data/pokemon/base_stats/jugon.inc"
+INCLUDE "data/pokemon/base_stats/betbeter.inc"
+INCLUDE "data/pokemon/base_stats/betbeton.inc"
+INCLUDE "data/pokemon/base_stats/shellder.inc"
+INCLUDE "data/pokemon/base_stats/parshen.inc"
+INCLUDE "data/pokemon/base_stats/ghos.inc"
+INCLUDE "data/pokemon/base_stats/ghost.inc"
+INCLUDE "data/pokemon/base_stats/gangar.inc"
+INCLUDE "data/pokemon/base_stats/iwark.inc"
+INCLUDE "data/pokemon/base_stats/sleepe.inc"
+INCLUDE "data/pokemon/base_stats/sleeper.inc"
+INCLUDE "data/pokemon/base_stats/crab.inc"
+INCLUDE "data/pokemon/base_stats/kingler.inc"
+INCLUDE "data/pokemon/base_stats/biriridama.inc"
+INCLUDE "data/pokemon/base_stats/marumine.inc"
+INCLUDE "data/pokemon/base_stats/tamatama.inc"
+INCLUDE "data/pokemon/base_stats/nassy.inc"
+INCLUDE "data/pokemon/base_stats/karakara.inc"
+INCLUDE "data/pokemon/base_stats/garagara.inc"
+INCLUDE "data/pokemon/base_stats/sawamular.inc"
+INCLUDE "data/pokemon/base_stats/ebiwalar.inc"
+INCLUDE "data/pokemon/base_stats/beroringa.inc"
+INCLUDE "data/pokemon/base_stats/dogars.inc"
+INCLUDE "data/pokemon/base_stats/matadogas.inc"
+INCLUDE "data/pokemon/base_stats/sihorn.inc"
+INCLUDE "data/pokemon/base_stats/sidon.inc"
+INCLUDE "data/pokemon/base_stats/lucky.inc"
+INCLUDE "data/pokemon/base_stats/monjara.inc"
+INCLUDE "data/pokemon/base_stats/garura.inc"
+INCLUDE "data/pokemon/base_stats/tattu.inc"
+INCLUDE "data/pokemon/base_stats/seadra.inc"
+INCLUDE "data/pokemon/base_stats/tosakinto.inc"
+INCLUDE "data/pokemon/base_stats/azumao.inc"
+INCLUDE "data/pokemon/base_stats/hitodeman.inc"
+INCLUDE "data/pokemon/base_stats/starmie.inc"
+INCLUDE "data/pokemon/base_stats/barrierd.inc"
+INCLUDE "data/pokemon/base_stats/strike.inc"
+INCLUDE "data/pokemon/base_stats/rougela.inc"
+INCLUDE "data/pokemon/base_stats/eleboo.inc"
+INCLUDE "data/pokemon/base_stats/boober.inc"
+INCLUDE "data/pokemon/base_stats/kailios.inc"
+INCLUDE "data/pokemon/base_stats/kentauros.inc"
+INCLUDE "data/pokemon/base_stats/koiking.inc"
+INCLUDE "data/pokemon/base_stats/gyarados.inc"
+INCLUDE "data/pokemon/base_stats/laplace.inc"
+INCLUDE "data/pokemon/base_stats/metamon.inc"
+INCLUDE "data/pokemon/base_stats/eievui.inc"
+INCLUDE "data/pokemon/base_stats/showers.inc"
+INCLUDE "data/pokemon/base_stats/thunders.inc"
+INCLUDE "data/pokemon/base_stats/booster.inc"
+INCLUDE "data/pokemon/base_stats/porygon.inc"
+INCLUDE "data/pokemon/base_stats/omnite.inc"
+INCLUDE "data/pokemon/base_stats/omstar.inc"
+INCLUDE "data/pokemon/base_stats/kabuto.inc"
+INCLUDE "data/pokemon/base_stats/kabutops.inc"
+INCLUDE "data/pokemon/base_stats/ptera.inc"
+INCLUDE "data/pokemon/base_stats/kabigon.inc"
+INCLUDE "data/pokemon/base_stats/freezer.inc"
+INCLUDE "data/pokemon/base_stats/thunder.inc"
+INCLUDE "data/pokemon/base_stats/fire.inc"
+INCLUDE "data/pokemon/base_stats/miniryu.inc"
+INCLUDE "data/pokemon/base_stats/hakuryu.inc"
+INCLUDE "data/pokemon/base_stats/kairyu.inc"
+INCLUDE "data/pokemon/base_stats/mewtwo.inc"
+INCLUDE "data/pokemon/base_stats/mew.inc"
+INCLUDE "data/pokemon/base_stats/happa.inc"
+INCLUDE "data/pokemon/base_stats/hanamogura.inc"
+INCLUDE "data/pokemon/base_stats/hanaryu.inc"
+INCLUDE "data/pokemon/base_stats/honoguma.inc"
+INCLUDE "data/pokemon/base_stats/volbear.inc"
+INCLUDE "data/pokemon/base_stats/dynabear.inc"
+INCLUDE "data/pokemon/base_stats/kurusu.inc"
+INCLUDE "data/pokemon/base_stats/aqua.inc"
+INCLUDE "data/pokemon/base_stats/aquaria.inc"
+INCLUDE "data/pokemon/base_stats/hoho.inc"
+INCLUDE "data/pokemon/base_stats/bobo.inc"
+INCLUDE "data/pokemon/base_stats/pachimee.inc"
+INCLUDE "data/pokemon/base_stats/mokoko.inc"
+INCLUDE "data/pokemon/base_stats/denryu.inc"
+INCLUDE "data/pokemon/base_stats/mikon.inc"
+INCLUDE "data/pokemon/base_stats/monja.inc"
+INCLUDE "data/pokemon/base_stats/jaranra.inc"
+INCLUDE "data/pokemon/base_stats/haneei.inc"
+INCLUDE "data/pokemon/base_stats/puku.inc"
+INCLUDE "data/pokemon/base_stats/shibirefugu.inc"
+INCLUDE "data/pokemon/base_stats/pichu.inc"
+INCLUDE "data/pokemon/base_stats/py.inc"
+INCLUDE "data/pokemon/base_stats/pupurin.inc"
+INCLUDE "data/pokemon/base_stats/mizuuo.inc"
+INCLUDE "data/pokemon/base_stats/naty.inc"
+INCLUDE "data/pokemon/base_stats/natio.inc"
+INCLUDE "data/pokemon/base_stats/gyopin.inc"
+INCLUDE "data/pokemon/base_stats/maril.inc"
+INCLUDE "data/pokemon/base_stats/manbo1.inc"
+INCLUDE "data/pokemon/base_stats/ikari.inc"
+INCLUDE "data/pokemon/base_stats/grotess.inc"
+INCLUDE "data/pokemon/base_stats/eksing.inc"
+INCLUDE "data/pokemon/base_stats/para.inc"
+INCLUDE "data/pokemon/base_stats/kokumo.inc"
+INCLUDE "data/pokemon/base_stats/twohead.inc"
+INCLUDE "data/pokemon/base_stats/yoroidori.inc"
+INCLUDE "data/pokemon/base_stats/animon.inc"
+INCLUDE "data/pokemon/base_stats/hinazu.inc"
+INCLUDE "data/pokemon/base_stats/sunny.inc"
+INCLUDE "data/pokemon/base_stats/paon.inc"
+INCLUDE "data/pokemon/base_stats/donphan.inc"
+INCLUDE "data/pokemon/base_stats/twinz.inc"
+INCLUDE "data/pokemon/base_stats/kirinriki.inc"
+INCLUDE "data/pokemon/base_stats/painter.inc"
+INCLUDE "data/pokemon/base_stats/kounya.inc"
+INCLUDE "data/pokemon/base_stats/rinrin.inc"
+INCLUDE "data/pokemon/base_stats/berurun.inc"
+INCLUDE "data/pokemon/base_stats/nyorotono.inc"
+INCLUDE "data/pokemon/base_stats/yadoking.inc"
+INCLUDE "data/pokemon/base_stats/annon.inc"
+INCLUDE "data/pokemon/base_stats/rediba.inc"
+INCLUDE "data/pokemon/base_stats/mitsuboshi.inc"
+INCLUDE "data/pokemon/base_stats/puchicorn.inc"
+INCLUDE "data/pokemon/base_stats/eifie.inc"
+INCLUDE "data/pokemon/base_stats/blacky.inc"
+INCLUDE "data/pokemon/base_stats/turban.inc"
+INCLUDE "data/pokemon/base_stats/betbaby.inc"
+INCLUDE "data/pokemon/base_stats/teppouo.inc"
+INCLUDE "data/pokemon/base_stats/okutank.inc"
+INCLUDE "data/pokemon/base_stats/gongu.inc"
+INCLUDE "data/pokemon/base_stats/kapoerer.inc"
+INCLUDE "data/pokemon/base_stats/pudie.inc"
+INCLUDE "data/pokemon/base_stats/haneko.inc"
+INCLUDE "data/pokemon/base_stats/poponeko.inc"
+INCLUDE "data/pokemon/base_stats/wataneko.inc"
+INCLUDE "data/pokemon/base_stats/baririna.inc"
+INCLUDE "data/pokemon/base_stats/lip.inc"
+INCLUDE "data/pokemon/base_stats/elebaby.inc"
+INCLUDE "data/pokemon/base_stats/booby.inc"
+INCLUDE "data/pokemon/base_stats/kireihana.inc"
+INCLUDE "data/pokemon/base_stats/tsubomitto.inc"
+INCLUDE "data/pokemon/base_stats/miltank.inc"
+INCLUDE "data/pokemon/base_stats/bombseeker.inc"
+INCLUDE "data/pokemon/base_stats/gift.inc"
+INCLUDE "data/pokemon/base_stats/kotora.inc"
+INCLUDE "data/pokemon/base_stats/raitora.inc"
+INCLUDE "data/pokemon/base_stats/madame.inc"
+INCLUDE "data/pokemon/base_stats/norowara.inc"
+INCLUDE "data/pokemon/base_stats/kyonpan.inc"
+INCLUDE "data/pokemon/base_stats/yamikarasu.inc"
+INCLUDE "data/pokemon/base_stats/happi.inc"
+INCLUDE "data/pokemon/base_stats/scissors.inc"
+INCLUDE "data/pokemon/base_stats/purakkusu.inc"
+INCLUDE "data/pokemon/base_stats/devil.inc"
+INCLUDE "data/pokemon/base_stats/helgaa.inc"
+INCLUDE "data/pokemon/base_stats/wolfman.inc"
+INCLUDE "data/pokemon/base_stats/warwolf.inc"
+INCLUDE "data/pokemon/base_stats/porygon2.inc"
+INCLUDE "data/pokemon/base_stats/nameil.inc"
+INCLUDE "data/pokemon/base_stats/haganeil.inc"
+INCLUDE "data/pokemon/base_stats/kingdra.inc"
+INCLUDE "data/pokemon/base_stats/rai.inc"
+INCLUDE "data/pokemon/base_stats/en.inc"
+INCLUDE "data/pokemon/base_stats/sui.inc"
+INCLUDE "data/pokemon/base_stats/nyula.inc"
+INCLUDE "data/pokemon/base_stats/houou.inc"
+INCLUDE "data/pokemon/base_stats/togepy.inc"
+INCLUDE "data/pokemon/base_stats/bulu.inc"
+INCLUDE "data/pokemon/base_stats/tail.inc"
+INCLUDE "data/pokemon/base_stats/leafy.inc"
diff --git a/data/pokemon/base_stats/animon.asm b/data/pokemon/base_stats/animon.inc
index bb9853c..bb9853c 100644
--- a/data/pokemon/base_stats/animon.asm
+++ b/data/pokemon/base_stats/animon.inc
diff --git a/data/pokemon/base_stats/annon.asm b/data/pokemon/base_stats/annon.inc
index 432308f..432308f 100644
--- a/data/pokemon/base_stats/annon.asm
+++ b/data/pokemon/base_stats/annon.inc
diff --git a/data/pokemon/base_stats/aqua.asm b/data/pokemon/base_stats/aqua.inc
index 8f18369..8f18369 100644
--- a/data/pokemon/base_stats/aqua.asm
+++ b/data/pokemon/base_stats/aqua.inc
diff --git a/data/pokemon/base_stats/aquaria.asm b/data/pokemon/base_stats/aquaria.inc
index df7f885..df7f885 100644
--- a/data/pokemon/base_stats/aquaria.asm
+++ b/data/pokemon/base_stats/aquaria.inc
diff --git a/data/pokemon/base_stats/arbo.asm b/data/pokemon/base_stats/arbo.inc
index 00f967a..00f967a 100644
--- a/data/pokemon/base_stats/arbo.asm
+++ b/data/pokemon/base_stats/arbo.inc
diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.inc
index 5768bc1..5768bc1 100644
--- a/data/pokemon/base_stats/arbok.asm
+++ b/data/pokemon/base_stats/arbok.inc
diff --git a/data/pokemon/base_stats/azumao.asm b/data/pokemon/base_stats/azumao.inc
index 510743c..510743c 100644
--- a/data/pokemon/base_stats/azumao.asm
+++ b/data/pokemon/base_stats/azumao.inc
diff --git a/data/pokemon/base_stats/baririna.asm b/data/pokemon/base_stats/baririna.inc
index 062dbf6..062dbf6 100644
--- a/data/pokemon/base_stats/baririna.asm
+++ b/data/pokemon/base_stats/baririna.inc
diff --git a/data/pokemon/base_stats/barrierd.asm b/data/pokemon/base_stats/barrierd.inc
index e6a3645..e6a3645 100644
--- a/data/pokemon/base_stats/barrierd.asm
+++ b/data/pokemon/base_stats/barrierd.inc
diff --git a/data/pokemon/base_stats/beedle.asm b/data/pokemon/base_stats/beedle.inc
index 2efbce0..2efbce0 100644
--- a/data/pokemon/base_stats/beedle.asm
+++ b/data/pokemon/base_stats/beedle.inc
diff --git a/data/pokemon/base_stats/beroringa.asm b/data/pokemon/base_stats/beroringa.inc
index cbabe5c..cbabe5c 100644
--- a/data/pokemon/base_stats/beroringa.asm
+++ b/data/pokemon/base_stats/beroringa.inc
diff --git a/data/pokemon/base_stats/berurun.asm b/data/pokemon/base_stats/berurun.inc
index 58356b4..58356b4 100644
--- a/data/pokemon/base_stats/berurun.asm
+++ b/data/pokemon/base_stats/berurun.inc
diff --git a/data/pokemon/base_stats/betbaby.asm b/data/pokemon/base_stats/betbaby.inc
index fd899aa..fd899aa 100644
--- a/data/pokemon/base_stats/betbaby.asm
+++ b/data/pokemon/base_stats/betbaby.inc
diff --git a/data/pokemon/base_stats/betbeter.asm b/data/pokemon/base_stats/betbeter.inc
index 1813923..1813923 100644
--- a/data/pokemon/base_stats/betbeter.asm
+++ b/data/pokemon/base_stats/betbeter.inc
diff --git a/data/pokemon/base_stats/betbeton.asm b/data/pokemon/base_stats/betbeton.inc
index c269960..c269960 100644
--- a/data/pokemon/base_stats/betbeton.asm
+++ b/data/pokemon/base_stats/betbeton.inc
diff --git a/data/pokemon/base_stats/biriridama.asm b/data/pokemon/base_stats/biriridama.inc
index 1f4f5d5..1f4f5d5 100644
--- a/data/pokemon/base_stats/biriridama.asm
+++ b/data/pokemon/base_stats/biriridama.inc
diff --git a/data/pokemon/base_stats/blacky.asm b/data/pokemon/base_stats/blacky.inc
index 46d633b..46d633b 100644
--- a/data/pokemon/base_stats/blacky.asm
+++ b/data/pokemon/base_stats/blacky.inc
diff --git a/data/pokemon/base_stats/bobo.asm b/data/pokemon/base_stats/bobo.inc
index ff0fc23..ff0fc23 100644
--- a/data/pokemon/base_stats/bobo.asm
+++ b/data/pokemon/base_stats/bobo.inc
diff --git a/data/pokemon/base_stats/bombseeker.asm b/data/pokemon/base_stats/bombseeker.inc
index 6c8edfa..6c8edfa 100644
--- a/data/pokemon/base_stats/bombseeker.asm
+++ b/data/pokemon/base_stats/bombseeker.inc
diff --git a/data/pokemon/base_stats/boober.asm b/data/pokemon/base_stats/boober.inc
index 760b634..760b634 100644
--- a/data/pokemon/base_stats/boober.asm
+++ b/data/pokemon/base_stats/boober.inc
diff --git a/data/pokemon/base_stats/booby.asm b/data/pokemon/base_stats/booby.inc
index a0fff88..a0fff88 100644
--- a/data/pokemon/base_stats/booby.asm
+++ b/data/pokemon/base_stats/booby.inc
diff --git a/data/pokemon/base_stats/booster.asm b/data/pokemon/base_stats/booster.inc
index 697ddf4..697ddf4 100644
--- a/data/pokemon/base_stats/booster.asm
+++ b/data/pokemon/base_stats/booster.inc
diff --git a/data/pokemon/base_stats/bulu.asm b/data/pokemon/base_stats/bulu.inc
index da0d7bd..da0d7bd 100644
--- a/data/pokemon/base_stats/bulu.asm
+++ b/data/pokemon/base_stats/bulu.inc
diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.inc
index 158d3ba..158d3ba 100644
--- a/data/pokemon/base_stats/butterfree.asm
+++ b/data/pokemon/base_stats/butterfree.inc
diff --git a/data/pokemon/base_stats/casey.asm b/data/pokemon/base_stats/casey.inc
index f3693c1..f3693c1 100644
--- a/data/pokemon/base_stats/casey.asm
+++ b/data/pokemon/base_stats/casey.inc
diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.inc
index eb0ad5f..eb0ad5f 100644
--- a/data/pokemon/base_stats/caterpie.asm
+++ b/data/pokemon/base_stats/caterpie.inc
diff --git a/data/pokemon/base_stats/cocoon.asm b/data/pokemon/base_stats/cocoon.inc
index c7bddb8..c7bddb8 100644
--- a/data/pokemon/base_stats/cocoon.asm
+++ b/data/pokemon/base_stats/cocoon.inc
diff --git a/data/pokemon/base_stats/coil.asm b/data/pokemon/base_stats/coil.inc
index 115397d..115397d 100644
--- a/data/pokemon/base_stats/coil.asm
+++ b/data/pokemon/base_stats/coil.inc
diff --git a/data/pokemon/base_stats/crab.asm b/data/pokemon/base_stats/crab.inc
index a41d27e..a41d27e 100644
--- a/data/pokemon/base_stats/crab.asm
+++ b/data/pokemon/base_stats/crab.inc
diff --git a/data/pokemon/base_stats/denryu.asm b/data/pokemon/base_stats/denryu.inc
index 38f176f..38f176f 100644
--- a/data/pokemon/base_stats/denryu.asm
+++ b/data/pokemon/base_stats/denryu.inc
diff --git a/data/pokemon/base_stats/devil.asm b/data/pokemon/base_stats/devil.inc
index 3a800e3..3a800e3 100644
--- a/data/pokemon/base_stats/devil.asm
+++ b/data/pokemon/base_stats/devil.inc
diff --git a/data/pokemon/base_stats/digda.asm b/data/pokemon/base_stats/digda.inc
index c992723..c992723 100644
--- a/data/pokemon/base_stats/digda.asm
+++ b/data/pokemon/base_stats/digda.inc
diff --git a/data/pokemon/base_stats/dodo.asm b/data/pokemon/base_stats/dodo.inc
index 6387d8a..6387d8a 100644
--- a/data/pokemon/base_stats/dodo.asm
+++ b/data/pokemon/base_stats/dodo.inc
diff --git a/data/pokemon/base_stats/dodorio.asm b/data/pokemon/base_stats/dodorio.inc
index 83e0826..83e0826 100644
--- a/data/pokemon/base_stats/dodorio.asm
+++ b/data/pokemon/base_stats/dodorio.inc
diff --git a/data/pokemon/base_stats/dogars.asm b/data/pokemon/base_stats/dogars.inc
index 81206cc..81206cc 100644
--- a/data/pokemon/base_stats/dogars.asm
+++ b/data/pokemon/base_stats/dogars.inc
diff --git a/data/pokemon/base_stats/dokukurage.asm b/data/pokemon/base_stats/dokukurage.inc
index 54e2c4f..54e2c4f 100644
--- a/data/pokemon/base_stats/dokukurage.asm
+++ b/data/pokemon/base_stats/dokukurage.inc
diff --git a/data/pokemon/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.inc
index 6f26c95..6f26c95 100644
--- a/data/pokemon/base_stats/donphan.asm
+++ b/data/pokemon/base_stats/donphan.inc
diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.inc
index a2bd9c9..a2bd9c9 100644
--- a/data/pokemon/base_stats/dugtrio.asm
+++ b/data/pokemon/base_stats/dugtrio.inc
diff --git a/data/pokemon/base_stats/dynabear.asm b/data/pokemon/base_stats/dynabear.inc
index 244ecc5..244ecc5 100644
--- a/data/pokemon/base_stats/dynabear.asm
+++ b/data/pokemon/base_stats/dynabear.inc
diff --git a/data/pokemon/base_stats/ebiwalar.asm b/data/pokemon/base_stats/ebiwalar.inc
index 301ee47..301ee47 100644
--- a/data/pokemon/base_stats/ebiwalar.asm
+++ b/data/pokemon/base_stats/ebiwalar.inc
diff --git a/data/pokemon/base_stats/eievui.asm b/data/pokemon/base_stats/eievui.inc
index 4a29e77..4a29e77 100644
--- a/data/pokemon/base_stats/eievui.asm
+++ b/data/pokemon/base_stats/eievui.inc
diff --git a/data/pokemon/base_stats/eifie.asm b/data/pokemon/base_stats/eifie.inc
index 4922cb7..4922cb7 100644
--- a/data/pokemon/base_stats/eifie.asm
+++ b/data/pokemon/base_stats/eifie.inc
diff --git a/data/pokemon/base_stats/eksing.asm b/data/pokemon/base_stats/eksing.inc
index 7643e5e..7643e5e 100644
--- a/data/pokemon/base_stats/eksing.asm
+++ b/data/pokemon/base_stats/eksing.inc
diff --git a/data/pokemon/base_stats/elebaby.asm b/data/pokemon/base_stats/elebaby.inc
index adcd059..adcd059 100644
--- a/data/pokemon/base_stats/elebaby.asm
+++ b/data/pokemon/base_stats/elebaby.inc
diff --git a/data/pokemon/base_stats/eleboo.asm b/data/pokemon/base_stats/eleboo.inc
index 4416661..4416661 100644
--- a/data/pokemon/base_stats/eleboo.asm
+++ b/data/pokemon/base_stats/eleboo.inc
diff --git a/data/pokemon/base_stats/en.asm b/data/pokemon/base_stats/en.inc
index 4cae666..4cae666 100644
--- a/data/pokemon/base_stats/en.asm
+++ b/data/pokemon/base_stats/en.inc
diff --git a/data/pokemon/base_stats/fire.asm b/data/pokemon/base_stats/fire.inc
index 0800618..0800618 100644
--- a/data/pokemon/base_stats/fire.asm
+++ b/data/pokemon/base_stats/fire.inc
diff --git a/data/pokemon/base_stats/foodin.asm b/data/pokemon/base_stats/foodin.inc
index c2cf13b..c2cf13b 100644
--- a/data/pokemon/base_stats/foodin.asm
+++ b/data/pokemon/base_stats/foodin.inc
diff --git a/data/pokemon/base_stats/freezer.asm b/data/pokemon/base_stats/freezer.inc
index bf66c3d..bf66c3d 100644
--- a/data/pokemon/base_stats/freezer.asm
+++ b/data/pokemon/base_stats/freezer.inc
diff --git a/data/pokemon/base_stats/fushigibana.asm b/data/pokemon/base_stats/fushigibana.inc
index 17237dd..17237dd 100644
--- a/data/pokemon/base_stats/fushigibana.asm
+++ b/data/pokemon/base_stats/fushigibana.inc
diff --git a/data/pokemon/base_stats/fushigidane.asm b/data/pokemon/base_stats/fushigidane.inc
index 64d466b..64d466b 100644
--- a/data/pokemon/base_stats/fushigidane.asm
+++ b/data/pokemon/base_stats/fushigidane.inc
diff --git a/data/pokemon/base_stats/fushigisou.asm b/data/pokemon/base_stats/fushigisou.inc
index a4159bc..a4159bc 100644
--- a/data/pokemon/base_stats/fushigisou.asm
+++ b/data/pokemon/base_stats/fushigisou.inc
diff --git a/data/pokemon/base_stats/gallop.asm b/data/pokemon/base_stats/gallop.inc
index 9a280d2..9a280d2 100644
--- a/data/pokemon/base_stats/gallop.asm
+++ b/data/pokemon/base_stats/gallop.inc
diff --git a/data/pokemon/base_stats/gangar.asm b/data/pokemon/base_stats/gangar.inc
index b06c9d8..b06c9d8 100644
--- a/data/pokemon/base_stats/gangar.asm
+++ b/data/pokemon/base_stats/gangar.inc
diff --git a/data/pokemon/base_stats/garagara.asm b/data/pokemon/base_stats/garagara.inc
index 94553a7..94553a7 100644
--- a/data/pokemon/base_stats/garagara.asm
+++ b/data/pokemon/base_stats/garagara.inc
diff --git a/data/pokemon/base_stats/gardie.asm b/data/pokemon/base_stats/gardie.inc
index fc68ecf..fc68ecf 100644
--- a/data/pokemon/base_stats/gardie.asm
+++ b/data/pokemon/base_stats/gardie.inc
diff --git a/data/pokemon/base_stats/garura.asm b/data/pokemon/base_stats/garura.inc
index 17b1cb2..17b1cb2 100644
--- a/data/pokemon/base_stats/garura.asm
+++ b/data/pokemon/base_stats/garura.inc
diff --git a/data/pokemon/base_stats/ghos.asm b/data/pokemon/base_stats/ghos.inc
index 1de9016..1de9016 100644
--- a/data/pokemon/base_stats/ghos.asm
+++ b/data/pokemon/base_stats/ghos.inc
diff --git a/data/pokemon/base_stats/ghost.asm b/data/pokemon/base_stats/ghost.inc
index 97a258a..97a258a 100644
--- a/data/pokemon/base_stats/ghost.asm
+++ b/data/pokemon/base_stats/ghost.inc
diff --git a/data/pokemon/base_stats/gift.asm b/data/pokemon/base_stats/gift.inc
index 52ad299..52ad299 100644
--- a/data/pokemon/base_stats/gift.asm
+++ b/data/pokemon/base_stats/gift.inc
diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.inc
index 83863a9..83863a9 100644
--- a/data/pokemon/base_stats/golbat.asm
+++ b/data/pokemon/base_stats/golbat.inc
diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.inc
index d259840..d259840 100644
--- a/data/pokemon/base_stats/golduck.asm
+++ b/data/pokemon/base_stats/golduck.inc
diff --git a/data/pokemon/base_stats/golone.asm b/data/pokemon/base_stats/golone.inc
index ec9bf3b..ec9bf3b 100644
--- a/data/pokemon/base_stats/golone.asm
+++ b/data/pokemon/base_stats/golone.inc
diff --git a/data/pokemon/base_stats/golonya.asm b/data/pokemon/base_stats/golonya.inc
index 8ef1b24..8ef1b24 100644
--- a/data/pokemon/base_stats/golonya.asm
+++ b/data/pokemon/base_stats/golonya.inc
diff --git a/data/pokemon/base_stats/gongu.asm b/data/pokemon/base_stats/gongu.inc
index 4b50099..4b50099 100644
--- a/data/pokemon/base_stats/gongu.asm
+++ b/data/pokemon/base_stats/gongu.inc
diff --git a/data/pokemon/base_stats/goriky.asm b/data/pokemon/base_stats/goriky.inc
index beb05d4..beb05d4 100644
--- a/data/pokemon/base_stats/goriky.asm
+++ b/data/pokemon/base_stats/goriky.inc
diff --git a/data/pokemon/base_stats/grotess.asm b/data/pokemon/base_stats/grotess.inc
index 8130a3c..8130a3c 100644
--- a/data/pokemon/base_stats/grotess.asm
+++ b/data/pokemon/base_stats/grotess.inc
diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.inc
index 7247a5a..7247a5a 100644
--- a/data/pokemon/base_stats/gyarados.asm
+++ b/data/pokemon/base_stats/gyarados.inc
diff --git a/data/pokemon/base_stats/gyopin.asm b/data/pokemon/base_stats/gyopin.inc
index 43075d1..43075d1 100644
--- a/data/pokemon/base_stats/gyopin.asm
+++ b/data/pokemon/base_stats/gyopin.inc
diff --git a/data/pokemon/base_stats/haganeil.asm b/data/pokemon/base_stats/haganeil.inc
index 6ced7ac..6ced7ac 100644
--- a/data/pokemon/base_stats/haganeil.asm
+++ b/data/pokemon/base_stats/haganeil.inc
diff --git a/data/pokemon/base_stats/hakuryu.asm b/data/pokemon/base_stats/hakuryu.inc
index 0f7a10d..0f7a10d 100644
--- a/data/pokemon/base_stats/hakuryu.asm
+++ b/data/pokemon/base_stats/hakuryu.inc
diff --git a/data/pokemon/base_stats/hanamogura.asm b/data/pokemon/base_stats/hanamogura.inc
index 03f53aa..03f53aa 100644
--- a/data/pokemon/base_stats/hanamogura.asm
+++ b/data/pokemon/base_stats/hanamogura.inc
diff --git a/data/pokemon/base_stats/hanaryu.asm b/data/pokemon/base_stats/hanaryu.inc
index 5b8f2cf..5b8f2cf 100644
--- a/data/pokemon/base_stats/hanaryu.asm
+++ b/data/pokemon/base_stats/hanaryu.inc
diff --git a/data/pokemon/base_stats/haneei.asm b/data/pokemon/base_stats/haneei.inc
index 026c5f3..026c5f3 100644
--- a/data/pokemon/base_stats/haneei.asm
+++ b/data/pokemon/base_stats/haneei.inc
diff --git a/data/pokemon/base_stats/haneko.asm b/data/pokemon/base_stats/haneko.inc
index 69329ec..69329ec 100644
--- a/data/pokemon/base_stats/haneko.asm
+++ b/data/pokemon/base_stats/haneko.inc
diff --git a/data/pokemon/base_stats/happa.asm b/data/pokemon/base_stats/happa.inc
index a8d4c22..a8d4c22 100644
--- a/data/pokemon/base_stats/happa.asm
+++ b/data/pokemon/base_stats/happa.inc
diff --git a/data/pokemon/base_stats/happi.asm b/data/pokemon/base_stats/happi.inc
index 5c2a7a4..5c2a7a4 100644
--- a/data/pokemon/base_stats/happi.asm
+++ b/data/pokemon/base_stats/happi.inc
diff --git a/data/pokemon/base_stats/helgaa.asm b/data/pokemon/base_stats/helgaa.inc
index e4339eb..e4339eb 100644
--- a/data/pokemon/base_stats/helgaa.asm
+++ b/data/pokemon/base_stats/helgaa.inc
diff --git a/data/pokemon/base_stats/hinazu.asm b/data/pokemon/base_stats/hinazu.inc
index e636972..e636972 100644
--- a/data/pokemon/base_stats/hinazu.asm
+++ b/data/pokemon/base_stats/hinazu.inc
diff --git a/data/pokemon/base_stats/hitodeman.asm b/data/pokemon/base_stats/hitodeman.inc
index c7e2051..c7e2051 100644
--- a/data/pokemon/base_stats/hitodeman.asm
+++ b/data/pokemon/base_stats/hitodeman.inc
diff --git a/data/pokemon/base_stats/hitokage.asm b/data/pokemon/base_stats/hitokage.inc
index edc3f5a..edc3f5a 100644
--- a/data/pokemon/base_stats/hitokage.asm
+++ b/data/pokemon/base_stats/hitokage.inc
diff --git a/data/pokemon/base_stats/hoho.asm b/data/pokemon/base_stats/hoho.inc
index 4b49c74..4b49c74 100644
--- a/data/pokemon/base_stats/hoho.asm
+++ b/data/pokemon/base_stats/hoho.inc
diff --git a/data/pokemon/base_stats/honoguma.asm b/data/pokemon/base_stats/honoguma.inc
index 40149b4..40149b4 100644
--- a/data/pokemon/base_stats/honoguma.asm
+++ b/data/pokemon/base_stats/honoguma.inc
diff --git a/data/pokemon/base_stats/houou.asm b/data/pokemon/base_stats/houou.inc
index 799c7f3..799c7f3 100644
--- a/data/pokemon/base_stats/houou.asm
+++ b/data/pokemon/base_stats/houou.inc
diff --git a/data/pokemon/base_stats/ikari.asm b/data/pokemon/base_stats/ikari.inc
index c3ffad8..c3ffad8 100644
--- a/data/pokemon/base_stats/ikari.asm
+++ b/data/pokemon/base_stats/ikari.inc
diff --git a/data/pokemon/base_stats/isitsubute.asm b/data/pokemon/base_stats/isitsubute.inc
index 5cfd771..5cfd771 100644
--- a/data/pokemon/base_stats/isitsubute.asm
+++ b/data/pokemon/base_stats/isitsubute.inc
diff --git a/data/pokemon/base_stats/iwark.asm b/data/pokemon/base_stats/iwark.inc
index c0b501f..c0b501f 100644
--- a/data/pokemon/base_stats/iwark.asm
+++ b/data/pokemon/base_stats/iwark.inc
diff --git a/data/pokemon/base_stats/jaranra.asm b/data/pokemon/base_stats/jaranra.inc
index ef9c8f6..ef9c8f6 100644
--- a/data/pokemon/base_stats/jaranra.asm
+++ b/data/pokemon/base_stats/jaranra.inc
diff --git a/data/pokemon/base_stats/jugon.asm b/data/pokemon/base_stats/jugon.inc
index 806012d..806012d 100644
--- a/data/pokemon/base_stats/jugon.asm
+++ b/data/pokemon/base_stats/jugon.inc
diff --git a/data/pokemon/base_stats/kabigon.asm b/data/pokemon/base_stats/kabigon.inc
index 50a5ac3..50a5ac3 100644
--- a/data/pokemon/base_stats/kabigon.asm
+++ b/data/pokemon/base_stats/kabigon.inc
diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.inc
index 00ef4ce..00ef4ce 100644
--- a/data/pokemon/base_stats/kabuto.asm
+++ b/data/pokemon/base_stats/kabuto.inc
diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.inc
index 4c73947..4c73947 100644
--- a/data/pokemon/base_stats/kabutops.asm
+++ b/data/pokemon/base_stats/kabutops.inc
diff --git a/data/pokemon/base_stats/kailios.asm b/data/pokemon/base_stats/kailios.inc
index 8f2fd25..8f2fd25 100644
--- a/data/pokemon/base_stats/kailios.asm
+++ b/data/pokemon/base_stats/kailios.inc
diff --git a/data/pokemon/base_stats/kairiky.asm b/data/pokemon/base_stats/kairiky.inc
index db33e4c..db33e4c 100644
--- a/data/pokemon/base_stats/kairiky.asm
+++ b/data/pokemon/base_stats/kairiky.inc
diff --git a/data/pokemon/base_stats/kairyu.asm b/data/pokemon/base_stats/kairyu.inc
index ba150e6..ba150e6 100644
--- a/data/pokemon/base_stats/kairyu.asm
+++ b/data/pokemon/base_stats/kairyu.inc
diff --git a/data/pokemon/base_stats/kameil.asm b/data/pokemon/base_stats/kameil.inc
index adb792e..adb792e 100644
--- a/data/pokemon/base_stats/kameil.asm
+++ b/data/pokemon/base_stats/kameil.inc
diff --git a/data/pokemon/base_stats/kamex.asm b/data/pokemon/base_stats/kamex.inc
index 8bd0b54..8bd0b54 100644
--- a/data/pokemon/base_stats/kamex.asm
+++ b/data/pokemon/base_stats/kamex.inc
diff --git a/data/pokemon/base_stats/kamonegi.asm b/data/pokemon/base_stats/kamonegi.inc
index ff31528..ff31528 100644
--- a/data/pokemon/base_stats/kamonegi.asm
+++ b/data/pokemon/base_stats/kamonegi.inc
diff --git a/data/pokemon/base_stats/kapoerer.asm b/data/pokemon/base_stats/kapoerer.inc
index dd47e0b..dd47e0b 100644
--- a/data/pokemon/base_stats/kapoerer.asm
+++ b/data/pokemon/base_stats/kapoerer.inc
diff --git a/data/pokemon/base_stats/karakara.asm b/data/pokemon/base_stats/karakara.inc
index 21ffe32..21ffe32 100644
--- a/data/pokemon/base_stats/karakara.asm
+++ b/data/pokemon/base_stats/karakara.inc
diff --git a/data/pokemon/base_stats/kentauros.asm b/data/pokemon/base_stats/kentauros.inc
index 26449db..26449db 100644
--- a/data/pokemon/base_stats/kentauros.asm
+++ b/data/pokemon/base_stats/kentauros.inc
diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.inc
index 0efbc97..0efbc97 100644
--- a/data/pokemon/base_stats/kingdra.asm
+++ b/data/pokemon/base_stats/kingdra.inc
diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.inc
index a80f65d..a80f65d 100644
--- a/data/pokemon/base_stats/kingler.asm
+++ b/data/pokemon/base_stats/kingler.inc
diff --git a/data/pokemon/base_stats/kireihana.asm b/data/pokemon/base_stats/kireihana.inc
index cbf8a4c..cbf8a4c 100644
--- a/data/pokemon/base_stats/kireihana.asm
+++ b/data/pokemon/base_stats/kireihana.inc
diff --git a/data/pokemon/base_stats/kirinriki.asm b/data/pokemon/base_stats/kirinriki.inc
index 400a807..400a807 100644
--- a/data/pokemon/base_stats/kirinriki.asm
+++ b/data/pokemon/base_stats/kirinriki.inc
diff --git a/data/pokemon/base_stats/koduck.asm b/data/pokemon/base_stats/koduck.inc
index 8c00e6f..8c00e6f 100644
--- a/data/pokemon/base_stats/koduck.asm
+++ b/data/pokemon/base_stats/koduck.inc
diff --git a/data/pokemon/base_stats/koiking.asm b/data/pokemon/base_stats/koiking.inc
index 8cc9493..8cc9493 100644
--- a/data/pokemon/base_stats/koiking.asm
+++ b/data/pokemon/base_stats/koiking.inc
diff --git a/data/pokemon/base_stats/kokumo.asm b/data/pokemon/base_stats/kokumo.inc
index fa1efb9..fa1efb9 100644
--- a/data/pokemon/base_stats/kokumo.asm
+++ b/data/pokemon/base_stats/kokumo.inc
diff --git a/data/pokemon/base_stats/kongpang.asm b/data/pokemon/base_stats/kongpang.inc
index 6abbf05..6abbf05 100644
--- a/data/pokemon/base_stats/kongpang.asm
+++ b/data/pokemon/base_stats/kongpang.inc
diff --git a/data/pokemon/base_stats/koratta.asm b/data/pokemon/base_stats/koratta.inc
index 4acbe91..4acbe91 100644
--- a/data/pokemon/base_stats/koratta.asm
+++ b/data/pokemon/base_stats/koratta.inc
diff --git a/data/pokemon/base_stats/kotora.asm b/data/pokemon/base_stats/kotora.inc
index b60e4f3..b60e4f3 100644
--- a/data/pokemon/base_stats/kotora.asm
+++ b/data/pokemon/base_stats/kotora.inc
diff --git a/data/pokemon/base_stats/kounya.asm b/data/pokemon/base_stats/kounya.inc
index d537820..d537820 100644
--- a/data/pokemon/base_stats/kounya.asm
+++ b/data/pokemon/base_stats/kounya.inc
diff --git a/data/pokemon/base_stats/kurusu.asm b/data/pokemon/base_stats/kurusu.inc
index f8189b1..f8189b1 100644
--- a/data/pokemon/base_stats/kurusu.asm
+++ b/data/pokemon/base_stats/kurusu.inc
diff --git a/data/pokemon/base_stats/kusaihana.asm b/data/pokemon/base_stats/kusaihana.inc
index c78a629..c78a629 100644
--- a/data/pokemon/base_stats/kusaihana.asm
+++ b/data/pokemon/base_stats/kusaihana.inc
diff --git a/data/pokemon/base_stats/kyonpan.asm b/data/pokemon/base_stats/kyonpan.inc
index 63011c8..63011c8 100644
--- a/data/pokemon/base_stats/kyonpan.asm
+++ b/data/pokemon/base_stats/kyonpan.inc
diff --git a/data/pokemon/base_stats/kyukon.asm b/data/pokemon/base_stats/kyukon.inc
index 839923b..839923b 100644
--- a/data/pokemon/base_stats/kyukon.asm
+++ b/data/pokemon/base_stats/kyukon.inc
diff --git a/data/pokemon/base_stats/laplace.asm b/data/pokemon/base_stats/laplace.inc
index 780f098..780f098 100644
--- a/data/pokemon/base_stats/laplace.asm
+++ b/data/pokemon/base_stats/laplace.inc
diff --git a/data/pokemon/base_stats/leafy.asm b/data/pokemon/base_stats/leafy.inc
index f04cc6e..f04cc6e 100644
--- a/data/pokemon/base_stats/leafy.asm
+++ b/data/pokemon/base_stats/leafy.inc
diff --git a/data/pokemon/base_stats/lip.asm b/data/pokemon/base_stats/lip.inc
index c86580b..c86580b 100644
--- a/data/pokemon/base_stats/lip.asm
+++ b/data/pokemon/base_stats/lip.inc
diff --git a/data/pokemon/base_stats/lizardo.asm b/data/pokemon/base_stats/lizardo.inc
index 3d66d18..3d66d18 100644
--- a/data/pokemon/base_stats/lizardo.asm
+++ b/data/pokemon/base_stats/lizardo.inc
diff --git a/data/pokemon/base_stats/lizardon.asm b/data/pokemon/base_stats/lizardon.inc
index c4b419a..c4b419a 100644
--- a/data/pokemon/base_stats/lizardon.asm
+++ b/data/pokemon/base_stats/lizardon.inc
diff --git a/data/pokemon/base_stats/lucky.asm b/data/pokemon/base_stats/lucky.inc
index 49d6971..49d6971 100644
--- a/data/pokemon/base_stats/lucky.asm
+++ b/data/pokemon/base_stats/lucky.inc
diff --git a/data/pokemon/base_stats/madame.asm b/data/pokemon/base_stats/madame.inc
index e3de03e..e3de03e 100644
--- a/data/pokemon/base_stats/madame.asm
+++ b/data/pokemon/base_stats/madame.inc
diff --git a/data/pokemon/base_stats/madatsubomi.asm b/data/pokemon/base_stats/madatsubomi.inc
index bb0804b..bb0804b 100644
--- a/data/pokemon/base_stats/madatsubomi.asm
+++ b/data/pokemon/base_stats/madatsubomi.inc
diff --git a/data/pokemon/base_stats/manbo1.asm b/data/pokemon/base_stats/manbo1.inc
index 4e38a6f..4e38a6f 100644
--- a/data/pokemon/base_stats/manbo1.asm
+++ b/data/pokemon/base_stats/manbo1.inc
diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.inc
index c82f3dc..c82f3dc 100644
--- a/data/pokemon/base_stats/mankey.asm
+++ b/data/pokemon/base_stats/mankey.inc
diff --git a/data/pokemon/base_stats/maril.asm b/data/pokemon/base_stats/maril.inc
index 32f9482..32f9482 100644
--- a/data/pokemon/base_stats/maril.asm
+++ b/data/pokemon/base_stats/maril.inc
diff --git a/data/pokemon/base_stats/marumine.asm b/data/pokemon/base_stats/marumine.inc
index 15cc4ba..15cc4ba 100644
--- a/data/pokemon/base_stats/marumine.asm
+++ b/data/pokemon/base_stats/marumine.inc
diff --git a/data/pokemon/base_stats/matadogas.asm b/data/pokemon/base_stats/matadogas.inc
index ce15200..ce15200 100644
--- a/data/pokemon/base_stats/matadogas.asm
+++ b/data/pokemon/base_stats/matadogas.inc
diff --git a/data/pokemon/base_stats/menokurage.asm b/data/pokemon/base_stats/menokurage.inc
index 080a0b1..080a0b1 100644
--- a/data/pokemon/base_stats/menokurage.asm
+++ b/data/pokemon/base_stats/menokurage.inc
diff --git a/data/pokemon/base_stats/metamon.asm b/data/pokemon/base_stats/metamon.inc
index 23c5cb5..23c5cb5 100644
--- a/data/pokemon/base_stats/metamon.asm
+++ b/data/pokemon/base_stats/metamon.inc
diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.inc
index 9d08056..9d08056 100644
--- a/data/pokemon/base_stats/mew.asm
+++ b/data/pokemon/base_stats/mew.inc
diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.inc
index d773b29..d773b29 100644
--- a/data/pokemon/base_stats/mewtwo.asm
+++ b/data/pokemon/base_stats/mewtwo.inc
diff --git a/data/pokemon/base_stats/mikon.asm b/data/pokemon/base_stats/mikon.inc
index eaf77fa..eaf77fa 100644
--- a/data/pokemon/base_stats/mikon.asm
+++ b/data/pokemon/base_stats/mikon.inc
diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.inc
index 565db81..565db81 100644
--- a/data/pokemon/base_stats/miltank.asm
+++ b/data/pokemon/base_stats/miltank.inc
diff --git a/data/pokemon/base_stats/miniryu.asm b/data/pokemon/base_stats/miniryu.inc
index c456822..c456822 100644
--- a/data/pokemon/base_stats/miniryu.asm
+++ b/data/pokemon/base_stats/miniryu.inc
diff --git a/data/pokemon/base_stats/mitsuboshi.asm b/data/pokemon/base_stats/mitsuboshi.inc
index aa6741f..aa6741f 100644
--- a/data/pokemon/base_stats/mitsuboshi.asm
+++ b/data/pokemon/base_stats/mitsuboshi.inc
diff --git a/data/pokemon/base_stats/mizuuo.asm b/data/pokemon/base_stats/mizuuo.inc
index 4ee970e..4ee970e 100644
--- a/data/pokemon/base_stats/mizuuo.asm
+++ b/data/pokemon/base_stats/mizuuo.inc
diff --git a/data/pokemon/base_stats/mokoko.asm b/data/pokemon/base_stats/mokoko.inc
index 8e03228..8e03228 100644
--- a/data/pokemon/base_stats/mokoko.asm
+++ b/data/pokemon/base_stats/mokoko.inc
diff --git a/data/pokemon/base_stats/monja.asm b/data/pokemon/base_stats/monja.inc
index ffe3f53..ffe3f53 100644
--- a/data/pokemon/base_stats/monja.asm
+++ b/data/pokemon/base_stats/monja.inc
diff --git a/data/pokemon/base_stats/monjara.asm b/data/pokemon/base_stats/monjara.inc
index b0bee78..b0bee78 100644
--- a/data/pokemon/base_stats/monjara.asm
+++ b/data/pokemon/base_stats/monjara.inc
diff --git a/data/pokemon/base_stats/morphon.asm b/data/pokemon/base_stats/morphon.inc
index d8d0937..d8d0937 100644
--- a/data/pokemon/base_stats/morphon.asm
+++ b/data/pokemon/base_stats/morphon.inc
diff --git a/data/pokemon/base_stats/nameil.asm b/data/pokemon/base_stats/nameil.inc
index ad8812e..ad8812e 100644
--- a/data/pokemon/base_stats/nameil.asm
+++ b/data/pokemon/base_stats/nameil.inc
diff --git a/data/pokemon/base_stats/nassy.asm b/data/pokemon/base_stats/nassy.inc
index a5ccb5d..a5ccb5d 100644
--- a/data/pokemon/base_stats/nassy.asm
+++ b/data/pokemon/base_stats/nassy.inc
diff --git a/data/pokemon/base_stats/natio.asm b/data/pokemon/base_stats/natio.inc
index fedd462..fedd462 100644
--- a/data/pokemon/base_stats/natio.asm
+++ b/data/pokemon/base_stats/natio.inc
diff --git a/data/pokemon/base_stats/naty.asm b/data/pokemon/base_stats/naty.inc
index ee6307b..ee6307b 100644
--- a/data/pokemon/base_stats/naty.asm
+++ b/data/pokemon/base_stats/naty.inc
diff --git a/data/pokemon/base_stats/nazonokusa.asm b/data/pokemon/base_stats/nazonokusa.inc
index 8acdf2c..8acdf2c 100644
--- a/data/pokemon/base_stats/nazonokusa.asm
+++ b/data/pokemon/base_stats/nazonokusa.inc
diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.inc
index be71dfc..be71dfc 100644
--- a/data/pokemon/base_stats/nidoking.asm
+++ b/data/pokemon/base_stats/nidoking.inc
diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.inc
index f8cf6f0..f8cf6f0 100644
--- a/data/pokemon/base_stats/nidoqueen.asm
+++ b/data/pokemon/base_stats/nidoqueen.inc
diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.inc
index aeab391..aeab391 100644
--- a/data/pokemon/base_stats/nidoran_f.asm
+++ b/data/pokemon/base_stats/nidoran_f.inc
diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.inc
index 829e9bb..829e9bb 100644
--- a/data/pokemon/base_stats/nidoran_m.asm
+++ b/data/pokemon/base_stats/nidoran_m.inc
diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.inc
index 247a03e..247a03e 100644
--- a/data/pokemon/base_stats/nidorina.asm
+++ b/data/pokemon/base_stats/nidorina.inc
diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.inc
index fe89c83..fe89c83 100644
--- a/data/pokemon/base_stats/nidorino.asm
+++ b/data/pokemon/base_stats/nidorino.inc
diff --git a/data/pokemon/base_stats/norowara.asm b/data/pokemon/base_stats/norowara.inc
index 0857dde..0857dde 100644
--- a/data/pokemon/base_stats/norowara.asm
+++ b/data/pokemon/base_stats/norowara.inc
diff --git a/data/pokemon/base_stats/nyarth.asm b/data/pokemon/base_stats/nyarth.inc
index 3658319..3658319 100644
--- a/data/pokemon/base_stats/nyarth.asm
+++ b/data/pokemon/base_stats/nyarth.inc
diff --git a/data/pokemon/base_stats/nyorobon.asm b/data/pokemon/base_stats/nyorobon.inc
index fd322b0..fd322b0 100644
--- a/data/pokemon/base_stats/nyorobon.asm
+++ b/data/pokemon/base_stats/nyorobon.inc
diff --git a/data/pokemon/base_stats/nyoromo.asm b/data/pokemon/base_stats/nyoromo.inc
index 722d4e0..722d4e0 100644
--- a/data/pokemon/base_stats/nyoromo.asm
+++ b/data/pokemon/base_stats/nyoromo.inc
diff --git a/data/pokemon/base_stats/nyorotono.asm b/data/pokemon/base_stats/nyorotono.inc
index efb3160..efb3160 100644
--- a/data/pokemon/base_stats/nyorotono.asm
+++ b/data/pokemon/base_stats/nyorotono.inc
diff --git a/data/pokemon/base_stats/nyorozo.asm b/data/pokemon/base_stats/nyorozo.inc
index bed84b4..bed84b4 100644
--- a/data/pokemon/base_stats/nyorozo.asm
+++ b/data/pokemon/base_stats/nyorozo.inc
diff --git a/data/pokemon/base_stats/nyula.asm b/data/pokemon/base_stats/nyula.inc
index d6a3cfb..d6a3cfb 100644
--- a/data/pokemon/base_stats/nyula.asm
+++ b/data/pokemon/base_stats/nyula.inc
diff --git a/data/pokemon/base_stats/okorizaru.asm b/data/pokemon/base_stats/okorizaru.inc
index 385aa03..385aa03 100644
--- a/data/pokemon/base_stats/okorizaru.asm
+++ b/data/pokemon/base_stats/okorizaru.inc
diff --git a/data/pokemon/base_stats/okutank.asm b/data/pokemon/base_stats/okutank.inc
index 31dc176..31dc176 100644
--- a/data/pokemon/base_stats/okutank.asm
+++ b/data/pokemon/base_stats/okutank.inc
diff --git a/data/pokemon/base_stats/omnite.asm b/data/pokemon/base_stats/omnite.inc
index 8d05cf5..8d05cf5 100644
--- a/data/pokemon/base_stats/omnite.asm
+++ b/data/pokemon/base_stats/omnite.inc
diff --git a/data/pokemon/base_stats/omstar.asm b/data/pokemon/base_stats/omstar.inc
index 5ea8841..5ea8841 100644
--- a/data/pokemon/base_stats/omstar.asm
+++ b/data/pokemon/base_stats/omstar.inc
diff --git a/data/pokemon/base_stats/onidrill.asm b/data/pokemon/base_stats/onidrill.inc
index 1ea2520..1ea2520 100644
--- a/data/pokemon/base_stats/onidrill.asm
+++ b/data/pokemon/base_stats/onidrill.inc
diff --git a/data/pokemon/base_stats/onisuzume.asm b/data/pokemon/base_stats/onisuzume.inc
index b3704d0..b3704d0 100644
--- a/data/pokemon/base_stats/onisuzume.asm
+++ b/data/pokemon/base_stats/onisuzume.inc
diff --git a/data/pokemon/base_stats/pachimee.asm b/data/pokemon/base_stats/pachimee.inc
index 2623a6f..2623a6f 100644
--- a/data/pokemon/base_stats/pachimee.asm
+++ b/data/pokemon/base_stats/pachimee.inc
diff --git a/data/pokemon/base_stats/painter.asm b/data/pokemon/base_stats/painter.inc
index c1d5814..c1d5814 100644
--- a/data/pokemon/base_stats/painter.asm
+++ b/data/pokemon/base_stats/painter.inc
diff --git a/data/pokemon/base_stats/paon.asm b/data/pokemon/base_stats/paon.inc
index be60ab8..be60ab8 100644
--- a/data/pokemon/base_stats/paon.asm
+++ b/data/pokemon/base_stats/paon.inc
diff --git a/data/pokemon/base_stats/para.asm b/data/pokemon/base_stats/para.inc
index 84c5ea5..84c5ea5 100644
--- a/data/pokemon/base_stats/para.asm
+++ b/data/pokemon/base_stats/para.inc
diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.inc
index 2a289a3..2a289a3 100644
--- a/data/pokemon/base_stats/paras.asm
+++ b/data/pokemon/base_stats/paras.inc
diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.inc
index 5d8492a..5d8492a 100644
--- a/data/pokemon/base_stats/parasect.asm
+++ b/data/pokemon/base_stats/parasect.inc
diff --git a/data/pokemon/base_stats/parshen.asm b/data/pokemon/base_stats/parshen.inc
index f6512e7..f6512e7 100644
--- a/data/pokemon/base_stats/parshen.asm
+++ b/data/pokemon/base_stats/parshen.inc
diff --git a/data/pokemon/base_stats/pawou.asm b/data/pokemon/base_stats/pawou.inc
index 5cd8340..5cd8340 100644
--- a/data/pokemon/base_stats/pawou.asm
+++ b/data/pokemon/base_stats/pawou.inc
diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.inc
index 42d3384..42d3384 100644
--- a/data/pokemon/base_stats/persian.asm
+++ b/data/pokemon/base_stats/persian.inc
diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.inc
index aa8b18a..aa8b18a 100644
--- a/data/pokemon/base_stats/pichu.asm
+++ b/data/pokemon/base_stats/pichu.inc
diff --git a/data/pokemon/base_stats/pigeon.asm b/data/pokemon/base_stats/pigeon.inc
index ef818db..ef818db 100644
--- a/data/pokemon/base_stats/pigeon.asm
+++ b/data/pokemon/base_stats/pigeon.inc
diff --git a/data/pokemon/base_stats/pigeot.asm b/data/pokemon/base_stats/pigeot.inc
index f4ebc16..f4ebc16 100644
--- a/data/pokemon/base_stats/pigeot.asm
+++ b/data/pokemon/base_stats/pigeot.inc
diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.inc
index 522efa1..522efa1 100644
--- a/data/pokemon/base_stats/pikachu.asm
+++ b/data/pokemon/base_stats/pikachu.inc
diff --git a/data/pokemon/base_stats/pippi.asm b/data/pokemon/base_stats/pippi.inc
index 8cd8847..8cd8847 100644
--- a/data/pokemon/base_stats/pippi.asm
+++ b/data/pokemon/base_stats/pippi.inc
diff --git a/data/pokemon/base_stats/pixy.asm b/data/pokemon/base_stats/pixy.inc
index 73623e9..73623e9 100644
--- a/data/pokemon/base_stats/pixy.asm
+++ b/data/pokemon/base_stats/pixy.inc
diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.inc
index bdb45c3..bdb45c3 100644
--- a/data/pokemon/base_stats/ponyta.asm
+++ b/data/pokemon/base_stats/ponyta.inc
diff --git a/data/pokemon/base_stats/poponeko.asm b/data/pokemon/base_stats/poponeko.inc
index 7041228..7041228 100644
--- a/data/pokemon/base_stats/poponeko.asm
+++ b/data/pokemon/base_stats/poponeko.inc
diff --git a/data/pokemon/base_stats/poppo.asm b/data/pokemon/base_stats/poppo.inc
index 110e52b..110e52b 100644
--- a/data/pokemon/base_stats/poppo.asm
+++ b/data/pokemon/base_stats/poppo.inc
diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.inc
index c86389e..c86389e 100644
--- a/data/pokemon/base_stats/porygon.asm
+++ b/data/pokemon/base_stats/porygon.inc
diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.inc
index dd0e5f7..dd0e5f7 100644
--- a/data/pokemon/base_stats/porygon2.asm
+++ b/data/pokemon/base_stats/porygon2.inc
diff --git a/data/pokemon/base_stats/ptera.asm b/data/pokemon/base_stats/ptera.inc
index eb045de..eb045de 100644
--- a/data/pokemon/base_stats/ptera.asm
+++ b/data/pokemon/base_stats/ptera.inc
diff --git a/data/pokemon/base_stats/puchicorn.asm b/data/pokemon/base_stats/puchicorn.inc
index df8dfee..df8dfee 100644
--- a/data/pokemon/base_stats/puchicorn.asm
+++ b/data/pokemon/base_stats/puchicorn.inc
diff --git a/data/pokemon/base_stats/pudie.asm b/data/pokemon/base_stats/pudie.inc
index 18cbbda..18cbbda 100644
--- a/data/pokemon/base_stats/pudie.asm
+++ b/data/pokemon/base_stats/pudie.inc
diff --git a/data/pokemon/base_stats/puku.asm b/data/pokemon/base_stats/puku.inc
index c614ba3..c614ba3 100644
--- a/data/pokemon/base_stats/puku.asm
+++ b/data/pokemon/base_stats/puku.inc
diff --git a/data/pokemon/base_stats/pukurin.asm b/data/pokemon/base_stats/pukurin.inc
index b61b46a..b61b46a 100644
--- a/data/pokemon/base_stats/pukurin.asm
+++ b/data/pokemon/base_stats/pukurin.inc
diff --git a/data/pokemon/base_stats/pupurin.asm b/data/pokemon/base_stats/pupurin.inc
index 4e5b3be..4e5b3be 100644
--- a/data/pokemon/base_stats/pupurin.asm
+++ b/data/pokemon/base_stats/pupurin.inc
diff --git a/data/pokemon/base_stats/purakkusu.asm b/data/pokemon/base_stats/purakkusu.inc
index 495a39c..495a39c 100644
--- a/data/pokemon/base_stats/purakkusu.asm
+++ b/data/pokemon/base_stats/purakkusu.inc
diff --git a/data/pokemon/base_stats/purin.asm b/data/pokemon/base_stats/purin.inc
index 4209523..4209523 100644
--- a/data/pokemon/base_stats/purin.asm
+++ b/data/pokemon/base_stats/purin.inc
diff --git a/data/pokemon/base_stats/py.asm b/data/pokemon/base_stats/py.inc
index f2fcc9d..f2fcc9d 100644
--- a/data/pokemon/base_stats/py.asm
+++ b/data/pokemon/base_stats/py.inc
diff --git a/data/pokemon/base_stats/rai.asm b/data/pokemon/base_stats/rai.inc
index 0d39a24..0d39a24 100644
--- a/data/pokemon/base_stats/rai.asm
+++ b/data/pokemon/base_stats/rai.inc
diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.inc
index c1213c4..c1213c4 100644
--- a/data/pokemon/base_stats/raichu.asm
+++ b/data/pokemon/base_stats/raichu.inc
diff --git a/data/pokemon/base_stats/raitora.asm b/data/pokemon/base_stats/raitora.inc
index e312b8d..e312b8d 100644
--- a/data/pokemon/base_stats/raitora.asm
+++ b/data/pokemon/base_stats/raitora.inc
diff --git a/data/pokemon/base_stats/rarecoil.asm b/data/pokemon/base_stats/rarecoil.inc
index 6a3f0a6..6a3f0a6 100644
--- a/data/pokemon/base_stats/rarecoil.asm
+++ b/data/pokemon/base_stats/rarecoil.inc
diff --git a/data/pokemon/base_stats/ratta.asm b/data/pokemon/base_stats/ratta.inc
index 212c6fd..212c6fd 100644
--- a/data/pokemon/base_stats/ratta.asm
+++ b/data/pokemon/base_stats/ratta.inc
diff --git a/data/pokemon/base_stats/rediba.asm b/data/pokemon/base_stats/rediba.inc
index 966ee8c..966ee8c 100644
--- a/data/pokemon/base_stats/rediba.asm
+++ b/data/pokemon/base_stats/rediba.inc
diff --git a/data/pokemon/base_stats/rinrin.asm b/data/pokemon/base_stats/rinrin.inc
index 6076112..6076112 100644
--- a/data/pokemon/base_stats/rinrin.asm
+++ b/data/pokemon/base_stats/rinrin.inc
diff --git a/data/pokemon/base_stats/rokon.asm b/data/pokemon/base_stats/rokon.inc
index 2152b1e..2152b1e 100644
--- a/data/pokemon/base_stats/rokon.asm
+++ b/data/pokemon/base_stats/rokon.inc
diff --git a/data/pokemon/base_stats/rougela.asm b/data/pokemon/base_stats/rougela.inc
index e13e9df..e13e9df 100644
--- a/data/pokemon/base_stats/rougela.asm
+++ b/data/pokemon/base_stats/rougela.inc
diff --git a/data/pokemon/base_stats/ruffresia.asm b/data/pokemon/base_stats/ruffresia.inc
index 497c287..497c287 100644
--- a/data/pokemon/base_stats/ruffresia.asm
+++ b/data/pokemon/base_stats/ruffresia.inc
diff --git a/data/pokemon/base_stats/sand.asm b/data/pokemon/base_stats/sand.inc
index c5196b2..c5196b2 100644
--- a/data/pokemon/base_stats/sand.asm
+++ b/data/pokemon/base_stats/sand.inc
diff --git a/data/pokemon/base_stats/sandpan.asm b/data/pokemon/base_stats/sandpan.inc
index fa42d0f..fa42d0f 100644
--- a/data/pokemon/base_stats/sandpan.asm
+++ b/data/pokemon/base_stats/sandpan.inc
diff --git a/data/pokemon/base_stats/sawamular.asm b/data/pokemon/base_stats/sawamular.inc
index 9f31324..9f31324 100644
--- a/data/pokemon/base_stats/sawamular.asm
+++ b/data/pokemon/base_stats/sawamular.inc
diff --git a/data/pokemon/base_stats/scissors.asm b/data/pokemon/base_stats/scissors.inc
index 8ee0f35..8ee0f35 100644
--- a/data/pokemon/base_stats/scissors.asm
+++ b/data/pokemon/base_stats/scissors.inc
diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.inc
index 7810d61..7810d61 100644
--- a/data/pokemon/base_stats/seadra.asm
+++ b/data/pokemon/base_stats/seadra.inc
diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.inc
index 3f381d4..3f381d4 100644
--- a/data/pokemon/base_stats/shellder.asm
+++ b/data/pokemon/base_stats/shellder.inc
diff --git a/data/pokemon/base_stats/shibirefugu.asm b/data/pokemon/base_stats/shibirefugu.inc
index aa603ff..aa603ff 100644
--- a/data/pokemon/base_stats/shibirefugu.asm
+++ b/data/pokemon/base_stats/shibirefugu.inc
diff --git a/data/pokemon/base_stats/showers.asm b/data/pokemon/base_stats/showers.inc
index eb1ba76..eb1ba76 100644
--- a/data/pokemon/base_stats/showers.asm
+++ b/data/pokemon/base_stats/showers.inc
diff --git a/data/pokemon/base_stats/sidon.asm b/data/pokemon/base_stats/sidon.inc
index b761fd7..b761fd7 100644
--- a/data/pokemon/base_stats/sidon.asm
+++ b/data/pokemon/base_stats/sidon.inc
diff --git a/data/pokemon/base_stats/sihorn.asm b/data/pokemon/base_stats/sihorn.inc
index b7d9c9c..b7d9c9c 100644
--- a/data/pokemon/base_stats/sihorn.asm
+++ b/data/pokemon/base_stats/sihorn.inc
diff --git a/data/pokemon/base_stats/sleepe.asm b/data/pokemon/base_stats/sleepe.inc
index ee24e07..ee24e07 100644
--- a/data/pokemon/base_stats/sleepe.asm
+++ b/data/pokemon/base_stats/sleepe.inc
diff --git a/data/pokemon/base_stats/sleeper.asm b/data/pokemon/base_stats/sleeper.inc
index 38db0fc..38db0fc 100644
--- a/data/pokemon/base_stats/sleeper.asm
+++ b/data/pokemon/base_stats/sleeper.inc
diff --git a/data/pokemon/base_stats/spear.asm b/data/pokemon/base_stats/spear.inc
index c4c0608..c4c0608 100644
--- a/data/pokemon/base_stats/spear.asm
+++ b/data/pokemon/base_stats/spear.inc
diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.inc
index 5976ff4..5976ff4 100644
--- a/data/pokemon/base_stats/starmie.asm
+++ b/data/pokemon/base_stats/starmie.inc
diff --git a/data/pokemon/base_stats/strike.asm b/data/pokemon/base_stats/strike.inc
index 43879d1..43879d1 100644
--- a/data/pokemon/base_stats/strike.asm
+++ b/data/pokemon/base_stats/strike.inc
diff --git a/data/pokemon/base_stats/sui.asm b/data/pokemon/base_stats/sui.inc
index ada13cd..ada13cd 100644
--- a/data/pokemon/base_stats/sui.asm
+++ b/data/pokemon/base_stats/sui.inc
diff --git a/data/pokemon/base_stats/sunny.asm b/data/pokemon/base_stats/sunny.inc
index d3aadd4..d3aadd4 100644
--- a/data/pokemon/base_stats/sunny.asm
+++ b/data/pokemon/base_stats/sunny.inc
diff --git a/data/pokemon/base_stats/tail.asm b/data/pokemon/base_stats/tail.inc
index 82cbafb..82cbafb 100644
--- a/data/pokemon/base_stats/tail.asm
+++ b/data/pokemon/base_stats/tail.inc
diff --git a/data/pokemon/base_stats/tamatama.asm b/data/pokemon/base_stats/tamatama.inc
index 39387c5..39387c5 100644
--- a/data/pokemon/base_stats/tamatama.asm
+++ b/data/pokemon/base_stats/tamatama.inc
diff --git a/data/pokemon/base_stats/tattu.asm b/data/pokemon/base_stats/tattu.inc
index 8a7a575..8a7a575 100644
--- a/data/pokemon/base_stats/tattu.asm
+++ b/data/pokemon/base_stats/tattu.inc
diff --git a/data/pokemon/base_stats/teppouo.asm b/data/pokemon/base_stats/teppouo.inc
index 3179465..3179465 100644
--- a/data/pokemon/base_stats/teppouo.asm
+++ b/data/pokemon/base_stats/teppouo.inc
diff --git a/data/pokemon/base_stats/thunder.asm b/data/pokemon/base_stats/thunder.inc
index 01114b3..01114b3 100644
--- a/data/pokemon/base_stats/thunder.asm
+++ b/data/pokemon/base_stats/thunder.inc
diff --git a/data/pokemon/base_stats/thunders.asm b/data/pokemon/base_stats/thunders.inc
index 21326cf..21326cf 100644
--- a/data/pokemon/base_stats/thunders.asm
+++ b/data/pokemon/base_stats/thunders.inc
diff --git a/data/pokemon/base_stats/togepy.asm b/data/pokemon/base_stats/togepy.inc
index 0649197..0649197 100644
--- a/data/pokemon/base_stats/togepy.asm
+++ b/data/pokemon/base_stats/togepy.inc
diff --git a/data/pokemon/base_stats/tosakinto.asm b/data/pokemon/base_stats/tosakinto.inc
index bb3fd6e..bb3fd6e 100644
--- a/data/pokemon/base_stats/tosakinto.asm
+++ b/data/pokemon/base_stats/tosakinto.inc
diff --git a/data/pokemon/base_stats/transel.asm b/data/pokemon/base_stats/transel.inc
index 84d4019..84d4019 100644
--- a/data/pokemon/base_stats/transel.asm
+++ b/data/pokemon/base_stats/transel.inc
diff --git a/data/pokemon/base_stats/tsubomitto.asm b/data/pokemon/base_stats/tsubomitto.inc
index 6d0f954..6d0f954 100644
--- a/data/pokemon/base_stats/tsubomitto.asm
+++ b/data/pokemon/base_stats/tsubomitto.inc
diff --git a/data/pokemon/base_stats/turban.asm b/data/pokemon/base_stats/turban.inc
index bf2eb5a..bf2eb5a 100644
--- a/data/pokemon/base_stats/turban.asm
+++ b/data/pokemon/base_stats/turban.inc
diff --git a/data/pokemon/base_stats/twinz.asm b/data/pokemon/base_stats/twinz.inc
index 64c22c7..64c22c7 100644
--- a/data/pokemon/base_stats/twinz.asm
+++ b/data/pokemon/base_stats/twinz.inc
diff --git a/data/pokemon/base_stats/twohead.asm b/data/pokemon/base_stats/twohead.inc
index 51456ff..51456ff 100644
--- a/data/pokemon/base_stats/twohead.asm
+++ b/data/pokemon/base_stats/twohead.inc
diff --git a/data/pokemon/base_stats/utsubot.asm b/data/pokemon/base_stats/utsubot.inc
index e6b2b07..e6b2b07 100644
--- a/data/pokemon/base_stats/utsubot.asm
+++ b/data/pokemon/base_stats/utsubot.inc
diff --git a/data/pokemon/base_stats/utsudon.asm b/data/pokemon/base_stats/utsudon.inc
index 1b134e6..1b134e6 100644
--- a/data/pokemon/base_stats/utsudon.asm
+++ b/data/pokemon/base_stats/utsudon.inc
diff --git a/data/pokemon/base_stats/volbear.asm b/data/pokemon/base_stats/volbear.inc
index 19c3892..19c3892 100644
--- a/data/pokemon/base_stats/volbear.asm
+++ b/data/pokemon/base_stats/volbear.inc
diff --git a/data/pokemon/base_stats/wanriky.asm b/data/pokemon/base_stats/wanriky.inc
index 684cb08..684cb08 100644
--- a/data/pokemon/base_stats/wanriky.asm
+++ b/data/pokemon/base_stats/wanriky.inc
diff --git a/data/pokemon/base_stats/warwolf.asm b/data/pokemon/base_stats/warwolf.inc
index 51cf942..51cf942 100644
--- a/data/pokemon/base_stats/warwolf.asm
+++ b/data/pokemon/base_stats/warwolf.inc
diff --git a/data/pokemon/base_stats/wataneko.asm b/data/pokemon/base_stats/wataneko.inc
index 8337e70..8337e70 100644
--- a/data/pokemon/base_stats/wataneko.asm
+++ b/data/pokemon/base_stats/wataneko.inc
diff --git a/data/pokemon/base_stats/windie.asm b/data/pokemon/base_stats/windie.inc
index 5b50e93..5b50e93 100644
--- a/data/pokemon/base_stats/windie.asm
+++ b/data/pokemon/base_stats/windie.inc
diff --git a/data/pokemon/base_stats/wolfman.asm b/data/pokemon/base_stats/wolfman.inc
index f7ba8ba..f7ba8ba 100644
--- a/data/pokemon/base_stats/wolfman.asm
+++ b/data/pokemon/base_stats/wolfman.inc
diff --git a/data/pokemon/base_stats/yadoking.asm b/data/pokemon/base_stats/yadoking.inc
index 3990ef5..3990ef5 100644
--- a/data/pokemon/base_stats/yadoking.asm
+++ b/data/pokemon/base_stats/yadoking.inc
diff --git a/data/pokemon/base_stats/yadon.asm b/data/pokemon/base_stats/yadon.inc
index daffa31..daffa31 100644
--- a/data/pokemon/base_stats/yadon.asm
+++ b/data/pokemon/base_stats/yadon.inc
diff --git a/data/pokemon/base_stats/yadoran.asm b/data/pokemon/base_stats/yadoran.inc
index 819f868..819f868 100644
--- a/data/pokemon/base_stats/yadoran.asm
+++ b/data/pokemon/base_stats/yadoran.inc
diff --git a/data/pokemon/base_stats/yamikarasu.asm b/data/pokemon/base_stats/yamikarasu.inc
index f641a88..f641a88 100644
--- a/data/pokemon/base_stats/yamikarasu.asm
+++ b/data/pokemon/base_stats/yamikarasu.inc
diff --git a/data/pokemon/base_stats/yoroidori.asm b/data/pokemon/base_stats/yoroidori.inc
index d7998a3..d7998a3 100644
--- a/data/pokemon/base_stats/yoroidori.asm
+++ b/data/pokemon/base_stats/yoroidori.inc
diff --git a/data/pokemon/base_stats/yungerer.asm b/data/pokemon/base_stats/yungerer.inc
index d46ad12..d46ad12 100644
--- a/data/pokemon/base_stats/yungerer.asm
+++ b/data/pokemon/base_stats/yungerer.inc
diff --git a/data/pokemon/base_stats/zenigame.asm b/data/pokemon/base_stats/zenigame.inc
index 9d363bf..9d363bf 100644
--- a/data/pokemon/base_stats/zenigame.asm
+++ b/data/pokemon/base_stats/zenigame.inc
diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.inc
index ad65bba..ad65bba 100644
--- a/data/pokemon/base_stats/zubat.asm
+++ b/data/pokemon/base_stats/zubat.inc
diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm
index 3f7b5f6..1e6a6b5 100644
--- a/data/pokemon/dex_order_alpha.asm
+++ b/data/pokemon/dex_order_alpha.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Alphabetical Pokedex Order", ROMX[$4943], BANK[$10]
+
 ; Every Pokémon sorted alphabetically by name (gojūon order).
 
 AlphabeticalPokedexOrder: ; 0x40943
diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm
index d662dce..e78a5d0 100644
--- a/data/pokemon/evos_attacks.asm
+++ b/data/pokemon/evos_attacks.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Evolutions and Attacks", ROMX[$6493], BANK[$10]
+
 ; Evolutions for Pokémon available in the demo were removed,
 ; and have been left in comments.
 
@@ -5,7 +9,7 @@
 ; so its data is corrupt. (See EievuiEvosAttacks.)
 
 
-INCLUDE "data/pokemon/evos_attacks_pointers.asm"
+INCLUDE "data/pokemon/evos_attacks_pointers.inc"
 
 
 EvosAttacks::
diff --git a/data/pokemon/evos_attacks_pointers.asm b/data/pokemon/evos_attacks_pointers.inc
index e14ddac..e14ddac 100644
--- a/data/pokemon/evos_attacks_pointers.asm
+++ b/data/pokemon/evos_attacks_pointers.inc
diff --git a/data/predef_pointers.asm b/data/predef_pointers.inc
index 22d14f9..22d14f9 100644
--- a/data/predef_pointers.asm
+++ b/data/predef_pointers.inc
diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm
index a004938..5425b91 100644
--- a/data/tileset_headers.asm
+++ b/data/tileset_headers.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Tileset Headers", ROMX[$488D], BANK[$03]
+
 Tileset_00: ; 0xc88d
 	db $06 ; bank
 	dw $4400 ; blocks
diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm
index 284876d..4fdbed0 100644
--- a/data/trainers/class_names.asm
+++ b/data/trainers/class_names.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "TrainerClassNames", ROMX[$4D90], BANK[$0E]
+
 TrainerClassNames:: ; 38d90
 	db "ハヤト@"
 	db "アカネ@"
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 74b1129..c3861cf 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -1,3 +1,5 @@
+INCLUDE "constants.asm"
+
 ; Trainer data structure:
 ; - db "NAME@", TRAINERTYPE_* constant
 ; - 1 to 6 Pokémon:
@@ -10,9 +12,6 @@
 
 ; TODO: decode data from the beginning
 
-SECTION "TrainerGroups", ROMX[$5110],BANK[$E]
-INCLUDE "data/trainers/party_pointers.asm"
-
 SECTION "HayatoGroup", ROMX[$518A],BANK[$E]
 HayatoGroup::
 
diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm
index a23b165..f410435 100644
--- a/data/trainers/party_pointers.asm
+++ b/data/trainers/party_pointers.asm
@@ -1,3 +1,5 @@
+SECTION "TrainerGroups", ROMX[$5110],BANK[$E]
+
 TrainerGroups: ; 0x039110
 	dw HayatoGroup
 	dw AkaneGroup
diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm
index 170072b..a965da0 100644
--- a/data/types/type_matchups.asm
+++ b/data/types/type_matchups.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"

+

+SECTION "Type Matchups", ROMX[$506D], BANK[$0D]

+

 TypeMatchups: ; 3506d

 	;  attacker,  defender,  *=

 	db TYPE_NORMAL,   TYPE_ROCK,     NOT_VERY_EFFECTIVE