306 files changed, 5743 insertions, 212 deletions

diff --git a/data/base_stats.asm b/data/base_stats.asm
deleted file mode 100755
index 7aa36735..00000000
--- a/data/base_stats.asm
+++ /dev/null
@@ -1,153 +0,0 @@
-BaseStats::
-MonBaseStats::
-INCLUDE "data/baseStats/bulbasaur.asm"
-MonBaseStatsEnd::
-INCLUDE "data/baseStats/ivysaur.asm"
-INCLUDE "data/baseStats/venusaur.asm"
-INCLUDE "data/baseStats/charmander.asm"
-INCLUDE "data/baseStats/charmeleon.asm"
-INCLUDE "data/baseStats/charizard.asm"
-INCLUDE "data/baseStats/squirtle.asm"
-INCLUDE "data/baseStats/wartortle.asm"
-INCLUDE "data/baseStats/blastoise.asm"
-INCLUDE "data/baseStats/caterpie.asm"
-INCLUDE "data/baseStats/metapod.asm"
-INCLUDE "data/baseStats/butterfree.asm"
-INCLUDE "data/baseStats/weedle.asm"
-INCLUDE "data/baseStats/kakuna.asm"
-INCLUDE "data/baseStats/beedrill.asm"
-INCLUDE "data/baseStats/pidgey.asm"
-INCLUDE "data/baseStats/pidgeotto.asm"
-INCLUDE "data/baseStats/pidgeot.asm"
-INCLUDE "data/baseStats/rattata.asm"
-INCLUDE "data/baseStats/raticate.asm"
-INCLUDE "data/baseStats/spearow.asm"
-INCLUDE "data/baseStats/fearow.asm"
-INCLUDE "data/baseStats/ekans.asm"
-INCLUDE "data/baseStats/arbok.asm"
-INCLUDE "data/baseStats/pikachu.asm"
-INCLUDE "data/baseStats/raichu.asm"
-INCLUDE "data/baseStats/sandshrew.asm"
-INCLUDE "data/baseStats/sandslash.asm"
-INCLUDE "data/baseStats/nidoranf.asm"
-INCLUDE "data/baseStats/nidorina.asm"
-INCLUDE "data/baseStats/nidoqueen.asm"
-INCLUDE "data/baseStats/nidoranm.asm"
-INCLUDE "data/baseStats/nidorino.asm"
-INCLUDE "data/baseStats/nidoking.asm"
-INCLUDE "data/baseStats/clefairy.asm"
-INCLUDE "data/baseStats/clefable.asm"
-INCLUDE "data/baseStats/vulpix.asm"
-INCLUDE "data/baseStats/ninetales.asm"
-INCLUDE "data/baseStats/jigglypuff.asm"
-INCLUDE "data/baseStats/wigglytuff.asm"
-INCLUDE "data/baseStats/zubat.asm"
-INCLUDE "data/baseStats/golbat.asm"
-INCLUDE "data/baseStats/oddish.asm"
-INCLUDE "data/baseStats/gloom.asm"
-INCLUDE "data/baseStats/vileplume.asm"
-INCLUDE "data/baseStats/paras.asm"
-INCLUDE "data/baseStats/parasect.asm"
-INCLUDE "data/baseStats/venonat.asm"
-INCLUDE "data/baseStats/venomoth.asm"
-INCLUDE "data/baseStats/diglett.asm"
-INCLUDE "data/baseStats/dugtrio.asm"
-INCLUDE "data/baseStats/meowth.asm"
-INCLUDE "data/baseStats/persian.asm"
-INCLUDE "data/baseStats/psyduck.asm"
-INCLUDE "data/baseStats/golduck.asm"
-INCLUDE "data/baseStats/mankey.asm"
-INCLUDE "data/baseStats/primeape.asm"
-INCLUDE "data/baseStats/growlithe.asm"
-INCLUDE "data/baseStats/arcanine.asm"
-INCLUDE "data/baseStats/poliwag.asm"
-INCLUDE "data/baseStats/poliwhirl.asm"
-INCLUDE "data/baseStats/poliwrath.asm"
-INCLUDE "data/baseStats/abra.asm"
-INCLUDE "data/baseStats/kadabra.asm"
-INCLUDE "data/baseStats/alakazam.asm"
-INCLUDE "data/baseStats/machop.asm"
-INCLUDE "data/baseStats/machoke.asm"
-INCLUDE "data/baseStats/machamp.asm"
-INCLUDE "data/baseStats/bellsprout.asm"
-INCLUDE "data/baseStats/weepinbell.asm"
-INCLUDE "data/baseStats/victreebel.asm"
-INCLUDE "data/baseStats/tentacool.asm"
-INCLUDE "data/baseStats/tentacruel.asm"
-INCLUDE "data/baseStats/geodude.asm"
-INCLUDE "data/baseStats/graveler.asm"
-INCLUDE "data/baseStats/golem.asm"
-INCLUDE "data/baseStats/ponyta.asm"
-INCLUDE "data/baseStats/rapidash.asm"
-INCLUDE "data/baseStats/slowpoke.asm"
-INCLUDE "data/baseStats/slowbro.asm"
-INCLUDE "data/baseStats/magnemite.asm"
-INCLUDE "data/baseStats/magneton.asm"
-INCLUDE "data/baseStats/farfetchd.asm"
-INCLUDE "data/baseStats/doduo.asm"
-INCLUDE "data/baseStats/dodrio.asm"
-INCLUDE "data/baseStats/seel.asm"
-INCLUDE "data/baseStats/dewgong.asm"
-INCLUDE "data/baseStats/grimer.asm"
-INCLUDE "data/baseStats/muk.asm"
-INCLUDE "data/baseStats/shellder.asm"
-INCLUDE "data/baseStats/cloyster.asm"
-INCLUDE "data/baseStats/gastly.asm"
-INCLUDE "data/baseStats/haunter.asm"
-INCLUDE "data/baseStats/gengar.asm"
-INCLUDE "data/baseStats/onix.asm"
-INCLUDE "data/baseStats/drowzee.asm"
-INCLUDE "data/baseStats/hypno.asm"
-INCLUDE "data/baseStats/krabby.asm"
-INCLUDE "data/baseStats/kingler.asm"
-INCLUDE "data/baseStats/voltorb.asm"
-INCLUDE "data/baseStats/electrode.asm"
-INCLUDE "data/baseStats/exeggcute.asm"
-INCLUDE "data/baseStats/exeggutor.asm"
-INCLUDE "data/baseStats/cubone.asm"
-INCLUDE "data/baseStats/marowak.asm"
-INCLUDE "data/baseStats/hitmonlee.asm"
-INCLUDE "data/baseStats/hitmonchan.asm"
-INCLUDE "data/baseStats/lickitung.asm"
-INCLUDE "data/baseStats/koffing.asm"
-INCLUDE "data/baseStats/weezing.asm"
-INCLUDE "data/baseStats/rhyhorn.asm"
-INCLUDE "data/baseStats/rhydon.asm"
-INCLUDE "data/baseStats/chansey.asm"
-INCLUDE "data/baseStats/tangela.asm"
-INCLUDE "data/baseStats/kangaskhan.asm"
-INCLUDE "data/baseStats/horsea.asm"
-INCLUDE "data/baseStats/seadra.asm"
-INCLUDE "data/baseStats/goldeen.asm"
-INCLUDE "data/baseStats/seaking.asm"
-INCLUDE "data/baseStats/staryu.asm"
-INCLUDE "data/baseStats/starmie.asm"
-INCLUDE "data/baseStats/mrmime.asm"
-INCLUDE "data/baseStats/scyther.asm"
-INCLUDE "data/baseStats/jynx.asm"
-INCLUDE "data/baseStats/electabuzz.asm"
-INCLUDE "data/baseStats/magmar.asm"
-INCLUDE "data/baseStats/pinsir.asm"
-INCLUDE "data/baseStats/tauros.asm"
-INCLUDE "data/baseStats/magikarp.asm"
-INCLUDE "data/baseStats/gyarados.asm"
-INCLUDE "data/baseStats/lapras.asm"
-INCLUDE "data/baseStats/ditto.asm"
-INCLUDE "data/baseStats/eevee.asm"
-INCLUDE "data/baseStats/vaporeon.asm"
-INCLUDE "data/baseStats/jolteon.asm"
-INCLUDE "data/baseStats/flareon.asm"
-INCLUDE "data/baseStats/porygon.asm"
-INCLUDE "data/baseStats/omanyte.asm"
-INCLUDE "data/baseStats/omastar.asm"
-INCLUDE "data/baseStats/kabuto.asm"
-INCLUDE "data/baseStats/kabutops.asm"
-INCLUDE "data/baseStats/aerodactyl.asm"
-INCLUDE "data/baseStats/snorlax.asm"
-INCLUDE "data/baseStats/articuno.asm"
-INCLUDE "data/baseStats/zapdos.asm"
-INCLUDE "data/baseStats/moltres.asm"
-INCLUDE "data/baseStats/dratini.asm"
-INCLUDE "data/baseStats/dragonair.asm"
-INCLUDE "data/baseStats/dragonite.asm"
-INCLUDE "data/baseStats/mewtwo.asm"
diff --git a/data/battle/stat_names.asm b/data/battle/stat_names.asm
new file mode 100644
index 00000000..854780c6
--- /dev/null
+++ b/data/battle/stat_names.asm
@@ -0,0 +1,7 @@
+StatsTextStrings:
+	db "ATTACK@"
+	db "DEFENSE@"
+	db "SPEED@"
+	db "SPECIAL@"
+	db "ACCURACY@"
+	db "EVADE@"
diff --git a/data/credit_mons.asm b/data/credits/credits_mons.asm
index 23142f9f..23142f9f 100755
--- a/data/credit_mons.asm
+++ b/data/credits/credits_mons.asm
diff --git a/data/credits_order.asm b/data/credits/credits_order.asm
index 20b9137f..20b9137f 100755
--- a/data/credits_order.asm
+++ b/data/credits/credits_order.asm
diff --git a/data/credits/credits_text.asm b/data/credits/credits_text.asm
new file mode 100755
index 00000000..a68c33d3
--- /dev/null
+++ b/data/credits/credits_text.asm
@@ -0,0 +1,199 @@
+CreditsTextPointers:
+	dw CredVersion
+	dw CredTajiri
+	dw CredTaOota
+	dw CredMorimoto
+	dw CredWatanabe
+	dw CredMasuda
+	dw CredNisino
+	dw CredSugimori
+	dw CredNishida
+	dw CredMiyamoto
+	dw CredKawaguchi
+	dw CredIshihara
+	dw CredYamauchi
+	dw CredZinnai
+	dw CredHishida
+	dw CredSakai
+	dw CredYamaguchi
+	dw CredYamamoto
+	dw CredTaniguchi
+	dw CredNonomura
+	dw CredFuziwara
+	dw CredMatsusima
+	dw CredTomisawa
+	dw CredKawamoto
+	dw CredKakei
+	dw CredTsuchiya
+	dw CredTaNakamura
+	dw CredYuda
+	dw CredMon
+	dw CredDirector
+	dw CredProgrammers
+	dw CredCharDesign
+	dw CredMusic
+	dw CredSoundEffects
+	dw CredGameDesign
+	dw CredMonsterDesign
+	dw CredGameScene
+	dw CredParam
+	dw CredMap
+	dw CredTest
+	dw CredSpecial
+	dw CredProducers
+	dw CredProducer
+	dw CredExecutive
+	dw CredTamada
+	dw CredSaOota
+	dw CredYoshikawa
+	dw CredToOota
+	dw CredUSStaff
+	dw CredUSCoord
+	dw CredTilden
+	dw CredKawakami
+	dw CredHiNakamura
+	dw CredGiese
+	dw CredOsborne
+	dw CredTrans
+	dw CredOgasawara
+	dw CredIwata
+	dw CredIzushi
+	dw CredHarada
+	dw CredMurakawa
+	dw CredFukui
+	dw CredClub
+	dw CredPAAD
+
+CredVersion: ; this 1 byte difference makes all bank addresses offset by 1 in the blue version
+IF DEF(_RED)
+	db -8, "RED VERSION STAFF@"
+ENDC
+IF DEF(_BLUE)
+	db -8, "BLUE VERSION STAFF@"
+ENDC
+CredTajiri:
+	db -6, "SATOSHI TAJIRI@"
+CredTaOota:
+	db -6, "TAKENORI OOTA@"
+CredMorimoto:
+	db -7, "SHIGEKI MORIMOTO@"
+CredWatanabe:
+	db -7, "TETSUYA WATANABE@"
+CredMasuda:
+	db -6, "JUNICHI MASUDA@"
+CredNisino:
+	db -5, "KOHJI NISINO@"
+CredSugimori:
+	db -5, "KEN SUGIMORI@"
+CredNishida:
+	db -6, "ATSUKO NISHIDA@"
+CredMiyamoto:
+	db -7, "SHIGERU MIYAMOTO@"
+CredKawaguchi:
+	db -8, "TAKASHI KAWAGUCHI@"
+CredIshihara:
+	db -8, "TSUNEKAZU ISHIHARA@"
+CredYamauchi:
+	db -7, "HIROSHI YAMAUCHI@"
+CredZinnai:
+	db -7, "HIROYUKI ZINNAI@"
+CredHishida:
+	db -7, "TATSUYA HISHIDA@"
+CredSakai:
+	db -6, "YASUHIRO SAKAI@"
+CredYamaguchi:
+	db -7, "WATARU YAMAGUCHI@"
+CredYamamoto:
+	db -8, "KAZUYUKI YAMAMOTO@"
+CredTaniguchi:
+	db -8, "RYOHSUKE TANIGUCHI@"
+CredNonomura:
+	db -8, "FUMIHIRO NONOMURA@"
+CredFuziwara:
+	db -7, "MOTOFUMI FUZIWARA@"
+CredMatsusima:
+	db -7, "KENJI MATSUSIMA@"
+CredTomisawa:
+	db -7, "AKIHITO TOMISAWA@"
+CredKawamoto:
+	db -7, "HIROSHI KAWAMOTO@"
+CredKakei:
+	db -6, "AKIYOSHI KAKEI@"
+CredTsuchiya:
+	db -7, "KAZUKI TSUCHIYA@"
+CredTaNakamura:
+	db -6, "TAKEO NAKAMURA@"
+CredYuda:
+	db -6, "MASAMITSU YUDA@"
+CredMon:
+	db -3, "#MON@"
+CredDirector:
+	db -3, "DIRECTOR@"
+CredProgrammers:
+	db -5, "PROGRAMMERS@"
+CredCharDesign:
+	db -7, "CHARACTER DESIGN@"
+CredMusic:
+	db -2, "MUSIC@"
+CredSoundEffects:
+	db -6, "SOUND EFFECTS@"
+CredGameDesign:
+	db -5, "GAME DESIGN@"
+CredMonsterDesign:
+	db -6, "MONSTER DESIGN@"
+CredGameScene:
+	db -6, "GAME SCENARIO@"
+CredParam:
+	db -8, "PARAMETRIC DESIGN@"
+CredMap:
+	db -4, "MAP DESIGN@"
+CredTest:
+	db -7, "PRODUCT TESTING@"
+CredSpecial:
+	db -6, "SPECIAL THANKS@"
+CredProducers:
+	db -4, "PRODUCERS@"
+CredProducer:
+	db -4, "PRODUCER@"
+CredExecutive:
+	db -8, "EXECUTIVE PRODUCER@"
+CredTamada:
+	db -6, "SOUSUKE TAMADA@"
+CredSaOota:
+	db -5, "SATOSHI OOTA@"
+CredYoshikawa:
+	db -6, "RENA YOSHIKAWA@"
+CredToOota:
+	db -6, "TOMOMICHI OOTA@"
+CredUSStaff:
+	db -7, "US VERSION STAFF@"
+CredUSCoord:
+	db -7, "US COORDINATION@"
+CredTilden:
+	db -5, "GAIL TILDEN@"
+CredKawakami:
+	db -6, "NAOKO KAWAKAMI@"
+CredHiNakamura:
+	db -6, "HIRO NAKAMURA@"
+CredGiese:
+	db -6, "WILLIAM GIESE@"
+CredOsborne:
+	db -5, "SARA OSBORNE@"
+CredTrans:
+	db -7, "TEXT TRANSLATION@"
+CredOgasawara:
+	db -6, "NOB OGASAWARA@"
+CredIwata:
+	db -5, "SATORU IWATA@"
+CredIzushi:
+	db -7, "TAKEHIRO IZUSHI@"
+CredHarada:
+	db -7, "TAKAHIRO HARADA@"
+CredMurakawa:
+	db -7, "TERUKI MURAKAWA@"
+CredFukui:
+	db -5, "KOHTA FUKUI@"
+CredClub:
+	db -9, "NCL SUPER MARIO CLUB@"
+CredPAAD:
+	db -5, "PAAD TESTING@"
diff --git a/data/hidden_coins.asm b/data/events/hidden_coins.asm
index b7358572..b7358572 100755
--- a/data/hidden_coins.asm
+++ b/data/events/hidden_coins.asm
diff --git a/data/hidden_item_coords.asm b/data/events/hidden_item_coords.asm
index 6b911dea..6b911dea 100755
--- a/data/hidden_item_coords.asm
+++ b/data/events/hidden_item_coords.asm
diff --git a/data/hidden_objects.asm b/data/events/hidden_objects.asm
index 737947a7..737947a7 100755
--- a/data/hidden_objects.asm
+++ b/data/events/hidden_objects.asm
diff --git a/data/prize_mon_levels.asm b/data/events/prize_mon_levels.asm
index bffa4440..bffa4440 100755
--- a/data/prize_mon_levels.asm
+++ b/data/events/prize_mon_levels.asm
diff --git a/data/prizes.asm b/data/events/prizes.asm
index 1120c0d0..1120c0d0 100755
--- a/data/prizes.asm
+++ b/data/events/prizes.asm
diff --git a/data/slot_machine_wheels.asm b/data/events/slot_machine_wheels.asm
index 88a89822..88a89822 100755
--- a/data/slot_machine_wheels.asm
+++ b/data/events/slot_machine_wheels.asm
diff --git a/data/trades.asm b/data/events/trades.asm
index cf0fcbfd..cf0fcbfd 100755
--- a/data/trades.asm
+++ b/data/events/trades.asm
diff --git a/data/mon_party_sprite_pointers.asm b/data/icon_pointers.asm
index b615798e..b615798e 100644
--- a/data/mon_party_sprite_pointers.asm
+++ b/data/icon_pointers.asm
diff --git a/data/guard_drink_items.asm b/data/items/guard_drink_items.asm
index effef203..effef203 100644
--- a/data/guard_drink_items.asm
+++ b/data/items/guard_drink_items.asm
diff --git a/data/key_items.asm b/data/items/key_items.asm
index afa586af..afa586af 100755
--- a/data/key_items.asm
+++ b/data/items/key_items.asm
diff --git a/data/mart_inventories.asm b/data/items/marts.asm
index 35ae2e9d..35ae2e9d 100755
--- a/data/mart_inventories.asm
+++ b/data/items/marts.asm
diff --git a/data/items/names.asm b/data/items/names.asm
new file mode 100755
index 00000000..0c07fe5d
--- /dev/null
+++ b/data/items/names.asm
@@ -0,0 +1,98 @@
+ItemNames::
+	db "MASTER BALL@"
+	db "ULTRA BALL@"
+	db "GREAT BALL@"
+	db "POKé BALL@"
+	db "TOWN MAP@"
+	db "BICYCLE@"
+	db "?????@"
+	db "SAFARI BALL@"
+	db "POKéDEX@"
+	db "MOON STONE@"
+	db "ANTIDOTE@"
+	db "BURN HEAL@"
+	db "ICE HEAL@"
+	db "AWAKENING@"
+	db "PARLYZ HEAL@"
+	db "FULL RESTORE@"
+	db "MAX POTION@"
+	db "HYPER POTION@"
+	db "SUPER POTION@"
+	db "POTION@"
+	db "BOULDERBADGE@"
+	db "CASCADEBADGE@"
+	db "THUNDERBADGE@"
+	db "RAINBOWBADGE@"
+	db "SOULBADGE@"
+	db "MARSHBADGE@"
+	db "VOLCANOBADGE@"
+	db "EARTHBADGE@"
+	db "ESCAPE ROPE@"
+	db "REPEL@"
+	db "OLD AMBER@"
+	db "FIRE STONE@"
+	db "THUNDERSTONE@"
+	db "WATER STONE@"
+	db "HP UP@"
+	db "PROTEIN@"
+	db "IRON@"
+	db "CARBOS@"
+	db "CALCIUM@"
+	db "RARE CANDY@"
+	db "DOME FOSSIL@"
+	db "HELIX FOSSIL@"
+	db "SECRET KEY@"
+	db "?????@"
+	db "BIKE VOUCHER@"
+	db "X ACCURACY@"
+	db "LEAF STONE@"
+	db "CARD KEY@"
+	db "NUGGET@"
+	db "PP UP@"
+	db "POKé DOLL@"
+	db "FULL HEAL@"
+	db "REVIVE@"
+	db "MAX REVIVE@"
+	db "GUARD SPEC.@"
+	db "SUPER REPEL@"
+	db "MAX REPEL@"
+	db "DIRE HIT@"
+	db "COIN@"
+	db "FRESH WATER@"
+	db "SODA POP@"
+	db "LEMONADE@"
+	db "S.S.TICKET@"
+	db "GOLD TEETH@"
+	db "X ATTACK@"
+	db "X DEFEND@"
+	db "X SPEED@"
+	db "X SPECIAL@"
+	db "COIN CASE@"
+	db "OAK's PARCEL@"
+	db "ITEMFINDER@"
+	db "SILPH SCOPE@"
+	db "POKé FLUTE@"
+	db "LIFT KEY@"
+	db "EXP.ALL@"
+	db "OLD ROD@"
+	db "GOOD ROD@"
+	db "SUPER ROD@"
+	db "PP UP@"
+	db "ETHER@"
+	db "MAX ETHER@"
+	db "ELIXER@"
+	db "MAX ELIXER@"
+	db "B2F@"
+	db "B1F@"
+	db "1F@"
+	db "2F@"
+	db "3F@"
+	db "4F@"
+	db "5F@"
+	db "6F@"
+	db "7F@"
+	db "8F@"
+	db "9F@"
+	db "10F@"
+	db "11F@"
+	db "B4F@"
diff --git a/data/item_prices.asm b/data/items/prices.asm
index f3d8f76b..f3d8f76b 100755
--- a/data/item_prices.asm
+++ b/data/items/prices.asm
diff --git a/data/tm_prices.asm b/data/items/tm_prices.asm
index ccc8be05..ccc8be05 100755
--- a/data/tm_prices.asm
+++ b/data/items/tm_prices.asm
diff --git a/data/overworld_items.asm b/data/items/use_overworld.asm
index c2c244fe..c2c244fe 100644
--- a/data/overworld_items.asm
+++ b/data/items/use_overworld.asm
diff --git a/data/party_items.asm b/data/items/use_party.asm
index 0126ed5e..0126ed5e 100644
--- a/data/party_items.asm
+++ b/data/items/use_party.asm
diff --git a/data/vending_prices.asm b/data/items/vending_prices.asm
index 9a473cc9..9a473cc9 100644
--- a/data/vending_prices.asm
+++ b/data/items/vending_prices.asm
diff --git a/data/wildPokemon/ceruleancave1.asm b/data/mapWilds/CeruleanCave1F.asm
index 20e8643a..20e8643a 100644
--- a/data/wildPokemon/ceruleancave1.asm
+++ b/data/mapWilds/CeruleanCave1F.asm
diff --git a/data/wildPokemon/ceruleancave2.asm b/data/mapWilds/CeruleanCave2F.asm
index 5afe55ac..5afe55ac 100644
--- a/data/wildPokemon/ceruleancave2.asm
+++ b/data/mapWilds/CeruleanCave2F.asm
diff --git a/data/wildPokemon/ceruleancaveb1.asm b/data/mapWilds/CeruleanCaveB1F.asm
index 245d5912..245d5912 100644
--- a/data/wildPokemon/ceruleancaveb1.asm
+++ b/data/mapWilds/CeruleanCaveB1F.asm
diff --git a/data/wildPokemon/diglettscave.asm b/data/mapWilds/DiglettsCave.asm
index 37512687..37512687 100755
--- a/data/wildPokemon/diglettscave.asm
+++ b/data/mapWilds/DiglettsCave.asm
diff --git a/data/wildPokemon/mtmoon1.asm b/data/mapWilds/MtMoon1F.asm
index 44b34c45..44b34c45 100755
--- a/data/wildPokemon/mtmoon1.asm
+++ b/data/mapWilds/MtMoon1F.asm
diff --git a/data/wildPokemon/mtmoonb1.asm b/data/mapWilds/MtMoonB1F.asm
index 5c0d8a53..5c0d8a53 100755
--- a/data/wildPokemon/mtmoonb1.asm
+++ b/data/mapWilds/MtMoonB1F.asm
diff --git a/data/wildPokemon/mtmoonb2.asm b/data/mapWilds/MtMoonB2F.asm
index cbf97e7e..cbf97e7e 100755
--- a/data/wildPokemon/mtmoonb2.asm
+++ b/data/mapWilds/MtMoonB2F.asm
diff --git a/data/wildPokemon/mansion1.asm b/data/mapWilds/PokemonMansion1F.asm
index 22ad032b..22ad032b 100755
--- a/data/wildPokemon/mansion1.asm
+++ b/data/mapWilds/PokemonMansion1F.asm
diff --git a/data/wildPokemon/mansion2.asm b/data/mapWilds/PokemonMansion2F.asm
index 985474fc..985474fc 100755
--- a/data/wildPokemon/mansion2.asm
+++ b/data/mapWilds/PokemonMansion2F.asm
diff --git a/data/wildPokemon/mansion3.asm b/data/mapWilds/PokemonMansion3F.asm
index 9c5521ae..9c5521ae 100755
--- a/data/wildPokemon/mansion3.asm
+++ b/data/mapWilds/PokemonMansion3F.asm
diff --git a/data/wildPokemon/mansionb1.asm b/data/mapWilds/PokemonMansionB1F.asm
index 83266ddd..83266ddd 100755
--- a/data/wildPokemon/mansionb1.asm
+++ b/data/mapWilds/PokemonMansionB1F.asm
diff --git a/data/wildPokemon/pokemontower1.asm b/data/mapWilds/PokemonTower1F.asm
index df951e70..df951e70 100755
--- a/data/wildPokemon/pokemontower1.asm
+++ b/data/mapWilds/PokemonTower1F.asm
diff --git a/data/wildPokemon/pokemontower2.asm b/data/mapWilds/PokemonTower2F.asm
index dcbe0da0..dcbe0da0 100755
--- a/data/wildPokemon/pokemontower2.asm
+++ b/data/mapWilds/PokemonTower2F.asm
diff --git a/data/wildPokemon/pokemontower3.asm b/data/mapWilds/PokemonTower3F.asm
index 135ed84f..135ed84f 100755
--- a/data/wildPokemon/pokemontower3.asm
+++ b/data/mapWilds/PokemonTower3F.asm
diff --git a/data/wildPokemon/pokemontower4.asm b/data/mapWilds/PokemonTower4F.asm
index 0c84b0cf..0c84b0cf 100755
--- a/data/wildPokemon/pokemontower4.asm
+++ b/data/mapWilds/PokemonTower4F.asm
diff --git a/data/wildPokemon/pokemontower5.asm b/data/mapWilds/PokemonTower5F.asm
index 440dbf8d..440dbf8d 100755
--- a/data/wildPokemon/pokemontower5.asm
+++ b/data/mapWilds/PokemonTower5F.asm
diff --git a/data/wildPokemon/pokemontower6.asm b/data/mapWilds/PokemonTower6F.asm
index 553fdb5d..553fdb5d 100755
--- a/data/wildPokemon/pokemontower6.asm
+++ b/data/mapWilds/PokemonTower6F.asm
diff --git a/data/wildPokemon/pokemontower7.asm b/data/mapWilds/PokemonTower7F.asm
index 0f7e66e9..0f7e66e9 100755
--- a/data/wildPokemon/pokemontower7.asm
+++ b/data/mapWilds/PokemonTower7F.asm
diff --git a/data/wildPokemon/powerplant.asm b/data/mapWilds/PowerPlant.asm
index 35eece95..35eece95 100755
--- a/data/wildPokemon/powerplant.asm
+++ b/data/mapWilds/PowerPlant.asm
diff --git a/data/wildPokemon/rocktunnel1.asm b/data/mapWilds/RockTunnel1F.asm
index a36f2092..a36f2092 100755
--- a/data/wildPokemon/rocktunnel1.asm
+++ b/data/mapWilds/RockTunnel1F.asm
diff --git a/data/wildPokemon/rocktunnel2.asm b/data/mapWilds/RockTunnelB1F.asm
index 2fc7ef94..2fc7ef94 100755
--- a/data/wildPokemon/rocktunnel2.asm
+++ b/data/mapWilds/RockTunnelB1F.asm
diff --git a/data/wildPokemon/route1.asm b/data/mapWilds/Route1.asm
index f618c34f..f618c34f 100755
--- a/data/wildPokemon/route1.asm
+++ b/data/mapWilds/Route1.asm
diff --git a/data/wildPokemon/route10.asm b/data/mapWilds/Route10.asm
index 34e0b5ee..34e0b5ee 100755
--- a/data/wildPokemon/route10.asm
+++ b/data/mapWilds/Route10.asm
diff --git a/data/wildPokemon/route11.asm b/data/mapWilds/Route11.asm
index 9e4e3644..9e4e3644 100755
--- a/data/wildPokemon/route11.asm
+++ b/data/mapWilds/Route11.asm
diff --git a/data/wildPokemon/route12.asm b/data/mapWilds/Route12.asm
index 45dfbc9d..45dfbc9d 100755
--- a/data/wildPokemon/route12.asm
+++ b/data/mapWilds/Route12.asm
diff --git a/data/wildPokemon/route13.asm b/data/mapWilds/Route13.asm
index 2a1a6cb5..2a1a6cb5 100755
--- a/data/wildPokemon/route13.asm
+++ b/data/mapWilds/Route13.asm
diff --git a/data/wildPokemon/route14.asm b/data/mapWilds/Route14.asm
index aad5aa48..aad5aa48 100755
--- a/data/wildPokemon/route14.asm
+++ b/data/mapWilds/Route14.asm
diff --git a/data/wildPokemon/route15.asm b/data/mapWilds/Route15.asm
index b4762230..b4762230 100755
--- a/data/wildPokemon/route15.asm
+++ b/data/mapWilds/Route15.asm
diff --git a/data/wildPokemon/route16.asm b/data/mapWilds/Route16.asm
index c2421c50..c2421c50 100755
--- a/data/wildPokemon/route16.asm
+++ b/data/mapWilds/Route16.asm
diff --git a/data/wildPokemon/route17.asm b/data/mapWilds/Route17.asm
index 8dffd9a3..8dffd9a3 100755
--- a/data/wildPokemon/route17.asm
+++ b/data/mapWilds/Route17.asm
diff --git a/data/wildPokemon/route18.asm b/data/mapWilds/Route18.asm
index 47bd247d..47bd247d 100755
--- a/data/wildPokemon/route18.asm
+++ b/data/mapWilds/Route18.asm
diff --git a/data/wildPokemon/route2.asm b/data/mapWilds/Route2.asm
index ad958ea5..ad958ea5 100755
--- a/data/wildPokemon/route2.asm
+++ b/data/mapWilds/Route2.asm
diff --git a/data/wildPokemon/route21.asm b/data/mapWilds/Route21.asm
index 3cc73ba0..3cc73ba0 100755
--- a/data/wildPokemon/route21.asm
+++ b/data/mapWilds/Route21.asm
diff --git a/data/wildPokemon/route22.asm b/data/mapWilds/Route22.asm
index 750a2f4e..750a2f4e 100755
--- a/data/wildPokemon/route22.asm
+++ b/data/mapWilds/Route22.asm
diff --git a/data/wildPokemon/route23.asm b/data/mapWilds/Route23.asm
index a057d24d..a057d24d 100755
--- a/data/wildPokemon/route23.asm
+++ b/data/mapWilds/Route23.asm
diff --git a/data/wildPokemon/route24.asm b/data/mapWilds/Route24.asm
index 3a745f36..3a745f36 100755
--- a/data/wildPokemon/route24.asm
+++ b/data/mapWilds/Route24.asm
diff --git a/data/wildPokemon/route25.asm b/data/mapWilds/Route25.asm
index 4884fa64..4884fa64 100755
--- a/data/wildPokemon/route25.asm
+++ b/data/mapWilds/Route25.asm
diff --git a/data/wildPokemon/route3.asm b/data/mapWilds/Route3.asm
index dea820a4..dea820a4 100755
--- a/data/wildPokemon/route3.asm
+++ b/data/mapWilds/Route3.asm
diff --git a/data/wildPokemon/route4.asm b/data/mapWilds/Route4.asm
index 624d58de..624d58de 100755
--- a/data/wildPokemon/route4.asm
+++ b/data/mapWilds/Route4.asm
diff --git a/data/wildPokemon/route5.asm b/data/mapWilds/Route5.asm
index cb8c583b..cb8c583b 100755
--- a/data/wildPokemon/route5.asm
+++ b/data/mapWilds/Route5.asm
diff --git a/data/wildPokemon/route6.asm b/data/mapWilds/Route6.asm
index 92512ffb..92512ffb 100755
--- a/data/wildPokemon/route6.asm
+++ b/data/mapWilds/Route6.asm
diff --git a/data/wildPokemon/route7.asm b/data/mapWilds/Route7.asm
index 559c98ee..559c98ee 100755
--- a/data/wildPokemon/route7.asm
+++ b/data/mapWilds/Route7.asm
diff --git a/data/wildPokemon/route8.asm b/data/mapWilds/Route8.asm
index 8a0bfa31..8a0bfa31 100755
--- a/data/wildPokemon/route8.asm
+++ b/data/mapWilds/Route8.asm
diff --git a/data/wildPokemon/route9.asm b/data/mapWilds/Route9.asm
index 716589b0..716589b0 100755
--- a/data/wildPokemon/route9.asm
+++ b/data/mapWilds/Route9.asm
diff --git a/data/wildPokemon/safarizonecenter.asm b/data/mapWilds/SafariZoneCenter.asm
index 0cd5323a..0cd5323a 100755
--- a/data/wildPokemon/safarizonecenter.asm
+++ b/data/mapWilds/SafariZoneCenter.asm
diff --git a/data/wildPokemon/safarizone1.asm b/data/mapWilds/SafariZoneEast.asm
index 3d77b6fe..3d77b6fe 100755
--- a/data/wildPokemon/safarizone1.asm
+++ b/data/mapWilds/SafariZoneEast.asm
diff --git a/data/wildPokemon/safarizone2.asm b/data/mapWilds/SafariZoneNorth.asm
index c1b6a547..c1b6a547 100755
--- a/data/wildPokemon/safarizone2.asm
+++ b/data/mapWilds/SafariZoneNorth.asm
diff --git a/data/wildPokemon/safarizone3.asm b/data/mapWilds/SafariZoneWest.asm
index 47b6a102..47b6a102 100755
--- a/data/wildPokemon/safarizone3.asm
+++ b/data/mapWilds/SafariZoneWest.asm
diff --git a/data/wildPokemon/waterpokemon.asm b/data/mapWilds/SeaRoutes.asm
index 07c6a187..07c6a187 100755
--- a/data/wildPokemon/waterpokemon.asm
+++ b/data/mapWilds/SeaRoutes.asm
diff --git a/data/wildPokemon/seafoamisland1.asm b/data/mapWilds/SeafoamIslands1F.asm
index 3c431f9a..3c431f9a 100755
--- a/data/wildPokemon/seafoamisland1.asm
+++ b/data/mapWilds/SeafoamIslands1F.asm
diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/mapWilds/SeafoamIslandsB1F.asm
index 6f96f240..6f96f240 100755
--- a/data/wildPokemon/seafoamislandb1.asm
+++ b/data/mapWilds/SeafoamIslandsB1F.asm
diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/mapWilds/SeafoamIslandsB2F.asm
index 7191fea9..7191fea9 100755
--- a/data/wildPokemon/seafoamislandb2.asm
+++ b/data/mapWilds/SeafoamIslandsB2F.asm
diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/mapWilds/SeafoamIslandsB3F.asm
index 9778c0e9..9778c0e9 100755
--- a/data/wildPokemon/seafoamislandb3.asm
+++ b/data/mapWilds/SeafoamIslandsB3F.asm
diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/mapWilds/SeafoamIslandsB4F.asm
index 3948470b..3948470b 100755
--- a/data/wildPokemon/seafoamislandb4.asm
+++ b/data/mapWilds/SeafoamIslandsB4F.asm
diff --git a/data/wildPokemon/victoryroad1.asm b/data/mapWilds/VictoryRoad1F.asm
index 60aae31a..60aae31a 100755
--- a/data/wildPokemon/victoryroad1.asm
+++ b/data/mapWilds/VictoryRoad1F.asm
diff --git a/data/wildPokemon/victoryroad2.asm b/data/mapWilds/VictoryRoad2F.asm
index 580d644d..580d644d 100755
--- a/data/wildPokemon/victoryroad2.asm
+++ b/data/mapWilds/VictoryRoad2F.asm
diff --git a/data/wildPokemon/victoryroad3.asm b/data/mapWilds/VictoryRoad3F.asm
index 80d7ef3e..80d7ef3e 100755
--- a/data/wildPokemon/victoryroad3.asm
+++ b/data/mapWilds/VictoryRoad3F.asm
diff --git a/data/wildPokemon/viridianforest.asm b/data/mapWilds/ViridianForest.asm
index ae9a5a70..ae9a5a70 100755
--- a/data/wildPokemon/viridianforest.asm
+++ b/data/mapWilds/ViridianForest.asm
diff --git a/data/wildPokemon/nomons.asm b/data/mapWilds/nothing.asm
index ce7f7ede..ce7f7ede 100755
--- a/data/wildPokemon/nomons.asm
+++ b/data/mapWilds/nothing.asm
diff --git a/data/dungeon_maps.asm b/data/maps/dungeon_maps.asm
index 118cf46b..118cf46b 100644
--- a/data/dungeon_maps.asm
+++ b/data/maps/dungeon_maps.asm
diff --git a/data/force_bike_surf.asm b/data/maps/force_bike_surf.asm
index fb352aa9..fb352aa9 100755
--- a/data/force_bike_surf.asm
+++ b/data/maps/force_bike_surf.asm
diff --git a/data/hide_show_data.asm b/data/maps/hide_show_data.asm
index 7f4593ca..7f4593ca 100755
--- a/data/hide_show_data.asm
+++ b/data/maps/hide_show_data.asm
diff --git a/data/map_header_banks.asm b/data/maps/map_header_banks.asm
index d698cfee..d698cfee 100755
--- a/data/map_header_banks.asm
+++ b/data/maps/map_header_banks.asm
diff --git a/data/map_header_pointers.asm b/data/maps/map_header_pointers.asm
index 9d85eaae..9d85eaae 100755
--- a/data/map_header_pointers.asm
+++ b/data/maps/map_header_pointers.asm
diff --git a/data/maps/names.asm b/data/maps/names.asm
new file mode 100755
index 00000000..c2642942
--- /dev/null
+++ b/data/maps/names.asm
@@ -0,0 +1,107 @@
+MapNames:
+PalletTownName:
+	db "PALLET TOWN@"
+ViridianCityName:
+	db "VIRIDIAN CITY@"
+PewterCityName:
+	db "PEWTER CITY@"
+CeruleanCityName:
+	db "CERULEAN CITY@"
+LavenderTownName:
+	db "LAVENDER TOWN@"
+VermilionCityName:
+	db "VERMILION CITY@"
+CeladonCityName:
+	db "CELADON CITY@"
+FuchsiaCityName:
+	db "FUCHSIA CITY@"
+CinnabarIslandName:
+	db "CINNABAR ISLAND@"
+IndigoPlateauName:
+	db "INDIGO PLATEAU@"
+SaffronCityName:
+	db "SAFFRON CITY@"
+Route1Name:
+	db "ROUTE 1@"
+Route2Name:
+	db "ROUTE 2@"
+Route3Name:
+	db "ROUTE 3@"
+Route4Name:
+	db "ROUTE 4@"
+Route5Name:
+	db "ROUTE 5@"
+Route6Name:
+	db "ROUTE 6@"
+Route7Name:
+	db "ROUTE 7@"
+Route8Name:
+	db "ROUTE 8@"
+Route9Name:
+	db "ROUTE 9@"
+Route10Name:
+	db "ROUTE 10@"
+Route11Name:
+	db "ROUTE 11@"
+Route12Name:
+	db "ROUTE 12@"
+Route13Name:
+	db "ROUTE 13@"
+Route14Name:
+	db "ROUTE 14@"
+Route15Name:
+	db "ROUTE 15@"
+Route16Name:
+	db "ROUTE 16@"
+Route17Name:
+	db "ROUTE 17@"
+Route18Name:
+	db "ROUTE 18@"
+Route19Name:
+	db "SEA ROUTE 19@"
+Route20Name:
+	db "SEA ROUTE 20@"
+Route21Name:
+	db "SEA ROUTE 21@"
+Route22Name:
+	db "ROUTE 22@"
+Route23Name:
+	db "ROUTE 23@"
+Route24Name:
+	db "ROUTE 24@"
+Route25Name:
+	db "ROUTE 25@"
+ViridianForestName:
+	db "VIRIDIAN FOREST@"
+MountMoonName:
+	db "MT.MOON@"
+RockTunnelName:
+	db "ROCK TUNNEL@"
+SeaCottageName:
+	db "SEA COTTAGE@"
+SSAnneName:
+	db "S.S.ANNE@"
+PokemonLeagueName:
+	db "#MON LEAGUE@"
+UndergroundPathName:
+	db "UNDERGROUND PATH@"
+PokemonTowerName:
+	db "#MON TOWER@"
+SeafoamIslandsName:
+	db "SEAFOAM ISLANDS@"
+VictoryRoadName:
+	db "VICTORY ROAD@"
+DiglettsCaveName:
+	db "DIGLETT's CAVE@"
+RocketHQName:
+	db "ROCKET HQ@"
+SilphCoName:
+	db "SILPH CO.@"
+PokemonMansionName:
+	db "<pkmn> MANSION@"
+SafariZoneName:
+	db "SAFARI ZONE@"
+CeruleanCaveName:
+	db "CERULEAN CAVE@"
+PowerPlantName:
+	db "POWER PLANT@"
diff --git a/data/rest_house_maps.asm b/data/maps/rest_house_maps.asm
index 2feb89d3..2feb89d3 100644
--- a/data/rest_house_maps.asm
+++ b/data/maps/rest_house_maps.asm
diff --git a/data/map_songs.asm b/data/maps/songs.asm
index 28e17223..28e17223 100755
--- a/data/map_songs.asm
+++ b/data/maps/songs.asm
diff --git a/data/special_warps.asm b/data/maps/special_warps.asm
index 6b536b67..6b536b67 100755
--- a/data/special_warps.asm
+++ b/data/maps/special_warps.asm
diff --git a/data/sprite_sets.asm b/data/maps/sprite_sets.asm
index 5b0e1e00..5b0e1e00 100755
--- a/data/sprite_sets.asm
+++ b/data/maps/sprite_sets.asm
diff --git a/data/town_map_entries.asm b/data/maps/town_map_entries.asm
index 63ebd51b..63ebd51b 100755
--- a/data/town_map_entries.asm
+++ b/data/maps/town_map_entries.asm
diff --git a/data/town_map_order.asm b/data/maps/town_map_order.asm
index a082c376..a082c376 100755
--- a/data/town_map_order.asm
+++ b/data/maps/town_map_order.asm
diff --git a/data/move_animation_pointers.asm b/data/moves/animation_special_effect_pointers.asm
index ba607141..ba607141 100644
--- a/data/move_animation_pointers.asm
+++ b/data/moves/animation_special_effect_pointers.asm
diff --git a/data/move_animation_special_effects.asm b/data/moves/animation_special_effects.asm
index 9dfb5645..9dfb5645 100644
--- a/data/move_animation_special_effects.asm
+++ b/data/moves/animation_special_effects.asm
diff --git a/data/animations.asm b/data/moves/animations.asm
index 8c388afd..8c388afd 100755
--- a/data/animations.asm
+++ b/data/moves/animations.asm
diff --git a/data/effects_pointers.asm b/data/moves/effects_pointers.asm
index 0d36e887..0d36e887 100644
--- a/data/effects_pointers.asm
+++ b/data/moves/effects_pointers.asm
diff --git a/data/move_grammar.asm b/data/moves/grammar.asm
index 8113ab7c..8113ab7c 100644
--- a/data/move_grammar.asm
+++ b/data/moves/grammar.asm
diff --git a/data/hm_moves.asm b/data/moves/hm_moves.asm
index d72eddfe..d72eddfe 100644
--- a/data/hm_moves.asm
+++ b/data/moves/hm_moves.asm
diff --git a/data/moves.asm b/data/moves/moves.asm
index 44859681..44859681 100755
--- a/data/moves.asm
+++ b/data/moves/moves.asm
diff --git a/data/moves/names.asm b/data/moves/names.asm
new file mode 100644
index 00000000..f8706ee3
--- /dev/null
+++ b/data/moves/names.asm
@@ -0,0 +1,167 @@
+MoveNames::
+	db "POUND@"
+	db "KARATE CHOP@"
+	db "DOUBLESLAP@"
+	db "COMET PUNCH@"
+	db "MEGA PUNCH@"
+	db "PAY DAY@"
+	db "FIRE PUNCH@"
+	db "ICE PUNCH@"
+	db "THUNDERPUNCH@"
+	db "SCRATCH@"
+	db "VICEGRIP@"
+	db "GUILLOTINE@"
+	db "RAZOR WIND@"
+	db "SWORDS DANCE@"
+	db "CUT@"
+	db "GUST@"
+	db "WING ATTACK@"
+	db "WHIRLWIND@"
+	db "FLY@"
+	db "BIND@"
+	db "SLAM@"
+	db "VINE WHIP@"
+	db "STOMP@"
+	db "DOUBLE KICK@"
+	db "MEGA KICK@"
+	db "JUMP KICK@"
+	db "ROLLING KICK@"
+	db "SAND-ATTACK@"
+	db "HEADBUTT@"
+	db "HORN ATTACK@"
+	db "FURY ATTACK@"
+	db "HORN DRILL@"
+	db "TACKLE@"
+	db "BODY SLAM@"
+	db "WRAP@"
+	db "TAKE DOWN@"
+	db "THRASH@"
+	db "DOUBLE-EDGE@"
+	db "TAIL WHIP@"
+	db "POISON STING@"
+	db "TWINEEDLE@"
+	db "PIN MISSILE@"
+	db "LEER@"
+	db "BITE@"
+	db "GROWL@"
+	db "ROAR@"
+	db "SING@"
+	db "SUPERSONIC@"
+	db "SONICBOOM@"
+	db "DISABLE@"
+	db "ACID@"
+	db "EMBER@"
+	db "FLAMETHROWER@"
+	db "MIST@"
+	db "WATER GUN@"
+	db "HYDRO PUMP@"
+	db "SURF@"
+	db "ICE BEAM@"
+	db "BLIZZARD@"
+	db "PSYBEAM@"
+	db "BUBBLEBEAM@"
+	db "AURORA BEAM@"
+	db "HYPER BEAM@"
+	db "PECK@"
+	db "DRILL PECK@"
+	db "SUBMISSION@"
+	db "LOW KICK@"
+	db "COUNTER@"
+	db "SEISMIC TOSS@"
+	db "STRENGTH@"
+	db "ABSORB@"
+	db "MEGA DRAIN@"
+	db "LEECH SEED@"
+	db "GROWTH@"
+	db "RAZOR LEAF@"
+	db "SOLARBEAM@"
+	db "POISONPOWDER@"
+	db "STUN SPORE@"
+	db "SLEEP POWDER@"
+	db "PETAL DANCE@"
+	db "STRING SHOT@"
+	db "DRAGON RAGE@"
+	db "FIRE SPIN@"
+	db "THUNDERSHOCK@"
+	db "THUNDERBOLT@"
+	db "THUNDER WAVE@"
+	db "THUNDER@"
+	db "ROCK THROW@"
+	db "EARTHQUAKE@"
+	db "FISSURE@"
+	db "DIG@"
+	db "TOXIC@"
+	db "CONFUSION@"
+	db "PSYCHIC@"
+	db "HYPNOSIS@"
+	db "MEDITATE@"
+	db "AGILITY@"
+	db "QUICK ATTACK@"
+	db "RAGE@"
+	db "TELEPORT@"
+	db "NIGHT SHADE@"
+	db "MIMIC@"
+	db "SCREECH@"
+	db "DOUBLE TEAM@"
+	db "RECOVER@"
+	db "HARDEN@"
+	db "MINIMIZE@"
+	db "SMOKESCREEN@"
+	db "CONFUSE RAY@"
+	db "WITHDRAW@"
+	db "DEFENSE CURL@"
+	db "BARRIER@"
+	db "LIGHT SCREEN@"
+	db "HAZE@"
+	db "REFLECT@"
+	db "FOCUS ENERGY@"
+	db "BIDE@"
+	db "METRONOME@"
+	db "MIRROR MOVE@"
+	db "SELFDESTRUCT@"
+	db "EGG BOMB@"
+	db "LICK@"
+	db "SMOG@"
+	db "SLUDGE@"
+	db "BONE CLUB@"
+	db "FIRE BLAST@"
+	db "WATERFALL@"
+	db "CLAMP@"
+	db "SWIFT@"
+	db "SKULL BASH@"
+	db "SPIKE CANNON@"
+	db "CONSTRICT@"
+	db "AMNESIA@"
+	db "KINESIS@"
+	db "SOFTBOILED@"
+	db "HI JUMP KICK@"
+	db "GLARE@"
+	db "DREAM EATER@"
+	db "POISON GAS@"
+	db "BARRAGE@"
+	db "LEECH LIFE@"
+	db "LOVELY KISS@"
+	db "SKY ATTACK@"
+	db "TRANSFORM@"
+	db "BUBBLE@"
+	db "DIZZY PUNCH@"
+	db "SPORE@"
+	db "FLASH@"
+	db "PSYWAVE@"
+	db "SPLASH@"
+	db "ACID ARMOR@"
+	db "CRABHAMMER@"
+	db "EXPLOSION@"
+	db "FURY SWIPES@"
+	db "BONEMERANG@"
+	db "REST@"
+	db "ROCK SLIDE@"
+	db "HYPER FANG@"
+	db "SHARPEN@"
+	db "CONVERSION@"
+	db "TRI ATTACK@"
+	db "SUPER FANG@"
+	db "SLASH@"
+	db "SUBSTITUTE@"
+	db "STRUGGLE@"
+
diff --git a/data/move_sfx.asm b/data/moves/sfx.asm
index 28ad0b63..28ad0b63 100644
--- a/data/move_sfx.asm
+++ b/data/moves/sfx.asm
diff --git a/data/tms.asm b/data/moves/tmhm_moves.asm
index 23c1685e..23c1685e 100755
--- a/data/tms.asm
+++ b/data/moves/tmhm_moves.asm
diff --git a/data/player_names.asm b/data/player_names.asm
new file mode 100644
index 00000000..f57c9877
--- /dev/null
+++ b/data/player_names.asm
@@ -0,0 +1,31 @@
+IF DEF(_RED)
+DefaultNamesPlayer:
+	db   "NEW NAME"
+	next "RED"
+	next "ASH"
+	next "JACK"
+	db   "@"
+
+DefaultNamesRival:
+	db   "NEW NAME"
+	next "BLUE"
+	next "GARY"
+	next "JOHN"
+	db   "@"
+ENDC
+
+IF DEF(_BLUE)
+DefaultNamesPlayer:
+	db   "NEW NAME"
+	next "BLUE"
+	next "GARY"
+	next "JOHN"
+	db   "@"
+
+DefaultNamesRival:
+	db   "NEW NAME"
+	next "RED"
+	next "ASH"
+	next "JACK"
+	db   "@"
+ENDC
diff --git a/data/player_names_list.asm b/data/player_names_list.asm
new file mode 100644
index 00000000..56075df0
--- /dev/null
+++ b/data/player_names_list.asm
@@ -0,0 +1,27 @@
+IF DEF(_RED)
+DefaultNamesPlayerList:
+	db "NEW NAME@"
+	db "RED@"
+	db "ASH@"
+	db "JACK@"
+
+DefaultNamesRivalList:
+	db "NEW NAME@"
+	db "BLUE@"
+	db "GARY@"
+	db "JOHN@"
+ENDC
+
+IF DEF(_BLUE)
+DefaultNamesPlayerList:
+	db "NEW NAME@"
+	db "BLUE@"
+	db "GARY@"
+	db "JOHN@"
+
+DefaultNamesRivalList:
+	db "NEW NAME@"
+	db "RED@"
+	db "ASH@"
+	db "JACK@"
+ENDC
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
new file mode 100755
index 00000000..809ae8eb
--- /dev/null
+++ b/data/pokemon/base_stats.asm
@@ -0,0 +1,153 @@
+BaseStats::
+MonBaseStats::
+INCLUDE "data/pokemon/base_stats/bulbasaur.asm"
+MonBaseStatsEnd::
+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/nidoranf.asm"
+INCLUDE "data/pokemon/base_stats/nidorina.asm"
+INCLUDE "data/pokemon/base_stats/nidoqueen.asm"
+INCLUDE "data/pokemon/base_stats/nidoranm.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/farfetchd.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/mrmime.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"
diff --git a/data/baseStats/abra.asm b/data/pokemon/base_stats/abra.asm
index dfb446ca..dfb446ca 100644
--- a/data/baseStats/abra.asm
+++ b/data/pokemon/base_stats/abra.asm
diff --git a/data/baseStats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm
index 564fc831..564fc831 100644
--- a/data/baseStats/aerodactyl.asm
+++ b/data/pokemon/base_stats/aerodactyl.asm
diff --git a/data/baseStats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm
index 57f7f516..57f7f516 100644
--- a/data/baseStats/alakazam.asm
+++ b/data/pokemon/base_stats/alakazam.asm
diff --git a/data/baseStats/arbok.asm b/data/pokemon/base_stats/arbok.asm
index 1e88289f..1e88289f 100644
--- a/data/baseStats/arbok.asm
+++ b/data/pokemon/base_stats/arbok.asm
diff --git a/data/baseStats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm
index c661cc88..c661cc88 100644
--- a/data/baseStats/arcanine.asm
+++ b/data/pokemon/base_stats/arcanine.asm
diff --git a/data/baseStats/articuno.asm b/data/pokemon/base_stats/articuno.asm
index 6265c654..6265c654 100644
--- a/data/baseStats/articuno.asm
+++ b/data/pokemon/base_stats/articuno.asm
diff --git a/data/baseStats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm
index 516f5747..516f5747 100644
--- a/data/baseStats/beedrill.asm
+++ b/data/pokemon/base_stats/beedrill.asm
diff --git a/data/baseStats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm
index 42c1a22c..42c1a22c 100644
--- a/data/baseStats/bellsprout.asm
+++ b/data/pokemon/base_stats/bellsprout.asm
diff --git a/data/baseStats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm
index 1e073c26..1e073c26 100644
--- a/data/baseStats/blastoise.asm
+++ b/data/pokemon/base_stats/blastoise.asm
diff --git a/data/baseStats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm
index 08e171ef..08e171ef 100644
--- a/data/baseStats/bulbasaur.asm
+++ b/data/pokemon/base_stats/bulbasaur.asm
diff --git a/data/baseStats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm
index 2f0dae18..2f0dae18 100644
--- a/data/baseStats/butterfree.asm
+++ b/data/pokemon/base_stats/butterfree.asm
diff --git a/data/baseStats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm
index 75270144..75270144 100644
--- a/data/baseStats/caterpie.asm
+++ b/data/pokemon/base_stats/caterpie.asm
diff --git a/data/baseStats/chansey.asm b/data/pokemon/base_stats/chansey.asm
index 7f0cf16e..7f0cf16e 100644
--- a/data/baseStats/chansey.asm
+++ b/data/pokemon/base_stats/chansey.asm
diff --git a/data/baseStats/charizard.asm b/data/pokemon/base_stats/charizard.asm
index c0df120e..c0df120e 100644
--- a/data/baseStats/charizard.asm
+++ b/data/pokemon/base_stats/charizard.asm
diff --git a/data/baseStats/charmander.asm b/data/pokemon/base_stats/charmander.asm
index a296b609..a296b609 100644
--- a/data/baseStats/charmander.asm
+++ b/data/pokemon/base_stats/charmander.asm
diff --git a/data/baseStats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm
index 62e8eb89..62e8eb89 100644
--- a/data/baseStats/charmeleon.asm
+++ b/data/pokemon/base_stats/charmeleon.asm
diff --git a/data/baseStats/clefable.asm b/data/pokemon/base_stats/clefable.asm
index 407a5170..407a5170 100644
--- a/data/baseStats/clefable.asm
+++ b/data/pokemon/base_stats/clefable.asm
diff --git a/data/baseStats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm
index 2e3bbf92..2e3bbf92 100644
--- a/data/baseStats/clefairy.asm
+++ b/data/pokemon/base_stats/clefairy.asm
diff --git a/data/baseStats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm
index 9b79bd78..9b79bd78 100644
--- a/data/baseStats/cloyster.asm
+++ b/data/pokemon/base_stats/cloyster.asm
diff --git a/data/baseStats/cubone.asm b/data/pokemon/base_stats/cubone.asm
index 776a771c..776a771c 100644
--- a/data/baseStats/cubone.asm
+++ b/data/pokemon/base_stats/cubone.asm
diff --git a/data/baseStats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm
index 59ab04b0..59ab04b0 100644
--- a/data/baseStats/dewgong.asm
+++ b/data/pokemon/base_stats/dewgong.asm
diff --git a/data/baseStats/diglett.asm b/data/pokemon/base_stats/diglett.asm
index da8648d8..da8648d8 100644
--- a/data/baseStats/diglett.asm
+++ b/data/pokemon/base_stats/diglett.asm
diff --git a/data/baseStats/ditto.asm b/data/pokemon/base_stats/ditto.asm
index aff87275..aff87275 100644
--- a/data/baseStats/ditto.asm
+++ b/data/pokemon/base_stats/ditto.asm
diff --git a/data/baseStats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm
index baf1fd8a..baf1fd8a 100644
--- a/data/baseStats/dodrio.asm
+++ b/data/pokemon/base_stats/dodrio.asm
diff --git a/data/baseStats/doduo.asm b/data/pokemon/base_stats/doduo.asm
index 33d1506a..33d1506a 100644
--- a/data/baseStats/doduo.asm
+++ b/data/pokemon/base_stats/doduo.asm
diff --git a/data/baseStats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm
index 9d8ab0c2..9d8ab0c2 100644
--- a/data/baseStats/dragonair.asm
+++ b/data/pokemon/base_stats/dragonair.asm
diff --git a/data/baseStats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm
index 22653bcc..22653bcc 100644
--- a/data/baseStats/dragonite.asm
+++ b/data/pokemon/base_stats/dragonite.asm
diff --git a/data/baseStats/dratini.asm b/data/pokemon/base_stats/dratini.asm
index c377c217..c377c217 100644
--- a/data/baseStats/dratini.asm
+++ b/data/pokemon/base_stats/dratini.asm
diff --git a/data/baseStats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm
index 075158c4..075158c4 100644
--- a/data/baseStats/drowzee.asm
+++ b/data/pokemon/base_stats/drowzee.asm
diff --git a/data/baseStats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm
index 86a55e22..86a55e22 100644
--- a/data/baseStats/dugtrio.asm
+++ b/data/pokemon/base_stats/dugtrio.asm
diff --git a/data/baseStats/eevee.asm b/data/pokemon/base_stats/eevee.asm
index d5cbaa9b..d5cbaa9b 100644
--- a/data/baseStats/eevee.asm
+++ b/data/pokemon/base_stats/eevee.asm
diff --git a/data/baseStats/ekans.asm b/data/pokemon/base_stats/ekans.asm
index 94295b51..94295b51 100644
--- a/data/baseStats/ekans.asm
+++ b/data/pokemon/base_stats/ekans.asm
diff --git a/data/baseStats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm
index 5a1bc59f..5a1bc59f 100644
--- a/data/baseStats/electabuzz.asm
+++ b/data/pokemon/base_stats/electabuzz.asm
diff --git a/data/baseStats/electrode.asm b/data/pokemon/base_stats/electrode.asm
index 86b023c3..86b023c3 100644
--- a/data/baseStats/electrode.asm
+++ b/data/pokemon/base_stats/electrode.asm
diff --git a/data/baseStats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm
index 6499362a..6499362a 100644
--- a/data/baseStats/exeggcute.asm
+++ b/data/pokemon/base_stats/exeggcute.asm
diff --git a/data/baseStats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm
index 17b1f6a6..17b1f6a6 100644
--- a/data/baseStats/exeggutor.asm
+++ b/data/pokemon/base_stats/exeggutor.asm
diff --git a/data/baseStats/farfetchd.asm b/data/pokemon/base_stats/farfetchd.asm
index ffbb70f1..ffbb70f1 100644
--- a/data/baseStats/farfetchd.asm
+++ b/data/pokemon/base_stats/farfetchd.asm
diff --git a/data/baseStats/fearow.asm b/data/pokemon/base_stats/fearow.asm
index d03722ba..d03722ba 100644
--- a/data/baseStats/fearow.asm
+++ b/data/pokemon/base_stats/fearow.asm
diff --git a/data/baseStats/flareon.asm b/data/pokemon/base_stats/flareon.asm
index 8ebe4ede..8ebe4ede 100644
--- a/data/baseStats/flareon.asm
+++ b/data/pokemon/base_stats/flareon.asm
diff --git a/data/baseStats/gastly.asm b/data/pokemon/base_stats/gastly.asm
index b68d431b..b68d431b 100644
--- a/data/baseStats/gastly.asm
+++ b/data/pokemon/base_stats/gastly.asm
diff --git a/data/baseStats/gengar.asm b/data/pokemon/base_stats/gengar.asm
index bdbe5de6..bdbe5de6 100644
--- a/data/baseStats/gengar.asm
+++ b/data/pokemon/base_stats/gengar.asm
diff --git a/data/baseStats/geodude.asm b/data/pokemon/base_stats/geodude.asm
index 9ffd1c86..9ffd1c86 100644
--- a/data/baseStats/geodude.asm
+++ b/data/pokemon/base_stats/geodude.asm
diff --git a/data/baseStats/gloom.asm b/data/pokemon/base_stats/gloom.asm
index 6c08287e..6c08287e 100644
--- a/data/baseStats/gloom.asm
+++ b/data/pokemon/base_stats/gloom.asm
diff --git a/data/baseStats/golbat.asm b/data/pokemon/base_stats/golbat.asm
index de93ee3f..de93ee3f 100644
--- a/data/baseStats/golbat.asm
+++ b/data/pokemon/base_stats/golbat.asm
diff --git a/data/baseStats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm
index 32c89599..32c89599 100644
--- a/data/baseStats/goldeen.asm
+++ b/data/pokemon/base_stats/goldeen.asm
diff --git a/data/baseStats/golduck.asm b/data/pokemon/base_stats/golduck.asm
index 6f2cc6a9..6f2cc6a9 100644
--- a/data/baseStats/golduck.asm
+++ b/data/pokemon/base_stats/golduck.asm
diff --git a/data/baseStats/golem.asm b/data/pokemon/base_stats/golem.asm
index b5506372..b5506372 100644
--- a/data/baseStats/golem.asm
+++ b/data/pokemon/base_stats/golem.asm
diff --git a/data/baseStats/graveler.asm b/data/pokemon/base_stats/graveler.asm
index 0525c587..0525c587 100644
--- a/data/baseStats/graveler.asm
+++ b/data/pokemon/base_stats/graveler.asm
diff --git a/data/baseStats/grimer.asm b/data/pokemon/base_stats/grimer.asm
index 63533c00..63533c00 100644
--- a/data/baseStats/grimer.asm
+++ b/data/pokemon/base_stats/grimer.asm
diff --git a/data/baseStats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm
index 9bf5e036..9bf5e036 100644
--- a/data/baseStats/growlithe.asm
+++ b/data/pokemon/base_stats/growlithe.asm
diff --git a/data/baseStats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm
index 3cd2e213..3cd2e213 100644
--- a/data/baseStats/gyarados.asm
+++ b/data/pokemon/base_stats/gyarados.asm
diff --git a/data/baseStats/haunter.asm b/data/pokemon/base_stats/haunter.asm
index 879b75d4..879b75d4 100644
--- a/data/baseStats/haunter.asm
+++ b/data/pokemon/base_stats/haunter.asm
diff --git a/data/baseStats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm
index f34bf086..f34bf086 100644
--- a/data/baseStats/hitmonchan.asm
+++ b/data/pokemon/base_stats/hitmonchan.asm
diff --git a/data/baseStats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm
index 2590bfb0..2590bfb0 100644
--- a/data/baseStats/hitmonlee.asm
+++ b/data/pokemon/base_stats/hitmonlee.asm
diff --git a/data/baseStats/horsea.asm b/data/pokemon/base_stats/horsea.asm
index ecf98197..ecf98197 100644
--- a/data/baseStats/horsea.asm
+++ b/data/pokemon/base_stats/horsea.asm
diff --git a/data/baseStats/hypno.asm b/data/pokemon/base_stats/hypno.asm
index 9d251cd6..9d251cd6 100644
--- a/data/baseStats/hypno.asm
+++ b/data/pokemon/base_stats/hypno.asm
diff --git a/data/baseStats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm
index f90549b9..f90549b9 100644
--- a/data/baseStats/ivysaur.asm
+++ b/data/pokemon/base_stats/ivysaur.asm
diff --git a/data/baseStats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm
index 0a6bdf49..0a6bdf49 100644
--- a/data/baseStats/jigglypuff.asm
+++ b/data/pokemon/base_stats/jigglypuff.asm
diff --git a/data/baseStats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm
index 1752354b..1752354b 100644
--- a/data/baseStats/jolteon.asm
+++ b/data/pokemon/base_stats/jolteon.asm
diff --git a/data/baseStats/jynx.asm b/data/pokemon/base_stats/jynx.asm
index f82796e5..f82796e5 100644
--- a/data/baseStats/jynx.asm
+++ b/data/pokemon/base_stats/jynx.asm
diff --git a/data/baseStats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm
index fc2df213..fc2df213 100644
--- a/data/baseStats/kabuto.asm
+++ b/data/pokemon/base_stats/kabuto.asm
diff --git a/data/baseStats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm
index ca35e56a..ca35e56a 100644
--- a/data/baseStats/kabutops.asm
+++ b/data/pokemon/base_stats/kabutops.asm
diff --git a/data/baseStats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm
index 652f762a..652f762a 100644
--- a/data/baseStats/kadabra.asm
+++ b/data/pokemon/base_stats/kadabra.asm
diff --git a/data/baseStats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm
index 4a7ec5b4..4a7ec5b4 100644
--- a/data/baseStats/kakuna.asm
+++ b/data/pokemon/base_stats/kakuna.asm
diff --git a/data/baseStats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm
index 381c8879..381c8879 100644
--- a/data/baseStats/kangaskhan.asm
+++ b/data/pokemon/base_stats/kangaskhan.asm
diff --git a/data/baseStats/kingler.asm b/data/pokemon/base_stats/kingler.asm
index d4b426fb..d4b426fb 100644
--- a/data/baseStats/kingler.asm
+++ b/data/pokemon/base_stats/kingler.asm
diff --git a/data/baseStats/koffing.asm b/data/pokemon/base_stats/koffing.asm
index ca3e1029..ca3e1029 100644
--- a/data/baseStats/koffing.asm
+++ b/data/pokemon/base_stats/koffing.asm
diff --git a/data/baseStats/krabby.asm b/data/pokemon/base_stats/krabby.asm
index d1839d26..d1839d26 100644
--- a/data/baseStats/krabby.asm
+++ b/data/pokemon/base_stats/krabby.asm
diff --git a/data/baseStats/lapras.asm b/data/pokemon/base_stats/lapras.asm
index 17b80461..17b80461 100644
--- a/data/baseStats/lapras.asm
+++ b/data/pokemon/base_stats/lapras.asm
diff --git a/data/baseStats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm
index 5c772dd3..5c772dd3 100644
--- a/data/baseStats/lickitung.asm
+++ b/data/pokemon/base_stats/lickitung.asm
diff --git a/data/baseStats/machamp.asm b/data/pokemon/base_stats/machamp.asm
index 825766a6..825766a6 100644
--- a/data/baseStats/machamp.asm
+++ b/data/pokemon/base_stats/machamp.asm
diff --git a/data/baseStats/machoke.asm b/data/pokemon/base_stats/machoke.asm
index 9bc5df42..9bc5df42 100644
--- a/data/baseStats/machoke.asm
+++ b/data/pokemon/base_stats/machoke.asm
diff --git a/data/baseStats/machop.asm b/data/pokemon/base_stats/machop.asm
index a691183a..a691183a 100644
--- a/data/baseStats/machop.asm
+++ b/data/pokemon/base_stats/machop.asm
diff --git a/data/baseStats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm
index 5185e3f0..5185e3f0 100644
--- a/data/baseStats/magikarp.asm
+++ b/data/pokemon/base_stats/magikarp.asm
diff --git a/data/baseStats/magmar.asm b/data/pokemon/base_stats/magmar.asm
index b24f519c..b24f519c 100644
--- a/data/baseStats/magmar.asm
+++ b/data/pokemon/base_stats/magmar.asm
diff --git a/data/baseStats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm
index f7fe0b00..f7fe0b00 100644
--- a/data/baseStats/magnemite.asm
+++ b/data/pokemon/base_stats/magnemite.asm
diff --git a/data/baseStats/magneton.asm b/data/pokemon/base_stats/magneton.asm
index 7c32d059..7c32d059 100644
--- a/data/baseStats/magneton.asm
+++ b/data/pokemon/base_stats/magneton.asm
diff --git a/data/baseStats/mankey.asm b/data/pokemon/base_stats/mankey.asm
index 07b961c5..07b961c5 100644
--- a/data/baseStats/mankey.asm
+++ b/data/pokemon/base_stats/mankey.asm
diff --git a/data/baseStats/marowak.asm b/data/pokemon/base_stats/marowak.asm
index a2c5a4c6..a2c5a4c6 100644
--- a/data/baseStats/marowak.asm
+++ b/data/pokemon/base_stats/marowak.asm
diff --git a/data/baseStats/meowth.asm b/data/pokemon/base_stats/meowth.asm
index aa1904ba..aa1904ba 100644
--- a/data/baseStats/meowth.asm
+++ b/data/pokemon/base_stats/meowth.asm
diff --git a/data/baseStats/metapod.asm b/data/pokemon/base_stats/metapod.asm
index cf4f52b7..cf4f52b7 100644
--- a/data/baseStats/metapod.asm
+++ b/data/pokemon/base_stats/metapod.asm
diff --git a/data/baseStats/mew.asm b/data/pokemon/base_stats/mew.asm
index f89a2864..f89a2864 100644
--- a/data/baseStats/mew.asm
+++ b/data/pokemon/base_stats/mew.asm
diff --git a/data/baseStats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm
index 6e85291d..6e85291d 100644
--- a/data/baseStats/mewtwo.asm
+++ b/data/pokemon/base_stats/mewtwo.asm
diff --git a/data/baseStats/moltres.asm b/data/pokemon/base_stats/moltres.asm
index 4c54cf44..4c54cf44 100644
--- a/data/baseStats/moltres.asm
+++ b/data/pokemon/base_stats/moltres.asm
diff --git a/data/baseStats/mrmime.asm b/data/pokemon/base_stats/mrmime.asm
index 95f2655a..95f2655a 100644
--- a/data/baseStats/mrmime.asm
+++ b/data/pokemon/base_stats/mrmime.asm
diff --git a/data/baseStats/muk.asm b/data/pokemon/base_stats/muk.asm
index 45f7921f..45f7921f 100644
--- a/data/baseStats/muk.asm
+++ b/data/pokemon/base_stats/muk.asm
diff --git a/data/baseStats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm
index 7d5ff438..7d5ff438 100644
--- a/data/baseStats/nidoking.asm
+++ b/data/pokemon/base_stats/nidoking.asm
diff --git a/data/baseStats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm
index 9b635e3e..9b635e3e 100644
--- a/data/baseStats/nidoqueen.asm
+++ b/data/pokemon/base_stats/nidoqueen.asm
diff --git a/data/baseStats/nidoranf.asm b/data/pokemon/base_stats/nidoranf.asm
index f58e971d..f58e971d 100644
--- a/data/baseStats/nidoranf.asm
+++ b/data/pokemon/base_stats/nidoranf.asm
diff --git a/data/baseStats/nidoranm.asm b/data/pokemon/base_stats/nidoranm.asm
index 2c5374ba..2c5374ba 100644
--- a/data/baseStats/nidoranm.asm
+++ b/data/pokemon/base_stats/nidoranm.asm
diff --git a/data/baseStats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm
index ae7681c4..ae7681c4 100644
--- a/data/baseStats/nidorina.asm
+++ b/data/pokemon/base_stats/nidorina.asm
diff --git a/data/baseStats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm
index c9c87c25..c9c87c25 100644
--- a/data/baseStats/nidorino.asm
+++ b/data/pokemon/base_stats/nidorino.asm
diff --git a/data/baseStats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm
index 88d95329..88d95329 100644
--- a/data/baseStats/ninetales.asm
+++ b/data/pokemon/base_stats/ninetales.asm
diff --git a/data/baseStats/oddish.asm b/data/pokemon/base_stats/oddish.asm
index d0309427..d0309427 100644
--- a/data/baseStats/oddish.asm
+++ b/data/pokemon/base_stats/oddish.asm
diff --git a/data/baseStats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm
index 33541539..33541539 100644
--- a/data/baseStats/omanyte.asm
+++ b/data/pokemon/base_stats/omanyte.asm
diff --git a/data/baseStats/omastar.asm b/data/pokemon/base_stats/omastar.asm
index dfd5c7a2..dfd5c7a2 100644
--- a/data/baseStats/omastar.asm
+++ b/data/pokemon/base_stats/omastar.asm
diff --git a/data/baseStats/onix.asm b/data/pokemon/base_stats/onix.asm
index a0ad840e..a0ad840e 100644
--- a/data/baseStats/onix.asm
+++ b/data/pokemon/base_stats/onix.asm
diff --git a/data/baseStats/paras.asm b/data/pokemon/base_stats/paras.asm
index 47d2d490..47d2d490 100644
--- a/data/baseStats/paras.asm
+++ b/data/pokemon/base_stats/paras.asm
diff --git a/data/baseStats/parasect.asm b/data/pokemon/base_stats/parasect.asm
index 8e39c90e..8e39c90e 100644
--- a/data/baseStats/parasect.asm
+++ b/data/pokemon/base_stats/parasect.asm
diff --git a/data/baseStats/persian.asm b/data/pokemon/base_stats/persian.asm
index 40a9d70c..40a9d70c 100644
--- a/data/baseStats/persian.asm
+++ b/data/pokemon/base_stats/persian.asm
diff --git a/data/baseStats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm
index 9c770dd6..9c770dd6 100644
--- a/data/baseStats/pidgeot.asm
+++ b/data/pokemon/base_stats/pidgeot.asm
diff --git a/data/baseStats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm
index 1a2962e7..1a2962e7 100644
--- a/data/baseStats/pidgeotto.asm
+++ b/data/pokemon/base_stats/pidgeotto.asm
diff --git a/data/baseStats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm
index ca167e3b..ca167e3b 100644
--- a/data/baseStats/pidgey.asm
+++ b/data/pokemon/base_stats/pidgey.asm
diff --git a/data/baseStats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm
index 36391ed8..36391ed8 100644
--- a/data/baseStats/pikachu.asm
+++ b/data/pokemon/base_stats/pikachu.asm
diff --git a/data/baseStats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm
index db749370..db749370 100644
--- a/data/baseStats/pinsir.asm
+++ b/data/pokemon/base_stats/pinsir.asm
diff --git a/data/baseStats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm
index a4e260ba..a4e260ba 100644
--- a/data/baseStats/poliwag.asm
+++ b/data/pokemon/base_stats/poliwag.asm
diff --git a/data/baseStats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm
index 706bd498..706bd498 100644
--- a/data/baseStats/poliwhirl.asm
+++ b/data/pokemon/base_stats/poliwhirl.asm
diff --git a/data/baseStats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm
index 6f7d4b78..6f7d4b78 100644
--- a/data/baseStats/poliwrath.asm
+++ b/data/pokemon/base_stats/poliwrath.asm
diff --git a/data/baseStats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm
index 667d3cc9..667d3cc9 100644
--- a/data/baseStats/ponyta.asm
+++ b/data/pokemon/base_stats/ponyta.asm
diff --git a/data/baseStats/porygon.asm b/data/pokemon/base_stats/porygon.asm
index 71a37154..71a37154 100644
--- a/data/baseStats/porygon.asm
+++ b/data/pokemon/base_stats/porygon.asm
diff --git a/data/baseStats/primeape.asm b/data/pokemon/base_stats/primeape.asm
index 2d00ee76..2d00ee76 100644
--- a/data/baseStats/primeape.asm
+++ b/data/pokemon/base_stats/primeape.asm
diff --git a/data/baseStats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm
index 163f851e..163f851e 100644
--- a/data/baseStats/psyduck.asm
+++ b/data/pokemon/base_stats/psyduck.asm
diff --git a/data/baseStats/raichu.asm b/data/pokemon/base_stats/raichu.asm
index c2c0c6a9..c2c0c6a9 100644
--- a/data/baseStats/raichu.asm
+++ b/data/pokemon/base_stats/raichu.asm
diff --git a/data/baseStats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm
index 53dcbe4a..53dcbe4a 100644
--- a/data/baseStats/rapidash.asm
+++ b/data/pokemon/base_stats/rapidash.asm
diff --git a/data/baseStats/raticate.asm b/data/pokemon/base_stats/raticate.asm
index 157b22bb..157b22bb 100644
--- a/data/baseStats/raticate.asm
+++ b/data/pokemon/base_stats/raticate.asm
diff --git a/data/baseStats/rattata.asm b/data/pokemon/base_stats/rattata.asm
index 5dfafddb..5dfafddb 100644
--- a/data/baseStats/rattata.asm
+++ b/data/pokemon/base_stats/rattata.asm
diff --git a/data/baseStats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm
index 9f611a83..9f611a83 100644
--- a/data/baseStats/rhydon.asm
+++ b/data/pokemon/base_stats/rhydon.asm
diff --git a/data/baseStats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm
index b7fc9137..b7fc9137 100644
--- a/data/baseStats/rhyhorn.asm
+++ b/data/pokemon/base_stats/rhyhorn.asm
diff --git a/data/baseStats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm
index a098678e..a098678e 100644
--- a/data/baseStats/sandshrew.asm
+++ b/data/pokemon/base_stats/sandshrew.asm
diff --git a/data/baseStats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm
index c596265c..c596265c 100644
--- a/data/baseStats/sandslash.asm
+++ b/data/pokemon/base_stats/sandslash.asm
diff --git a/data/baseStats/scyther.asm b/data/pokemon/base_stats/scyther.asm
index 303a33c1..303a33c1 100644
--- a/data/baseStats/scyther.asm
+++ b/data/pokemon/base_stats/scyther.asm
diff --git a/data/baseStats/seadra.asm b/data/pokemon/base_stats/seadra.asm
index cd9bbc3f..cd9bbc3f 100644
--- a/data/baseStats/seadra.asm
+++ b/data/pokemon/base_stats/seadra.asm
diff --git a/data/baseStats/seaking.asm b/data/pokemon/base_stats/seaking.asm
index c14b095b..c14b095b 100644
--- a/data/baseStats/seaking.asm
+++ b/data/pokemon/base_stats/seaking.asm
diff --git a/data/baseStats/seel.asm b/data/pokemon/base_stats/seel.asm
index 64c0cd7f..64c0cd7f 100644
--- a/data/baseStats/seel.asm
+++ b/data/pokemon/base_stats/seel.asm
diff --git a/data/baseStats/shellder.asm b/data/pokemon/base_stats/shellder.asm
index c051f2f5..c051f2f5 100644
--- a/data/baseStats/shellder.asm
+++ b/data/pokemon/base_stats/shellder.asm
diff --git a/data/baseStats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm
index 51d3f564..51d3f564 100644
--- a/data/baseStats/slowbro.asm
+++ b/data/pokemon/base_stats/slowbro.asm
diff --git a/data/baseStats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm
index 60e47ea8..60e47ea8 100644
--- a/data/baseStats/slowpoke.asm
+++ b/data/pokemon/base_stats/slowpoke.asm
diff --git a/data/baseStats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm
index c1d47cd6..c1d47cd6 100644
--- a/data/baseStats/snorlax.asm
+++ b/data/pokemon/base_stats/snorlax.asm
diff --git a/data/baseStats/spearow.asm b/data/pokemon/base_stats/spearow.asm
index 9b8db91d..9b8db91d 100644
--- a/data/baseStats/spearow.asm
+++ b/data/pokemon/base_stats/spearow.asm
diff --git a/data/baseStats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm
index 639809f9..639809f9 100644
--- a/data/baseStats/squirtle.asm
+++ b/data/pokemon/base_stats/squirtle.asm
diff --git a/data/baseStats/starmie.asm b/data/pokemon/base_stats/starmie.asm
index 23858638..23858638 100644
--- a/data/baseStats/starmie.asm
+++ b/data/pokemon/base_stats/starmie.asm
diff --git a/data/baseStats/staryu.asm b/data/pokemon/base_stats/staryu.asm
index ffbb1f21..ffbb1f21 100644
--- a/data/baseStats/staryu.asm
+++ b/data/pokemon/base_stats/staryu.asm
diff --git a/data/baseStats/tangela.asm b/data/pokemon/base_stats/tangela.asm
index 65570b3c..65570b3c 100644
--- a/data/baseStats/tangela.asm
+++ b/data/pokemon/base_stats/tangela.asm
diff --git a/data/baseStats/tauros.asm b/data/pokemon/base_stats/tauros.asm
index e66980d7..e66980d7 100644
--- a/data/baseStats/tauros.asm
+++ b/data/pokemon/base_stats/tauros.asm
diff --git a/data/baseStats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm
index 0b1b840d..0b1b840d 100644
--- a/data/baseStats/tentacool.asm
+++ b/data/pokemon/base_stats/tentacool.asm
diff --git a/data/baseStats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm
index ef82c764..ef82c764 100644
--- a/data/baseStats/tentacruel.asm
+++ b/data/pokemon/base_stats/tentacruel.asm
diff --git a/data/baseStats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm
index a01c9ade..a01c9ade 100644
--- a/data/baseStats/vaporeon.asm
+++ b/data/pokemon/base_stats/vaporeon.asm
diff --git a/data/baseStats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm
index 7518f31e..7518f31e 100644
--- a/data/baseStats/venomoth.asm
+++ b/data/pokemon/base_stats/venomoth.asm
diff --git a/data/baseStats/venonat.asm b/data/pokemon/base_stats/venonat.asm
index 1e88d9ae..1e88d9ae 100644
--- a/data/baseStats/venonat.asm
+++ b/data/pokemon/base_stats/venonat.asm
diff --git a/data/baseStats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm
index bda8a528..bda8a528 100644
--- a/data/baseStats/venusaur.asm
+++ b/data/pokemon/base_stats/venusaur.asm
diff --git a/data/baseStats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm
index ce528805..ce528805 100644
--- a/data/baseStats/victreebel.asm
+++ b/data/pokemon/base_stats/victreebel.asm
diff --git a/data/baseStats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm
index 2ec67131..2ec67131 100644
--- a/data/baseStats/vileplume.asm
+++ b/data/pokemon/base_stats/vileplume.asm
diff --git a/data/baseStats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm
index 6cb55714..6cb55714 100644
--- a/data/baseStats/voltorb.asm
+++ b/data/pokemon/base_stats/voltorb.asm
diff --git a/data/baseStats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm
index 9285df13..9285df13 100644
--- a/data/baseStats/vulpix.asm
+++ b/data/pokemon/base_stats/vulpix.asm
diff --git a/data/baseStats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm
index ce37e7b3..ce37e7b3 100644
--- a/data/baseStats/wartortle.asm
+++ b/data/pokemon/base_stats/wartortle.asm
diff --git a/data/baseStats/weedle.asm b/data/pokemon/base_stats/weedle.asm
index 7434d93a..7434d93a 100644
--- a/data/baseStats/weedle.asm
+++ b/data/pokemon/base_stats/weedle.asm
diff --git a/data/baseStats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm
index 48e18a31..48e18a31 100644
--- a/data/baseStats/weepinbell.asm
+++ b/data/pokemon/base_stats/weepinbell.asm
diff --git a/data/baseStats/weezing.asm b/data/pokemon/base_stats/weezing.asm
index 21779741..21779741 100644
--- a/data/baseStats/weezing.asm
+++ b/data/pokemon/base_stats/weezing.asm
diff --git a/data/baseStats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm
index 4f7fec95..4f7fec95 100644
--- a/data/baseStats/wigglytuff.asm
+++ b/data/pokemon/base_stats/wigglytuff.asm
diff --git a/data/baseStats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm
index 560f78c4..560f78c4 100644
--- a/data/baseStats/zapdos.asm
+++ b/data/pokemon/base_stats/zapdos.asm
diff --git a/data/baseStats/zubat.asm b/data/pokemon/base_stats/zubat.asm
index 55b7ac4c..55b7ac4c 100644
--- a/data/baseStats/zubat.asm
+++ b/data/pokemon/base_stats/zubat.asm
diff --git a/data/cries.asm b/data/pokemon/cries.asm
index 1fc9960f..1fc9960f 100755
--- a/data/cries.asm
+++ b/data/pokemon/cries.asm
diff --git a/data/pokedex_entries.asm b/data/pokemon/dex_entries.asm
index 495a8e33..495a8e33 100755
--- a/data/pokedex_entries.asm
+++ b/data/pokemon/dex_entries.asm
diff --git a/data/pokedex_order.asm b/data/pokemon/dex_order.asm
index 0e293946..0e293946 100755
--- a/data/pokedex_order.asm
+++ b/data/pokemon/dex_order.asm
diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm
new file mode 100644
index 00000000..65f3d89d
--- /dev/null
+++ b/data/pokemon/dex_text.asm
@@ -0,0 +1,1510 @@
+_RhydonDexEntry::
+	text "Protected by an"
+	next "armor-like hide,"
+	next "it is capable of"
+
+	page "living in molten"
+	next "lava of 3,600"
+	next "degrees"
+	dex
+
+_KangaskhanDexEntry::
+	text "The infant rarely"
+	next "ventures out of"
+	next "its mother's"
+
+	page "protective pouch"
+	next "until it is 3"
+	next "years old"
+	dex
+
+_NidoranMDexEntry::
+	text "Stiffens its ears"
+	next "to sense danger."
+	next "The larger its"
+
+	page "horns, the more"
+	next "powerful its"
+	next "secreted venom"
+	dex
+
+_ClefairyDexEntry::
+	text "Its magical and"
+	next "cute appeal has"
+	next "many admirers."
+
+	page "It is rare and"
+	next "found only in"
+	next "certain areas"
+	dex
+
+_SpearowDexEntry::
+	text "Eats bugs in"
+	next "grassy areas. It"
+	next "has to flap its"
+
+	page "short wings at"
+	next "high speed to"
+	next "stay airborne"
+	dex
+
+_VoltorbDexEntry::
+	text "Usually found in"
+	next "power plants."
+	next "Easily mistaken"
+
+	page "for a # BALL,"
+	next "they have zapped"
+	next "many people"
+	dex
+
+_NidokingDexEntry::
+	text "It uses its"
+	next "powerful tail in"
+	next "battle to smash,"
+
+	page "constrict, then"
+	next "break the prey's"
+	next "bones"
+	dex
+
+_SlowbroDexEntry::
+	text "The SHELLDER that"
+	next "is latched onto"
+	next "SLOWPOKE's tail"
+
+	page "is said to feed"
+	next "on the host's left"
+	next "over scraps"
+	dex
+
+_IvysaurDexEntry::
+	text "When the bulb on"
+	next "its back grows"
+	next "large, it appears"
+
+	page "to lose the"
+	next "ability to stand"
+	next "on its hind legs"
+	dex
+
+_ExeggutorDexEntry::
+	text "Legend has it that"
+	next "on rare occasions,"
+	next "one of its heads"
+
+	page "will drop off and"
+	next "continue on as an"
+	next "EXEGGCUTE"
+	dex
+
+_LickitungDexEntry::
+	text "Its tongue can be"
+	next "extended like a"
+	next "chameleon's. It"
+
+	page "leaves a tingling"
+	next "sensation when it"
+	next "licks enemies"
+	dex
+
+_ExeggcuteDexEntry::
+	text "Often mistaken"
+	next "for eggs."
+	next "When disturbed,"
+
+	page "they quickly"
+	next "gather and attack"
+	next "in swarms"
+	dex
+
+_GrimerDexEntry::
+	text "Appears in filthy"
+	next "areas. Thrives by"
+	next "sucking up"
+
+	page "polluted sludge"
+	next "that is pumped"
+	next "out of factories"
+	dex
+
+_GengarDexEntry::
+	text "Under a full moon,"
+	next "this #MON"
+	next "likes to mimic"
+
+	page "the shadows of"
+	next "people and laugh"
+	next "at their fright"
+	dex
+
+_NidoranFDexEntry::
+	text "Although small,"
+	next "its venomous"
+	next "barbs render this"
+
+	page "#MON dangerous."
+	next "The female has"
+	next "smaller horns"
+	dex
+
+_NidoqueenDexEntry::
+	text "Its hard scales"
+	next "provide strong"
+	next "protection. It"
+
+	page "uses its hefty"
+	next "bulk to execute"
+	next "powerful moves"
+	dex
+
+_CuboneDexEntry::
+	text "Because it never"
+	next "removes its skull"
+	next "helmet, no one"
+
+	page "has ever seen"
+	next "this #MON's"
+	next "real face"
+	dex
+
+_RhyhornDexEntry::
+	text "Its massive bones"
+	next "are 1000 times"
+	next "harder than human"
+
+	page "bones. It can"
+	next "easily knock a"
+	next "trailer flying"
+	dex
+
+_LaprasDexEntry::
+	text "A #MON that"
+	next "has been over-"
+	next "hunted almost to"
+
+	page "extinction. It"
+	next "can ferry people"
+	next "across the water"
+	dex
+
+_ArcanineDexEntry::
+	text "A #MON that"
+	next "has been admired"
+	next "since the past"
+
+	page "for its beauty."
+	next "It runs agilely"
+	next "as if on wings"
+	dex
+
+_MewDexEntry::
+	text "So rare that it"
+	next "is still said to"
+	next "be a mirage by"
+
+	page "many experts. Only"
+	next "a few people have"
+	next "seen it worldwide"
+	dex
+
+_GyaradosDexEntry::
+	text "Rarely seen in"
+	next "the wild. Huge"
+	next "and vicious, it"
+
+	page "is capable of"
+	next "destroying entire"
+	next "cities in a rage"
+	dex
+
+_ShellderDexEntry::
+	text "Its hard shell"
+	next "repels any kind"
+	next "of attack."
+
+	page "It is vulnerable"
+	next "only when its"
+	next "shell is open"
+	dex
+
+_TentacoolDexEntry::
+	text "Drifts in shallow"
+	next "seas. Anglers who"
+	next "hook them by"
+
+	page "accident are"
+	next "often punished by"
+	next "its stinging acid"
+	dex
+
+_GastlyDexEntry::
+	text "Almost invisible,"
+	next "this gaseous"
+	next "#MON cloaks"
+
+	page "the target and"
+	next "puts it to sleep"
+	next "without notice"
+	dex
+
+_ScytherDexEntry::
+	text "With ninja-like"
+	next "agility and speed,"
+	next "it can create the"
+
+	page "illusion that"
+	next "there is more"
+	next "than one"
+	dex
+
+_StaryuDexEntry::
+	text "An enigmatic"
+	next "#MON that can"
+	next "effortlessly"
+
+	page "regenerate any"
+	next "appendage it"
+	next "loses in battle"
+	dex
+
+_BlastoiseDexEntry::
+	text "A brutal #MON"
+	next "with pressurized"
+	next "water jets on its"
+
+	page "shell. They are"
+	next "used for high"
+	next "speed tackles"
+	dex
+
+_PinsirDexEntry::
+	text "If it fails to"
+	next "crush the victim"
+	next "in its pincers,"
+
+	page "it will swing it"
+	next "around and toss"
+	next "it hard"
+	dex
+
+_TangelaDexEntry::
+	text "The whole body is"
+	next "swathed with wide"
+	next "vines that are"
+
+	page "similar to sea-"
+	next "weed. Its vines"
+	next "shake as it walks"
+	dex
+
+_GrowlitheDexEntry::
+	text "Very protective"
+	next "of its territory."
+	next "It will bark and"
+
+	page "bite to repel"
+	next "intruders from"
+	next "its space"
+	dex
+
+_OnixDexEntry::
+	text "As it grows, the"
+	next "stone portions of"
+	next "its body harden"
+
+	page "to become similar"
+	next "to a diamond, but"
+	next "colored black"
+	dex
+
+_FearowDexEntry::
+	text "With its huge and"
+	next "magnificent wings,"
+	next "it can keep aloft"
+
+	page "without ever"
+	next "having to land"
+	next "for rest"
+	dex
+
+_PidgeyDexEntry::
+	text "A common sight in"
+	next "forests and woods."
+	next "It flaps its"
+
+	page "wings at ground"
+	next "level to kick up"
+	next "blinding sand"
+	dex
+
+_SlowpokeDexEntry::
+	text "Incredibly slow"
+	next "and dopey. It"
+	next "takes 5 seconds"
+
+	page "for it to feel"
+	next "pain when under"
+	next "attack"
+	dex
+
+_KadabraDexEntry::
+	text "It emits special"
+	next "alpha waves from"
+	next "its body that"
+
+	page "induce headaches"
+	next "just by being"
+	next "close by"
+	dex
+
+_GravelerDexEntry::
+	text "Rolls down slopes"
+	next "to move. It rolls"
+	next "over any obstacle"
+
+	page "without slowing"
+	next "or changing its"
+	next "direction"
+	dex
+
+_ChanseyDexEntry::
+	text "A rare and elusive"
+	next "#MON that is"
+	next "said to bring"
+
+	page "happiness to those"
+	next "who manage to get"
+	next "it"
+	dex
+
+_MachokeDexEntry::
+	text "Its muscular body"
+	next "is so powerful, it"
+	next "must wear a power"
+
+	page "save belt to be"
+	next "able to regulate"
+	next "its motions"
+	dex
+
+_MrMimeDexEntry::
+	text "If interrupted"
+	next "while it is"
+	next "miming, it will"
+
+	page "slap around the"
+	next "offender with its"
+	next "broad hands"
+	dex
+
+_HitmonleeDexEntry::
+	text "When in a hurry,"
+	next "its legs lengthen"
+	next "progressively."
+
+	page "It runs smoothly"
+	next "with extra long,"
+	next "loping strides"
+	dex
+
+_HitmonchanDexEntry::
+	text "While apparently"
+	next "doing nothing, it"
+	next "fires punches in"
+
+	page "lightning fast"
+	next "volleys that are"
+	next "impossible to see"
+	dex
+
+_ArbokDexEntry::
+	text "It is rumored that"
+	next "the ferocious"
+	next "warning markings"
+
+	page "on its belly"
+	next "differ from area"
+	next "to area"
+	dex
+
+_ParasectDexEntry::
+	text "A host-parasite"
+	next "pair in which the"
+	next "parasite mushroom"
+
+	page "has taken over the"
+	next "host bug. Prefers"
+	next "damp places"
+	dex
+
+_PsyduckDexEntry::
+	text "While lulling its"
+	next "enemies with its"
+	next "vacant look, this"
+
+	page "wily #MON will"
+	next "use psychokinetic"
+	next "powers"
+	dex
+
+_DrowzeeDexEntry::
+	text "Puts enemies to"
+	next "sleep then eats"
+	next "their dreams."
+
+	page "Occasionally gets"
+	next "sick from eating"
+	next "bad dreams"
+	dex
+
+_GolemDexEntry::
+	text "Its boulder-like"
+	next "body is extremely"
+	next "hard. It can"
+
+	page "easily withstand"
+	next "dynamite blasts"
+	next "without damage"
+	dex
+
+_MagmarDexEntry::
+	text "Its body always"
+	next "burns with an"
+	next "orange glow that"
+
+	page "enables it to"
+	next "hide perfectly"
+	next "among flames"
+	dex
+
+_ElectabuzzDexEntry::
+	text "Normally found"
+	next "near power plants,"
+	next "they can wander"
+
+	page "away and cause"
+	next "major blackouts"
+	next "in cities"
+	dex
+
+_MagnetonDexEntry::
+	text "Formed by several"
+	next "MAGNEMITEs linked"
+	next "together. They"
+
+	page "frequently appear"
+	next "when sunspots"
+	next "flare up"
+	dex
+
+_KoffingDexEntry::
+	text "Because it stores"
+	next "several kinds of"
+	next "toxic gases in"
+
+	page "its body, it is"
+	next "prone to exploding"
+	next "without warning"
+	dex
+
+_MankeyDexEntry::
+	text "Extremely quick to"
+	next "anger. It could"
+	next "be docile one"
+
+	page "moment then"
+	next "thrashing away"
+	next "the next instant"
+	dex
+
+_SeelDexEntry::
+	text "The protruding"
+	next "horn on its head"
+	next "is very hard."
+
+	page "It is used for"
+	next "bashing through"
+	next "thick ice"
+	dex
+
+_DiglettDexEntry::
+	text "Lives about one"
+	next "yard underground"
+	next "where it feeds on"
+
+	page "plant roots. It"
+	next "sometimes appears"
+	next "above ground"
+	dex
+
+_TaurosDexEntry::
+	text "When it targets"
+	next "an enemy, it"
+	next "charges furiously"
+
+	page "while whipping its"
+	next "body with its"
+	next "long tails"
+	dex
+
+_FarfetchdDexEntry::
+	text "The sprig of"
+	next "green onions it"
+	next "holds is its"
+
+	page "weapon. It is"
+	next "used much like a"
+	next "metal sword"
+	dex
+
+_VenonatDexEntry::
+	text "Lives in the"
+	next "shadows of tall"
+	next "trees where it"
+
+	page "eats insects. It"
+	next "is attracted by"
+	next "light at night"
+	dex
+
+_DragoniteDexEntry::
+	text "An extremely"
+	next "rarely seen"
+	next "marine #MON."
+
+	page "Its intelligence"
+	next "is said to match"
+	next "that of humans"
+	dex
+
+_DoduoDexEntry::
+	text "A bird that makes"
+	next "up for its poor"
+	next "flying with its"
+
+	page "fast foot speed."
+	next "Leaves giant"
+	next "footprints"
+	dex
+
+_PoliwagDexEntry::
+	text "Its newly grown"
+	next "legs prevent it"
+	next "from running. It"
+
+	page "appears to prefer"
+	next "swimming than"
+	next "trying to stand"
+	dex
+
+_JynxDexEntry::
+	text "It seductively"
+	next "wiggles its hips"
+	next "as it walks. It"
+
+	page "can cause people"
+	next "to dance in"
+	next "unison with it"
+	dex
+
+_MoltresDexEntry::
+	text "Known as the"
+	next "legendary bird of"
+	next "fire. Every flap"
+
+	page "of its wings"
+	next "creates a dazzling"
+	next "flash of flames"
+	dex
+
+_ArticunoDexEntry::
+	text "A legendary bird"
+	next "#MON that is"
+	next "said to appear to"
+
+	page "doomed people who"
+	next "are lost in icy"
+	next "mountains"
+	dex
+
+_ZapdosDexEntry::
+	text "A legendary bird"
+	next "#MON that is"
+	next "said to appear"
+
+	page "from clouds while"
+	next "dropping enormous"
+	next "lightning bolts"
+	dex
+
+_DittoDexEntry::
+	text "Capable of copying"
+	next "an enemy's genetic"
+	next "code to instantly"
+
+	page "transform itself"
+	next "into a duplicate"
+	next "of the enemy"
+	dex
+
+_MeowthDexEntry::
+	text "Adores circular"
+	next "objects. Wanders"
+	next "the streets on a"
+
+	page "nightly basis to"
+	next "look for dropped"
+	next "loose change"
+	dex
+
+_KrabbyDexEntry::
+	text "Its pincers are"
+	next "not only powerful"
+	next "weapons, they are"
+
+	page "used for balance"
+	next "when walking"
+	next "sideways"
+	dex
+
+_VulpixDexEntry::
+	text "At the time of"
+	next "birth, it has"
+	next "just one tail."
+
+	page "The tail splits"
+	next "from its tip as"
+	next "it grows older"
+	dex
+
+_NinetalesDexEntry::
+	text "Very smart and"
+	next "very vengeful."
+	next "Grabbing one of"
+
+	page "its many tails"
+	next "could result in a"
+	next "1000-year curse"
+	dex
+
+_PikachuDexEntry::
+	text "When several of"
+	next "these #MON"
+	next "gather, their"
+
+	page "electricity could"
+	next "build and cause"
+	next "lightning storms"
+	dex
+
+_RaichuDexEntry::
+	text "Its long tail"
+	next "serves as a"
+	next "ground to protect"
+
+	page "itself from its"
+	next "own high voltage"
+	next "power"
+	dex
+
+_DratiniDexEntry::
+	text "Long considered a"
+	next "mythical #MON"
+	next "until recently"
+
+	page "when a small"
+	next "colony was found"
+	next "living underwater"
+	dex
+
+_DragonairDexEntry::
+	text "A mystical #MON"
+	next "that exudes a"
+	next "gentle aura."
+
+	page "Has the ability"
+	next "to change climate"
+	next "conditions"
+	dex
+
+_KabutoDexEntry::
+	text "A #MON that"
+	next "was resurrected"
+	next "from a fossil"
+
+	page "found in what was"
+	next "once the ocean"
+	next "floor eons ago"
+	dex
+
+_KabutopsDexEntry::
+	text "Its sleek shape is"
+	next "perfect for swim-"
+	next "ming. It slashes"
+
+	page "prey with its"
+	next "claws and drains"
+	next "the body fluids"
+	dex
+
+_HorseaDexEntry::
+	text "Known to shoot"
+	next "down flying bugs"
+	next "with precision"
+
+	page "blasts of ink"
+	next "from the surface"
+	next "of the water"
+	dex
+
+_SeadraDexEntry::
+	text "Capable of swim-"
+	next "ming backwards by"
+	next "rapidly flapping"
+
+	page "its wing-like"
+	next "pectoral fins and"
+	next "stout tail"
+	dex
+
+_SandshrewDexEntry::
+	text "Burrows deep"
+	next "underground in"
+	next "arid locations"
+
+	page "far from water."
+	next "It only emerges"
+	next "to hunt for food"
+	dex
+
+_SandslashDexEntry::
+	text "Curls up into a"
+	next "spiny ball when"
+	next "threatened. It"
+
+	page "can roll while"
+	next "curled up to"
+	next "attack or escape"
+	dex
+
+_OmanyteDexEntry::
+	text "Although long"
+	next "extinct, in rare"
+	next "cases, it can be"
+
+	page "genetically"
+	next "resurrected from"
+	next "fossils"
+	dex
+
+_OmastarDexEntry::
+	text "A prehistoric"
+	next "#MON that died"
+	next "out when its"
+
+	page "heavy shell made"
+	next "it impossible to"
+	next "catch prey"
+	dex
+
+_JigglypuffDexEntry::
+	text "When its huge eyes"
+	next "light up, it sings"
+	next "a mysteriously"
+
+	page "soothing melody"
+	next "that lulls its"
+	next "enemies to sleep"
+	dex
+
+_WigglytuffDexEntry::
+	text "The body is soft"
+	next "and rubbery. When"
+	next "angered, it will"
+
+	page "suck in air and"
+	next "inflate itself to"
+	next "an enormous size"
+	dex
+
+_EeveeDexEntry::
+	text "Its genetic code"
+	next "is irregular."
+	next "It may mutate if"
+
+	page "it is exposed to"
+	next "radiation from"
+	next "element STONEs"
+	dex
+
+_FlareonDexEntry::
+	text "When storing"
+	next "thermal energy in"
+	next "its body, its"
+
+	page "temperature could"
+	next "soar to over 1600"
+	next "degrees"
+	dex
+
+_JolteonDexEntry::
+	text "It accumulates"
+	next "negative ions in"
+	next "the atmosphere to"
+
+	page "blast out 10000-"
+	next "volt lightning"
+	next "bolts"
+	dex
+
+_VaporeonDexEntry::
+	text "Lives close to"
+	next "water. Its long"
+	next "tail is ridged"
+
+	page "with a fin which"
+	next "is often mistaken"
+	next "for a mermaid's"
+	dex
+
+_MachopDexEntry::
+	text "Loves to build"
+	next "its muscles."
+	next "It trains in all"
+
+	page "styles of martial"
+	next "arts to become"
+	next "even stronger"
+	dex
+
+_ZubatDexEntry::
+	text "Forms colonies in"
+	next "perpetually dark"
+	next "places. Uses"
+
+	page "ultrasonic waves"
+	next "to identify and"
+	next "approach targets"
+	dex
+
+_EkansDexEntry::
+	text "Moves silently"
+	next "and stealthily."
+	next "Eats the eggs of"
+
+	page "birds, such as"
+	next "PIDGEY and"
+	next "SPEAROW, whole"
+	dex
+
+_ParasDexEntry::
+	text "Burrows to suck"
+	next "tree roots. The"
+	next "mushrooms on its"
+
+	page "back grow by draw-"
+	next "ing nutrients from"
+	next "the bug host"
+	dex
+
+_PoliwhirlDexEntry::
+	text "Capable of living"
+	next "in or out of"
+	next "water. When out"
+
+	page "of water, it"
+	next "sweats to keep"
+	next "its body slimy"
+	dex
+
+_PoliwrathDexEntry::
+	text "An adept swimmer"
+	next "at both the front"
+	next "crawl and breast"
+
+	page "stroke. Easily"
+	next "overtakes the best"
+	next "human swimmers"
+	dex
+
+_WeedleDexEntry::
+	text "Often found in"
+	next "forests, eating"
+	next "leaves."
+
+	page "It has a sharp"
+	next "venomous stinger"
+	next "on its head"
+	dex
+
+_KakunaDexEntry::
+	text "Almost incapable"
+	next "of moving, this"
+	next "#MON can only"
+
+	page "harden its shell"
+	next "to protect itself"
+	next "from predators"
+	dex
+
+_BeedrillDexEntry::
+	text "Flies at high"
+	next "speed and attacks"
+	next "using its large"
+
+	page "venomous stingers"
+	next "on its forelegs"
+	next "and tail"
+	dex
+
+_DodrioDexEntry::
+	text "Uses its three"
+	next "brains to execute"
+	next "complex plans."
+
+	page "While two heads"
+	next "sleep, one head"
+	next "stays awake"
+	dex
+
+_PrimeapeDexEntry::
+	text "Always furious"
+	next "and tenacious to"
+	next "boot. It will not"
+
+	page "abandon chasing"
+	next "its quarry until"
+	next "it is caught"
+	dex
+
+_DugtrioDexEntry::
+	text "A team of DIGLETT"
+	next "triplets."
+	next "It triggers huge"
+
+	page "earthquakes by"
+	next "burrowing 60 miles"
+	next "underground"
+	dex
+
+_VenomothDexEntry::
+	text "The dust-like"
+	next "scales covering"
+	next "its wings are"
+
+	page "color coded to"
+	next "indicate the kinds"
+	next "of poison it has"
+	dex
+
+_DewgongDexEntry::
+	text "Stores thermal"
+	next "energy in its"
+	next "body. Swims at a"
+
+	page "steady 8 knots"
+	next "even in intensely"
+	next "cold waters"
+	dex
+
+_CaterpieDexEntry::
+	text "Its short feet"
+	next "are tipped with"
+	next "suction pads that"
+
+	page "enable it to"
+	next "tirelessly climb"
+	next "slopes and walls"
+	dex
+
+_MetapodDexEntry::
+	text "This #MON is"
+	next "vulnerable to"
+	next "attack while its"
+
+	page "shell is soft,"
+	next "exposing its weak"
+	next "and tender body"
+	dex
+
+_ButterfreeDexEntry::
+	text "In battle, it"
+	next "flaps its wings"
+	next "at high speed to"
+
+	page "release highly"
+	next "toxic dust into"
+	next "the air"
+	dex
+
+_MachampDexEntry::
+	text "Using its heavy"
+	next "muscles, it throws"
+	next "powerful punches"
+
+	page "that can send the"
+	next "victim clear over"
+	next "the horizon"
+	dex
+
+_GolduckDexEntry::
+	text "Often seen swim-"
+	next "ming elegantly by"
+	next "lake shores. It"
+
+	page "is often mistaken"
+	next "for the Japanese"
+	next "monster, Kappa"
+	dex
+
+_HypnoDexEntry::
+	text "When it locks eyes"
+	next "with an enemy, it"
+	next "will use a mix of"
+
+	page "PSI moves such as"
+	next "HYPNOSIS and"
+	next "CONFUSION"
+	dex
+
+_GolbatDexEntry::
+	text "Once it strikes,"
+	next "it will not stop"
+	next "draining energy"
+
+	page "from the victim"
+	next "even if it gets"
+	next "too heavy to fly"
+	dex
+
+_MewtwoDexEntry::
+	text "It was created by"
+	next "a scientist after"
+	next "years of horrific"
+
+	page "gene splicing and"
+	next "DNA engineering"
+	next "experiments"
+	dex
+
+_SnorlaxDexEntry::
+	text "Very lazy. Just"
+	next "eats and sleeps."
+	next "As its rotund"
+
+	page "bulk builds, it"
+	next "becomes steadily"
+	next "more slothful"
+	dex
+
+_MagikarpDexEntry::
+	text "In the distant"
+	next "past, it was"
+	next "somewhat stronger"
+
+	page "than the horribly"
+	next "weak descendants"
+	next "that exist today"
+	dex
+
+_MukDexEntry::
+	text "Thickly covered"
+	next "with a filthy,"
+	next "vile sludge. It"
+
+	page "is so toxic, even"
+	next "its footprints"
+	next "contain poison"
+	dex
+
+_KinglerDexEntry::
+	text "The large pincer"
+	next "has 10000 hp of"
+	next "crushing power."
+
+	page "However, its huge"
+	next "size makes it"
+	next "unwieldy to use"
+	dex
+
+_CloysterDexEntry::
+	text "When attacked, it"
+	next "launches its"
+	next "horns in quick"
+
+	page "volleys. Its"
+	next "innards have"
+	next "never been seen"
+	dex
+
+_ElectrodeDexEntry::
+	text "It stores electric"
+	next "energy under very"
+	next "high pressure."
+
+	page "It often explodes"
+	next "with little or no"
+	next "provocation"
+	dex
+
+_ClefableDexEntry::
+	text "A timid fairy"
+	next "#MON that is"
+	next "rarely seen. It"
+
+	page "will run and hide"
+	next "the moment it"
+	next "senses people"
+	dex
+
+_WeezingDexEntry::
+	text "Where two kinds"
+	next "of poison gases"
+	next "meet, 2 KOFFINGs"
+
+	page "can fuse into a"
+	next "WEEZING over many"
+	next "years"
+	dex
+
+_PersianDexEntry::
+	text "Although its fur"
+	next "has many admirers,"
+	next "it is tough to"
+
+	page "raise as a pet"
+	next "because of its"
+	next "fickle meanness"
+	dex
+
+_MarowakDexEntry::
+	text "The bone it holds"
+	next "is its key weapon."
+	next "It throws the"
+
+	page "bone skillfully"
+	next "like a boomerang"
+	next "to KO targets"
+	dex
+
+_HaunterDexEntry::
+	text "Because of its"
+	next "ability to slip"
+	next "through block"
+
+	page "walls, it is said"
+	next "to be from an-"
+	next "other dimension"
+	dex
+
+_AbraDexEntry::
+	text "Using its ability"
+	next "to read minds, it"
+	next "will identify"
+
+	page "impending danger"
+	next "and TELEPORT to"
+	next "safety"
+	dex
+
+_AlakazamDexEntry::
+	text "Its brain can out-"
+	next "perform a super-"
+	next "computer."
+
+	page "Its intelligence"
+	next "quotient is said"
+	next "to be 5,000"
+	dex
+
+_PidgeottoDexEntry::
+	text "Very protective"
+	next "of its sprawling"
+	next "territorial area,"
+
+	page "this #MON will"
+	next "fiercely peck at"
+	next "any intruder"
+	dex
+
+_PidgeotDexEntry::
+	text "When hunting, it"
+	next "skims the surface"
+	next "of water at high"
+
+	page "speed to pick off"
+	next "unwary prey such"
+	next "as MAGIKARP"
+	dex
+
+_StarmieDexEntry::
+	text "Its central core"
+	next "glows with the"
+	next "seven colors of"
+
+	page "the rainbow. Some"
+	next "people value the"
+	next "core as a gem"
+	dex
+
+_BulbasaurDexEntry::
+	text "A strange seed was"
+	next "planted on its"
+	next "back at birth."
+
+	page "The plant sprouts"
+	next "and grows with"
+	next "this #MON"
+	dex
+
+_VenusaurDexEntry::
+	text "The plant blooms"
+	next "when it is"
+	next "absorbing solar"
+
+	page "energy. It stays"
+	next "on the move to"
+	next "seek sunlight"
+	dex
+
+_TentacruelDexEntry::
+	text "The tentacles are"
+	next "normally kept"
+	next "short. On hunts,"
+
+	page "they are extended"
+	next "to ensnare and"
+	next "immobilize prey"
+	dex
+
+_GoldeenDexEntry::
+	text "Its tail fin"
+	next "billows like an"
+	next "elegant ballroom"
+
+	page "dress, giving it"
+	next "the nickname of"
+	next "the Water Queen"
+	dex
+
+_SeakingDexEntry::
+	text "In the autumn"
+	next "spawning season,"
+	next "they can be seen"
+
+	page "swimming power-"
+	next "fully up rivers"
+	next "and creeks"
+	dex
+
+_PonytaDexEntry::
+	text "Its hooves are 10"
+	next "times harder than"
+	next "diamonds. It can"
+
+	page "trample anything"
+	next "completely flat"
+	next "in little time"
+	dex
+
+_RapidashDexEntry::
+	text "Very competitive,"
+	next "this #MON will"
+	next "chase anything"
+
+	page "that moves fast"
+	next "in the hopes of"
+	next "racing it"
+	dex
+
+_RattataDexEntry::
+	text "Bites anything"
+	next "when it attacks."
+	next "Small and very"
+
+	page "quick, it is a"
+	next "common sight in"
+	next "many places"
+	dex
+
+_RaticateDexEntry::
+	text "It uses its whis-"
+	next "kers to maintain"
+	next "its balance."
+
+	page "It apparently"
+	next "slows down if"
+	next "they are cut off"
+	dex
+
+_NidorinoDexEntry::
+	text "An aggressive"
+	next "#MON that is"
+	next "quick to attack."
+
+	page "The horn on its"
+	next "head secretes a"
+	next "powerful venom"
+	dex
+
+_NidorinaDexEntry::
+	text "The female's horn"
+	next "develops slowly."
+	next "Prefers physical"
+
+	page "attacks such as"
+	next "clawing and"
+	next "biting"
+	dex
+
+_GeodudeDexEntry::
+	text "Found in fields"
+	next "and mountains."
+	next "Mistaking them"
+
+	page "for boulders,"
+	next "people often step"
+	next "or trip on them"
+	dex
+
+_PorygonDexEntry::
+	text "A #MON that"
+	next "consists entirely"
+	next "of programming"
+
+	page "code. Capable of"
+	next "moving freely in"
+	next "cyberspace"
+	dex
+
+_AerodactylDexEntry::
+	text "A ferocious, pre-"
+	next "historic #MON"
+	next "that goes for the"
+
+	page "enemy's throat"
+	next "with its serrated"
+	next "saw-like fangs"
+	dex
+
+_MagnemiteDexEntry::
+	text "Uses anti-gravity"
+	next "to stay suspended."
+	next "Appears without"
+
+	page "warning and uses"
+	next "THUNDER WAVE and"
+	next "similar moves"
+	dex
+
+_CharmanderDexEntry::
+	text "Obviously prefers"
+	next "hot places. When"
+	next "it rains, steam"
+
+	page "is said to spout"
+	next "from the tip of"
+	next "its tail"
+	dex
+
+_SquirtleDexEntry::
+	text "After birth, its"
+	next "back swells and"
+	next "hardens into a"
+
+	page "shell. Powerfully"
+	next "sprays foam from"
+	next "its mouth"
+	dex
+
+_CharmeleonDexEntry::
+	text "When it swings"
+	next "its burning tail,"
+	next "it elevates the"
+
+	page "temperature to"
+	next "unbearably high"
+	next "levels"
+	dex
+
+_WartortleDexEntry::
+	text "Often hides in"
+	next "water to stalk"
+	next "unwary prey. For"
+
+	page "swimming fast, it"
+	next "moves its ears to"
+	next "maintain balance"
+	dex
+
+_CharizardDexEntry::
+	text "Spits fire that"
+	next "is hot enough to"
+	next "melt boulders."
+
+	page "Known to cause"
+	next "forest fires"
+	next "unintentionally"
+	dex
+
+_OddishDexEntry::
+	text "During the day,"
+	next "it keeps its face"
+	next "buried in the"
+
+	page "ground. At night,"
+	next "it wanders around"
+	next "sowing its seeds"
+	dex
+
+_GloomDexEntry::
+	text "The fluid that"
+	next "oozes from its"
+	next "mouth isn't drool."
+
+	page "It is a nectar"
+	next "that is used to"
+	next "attract prey"
+	dex
+
+_VileplumeDexEntry::
+	text "The larger its"
+	next "petals, the more"
+	next "toxic pollen it"
+
+	page "contains. Its big"
+	next "head is heavy and"
+	next "hard to hold up"
+	dex
+
+_BellsproutDexEntry::
+	text "A carnivorous"
+	next "#MON that traps"
+	next "and eats bugs."
+
+	page "It uses its root"
+	next "feet to soak up"
+	next "needed moisture"
+	dex
+
+_WeepinbellDexEntry::
+	text "It spits out"
+	next "POISONPOWDER to"
+	next "immobilize the"
+
+	page "enemy and then"
+	next "finishes it with"
+	next "a spray of ACID"
+	dex
+
+_VictreebelDexEntry::
+	text "Said to live in"
+	next "huge colonies"
+	next "deep in jungles,"
+
+	page "although no one"
+	next "has ever returned"
+	next "from there"
+	dex
+
diff --git a/data/evos_moves.asm b/data/pokemon/evos_moves.asm
index 26f09b87..26f09b87 100755
--- a/data/evos_moves.asm
+++ b/data/pokemon/evos_moves.asm
diff --git a/data/mon_party_sprites.asm b/data/pokemon/menu_icons.asm
index 471ee846..471ee846 100755
--- a/data/mon_party_sprites.asm
+++ b/data/pokemon/menu_icons.asm
diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm
new file mode 100755
index 00000000..83a45b77
--- /dev/null
+++ b/data/pokemon/names.asm
@@ -0,0 +1,191 @@
+MonsterNames::
+	db "RHYDON@@@@"
+	db "KANGASKHAN"
+	db "NIDORAN♂@@"
+	db "CLEFAIRY@@"
+	db "SPEAROW@@@"
+	db "VOLTORB@@@"
+	db "NIDOKING@@"
+	db "SLOWBRO@@@"
+	db "IVYSAUR@@@"
+	db "EXEGGUTOR@"
+	db "LICKITUNG@"
+	db "EXEGGCUTE@"
+	db "GRIMER@@@@"
+	db "GENGAR@@@@"
+	db "NIDORAN♀@@"
+	db "NIDOQUEEN@"
+	db "CUBONE@@@@"
+	db "RHYHORN@@@"
+	db "LAPRAS@@@@"
+	db "ARCANINE@@"
+	db "MEW@@@@@@@"
+	db "GYARADOS@@"
+	db "SHELLDER@@"
+	db "TENTACOOL@"
+	db "GASTLY@@@@"
+	db "SCYTHER@@@"
+	db "STARYU@@@@"
+	db "BLASTOISE@"
+	db "PINSIR@@@@"
+	db "TANGELA@@@"
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "GROWLITHE@"
+	db "ONIX@@@@@@"
+	db "FEAROW@@@@"
+	db "PIDGEY@@@@"
+	db "SLOWPOKE@@"
+	db "KADABRA@@@"
+	db "GRAVELER@@"
+	db "CHANSEY@@@"
+	db "MACHOKE@@@"
+	db "MR.MIME@@@"
+	db "HITMONLEE@"
+	db "HITMONCHAN"
+	db "ARBOK@@@@@"
+	db "PARASECT@@"
+	db "PSYDUCK@@@"
+	db "DROWZEE@@@"
+	db "GOLEM@@@@@"
+	db "MISSINGNO."
+	db "MAGMAR@@@@"
+	db "MISSINGNO."
+	db "ELECTABUZZ"
+	db "MAGNETON@@"
+	db "KOFFING@@@"
+	db "MISSINGNO."
+	db "MANKEY@@@@"
+	db "SEEL@@@@@@"
+	db "DIGLETT@@@"
+	db "TAUROS@@@@"
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "FARFETCH'D"
+	db "VENONAT@@@"
+	db "DRAGONITE@"
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "DODUO@@@@@"
+	db "POLIWAG@@@"
+	db "JYNX@@@@@@"
+	db "MOLTRES@@@"
+	db "ARTICUNO@@"
+	db "ZAPDOS@@@@"
+	db "DITTO@@@@@"
+	db "MEOWTH@@@@"
+	db "KRABBY@@@@"
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "VULPIX@@@@"
+	db "NINETALES@"
+	db "PIKACHU@@@"
+	db "RAICHU@@@@"
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "DRATINI@@@"
+	db "DRAGONAIR@"
+	db "KABUTO@@@@"
+	db "KABUTOPS@@"
+	db "HORSEA@@@@"
+	db "SEADRA@@@@"
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "SANDSHREW@"
+	db "SANDSLASH@"
+	db "OMANYTE@@@"
+	db "OMASTAR@@@"
+	db "JIGGLYPUFF"
+	db "WIGGLYTUFF"
+	db "EEVEE@@@@@"
+	db "FLAREON@@@"
+	db "JOLTEON@@@"
+	db "VAPOREON@@"
+	db "MACHOP@@@@"
+	db "ZUBAT@@@@@"
+	db "EKANS@@@@@"
+	db "PARAS@@@@@"
+	db "POLIWHIRL@"
+	db "POLIWRATH@"
+	db "WEEDLE@@@@"
+	db "KAKUNA@@@@"
+	db "BEEDRILL@@"
+	db "MISSINGNO."
+	db "DODRIO@@@@"
+	db "PRIMEAPE@@"
+	db "DUGTRIO@@@"
+	db "VENOMOTH@@"
+	db "DEWGONG@@@"
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "CATERPIE@@"
+	db "METAPOD@@@"
+	db "BUTTERFREE"
+	db "MACHAMP@@@"
+	db "MISSINGNO."
+	db "GOLDUCK@@@"
+	db "HYPNO@@@@@"
+	db "GOLBAT@@@@"
+	db "MEWTWO@@@@"
+	db "SNORLAX@@@"
+	db "MAGIKARP@@"
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "MUK@@@@@@@"
+	db "MISSINGNO."
+	db "KINGLER@@@"
+	db "CLOYSTER@@"
+	db "MISSINGNO."
+	db "ELECTRODE@"
+	db "CLEFABLE@@"
+	db "WEEZING@@@"
+	db "PERSIAN@@@"
+	db "MAROWAK@@@"
+	db "MISSINGNO."
+	db "HAUNTER@@@"
+	db "ABRA@@@@@@"
+	db "ALAKAZAM@@"
+	db "PIDGEOTTO@"
+	db "PIDGEOT@@@"
+	db "STARMIE@@@"
+	db "BULBASAUR@"
+	db "VENUSAUR@@"
+	db "TENTACRUEL"
+	db "MISSINGNO."
+	db "GOLDEEN@@@"
+	db "SEAKING@@@"
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "PONYTA@@@@"
+	db "RAPIDASH@@"
+	db "RATTATA@@@"
+	db "RATICATE@@"
+	db "NIDORINO@@"
+	db "NIDORINA@@"
+	db "GEODUDE@@@"
+	db "PORYGON@@@"
+	db "AERODACTYL"
+	db "MISSINGNO."
+	db "MAGNEMITE@"
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "CHARMANDER"
+	db "SQUIRTLE@@"
+	db "CHARMELEON"
+	db "WARTORTLE@"
+	db "CHARIZARD@"
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "MISSINGNO."
+	db "ODDISH@@@@"
+	db "GLOOM@@@@@"
+	db "VILEPLUME@"
+	db "BELLSPROUT"
+	db "WEEPINBELL"
+	db "VICTREEBEL"
diff --git a/data/mon_palettes.asm b/data/pokemon/palettes.asm
index 8c4d0bc0..8c4d0bc0 100755
--- a/data/mon_palettes.asm
+++ b/data/pokemon/palettes.asm
diff --git a/data/title_mons.asm b/data/pokemon/title_mons.asm
index c5d94301..c5d94301 100755
--- a/data/title_mons.asm
+++ b/data/pokemon/title_mons.asm
diff --git a/data/sgb_border.asm b/data/sgb/sgb_border.asm
index aa11a326..aa11a326 100755
--- a/data/sgb_border.asm
+++ b/data/sgb/sgb_border.asm
diff --git a/data/sgb_packets.asm b/data/sgb/sgb_packets.asm
index cae91883..cae91883 100755
--- a/data/sgb_packets.asm
+++ b/data/sgb/sgb_packets.asm
diff --git a/data/super_palettes.asm b/data/sgb/sgb_palettes.asm
index 97f1d8ec..97f1d8ec 100755
--- a/data/super_palettes.asm
+++ b/data/sgb/sgb_palettes.asm
diff --git a/data/facing.asm b/data/sprite_facings.asm
index c412247a..c412247a 100644
--- a/data/facing.asm
+++ b/data/sprite_facings.asm
diff --git a/data/text/alphabets.asm b/data/text/alphabets.asm
new file mode 100644
index 00000000..9799a7e6
--- /dev/null
+++ b/data/text/alphabets.asm
@@ -0,0 +1,5 @@
+LowerCaseAlphabet:
+	db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@"
+
+UpperCaseAlphabet:
+	db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@"
diff --git a/data/text/dakutens.asm b/data/text/dakutens.asm
new file mode 100644
index 00000000..f3bf4854
--- /dev/null
+++ b/data/text/dakutens.asm
@@ -0,0 +1,15 @@
+Dakutens:
+	db "かが", "きぎ", "くぐ", "けげ", "こご"
+	db "さざ", "しじ", "すず", "せぜ", "そぞ"
+	db "ただ", "ちぢ", "つづ", "てで", "とど"
+	db "はば", "ひび", "ふぶ", "へべ", "ほぼ"
+	db "カガ", "キギ", "クグ", "ケゲ", "コゴ"
+	db "サザ", "シジ", "スズ", "セゼ", "ソゾ"
+	db "タダ", "チヂ", "ツヅ", "テデ", "トド"
+	db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
+	db $ff
+
+Handakutens:
+	db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
+	db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
+	db $ff
diff --git a/data/text/text_1.asm b/data/text/text_1.asm
new file mode 100644
index 00000000..1ab54da3
--- /dev/null
+++ b/data/text/text_1.asm
@@ -0,0 +1,145 @@
+_CardKeySuccessText1::
+	text "Bingo!@@"
+
+_CardKeySuccessText2::
+	text ""
+	line "The CARD KEY"
+	cont "opened the door!"
+	done
+
+_CardKeyFailText::
+	text "Darn! It needs a"
+	line "CARD KEY!"
+	done
+
+_TrainerNameText::
+	TX_RAM wcd6d
+	text ": @@"
+
+_NoNibbleText::
+	text "Not even a nibble!"
+	prompt
+
+_NothingHereText::
+	text "Looks like there's"
+	line "nothing here."
+	prompt
+
+_ItsABiteText::
+	text "Oh!"
+	line "It's a bite!"
+	prompt
+
+_ExclamationText::
+	text "!"
+	done
+
+_GroundRoseText::
+	text "Ground rose up"
+	line "somewhere!"
+	done
+
+_BoulderText::
+	text "This requires"
+	line "STRENGTH to move!"
+	done
+
+_MartSignText::
+	text "All your item"
+	line "needs fulfilled!"
+	cont "#MON MART"
+	done
+
+_PokeCenterSignText::
+	text "Heal Your #MON!"
+	line "#MON CENTER"
+	done
+
+_FoundItemText::
+	text "<PLAYER> found"
+	line "@"
+	TX_RAM wcf4b
+	text "!@@"
+
+_NoMoreRoomForItemText::
+	text "No more room for"
+	line "items!"
+	done
+
+_OaksAideHiText::
+	text "Hi! Remember me?"
+	line "I'm PROF.OAK's"
+	cont "AIDE!"
+
+	para "If you caught @"
+	TX_NUM hOaksAideRequirement, 1, 3
+	text ""
+	line "kinds of #MON,"
+	cont "I'm supposed to"
+	cont "give you an"
+	cont "@"
+	TX_RAM wOaksAideRewardItemName
+	text "!"
+
+	para "So, <PLAYER>! Have"
+	line "you caught at"
+	cont "least @"
+	TX_NUM hOaksAideRequirement, 1, 3
+	text " kinds of"
+	cont "#MON?"
+	done
+
+_OaksAideUhOhText::
+	text "Let's see..."
+	line "Uh-oh! You have"
+	cont "caught only @"
+	TX_NUM hOaksAideNumMonsOwned, 1, 3
+	text ""
+	cont "kinds of #MON!"
+
+	para "You need @"
+	TX_NUM hOaksAideRequirement, 1, 3
+	text " kinds"
+	line "if you want the"
+	cont "@"
+	TX_RAM wOaksAideRewardItemName
+	text "."
+	done
+
+_OaksAideComeBackText::
+	text "Oh. I see."
+
+	para "When you get @"
+	TX_NUM hOaksAideRequirement, 1, 3
+	text ""
+	line "kinds, come back"
+	cont "for @"
+	TX_RAM wOaksAideRewardItemName
+	text "."
+	done
+
+_OaksAideHereYouGoText::
+	text "Great! You have"
+	line "caught @"
+	TX_NUM hOaksAideNumMonsOwned, 1, 3
+	text " kinds "
+	cont "of #MON!"
+	cont "Congratulations!"
+
+	para "Here you go!"
+	prompt
+
+_OaksAideGotItemText::
+	text "<PLAYER> got the"
+	line "@"
+	TX_RAM wOaksAideRewardItemName
+	text "!@@"
+
+_OaksAideNoRoomText::
+	text "Oh! I see you"
+	line "don't have any"
+	cont "room for the"
+	cont "@"
+	TX_RAM wOaksAideRewardItemName
+	text "."
+	done
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
new file mode 100644
index 00000000..01e8641b
--- /dev/null
+++ b/data/text/text_2.asm
@@ -0,0 +1,1753 @@
+_AIBattleWithdrawText::
+	TX_RAM wTrainerName
+	text " with-"
+	line "drew @"
+	TX_RAM wEnemyMonNick
+	text "!"
+	prompt
+
+_AIBattleUseItemText::
+	TX_RAM wTrainerName
+	text ""
+	line "used @"
+	TX_RAM wcd6d
+	text ""
+	cont "on @"
+	TX_RAM wEnemyMonNick
+	text "!"
+	prompt
+
+_TradeWentToText::
+	TX_RAM wcf4b
+	text " went"
+	line "to @"
+	TX_RAM wLinkEnemyTrainerName
+	text "."
+	done
+
+_TradeForText::
+	text "For <PLAYER>'s"
+	line "@"
+	TX_RAM wcf4b
+	text ","
+	done
+
+_TradeSendsText::
+	TX_RAM wLinkEnemyTrainerName
+	text " sends"
+	line "@"
+	TX_RAM wcd6d
+	text "."
+	done
+
+_TradeWavesFarewellText::
+	TX_RAM wLinkEnemyTrainerName
+	text " waves"
+	line "farewell as"
+	done
+
+_TradeTransferredText::
+	TX_RAM wcd6d
+	text " is"
+	line "transferred."
+	done
+
+_TradeTakeCareText::
+	text "Take good care of"
+	line "@"
+	TX_RAM wcd6d
+	text "."
+	done
+
+_TradeWillTradeText::
+	TX_RAM wLinkEnemyTrainerName
+	text " will"
+	line "trade @"
+	TX_RAM wcd6d
+	text ""
+	done
+
+_TradeforText::
+	text "for <PLAYER>'s"
+	line "@"
+	TX_RAM wcf4b
+	text "."
+	done
+
+_PlaySlotMachineText::
+	text "A slot machine!"
+	line "Want to play?"
+	done
+
+_OutOfCoinsSlotMachineText::
+	text "Darn!"
+	line "Ran out of coins!"
+	done
+
+_BetHowManySlotMachineText::
+	text "Bet how many"
+	line "coins?"
+	done
+
+_StartSlotMachineText::
+	text "Start!"
+	done
+
+_NotEnoughCoinsSlotMachineText::
+	text "Not enough"
+	line "coins!"
+	prompt
+
+_OneMoreGoSlotMachineText::
+	text "One more "
+	line "go?"
+	done
+
+_LinedUpText::
+	text " lined up!"
+	line "Scored @"
+	TX_RAM wcf4b
+	text " coins!"
+	done
+
+_NotThisTimeText::
+	text "Not this time!"
+	prompt
+
+_YeahText::
+	text "Yeah!@@"
+
+_DexSeenOwnedText::
+	text "#DEX   Seen:@"
+	TX_NUM wDexRatingNumMonsSeen, 1, 3
+	text ""
+	line "         Owned:@"
+	TX_NUM wDexRatingNumMonsOwned, 1, 3
+	db "@"
+
+_DexRatingText::
+	text "#DEX Rating", $6d
+	done
+
+_GymStatueText1::
+	TX_RAM wGymCityName
+	text ""
+	line "#MON GYM"
+	cont "LEADER: @"
+	TX_RAM wGymLeaderName
+	text ""
+
+	para "WINNING TRAINERS:"
+	line "<RIVAL>"
+	done
+
+_GymStatueText2::
+	TX_RAM wGymCityName
+	text ""
+	line "#MON GYM"
+	cont "LEADER: @"
+	TX_RAM wGymLeaderName
+	text ""
+
+	para "WINNING TRAINERS:"
+	line "<RIVAL>"
+	cont "<PLAYER>"
+	done
+
+_ViridianCityPokecenterGuyText::
+	text "#MON CENTERs"
+	line "heal your tired,"
+	cont "hurt or fainted"
+	cont "#MON!"
+	done
+
+_PewterCityPokecenterGuyText::
+	text "Yawn!"
+
+	para "When JIGGLYPUFF"
+	line "sings, #MON"
+	cont "get drowsy..."
+
+	para "...Me too..."
+	line "Snore..."
+	done
+
+_CeruleanPokecenterGuyText::
+	text "BILL has lots of"
+	line "#MON!"
+
+	para "He collects rare"
+	line "ones too!"
+	done
+
+_LavenderPokecenterGuyText::
+	text "CUBONEs wear"
+	line "skulls, right?"
+
+	para "People will pay a"
+	line "lot for one!"
+	done
+
+_MtMoonPokecenterBenchGuyText::
+	text "If you have too"
+	line "many #MON, you"
+	cont "should store them"
+	cont "via PC!"
+	done
+
+_RockTunnelPokecenterGuyText::
+	text "I heard that"
+	line "GHOSTs haunt"
+	cont "LAVENDER TOWN!"
+	done
+
+_UnusedBenchGuyText1::
+	text "I wish I could"
+	line "catch #MON."
+	done
+
+_UnusedBenchGuyText2::
+	text "I'm tired from"
+	line "all the fun..."
+	done
+
+_UnusedBenchGuyText3::
+	text "SILPH's manager"
+	line "is hiding in the"
+	cont "SAFARI ZONE."
+	done
+
+_VermilionPokecenterGuyText::
+	text "It is true that a"
+	line "higher level"
+	cont "#MON will be"
+	cont "more powerful..."
+
+	para "But, all #MON"
+	line "will have weak"
+	cont "points against"
+	cont "specific types."
+
+	para "So, there is no"
+	line "universally"
+	cont "strong #MON."
+	done
+
+_CeladonCityPokecenterGuyText::
+	text "If I had a BIKE,"
+	line "I would go to"
+	cont "CYCLING ROAD!"
+	done
+
+_FuchsiaCityPokecenterGuyText::
+	text "If you're studying "
+	line "#MON, visit"
+	cont "the SAFARI ZONE."
+
+	para "It has all sorts"
+	line "of rare #MON."
+	done
+
+_CinnabarPokecenterGuyText::
+	text "#MON can still"
+	line "learn techniques"
+	cont "after canceling"
+	cont "evolution."
+
+	para "Evolution can wait"
+	line "until new moves"
+	cont "have been learned."
+	done
+
+_SaffronCityPokecenterGuyText1::
+	text "It would be great"
+	line "if the ELITE FOUR"
+	cont "came and stomped"
+	cont "TEAM ROCKET!"
+	done
+
+_SaffronCityPokecenterGuyText2::
+	text "TEAM ROCKET took"
+	line "off! We can go"
+	cont "out safely again!"
+	cont "That's great!"
+	done
+
+_CeladonCityHotelText::
+	text "My sis brought me"
+	line "on this vacation!"
+	done
+
+_BookcaseText::
+	text "Crammed full of"
+	line "#MON books!"
+	done
+
+_NewBicycleText::
+	text "A shiny new"
+	line "BICYCLE!"
+	done
+
+_PushStartText::
+	text "Push START to"
+	line "open the MENU!"
+	done
+
+_SaveOptionText::
+	text "The SAVE option is"
+	line "on the MENU"
+	cont "screen."
+	done
+
+_StrengthsAndWeaknessesText::
+	text "All #MON types"
+	line "have strong and"
+	cont "weak points"
+	cont "against others."
+	done
+
+_TimesUpText::
+	text "PA: Ding-dong!"
+
+	para "Time's up!"
+	prompt
+
+_GameOverText::
+	text "PA: Your SAFARI"
+	line "GAME is over!"
+	done
+
+_CinnabarGymQuizIntroText::
+	text "#MON Quiz!"
+
+	para "Get it right and"
+	line "the door opens to"
+	cont "the next room!"
+
+	para "Get it wrong and"
+	line "face a trainer!"
+
+	para "If you want to"
+	line "conserve your"
+	cont "#MON for the"
+	cont "GYM LEADER..."
+
+	para "Then get it right!"
+	line "Here we go!"
+	prompt
+
+_CinnabarQuizQuestionsText1::
+	text "CATERPIE evolves"
+	line "into BUTTERFREE?"
+	done
+
+_CinnabarQuizQuestionsText2::
+	text "There are 9"
+	line "certified #MON"
+	cont "LEAGUE BADGEs?"
+	done
+
+_CinnabarQuizQuestionsText3::
+	text "POLIWAG evolves 3"
+	line "times?"
+	done
+
+_CinnabarQuizQuestionsText4::
+	text "Are thunder moves"
+	line "effective against"
+	cont "ground element-"
+	cont "type #MON?"
+	done
+
+_CinnabarQuizQuestionsText5::
+	text "#MON of the"
+	line "same kind and"
+	cont "level are not"
+	cont "identical?"
+	done
+
+_CinnabarQuizQuestionsText6::
+	text "TM28 contains"
+	line "TOMBSTONER?"
+	done
+
+_CinnabarGymQuizCorrectText::
+	text "You're absolutely"
+	line "correct!"
+
+	para "Go on through!@@"
+
+_CinnabarGymQuizIncorrectText::
+	text "Sorry! Bad call!"
+	prompt
+
+_MagazinesText::
+	text "#MON magazines!"
+
+	para "#MON notebooks!"
+
+	para "#MON graphs!"
+	done
+
+_BillsHouseMonitorText::
+	text "TELEPORTER is"
+	line "displayed on the"
+	cont "PC monitor."
+	done
+
+_BillsHouseInitiatedText::
+	text "<PLAYER> initiated"
+	line "TELEPORTER's Cell"
+	cont "Separator!@@"
+
+_BillsHousePokemonListText1::
+	text "BILL's favorite"
+	line "#MON list!"
+	prompt
+
+_BillsHousePokemonListText2::
+	text "Which #MON do"
+	line "you want to see?"
+	done
+
+_OakLabEmailText::
+	text "There's an e-mail"
+	line "message here!"
+
+	para "..."
+
+	para "Calling all"
+	line "#MON trainers!"
+
+	para "The elite trainers"
+	line "of #MON LEAGUE"
+	cont "are ready to take"
+	cont "on all comers!"
+
+	para "Bring your best"
+	line "#MON and see"
+	cont "how you rate as a"
+	cont "trainer!"
+
+	para "#MON LEAGUE HQ"
+	line "INDIGO PLATEAU"
+
+	para "PS: PROF.OAK,"
+	line "please visit us!"
+	cont "..."
+	done
+
+_GameCornerCoinCaseText::
+	text "A COIN CASE is"
+	line "required!"
+	done
+
+_GameCornerNoCoinsText::
+	text "You don't have"
+	line "any coins!"
+	done
+
+_GameCornerOutOfOrderText::
+	text "OUT OF ORDER"
+	line "This is broken."
+	done
+
+_GameCornerOutToLunchText::
+	text "OUT TO LUNCH"
+	line "This is reserved."
+	done
+
+_GameCornerSomeonesKeysText::
+	text "Someone's keys!"
+	line "They'll be back."
+	done
+
+_JustAMomentText::
+	text "Just a moment."
+	done
+
+TMNotebookText::
+	text "It's a pamphlet"
+	line "on TMs."
+
+	para "..."
+
+	para "There are 50 TMs"
+	line "in all."
+
+	para "There are also 5"
+	line "HMs that can be"
+	cont "used repeatedly."
+
+	para "SILPH CO.@@"
+
+_TurnPageText::
+	text "Turn the page?"
+	done
+
+_ViridianSchoolNotebookText5::
+	text "GIRL: Hey! Don't"
+	line "look at my notes!@@"
+
+_ViridianSchoolNotebookText1::
+	text "Looked at the"
+	line "notebook!"
+
+	para "First page..."
+
+	para "# BALLs are"
+	line "used to catch"
+	cont "#MON."
+
+	para "Up to 6 #MON"
+	line "can be carried."
+
+	para "People who raise"
+	line "and make #MON"
+	cont "fight are called"
+	cont "#MON trainers."
+	prompt
+
+_ViridianSchoolNotebookText2::
+	text "Second page..."
+
+	para "A healthy #MON"
+	line "may be hard to"
+	cont "catch, so weaken"
+	cont "it first!"
+
+	para "Poison, burns and"
+	line "other damage are"
+	cont "effective!"
+	prompt
+
+_ViridianSchoolNotebookText3::
+	text "Third page..."
+
+	para "#MON trainers"
+	line "seek others to"
+	cont "engage in #MON"
+	cont "fights."
+
+	para "Battles are"
+	line "constantly fought"
+	cont "at #MON GYMs."
+	prompt
+
+_ViridianSchoolNotebookText4::
+	text "Fourth page..."
+
+	para "The goal for"
+	line "#MON trainers"
+	cont "is to beat the "
+	cont "top 8 #MON"
+	cont "GYM LEADERs."
+
+	para "Do so to earn the"
+	line "right to face..."
+
+	para "The ELITE FOUR of"
+	line "#MON LEAGUE!"
+	prompt
+
+_EnemiesOnEverySideText::
+	text "Enemies on every"
+	line "side!"
+	done
+
+_WhatGoesAroundComesAroundText::
+	text "What goes around"
+	line "comes around!"
+	done
+
+_FightingDojoText::
+	text "FIGHTING DOJO"
+	done
+
+_IndigoPlateauHQText::
+	text "INDIGO PLATEAU"
+	line "#MON LEAGUE HQ"
+	done
+
+_RedBedroomSNESText::
+	text "<PLAYER> is"
+	line "playing the SNES!"
+	cont "...Okay!"
+	cont "It's time to go!"
+	done
+
+_Route15UpstairsBinocularsText::
+	text "Looked into the"
+	line "binoculars..."
+
+	para "A large, shining"
+	line "bird is flying"
+	cont "toward the sea."
+	done
+
+_AerodactylFossilText::
+	text "AERODACTYL Fossil"
+	line "A primitive and"
+	cont "rare #MON."
+	done
+
+_KabutopsFossilText::
+	text "KABUTOPS Fossil"
+	line "A primitive and"
+	cont "rare #MON."
+	done
+
+_LinkCableHelpText1::
+	text "TRAINER TIPS"
+
+	para "Using a Game Link"
+	line "Cable"
+	prompt
+
+_LinkCableHelpText2::
+	text "Which heading do"
+	line "you want to read?"
+	done
+
+_LinkCableInfoText1::
+	text "When you have"
+	line "linked your GAME"
+	cont "BOY with another"
+	cont "GAME BOY, talk to"
+	cont "the attendant on"
+	cont "the right in any"
+	cont "#MON CENTER."
+	prompt
+
+_LinkCableInfoText2::
+	text "COLOSSEUM lets"
+	line "you play against"
+	cont "a friend."
+	prompt
+
+_LinkCableInfoText3::
+	text "TRADE CENTER is"
+	line "used for trading"
+	cont "#MON."
+	prompt
+
+_ViridianSchoolBlackboardText1::
+	text "The blackboard"
+	line "describes #MON"
+	cont "STATUS changes"
+	cont "during battles."
+	prompt
+
+_ViridianSchoolBlackboardText2::
+	text "Which heading do"
+	line "you want to read?"
+	done
+
+_ViridianBlackboardSleepText::
+	text "A #MON can't"
+	line "attack if it's"
+	cont "asleep!"
+
+	para "#MON will stay"
+	line "asleep even after"
+	cont "battles."
+
+	para "Use AWAKENING to"
+	line "wake them up!"
+	prompt
+
+_ViridianBlackboardPoisonText::
+	text "When poisoned, a"
+	line "#MON's health"
+	cont "steadily drops."
+
+	para "Poison lingers"
+	line "after battles."
+
+	para "Use an ANTIDOTE"
+	line "to cure poison!"
+	prompt
+
+_ViridianBlackboardPrlzText::
+	text "Paralysis could"
+	line "make #MON"
+	cont "moves misfire!"
+
+	para "Paralysis remains"
+	line "after battles."
+
+	para "Use PARLYZ HEAL"
+	line "for treatment!"
+	prompt
+
+_ViridianBlackboardBurnText::
+	text "A burn reduces"
+	line "power and speed."
+	cont "It also causes"
+	cont "ongoing damage."
+
+	para "Burns remain"
+	line "after battles."
+
+	para "Use BURN HEAL to"
+	line "cure a burn!"
+	prompt
+
+_ViridianBlackboardFrozenText::
+	text "If frozen, a"
+	line "#MON becomes"
+	cont "totally immobile!"
+
+	para "It stays frozen"
+	line "even after the"
+	cont "battle ends."
+
+	para "Use ICE HEAL to"
+	line "thaw out #MON!"
+	prompt
+
+_VermilionGymTrashText::
+	text "Nope, there's"
+	line "only trash here."
+	done
+
+_VermilionGymTrashSuccessText1::
+	text "Hey! There's a"
+	line "switch under the"
+	cont "trash!"
+	cont "Turn it on!"
+
+	para "The 1st electric"
+	line "lock opened!@@"
+
+_VermilionGymTrashSuccessText2::
+	text "Hey! There's"
+	line "another switch"
+	cont "under the trash!"
+	cont "Turn it on!"
+	prompt
+
+_VermilionGymTrashSuccessText3::
+	text "The 2nd electric"
+	line "lock opened!"
+
+	para "The motorized door"
+	line "opened!@@"
+
+_VermilionGymTrashFailText::
+	text "Nope! There's"
+	line "only trash here."
+	cont "Hey! The electric"
+	cont "locks were reset!@@"
+
+_FoundHiddenItemText::
+	text "<PLAYER> found"
+	line "@"
+	TX_RAM wcd6d
+	text "!@@"
+
+_HiddenItemBagFullText::
+	text "But, <PLAYER> has"
+	line "no more room for"
+	cont "other items!"
+	done
+
+_FoundHiddenCoinsText::
+	text "<PLAYER> found"
+	line "@"
+	TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text " coins!@@"
+
+_FoundHiddenCoins2Text::
+	text "<PLAYER> found"
+	line "@"
+	TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text " coins!@@"
+
+_DroppedHiddenCoinsText::
+	text ""
+	para "Oops! Dropped"
+	line "some coins!"
+	done
+
+_IndigoPlateauStatuesText1::
+	text "INDIGO PLATEAU"
+	prompt
+
+_IndigoPlateauStatuesText2::
+	text "The ultimate goal"
+	line "of trainers!"
+	cont "#MON LEAGUE HQ"
+	done
+
+_IndigoPlateauStatuesText3::
+	text "The highest"
+	line "#MON authority"
+	cont "#MON LEAGUE HQ"
+	done
+
+_PokemonBooksText::
+	text "Crammed full of"
+	line "#MON books!"
+	done
+
+_DiglettSculptureText::
+	text "It's a sculpture"
+	line "of DIGLETT."
+	done
+
+_ElevatorText::
+	text "This is an"
+	line "elevator."
+	done
+
+_TownMapText::
+	text "A TOWN MAP.@@"
+
+_PokemonStuffText::
+	text "Wow! Tons of"
+	line "#MON stuff!"
+	done
+
+_OutOfSafariBallsText::
+	text "PA: Ding-dong!"
+
+	para "You are out of"
+	line "SAFARI BALLs!"
+	prompt
+
+_WildRanText::
+	text "Wild @"
+	TX_RAM wEnemyMonNick
+	text ""
+	line "ran!"
+	prompt
+
+_EnemyRanText::
+	text "Enemy @"
+	TX_RAM wEnemyMonNick
+	text ""
+	line "ran!"
+	prompt
+
+_HurtByPoisonText::
+	text "<USER>'s"
+	line "hurt by poison!"
+	prompt
+
+_HurtByBurnText::
+	text "<USER>'s"
+	line "hurt by the burn!"
+	prompt
+
+_HurtByLeechSeedText::
+	text "LEECH SEED saps"
+	line "<USER>!"
+	prompt
+
+_EnemyMonFaintedText::
+	text "Enemy @"
+	TX_RAM wEnemyMonNick
+	text ""
+	line "fainted!"
+	prompt
+
+_MoneyForWinningText::
+	text "<PLAYER> got ¥@"
+	TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text ""
+	line "for winning!"
+	prompt
+
+_TrainerDefeatedText::
+	text "<PLAYER> defeated"
+	line "@"
+	TX_RAM wTrainerName
+	text "!"
+	prompt
+
+_PlayerMonFaintedText::
+	TX_RAM wBattleMonNick
+	text ""
+	line "fainted!"
+	prompt
+
+_UseNextMonText::
+	text "Use next #MON?"
+	done
+
+_Sony1WinText::
+	text "<RIVAL>: Yeah! Am"
+	line "I great or what?"
+	prompt
+
+_PlayerBlackedOutText2::
+	text "<PLAYER> is out of"
+	line "useable #MON!"
+
+	para "<PLAYER> blacked"
+	line "out!"
+	prompt
+
+_LinkBattleLostText::
+	text "<PLAYER> lost to"
+	line "@"
+	TX_RAM wTrainerName
+	text "!"
+	prompt
+
+_TrainerAboutToUseText::
+	TX_RAM wTrainerName
+	text " is"
+	line "about to use"
+	cont"@"
+	TX_RAM wEnemyMonNick
+	text "!"
+
+	para "Will <PLAYER>"
+	line "change #MON?"
+	done
+
+_TrainerSentOutText::
+	TX_RAM wTrainerName
+	text " sent"
+	line "out @"
+	TX_RAM wEnemyMonNick
+	text "!"
+	done
+
+_NoWillText::
+	text "There's no will"
+	line "to fight!"
+	prompt
+
+_CantEscapeText::
+	text "Can't escape!"
+	prompt
+
+_NoRunningText::
+	text "No! There's no"
+	line "running from a"
+	cont "trainer battle!"
+	prompt
+
+_GotAwayText::
+	text "Got away safely!"
+	prompt
+
+_ItemsCantBeUsedHereText::
+	text "Items can't be"
+	line "used here."
+	prompt
+
+_AlreadyOutText::
+	TX_RAM wBattleMonNick
+	text " is"
+	line "already out!"
+	prompt
+
+_MoveNoPPText::
+	text "No PP left for"
+	line "this move!"
+	prompt
+
+_MoveDisabledText::
+	text "The move is"
+	line "disabled!"
+	prompt
+
+_NoMovesLeftText::
+	TX_RAM wBattleMonNick
+	text " has no"
+	line "moves left!"
+	done
+
+_MultiHitText::
+	text "Hit the enemy"
+	line "@"
+	TX_NUM wPlayerNumHits,1,1
+	text " times!"
+	prompt
+
+_ScaredText::
+	TX_RAM wBattleMonNick
+	text " is too"
+	line "scared to move!"
+	prompt
+
+_GetOutText::
+	text "GHOST: Get out..."
+	line "Get out..."
+	prompt
+
+_FastAsleepText::
+	text "<USER>"
+	line "is fast asleep!"
+	prompt
+
+_WokeUpText::
+	text "<USER>"
+	line "woke up!"
+	prompt
+
+_IsFrozenText::
+	text "<USER>"
+	line "is frozen solid!"
+	prompt
+
+_FullyParalyzedText::
+	text "<USER>'s"
+	line "fully paralyzed!"
+	prompt
+
+_FlinchedText::
+	text "<USER>"
+	line "flinched!"
+	prompt
+
+_MustRechargeText::
+	text "<USER>"
+	line "must recharge!"
+	prompt
+
+_DisabledNoMoreText::
+	text "<USER>'s"
+	line "disabled no more!"
+	prompt
+
+_IsConfusedText::
+	text "<USER>"
+	line "is confused!"
+	prompt
+
+_HurtItselfText::
+	text "It hurt itself in"
+	line "its confusion!"
+	prompt
+
+_ConfusedNoMoreText::
+	text "<USER>'s"
+	line "confused no more!"
+	prompt
+
+_SavingEnergyText::
+	text "<USER>"
+	line "is saving energy!"
+	prompt
+
+_UnleashedEnergyText::
+	text "<USER>"
+	line "unleashed energy!"
+	prompt
+
+_ThrashingAboutText::
+	text "<USER>'s"
+	line "thrashing about!"
+	done
+
+_AttackContinuesText::
+	text "<USER>'s"
+	line "attack continues!"
+	done
+
+_CantMoveText::
+	text "<USER>"
+	line "can't move!"
+	prompt
+
+_MoveIsDisabledText::
+	text "<USER>'s"
+	line "@"
+	TX_RAM wcd6d
+	text " is"
+	cont "disabled!"
+	prompt
+
+_MonName1Text::
+	text "<USER>@@"
+
+_Used1Text::
+	text ""
+	line "used @@"
+
+_Used2Text::
+	text ""
+	line "used @@"
+
+_InsteadText::
+	text "instead,"
+	cont "@@"
+
+_CF4BText::
+	TX_RAM wcf4b
+	text "@"
+
+_ExclamationPoint1Text::
+	text "!"
+	done
+
+_ExclamationPoint2Text::
+	text "!"
+	done
+
+_ExclamationPoint3Text::
+	text "!"
+	done
+
+_ExclamationPoint4Text::
+	text "!"
+	done
+
+_ExclamationPoint5Text::
+	text "!"
+	done
+
+_AttackMissedText::
+	text "<USER>'s"
+	line "attack missed!"
+	prompt
+
+_KeptGoingAndCrashedText::
+	text "<USER>"
+	line "kept going and"
+	cont "crashed!"
+	prompt
+
+_UnaffectedText::
+	text "<TARGET>'s"
+	line "unaffected!"
+	prompt
+
+_DoesntAffectMonText::
+	text "It doesn't affect"
+	line "<TARGET>!"
+	prompt
+
+_CriticalHitText::
+	text "Critical hit!"
+	prompt
+
+_OHKOText::
+	text "One-hit KO!"
+	prompt
+
+_LoafingAroundText::
+	TX_RAM wBattleMonNick
+	text " is"
+	line "loafing around."
+	prompt
+
+_BeganToNapText::
+	TX_RAM wBattleMonNick
+	text " began"
+	line "to nap!"
+	prompt
+
+_WontObeyText::
+	TX_RAM wBattleMonNick
+	text " won't"
+	line "obey!"
+	prompt
+
+_TurnedAwayText::
+	TX_RAM wBattleMonNick
+	text " turned"
+	line "away!"
+	prompt
+
+_IgnoredOrdersText::
+	TX_RAM wBattleMonNick
+	text ""
+	line "ignored orders!"
+	prompt
+
+_SubstituteTookDamageText::
+	text "The SUBSTITUTE"
+	line "took damage for"
+	cont "<TARGET>!"
+	prompt
+
+_SubstituteBrokeText::
+	text "<TARGET>'s"
+	line "SUBSTITUTE broke!"
+	prompt
+
+_BuildingRageText::
+	text "<USER>'s"
+	line "RAGE is building!"
+	prompt
+
+_MirrorMoveFailedText::
+	text "The MIRROR MOVE"
+	next "failed!"
+	prompt
+
+_HitXTimesText::
+	text "Hit @"
+	TX_NUM wEnemyNumHits, 1, 1
+	text " times!"
+	prompt
+
+_GainedText::
+	TX_RAM wcd6d
+	text " gained"
+	line "@@"
+
+_WithExpAllText::
+	text "with EXP.ALL,"
+	cont "@@"
+
+_BoostedText::
+	text "a boosted"
+	cont "@@"
+
+_ExpPointsText::
+	TX_NUM wExpAmountGained, 2, 4
+	text " EXP. Points!"
+	prompt
+
+_GrewLevelText::
+	TX_RAM wcd6d
+	text " grew"
+	line "to level @"
+	TX_NUM wCurEnemyLVL, 1, 3
+	text "!@@"
+
+_WildMonAppearedText::
+	text "Wild @"
+	TX_RAM wEnemyMonNick
+	text ""
+	line "appeared!"
+	prompt
+
+_HookedMonAttackedText::
+	text "The hooked"
+	line "@"
+	TX_RAM wEnemyMonNick
+	text ""
+	cont "attacked!"
+	prompt
+
+_EnemyAppearedText::
+	TX_RAM wEnemyMonNick
+	text ""
+	line "appeared!"
+	prompt
+
+_TrainerWantsToFightText::
+	TX_RAM wTrainerName
+	text " wants"
+	line "to fight!"
+	prompt
+
+_UnveiledGhostText::
+	text "SILPH SCOPE"
+	line "unveiled the"
+	cont "GHOST's identity!"
+	prompt
+
+_GhostCantBeIDdText::
+	text "Darn! The GHOST"
+	line "can't be ID'd!"
+	prompt
+
+_GoText::
+	text "Go! @@"
+
+_DoItText::
+	text "Do it! @@"
+
+_GetmText::
+	text "Get'm! @@"
+
+_EnemysWeakText::
+	text "The enemy's weak!"
+	line "Get'm! @@"
+
+_PlayerMon1Text::
+	TX_RAM wBattleMonNick
+	text "!"
+	done
+
+_PlayerMon2Text::
+	TX_RAM wBattleMonNick
+	text " @@"
+
+_EnoughText::
+	text "enough!@@"
+
+_OKExclamationText::
+	text "OK!@@"
+
+_GoodText::
+	text "good!@@"
+
+_ComeBackText::
+	text ""
+	line "Come back!"
+	done
+
+_SuperEffectiveText::
+	text "It's super"
+	line "effective!"
+	prompt
+
+_NotVeryEffectiveText::
+	text "It's not very"
+	line "effective..."
+	prompt
+
+_SafariZoneEatingText::
+	text "Wild @"
+	TX_RAM wEnemyMonNick
+	text ""
+	line "is eating!"
+	prompt
+
+_SafariZoneAngryText::
+	text "Wild @"
+	TX_RAM wEnemyMonNick
+	text ""
+	line "is angry!"
+	prompt
+
+; money related
+_PickUpPayDayMoneyText::
+	text "<PLAYER> picked up"
+	line "¥@"
+	TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text "!"
+	prompt
+
+_ClearSaveDataText::
+	text "Clear all saved"
+	line "data?"
+	done
+
+_WhichFloorText::
+	text "Which floor do"
+	line "you want? "
+	done
+
+_PartyMenuNormalText::
+	text "Choose a #MON."
+	done
+
+_PartyMenuItemUseText::
+	text "Use item on which"
+	line "#MON?"
+	done
+
+_PartyMenuBattleText::
+	text "Bring out which"
+	line "#MON?"
+	done
+
+_PartyMenuUseTMText::
+	text "Use TM on which"
+	line "#MON?"
+	done
+
+_PartyMenuSwapMonText::
+	text "Move #MON"
+	line "where?"
+	done
+
+_PotionText::
+	TX_RAM wcd6d
+	text ""
+	line "recovered by @"
+	TX_NUM wHPBarHPDifference, 2, 3
+	text "!"
+	done
+
+_AntidoteText::
+	TX_RAM wcd6d
+	text " was"
+	line "cured of poison!"
+	done
+
+_ParlyzHealText::
+	TX_RAM wcd6d
+	text "'s"
+	line "rid of paralysis!"
+	done
+
+_BurnHealText::
+	TX_RAM wcd6d
+	text "'s"
+	line "burn was healed!"
+	done
+
+_IceHealText::
+	TX_RAM wcd6d
+	text " was"
+	line "defrosted!"
+	done
+
+_AwakeningText::
+	TX_RAM wcd6d
+	text ""
+	line "woke up!"
+	done
+
+_FullHealText::
+	TX_RAM wcd6d
+	text "'s"
+	line "health returned!"
+	done
+
+_ReviveText::
+	TX_RAM wcd6d
+	text ""
+	line "is revitalized!"
+	done
+
+_RareCandyText::
+	TX_RAM wcd6d
+	text " grew"
+	line "to level @"
+	TX_NUM wCurEnemyLVL, 1, 3
+	text "!@@"
+
+_TurnedOnPC1Text::
+	text "<PLAYER> turned on"
+	line "the PC."
+	prompt
+
+_AccessedBillsPCText::
+	text "Accessed BILL's"
+	line "PC."
+
+	para "Accessed #MON"
+	line "Storage System."
+	prompt
+
+_AccessedSomeonesPCText::
+	text "Accessed someone's"
+	line "PC."
+
+	para "Accessed #MON"
+	line "Storage System."
+	prompt
+
+_AccessedMyPCText::
+	text "Accessed my PC."
+
+	para "Accessed Item"
+	line "Storage System."
+	prompt
+
+_TurnedOnPC2Text::
+	text "<PLAYER> turned on"
+	line "the PC."
+	prompt
+
+_WhatDoYouWantText::
+	text "What do you want"
+	line "to do?"
+	done
+
+_WhatToDepositText::
+	text "What do you want"
+	line "to deposit?"
+	done
+
+_DepositHowManyText::
+	text "How many?"
+	done
+
+_ItemWasStoredText::
+	TX_RAM wcd6d
+	text " was"
+	line "stored via PC."
+	prompt
+
+_NothingToDepositText::
+	text "You have nothing"
+	line "to deposit."
+	prompt
+
+_NoRoomToStoreText::
+	text "No room left to"
+	line "store items."
+	prompt
+
+_WhatToWithdrawText::
+	text "What do you want"
+	line "to withdraw?"
+	done
+
+_WithdrawHowManyText::
+	text "How many?"
+	done
+
+_WithdrewItemText::
+	text "Withdrew"
+	line "@"
+	TX_RAM wcd6d
+	text "."
+	prompt
+
+_NothingStoredText::
+	text "There is nothing"
+	line "stored."
+	prompt
+
+_CantCarryMoreText::
+	text "You can't carry"
+	line "any more items."
+	prompt
+
+_WhatToTossText::
+	text "What do you want"
+	line "to toss away?"
+	done
+
+_TossHowManyText::
+	text "How many?"
+	done
+
+_AccessedHoFPCText::
+	text "Accessed #MON"
+	line "LEAGUE's site."
+
+	para "Accessed the HALL"
+	line "OF FAME List."
+	prompt
+
+_SwitchOnText::
+	text "Switch on!"
+	prompt
+
+_WhatText::
+	text "What?"
+	done
+
+_DepositWhichMonText::
+	text "Deposit which"
+	line "#MON?"
+	done
+
+_MonWasStoredText::
+	TX_RAM wcf4b
+	text " was"
+	line "stored in Box @"
+	TX_RAM wBoxNumString
+	text "."
+	prompt
+
+_CantDepositLastMonText::
+	text "You can't deposit"
+	line "the last #MON!"
+	prompt
+
+_BoxFullText::
+	text "Oops! This Box is"
+	line "full of #MON."
+	prompt
+
+_MonIsTakenOutText::
+	TX_RAM wcf4b
+	text " is"
+	line "taken out."
+	cont "Got @"
+	TX_RAM wcf4b
+	text "."
+	prompt
+
+_NoMonText::
+	text "What? There are"
+	line "no #MON here!"
+	prompt
+
+_CantTakeMonText::
+	text "You can't take"
+	line "any more #MON."
+
+	para "Deposit #MON"
+	line "first."
+	prompt
+
+_ReleaseWhichMonText::
+	text "Release which"
+	line "#MON?"
+	done
+
+_OnceReleasedText::
+	text "Once released,"
+	line "@"
+	TX_RAM wcf4b
+	text " is"
+	cont "gone forever. OK?"
+	done
+
+_MonWasReleasedText::
+	TX_RAM wcf4b
+	text " was"
+	line "released outside."
+	cont "Bye @"
+
+_CF4BExclamationText::
+	TX_RAM wcf4b
+	text "!"
+	prompt
+
+_RequireCoinCaseText::
+	text "A COIN CASE is"
+	line "required!@@"
+
+_ExchangeCoinsForPrizesText::
+	text "We exchange your"
+	line "coins for prizes."
+	prompt
+
+_WhichPrizeText::
+	text "Which prize do"
+	line "you want?"
+	done
+
+_HereYouGoText::
+	text "Here you go!@@"
+
+_SoYouWantPrizeText::
+	text "So, you want"
+	line "@"
+	TX_RAM wcd6d
+	text "?"
+	done
+
+_SorryNeedMoreCoinsText::
+	text "Sorry, you need"
+	line "more coins.@@"
+
+_OopsYouDontHaveEnoughRoomText::
+	text "Oops! You don't"
+	line "have enough room.@@"
+
+_OhFineThenText::
+	text "Oh, fine then.@@"
+
+_GetDexRatedText::
+	text "Want to get your"
+	line "#DEX rated?"
+	done
+
+_ClosedOaksPCText::
+	text "Closed link to"
+	line "PROF.OAK's PC.@@"
+
+_AccessedOaksPCText::
+	text "Accessed PROF."
+	line "OAK's PC."
+
+	para "Accessed #DEX"
+	line "Rating System."
+	prompt
+
+_WhereWouldYouLikeText::
+	text "Where would you"
+	line "like to go?"
+	done
+
+_PleaseWaitText::
+	text "OK, please wait"
+	line "just a moment."
+	done
+
+_LinkCanceledText::
+	text "The link was"
+	line "canceled."
+	done
+
+_OakSpeechText1::
+	text "Hello there!"
+	line "Welcome to the"
+	cont "world of #MON!"
+
+	para "My name is OAK!"
+	line "People call me"
+	cont "the #MON PROF!"
+	prompt
+
+_OakSpeechText2A::
+	text "This world is"
+	line "inhabited by"
+	cont "creatures called"
+	cont "#MON!@@"
+
+_OakSpeechText2B::
+	text $51,"For some people,"
+	line "#MON are"
+	cont "pets. Others use"
+	cont "them for fights."
+
+	para "Myself..."
+
+	para "I study #MON"
+	line "as a profession."
+	prompt
+
+_IntroducePlayerText::
+	text "First, what is"
+	line "your name?"
+	prompt
+
+_IntroduceRivalText::
+	text "This is my grand-"
+	line "son. He's been"
+	cont "your rival since"
+	cont "you were a baby."
+
+	para "...Erm, what is"
+	line "his name again?"
+	prompt
+
+_OakSpeechText3::
+	text "<PLAYER>!"
+
+	para "Your very own"
+	line "#MON legend is"
+	cont "about to unfold!"
+
+	para "A world of dreams"
+	line "and adventures"
+	cont "with #MON"
+	cont "awaits! Let's go!"
+	done
+
+_DoYouWantToNicknameText::
+	text "Do you want to"
+	line "give a nickname"
+	cont "to @"
+	TX_RAM wcd6d
+	text "?"
+	done
+
+_YourNameIsText::
+	text "Right! So your"
+	line "name is <PLAYER>!"
+	prompt
+
+_HisNameIsText::
+	text "That's right! I"
+	line "remember now! His"
+	cont "name is <RIVAL>!"
+	prompt
+
+_WillBeTradedText::
+	TX_RAM wNameOfPlayerMonToBeTraded
+	text " and"
+	line "@"
+	TX_RAM wcd6d
+	text " will"
+	cont "be traded."
+	done
+
+_Char00Text::
+	TX_NUM hSpriteIndexOrTextID,1,2
+	text " ERROR."
+	done
+
+_Char55Text::
+	text $4B,"@@"
diff --git a/data/text/text_3.asm b/data/text/text_3.asm
new file mode 100644
index 00000000..3b2ff787
--- /dev/null
+++ b/data/text/text_3.asm
@@ -0,0 +1,324 @@
+_FileDataDestroyedText::
+	text "The file data is"
+	line "destroyed!"
+	prompt
+
+_WouldYouLikeToSaveText::
+	text "Would you like to"
+	line "SAVE the game?"
+	done
+
+_GameSavedText::
+	text "<PLAYER> saved"
+	line "the game!"
+	done
+
+_OlderFileWillBeErasedText::
+	text "The older file"
+	line "will be erased to"
+	cont "save. Okay?"
+	done
+
+_WhenYouChangeBoxText::
+	text "When you change a"
+	line "#MON BOX, data"
+	cont "will be saved."
+
+	para "Is that okay?"
+	done
+
+_ChooseABoxText::
+	text "Choose a"
+	line "<pkmn> BOX.@@"
+
+_EvolvedText::
+	TX_RAM wcf4b
+	text " evolved"
+	done
+
+_IntoText::
+	text ""
+	line "into @"
+	TX_RAM wcd6d
+	text "!"
+	done
+
+_StoppedEvolvingText::
+	text "Huh? @"
+	TX_RAM wcf4b
+	text ""
+	line "stopped evolving!"
+	prompt
+
+_IsEvolvingText::
+	text "What? @"
+	TX_RAM wcf4b
+	text ""
+	line "is evolving!"
+	done
+
+_FellAsleepText::
+	text "<TARGET>"
+	line "fell asleep!"
+	prompt
+
+_AlreadyAsleepText::
+	text "<TARGET>'s"
+	line "already asleep!"
+	prompt
+
+_PoisonedText::
+	text "<TARGET>"
+	line "was poisoned!"
+	prompt
+
+_BadlyPoisonedText::
+	text "<TARGET>'s"
+	line "badly poisoned!"
+	prompt
+
+_BurnedText::
+	text "<TARGET>"
+	line "was burned!"
+	prompt
+
+_FrozenText::
+	text "<TARGET>"
+	line "was frozen solid!"
+	prompt
+
+_FireDefrostedText::
+	text "Fire defrosted"
+	line "<TARGET>!"
+	prompt
+
+_MonsStatsRoseText::
+	text "<USER>'s"
+	line "@"
+	TX_RAM wcf4b
+	text "@@"
+
+_GreatlyRoseText::
+	text $4c, "greatly@@"
+
+_RoseText::
+	text " rose!"
+	prompt
+
+_MonsStatsFellText::
+	text "<TARGET>'s"
+	line "@"
+	TX_RAM wcf4b
+	text "@@"
+
+_GreatlyFellText::
+	text $4c, "greatly@@"
+
+_FellText::
+	text " fell!"
+	prompt
+
+_RanFromBattleText::
+	text "<USER>"
+	line "ran from battle!"
+	prompt
+
+_RanAwayScaredText::
+	text "<TARGET>"
+	line "ran away scared!"
+	prompt
+
+_WasBlownAwayText::
+	text "<TARGET>"
+	line "was blown away!"
+	prompt
+
+_ChargeMoveEffectText::
+	text "<USER>@@"
+
+_MadeWhirlwindText::
+	text ""
+	line "made a whirlwind!"
+	prompt
+
+_TookInSunlightText::
+	text ""
+	line "took in sunlight!"
+	prompt
+
+_LoweredItsHeadText::
+	text ""
+	line "lowered its head!"
+	prompt
+
+_SkyAttackGlowingText::
+	text ""
+	line "is glowing!"
+	prompt
+
+_FlewUpHighText::
+	text ""
+	line "flew up high!"
+	prompt
+
+_DugAHoleText::
+	text ""
+	line "dug a hole!"
+	prompt
+
+_BecameConfusedText::
+	text "<TARGET>"
+	line "became confused!"
+	prompt
+
+_MimicLearnedMoveText::
+	text "<USER>"
+	line "learned"
+	cont "@"
+	TX_RAM wcd6d
+	text "!"
+	prompt
+
+_MoveWasDisabledText::
+	text "<TARGET>'s"
+	line "@"
+	TX_RAM wcd6d
+	text " was"
+	cont "disabled!"
+	prompt
+
+_NothingHappenedText::
+	text "Nothing happened!"
+	prompt
+
+_NoEffectText::
+	text "No effect!"
+	prompt
+
+_ButItFailedText::
+	text "But, it failed! "
+	prompt
+
+_DidntAffectText::
+	text "It didn't affect"
+	line "<TARGET>!"
+	prompt
+
+_IsUnaffectedText::
+	text "<TARGET>"
+	line "is unaffected!"
+	prompt
+
+_ParalyzedMayNotAttackText::
+	text "<TARGET>'s"
+	line "paralyzed! It may"
+	cont "not attack!"
+	prompt
+
+_SubstituteText::
+	text "It created a"
+	line "SUBSTITUTE!"
+	prompt
+
+_HasSubstituteText::
+	text "<USER>"
+	line "has a SUBSTITUTE!"
+	prompt
+
+_TooWeakSubstituteText::
+	text "Too weak to make"
+	line "a SUBSTITUTE!"
+	prompt
+
+_CoinsScatteredText::
+	text "Coins scattered"
+	line "everywhere!"
+	prompt
+
+_GettingPumpedText::
+	text "<USER>'s"
+	line "getting pumped!"
+	prompt
+
+_WasSeededText::
+	text "<TARGET>"
+	line "was seeded!"
+	prompt
+
+_EvadedAttackText::
+	text "<TARGET>"
+	line "evaded attack!"
+	prompt
+
+_HitWithRecoilText::
+	text "<USER>'s"
+	line "hit with recoil!"
+	prompt
+
+_ConvertedTypeText::
+	text "Converted type to"
+	line "<TARGET>'s!"
+	prompt
+
+_StatusChangesEliminatedText::
+	text "All STATUS changes"
+	line "are eliminated!"
+	prompt
+
+_StartedSleepingEffect::
+	text "<USER>"
+	line "started sleeping!"
+	done
+
+_FellAsleepBecameHealthyText::
+	text "<USER>"
+	line "fell asleep and"
+	cont "became healthy!"
+	done
+
+_RegainedHealthText::
+	text "<USER>"
+	line "regained health!"
+	prompt
+
+_TransformedText::
+	text "<USER>"
+	line "transformed into"
+	cont "@"
+	TX_RAM wcd6d
+	text "!"
+	prompt
+
+_LightScreenProtectedText::
+	text "<USER>'s"
+	line "protected against"
+	cont "special attacks!"
+	prompt
+
+_ReflectGainedArmorText::
+	text "<USER>"
+	line "gained armor!"
+	prompt
+
+_ShroudedInMistText::
+	text "<USER>'s"
+	line "shrouded in mist!"
+	prompt
+
+_SuckedHealthText::
+	text "Sucked health from"
+	line "<TARGET>!"
+	prompt
+
+_DreamWasEatenText::
+	text "<TARGET>'s"
+	line "dream was eaten!"
+	prompt
+
+_TradeCenterText1::
+	text "!"
+	done
+
+_ColosseumText1::
+	text "!"
+	done
diff --git a/data/text/text_4.asm b/data/text/text_4.asm
new file mode 100644
index 00000000..6ec22680
--- /dev/null
+++ b/data/text/text_4.asm
@@ -0,0 +1,217 @@
+_PokemartGreetingText::
+	text "Hi there!"
+	next "May I help you?"
+	done
+
+_PokemonFaintedText::
+	TX_RAM wcd6d
+	text ""
+	line "fainted!"
+	done
+
+_PlayerBlackedOutText::
+	text "<PLAYER> is out of"
+	line "useable #MON!"
+
+	para "<PLAYER> blacked"
+	line "out!"
+	prompt
+
+_RepelWoreOffText::
+	text "REPEL's effect"
+	line "wore off."
+	done
+
+_PokemartBuyingGreetingText::
+	text "Take your time."
+	done
+
+_PokemartTellBuyPriceText::
+	TX_RAM wcf4b
+	text "?"
+	line "That will be"
+	cont "¥@"
+	TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text ". OK?"
+	done
+
+_PokemartBoughtItemText::
+	text "Here you are!"
+	line "Thank you!"
+	prompt
+
+_PokemartNotEnoughMoneyText::
+	text "You don't have"
+	line "enough money."
+	prompt
+
+_PokemartItemBagFullText::
+	text "You can't carry"
+	line "any more items."
+	prompt
+
+_PokemonSellingGreetingText::
+	text "What would you"
+	line "like to sell?"
+	done
+
+_PokemartTellSellPriceText::
+	text "I can pay you"
+	line "¥@"
+	TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text " for that."
+	done
+
+_PokemartItemBagEmptyText::
+	text "You don't have"
+	line "anything to sell."
+	prompt
+
+_PokemartUnsellableItemText::
+	text "I can't put a"
+	line "price on that."
+	prompt
+
+_PokemartThankYouText::
+	text "Thank you!"
+	done
+
+_PokemartAnythingElseText::
+	text "Is there anything"
+	line "else I can do?"
+	done
+
+_LearnedMove1Text::
+	TX_RAM wLearnMoveMonName
+	text " learned"
+	line "@"
+	TX_RAM wcf4b
+	text "!@@"
+
+_WhichMoveToForgetText::
+	text "Which move should"
+	next "be forgotten?"
+	done
+
+_AbandonLearningText::
+	text "Abandon learning"
+	line "@"
+	TX_RAM wcf4b
+	text "?"
+	done
+
+_DidNotLearnText::
+	TX_RAM wLearnMoveMonName
+	text ""
+	line "did not learn"
+	cont "@"
+	TX_RAM wcf4b
+	text "!"
+	prompt
+
+_TryingToLearnText::
+	TX_RAM wLearnMoveMonName
+	text " is"
+	line "trying to learn"
+	cont "@"
+	TX_RAM wcf4b
+	text "!"
+
+	para "But, @"
+	TX_RAM wLearnMoveMonName
+	text ""
+	line "can't learn more"
+	cont "than 4 moves!"
+
+	para "Delete an older"
+	line "move to make room"
+	cont "for @"
+	TX_RAM wcf4b
+	text "?"
+	done
+
+_OneTwoAndText::
+	text "1, 2 and...@@"
+
+_PoofText::
+	text " Poof!@@"
+
+_ForgotAndText::
+	text ""
+	para "@"
+	TX_RAM wLearnMoveMonName
+	text " forgot"
+	line "@"
+	TX_RAM wcd6d
+	text "!"
+
+	para "And..."
+	prompt
+
+_HMCantDeleteText::
+	text "HM techniques"
+	line "can't be deleted!"
+	prompt
+
+_PokemonCenterWelcomeText::
+	text "Welcome to our"
+	line "#MON CENTER!"
+
+	para "We heal your"
+	line "#MON back to"
+	cont "perfect health!"
+	prompt
+
+_ShallWeHealYourPokemonText::
+	text "Shall we heal your"
+	line "#MON?"
+	done
+
+_NeedYourPokemonText::
+	text "OK. We'll need"
+	line "your #MON."
+	done
+
+_PokemonFightingFitText::
+	text "Thank you!"
+	line "Your #MON are"
+	cont "fighting fit!"
+	prompt
+
+_PokemonCenterFarewellText::
+	text "We hope to see"
+	line "you again!"
+	done
+
+_CableClubNPCAreaReservedFor2FriendsLinkedByCableText::
+	text "This area is"
+	line "reserved for 2"
+	cont "friends who are"
+	cont "linked by cable."
+	done
+
+_CableClubNPCWelcomeText::
+	text "Welcome to the"
+	line "Cable Club!"
+	done
+
+_CableClubNPCPleaseApplyHereHaveToSaveText::
+	text "Please apply here."
+
+	para "Before opening"
+	line "the link, we have"
+	cont "to save the game."
+	done
+
+_CableClubNPCPleaseWaitText::
+	text "Please wait.@@"
+
+_CableClubNPCLinkClosedBecauseOfInactivityText::
+	text "The link has been"
+	line "closed because of"
+	cont "inactivity."
+
+	para "Please contact"
+	line "your friend and"
+	cont "come again!"
+	done
diff --git a/data/text/text_5.asm b/data/text/text_5.asm
new file mode 100644
index 00000000..26a11a40
--- /dev/null
+++ b/data/text/text_5.asm
@@ -0,0 +1,102 @@
+_CableClubNPCPleaseComeAgainText::
+	text "Please come again!"
+	done
+
+_CableClubNPCMakingPreparationsText::
+	text "We're making"
+	line "preparations."
+	cont "Please wait."
+	done
+
+_UsedStrengthText::
+	TX_RAM wcd6d
+	text " used"
+	line "STRENGTH.@@"
+
+_CanMoveBouldersText::
+	TX_RAM wcd6d
+	text " can"
+	line "move boulders."
+	prompt
+
+_CurrentTooFastText::
+	text "The current is"
+	line "much too fast!"
+	prompt
+
+_CyclingIsFunText::
+	text "Cycling is fun!"
+	line "Forget SURFing!"
+	prompt
+
+_FlashLightsAreaText::
+	text "A blinding FLASH"
+	line "lights the area!"
+	prompt
+
+_WarpToLastPokemonCenterText::
+	text "Warp to the last"
+	line "#MON CENTER."
+	done
+
+_CannotUseTeleportNowText::
+	TX_RAM wcd6d
+	text " can't"
+	line "use TELEPORT now."
+	prompt
+
+_CannotFlyHereText::
+	TX_RAM wcd6d
+	text " can't"
+	line "FLY here."
+	prompt
+
+_NotHealthyEnoughText::
+	text "Not healthy"
+	line "enough."
+	prompt
+
+_NewBadgeRequiredText::
+	text "No! A new BADGE"
+	line "is required."
+	prompt
+
+_CannotUseItemsHereText::
+	text "You can't use items"
+	line "here."
+	prompt
+
+_CannotGetOffHereText::
+	text "You can't get off"
+	line "here."
+	prompt
+
+_GotMonText::
+	text "<PLAYER> got"
+	line "@"
+	TX_RAM wcd6d
+	text "!@@"
+
+_SentToBoxText::
+	text "There's no more"
+	line "room for #MON!"
+	cont "@"
+	TX_RAM wBoxMonNicks
+	text " was"
+	cont "sent to #MON"
+	cont "BOX @"
+	TX_RAM wcf4b
+	text " on PC!"
+	done
+
+_BoxIsFullText::
+	text "There's no more"
+	line "room for #MON!"
+
+	para "The #MON BOX"
+	line "is full and can't"
+	cont "accept any more!"
+
+	para "Change the BOX at"
+	line "a #MON CENTER!"
+	done
diff --git a/data/text/text_6.asm b/data/text/text_6.asm
new file mode 100644
index 00000000..45c553cd
--- /dev/null
+++ b/data/text/text_6.asm
@@ -0,0 +1,228 @@
+_ItemUseBallText00::
+	text "It dodged the"
+	line "thrown BALL!"
+
+	para "This #MON"
+	line "can't be caught!"
+	prompt
+
+_ItemUseBallText01::
+	text "You missed the"
+	line "#MON!"
+	prompt
+
+_ItemUseBallText02::
+	text "Darn! The #MON"
+	line "broke free!"
+	prompt
+
+_ItemUseBallText03::
+	text "Aww! It appeared"
+	line "to be caught! "
+	prompt
+
+_ItemUseBallText04::
+	text "Shoot! It was so"
+	line "close too!"
+	prompt
+
+_ItemUseBallText05::
+	text "All right!"
+	line "@"
+	TX_RAM wEnemyMonNick
+	text " was"
+	cont "caught!@@"
+
+_ItemUseBallText07::
+	TX_RAM wBoxMonNicks
+	text " was"
+	line "transferred to"
+	cont "BILL's PC!"
+	prompt
+
+_ItemUseBallText08::
+	TX_RAM wBoxMonNicks
+	text " was"
+	line "transferred to"
+	cont "someone's PC!"
+	prompt
+
+_ItemUseBallText06::
+	text "New #DEX data"
+	line "will be added for"
+	cont "@"
+	TX_RAM wEnemyMonNick
+	text "!@@"
+
+_SurfingGotOnText::
+	text "<PLAYER> got on"
+	line "@"
+	TX_RAM wcd6d
+	text "!"
+	prompt
+
+_SurfingNoPlaceToGetOffText::
+	text "There's no place"
+	line "to get off!"
+	prompt
+
+_VitaminStatRoseText::
+	TX_RAM wcd6d
+	text "'s"
+	line "@"
+	TX_RAM wcf4b
+	text " rose."
+	prompt
+
+_VitaminNoEffectText::
+	text "It won't have any"
+	line "effect."
+	prompt
+
+_ThrewBaitText::
+	text "<PLAYER> threw"
+	line "some BAIT."
+	done
+
+_ThrewRockText::
+	text "<PLAYER> threw a"
+	line "ROCK."
+	done
+
+_PlayedFluteNoEffectText::
+	text "Played the #"
+	line "FLUTE."
+
+	para "Now, that's a"
+	line "catchy tune!"
+	prompt
+
+_FluteWokeUpText::
+	text "All sleeping"
+	line "#MON woke up."
+	prompt
+
+_PlayedFluteHadEffectText::
+	text "<PLAYER> played the"
+	line "# FLUTE.@@"
+
+_CoinCaseNumCoinsText::
+	text "Coins"
+	line "@"
+	TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text " "
+	prompt
+
+_ItemfinderFoundItemText::
+	text "Yes! ITEMFINDER"
+	line "indicates there's"
+	cont "an item nearby."
+	prompt
+
+_ItemfinderFoundNothingText::
+	text "Nope! ITEMFINDER"
+	line "isn't responding."
+	prompt
+
+_RaisePPWhichTechniqueText::
+	text "Raise PP of which"
+	line "technique?"
+	done
+
+_RestorePPWhichTechniqueText::
+	text "Restore PP of"
+	line "which technique?"
+	done
+
+_PPMaxedOutText::
+	TX_RAM wcf4b
+	text "'s PP"
+	line "is maxed out."
+	prompt
+
+_PPIncreasedText::
+	TX_RAM wcf4b
+	text "'s PP"
+	line "increased."
+	prompt
+
+_PPRestoredText::
+	text "PP was restored."
+	prompt
+
+_BootedUpTMText::
+	text "Booted up a TM!"
+	prompt
+
+_BootedUpHMText::
+	text "Booted up an HM!"
+	prompt
+
+_TeachMachineMoveText::
+	text "It contained"
+	line "@"
+	TX_RAM wcf4b
+	text "!"
+
+	para "Teach @"
+	TX_RAM wcf4b
+	text ""
+	line "to a #MON?"
+	done
+
+_MonCannotLearnMachineMoveText::
+	TX_RAM wcd6d
+	text " is not"
+	line "compatible with"
+	cont "@"
+	TX_RAM wcf4b
+	text "."
+
+	para "It can't learn"
+	line "@"
+	TX_RAM wcf4b
+	text "."
+	prompt
+
+_ItemUseNotTimeText::
+	text "OAK: <PLAYER>!"
+	line "This isn't the"
+	cont "time to use that! "
+	prompt
+
+_ItemUseNotYoursToUseText::
+	text "This isn't yours"
+	line "to use!"
+	prompt
+
+_ItemUseNoEffectText::
+	text "It won't have any"
+	line "effect."
+	prompt
+
+_ThrowBallAtTrainerMonText1::
+	text "The trainer"
+	line "blocked the BALL!"
+	prompt
+
+_ThrowBallAtTrainerMonText2::
+	text "Don't be a thief!"
+	prompt
+
+_NoCyclingAllowedHereText::
+	text "No cycling"
+	next "allowed here."
+	prompt
+
+_NoSurfingHereText::
+	text "No SURFing on"
+	line "@"
+	TX_RAM wcd6d
+	text " here!"
+	prompt
+
+_BoxFullCannotThrowBallText::
+	text "The #MON BOX"
+	line "is full! Can't"
+	cont "use that item!"
+	prompt
diff --git a/data/text/text_7.asm b/data/text/text_7.asm
new file mode 100644
index 00000000..e836fc8e
--- /dev/null
+++ b/data/text/text_7.asm
@@ -0,0 +1,196 @@
+_ItemUseText001::
+	text "<PLAYER> used@@"
+
+_ItemUseText002::
+	TX_RAM wcf4b
+	text "!"
+	done
+
+_GotOnBicycleText1::
+	text "<PLAYER> got on the@@"
+
+_GotOnBicycleText2::
+	TX_RAM wcf4b
+	text "!"
+	prompt
+
+_GotOffBicycleText1::
+	text "<PLAYER> got off@@"
+
+_GotOffBicycleText2::
+	text "the @"
+	TX_RAM wcf4b
+	text "."
+	prompt
+
+_ThrewAwayItemText::
+	text "Threw away"
+	line "@"
+	TX_RAM wcd6d
+	text "."
+	prompt
+
+_IsItOKToTossItemText::
+	text "Is it OK to toss"
+	line "@"
+	TX_RAM wcf4b
+	text "?"
+	prompt
+
+_TooImportantToTossText::
+	text "That's too impor-"
+	line "tant to toss!"
+	prompt
+
+_AlreadyKnowsText::
+	TX_RAM wcd6d
+	text " knows"
+	line "@"
+	TX_RAM wcf4b
+	text "!"
+	prompt
+
+_ConnectCableText::
+	text "Okay, connect the"
+	line "cable like so!"
+	prompt
+
+_TradedForText::
+	text "<PLAYER> traded"
+	line "@"
+	TX_RAM wInGameTradeGiveMonName
+	text " for"
+	cont "@"
+	TX_RAM wInGameTradeReceiveMonName
+	text "!@@"
+
+_WannaTrade1Text::
+	text "I'm looking for"
+	line "@"
+	TX_RAM wInGameTradeGiveMonName
+	text "! Wanna"
+
+	para "trade one for"
+	line "@"
+	TX_RAM wInGameTradeReceiveMonName
+	text "? "
+	done
+
+_NoTrade1Text::
+	text "Awww!"
+	line "Oh well..."
+	done
+
+_WrongMon1Text::
+	text "What? That's not"
+	line "@"
+	TX_RAM wInGameTradeGiveMonName
+	text "!"
+
+	para "If you get one,"
+	line "come back here!"
+	done
+
+_Thanks1Text::
+	text "Hey thanks!"
+	done
+
+_AfterTrade1Text::
+	text "Isn't my old"
+	line "@"
+	TX_RAM wInGameTradeReceiveMonName
+	text " great?"
+	done
+
+_WannaTrade2Text::
+	text "Hello there! Do"
+	line "you want to trade"
+
+	para "your @"
+	TX_RAM wInGameTradeGiveMonName
+	text ""
+	line "for @"
+	TX_RAM wInGameTradeReceiveMonName
+	text "?"
+	done
+
+_NoTrade2Text::
+	text "Well, if you"
+	line "don't want to..."
+	done
+
+_WrongMon2Text::
+	text "Hmmm? This isn't"
+	line "@"
+	TX_RAM wInGameTradeGiveMonName
+	text "."
+
+	para "Think of me when"
+	line "you get one."
+	done
+
+_Thanks2Text::
+	text "Thanks!"
+	done
+
+_AfterTrade2Text::
+	text "The @"
+	TX_RAM wInGameTradeGiveMonName
+	text " you"
+	line "traded to me"
+
+	para "went and evolved!"
+	done
+
+_WannaTrade3Text::
+	text "Hi! Do you have"
+	line "@"
+	TX_RAM wInGameTradeGiveMonName
+	text "?"
+
+	para "Want to trade it"
+	line "for @"
+	TX_RAM wInGameTradeReceiveMonName
+	text "?"
+	done
+
+_NoTrade3Text::
+	text "That's too bad."
+	done
+
+_WrongMon3Text::
+	text "...This is no"
+	line "@"
+	TX_RAM wInGameTradeGiveMonName
+	text "."
+
+	para "If you get one,"
+	line "trade it with me!"
+	done
+
+_Thanks3Text::
+	text "Thanks pal!"
+	done
+
+_AfterTrade3Text::
+	text "How is my old"
+	line "@"
+	TX_RAM wInGameTradeReceiveMonName
+	text "?"
+
+	para "My @"
+	TX_RAM wInGameTradeGiveMonName
+	text " is"
+	line "doing great!"
+	done
+
+_NothingToCutText::
+	text "There isn't"
+	line "anything to CUT!"
+	prompt
+
+_UsedCutText::
+	TX_RAM wcd6d
+	text " hacked"
+	line "away with CUT!"
+	prompt
diff --git a/data/text/unused_names.asm b/data/text/unused_names.asm
new file mode 100644
index 00000000..e629c44e
--- /dev/null
+++ b/data/text/unused_names.asm
@@ -0,0 +1,20 @@
+UnusedNames::
+	db "かみなりバッヂ@" ; THUNDER BADGE
+	db "かいがらバッヂ@" ; SHELL BADGE
+	db "おじぞうバッヂ@" ; JIZOU BADGE
+	db "はやぶさバッヂ@" ; FALCON BADGE
+	db "ひんやりバッヂ@" ; CHILL BADGE
+	db "なかよしバッヂ@" ; FRIENDSHIP BADGE
+	db "バラバッヂ@" ; ROSE BADGE
+	db "ひのたまバッヂ@" ; FIREBALL BADGE
+	db "ゴールドバッヂ@" ; GOLD BADGE
+	db "たまご@" ; EGG
+	db "ひよこ@" ; CHICK
+	db "ブロンズ@" ; BRONZE
+	db "シルバー@" ; SILVER
+	db "ゴールド@" ; GOLD
+	db "プチキャプテン@" ; PETIT CAPTAIN
+	db "キャプテン@" ; CAPTAIN
+	db "プチマスター@" ; PETIT MASTER
+	db "マスター@" ; MASTER
+	db "エクセレント" ; EXCELLENT
diff --git a/data/bike_riding_tilesets.asm b/data/tilesets/bike_riding_tilesets.asm
index 48c2cee6..48c2cee6 100755
--- a/data/bike_riding_tilesets.asm
+++ b/data/tilesets/bike_riding_tilesets.asm
diff --git a/data/bookshelf_tile_ids.asm b/data/tilesets/bookshelf_tile_ids.asm
index 535bf8e9..535bf8e9 100644
--- a/data/bookshelf_tile_ids.asm
+++ b/data/tilesets/bookshelf_tile_ids.asm
diff --git a/data/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm
index c18a7e72..c18a7e72 100644
--- a/data/collision_tile_ids.asm
+++ b/data/tilesets/collision_tile_ids.asm
diff --git a/data/cut_tree_blocks.asm b/data/tilesets/cut_tree_blocks.asm
index eb63a712..eb63a712 100644
--- a/data/cut_tree_blocks.asm
+++ b/data/tilesets/cut_tree_blocks.asm
diff --git a/data/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm
index 686e418c..686e418c 100644
--- a/data/door_tile_ids.asm
+++ b/data/tilesets/door_tile_ids.asm
diff --git a/data/dungeon_tilesets.asm b/data/tilesets/dungeon_tilesets.asm
index 01e86714..01e86714 100755
--- a/data/dungeon_tilesets.asm
+++ b/data/tilesets/dungeon_tilesets.asm
diff --git a/data/ledge_tiles.asm b/data/tilesets/ledge_tiles.asm
index b742af1a..b742af1a 100644
--- a/data/ledge_tiles.asm
+++ b/data/tilesets/ledge_tiles.asm
diff --git a/data/tileset_headers.asm b/data/tilesets/tileset_headers.asm
index d8e0d9b4..d8e0d9b4 100755
--- a/data/tileset_headers.asm
+++ b/data/tilesets/tileset_headers.asm
diff --git a/data/warp_carpet_tile_ids.asm b/data/tilesets/warp_carpet_tile_ids.asm
index 6f312bc7..6f312bc7 100644
--- a/data/warp_carpet_tile_ids.asm
+++ b/data/tilesets/warp_carpet_tile_ids.asm
diff --git a/data/warp_pad_hole_tile_ids.asm b/data/tilesets/warp_pad_hole_tile_ids.asm
index 3e2c1890..3e2c1890 100644
--- a/data/warp_pad_hole_tile_ids.asm
+++ b/data/tilesets/warp_pad_hole_tile_ids.asm
diff --git a/data/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm
index 6fd326cc..6fd326cc 100755
--- a/data/warp_tile_ids.asm
+++ b/data/tilesets/warp_tile_ids.asm
diff --git a/data/water_tilesets.asm b/data/tilesets/water_tilesets.asm
index 00f0ab1f..00f0ab1f 100644
--- a/data/water_tilesets.asm
+++ b/data/tilesets/water_tilesets.asm
diff --git a/data/trainer_ai_pointers.asm b/data/trainers/ai_pointers.asm
index d7cb5f19..26f3001e 100644
--- a/data/trainer_ai_pointers.asm
+++ b/data/trainers/ai_pointers.asm
@@ -2,6 +2,7 @@ TrainerAIPointers:
 ; one entry per trainer class
 ; first byte, number of times (per Pokémon) it can occur
 ; next two bytes, pointer to AI subroutine for trainer class
+; subroutines are defined in engine/battle/trainer_ai.asm
 	dbw 3,GenericAI
 	dbw 3,GenericAI
 	dbw 3,GenericAI
diff --git a/data/trainer_types.asm b/data/trainers/encounter_types.asm
index cc7ca605..cc7ca605 100755
--- a/data/trainer_types.asm
+++ b/data/trainers/encounter_types.asm
diff --git a/data/trainer_move_choices.asm b/data/trainers/move_choices.asm
index ccbae448..ccbae448 100644
--- a/data/trainer_move_choices.asm
+++ b/data/trainers/move_choices.asm
diff --git a/data/trainers/name_pointers.asm b/data/trainers/name_pointers.asm
new file mode 100644
index 00000000..aa5e72d3
--- /dev/null
+++ b/data/trainers/name_pointers.asm
@@ -0,0 +1,92 @@
+TrainerNamePointers:
+; what is the point of these?
+	dw YoungsterName
+	dw BugCatcherName
+	dw LassName
+	dw wTrainerName
+	dw JrTrainerMName
+	dw JrTrainerFName
+	dw PokemaniacName
+	dw SuperNerdName
+	dw wTrainerName
+	dw wTrainerName
+	dw BurglarName
+	dw EngineerName
+	dw JugglerXName
+	dw wTrainerName
+	dw SwimmerName
+	dw wTrainerName
+	dw wTrainerName
+	dw BeautyName
+	dw wTrainerName
+	dw RockerName
+	dw JugglerName
+	dw wTrainerName
+	dw wTrainerName
+	dw BlackbeltName
+	dw wTrainerName
+	dw ProfOakName
+	dw ChiefName
+	dw ScientistName
+	dw wTrainerName
+	dw RocketName
+	dw CooltrainerMName
+	dw CooltrainerFName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+
+YoungsterName:
+	db "YOUNGSTER@"
+BugCatcherName:
+	db "BUG CATCHER@"
+LassName:
+	db "LASS@"
+JrTrainerMName:
+	db "JR.TRAINER♂@"
+JrTrainerFName:
+	db "JR.TRAINER♀@"
+PokemaniacName:
+	db "POKéMANIAC@"
+SuperNerdName:
+	db "SUPER NERD@"
+BurglarName:
+	db "BURGLAR@"
+EngineerName:
+	db "ENGINEER@"
+JugglerXName:
+	db "JUGGLER@"
+SwimmerName:
+	db "SWIMMER@"
+BeautyName:
+	db "BEAUTY@"
+RockerName:
+	db "ROCKER@"
+JugglerName:
+	db "JUGGLER@"
+BlackbeltName:
+	db "BLACKBELT@"
+ProfOakName:
+	db "PROF.OAK@"
+ChiefName:
+	db "CHIEF@"
+ScientistName:
+	db "SCIENTIST@"
+RocketName:
+	db "ROCKET@"
+CooltrainerMName:
+	db "COOLTRAINER♂@"
+CooltrainerFName:
+	db "COOLTRAINER♀@"
diff --git a/data/trainers/names.asm b/data/trainers/names.asm
new file mode 100755
index 00000000..d8e1f550
--- /dev/null
+++ b/data/trainers/names.asm
@@ -0,0 +1,48 @@
+TrainerNames::
+	db "YOUNGSTER@"
+	db "BUG CATCHER@"
+	db "LASS@"
+	db "SAILOR@"
+	db "JR.TRAINER♂@"
+	db "JR.TRAINER♀@"
+	db "POKéMANIAC@"
+	db "SUPER NERD@"
+	db "HIKER@"
+	db "BIKER@"
+	db "BURGLAR@"
+	db "ENGINEER@"
+	db "JUGGLER@"
+	db "FISHERMAN@"
+	db "SWIMMER@"
+	db "CUE BALL@"
+	db "GAMBLER@"
+	db "BEAUTY@"
+	db "PSYCHIC@"
+	db "ROCKER@"
+	db "JUGGLER@"
+	db "TAMER@"
+	db "BIRD KEEPER@"
+	db "BLACKBELT@"
+	db "RIVAL1@"
+	db "PROF.OAK@"
+	db "CHIEF@"
+	db "SCIENTIST@"
+	db "GIOVANNI@"
+	db "ROCKET@"
+	db "COOLTRAINER♂@"
+	db "COOLTRAINER♀@"
+	db "BRUNO@"
+	db "BROCK@"
+	db "MISTY@"
+	db "LT.SURGE@"
+	db "ERIKA@"
+	db "KOGA@"
+	db "BLAINE@"
+	db "SABRINA@"
+	db "GENTLEMAN@"
+	db "RIVAL2@"
+	db "RIVAL3@"
+	db "LORELEI@"
+	db "CHANNELER@"
+	db "AGATHA@"
+	db "LANCE@"
diff --git a/data/trainer_parties.asm b/data/trainers/parties.asm
index e448d431..e448d431 100755
--- a/data/trainer_parties.asm
+++ b/data/trainers/parties.asm
diff --git a/data/trainer_pic_money_pointers.asm b/data/trainers/pic_pointers_money.asm
index 85f34497..85f34497 100755
--- a/data/trainer_pic_money_pointers.asm
+++ b/data/trainers/pic_pointers_money.asm
diff --git a/data/trainer_moves.asm b/data/trainers/special_moves.asm
index 2e7b52a5..2e7b52a5 100755
--- a/data/trainer_moves.asm
+++ b/data/trainers/special_moves.asm
diff --git a/data/types/names.asm b/data/types/names.asm
new file mode 100755
index 00000000..d94675b8
--- /dev/null
+++ b/data/types/names.asm
@@ -0,0 +1,48 @@
+TypeNames:
+
+	dw .Normal
+	dw .Fighting
+	dw .Flying
+	dw .Poison
+	dw .Ground
+	dw .Rock
+	dw .Bird
+	dw .Bug
+	dw .Ghost
+
+	dw .Normal
+	dw .Normal
+	dw .Normal
+	dw .Normal
+	dw .Normal
+	dw .Normal
+	dw .Normal
+	dw .Normal
+	dw .Normal
+	dw .Normal
+	dw .Normal
+
+	dw .Fire
+	dw .Water
+	dw .Grass
+	dw .Electric
+	dw .Psychic
+	dw .Ice
+	dw .Dragon
+
+.Normal:   db "NORMAL@"
+.Fighting: db "FIGHTING@"
+.Flying:   db "FLYING@"
+.Poison:   db "POISON@"
+.Fire:     db "FIRE@"
+.Water:    db "WATER@"
+.Grass:    db "GRASS@"
+.Electric: db "ELECTRIC@"
+.Psychic:  db "PSYCHIC@"
+.Ice:      db "ICE@"
+.Ground:   db "GROUND@"
+.Rock:     db "ROCK@"
+.Bird:     db "BIRD@"
+.Bug:      db "BUG@"
+.Ghost:    db "GHOST@"
+.Dragon:   db "DRAGON@"
diff --git a/data/type_effects.asm b/data/types/type_matchups.asm
index 1321a3d9..1321a3d9 100755
--- a/data/type_effects.asm
+++ b/data/types/type_matchups.asm
diff --git a/data/good_rod.asm b/data/wild/good_rod.asm
index 6c23f402..6c23f402 100755
--- a/data/good_rod.asm
+++ b/data/wild/good_rod.asm
diff --git a/data/wild_mons.asm b/data/wild/grass_water.asm
index e089a582..5697300e 100755
--- a/data/wild_mons.asm
+++ b/data/wild/grass_water.asm
@@ -260,62 +260,62 @@ WildDataPointers:
         ; followed by 20 bytes:
         ; level, species (ten times)
 
-INCLUDE "data/wildPokemon/nomons.asm"
-INCLUDE "data/wildPokemon/route1.asm"
-INCLUDE "data/wildPokemon/route2.asm"
-INCLUDE "data/wildPokemon/route22.asm"
-INCLUDE "data/wildPokemon/viridianforest.asm"
-INCLUDE "data/wildPokemon/route3.asm"
-INCLUDE "data/wildPokemon/mtmoon1.asm"
-INCLUDE "data/wildPokemon/mtmoonb1.asm"
-INCLUDE "data/wildPokemon/mtmoonb2.asm"
-INCLUDE "data/wildPokemon/route4.asm"
-INCLUDE "data/wildPokemon/route24.asm"
-INCLUDE "data/wildPokemon/route25.asm"
-INCLUDE "data/wildPokemon/route9.asm"
-INCLUDE "data/wildPokemon/route5.asm"
-INCLUDE "data/wildPokemon/route6.asm"
-INCLUDE "data/wildPokemon/route11.asm"
-INCLUDE "data/wildPokemon/rocktunnel1.asm"
-INCLUDE "data/wildPokemon/rocktunnel2.asm"
-INCLUDE "data/wildPokemon/route10.asm"
-INCLUDE "data/wildPokemon/route12.asm"
-INCLUDE "data/wildPokemon/route8.asm"
-INCLUDE "data/wildPokemon/route7.asm"
-INCLUDE "data/wildPokemon/pokemontower1.asm"
-INCLUDE "data/wildPokemon/pokemontower2.asm"
-INCLUDE "data/wildPokemon/pokemontower3.asm"
-INCLUDE "data/wildPokemon/pokemontower4.asm"
-INCLUDE "data/wildPokemon/pokemontower5.asm"
-INCLUDE "data/wildPokemon/pokemontower6.asm"
-INCLUDE "data/wildPokemon/pokemontower7.asm"
-INCLUDE "data/wildPokemon/route13.asm"
-INCLUDE "data/wildPokemon/route14.asm"
-INCLUDE "data/wildPokemon/route15.asm"
-INCLUDE "data/wildPokemon/route16.asm"
-INCLUDE "data/wildPokemon/route17.asm"
-INCLUDE "data/wildPokemon/route18.asm"
-INCLUDE "data/wildPokemon/safarizonecenter.asm"
-INCLUDE "data/wildPokemon/safarizone1.asm"
-INCLUDE "data/wildPokemon/safarizone2.asm"
-INCLUDE "data/wildPokemon/safarizone3.asm"
-INCLUDE "data/wildPokemon/waterpokemon.asm"
-INCLUDE "data/wildPokemon/seafoamisland1.asm"
-INCLUDE "data/wildPokemon/seafoamislandb1.asm"
-INCLUDE "data/wildPokemon/seafoamislandb2.asm"
-INCLUDE "data/wildPokemon/seafoamislandb3.asm"
-INCLUDE "data/wildPokemon/seafoamislandb4.asm"
-INCLUDE "data/wildPokemon/mansion1.asm"
-INCLUDE "data/wildPokemon/mansion2.asm"
-INCLUDE "data/wildPokemon/mansion3.asm"
-INCLUDE "data/wildPokemon/mansionb1.asm"
-INCLUDE "data/wildPokemon/route21.asm"
-INCLUDE "data/wildPokemon/ceruleancave1.asm"
-INCLUDE "data/wildPokemon/ceruleancave2.asm"
-INCLUDE "data/wildPokemon/ceruleancaveb1.asm"
-INCLUDE "data/wildPokemon/powerplant.asm"
-INCLUDE "data/wildPokemon/route23.asm"
-INCLUDE "data/wildPokemon/victoryroad2.asm"
-INCLUDE "data/wildPokemon/victoryroad3.asm"
-INCLUDE "data/wildPokemon/victoryroad1.asm"
-INCLUDE "data/wildPokemon/diglettscave.asm"
+INCLUDE "data/mapWilds/nothing.asm"
+INCLUDE "data/mapWilds/Route1.asm"
+INCLUDE "data/mapWilds/Route2.asm"
+INCLUDE "data/mapWilds/Route22.asm"
+INCLUDE "data/mapWilds/ViridianForest.asm"
+INCLUDE "data/mapWilds/Route3.asm"
+INCLUDE "data/mapWilds/MtMoon1F.asm"
+INCLUDE "data/mapWilds/MtMoonB1F.asm"
+INCLUDE "data/mapWilds/MtMoonB2F.asm"
+INCLUDE "data/mapWilds/Route4.asm"
+INCLUDE "data/mapWilds/Route24.asm"
+INCLUDE "data/mapWilds/Route25.asm"
+INCLUDE "data/mapWilds/Route9.asm"
+INCLUDE "data/mapWilds/Route5.asm"
+INCLUDE "data/mapWilds/Route6.asm"
+INCLUDE "data/mapWilds/Route11.asm"
+INCLUDE "data/mapWilds/RockTunnel1F.asm"
+INCLUDE "data/mapWilds/RockTunnelB1F.asm"
+INCLUDE "data/mapWilds/Route10.asm"
+INCLUDE "data/mapWilds/Route12.asm"
+INCLUDE "data/mapWilds/Route8.asm"
+INCLUDE "data/mapWilds/Route7.asm"
+INCLUDE "data/mapWilds/PokemonTower1F.asm"
+INCLUDE "data/mapWilds/PokemonTower2F.asm"
+INCLUDE "data/mapWilds/PokemonTower3F.asm"
+INCLUDE "data/mapWilds/PokemonTower4F.asm"
+INCLUDE "data/mapWilds/PokemonTower5F.asm"
+INCLUDE "data/mapWilds/PokemonTower6F.asm"
+INCLUDE "data/mapWilds/PokemonTower7F.asm"
+INCLUDE "data/mapWilds/Route13.asm"
+INCLUDE "data/mapWilds/Route14.asm"
+INCLUDE "data/mapWilds/Route15.asm"
+INCLUDE "data/mapWilds/Route16.asm"
+INCLUDE "data/mapWilds/Route17.asm"
+INCLUDE "data/mapWilds/Route18.asm"
+INCLUDE "data/mapWilds/SafariZoneCenter.asm"
+INCLUDE "data/mapWilds/SafariZoneEast.asm"
+INCLUDE "data/mapWilds/SafariZoneNorth.asm"
+INCLUDE "data/mapWilds/SafariZoneWest.asm"
+INCLUDE "data/mapWilds/SeaRoutes.asm"
+INCLUDE "data/mapWilds/SeafoamIslands1F.asm"
+INCLUDE "data/mapWilds/SeafoamIslandsB1F.asm"
+INCLUDE "data/mapWilds/SeafoamIslandsB2F.asm"
+INCLUDE "data/mapWilds/SeafoamIslandsB3F.asm"
+INCLUDE "data/mapWilds/SeafoamIslandsB4F.asm"
+INCLUDE "data/mapWilds/PokemonMansion1F.asm"
+INCLUDE "data/mapWilds/PokemonMansion2F.asm"
+INCLUDE "data/mapWilds/PokemonMansion3F.asm"
+INCLUDE "data/mapWilds/PokemonMansionB1F.asm"
+INCLUDE "data/mapWilds/Route21.asm"
+INCLUDE "data/mapWilds/CeruleanCave1F.asm"
+INCLUDE "data/mapWilds/CeruleanCave2F.asm"
+INCLUDE "data/mapWilds/CeruleanCaveB1F.asm"
+INCLUDE "data/mapWilds/PowerPlant.asm"
+INCLUDE "data/mapWilds/Route23.asm"
+INCLUDE "data/mapWilds/VictoryRoad2F.asm"
+INCLUDE "data/mapWilds/VictoryRoad3F.asm"
+INCLUDE "data/mapWilds/VictoryRoad1F.asm"
+INCLUDE "data/mapWilds/DiglettsCave.asm"
diff --git a/data/wild_probabilities.asm b/data/wild/probabilities.asm
index 9d4704c6..9d4704c6 100644
--- a/data/wild_probabilities.asm
+++ b/data/wild/probabilities.asm
diff --git a/data/super_rod.asm b/data/wild/super_rod.asm
index d3d64632..d3d64632 100755
--- a/data/super_rod.asm
+++ b/data/wild/super_rod.asm