Merge pull request #257 from Rangi42/master

More reorganization

988 files changed, 11138 insertions, 6621 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/effects_pointers.asm b/data/effects_pointers.asm
deleted file mode 100644
index 0d36e887..00000000
--- a/data/effects_pointers.asm
+++ /dev/null
@@ -1,87 +0,0 @@
-MoveEffectPointerTable:
-	dw SleepEffect               ; unused effect
-	dw PoisonEffect              ; POISON_SIDE_EFFECT1
-	dw DrainHPEffect             ; DRAIN_HP_EFFECT
-	dw FreezeBurnParalyzeEffect  ; BURN_SIDE_EFFECT1
-	dw FreezeBurnParalyzeEffect  ; FREEZE_SIDE_EFFECT
-	dw FreezeBurnParalyzeEffect  ; PARALYZE_SIDE_EFFECT1
-	dw ExplodeEffect             ; EXPLODE_EFFECT
-	dw DrainHPEffect             ; DREAM_EATER_EFFECT
-	dw $0000                     ; MIRROR_MOVE_EFFECT
-	dw StatModifierUpEffect      ; ATTACK_UP1_EFFECT
-	dw StatModifierUpEffect      ; DEFENSE_UP1_EFFECT
-	dw StatModifierUpEffect      ; SPEED_UP1_EFFECT
-	dw StatModifierUpEffect      ; SPECIAL_UP1_EFFECT
-	dw StatModifierUpEffect      ; ACCURACY_UP1_EFFECT
-	dw StatModifierUpEffect      ; EVASION_UP1_EFFECT
-	dw PayDayEffect              ; PAY_DAY_EFFECT
-	dw $0000                     ; SWIFT_EFFECT
-	dw StatModifierDownEffect    ; ATTACK_DOWN1_EFFECT
-	dw StatModifierDownEffect    ; DEFENSE_DOWN1_EFFECT
-	dw StatModifierDownEffect    ; SPEED_DOWN1_EFFECT
-	dw StatModifierDownEffect    ; SPECIAL_DOWN1_EFFECT
-	dw StatModifierDownEffect    ; ACCURACY_DOWN1_EFFECT
-	dw StatModifierDownEffect    ; EVASION_DOWN1_EFFECT
-	dw ConversionEffect          ; CONVERSION_EFFECT
-	dw HazeEffect                ; HAZE_EFFECT
-	dw BideEffect                ; BIDE_EFFECT
-	dw ThrashPetalDanceEffect    ; THRASH_PETAL_DANCE_EFFECT
-	dw SwitchAndTeleportEffect   ; SWITCH_AND_TELEPORT_EFFECT
-	dw TwoToFiveAttacksEffect    ; TWO_TO_FIVE_ATTACKS_EFFECT
-	dw TwoToFiveAttacksEffect    ; unused effect
-	dw FlinchSideEffect           ; FLINCH_SIDE_EFFECT1
-	dw SleepEffect               ; SLEEP_EFFECT
-	dw PoisonEffect              ; POISON_SIDE_EFFECT2
-	dw FreezeBurnParalyzeEffect  ; BURN_SIDE_EFFECT2
-	dw FreezeBurnParalyzeEffect  ; unused effect
-	dw FreezeBurnParalyzeEffect  ; PARALYZE_SIDE_EFFECT2
-	dw FlinchSideEffect           ; FLINCH_SIDE_EFFECT2
-	dw OneHitKOEffect            ; OHKO_EFFECT
-	dw ChargeEffect              ; CHARGE_EFFECT
-	dw $0000                     ; SUPER_FANG_EFFECT
-	dw $0000                     ; SPECIAL_DAMAGE_EFFECT
-	dw TrappingEffect            ; TRAPPING_EFFECT
-	dw ChargeEffect              ; FLY_EFFECT
-	dw TwoToFiveAttacksEffect    ; ATTACK_TWICE_EFFECT
-	dw $0000                     ; JUMP_KICK_EFFECT
-	dw MistEffect                ; MIST_EFFECT
-	dw FocusEnergyEffect         ; FOCUS_ENERGY_EFFECT
-	dw RecoilEffect              ; RECOIL_EFFECT
-	dw ConfusionEffect           ; CONFUSION_EFFECT
-	dw StatModifierUpEffect      ; ATTACK_UP2_EFFECT
-	dw StatModifierUpEffect      ; DEFENSE_UP2_EFFECT
-	dw StatModifierUpEffect      ; SPEED_UP2_EFFECT
-	dw StatModifierUpEffect      ; SPECIAL_UP2_EFFECT
-	dw StatModifierUpEffect      ; ACCURACY_UP2_EFFECT
-	dw StatModifierUpEffect      ; EVASION_UP2_EFFECT
-	dw HealEffect                ; HEAL_EFFECT
-	dw TransformEffect           ; TRANSFORM_EFFECT
-	dw StatModifierDownEffect    ; ATTACK_DOWN2_EFFECT
-	dw StatModifierDownEffect    ; DEFENSE_DOWN2_EFFECT
-	dw StatModifierDownEffect    ; SPEED_DOWN2_EFFECT
-	dw StatModifierDownEffect    ; SPECIAL_DOWN2_EFFECT
-	dw StatModifierDownEffect    ; ACCURACY_DOWN2_EFFECT
-	dw StatModifierDownEffect    ; EVASION_DOWN2_EFFECT
-	dw ReflectLightScreenEffect  ; LIGHT_SCREEN_EFFECT
-	dw ReflectLightScreenEffect  ; REFLECT_EFFECT
-	dw PoisonEffect              ; POISON_EFFECT
-	dw ParalyzeEffect            ; PARALYZE_EFFECT
-	dw StatModifierDownEffect    ; ATTACK_DOWN_SIDE_EFFECT
-	dw StatModifierDownEffect    ; DEFENSE_DOWN_SIDE_EFFECT
-	dw StatModifierDownEffect    ; SPEED_DOWN_SIDE_EFFECT
-	dw StatModifierDownEffect    ; SPECIAL_DOWN_SIDE_EFFECT
-	dw StatModifierDownEffect    ; unused effect
-	dw StatModifierDownEffect    ; unused effect
-	dw StatModifierDownEffect    ; unused effect
-	dw StatModifierDownEffect    ; unused effect
-	dw ConfusionSideEffect       ; CONFUSION_SIDE_EFFECT
-	dw TwoToFiveAttacksEffect    ; TWINEEDLE_EFFECT
-	dw $0000                     ; unused effect
-	dw SubstituteEffect          ; SUBSTITUTE_EFFECT
-	dw HyperBeamEffect           ; HYPER_BEAM_EFFECT
-	dw RageEffect                ; RAGE_EFFECT
-	dw MimicEffect               ; MIMIC_EFFECT
-	dw $0000                     ; METRONOME_EFFECT
-	dw LeechSeedEffect           ; LEECH_SEED_EFFECT
-	dw SplashEffect              ; SPLASH_EFFECT
-	dw DisableEffect             ; DISABLE_EFFECT
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/events/hidden_objects.asm b/data/events/hidden_objects.asm
new file mode 100755
index 00000000..8fc539ef
--- /dev/null
+++ b/data/events/hidden_objects.asm
@@ -0,0 +1,853 @@
+HiddenObjectMaps:
+	db REDS_HOUSE_2F
+	db BLUES_HOUSE
+	db OAKS_LAB
+	db VIRIDIAN_POKECENTER
+	db VIRIDIAN_MART
+	db VIRIDIAN_SCHOOL_HOUSE
+	db VIRIDIAN_GYM
+	db MUSEUM_1F
+	db PEWTER_GYM
+	db PEWTER_MART
+	db PEWTER_POKECENTER
+	db CERULEAN_POKECENTER
+	db CERULEAN_GYM
+	db CERULEAN_MART
+	db LAVENDER_POKECENTER
+	db VERMILION_POKECENTER
+	db VERMILION_GYM
+	db CELADON_MANSION_2F
+	db CELADON_POKECENTER
+	db CELADON_GYM
+	db GAME_CORNER
+	db CELADON_HOTEL
+	db FUCHSIA_POKECENTER
+	db FUCHSIA_GYM
+	db CINNABAR_GYM
+	db CINNABAR_POKECENTER
+	db SAFFRON_GYM
+	db MT_MOON_POKECENTER
+	db ROCK_TUNNEL_POKECENTER
+	db TRADE_CENTER
+	db COLOSSEUM
+	db VIRIDIAN_FOREST
+	db MT_MOON_B2F
+	db INDIGO_PLATEAU
+	db ROUTE_25
+	db ROUTE_9
+	db SS_ANNE_KITCHEN
+	db SS_ANNE_B1F_ROOMS
+	db ROCKET_HIDEOUT_B1F
+	db ROCKET_HIDEOUT_B3F
+	db ROCKET_HIDEOUT_B4F
+	db SAFFRON_POKECENTER
+	db POKEMON_TOWER_5F
+	db ROUTE_13
+	db SAFARI_ZONE_GATE
+	db SAFARI_ZONE_WEST
+	db SILPH_CO_5F
+	db SILPH_CO_9F
+	db COPYCATS_HOUSE_2F
+	db CERULEAN_CAVE_1F
+	db CERULEAN_CAVE_B1F
+	db POWER_PLANT
+	db SEAFOAM_ISLANDS_B2F
+	db SEAFOAM_ISLANDS_B4F
+	db POKEMON_MANSION_1F
+	db POKEMON_MANSION_3F
+	db ROUTE_23
+	db VICTORY_ROAD_2F
+	db UNUSED_MAP_6F
+	db BILLS_HOUSE
+	db VIRIDIAN_CITY
+	db SAFARI_ZONE_WEST_REST_HOUSE
+	db SAFARI_ZONE_EAST_REST_HOUSE
+	db SAFARI_ZONE_NORTH_REST_HOUSE
+	db ROUTE_15_GATE_2F
+	db MR_FUJIS_HOUSE
+	db CELADON_MANSION_ROOF_HOUSE
+	db FIGHTING_DOJO
+	db ROUTE_10
+	db INDIGO_PLATEAU_LOBBY
+	db CINNABAR_LAB_FOSSIL_ROOM
+	db BIKE_SHOP
+	db ROUTE_11
+	db ROUTE_12
+	db POKEMON_MANSION_2F
+	db POKEMON_MANSION_B1F
+	db SILPH_CO_11F
+	db ROUTE_17
+	db UNDERGROUND_PATH_NORTH_SOUTH
+	db UNDERGROUND_PATH_WEST_EAST
+	db CELADON_CITY
+	db SEAFOAM_ISLANDS_B3F
+	db VERMILION_CITY
+	db CERULEAN_CITY
+	db ROUTE_4
+	db $FF
+
+HiddenObjectPointers:
+; each of these pointers is for the corresponding map in HiddenObjectMaps
+	dw RedsHouse2FHiddenObjects
+	dw BluesHouseHiddenObjects
+	dw OaksLabHiddenObjects
+	dw ViridianPokecenterHiddenObjects
+	dw ViridianMartHiddenObjects
+	dw ViridianSchoolHiddenObjects
+	dw ViridianGymHiddenObjects
+	dw Museum1FHiddenObjects
+	dw PewterGymHiddenObjects
+	dw PewterMartHiddenObjects
+	dw PewterPokecenterHiddenObjects
+	dw CeruleanPokecenterHiddenObjects
+	dw CeruleanGymHiddenObjects
+	dw CeruleanMartHiddenObjects
+	dw LavenderPokecenterHiddenObjects
+	dw VermilionPokecenterHiddenObjects
+	dw VermilionGymHiddenObjects
+	dw CeladonMansion2HiddenObjects
+	dw CeladonPokecenterHiddenObjects
+	dw CeladonGymHiddenObjects
+	dw GameCornerHiddenObjects
+	dw CeladonHotelHiddenObjects
+	dw FuchsiaPokecenterHiddenObjects
+	dw FuchsiaGymHiddenObjects
+	dw CinnabarGymHiddenObjects
+	dw CinnabarPokecenterHiddenObjects
+	dw SaffronGymHiddenObjects
+	dw MtMoonPokecenterHiddenObjects
+	dw RockTunnelPokecenterHiddenObjects
+	dw TradeCenterHiddenObjects
+	dw ColosseumHiddenObjects
+	dw ViridianForestHiddenObjects
+	dw MtMoon3HiddenObjects
+	dw IndigoPlateauHiddenObjects
+	dw Route25HiddenObjects
+	dw Route9HiddenObjects
+	dw SSAnne6HiddenObjects
+	dw SSAnne10HiddenObjects
+	dw RocketHideout1HiddenObjects
+	dw RocketHideout3HiddenObjects
+	dw RocketHideout4HiddenObjects
+	dw SaffronPokecenterHiddenObjects
+	dw PokemonTower5HiddenObjects
+	dw Route13HiddenObjects
+	dw SafariZoneEntranceHiddenObjects
+	dw SafariZoneWestHiddenObjects
+	dw SilphCo5FHiddenObjects
+	dw SilphCo9FHiddenObjects
+	dw CopycatsHouse2FHiddenObjects
+	dw CeruleanCave1HiddenObjects
+	dw CeruleanCave3HiddenObjects
+	dw PowerPlantHiddenObjects
+	dw SeafoamIslands3HiddenObjects
+	dw SeafoamIslands5HiddenObjects
+	dw Mansion1HiddenObjects
+	dw Mansion3HiddenObjects
+	dw Route23HiddenObjects
+	dw VictoryRoad2HiddenObjects
+	dw Unused6FHiddenObjects
+	dw BillsHouseHiddenObjects
+	dw ViridianCityHiddenObjects
+	dw SafariZoneRestHouse2HiddenObjects
+	dw SafariZoneRestHouse3HiddenObjects
+	dw SafariZoneRestHouse4HiddenObjects
+	dw Route15GateUpstairsHiddenObjects
+	dw LavenderHouse1HiddenObjects
+	dw CeladonMansion5HiddenObjects
+	dw FightingDojoHiddenObjects
+	dw Route10HiddenObjects
+	dw IndigoPlateauLobbyHiddenObjects
+	dw CinnabarLab4HiddenObjects
+	dw BikeShopHiddenObjects
+	dw Route11HiddenObjects
+	dw Route12HiddenObjects
+	dw Mansion2HiddenObjects
+	dw Mansion4HiddenObjects
+	dw SilphCo11FHiddenObjects
+	dw Route17HiddenObjects
+	dw UndergroundPathNsHiddenObjects
+	dw UndergroundPathWeHiddenObjects
+	dw CeladonCityHiddenObjects
+	dw SeafoamIslands4HiddenObjects
+	dw VermilionCityHiddenObjects
+	dw CeruleanCityHiddenObjects
+	dw Route4HiddenObjects
+
+; format: y-coord, x-coord, text id/item id, object routine
+TradeCenterHiddenObjects:
+	db $04,$05,$d0
+	db BANK(CableClubRightGameboy)
+	dw CableClubRightGameboy
+	db $04,$04,$d0
+	db BANK(CableClubLeftGameboy)
+	dw CableClubLeftGameboy
+	db $FF
+ColosseumHiddenObjects:
+	db $04,$05,$d0
+	db BANK(CableClubRightGameboy)
+	dw CableClubRightGameboy
+	db $04,$04,$d0
+	db BANK(CableClubLeftGameboy)
+	dw CableClubLeftGameboy
+	db $FF
+RedsHouse2FHiddenObjects:
+	db $01,$00,$04
+	dbw BANK(OpenRedsPC), OpenRedsPC
+	db $05,$03,$d0
+	dbw BANK(PrintRedSNESText), PrintRedSNESText
+	db $FF
+BluesHouseHiddenObjects:
+	db $01,$00,$04
+	db BANK(PrintBookcaseText)
+	dw PrintBookcaseText
+	db $01,$01,$04
+	db BANK(PrintBookcaseText)
+	dw PrintBookcaseText
+	db $01,$07,$04
+	db BANK(PrintBookcaseText)
+	dw PrintBookcaseText
+	db $FF
+OaksLabHiddenObjects:
+	db $00,$04,$04
+	db BANK(DisplayOakLabLeftPoster)
+	dw DisplayOakLabLeftPoster
+	db $00,$05,$04
+	db BANK(DisplayOakLabRightPoster)
+	dw DisplayOakLabRightPoster
+	db $01,$00,$04
+	db BANK(DisplayOakLabEmailText)
+	dw DisplayOakLabEmailText
+	db $01,$01,$04
+	db BANK(DisplayOakLabEmailText)
+	dw DisplayOakLabEmailText
+	db $FF
+ViridianPokecenterHiddenObjects:
+	db $04,$00,$08
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+ViridianMartHiddenObjects:
+	db $FF
+ViridianSchoolHiddenObjects:
+	db $04,$03,(ViridianSchoolNotebook_id - TextPredefs) / 2 + 1
+	db BANK(PrintNotebookText)
+	dw PrintNotebookText
+	db $00,$03,(ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1
+	db BANK(PrintBlackboardLinkCableText)
+	dw PrintBlackboardLinkCableText
+	db $FF
+ViridianGymHiddenObjects:
+	db $0f,$0f,$04
+	dbw BANK(GymStatues),GymStatues
+	db $0f,$12,$04
+	dbw BANK(GymStatues),GymStatues
+	db $FF
+Museum1FHiddenObjects:
+	db $03,$02,$04
+	dbw BANK(AerodactylFossil), AerodactylFossil
+	db $06,$02,$04
+	dbw BANK(KabutopsFossil), KabutopsFossil
+	db $FF
+PewterGymHiddenObjects:
+	db $0a,$03,$04
+	dbw BANK(GymStatues),GymStatues
+	db $0a,$06,$04
+	dbw BANK(GymStatues),GymStatues
+	db $FF
+PewterMartHiddenObjects:
+	db $FF
+PewterPokecenterHiddenObjects:
+	db $04,$00,$08
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+CeruleanPokecenterHiddenObjects:
+	db $04,$00,$08
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+CeruleanGymHiddenObjects:
+	db $0b,$03,$04
+	dbw BANK(GymStatues),GymStatues
+	db $0b,$06,$04
+	dbw BANK(GymStatues),GymStatues
+	db $FF
+CeruleanMartHiddenObjects:
+	db $FF
+LavenderPokecenterHiddenObjects:
+	db $04,$00,$08
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+VermilionPokecenterHiddenObjects:
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $04,$00,$04
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $FF
+VermilionGymHiddenObjects:
+	db $0e,$03,$04
+	dbw BANK(GymStatues), GymStatues
+	db $0e,$06,$04
+	dbw BANK(GymStatues), GymStatues
+	db $01,$06,$00
+	dbw BANK(PrintTrashText), PrintTrashText
+	db $07,$01,$00
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $09,$01,$01
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $0b,$01,$02
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $07,$03,$03
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $09,$03,$04
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $0b,$03,$05
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $07,$05,$06
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $09,$05,$07
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $0b,$05,$08
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $07,$07,$09
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $09,$07,$0a
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $0b,$07,$0b
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $07,$09,$0c
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $09,$09,$0d
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $0b,$09,$0e
+	dbw BANK(GymTrashScript), GymTrashScript
+	db $FF
+CeladonMansion2HiddenObjects:
+	db $05,$00,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+CeladonPokecenterHiddenObjects:
+	db $04,$00,$08
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+CeladonGymHiddenObjects:
+	db $0f,$03,$04
+	dbw BANK(GymStatues),GymStatues
+	db $0f,$06,$04
+	dbw BANK(GymStatues),GymStatues
+	db $FF
+GameCornerHiddenObjects:
+	db $0f,$12,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0e,$12,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0d,$12,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0c,$12,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0b,$12,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0a,$12,$ff ; "Someone's Keys"
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0a,$0d,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0b,$0d,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0c,$0d,$fe ; "Out To Lunch"
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0d,$0d,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0e,$0d,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0f,$0d,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0f,$0c,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0e,$0c,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0d,$0c,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0c,$0c,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0b,$0c,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0a,$0c,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0a,$07,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0b,$07,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0c,$07,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0d,$07,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0e,$07,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0f,$07,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0f,$06,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0e,$06,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0d,$06,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0c,$06,$fd ; "Out Of Order"
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0b,$06,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0a,$06,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0a,$01,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0b,$01,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0c,$01,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0d,$01,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0e,$01,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $0f,$01,$d0
+	dbw BANK(StartSlotMachine), StartSlotMachine
+	db $08,$00,COIN+10
+	dbw BANK(HiddenCoins),HiddenCoins
+	db $10,$01,COIN+10
+	dbw BANK(HiddenCoins),HiddenCoins
+	db $0b,$03,COIN+20
+	dbw BANK(HiddenCoins),HiddenCoins
+	db $0e,$03,COIN+10
+	dbw BANK(HiddenCoins),HiddenCoins
+	db $0c,$04,COIN+10
+	dbw BANK(HiddenCoins),HiddenCoins
+	db $0c,$09,COIN+20
+	dbw BANK(HiddenCoins),HiddenCoins
+	db $0f,$09,COIN+10
+	dbw BANK(HiddenCoins),HiddenCoins
+	db $0e,$10,COIN+10
+	dbw BANK(HiddenCoins),HiddenCoins
+	db $10,$0a,COIN+10
+	dbw BANK(HiddenCoins),HiddenCoins
+	db $07,$0b,COIN+40
+	dbw BANK(HiddenCoins),HiddenCoins
+	db $08,$0f,COIN+100
+	dbw BANK(HiddenCoins),HiddenCoins
+	db $0f,$0c,COIN+10
+	dbw BANK(HiddenCoins),HiddenCoins
+	db $FF
+CeladonHotelHiddenObjects:
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $04,$00,$08
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $FF
+FuchsiaPokecenterHiddenObjects:
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $04,$00,$04
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $FF
+FuchsiaGymHiddenObjects:
+	db $0f,$03,$04
+	dbw BANK(GymStatues),GymStatues
+	db $0f,$06,$04
+	dbw BANK(GymStatues),GymStatues
+	db $FF
+CinnabarGymHiddenObjects:
+	db $0d,$11,$04
+	dbw BANK(GymStatues),GymStatues
+	db $07,$0f,$01
+	db BANK(PrintCinnabarQuiz)
+	dw PrintCinnabarQuiz
+	db $01,$0a,$12
+	db BANK(PrintCinnabarQuiz)
+	dw PrintCinnabarQuiz
+	db $07,$09,$13
+	db BANK(PrintCinnabarQuiz)
+	dw PrintCinnabarQuiz
+	db $0d,$09,$14
+	db BANK(PrintCinnabarQuiz)
+	dw PrintCinnabarQuiz
+	db $0d,$01,$05
+	db BANK(PrintCinnabarQuiz)
+	dw PrintCinnabarQuiz
+	db $07,$01,$16
+	db BANK(PrintCinnabarQuiz)
+	dw PrintCinnabarQuiz
+	db $FF
+CinnabarPokecenterHiddenObjects:
+	db $04,$00,$04
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+SaffronGymHiddenObjects:
+	db $0f,$09,$04
+	dbw BANK(GymStatues),GymStatues
+	db $FF
+MtMoonPokecenterHiddenObjects:
+	db $04,$00,$08
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+RockTunnelPokecenterHiddenObjects:
+	db $04,$00,$08
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+ViridianForestHiddenObjects:
+	db $12,$01,POTION
+	dbw BANK(HiddenItems),HiddenItems
+	db $2a,$10,ANTIDOTE
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+MtMoon3HiddenObjects:
+	db $0c,$12,MOON_STONE
+	dbw BANK(HiddenItems),HiddenItems
+	db $09,$21,ETHER
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+IndigoPlateauHiddenObjects:
+	db $0d,$08,$ff
+	db BANK(PrintIndigoPlateauHQText)
+	dw PrintIndigoPlateauHQText
+	db $0d,$0b,$00
+	db BANK(PrintIndigoPlateauHQText)
+	dw PrintIndigoPlateauHQText
+	db $FF
+Route25HiddenObjects:
+	db $03,$26,ETHER
+	dbw BANK(HiddenItems),HiddenItems
+	db $01,$0a,ELIXER
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+Route9HiddenObjects:
+	db $07,$0e,ETHER
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+SSAnne6HiddenObjects:
+	db $05,$0d,$00
+	dbw BANK(PrintTrashText), PrintTrashText
+	db $07,$0d,$00
+	dbw BANK(PrintTrashText), PrintTrashText
+	db $09,$0d,GREAT_BALL
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+SSAnne10HiddenObjects:
+	db $01,$03,HYPER_POTION
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+Route10HiddenObjects:
+	db $11,$09,SUPER_POTION
+	dbw BANK(HiddenItems),HiddenItems
+	db $35,$10,MAX_ETHER
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+RocketHideout1HiddenObjects:
+	db $0f,$15,PP_UP
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+RocketHideout3HiddenObjects:
+	db $11,$1b,NUGGET
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+RocketHideout4HiddenObjects:
+	db $01,$19,SUPER_POTION
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+SaffronPokecenterHiddenObjects:
+	db $04,$00,$04
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+PokemonTower5HiddenObjects:
+	db $0c,$04,ELIXER
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+Route13HiddenObjects:
+	db $0e,$01,PP_UP
+	dbw BANK(HiddenItems),HiddenItems
+	db $0d,$10,CALCIUM
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+SafariZoneEntranceHiddenObjects:
+	db $01,$0a,NUGGET
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+SafariZoneWestHiddenObjects:
+	db $05,$06,REVIVE
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+SilphCo5FHiddenObjects:
+	db $03,$0c,ELIXER
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+SilphCo9FHiddenObjects:
+	db $0f,$02,MAX_POTION
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+CopycatsHouse2FHiddenObjects:
+	db $01,$01,NUGGET
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+CeruleanCave1HiddenObjects:
+	db $0b,$0e,RARE_CANDY
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+CeruleanCave3HiddenObjects:
+	db $03,$1b,ULTRA_BALL
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+PowerPlantHiddenObjects:
+	db $10,$11,MAX_ELIXER
+	dbw BANK(HiddenItems),HiddenItems
+	db $01,$0c,PP_UP
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+SeafoamIslands3HiddenObjects:
+	db $0f,$0f,NUGGET
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+SeafoamIslands5HiddenObjects:
+	db $11,$19,ULTRA_BALL
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+Mansion1HiddenObjects:
+	db $10,$08,MOON_STONE
+	dbw BANK(HiddenItems),HiddenItems
+	db $05,$02,$04
+	db BANK(Mansion1Script_Switches)
+	dw Mansion1Script_Switches
+	db $FF
+Mansion2HiddenObjects:
+	db $0b,$02,$04
+	db BANK(Mansion2Script_Switches)
+	dw Mansion2Script_Switches
+	db $FF
+Mansion3HiddenObjects:
+	db $09,$01,MAX_REVIVE
+	dbw BANK(HiddenItems),HiddenItems
+	db $05,$0a,$04
+	db BANK(Mansion3Script_Switches)
+	dw Mansion3Script_Switches
+	db $FF
+Mansion4HiddenObjects:
+	db $09,$01,RARE_CANDY
+	dbw BANK(HiddenItems),HiddenItems
+	db $03,$14,$04
+	db BANK(Mansion4Script_Switches)
+	dw Mansion4Script_Switches
+	db $19,$12,$04
+	db BANK(Mansion4Script_Switches)
+	dw Mansion4Script_Switches
+	db $FF
+Route23HiddenObjects:
+	db $2c,$09,FULL_RESTORE
+	dbw BANK(HiddenItems),HiddenItems
+	db $46,$13,ULTRA_BALL
+	dbw BANK(HiddenItems),HiddenItems
+	db $5a,$08,MAX_ETHER
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+VictoryRoad2HiddenObjects:
+	db $02,$05,ULTRA_BALL
+	dbw BANK(HiddenItems),HiddenItems
+	db $07,$1a,FULL_RESTORE
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+Unused6FHiddenObjects:
+	db $0b,$0e,MAX_ELIXER
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+BillsHouseHiddenObjects:
+	db $04,$01,$04
+	dbw BANK(BillsHousePC), BillsHousePC
+	db $FF
+ViridianCityHiddenObjects:
+	db $04,$0e,POTION
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+SafariZoneRestHouse2HiddenObjects:
+	db $04,$00,$08
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+SafariZoneRestHouse3HiddenObjects:
+	db $04,$00,$08
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+SafariZoneRestHouse4HiddenObjects:
+	db $04,$00,$08
+	db BANK(PrintBenchGuyText)
+	dw PrintBenchGuyText
+	db $03,$0d,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+Route15GateUpstairsHiddenObjects:
+	db $02,$01,$04
+	db BANK(Route15GateLeftBinoculars)
+	dw Route15GateLeftBinoculars
+	db $FF
+LavenderHouse1HiddenObjects:
+	db $01,$00,$00
+	db BANK(PrintMagazinesText)
+	dw PrintMagazinesText
+	db $01,$01,$00
+	db BANK(PrintMagazinesText)
+	dw PrintMagazinesText
+	db $01,$07,$00
+	db BANK(PrintMagazinesText)
+	dw PrintMagazinesText
+	db $FF
+CeladonMansion5HiddenObjects:
+	db $00,$03,(LinkCableHelp_id - TextPredefs) / 2 + 1
+	db BANK(PrintBlackboardLinkCableText)
+	dw PrintBlackboardLinkCableText
+	db $00,$04,(LinkCableHelp_id - TextPredefs) / 2 + 1
+	db BANK(PrintBlackboardLinkCableText)
+	dw PrintBlackboardLinkCableText
+	db $04,$03,(TMNotebook_id - TextPredefs) / 2 + 1
+	db BANK(PrintNotebookText)
+	dw PrintNotebookText
+	db $FF
+FightingDojoHiddenObjects:
+	db $09,$03,$04
+	db BANK(PrintFightingDojoText)
+	dw PrintFightingDojoText
+	db $09,$06,$04
+	db BANK(PrintFightingDojoText)
+	dw PrintFightingDojoText
+	db $00,$04,$04
+	db BANK(PrintFightingDojoText2)
+	dw PrintFightingDojoText2
+	db $00,$05,$04
+	db BANK(PrintFightingDojoText3)
+	dw PrintFightingDojoText3
+	db $FF
+IndigoPlateauLobbyHiddenObjects:
+	db $07,$0f,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+CinnabarLab4HiddenObjects:
+	db $04,$00,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $04,$02,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+BikeShopHiddenObjects:
+	db $00,$01,$d0
+	dbw BANK(PrintNewBikeText), PrintNewBikeText
+	db $01,$02,$d0
+	dbw BANK(PrintNewBikeText), PrintNewBikeText
+	db $02,$01,$d0
+	dbw BANK(PrintNewBikeText), PrintNewBikeText
+	db $02,$03,$d0
+	dbw BANK(PrintNewBikeText), PrintNewBikeText
+	db $04,$00,$d0
+	dbw BANK(PrintNewBikeText), PrintNewBikeText
+	db $05,$01,$d0
+	dbw BANK(PrintNewBikeText), PrintNewBikeText
+	db $FF
+Route11HiddenObjects:
+	db $05,$30,ESCAPE_ROPE
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+Route12HiddenObjects:
+	db $3f,$02,HYPER_POTION
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+SilphCo11FHiddenObjects:
+	db $0c,$0a,$04
+	db BANK(OpenPokemonCenterPC)
+	dw OpenPokemonCenterPC
+	db $FF
+Route17HiddenObjects:
+	db $0e,$0f,RARE_CANDY
+	dbw BANK(HiddenItems),HiddenItems
+	db $2d,$08,FULL_RESTORE
+	dbw BANK(HiddenItems),HiddenItems
+	db $48,$11,PP_UP
+	dbw BANK(HiddenItems),HiddenItems
+	db $5b,$04,MAX_REVIVE
+	dbw BANK(HiddenItems),HiddenItems
+	db $79,$08,MAX_ELIXER
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+UndergroundPathNsHiddenObjects:
+	db $04,$03,FULL_RESTORE
+	dbw BANK(HiddenItems),HiddenItems
+	db $22,$04,X_SPECIAL
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+UndergroundPathWeHiddenObjects:
+	db $02,$0c,NUGGET
+	dbw BANK(HiddenItems),HiddenItems
+	db $05,$15,ELIXER
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+CeladonCityHiddenObjects:
+	db $0f,$30,PP_UP
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+SeafoamIslands4HiddenObjects:
+	db $10,$09,MAX_ELIXER
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+VermilionCityHiddenObjects:
+	db $0b,$0e,MAX_ETHER
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+CeruleanCityHiddenObjects:
+	db $08,$0f,RARE_CANDY
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
+Route4HiddenObjects:
+	db $03,$28,GREAT_BALL
+	dbw BANK(HiddenItems),HiddenItems
+	db $FF
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/evos_moves.asm b/data/evos_moves.asm
deleted file mode 100755
index 26f09b87..00000000
--- a/data/evos_moves.asm
+++ /dev/null
@@ -1,2134 +0,0 @@
-; See constants/evolution_constants.asm
-; The max number of evolutions per monster is MAX_EVOLUTIONS
-
-EvosMovesPointerTable:
-	dw RhydonEvosMoves
-	dw KangaskhanEvosMoves
-	dw NidoranMEvosMoves
-	dw ClefairyEvosMoves
-	dw SpearowEvosMoves
-	dw VoltorbEvosMoves
-	dw NidokingEvosMoves
-	dw SlowbroEvosMoves
-	dw IvysaurEvosMoves
-	dw ExeggutorEvosMoves
-	dw LickitungEvosMoves
-	dw ExeggcuteEvosMoves
-	dw GrimerEvosMoves
-	dw GengarEvosMoves
-	dw NidoranFEvosMoves
-	dw NidoqueenEvosMoves
-	dw CuboneEvosMoves
-	dw RhyhornEvosMoves
-	dw LaprasEvosMoves
-	dw ArcanineEvosMoves
-	dw MewEvosMoves
-	dw GyaradosEvosMoves
-	dw ShellderEvosMoves
-	dw TentacoolEvosMoves
-	dw GastlyEvosMoves
-	dw ScytherEvosMoves
-	dw StaryuEvosMoves
-	dw BlastoiseEvosMoves
-	dw PinsirEvosMoves
-	dw TangelaEvosMoves
-	dw MissingNo1FEvosMoves
-	dw MissingNo20EvosMoves
-	dw GrowlitheEvosMoves
-	dw OnixEvosMoves
-	dw FearowEvosMoves
-	dw PidgeyEvosMoves
-	dw SlowpokeEvosMoves
-	dw KadabraEvosMoves
-	dw GravelerEvosMoves
-	dw ChanseyEvosMoves
-	dw MachokeEvosMoves
-	dw MrMimeEvosMoves
-	dw HitmonleeEvosMoves
-	dw HitmonchanEvosMoves
-	dw ArbokEvosMoves
-	dw ParasectEvosMoves
-	dw PsyduckEvosMoves
-	dw DrowzeeEvosMoves
-	dw GolemEvosMoves
-	dw MissingNo32EvosMoves
-	dw MagmarEvosMoves
-	dw MissingNo34EvosMoves
-	dw ElectabuzzEvosMoves
-	dw MagnetonEvosMoves
-	dw KoffingEvosMoves
-	dw MissingNo38EvosMoves
-	dw MankeyEvosMoves
-	dw SeelEvosMoves
-	dw DiglettEvosMoves
-	dw TaurosEvosMoves
-	dw MissingNo3DEvosMoves
-	dw MissingNo3EEvosMoves
-	dw MissingNo3FEvosMoves
-	dw FarfetchdEvosMoves
-	dw VenonatEvosMoves
-	dw DragoniteEvosMoves
-	dw MissingNo43EvosMoves
-	dw MissingNo44EvosMoves
-	dw MissingNo45EvosMoves
-	dw DoduoEvosMoves
-	dw PoliwagEvosMoves
-	dw JynxEvosMoves
-	dw MoltresEvosMoves
-	dw ArticunoEvosMoves
-	dw ZapdosEvosMoves
-	dw DittoEvosMoves
-	dw MeowthEvosMoves
-	dw KrabbyEvosMoves
-	dw MissingNo4FEvosMoves
-	dw MissingNo50EvosMoves
-	dw MissingNo51EvosMoves
-	dw VulpixEvosMoves
-	dw NinetalesEvosMoves
-	dw PikachuEvosMoves
-	dw RaichuEvosMoves
-	dw MissingNo56EvosMoves
-	dw MissingNo57EvosMoves
-	dw DratiniEvosMoves
-	dw DragonairEvosMoves
-	dw KabutoEvosMoves
-	dw KabutopsEvosMoves
-	dw HorseaEvosMoves
-	dw SeadraEvosMoves
-	dw MissingNo5EEvosMoves
-	dw MissingNo5FEvosMoves
-	dw SandshrewEvosMoves
-	dw SandslashEvosMoves
-	dw OmanyteEvosMoves
-	dw OmastarEvosMoves
-	dw JigglypuffEvosMoves
-	dw WigglytuffEvosMoves
-	dw EeveeEvosMoves
-	dw FlareonEvosMoves
-	dw JolteonEvosMoves
-	dw VaporeonEvosMoves
-	dw MachopEvosMoves
-	dw ZubatEvosMoves
-	dw EkansEvosMoves
-	dw ParasEvosMoves
-	dw PoliwhirlEvosMoves
-	dw PoliwrathEvosMoves
-	dw WeedleEvosMoves
-	dw KakunaEvosMoves
-	dw BeedrillEvosMoves
-	dw MissingNo73EvosMoves
-	dw DodrioEvosMoves
-	dw PrimeapeEvosMoves
-	dw DugtrioEvosMoves
-	dw VenomothEvosMoves
-	dw DewgongEvosMoves
-	dw MissingNo79EvosMoves
-	dw MissingNo7AEvosMoves
-	dw CaterpieEvosMoves
-	dw MetapodEvosMoves
-	dw ButterfreeEvosMoves
-	dw MachampEvosMoves
-	dw MissingNo7FEvosMoves
-	dw GolduckEvosMoves
-	dw HypnoEvosMoves
-	dw GolbatEvosMoves
-	dw MewtwoEvosMoves
-	dw SnorlaxEvosMoves
-	dw MagikarpEvosMoves
-	dw MissingNo86EvosMoves
-	dw MissingNo87EvosMoves
-	dw MukEvosMoves
-	dw MissingNo8AEvosMoves
-	dw KinglerEvosMoves
-	dw CloysterEvosMoves
-	dw MissingNo8CEvosMoves
-	dw ElectrodeEvosMoves
-	dw ClefableEvosMoves
-	dw WeezingEvosMoves
-	dw PersianEvosMoves
-	dw MarowakEvosMoves
-	dw MissingNo92EvosMoves
-	dw HaunterEvosMoves
-	dw AbraEvosMoves
-	dw AlakazamEvosMoves
-	dw PidgeottoEvosMoves
-	dw PidgeotEvosMoves
-	dw StarmieEvosMoves
-	dw BulbasaurEvosMoves
-	dw VenusaurEvosMoves
-	dw TentacruelEvosMoves
-	dw MissingNo9CEvosMoves
-	dw GoldeenEvosMoves
-	dw SeakingEvosMoves
-	dw MissingNo9FEvosMoves
-	dw MissingNoA0EvosMoves
-	dw MissingNoA1EvosMoves
-	dw MissingNoA2EvosMoves
-	dw PonytaEvosMoves
-	dw RapidashEvosMoves
-	dw RattataEvosMoves
-	dw RaticateEvosMoves
-	dw NidorinoEvosMoves
-	dw NidorinaEvosMoves
-	dw GeodudeEvosMoves
-	dw PorygonEvosMoves
-	dw AerodactylEvosMoves
-	dw MissingNoACEvosMoves
-	dw MagnemiteEvosMoves
-	dw MissingNoAEEvosMoves
-	dw MissingNoAFEvosMoves
-	dw CharmanderEvosMoves
-	dw SquirtleEvosMoves
-	dw CharmeleonEvosMoves
-	dw WartortleEvosMoves
-	dw CharizardEvosMoves
-	dw MissingNoB5EvosMoves
-	dw FossilKabutopsEvosMoves
-	dw FossilAerodactylEvosMoves
-	dw MonGhostEvosMoves
-	dw OddishEvosMoves
-	dw GloomEvosMoves
-	dw VileplumeEvosMoves
-	dw BellsproutEvosMoves
-	dw WeepinbellEvosMoves
-	dw VictreebelEvosMoves
-
-RhydonEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 30, STOMP
-	db 35, TAIL_WHIP
-	db 40, FURY_ATTACK
-	db 48, HORN_DRILL
-	db 55, LEER
-	db 64, TAKE_DOWN
-	db 0
-
-KangaskhanEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 26, BITE
-	db 31, TAIL_WHIP
-	db 36, MEGA_PUNCH
-	db 41, LEER
-	db 46, DIZZY_PUNCH
-	db 0
-
-NidoranMEvosMoves:
-; Evolutions
-	db EV_LEVEL, 16, NIDORINO
-	db 0
-; Learnset
-	db 8, HORN_ATTACK
-	db 14, POISON_STING
-	db 21, FOCUS_ENERGY
-	db 29, FURY_ATTACK
-	db 36, HORN_DRILL
-	db 43, DOUBLE_KICK
-	db 0
-
-ClefairyEvosMoves:
-; Evolutions
-	db EV_ITEM, MOON_STONE, 1, CLEFABLE
-	db 0
-; Learnset
-	db 13, SING
-	db 18, DOUBLESLAP
-	db 24, MINIMIZE
-	db 31, METRONOME
-	db 39, DEFENSE_CURL
-	db 48, LIGHT_SCREEN
-	db 0
-
-SpearowEvosMoves:
-; Evolutions
-	db EV_LEVEL, 20, FEAROW
-	db 0
-; Learnset
-	db 9, LEER
-	db 15, FURY_ATTACK
-	db 22, MIRROR_MOVE
-	db 29, DRILL_PECK
-	db 36, AGILITY
-	db 0
-
-VoltorbEvosMoves:
-; Evolutions
-	db EV_LEVEL, 30, ELECTRODE
-	db 0
-; Learnset
-	db 17, SONICBOOM
-	db 22, SELFDESTRUCT
-	db 29, LIGHT_SCREEN
-	db 36, SWIFT
-	db 43, EXPLOSION
-	db 0
-
-NidokingEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 8, HORN_ATTACK
-	db 14, POISON_STING
-	db 23, THRASH
-	db 0
-
-SlowbroEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 18, DISABLE
-	db 22, HEADBUTT
-	db 27, GROWL
-	db 33, WATER_GUN
-	db 37, WITHDRAW
-	db 44, AMNESIA
-	db 55, PSYCHIC_M
-	db 0
-
-IvysaurEvosMoves:
-; Evolutions
-	db EV_LEVEL, 32, VENUSAUR
-	db 0
-; Learnset
-	db 7, LEECH_SEED
-	db 13, VINE_WHIP
-	db 22, POISONPOWDER
-	db 30, RAZOR_LEAF
-	db 38, GROWTH
-	db 46, SLEEP_POWDER
-	db 54, SOLARBEAM
-	db 0
-
-ExeggutorEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 28, STOMP
-	db 0
-
-LickitungEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 7, STOMP
-	db 15, DISABLE
-	db 23, DEFENSE_CURL
-	db 31, SLAM
-	db 39, SCREECH
-	db 0
-
-ExeggcuteEvosMoves:
-; Evolutions
-	db EV_ITEM, LEAF_STONE, 1, EXEGGUTOR
-	db 0
-; Learnset
-	db 25, REFLECT
-	db 28, LEECH_SEED
-	db 32, STUN_SPORE
-	db 37, POISONPOWDER
-	db 42, SOLARBEAM
-	db 48, SLEEP_POWDER
-	db 0
-
-GrimerEvosMoves:
-; Evolutions
-	db EV_LEVEL, 38, MUK
-	db 0
-; Learnset
-	db 30, POISON_GAS
-	db 33, MINIMIZE
-	db 37, SLUDGE
-	db 42, HARDEN
-	db 48, SCREECH
-	db 55, ACID_ARMOR
-	db 0
-
-GengarEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 29, HYPNOSIS
-	db 38, DREAM_EATER
-	db 0
-
-NidoranFEvosMoves:
-; Evolutions
-	db EV_LEVEL, 16, NIDORINA
-	db 0
-; Learnset
-	db 8, SCRATCH
-	db 14, POISON_STING
-	db 21, TAIL_WHIP
-	db 29, BITE
-	db 36, FURY_SWIPES
-	db 43, DOUBLE_KICK
-	db 0
-
-NidoqueenEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 8, SCRATCH
-	db 14, POISON_STING
-	db 23, BODY_SLAM
-	db 0
-
-CuboneEvosMoves:
-; Evolutions
-	db EV_LEVEL, 28, MAROWAK
-	db 0
-; Learnset
-	db 25, LEER
-	db 31, FOCUS_ENERGY
-	db 38, THRASH
-	db 43, BONEMERANG
-	db 46, RAGE
-	db 0
-
-RhyhornEvosMoves:
-; Evolutions
-	db EV_LEVEL, 42, RHYDON
-	db 0
-; Learnset
-	db 30, STOMP
-	db 35, TAIL_WHIP
-	db 40, FURY_ATTACK
-	db 45, HORN_DRILL
-	db 50, LEER
-	db 55, TAKE_DOWN
-	db 0
-
-LaprasEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 16, SING
-	db 20, MIST
-	db 25, BODY_SLAM
-	db 31, CONFUSE_RAY
-	db 38, ICE_BEAM
-	db 46, HYDRO_PUMP
-	db 0
-
-ArcanineEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MewEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 10, TRANSFORM
-	db 20, MEGA_PUNCH
-	db 30, METRONOME
-	db 40, PSYCHIC_M
-	db 0
-
-GyaradosEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 20, BITE
-	db 25, DRAGON_RAGE
-	db 32, LEER
-	db 41, HYDRO_PUMP
-	db 52, HYPER_BEAM
-	db 0
-
-ShellderEvosMoves:
-; Evolutions
-	db EV_ITEM, WATER_STONE, 1, CLOYSTER
-	db 0
-; Learnset
-	db 18, SUPERSONIC
-	db 23, CLAMP
-	db 30, AURORA_BEAM
-	db 39, LEER
-	db 50, ICE_BEAM
-	db 0
-
-TentacoolEvosMoves:
-; Evolutions
-	db EV_LEVEL, 30, TENTACRUEL
-	db 0
-; Learnset
-	db 7, SUPERSONIC
-	db 13, WRAP
-	db 18, POISON_STING
-	db 22, WATER_GUN
-	db 27, CONSTRICT
-	db 33, BARRIER
-	db 40, SCREECH
-	db 48, HYDRO_PUMP
-	db 0
-
-GastlyEvosMoves:
-; Evolutions
-	db EV_LEVEL, 25, HAUNTER
-	db 0
-; Learnset
-	db 27, HYPNOSIS
-	db 35, DREAM_EATER
-	db 0
-
-ScytherEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 17, LEER
-	db 20, FOCUS_ENERGY
-	db 24, DOUBLE_TEAM
-	db 29, SLASH
-	db 35, SWORDS_DANCE
-	db 42, AGILITY
-	db 0
-
-StaryuEvosMoves:
-; Evolutions
-	db EV_ITEM, WATER_STONE, 1, STARMIE
-	db 0
-; Learnset
-	db 17, WATER_GUN
-	db 22, HARDEN
-	db 27, RECOVER
-	db 32, SWIFT
-	db 37, MINIMIZE
-	db 42, LIGHT_SCREEN
-	db 47, HYDRO_PUMP
-	db 0
-
-BlastoiseEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 8, BUBBLE
-	db 15, WATER_GUN
-	db 24, BITE
-	db 31, WITHDRAW
-	db 42, SKULL_BASH
-	db 52, HYDRO_PUMP
-	db 0
-
-PinsirEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 25, SEISMIC_TOSS
-	db 30, GUILLOTINE
-	db 36, FOCUS_ENERGY
-	db 43, HARDEN
-	db 49, SLASH
-	db 54, SWORDS_DANCE
-	db 0
-
-TangelaEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 29, ABSORB
-	db 32, POISONPOWDER
-	db 36, STUN_SPORE
-	db 39, SLEEP_POWDER
-	db 45, SLAM
-	db 49, GROWTH
-	db 0
-
-MissingNo1FEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNo20EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-GrowlitheEvosMoves:
-; Evolutions
-	db EV_ITEM, FIRE_STONE, 1, ARCANINE
-	db 0
-; Learnset
-	db 18, EMBER
-	db 23, LEER
-	db 30, TAKE_DOWN
-	db 39, AGILITY
-	db 50, FLAMETHROWER
-	db 0
-
-OnixEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 15, BIND
-	db 19, ROCK_THROW
-	db 25, RAGE
-	db 33, SLAM
-	db 43, HARDEN
-	db 0
-
-FearowEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 9, LEER
-	db 15, FURY_ATTACK
-	db 25, MIRROR_MOVE
-	db 34, DRILL_PECK
-	db 43, AGILITY
-	db 0
-
-PidgeyEvosMoves:
-; Evolutions
-	db EV_LEVEL, 18, PIDGEOTTO
-	db 0
-; Learnset
-	db 5, SAND_ATTACK
-	db 12, QUICK_ATTACK
-	db 19, WHIRLWIND
-	db 28, WING_ATTACK
-	db 36, AGILITY
-	db 44, MIRROR_MOVE
-	db 0
-
-SlowpokeEvosMoves:
-; Evolutions
-	db EV_LEVEL, 37, SLOWBRO
-	db 0
-; Learnset
-	db 18, DISABLE
-	db 22, HEADBUTT
-	db 27, GROWL
-	db 33, WATER_GUN
-	db 40, AMNESIA
-	db 48, PSYCHIC_M
-	db 0
-
-KadabraEvosMoves:
-; Evolutions
-	db EV_TRADE, 1, ALAKAZAM
-	db 0
-; Learnset
-	db 16, CONFUSION
-	db 20, DISABLE
-	db 27, PSYBEAM
-	db 31, RECOVER
-	db 38, PSYCHIC_M
-	db 42, REFLECT
-	db 0
-
-GravelerEvosMoves:
-; Evolutions
-	db EV_TRADE, 1, GOLEM
-	db 0
-; Learnset
-	db 11, DEFENSE_CURL
-	db 16, ROCK_THROW
-	db 21, SELFDESTRUCT
-	db 29, HARDEN
-	db 36, EARTHQUAKE
-	db 43, EXPLOSION
-	db 0
-
-ChanseyEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 24, SING
-	db 30, GROWL
-	db 38, MINIMIZE
-	db 44, DEFENSE_CURL
-	db 48, LIGHT_SCREEN
-	db 54, DOUBLE_EDGE
-	db 0
-
-MachokeEvosMoves:
-; Evolutions
-	db EV_TRADE, 1, MACHAMP
-	db 0
-; Learnset
-	db 20, LOW_KICK
-	db 25, LEER
-	db 36, FOCUS_ENERGY
-	db 44, SEISMIC_TOSS
-	db 52, SUBMISSION
-	db 0
-
-MrMimeEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 15, CONFUSION
-	db 23, LIGHT_SCREEN
-	db 31, DOUBLESLAP
-	db 39, MEDITATE
-	db 47, SUBSTITUTE
-	db 0
-
-HitmonleeEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 33, ROLLING_KICK
-	db 38, JUMP_KICK
-	db 43, FOCUS_ENERGY
-	db 48, HI_JUMP_KICK
-	db 53, MEGA_KICK
-	db 0
-
-HitmonchanEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 33, FIRE_PUNCH
-	db 38, ICE_PUNCH
-	db 43, THUNDERPUNCH
-	db 48, MEGA_PUNCH
-	db 53, COUNTER
-	db 0
-
-ArbokEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 10, POISON_STING
-	db 17, BITE
-	db 27, GLARE
-	db 36, SCREECH
-	db 47, ACID
-	db 0
-
-ParasectEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 13, STUN_SPORE
-	db 20, LEECH_LIFE
-	db 30, SPORE
-	db 39, SLASH
-	db 48, GROWTH
-	db 0
-
-PsyduckEvosMoves:
-; Evolutions
-	db EV_LEVEL, 33, GOLDUCK
-	db 0
-; Learnset
-	db 28, TAIL_WHIP
-	db 31, DISABLE
-	db 36, CONFUSION
-	db 43, FURY_SWIPES
-	db 52, HYDRO_PUMP
-	db 0
-
-DrowzeeEvosMoves:
-; Evolutions
-	db EV_LEVEL, 26, HYPNO
-	db 0
-; Learnset
-	db 12, DISABLE
-	db 17, CONFUSION
-	db 24, HEADBUTT
-	db 29, POISON_GAS
-	db 32, PSYCHIC_M
-	db 37, MEDITATE
-	db 0
-
-GolemEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 11, DEFENSE_CURL
-	db 16, ROCK_THROW
-	db 21, SELFDESTRUCT
-	db 29, HARDEN
-	db 36, EARTHQUAKE
-	db 43, EXPLOSION
-	db 0
-
-MissingNo32EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MagmarEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 36, LEER
-	db 39, CONFUSE_RAY
-	db 43, FIRE_PUNCH
-	db 48, SMOKESCREEN
-	db 52, SMOG
-	db 55, FLAMETHROWER
-	db 0
-
-MissingNo34EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-ElectabuzzEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 34, THUNDERSHOCK
-	db 37, SCREECH
-	db 42, THUNDERPUNCH
-	db 49, LIGHT_SCREEN
-	db 54, THUNDER
-	db 0
-
-MagnetonEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 21, SONICBOOM
-	db 25, THUNDERSHOCK
-	db 29, SUPERSONIC
-	db 38, THUNDER_WAVE
-	db 46, SWIFT
-	db 54, SCREECH
-	db 0
-
-KoffingEvosMoves:
-; Evolutions
-	db EV_LEVEL, 35, WEEZING
-	db 0
-; Learnset
-	db 32, SLUDGE
-	db 37, SMOKESCREEN
-	db 40, SELFDESTRUCT
-	db 45, HAZE
-	db 48, EXPLOSION
-	db 0
-
-MissingNo38EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MankeyEvosMoves:
-; Evolutions
-	db EV_LEVEL, 28, PRIMEAPE
-	db 0
-; Learnset
-	db 15, KARATE_CHOP
-	db 21, FURY_SWIPES
-	db 27, FOCUS_ENERGY
-	db 33, SEISMIC_TOSS
-	db 39, THRASH
-	db 0
-
-SeelEvosMoves:
-; Evolutions
-	db EV_LEVEL, 34, DEWGONG
-	db 0
-; Learnset
-	db 30, GROWL
-	db 35, AURORA_BEAM
-	db 40, REST
-	db 45, TAKE_DOWN
-	db 50, ICE_BEAM
-	db 0
-
-DiglettEvosMoves:
-; Evolutions
-	db EV_LEVEL, 26, DUGTRIO
-	db 0
-; Learnset
-	db 15, GROWL
-	db 19, DIG
-	db 24, SAND_ATTACK
-	db 31, SLASH
-	db 40, EARTHQUAKE
-	db 0
-
-TaurosEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 21, STOMP
-	db 28, TAIL_WHIP
-	db 35, LEER
-	db 44, RAGE
-	db 51, TAKE_DOWN
-	db 0
-
-MissingNo3DEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNo3EEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNo3FEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-FarfetchdEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 7, LEER
-	db 15, FURY_ATTACK
-	db 23, SWORDS_DANCE
-	db 31, AGILITY
-	db 39, SLASH
-	db 0
-
-VenonatEvosMoves:
-; Evolutions
-	db EV_LEVEL, 31, VENOMOTH
-	db 0
-; Learnset
-	db 24, POISONPOWDER
-	db 27, LEECH_LIFE
-	db 30, STUN_SPORE
-	db 35, PSYBEAM
-	db 38, SLEEP_POWDER
-	db 43, PSYCHIC_M
-	db 0
-
-DragoniteEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 10, THUNDER_WAVE
-	db 20, AGILITY
-	db 35, SLAM
-	db 45, DRAGON_RAGE
-	db 60, HYPER_BEAM
-	db 0
-
-MissingNo43EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNo44EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNo45EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-DoduoEvosMoves:
-; Evolutions
-	db EV_LEVEL, 31, DODRIO
-	db 0
-; Learnset
-	db 20, GROWL
-	db 24, FURY_ATTACK
-	db 30, DRILL_PECK
-	db 36, RAGE
-	db 40, TRI_ATTACK
-	db 44, AGILITY
-	db 0
-
-PoliwagEvosMoves:
-; Evolutions
-	db EV_LEVEL, 25, POLIWHIRL
-	db 0
-; Learnset
-	db 16, HYPNOSIS
-	db 19, WATER_GUN
-	db 25, DOUBLESLAP
-	db 31, BODY_SLAM
-	db 38, AMNESIA
-	db 45, HYDRO_PUMP
-	db 0
-
-JynxEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 18, LICK
-	db 23, DOUBLESLAP
-	db 31, ICE_PUNCH
-	db 39, BODY_SLAM
-	db 47, THRASH
-	db 58, BLIZZARD
-	db 0
-
-MoltresEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 51, LEER
-	db 55, AGILITY
-	db 60, SKY_ATTACK
-	db 0
-
-ArticunoEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 51, BLIZZARD
-	db 55, AGILITY
-	db 60, MIST
-	db 0
-
-ZapdosEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 51, THUNDER
-	db 55, AGILITY
-	db 60, LIGHT_SCREEN
-	db 0
-
-DittoEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MeowthEvosMoves:
-; Evolutions
-	db EV_LEVEL, 28, PERSIAN
-	db 0
-; Learnset
-	db 12, BITE
-	db 17, PAY_DAY
-	db 24, SCREECH
-	db 33, FURY_SWIPES
-	db 44, SLASH
-	db 0
-
-KrabbyEvosMoves:
-; Evolutions
-	db EV_LEVEL, 28, KINGLER
-	db 0
-; Learnset
-	db 20, VICEGRIP
-	db 25, GUILLOTINE
-	db 30, STOMP
-	db 35, CRABHAMMER
-	db 40, HARDEN
-	db 0
-
-MissingNo4FEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNo50EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNo51EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-VulpixEvosMoves:
-; Evolutions
-	db EV_ITEM, FIRE_STONE, 1, NINETALES
-	db 0
-; Learnset
-	db 16, QUICK_ATTACK
-	db 21, ROAR
-	db 28, CONFUSE_RAY
-	db 35, FLAMETHROWER
-	db 42, FIRE_SPIN
-	db 0
-
-NinetalesEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-PikachuEvosMoves:
-; Evolutions
-	db EV_ITEM, THUNDER_STONE, 1, RAICHU
-	db 0
-; Learnset
-	db 9, THUNDER_WAVE
-	db 16, QUICK_ATTACK
-	db 26, SWIFT
-	db 33, AGILITY
-	db 43, THUNDER
-	db 0
-
-RaichuEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNo56EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNo57EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-DratiniEvosMoves:
-; Evolutions
-	db EV_LEVEL, 30, DRAGONAIR
-	db 0
-; Learnset
-	db 10, THUNDER_WAVE
-	db 20, AGILITY
-	db 30, SLAM
-	db 40, DRAGON_RAGE
-	db 50, HYPER_BEAM
-	db 0
-
-DragonairEvosMoves:
-; Evolutions
-	db EV_LEVEL, 55, DRAGONITE
-	db 0
-; Learnset
-	db 10, THUNDER_WAVE
-	db 20, AGILITY
-	db 35, SLAM
-	db 45, DRAGON_RAGE
-	db 55, HYPER_BEAM
-	db 0
-
-KabutoEvosMoves:
-; Evolutions
-	db EV_LEVEL, 40, KABUTOPS
-	db 0
-; Learnset
-	db 34, ABSORB
-	db 39, SLASH
-	db 44, LEER
-	db 49, HYDRO_PUMP
-	db 0
-
-KabutopsEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 34, ABSORB
-	db 39, SLASH
-	db 46, LEER
-	db 53, HYDRO_PUMP
-	db 0
-
-HorseaEvosMoves:
-; Evolutions
-	db EV_LEVEL, 32, SEADRA
-	db 0
-; Learnset
-	db 19, SMOKESCREEN
-	db 24, LEER
-	db 30, WATER_GUN
-	db 37, AGILITY
-	db 45, HYDRO_PUMP
-	db 0
-
-SeadraEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 19, SMOKESCREEN
-	db 24, LEER
-	db 30, WATER_GUN
-	db 41, AGILITY
-	db 52, HYDRO_PUMP
-	db 0
-
-MissingNo5EEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNo5FEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-SandshrewEvosMoves:
-; Evolutions
-	db EV_LEVEL, 22, SANDSLASH
-	db 0
-; Learnset
-	db 10, SAND_ATTACK
-	db 17, SLASH
-	db 24, POISON_STING
-	db 31, SWIFT
-	db 38, FURY_SWIPES
-	db 0
-
-SandslashEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 10, SAND_ATTACK
-	db 17, SLASH
-	db 27, POISON_STING
-	db 36, SWIFT
-	db 47, FURY_SWIPES
-	db 0
-
-OmanyteEvosMoves:
-; Evolutions
-	db EV_LEVEL, 40, OMASTAR
-	db 0
-; Learnset
-	db 34, HORN_ATTACK
-	db 39, LEER
-	db 46, SPIKE_CANNON
-	db 53, HYDRO_PUMP
-	db 0
-
-OmastarEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 34, HORN_ATTACK
-	db 39, LEER
-	db 44, SPIKE_CANNON
-	db 49, HYDRO_PUMP
-	db 0
-
-JigglypuffEvosMoves:
-; Evolutions
-	db EV_ITEM, MOON_STONE, 1, WIGGLYTUFF
-	db 0
-; Learnset
-	db 9, POUND
-	db 14, DISABLE
-	db 19, DEFENSE_CURL
-	db 24, DOUBLESLAP
-	db 29, REST
-	db 34, BODY_SLAM
-	db 39, DOUBLE_EDGE
-	db 0
-
-WigglytuffEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-EeveeEvosMoves:
-; Evolutions
-	db EV_ITEM, FIRE_STONE, 1, FLAREON
-	db EV_ITEM, THUNDER_STONE, 1, JOLTEON
-	db EV_ITEM, WATER_STONE, 1, VAPOREON
-	db 0
-; Learnset
-	db 27, QUICK_ATTACK
-	db 31, TAIL_WHIP
-	db 37, BITE
-	db 45, TAKE_DOWN
-	db 0
-
-FlareonEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 27, QUICK_ATTACK
-	db 31, EMBER
-	db 37, TAIL_WHIP
-	db 40, BITE
-	db 42, LEER
-	db 44, FIRE_SPIN
-	db 48, RAGE
-	db 54, FLAMETHROWER
-	db 0
-
-JolteonEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 27, QUICK_ATTACK
-	db 31, THUNDERSHOCK
-	db 37, TAIL_WHIP
-	db 40, THUNDER_WAVE
-	db 42, DOUBLE_KICK
-	db 44, AGILITY
-	db 48, PIN_MISSILE
-	db 54, THUNDER
-	db 0
-
-VaporeonEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 27, QUICK_ATTACK
-	db 31, WATER_GUN
-	db 37, TAIL_WHIP
-	db 40, BITE
-	db 42, ACID_ARMOR
-	db 44, HAZE
-	db 48, MIST
-	db 54, HYDRO_PUMP
-	db 0
-
-MachopEvosMoves:
-; Evolutions
-	db EV_LEVEL, 28, MACHOKE
-	db 0
-; Learnset
-	db 20, LOW_KICK
-	db 25, LEER
-	db 32, FOCUS_ENERGY
-	db 39, SEISMIC_TOSS
-	db 46, SUBMISSION
-	db 0
-
-ZubatEvosMoves:
-; Evolutions
-	db EV_LEVEL, 22, GOLBAT
-	db 0
-; Learnset
-	db 10, SUPERSONIC
-	db 15, BITE
-	db 21, CONFUSE_RAY
-	db 28, WING_ATTACK
-	db 36, HAZE
-	db 0
-
-EkansEvosMoves:
-; Evolutions
-	db EV_LEVEL, 22, ARBOK
-	db 0
-; Learnset
-	db 10, POISON_STING
-	db 17, BITE
-	db 24, GLARE
-	db 31, SCREECH
-	db 38, ACID
-	db 0
-
-ParasEvosMoves:
-; Evolutions
-	db EV_LEVEL, 24, PARASECT
-	db 0
-; Learnset
-	db 13, STUN_SPORE
-	db 20, LEECH_LIFE
-	db 27, SPORE
-	db 34, SLASH
-	db 41, GROWTH
-	db 0
-
-PoliwhirlEvosMoves:
-; Evolutions
-	db EV_ITEM, WATER_STONE, 1, POLIWRATH
-	db 0
-; Learnset
-	db 16, HYPNOSIS
-	db 19, WATER_GUN
-	db 26, DOUBLESLAP
-	db 33, BODY_SLAM
-	db 41, AMNESIA
-	db 49, HYDRO_PUMP
-	db 0
-
-PoliwrathEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 16, HYPNOSIS
-	db 19, WATER_GUN
-	db 0
-
-WeedleEvosMoves:
-; Evolutions
-	db EV_LEVEL, 7, KAKUNA
-	db 0
-; Learnset
-	db 0
-
-KakunaEvosMoves:
-; Evolutions
-	db EV_LEVEL, 10, BEEDRILL
-	db 0
-; Learnset
-	db 0
-
-BeedrillEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 12, FURY_ATTACK
-	db 16, FOCUS_ENERGY
-	db 20, TWINEEDLE
-	db 25, RAGE
-	db 30, PIN_MISSILE
-	db 35, AGILITY
-	db 0
-
-MissingNo73EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-DodrioEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 20, GROWL
-	db 24, FURY_ATTACK
-	db 30, DRILL_PECK
-	db 39, RAGE
-	db 45, TRI_ATTACK
-	db 51, AGILITY
-	db 0
-
-PrimeapeEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 15, KARATE_CHOP
-	db 21, FURY_SWIPES
-	db 27, FOCUS_ENERGY
-	db 37, SEISMIC_TOSS
-	db 46, THRASH
-	db 0
-
-DugtrioEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 15, GROWL
-	db 19, DIG
-	db 24, SAND_ATTACK
-	db 35, SLASH
-	db 47, EARTHQUAKE
-	db 0
-
-VenomothEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 24, POISONPOWDER
-	db 27, LEECH_LIFE
-	db 30, STUN_SPORE
-	db 38, PSYBEAM
-	db 43, SLEEP_POWDER
-	db 50, PSYCHIC_M
-	db 0
-
-DewgongEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 30, GROWL
-	db 35, AURORA_BEAM
-	db 44, REST
-	db 50, TAKE_DOWN
-	db 56, ICE_BEAM
-	db 0
-
-MissingNo79EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNo7AEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-CaterpieEvosMoves:
-; Evolutions
-	db EV_LEVEL, 7, METAPOD
-	db 0
-; Learnset
-	db 0
-
-MetapodEvosMoves:
-; Evolutions
-	db EV_LEVEL, 10, BUTTERFREE
-	db 0
-; Learnset
-	db 0
-
-ButterfreeEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 12, CONFUSION
-	db 15, POISONPOWDER
-	db 16, STUN_SPORE
-	db 17, SLEEP_POWDER
-	db 21, SUPERSONIC
-	db 26, WHIRLWIND
-	db 32, PSYBEAM
-	db 0
-
-MachampEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 20, LOW_KICK
-	db 25, LEER
-	db 36, FOCUS_ENERGY
-	db 44, SEISMIC_TOSS
-	db 52, SUBMISSION
-	db 0
-
-MissingNo7FEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-GolduckEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 28, TAIL_WHIP
-	db 31, DISABLE
-	db 39, CONFUSION
-	db 48, FURY_SWIPES
-	db 59, HYDRO_PUMP
-	db 0
-
-HypnoEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 12, DISABLE
-	db 17, CONFUSION
-	db 24, HEADBUTT
-	db 33, POISON_GAS
-	db 37, PSYCHIC_M
-	db 43, MEDITATE
-	db 0
-
-GolbatEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 10, SUPERSONIC
-	db 15, BITE
-	db 21, CONFUSE_RAY
-	db 32, WING_ATTACK
-	db 43, HAZE
-	db 0
-
-MewtwoEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 63, BARRIER
-	db 66, PSYCHIC_M
-	db 70, RECOVER
-	db 75, MIST
-	db 81, AMNESIA
-	db 0
-
-SnorlaxEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 35, BODY_SLAM
-	db 41, HARDEN
-	db 48, DOUBLE_EDGE
-	db 56, HYPER_BEAM
-	db 0
-
-MagikarpEvosMoves:
-; Evolutions
-	db EV_LEVEL, 20, GYARADOS
-	db 0
-; Learnset
-	db 15, TACKLE
-	db 0
-
-MissingNo86EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNo87EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MukEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 30, POISON_GAS
-	db 33, MINIMIZE
-	db 37, SLUDGE
-	db 45, HARDEN
-	db 53, SCREECH
-	db 60, ACID_ARMOR
-	db 0
-
-MissingNo8AEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-KinglerEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 20, VICEGRIP
-	db 25, GUILLOTINE
-	db 34, STOMP
-	db 42, CRABHAMMER
-	db 49, HARDEN
-	db 0
-
-CloysterEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 50, SPIKE_CANNON
-	db 0
-
-MissingNo8CEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-ElectrodeEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 17, SONICBOOM
-	db 22, SELFDESTRUCT
-	db 29, LIGHT_SCREEN
-	db 40, SWIFT
-	db 50, EXPLOSION
-	db 0
-
-ClefableEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-WeezingEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 32, SLUDGE
-	db 39, SMOKESCREEN
-	db 43, SELFDESTRUCT
-	db 49, HAZE
-	db 53, EXPLOSION
-	db 0
-
-PersianEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 12, BITE
-	db 17, PAY_DAY
-	db 24, SCREECH
-	db 37, FURY_SWIPES
-	db 51, SLASH
-	db 0
-
-MarowakEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 25, LEER
-	db 33, FOCUS_ENERGY
-	db 41, THRASH
-	db 48, BONEMERANG
-	db 55, RAGE
-	db 0
-
-MissingNo92EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-HaunterEvosMoves:
-; Evolutions
-	db EV_TRADE, 1, GENGAR
-	db 0
-; Learnset
-	db 29, HYPNOSIS
-	db 38, DREAM_EATER
-	db 0
-
-AbraEvosMoves:
-; Evolutions
-	db EV_LEVEL, 16, KADABRA
-	db 0
-; Learnset
-	db 0
-
-AlakazamEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 16, CONFUSION
-	db 20, DISABLE
-	db 27, PSYBEAM
-	db 31, RECOVER
-	db 38, PSYCHIC_M
-	db 42, REFLECT
-	db 0
-
-PidgeottoEvosMoves:
-; Evolutions
-	db EV_LEVEL, 36, PIDGEOT
-	db 0
-; Learnset
-	db 5, SAND_ATTACK
-	db 12, QUICK_ATTACK
-	db 21, WHIRLWIND
-	db 31, WING_ATTACK
-	db 40, AGILITY
-	db 49, MIRROR_MOVE
-	db 0
-
-PidgeotEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 5, SAND_ATTACK
-	db 12, QUICK_ATTACK
-	db 21, WHIRLWIND
-	db 31, WING_ATTACK
-	db 44, AGILITY
-	db 54, MIRROR_MOVE
-	db 0
-
-StarmieEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-BulbasaurEvosMoves:
-; Evolutions
-	db EV_LEVEL, 16, IVYSAUR
-	db 0
-; Learnset
-	db 7, LEECH_SEED
-	db 13, VINE_WHIP
-	db 20, POISONPOWDER
-	db 27, RAZOR_LEAF
-	db 34, GROWTH
-	db 41, SLEEP_POWDER
-	db 48, SOLARBEAM
-	db 0
-
-VenusaurEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 7, LEECH_SEED
-	db 13, VINE_WHIP
-	db 22, POISONPOWDER
-	db 30, RAZOR_LEAF
-	db 43, GROWTH
-	db 55, SLEEP_POWDER
-	db 65, SOLARBEAM
-	db 0
-
-TentacruelEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 7, SUPERSONIC
-	db 13, WRAP
-	db 18, POISON_STING
-	db 22, WATER_GUN
-	db 27, CONSTRICT
-	db 35, BARRIER
-	db 43, SCREECH
-	db 50, HYDRO_PUMP
-	db 0
-
-MissingNo9CEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-GoldeenEvosMoves:
-; Evolutions
-	db EV_LEVEL, 33, SEAKING
-	db 0
-; Learnset
-	db 19, SUPERSONIC
-	db 24, HORN_ATTACK
-	db 30, FURY_ATTACK
-	db 37, WATERFALL
-	db 45, HORN_DRILL
-	db 54, AGILITY
-	db 0
-
-SeakingEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 19, SUPERSONIC
-	db 24, HORN_ATTACK
-	db 30, FURY_ATTACK
-	db 39, WATERFALL
-	db 48, HORN_DRILL
-	db 54, AGILITY
-	db 0
-
-MissingNo9FEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNoA0EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNoA1EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNoA2EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-PonytaEvosMoves:
-; Evolutions
-	db EV_LEVEL, 40, RAPIDASH
-	db 0
-; Learnset
-	db 30, TAIL_WHIP
-	db 32, STOMP
-	db 35, GROWL
-	db 39, FIRE_SPIN
-	db 43, TAKE_DOWN
-	db 48, AGILITY
-	db 0
-
-RapidashEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 30, TAIL_WHIP
-	db 32, STOMP
-	db 35, GROWL
-	db 39, FIRE_SPIN
-	db 47, TAKE_DOWN
-	db 55, AGILITY
-	db 0
-
-RattataEvosMoves:
-; Evolutions
-	db EV_LEVEL, 20, RATICATE
-	db 0
-; Learnset
-	db 7, QUICK_ATTACK
-	db 14, HYPER_FANG
-	db 23, FOCUS_ENERGY
-	db 34, SUPER_FANG
-	db 0
-
-RaticateEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 7, QUICK_ATTACK
-	db 14, HYPER_FANG
-	db 27, FOCUS_ENERGY
-	db 41, SUPER_FANG
-	db 0
-
-NidorinoEvosMoves:
-; Evolutions
-	db EV_ITEM, MOON_STONE, 1, NIDOKING
-	db 0
-; Learnset
-	db 8, HORN_ATTACK
-	db 14, POISON_STING
-	db 23, FOCUS_ENERGY
-	db 32, FURY_ATTACK
-	db 41, HORN_DRILL
-	db 50, DOUBLE_KICK
-	db 0
-
-NidorinaEvosMoves:
-; Evolutions
-	db EV_ITEM, MOON_STONE, 1, NIDOQUEEN
-	db 0
-; Learnset
-	db 8, SCRATCH
-	db 14, POISON_STING
-	db 23, TAIL_WHIP
-	db 32, BITE
-	db 41, FURY_SWIPES
-	db 50, DOUBLE_KICK
-	db 0
-
-GeodudeEvosMoves:
-; Evolutions
-	db EV_LEVEL, 25, GRAVELER
-	db 0
-; Learnset
-	db 11, DEFENSE_CURL
-	db 16, ROCK_THROW
-	db 21, SELFDESTRUCT
-	db 26, HARDEN
-	db 31, EARTHQUAKE
-	db 36, EXPLOSION
-	db 0
-
-PorygonEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 23, PSYBEAM
-	db 28, RECOVER
-	db 35, AGILITY
-	db 42, TRI_ATTACK
-	db 0
-
-AerodactylEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 33, SUPERSONIC
-	db 38, BITE
-	db 45, TAKE_DOWN
-	db 54, HYPER_BEAM
-	db 0
-
-MissingNoACEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MagnemiteEvosMoves:
-; Evolutions
-	db EV_LEVEL, 30, MAGNETON
-	db 0
-; Learnset
-	db 21, SONICBOOM
-	db 25, THUNDERSHOCK
-	db 29, SUPERSONIC
-	db 35, THUNDER_WAVE
-	db 41, SWIFT
-	db 47, SCREECH
-	db 0
-
-MissingNoAEEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MissingNoAFEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-CharmanderEvosMoves:
-; Evolutions
-	db EV_LEVEL, 16, CHARMELEON
-	db 0
-; Learnset
-	db 9, EMBER
-	db 15, LEER
-	db 22, RAGE
-	db 30, SLASH
-	db 38, FLAMETHROWER
-	db 46, FIRE_SPIN
-	db 0
-
-SquirtleEvosMoves:
-; Evolutions
-	db EV_LEVEL, 16, WARTORTLE
-	db 0
-; Learnset
-	db 8, BUBBLE
-	db 15, WATER_GUN
-	db 22, BITE
-	db 28, WITHDRAW
-	db 35, SKULL_BASH
-	db 42, HYDRO_PUMP
-	db 0
-
-CharmeleonEvosMoves:
-; Evolutions
-	db EV_LEVEL, 36, CHARIZARD
-	db 0
-; Learnset
-	db 9, EMBER
-	db 15, LEER
-	db 24, RAGE
-	db 33, SLASH
-	db 42, FLAMETHROWER
-	db 56, FIRE_SPIN
-	db 0
-
-WartortleEvosMoves:
-; Evolutions
-	db EV_LEVEL, 36, BLASTOISE
-	db 0
-; Learnset
-	db 8, BUBBLE
-	db 15, WATER_GUN
-	db 24, BITE
-	db 31, WITHDRAW
-	db 39, SKULL_BASH
-	db 47, HYDRO_PUMP
-	db 0
-
-CharizardEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 9, EMBER
-	db 15, LEER
-	db 24, RAGE
-	db 36, SLASH
-	db 46, FLAMETHROWER
-	db 55, FIRE_SPIN
-	db 0
-
-MissingNoB5EvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-FossilKabutopsEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-FossilAerodactylEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-MonGhostEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 0
-
-OddishEvosMoves:
-; Evolutions
-	db EV_LEVEL, 21, GLOOM
-	db 0
-; Learnset
-	db 15, POISONPOWDER
-	db 17, STUN_SPORE
-	db 19, SLEEP_POWDER
-	db 24, ACID
-	db 33, PETAL_DANCE
-	db 46, SOLARBEAM
-	db 0
-
-GloomEvosMoves:
-; Evolutions
-	db EV_ITEM, LEAF_STONE, 1, VILEPLUME
-	db 0
-; Learnset
-	db 15, POISONPOWDER
-	db 17, STUN_SPORE
-	db 19, SLEEP_POWDER
-	db 28, ACID
-	db 38, PETAL_DANCE
-	db 52, SOLARBEAM
-	db 0
-
-VileplumeEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 15, POISONPOWDER
-	db 17, STUN_SPORE
-	db 19, SLEEP_POWDER
-	db 0
-
-BellsproutEvosMoves:
-; Evolutions
-	db EV_LEVEL, 21, WEEPINBELL
-	db 0
-; Learnset
-	db 13, WRAP
-	db 15, POISONPOWDER
-	db 18, SLEEP_POWDER
-	db 21, STUN_SPORE
-	db 26, ACID
-	db 33, RAZOR_LEAF
-	db 42, SLAM
-	db 0
-
-WeepinbellEvosMoves:
-; Evolutions
-	db EV_ITEM, LEAF_STONE, 1, VICTREEBEL
-	db 0
-; Learnset
-	db 13, WRAP
-	db 15, POISONPOWDER
-	db 18, SLEEP_POWDER
-	db 23, STUN_SPORE
-	db 29, ACID
-	db 38, RAZOR_LEAF
-	db 49, SLAM
-	db 0
-
-VictreebelEvosMoves:
-; Evolutions
-	db 0
-; Learnset
-	db 13, WRAP
-	db 15, POISONPOWDER
-	db 18, SLEEP_POWDER
-	db 0
diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm
deleted file mode 100755
index 737947a7..00000000
--- a/data/hidden_objects.asm
+++ /dev/null
@@ -1,853 +0,0 @@
-HiddenObjectMaps:
-	db REDS_HOUSE_2F
-	db BLUES_HOUSE
-	db OAKS_LAB
-	db VIRIDIAN_POKECENTER
-	db VIRIDIAN_MART
-	db VIRIDIAN_SCHOOL_HOUSE
-	db VIRIDIAN_GYM
-	db MUSEUM_1F
-	db PEWTER_GYM
-	db PEWTER_MART
-	db PEWTER_POKECENTER
-	db CERULEAN_POKECENTER
-	db CERULEAN_GYM
-	db CERULEAN_MART
-	db LAVENDER_POKECENTER
-	db VERMILION_POKECENTER
-	db VERMILION_GYM
-	db CELADON_MANSION_2F
-	db CELADON_POKECENTER
-	db CELADON_GYM
-	db GAME_CORNER
-	db CELADON_HOTEL
-	db FUCHSIA_POKECENTER
-	db FUCHSIA_GYM
-	db CINNABAR_GYM
-	db CINNABAR_POKECENTER
-	db SAFFRON_GYM
-	db MT_MOON_POKECENTER
-	db ROCK_TUNNEL_POKECENTER
-	db TRADE_CENTER
-	db COLOSSEUM
-	db VIRIDIAN_FOREST
-	db MT_MOON_B2F
-	db INDIGO_PLATEAU
-	db ROUTE_25
-	db ROUTE_9
-	db SS_ANNE_KITCHEN
-	db SS_ANNE_B1F_ROOMS
-	db ROCKET_HIDEOUT_B1F
-	db ROCKET_HIDEOUT_B3F
-	db ROCKET_HIDEOUT_B4F
-	db SAFFRON_POKECENTER
-	db POKEMON_TOWER_5F
-	db ROUTE_13
-	db SAFARI_ZONE_GATE
-	db SAFARI_ZONE_WEST
-	db SILPH_CO_5F
-	db SILPH_CO_9F
-	db COPYCATS_HOUSE_2F
-	db CERULEAN_CAVE_1F
-	db CERULEAN_CAVE_B1F
-	db POWER_PLANT
-	db SEAFOAM_ISLANDS_B2F
-	db SEAFOAM_ISLANDS_B4F
-	db POKEMON_MANSION_1F
-	db POKEMON_MANSION_3F
-	db ROUTE_23
-	db VICTORY_ROAD_2F
-	db UNUSED_MAP_6F
-	db BILLS_HOUSE
-	db VIRIDIAN_CITY
-	db SAFARI_ZONE_WEST_REST_HOUSE
-	db SAFARI_ZONE_EAST_REST_HOUSE
-	db SAFARI_ZONE_NORTH_REST_HOUSE
-	db ROUTE_15_GATE_2F
-	db MR_FUJIS_HOUSE
-	db CELADON_MANSION_ROOF_HOUSE
-	db FIGHTING_DOJO
-	db ROUTE_10
-	db INDIGO_PLATEAU_LOBBY
-	db CINNABAR_LAB_FOSSIL_ROOM
-	db BIKE_SHOP
-	db ROUTE_11
-	db ROUTE_12
-	db POKEMON_MANSION_2F
-	db POKEMON_MANSION_B1F
-	db SILPH_CO_11F
-	db ROUTE_17
-	db UNDERGROUND_PATH_NORTH_SOUTH
-	db UNDERGROUND_PATH_WEST_EAST
-	db CELADON_CITY
-	db SEAFOAM_ISLANDS_B3F
-	db VERMILION_CITY
-	db CERULEAN_CITY
-	db ROUTE_4
-	db $FF
-
-HiddenObjectPointers:
-; each of these pointers is for the corresponding map in HiddenObjectMaps
-	dw RedsHouse2FHiddenObjects
-	dw BluesHouseHiddenObjects
-	dw OaksLabHiddenObjects
-	dw ViridianPokecenterHiddenObjects
-	dw ViridianMartHiddenObjects
-	dw ViridianSchoolHiddenObjects
-	dw ViridianGymHiddenObjects
-	dw Museum1FHiddenObjects
-	dw PewterGymHiddenObjects
-	dw PewterMartHiddenObjects
-	dw PewterPokecenterHiddenObjects
-	dw CeruleanPokecenterHiddenObjects
-	dw CeruleanGymHiddenObjects
-	dw CeruleanMartHiddenObjects
-	dw LavenderPokecenterHiddenObjects
-	dw VermilionPokecenterHiddenObjects
-	dw VermilionGymHiddenObjects
-	dw CeladonMansion2HiddenObjects
-	dw CeladonPokecenterHiddenObjects
-	dw CeladonGymHiddenObjects
-	dw GameCornerHiddenObjects
-	dw CeladonHotelHiddenObjects
-	dw FuchsiaPokecenterHiddenObjects
-	dw FuchsiaGymHiddenObjects
-	dw CinnabarGymHiddenObjects
-	dw CinnabarPokecenterHiddenObjects
-	dw SaffronGymHiddenObjects
-	dw MtMoonPokecenterHiddenObjects
-	dw RockTunnelPokecenterHiddenObjects
-	dw TradeCenterHiddenObjects
-	dw ColosseumHiddenObjects
-	dw ViridianForestHiddenObjects
-	dw MtMoon3HiddenObjects
-	dw IndigoPlateauHiddenObjects
-	dw Route25HiddenObjects
-	dw Route9HiddenObjects
-	dw SSAnne6HiddenObjects
-	dw SSAnne10HiddenObjects
-	dw RocketHideout1HiddenObjects
-	dw RocketHideout3HiddenObjects
-	dw RocketHideout4HiddenObjects
-	dw SaffronPokecenterHiddenObjects
-	dw PokemonTower5HiddenObjects
-	dw Route13HiddenObjects
-	dw SafariZoneEntranceHiddenObjects
-	dw SafariZoneWestHiddenObjects
-	dw SilphCo5FHiddenObjects
-	dw SilphCo9FHiddenObjects
-	dw CopycatsHouse2FHiddenObjects
-	dw CeruleanCave1HiddenObjects
-	dw CeruleanCave3HiddenObjects
-	dw PowerPlantHiddenObjects
-	dw SeafoamIslands3HiddenObjects
-	dw SeafoamIslands5HiddenObjects
-	dw Mansion1HiddenObjects
-	dw Mansion3HiddenObjects
-	dw Route23HiddenObjects
-	dw VictoryRoad2HiddenObjects
-	dw Unused6FHiddenObjects
-	dw BillsHouseHiddenObjects
-	dw ViridianCityHiddenObjects
-	dw SafariZoneRestHouse2HiddenObjects
-	dw SafariZoneRestHouse3HiddenObjects
-	dw SafariZoneRestHouse4HiddenObjects
-	dw Route15GateUpstairsHiddenObjects
-	dw LavenderHouse1HiddenObjects
-	dw CeladonMansion5HiddenObjects
-	dw FightingDojoHiddenObjects
-	dw Route10HiddenObjects
-	dw IndigoPlateauLobbyHiddenObjects
-	dw CinnabarLab4HiddenObjects
-	dw BikeShopHiddenObjects
-	dw Route11HiddenObjects
-	dw Route12HiddenObjects
-	dw Mansion2HiddenObjects
-	dw Mansion4HiddenObjects
-	dw SilphCo11FHiddenObjects
-	dw Route17HiddenObjects
-	dw UndergroundPathNsHiddenObjects
-	dw UndergroundPathWeHiddenObjects
-	dw CeladonCityHiddenObjects
-	dw SeafoamIslands4HiddenObjects
-	dw VermilionCityHiddenObjects
-	dw CeruleanCityHiddenObjects
-	dw Route4HiddenObjects
-
-; format: y-coord, x-coord, text id/item id, object routine
-TradeCenterHiddenObjects:
-	db $04,$05,$d0
-	db BANK(CableClubRightGameboy)
-	dw CableClubRightGameboy
-	db $04,$04,$d0
-	db BANK(CableClubLeftGameboy)
-	dw CableClubLeftGameboy
-	db $FF
-ColosseumHiddenObjects:
-	db $04,$05,$d0
-	db BANK(CableClubRightGameboy)
-	dw CableClubRightGameboy
-	db $04,$04,$d0
-	db BANK(CableClubLeftGameboy)
-	dw CableClubLeftGameboy
-	db $FF
-RedsHouse2FHiddenObjects:
-	db $01,$00,$04
-	dbw BANK(OpenRedsPC), OpenRedsPC
-	db $05,$03,$d0
-	dbw BANK(PrintRedSNESText), PrintRedSNESText
-	db $FF
-BluesHouseHiddenObjects:
-	db $01,$00,$04
-	db BANK(PrintBookcaseText)
-	dw PrintBookcaseText
-	db $01,$01,$04
-	db BANK(PrintBookcaseText)
-	dw PrintBookcaseText
-	db $01,$07,$04
-	db BANK(PrintBookcaseText)
-	dw PrintBookcaseText
-	db $FF
-OaksLabHiddenObjects:
-	db $00,$04,$04
-	db BANK(DisplayOakLabLeftPoster)
-	dw DisplayOakLabLeftPoster
-	db $00,$05,$04
-	db BANK(DisplayOakLabRightPoster)
-	dw DisplayOakLabRightPoster
-	db $01,$00,$04
-	db BANK(DisplayOakLabEmailText)
-	dw DisplayOakLabEmailText
-	db $01,$01,$04
-	db BANK(DisplayOakLabEmailText)
-	dw DisplayOakLabEmailText
-	db $FF
-ViridianPokecenterHiddenObjects:
-	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-ViridianMartHiddenObjects:
-	db $FF
-ViridianSchoolHiddenObjects:
-	db $04,$03,(ViridianSchoolNotebook_id - TextPredefs) / 2 + 1
-	db Bank(PrintNotebookText)
-	dw PrintNotebookText
-	db $00,$03,(ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1
-	db BANK(PrintBlackboardLinkCableText)
-	dw PrintBlackboardLinkCableText
-	db $FF
-ViridianGymHiddenObjects:
-	db $0f,$0f,$04
-	dbw BANK(GymStatues),GymStatues
-	db $0f,$12,$04
-	dbw BANK(GymStatues),GymStatues
-	db $FF
-Museum1FHiddenObjects:
-	db $03,$02,$04
-	dbw BANK(AerodactylFossil), AerodactylFossil
-	db $06,$02,$04
-	dbw BANK(KabutopsFossil), KabutopsFossil
-	db $FF
-PewterGymHiddenObjects:
-	db $0a,$03,$04
-	dbw BANK(GymStatues),GymStatues
-	db $0a,$06,$04
-	dbw BANK(GymStatues),GymStatues
-	db $FF
-PewterMartHiddenObjects:
-	db $FF
-PewterPokecenterHiddenObjects:
-	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-CeruleanPokecenterHiddenObjects:
-	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-CeruleanGymHiddenObjects:
-	db $0b,$03,$04
-	dbw BANK(GymStatues),GymStatues
-	db $0b,$06,$04
-	dbw BANK(GymStatues),GymStatues
-	db $FF
-CeruleanMartHiddenObjects:
-	db $FF
-LavenderPokecenterHiddenObjects:
-	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-VermilionPokecenterHiddenObjects:
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $04,$00,$04
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $FF
-VermilionGymHiddenObjects:
-	db $0e,$03,$04
-	dbw BANK(GymStatues), GymStatues
-	db $0e,$06,$04
-	dbw BANK(GymStatues), GymStatues
-	db $01,$06,$00
-	dbw BANK(PrintTrashText), PrintTrashText
-	db $07,$01,$00
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $09,$01,$01
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $0b,$01,$02
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $07,$03,$03
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $09,$03,$04
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $0b,$03,$05
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $07,$05,$06
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $09,$05,$07
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $0b,$05,$08
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $07,$07,$09
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $09,$07,$0a
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $0b,$07,$0b
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $07,$09,$0c
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $09,$09,$0d
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $0b,$09,$0e
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $FF
-CeladonMansion2HiddenObjects:
-	db $05,$00,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-CeladonPokecenterHiddenObjects:
-	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-CeladonGymHiddenObjects:
-	db $0f,$03,$04
-	dbw BANK(GymStatues),GymStatues
-	db $0f,$06,$04
-	dbw BANK(GymStatues),GymStatues
-	db $FF
-GameCornerHiddenObjects:
-	db $0f,$12,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0e,$12,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0d,$12,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0c,$12,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0b,$12,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0a,$12,$ff ; "Someone's Keys"
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0a,$0d,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0b,$0d,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0c,$0d,$fe ; "Out To Lunch"
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0d,$0d,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0e,$0d,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0f,$0d,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0f,$0c,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0e,$0c,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0d,$0c,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0c,$0c,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0b,$0c,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0a,$0c,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0a,$07,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0b,$07,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0c,$07,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0d,$07,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0e,$07,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0f,$07,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0f,$06,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0e,$06,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0d,$06,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0c,$06,$fd ; "Out Of Order"
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0b,$06,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0a,$06,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0a,$01,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0b,$01,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0c,$01,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0d,$01,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0e,$01,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0f,$01,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $08,$00,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $10,$01,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0b,$03,COIN+20
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0e,$03,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0c,$04,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0c,$09,COIN+20
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0f,$09,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0e,$10,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $10,$0a,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $07,$0b,COIN+40
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $08,$0f,COIN+100
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0f,$0c,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $FF
-CeladonHotelHiddenObjects:
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $FF
-FuchsiaPokecenterHiddenObjects:
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $04,$00,$04
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $FF
-FuchsiaGymHiddenObjects:
-	db $0f,$03,$04
-	dbw BANK(GymStatues),GymStatues
-	db $0f,$06,$04
-	dbw BANK(GymStatues),GymStatues
-	db $FF
-CinnabarGymHiddenObjects:
-	db $0d,$11,$04
-	dbw BANK(GymStatues),GymStatues
-	db $07,$0f,$01
-	db Bank(PrintCinnabarQuiz)
-	dw PrintCinnabarQuiz
-	db $01,$0a,$12
-	db Bank(PrintCinnabarQuiz)
-	dw PrintCinnabarQuiz
-	db $07,$09,$13
-	db Bank(PrintCinnabarQuiz)
-	dw PrintCinnabarQuiz
-	db $0d,$09,$14
-	db Bank(PrintCinnabarQuiz)
-	dw PrintCinnabarQuiz
-	db $0d,$01,$05
-	db Bank(PrintCinnabarQuiz)
-	dw PrintCinnabarQuiz
-	db $07,$01,$16
-	db Bank(PrintCinnabarQuiz)
-	dw PrintCinnabarQuiz
-	db $FF
-CinnabarPokecenterHiddenObjects:
-	db $04,$00,$04
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-SaffronGymHiddenObjects:
-	db $0f,$09,$04
-	dbw BANK(GymStatues),GymStatues
-	db $FF
-MtMoonPokecenterHiddenObjects:
-	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-RockTunnelPokecenterHiddenObjects:
-	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-ViridianForestHiddenObjects:
-	db $12,$01,POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $2a,$10,ANTIDOTE
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-MtMoon3HiddenObjects:
-	db $0c,$12,MOON_STONE
-	dbw BANK(HiddenItems),HiddenItems
-	db $09,$21,ETHER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-IndigoPlateauHiddenObjects:
-	db $0d,$08,$ff
-	db BANK(PrintIndigoPlateauHQText)
-	dw PrintIndigoPlateauHQText
-	db $0d,$0b,$00
-	db BANK(PrintIndigoPlateauHQText)
-	dw PrintIndigoPlateauHQText
-	db $FF
-Route25HiddenObjects:
-	db $03,$26,ETHER
-	dbw BANK(HiddenItems),HiddenItems
-	db $01,$0a,ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-Route9HiddenObjects:
-	db $07,$0e,ETHER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-SSAnne6HiddenObjects:
-	db $05,$0d,$00
-	dbw BANK(PrintTrashText), PrintTrashText
-	db $07,$0d,$00
-	dbw BANK(PrintTrashText), PrintTrashText
-	db $09,$0d,GREAT_BALL
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-SSAnne10HiddenObjects:
-	db $01,$03,HYPER_POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-Route10HiddenObjects:
-	db $11,$09,SUPER_POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $35,$10,MAX_ETHER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-RocketHideout1HiddenObjects:
-	db $0f,$15,PP_UP
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-RocketHideout3HiddenObjects:
-	db $11,$1b,NUGGET
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-RocketHideout4HiddenObjects:
-	db $01,$19,SUPER_POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-SaffronPokecenterHiddenObjects:
-	db $04,$00,$04
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-PokemonTower5HiddenObjects:
-	db $0c,$04,ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-Route13HiddenObjects:
-	db $0e,$01,PP_UP
-	dbw BANK(HiddenItems),HiddenItems
-	db $0d,$10,CALCIUM
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-SafariZoneEntranceHiddenObjects:
-	db $01,$0a,NUGGET
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-SafariZoneWestHiddenObjects:
-	db $05,$06,REVIVE
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-SilphCo5FHiddenObjects:
-	db $03,$0c,ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-SilphCo9FHiddenObjects:
-	db $0f,$02,MAX_POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-CopycatsHouse2FHiddenObjects:
-	db $01,$01,NUGGET
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-CeruleanCave1HiddenObjects:
-	db $0b,$0e,RARE_CANDY
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-CeruleanCave3HiddenObjects:
-	db $03,$1b,ULTRA_BALL
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-PowerPlantHiddenObjects:
-	db $10,$11,MAX_ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $01,$0c,PP_UP
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-SeafoamIslands3HiddenObjects:
-	db $0f,$0f,NUGGET
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-SeafoamIslands5HiddenObjects:
-	db $11,$19,ULTRA_BALL
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-Mansion1HiddenObjects:
-	db $10,$08,MOON_STONE
-	dbw BANK(HiddenItems),HiddenItems
-	db $05,$02,$04
-	db BANK(Mansion1Script_Switches)
-	dw Mansion1Script_Switches
-	db $FF
-Mansion2HiddenObjects:
-	db $0b,$02,$04
-	db BANK(Mansion2Script_Switches)
-	dw Mansion2Script_Switches
-	db $FF
-Mansion3HiddenObjects:
-	db $09,$01,MAX_REVIVE
-	dbw BANK(HiddenItems),HiddenItems
-	db $05,$0a,$04
-	db BANK(Mansion3Script_Switches)
-	dw Mansion3Script_Switches
-	db $FF
-Mansion4HiddenObjects:
-	db $09,$01,RARE_CANDY
-	dbw BANK(HiddenItems),HiddenItems
-	db $03,$14,$04
-	db BANK(Mansion4Script_Switches)
-	dw Mansion4Script_Switches
-	db $19,$12,$04
-	db BANK(Mansion4Script_Switches)
-	dw Mansion4Script_Switches
-	db $FF
-Route23HiddenObjects:
-	db $2c,$09,FULL_RESTORE
-	dbw BANK(HiddenItems),HiddenItems
-	db $46,$13,ULTRA_BALL
-	dbw BANK(HiddenItems),HiddenItems
-	db $5a,$08,MAX_ETHER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-VictoryRoad2HiddenObjects:
-	db $02,$05,ULTRA_BALL
-	dbw BANK(HiddenItems),HiddenItems
-	db $07,$1a,FULL_RESTORE
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-Unused6FHiddenObjects:
-	db $0b,$0e,MAX_ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-BillsHouseHiddenObjects:
-	db $04,$01,$04
-	dbw BANK(BillsHousePC), BillsHousePC
-	db $FF
-ViridianCityHiddenObjects:
-	db $04,$0e,POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-SafariZoneRestHouse2HiddenObjects:
-	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-SafariZoneRestHouse3HiddenObjects:
-	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-SafariZoneRestHouse4HiddenObjects:
-	db $04,$00,$08
-	db Bank(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-Route15GateUpstairsHiddenObjects:
-	db $02,$01,$04
-	db BANK(Route15GateLeftBinoculars)
-	dw Route15GateLeftBinoculars
-	db $FF
-LavenderHouse1HiddenObjects:
-	db $01,$00,$00
-	db BANK(PrintMagazinesText)
-	dw PrintMagazinesText
-	db $01,$01,$00
-	db BANK(PrintMagazinesText)
-	dw PrintMagazinesText
-	db $01,$07,$00
-	db BANK(PrintMagazinesText)
-	dw PrintMagazinesText
-	db $FF
-CeladonMansion5HiddenObjects:
-	db $00,$03,(LinkCableHelp_id - TextPredefs) / 2 + 1
-	db BANK(PrintBlackboardLinkCableText)
-	dw PrintBlackboardLinkCableText
-	db $00,$04,(LinkCableHelp_id - TextPredefs) / 2 + 1
-	db BANK(PrintBlackboardLinkCableText)
-	dw PrintBlackboardLinkCableText
-	db $04,$03,(TMNotebook_id - TextPredefs) / 2 + 1
-	db Bank(PrintNotebookText)
-	dw PrintNotebookText
-	db $FF
-FightingDojoHiddenObjects:
-	db $09,$03,$04
-	db BANK(PrintFightingDojoText)
-	dw PrintFightingDojoText
-	db $09,$06,$04
-	db BANK(PrintFightingDojoText)
-	dw PrintFightingDojoText
-	db $00,$04,$04
-	db BANK(PrintFightingDojoText2)
-	dw PrintFightingDojoText2
-	db $00,$05,$04
-	db BANK(PrintFightingDojoText3)
-	dw PrintFightingDojoText3
-	db $FF
-IndigoPlateauLobbyHiddenObjects:
-	db $07,$0f,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-CinnabarLab4HiddenObjects:
-	db $04,$00,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $04,$02,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-BikeShopHiddenObjects:
-	db $00,$01,$d0
-	dbw BANK(PrintNewBikeText), PrintNewBikeText
-	db $01,$02,$d0
-	dbw BANK(PrintNewBikeText), PrintNewBikeText
-	db $02,$01,$d0
-	dbw BANK(PrintNewBikeText), PrintNewBikeText
-	db $02,$03,$d0
-	dbw BANK(PrintNewBikeText), PrintNewBikeText
-	db $04,$00,$d0
-	dbw BANK(PrintNewBikeText), PrintNewBikeText
-	db $05,$01,$d0
-	dbw BANK(PrintNewBikeText), PrintNewBikeText
-	db $FF
-Route11HiddenObjects:
-	db $05,$30,ESCAPE_ROPE
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-Route12HiddenObjects:
-	db $3f,$02,HYPER_POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-SilphCo11FHiddenObjects:
-	db $0c,$0a,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
-Route17HiddenObjects:
-	db $0e,$0f,RARE_CANDY
-	dbw BANK(HiddenItems),HiddenItems
-	db $2d,$08,FULL_RESTORE
-	dbw BANK(HiddenItems),HiddenItems
-	db $48,$11,PP_UP
-	dbw BANK(HiddenItems),HiddenItems
-	db $5b,$04,MAX_REVIVE
-	dbw BANK(HiddenItems),HiddenItems
-	db $79,$08,MAX_ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-UndergroundPathNsHiddenObjects:
-	db $04,$03,FULL_RESTORE
-	dbw BANK(HiddenItems),HiddenItems
-	db $22,$04,X_SPECIAL
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-UndergroundPathWeHiddenObjects:
-	db $02,$0c,NUGGET
-	dbw BANK(HiddenItems),HiddenItems
-	db $05,$15,ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-CeladonCityHiddenObjects:
-	db $0f,$30,PP_UP
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-SeafoamIslands4HiddenObjects:
-	db $10,$09,MAX_ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-VermilionCityHiddenObjects:
-	db $0b,$0e,MAX_ETHER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-CeruleanCityHiddenObjects:
-	db $08,$0f,RARE_CANDY
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
-Route4HiddenObjects:
-	db $03,$28,GREAT_BALL
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm
deleted file mode 100755
index 7f4593ca..00000000
--- a/data/hide_show_data.asm
+++ /dev/null
@@ -1,577 +0,0 @@
-; data for default hidden/shown
-; objects for each map ($00-$F8)
-
-; Table of 2-Byte pointers, one pointer per map,
-; goes up to Map_F7, ends with $FFFF.
-; points to table listing all missable object in the area
-MapHSPointers:
-	dw MapHS00
-	dw MapHS01
-	dw MapHS02
-	dw MapHS03
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS0A
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS0D
-	dw MapHSXX
-	dw MapHS0F
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS14
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS17
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS1A
-	dw MapHS1B
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS21
-	dw MapHSXX
-	dw MapHS23
-	dw MapHS24
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS27
-	dw MapHS28
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS2D
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS33
-	dw MapHS34
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS3B
-	dw MapHSXX
-	dw MapHS3D
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS53
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS58
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS60
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS66
-	dw MapHS67
-	dw MapHS68
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS6C
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS78
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS84
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS87
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS8F
-	dw MapHS90
-	dw MapHS91
-	dw MapHS92
-	dw MapHS93
-	dw MapHS94
-	dw MapHS95
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS9B
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS9F
-	dw MapHSA0
-	dw MapHSA1
-	dw MapHSA2
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSA5
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSB1
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSB5
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSC0
-	dw MapHSXX
-	dw MapHSC2
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSC6
-	dw MapHSC7
-	dw MapHSC8
-	dw MapHSC9
-	dw MapHSCA
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSCF
-	dw MapHSD0
-	dw MapHSD1
-	dw MapHSD2
-	dw MapHSD3
-	dw MapHSD4
-	dw MapHSD5
-	dw MapHSD6
-	dw MapHSD7
-	dw MapHSD8
-	dw MapHSD9
-	dw MapHSDA
-	dw MapHSDB
-	dw MapHSDC
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSE2
-	dw MapHSE3
-	dw MapHSE4
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSE9
-	dw MapHSEA
-	dw MapHSEB
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSF4
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw $FFFF
-
-; Structure:
-; 3 bytes per object
-; [Map_ID][Object_ID][H/S]
-;
-; Program stops reading when either:
-; a) Map_ID = $FF
-; b) Map_ID ≠ currentMapID
-;
-; This Data is loaded into RAM at wd5ce-$D5F?. (wMissableObjectList)
-
-; These constants come from the bytes for Predef functions:
-Hide equ $11
-Show equ $15
-
-MapHSXX:
-	db $FF,$FF,$FF
-MapHS00:
-	db PALLET_TOWN,$01,Hide
-MapHS01:
-	db VIRIDIAN_CITY,$05,Show
-	db VIRIDIAN_CITY,$07,Hide
-MapHS02:
-	db PEWTER_CITY,$03,Show
-	db PEWTER_CITY,$05,Show
-MapHS03:
-	db CERULEAN_CITY,$01,Hide
-	db CERULEAN_CITY,$02,Show
-	db CERULEAN_CITY,$06,Hide
-	db CERULEAN_CITY,$0A,Show
-	db CERULEAN_CITY,$0B,Show
-MapHS0A:
-	db SAFFRON_CITY,$01,Show
-	db SAFFRON_CITY,$02,Show
-	db SAFFRON_CITY,$03,Show
-	db SAFFRON_CITY,$04,Show
-	db SAFFRON_CITY,$05,Show
-	db SAFFRON_CITY,$06,Show
-	db SAFFRON_CITY,$07,Show
-	db SAFFRON_CITY,$08,Hide
-	db SAFFRON_CITY,$09,Hide
-	db SAFFRON_CITY,$0A,Hide
-	db SAFFRON_CITY,$0B,Hide
-	db SAFFRON_CITY,$0C,Hide
-	db SAFFRON_CITY,$0D,Hide
-	db SAFFRON_CITY,$0E,Show
-	db SAFFRON_CITY,$0F,Hide
-MapHS0D:
-	db ROUTE_2,$01,Show
-	db ROUTE_2,$02,Show
-MapHS0F:
-	db ROUTE_4,$03,Show
-MapHS14:
-	db ROUTE_9,$0A,Show
-MapHS17:
-	db ROUTE_12,$01,Show
-	db ROUTE_12,$09,Show
-	db ROUTE_12,$0A,Show
-MapHS1A:
-	db ROUTE_15,$0B,Show
-MapHS1B:
-	db ROUTE_16,$07,Show
-MapHS21:
-	db ROUTE_22,$01,Hide
-	db ROUTE_22,$02,Hide
-MapHS23:
-	db ROUTE_24,$01,Show
-	db ROUTE_24,$08,Show
-MapHS24:
-	db ROUTE_25,$0A,Show
-MapHS27:
-	db BLUES_HOUSE,$01,Show
-	db BLUES_HOUSE,$02,Hide
-	db BLUES_HOUSE,$03,Show
-MapHS28:
-	db OAKS_LAB,$01,Show
-	db OAKS_LAB,$02,Show
-	db OAKS_LAB,$03,Show
-	db OAKS_LAB,$04,Show
-	db OAKS_LAB,$05,Hide
-	db OAKS_LAB,$06,Show
-	db OAKS_LAB,$07,Show
-	db OAKS_LAB,$08,Hide
-MapHS2D:
-	db VIRIDIAN_GYM,$01,Show
-	db VIRIDIAN_GYM,$0B,Show
-MapHS34:
-	db MUSEUM_1F,$05,Show
-MapHSE4:
-	db CERULEAN_CAVE_1F,$01,Show
-	db CERULEAN_CAVE_1F,$02,Show
-	db CERULEAN_CAVE_1F,$03,Show
-MapHS8F:
-	db POKEMON_TOWER_2F,$01,Show
-MapHS90:
-	db POKEMON_TOWER_3F,$04,Show
-MapHS91:
-	db POKEMON_TOWER_4F,$04,Show
-	db POKEMON_TOWER_4F,$05,Show
-	db POKEMON_TOWER_4F,$06,Show
-MapHS92:
-	db POKEMON_TOWER_5F,$06,Show
-MapHS93:
-	db POKEMON_TOWER_6F,$04,Show
-	db POKEMON_TOWER_6F,$05,Show
-MapHS94:
-	db POKEMON_TOWER_7F,$01,Show
-	db POKEMON_TOWER_7F,$02,Show
-	db POKEMON_TOWER_7F,$03,Show
-	db POKEMON_TOWER_7F,$04,Show
-MapHS95:
-	db MR_FUJIS_HOUSE,$05,Hide
-MapHS84:
-	db CELADON_MANSION_ROOF_HOUSE,$02,Show
-MapHS87:
-	db GAME_CORNER,$0B,Show
-MapHS9B:
-	db WARDENS_HOUSE,$02,Show
-MapHSA5:
-	db POKEMON_MANSION_1F,$02,Show
-	db POKEMON_MANSION_1F,$03,Show
-MapHSB1:
-	db FIGHTING_DOJO,$06,Show
-	db FIGHTING_DOJO,$07,Show
-MapHSB5:
-	db SILPH_CO_1F,$01,Hide
-MapHS53:
-	db POWER_PLANT,$01,Show
-	db POWER_PLANT,$02,Show
-	db POWER_PLANT,$03,Show
-	db POWER_PLANT,$04,Show
-	db POWER_PLANT,$05,Show
-	db POWER_PLANT,$06,Show
-	db POWER_PLANT,$07,Show
-	db POWER_PLANT,$08,Show
-	db POWER_PLANT,$09,Show
-	db POWER_PLANT,$0A,Show
-	db POWER_PLANT,$0B,Show
-	db POWER_PLANT,$0C,Show
-	db POWER_PLANT,$0D,Show
-	db POWER_PLANT,$0E,Show
-MapHSC2:
-	db VICTORY_ROAD_2F,$06,Show
-	db VICTORY_ROAD_2F,$07,Show
-	db VICTORY_ROAD_2F,$08,Show
-	db VICTORY_ROAD_2F,$09,Show
-	db VICTORY_ROAD_2F,$0A,Show
-	db VICTORY_ROAD_2F,$0D,Show
-MapHS58:
-	db BILLS_HOUSE,$01,Show
-	db BILLS_HOUSE,$02,Hide
-	db BILLS_HOUSE,$03,Hide
-MapHS33:
-	db VIRIDIAN_FOREST,$05,Show
-	db VIRIDIAN_FOREST,$06,Show
-	db VIRIDIAN_FOREST,$07,Show
-MapHS3B:
-	db MT_MOON_1F,$08,Show
-	db MT_MOON_1F,$09,Show
-	db MT_MOON_1F,$0A,Show
-	db MT_MOON_1F,$0B,Show
-	db MT_MOON_1F,$0C,Show
-	db MT_MOON_1F,$0D,Show
-MapHS3D:
-	db MT_MOON_B2F,$06,Show
-	db MT_MOON_B2F,$07,Show
-	db MT_MOON_B2F,$08,Show
-	db MT_MOON_B2F,$09,Show
-MapHS60:
-	db SS_ANNE_2F,$02,Hide
-MapHS66:
-	db SS_ANNE_1F_ROOMS,$0A,Show
-MapHS67:
-	db SS_ANNE_2F_ROOMS,$06,Show
-	db SS_ANNE_2F_ROOMS,$09,Show
-MapHS68:
-	db SS_ANNE_B1F_ROOMS,$09,Show
-	db SS_ANNE_B1F_ROOMS,$0A,Show
-	db SS_ANNE_B1F_ROOMS,$0B,Show
-MapHSC6:
-	db VICTORY_ROAD_3F,$05,Show
-	db VICTORY_ROAD_3F,$06,Show
-	db VICTORY_ROAD_3F,$0A,Show
-MapHSC7:
-	db ROCKET_HIDEOUT_B1F,$06,Show
-	db ROCKET_HIDEOUT_B1F,$07,Show
-MapHSC8:
-	db ROCKET_HIDEOUT_B2F,$02,Show
-	db ROCKET_HIDEOUT_B2F,$03,Show
-	db ROCKET_HIDEOUT_B2F,$04,Show
-	db ROCKET_HIDEOUT_B2F,$05,Show
-MapHSC9:
-	db ROCKET_HIDEOUT_B3F,$03,Show
-	db ROCKET_HIDEOUT_B3F,$04,Show
-MapHSCA:
-	db ROCKET_HIDEOUT_B4F,$01,Show
-	db ROCKET_HIDEOUT_B4F,$05,Show
-	db ROCKET_HIDEOUT_B4F,$06,Show
-	db ROCKET_HIDEOUT_B4F,$07,Show
-	db ROCKET_HIDEOUT_B4F,$08,Hide
-	db ROCKET_HIDEOUT_B4F,$09,Hide
-MapHSCF:
-	db SILPH_CO_2F,$01,Show
-	db SILPH_CO_2F,$02,Show
-	db SILPH_CO_2F,$03,Show
-	db SILPH_CO_2F,$04,Show
-	db SILPH_CO_2F,$05,Show
-MapHSD0:
-	db SILPH_CO_3F,$02,Show
-	db SILPH_CO_3F,$03,Show
-	db SILPH_CO_3F,$04,Show
-MapHSD1:
-	db SILPH_CO_4F,$02,Show
-	db SILPH_CO_4F,$03,Show
-	db SILPH_CO_4F,$04,Show
-	db SILPH_CO_4F,$05,Show
-	db SILPH_CO_4F,$06,Show
-	db SILPH_CO_4F,$07,Show
-MapHSD2:
-	db SILPH_CO_5F,$02,Show
-	db SILPH_CO_5F,$03,Show
-	db SILPH_CO_5F,$04,Show
-	db SILPH_CO_5F,$05,Show
-	db SILPH_CO_5F,$06,Show
-	db SILPH_CO_5F,$07,Show
-	db SILPH_CO_5F,$08,Show
-MapHSD3:
-	db SILPH_CO_6F,$06,Show
-	db SILPH_CO_6F,$07,Show
-	db SILPH_CO_6F,$08,Show
-	db SILPH_CO_6F,$09,Show
-	db SILPH_CO_6F,$0A,Show
-MapHSD4:
-	db SILPH_CO_7F,$05,Show
-	db SILPH_CO_7F,$06,Show
-	db SILPH_CO_7F,$07,Show
-	db SILPH_CO_7F,$08,Show
-	db SILPH_CO_7F,$09,Show
-	db SILPH_CO_7F,$0A,Show
-	db SILPH_CO_7F,$0B,Show
-	db SILPH_CO_7F,$0C,Show
-MapHSD5:
-	db SILPH_CO_8F,$02,Show
-	db SILPH_CO_8F,$03,Show
-	db SILPH_CO_8F,$04,Show
-MapHSE9:
-	db SILPH_CO_9F,$02,Show
-	db SILPH_CO_9F,$03,Show
-	db SILPH_CO_9F,$04,Show
-MapHSEA:
-	db SILPH_CO_10F,$01,Show
-	db SILPH_CO_10F,$02,Show
-	db SILPH_CO_10F,$03,Show
-	db SILPH_CO_10F,$04,Show
-	db SILPH_CO_10F,$05,Show
-	db SILPH_CO_10F,$06,Show
-MapHSEB:
-	db SILPH_CO_11F,$03,Show
-	db SILPH_CO_11F,$04,Show
-	db SILPH_CO_11F,$05,Show
-MapHSF4:
-	db UNUSED_MAP_F4,$02,Show
-MapHSD6:
-	db POKEMON_MANSION_2F,$02,Show
-MapHSD7:
-	db POKEMON_MANSION_3F,$03,Show
-	db POKEMON_MANSION_3F,$04,Show
-MapHSD8:
-	db POKEMON_MANSION_B1F,$03,Show
-	db POKEMON_MANSION_B1F,$04,Show
-	db POKEMON_MANSION_B1F,$05,Show
-	db POKEMON_MANSION_B1F,$06,Show
-	db POKEMON_MANSION_B1F,$08,Show
-MapHSD9:
-	db SAFARI_ZONE_EAST,$01,Show
-	db SAFARI_ZONE_EAST,$02,Show
-	db SAFARI_ZONE_EAST,$03,Show
-	db SAFARI_ZONE_EAST,$04,Show
-MapHSDA:
-	db SAFARI_ZONE_NORTH,$01,Show
-	db SAFARI_ZONE_NORTH,$02,Show
-MapHSDB:
-	db SAFARI_ZONE_WEST,$01,Show
-	db SAFARI_ZONE_WEST,$02,Show
-	db SAFARI_ZONE_WEST,$03,Show
-	db SAFARI_ZONE_WEST,$04,Show
-MapHSDC:
-	db SAFARI_ZONE_CENTER,$01,Show
-MapHSE2:
-	db CERULEAN_CAVE_2F,$01,Show
-	db CERULEAN_CAVE_2F,$02,Show
-	db CERULEAN_CAVE_2F,$03,Show
-MapHSE3:
-	db CERULEAN_CAVE_B1F,$01,Show
-	db CERULEAN_CAVE_B1F,$02,Show
-	db CERULEAN_CAVE_B1F,$03,Show
-MapHS6C:
-	db VICTORY_ROAD_1F,$03,Show
-	db VICTORY_ROAD_1F,$04,Show
-MapHS78:
-	db CHAMPIONS_ROOM,$02,Hide
-MapHSC0:
-	db SEAFOAM_ISLANDS_1F,$01,Show
-	db SEAFOAM_ISLANDS_1F,$02,Show
-MapHS9F:
-	db SEAFOAM_ISLANDS_B1F,$01,Hide
-	db SEAFOAM_ISLANDS_B1F,$02,Hide
-MapHSA0:
-	db SEAFOAM_ISLANDS_B2F,$01,Hide
-	db SEAFOAM_ISLANDS_B2F,$02,Hide
-MapHSA1:
-	db SEAFOAM_ISLANDS_B3F,$02,Show
-	db SEAFOAM_ISLANDS_B3F,$03,Show
-	db SEAFOAM_ISLANDS_B3F,$05,Hide
-	db SEAFOAM_ISLANDS_B3F,$06,Hide
-MapHSA2:
-	db SEAFOAM_ISLANDS_B4F,$01,Hide
-	db SEAFOAM_ISLANDS_B4F,$02,Hide
-	db SEAFOAM_ISLANDS_B4F,$03,Show
-
-	db $FF,$01,Show
diff --git a/data/hm_moves.asm b/data/hm_moves.asm
deleted file mode 100644
index d72eddfe..00000000
--- a/data/hm_moves.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-HMMoveArray:
-	db CUT
-	db FLY
-	db SURF
-	db STRENGTH
-	db FLASH
-	db -1
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/mapHeaders/AgathasRoom.asm b/data/mapHeaders/AgathasRoom.asm
deleted file mode 100755
index 6e31225c..00000000
--- a/data/mapHeaders/AgathasRoom.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-AgathasRoom_h::
-	db CEMETERY ; tileset
-	db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x)
-	dw AgathasRoom_Blocks ; blocks
-	dw AgathasRoom_TextPointers ; texts
-	dw AgathasRoom_Script ; scripts
-	db 0 ; connections
-	dw AgathasRoom_Object ; objects
diff --git a/data/mapHeaders/BikeShop.asm b/data/mapHeaders/BikeShop.asm
deleted file mode 100755
index ea6f8d60..00000000
--- a/data/mapHeaders/BikeShop.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-BikeShop_h::
-	db CLUB ; tileset
-	db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x)
-	dw BikeShop_Blocks ; blocks
-	dw BikeShop_TextPointers ; texts
-	dw BikeShop_Script ; scripts
-	db 0 ; connections
-	dw BikeShop_Object ; objects
diff --git a/data/mapHeaders/BillsHouse.asm b/data/mapHeaders/BillsHouse.asm
deleted file mode 100755
index e58cbd5b..00000000
--- a/data/mapHeaders/BillsHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-BillsHouse_h::
-	db INTERIOR ; tileset
-	db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x)
-	dw BillsHouse_Blocks ; blocks
-	dw BillsHouse_TextPointers ; texts
-	dw BillsHouse_Script ; scripts
-	db 0 ; connections
-	dw BillsHouse_Object ; objects
diff --git a/data/mapHeaders/BluesHouse.asm b/data/mapHeaders/BluesHouse.asm
deleted file mode 100755
index bc9ed3de..00000000
--- a/data/mapHeaders/BluesHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-BluesHouse_h::
-	db HOUSE ; tileset
-	db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions (y, x)
-	dw BluesHouse_Blocks ; blocks
-	dw BluesHouse_TextPointers ; texts
-	dw BluesHouse_Script ; scripts
-	db 0 ; connections
-	dw BluesHouse_Object ; objects
diff --git a/data/mapHeaders/BrunosRoom.asm b/data/mapHeaders/BrunosRoom.asm
deleted file mode 100755
index 03398603..00000000
--- a/data/mapHeaders/BrunosRoom.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-BrunosRoom_h::
-	db GYM ; tileset
-	db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x)
-	dw BrunosRoom_Blocks ; blocks
-	dw BrunosRoom_TextPointers ; texts
-	dw BrunosRoom_Script ; scripts
-	db 0 ; connections
-	dw BrunosRoom_Object ; objects
diff --git a/data/mapHeaders/CeladonChiefHouse.asm b/data/mapHeaders/CeladonChiefHouse.asm
deleted file mode 100755
index e29f722f..00000000
--- a/data/mapHeaders/CeladonChiefHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonChiefHouse_h::
-	db MANSION ; tileset
-	db CELADON_CHIEF_HOUSE_HEIGHT, CELADON_CHIEF_HOUSE_WIDTH ; dimensions (y, x)
-	dw CeladonChiefHouse_Blocks ; blocks
-	dw CeladonChiefHouse_TextPointers ; texts
-	dw CeladonChiefHouse_Script ; scripts
-	db 0 ; connections
-	dw CeladonChiefHouse_Object ; objects
diff --git a/data/mapHeaders/CeladonCity.asm b/data/mapHeaders/CeladonCity.asm
deleted file mode 100755
index f2ce1831..00000000
--- a/data/mapHeaders/CeladonCity.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-CeladonCity_h::
-	db OVERWORLD ; tileset
-	db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x)
-	dw CeladonCity_Blocks ; blocks
-	dw CeladonCity_TextPointers ; texts
-	dw CeladonCity_Script ; scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION CELADON_CITY, ROUTE_16, 4, 0, Route16_Blocks
-	EAST_MAP_CONNECTION CELADON_CITY, ROUTE_7, 4, 0, Route7_Blocks, 1
-	dw CeladonCity_Object ; objects
diff --git a/data/mapHeaders/CeladonDiner.asm b/data/mapHeaders/CeladonDiner.asm
deleted file mode 100755
index 14501d83..00000000
--- a/data/mapHeaders/CeladonDiner.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonDiner_h::
-	db LOBBY ; tileset
-	db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x)
-	dw CeladonDiner_Blocks ; blocks
-	dw CeladonDiner_TextPointers ; texts
-	dw CeladonDiner_Script ; scripts
-	db 0 ; connections
-	dw CeladonDiner_Object ; objects
diff --git a/data/mapHeaders/CeladonGym.asm b/data/mapHeaders/CeladonGym.asm
deleted file mode 100755
index b64c5e19..00000000
--- a/data/mapHeaders/CeladonGym.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonGym_h::
-	db GYM ; tileset
-	db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x)
-	dw CeladonGym_Blocks ; blocks
-	dw CeladonGym_TextPointers ; texts
-	dw CeladonGym_Script ; scripts
-	db 0 ; connections
-	dw CeladonGym_Object ; objects
diff --git a/data/mapHeaders/CeladonHotel.asm b/data/mapHeaders/CeladonHotel.asm
deleted file mode 100755
index ecc943c2..00000000
--- a/data/mapHeaders/CeladonHotel.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonHotel_h::
-	db POKECENTER ; tileset
-	db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x)
-	dw CeladonHotel_Blocks ; blocks
-	dw CeladonHotel_TextPointers ; texts
-	dw CeladonHotel_Script ; scripts
-	db 0 ; connections
-	dw CeladonHotel_Object ; objects
diff --git a/data/mapHeaders/CeladonMansion1F.asm b/data/mapHeaders/CeladonMansion1F.asm
deleted file mode 100755
index b13f76a7..00000000
--- a/data/mapHeaders/CeladonMansion1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonMansion1F_h::
-	db MANSION ; tileset
-	db CELADON_MANSION_1F_HEIGHT, CELADON_MANSION_1F_WIDTH ; dimensions (y, x)
-	dw CeladonMansion1F_Blocks ; blocks
-	dw CeladonMansion1F_TextPointers ; texts
-	dw CeladonMansion1F_Script ; scripts
-	db 0 ; connections
-	dw CeladonMansion1F_Object ; objects
diff --git a/data/mapHeaders/CeladonMansion2F.asm b/data/mapHeaders/CeladonMansion2F.asm
deleted file mode 100755
index 33493510..00000000
--- a/data/mapHeaders/CeladonMansion2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonMansion2F_h::
-	db MANSION ; tileset
-	db CELADON_MANSION_2F_HEIGHT, CELADON_MANSION_2F_WIDTH ; dimensions (y, x)
-	dw CeladonMansion2F_Blocks ; blocks
-	dw CeladonMansion2F_TextPointers ; texts
-	dw CeladonMansion2F_Script ; scripts
-	db 0 ; connections
-	dw CeladonMansion2F_Object ; objects
diff --git a/data/mapHeaders/CeladonMansion3F.asm b/data/mapHeaders/CeladonMansion3F.asm
deleted file mode 100755
index 89d0cfe6..00000000
--- a/data/mapHeaders/CeladonMansion3F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonMansion3F_h::
-	db MANSION ; tileset
-	db CELADON_MANSION_3F_HEIGHT, CELADON_MANSION_3F_WIDTH ; dimensions (y, x)
-	dw CeladonMansion3F_Blocks ; blocks
-	dw CeladonMansion3F_TextPointers ; texts
-	dw CeladonMansion3F_Script ; scripts
-	db 0 ; connections
-	dw CeladonMansion3F_Object ; objects
diff --git a/data/mapHeaders/CeladonMansionRoof.asm b/data/mapHeaders/CeladonMansionRoof.asm
deleted file mode 100755
index 7f7fa4ac..00000000
--- a/data/mapHeaders/CeladonMansionRoof.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonMansionRoof_h::
-	db MANSION ; tileset
-	db CELADON_MANSION_ROOF_HEIGHT, CELADON_MANSION_ROOF_WIDTH ; dimensions (y, x)
-	dw CeladonMansionRoof_Blocks ; blocks
-	dw CeladonMansionRoof_TextPointers ; texts
-	dw CeladonMansionRoof_Script ; scripts
-	db 0 ; connections
-	dw CeladonMansionRoof_Object ; objects
diff --git a/data/mapHeaders/CeladonMansionRoofHouse.asm b/data/mapHeaders/CeladonMansionRoofHouse.asm
deleted file mode 100755
index de6771b7..00000000
--- a/data/mapHeaders/CeladonMansionRoofHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonMansionRoofHouse_h::
-	db HOUSE ; tileset
-	db CELADON_MANSION_ROOF_HOUSE_HEIGHT, CELADON_MANSION_ROOF_HOUSE_WIDTH ; dimensions (y, x)
-	dw CeladonMansionRoofHouse_Blocks ; blocks
-	dw CeladonMansionRoofHouse_TextPointers ; texts
-	dw CeladonMansionRoofHouse_Script ; scripts
-	db 0 ; connections
-	dw CeladonMansionRoofHouse_Object ; objects
diff --git a/data/mapHeaders/CeladonMart1F.asm b/data/mapHeaders/CeladonMart1F.asm
deleted file mode 100755
index d392f8a7..00000000
--- a/data/mapHeaders/CeladonMart1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonMart1F_h::
-	db LOBBY ; tileset
-	db CELADON_MART_1F_HEIGHT, CELADON_MART_1F_WIDTH ; dimensions (y, x)
-	dw CeladonMart1F_Blocks ; blocks
-	dw CeladonMart1F_TextPointers ; texts
-	dw CeladonMart1F_Script ; scripts
-	db 0 ; connections
-	dw CeladonMart1F_Object ; objects
diff --git a/data/mapHeaders/CeladonMart2F.asm b/data/mapHeaders/CeladonMart2F.asm
deleted file mode 100755
index ff39a08c..00000000
--- a/data/mapHeaders/CeladonMart2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonMart2F_h::
-	db LOBBY ; tileset
-	db CELADON_MART_2F_HEIGHT, CELADON_MART_2F_WIDTH ; dimensions (y, x)
-	dw CeladonMart2F_Blocks ; blocks
-	dw CeladonMart2F_TextPointers ; texts
-	dw CeladonMart2F_Script ; scripts
-	db 0 ; connections
-	dw CeladonMart2F_Object ; objects
diff --git a/data/mapHeaders/CeladonMart3F.asm b/data/mapHeaders/CeladonMart3F.asm
deleted file mode 100755
index 2bdd384f..00000000
--- a/data/mapHeaders/CeladonMart3F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonMart3F_h::
-	db LOBBY ; tileset
-	db CELADON_MART_3F_HEIGHT, CELADON_MART_3F_WIDTH ; dimensions (y, x)
-	dw CeladonMart3F_Blocks ; blocks
-	dw CeladonMart3F_TextPointers ; texts
-	dw CeladonMart3F_Script ; scripts
-	db 0 ; connections
-	dw CeladonMart3F_Object ; objects
diff --git a/data/mapHeaders/CeladonMart4F.asm b/data/mapHeaders/CeladonMart4F.asm
deleted file mode 100755
index d03bde7a..00000000
--- a/data/mapHeaders/CeladonMart4F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonMart4F_h::
-	db LOBBY ; tileset
-	db CELADON_MART_4F_HEIGHT, CELADON_MART_4F_WIDTH ; dimensions (y, x)
-	dw CeladonMart4F_Blocks ; blocks
-	dw CeladonMart4F_TextPointers ; texts
-	dw CeladonMart4F_Script ; scripts
-	db 0 ; connections
-	dw CeladonMart4F_Object ; objects
diff --git a/data/mapHeaders/CeladonMart5F.asm b/data/mapHeaders/CeladonMart5F.asm
deleted file mode 100755
index e0f9c436..00000000
--- a/data/mapHeaders/CeladonMart5F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonMart5F_h::
-	db LOBBY ; tileset
-	db CELADON_MART_5F_HEIGHT, CELADON_MART_5F_WIDTH ; dimensions (y, x)
-	dw CeladonMart5F_Blocks ; blocks
-	dw CeladonMart5F_TextPointers ; texts
-	dw CeladonMart5F_Script ; scripts
-	db 0 ; connections
-	dw CeladonMart5F_Object ; objects
diff --git a/data/mapHeaders/CeladonMartElevator.asm b/data/mapHeaders/CeladonMartElevator.asm
deleted file mode 100755
index 391f65fd..00000000
--- a/data/mapHeaders/CeladonMartElevator.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonMartElevator_h::
-	db LOBBY ; tileset
-	db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x)
-	dw CeladonMartElevator_Blocks ; blocks
-	dw CeladonMartElevator_TextPointers ; texts
-	dw CeladonMartElevator_Script ; scripts
-	db 0 ; connections
-	dw CeladonMartElevator_Object ; objects
diff --git a/data/mapHeaders/CeladonMartRoof.asm b/data/mapHeaders/CeladonMartRoof.asm
deleted file mode 100755
index 38f863f1..00000000
--- a/data/mapHeaders/CeladonMartRoof.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonMartRoof_h::
-	db LOBBY ; tileset
-	db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x)
-	dw CeladonMartRoof_Blocks ; blocks
-	dw CeladonMartRoof_TextPointers ; texts
-	dw CeladonMartRoof_Script ; scripts
-	db 0 ; connections
-	dw CeladonMartRoof_Object ; objects
diff --git a/data/mapHeaders/CeladonPokecenter.asm b/data/mapHeaders/CeladonPokecenter.asm
deleted file mode 100755
index 5b945d50..00000000
--- a/data/mapHeaders/CeladonPokecenter.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonPokecenter_h::
-	db POKECENTER ; tileset
-	db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x)
-	dw CeladonPokecenter_Blocks ; blocks
-	dw CeladonPokecenter_TextPointers ; texts
-	dw CeladonPokecenter_Script ; scripts
-	db 0 ; connections
-	dw CeladonPokecenter_Object ; objects
diff --git a/data/mapHeaders/CeruleanBadgeHouse.asm b/data/mapHeaders/CeruleanBadgeHouse.asm
deleted file mode 100755
index eaf77bb7..00000000
--- a/data/mapHeaders/CeruleanBadgeHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeruleanBadgeHouse_h::
-	db SHIP ; tileset
-	db CERULEAN_BADGE_HOUSE_HEIGHT, CERULEAN_BADGE_HOUSE_WIDTH ; dimensions (y, x)
-	dw CeruleanBadgeHouse_Blocks ; blocks
-	dw CeruleanBadgeHouse_TextPointers ; texts
-	dw CeruleanBadgeHouse_Script ; scripts
-	db 0 ; connections
-	dw CeruleanBadgeHouse_Object ; objects
diff --git a/data/mapHeaders/CeruleanCave1F.asm b/data/mapHeaders/CeruleanCave1F.asm
deleted file mode 100755
index 0ab0ecf0..00000000
--- a/data/mapHeaders/CeruleanCave1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeruleanCave1F_h::
-	db CAVERN ; tileset
-	db CERULEAN_CAVE_1F_HEIGHT, CERULEAN_CAVE_1F_WIDTH ; dimensions (y, x)
-	dw CeruleanCave1F_Blocks ; blocks
-	dw CeruleanCave1F_TextPointers ; texts
-	dw CeruleanCave1F_Script ; scripts
-	db 0 ; connections
-	dw CeruleanCave1F_Object ; objects
diff --git a/data/mapHeaders/CeruleanCave2F.asm b/data/mapHeaders/CeruleanCave2F.asm
deleted file mode 100755
index 4002e73a..00000000
--- a/data/mapHeaders/CeruleanCave2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeruleanCave2F_h::
-	db CAVERN ; tileset
-	db CERULEAN_CAVE_2F_HEIGHT, CERULEAN_CAVE_2F_WIDTH ; dimensions (y, x)
-	dw CeruleanCave2F_Blocks ; blocks
-	dw CeruleanCave2F_TextPointers ; texts
-	dw CeruleanCave2F_Script ; scripts
-	db 0 ; connections
-	dw CeruleanCave2F_Object ; objects
diff --git a/data/mapHeaders/CeruleanCaveB1F.asm b/data/mapHeaders/CeruleanCaveB1F.asm
deleted file mode 100755
index e3e9980f..00000000
--- a/data/mapHeaders/CeruleanCaveB1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeruleanCaveB1F_h::
-	db CAVERN ; tileset
-	db CERULEAN_CAVE_B1F_HEIGHT, CERULEAN_CAVE_B1F_WIDTH ; dimensions (y, x)
-	dw CeruleanCaveB1F_Blocks ; blocks
-	dw CeruleanCaveB1F_TextPointers ; texts
-	dw CeruleanCaveB1F_Script ; scripts
-	db 0 ; connections
-	dw CeruleanCaveB1F_Object ; objects
diff --git a/data/mapHeaders/CeruleanCity.asm b/data/mapHeaders/CeruleanCity.asm
deleted file mode 100755
index 23206c0a..00000000
--- a/data/mapHeaders/CeruleanCity.asm
+++ /dev/null
@@ -1,12 +0,0 @@
-CeruleanCity_h::
-	db OVERWORLD ; tileset
-	db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x)
-	dw CeruleanCity_Blocks ; blocks
-	dw CeruleanCity_TextPointers ; texts
-	dw CeruleanCity_Script ; scripts
-	db NORTH | SOUTH | WEST | EAST ; connections
-	NORTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_24, 5, 0, Route24_Blocks
-	SOUTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_5, 5, 0, Route5_Blocks, 1
-	WEST_MAP_CONNECTION CERULEAN_CITY, ROUTE_4, 4, 0, Route4_Blocks
-	EAST_MAP_CONNECTION CERULEAN_CITY, ROUTE_9, 4, 0, Route9_Blocks
-	dw CeruleanCity_Object ; objects
diff --git a/data/mapHeaders/CeruleanGym.asm b/data/mapHeaders/CeruleanGym.asm
deleted file mode 100755
index 32bb563f..00000000
--- a/data/mapHeaders/CeruleanGym.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeruleanGym_h::
-	db GYM ; tileset
-	db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x)
-	dw CeruleanGym_Blocks ; blocks
-	dw CeruleanGym_TextPointers ; texts
-	dw CeruleanGym_Script ; scripts
-	db 0 ; connections
-	dw CeruleanGym_Object ; objects
diff --git a/data/mapHeaders/CeruleanMart.asm b/data/mapHeaders/CeruleanMart.asm
deleted file mode 100755
index 106b664c..00000000
--- a/data/mapHeaders/CeruleanMart.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeruleanMart_h::
-	db MART ; tileset
-	db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x)
-	dw CeruleanMart_Blocks ; blocks
-	dw CeruleanMart_TextPointers ; texts
-	dw CeruleanMart_Script ; scripts
-	db 0 ; connections
-	dw CeruleanMart_Object ; objects
diff --git a/data/mapHeaders/CeruleanPokecenter.asm b/data/mapHeaders/CeruleanPokecenter.asm
deleted file mode 100755
index d81c0183..00000000
--- a/data/mapHeaders/CeruleanPokecenter.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeruleanPokecenter_h::
-	db POKECENTER ; tileset
-	db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x)
-	dw CeruleanPokecenter_Blocks ; blocks
-	dw CeruleanPokecenter_TextPointers ; texts
-	dw CeruleanPokecenter_Script ; scripts
-	db 0 ; connections
-	dw CeruleanPokecenter_Object ; objects
diff --git a/data/mapHeaders/CeruleanTradeHouse.asm b/data/mapHeaders/CeruleanTradeHouse.asm
deleted file mode 100755
index 171586fa..00000000
--- a/data/mapHeaders/CeruleanTradeHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeruleanTradeHouse_h::
-	db HOUSE ; tileset
-	db CERULEAN_TRADE_HOUSE_HEIGHT, CERULEAN_TRADE_HOUSE_WIDTH ; dimensions (y, x)
-	dw CeruleanTradeHouse_Blocks ; blocks
-	dw CeruleanTradeHouse_TextPointers ; texts
-	dw CeruleanTradeHouse_Script ; scripts
-	db 0 ; connections
-	dw CeruleanTradeHouse_Object ; objects
diff --git a/data/mapHeaders/CeruleanTrashedHouse.asm b/data/mapHeaders/CeruleanTrashedHouse.asm
deleted file mode 100755
index b9d53cdb..00000000
--- a/data/mapHeaders/CeruleanTrashedHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeruleanTrashedHouse_h::
-	db HOUSE ; tileset
-	db CERULEAN_TRASHED_HOUSE_HEIGHT, CERULEAN_TRASHED_HOUSE_WIDTH ; dimensions (y, x)
-	dw CeruleanTrashedHouse_Blocks ; blocks
-	dw CeruleanTrashedHouse_TextPointers ; texts
-	dw CeruleanTrashedHouse_Script ; scripts
-	db 0 ; connections
-	dw CeruleanTrashedHouse_Object ; objects
diff --git a/data/mapHeaders/ChampionsRoom.asm b/data/mapHeaders/ChampionsRoom.asm
deleted file mode 100755
index c6794804..00000000
--- a/data/mapHeaders/ChampionsRoom.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-ChampionsRoom_h::
-	db GYM ; tileset
-	db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; dimensions (y, x)
-	dw ChampionsRoom_Blocks ; blocks
-	dw ChampionsRoom_TextPointers ; texts
-	dw ChampionsRoom_Script ; scripts
-	db $0 ; connections
-	dw ChampionsRoom_Object ; objects
diff --git a/data/mapHeaders/CinnabarGym.asm b/data/mapHeaders/CinnabarGym.asm
deleted file mode 100755
index 96154af7..00000000
--- a/data/mapHeaders/CinnabarGym.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CinnabarGym_h::
-	db FACILITY ; tileset
-	db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x)
-	dw CinnabarGym_Blocks ; blocks
-	dw CinnabarGym_TextPointers ; texts
-	dw CinnabarGym_Script ; scripts
-	db 0 ; connections
-	dw CinnabarGym_Object ; objects
diff --git a/data/mapHeaders/CinnabarIsland.asm b/data/mapHeaders/CinnabarIsland.asm
deleted file mode 100755
index 3489fe3c..00000000
--- a/data/mapHeaders/CinnabarIsland.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-CinnabarIsland_h::
-	db OVERWORLD ; tileset
-	db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x)
-	dw CinnabarIsland_Blocks ; blocks
-	dw CinnabarIsland_TextPointers ; texts
-	dw CinnabarIsland_Script ; scripts
-	db NORTH | EAST ; connections
-	NORTH_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_21, 0, 0, Route21_Blocks
-	EAST_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_20, 0, 0, Route20_Blocks
-	dw CinnabarIsland_Object ; objects
diff --git a/data/mapHeaders/CinnabarLab.asm b/data/mapHeaders/CinnabarLab.asm
deleted file mode 100755
index ffa3a037..00000000
--- a/data/mapHeaders/CinnabarLab.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CinnabarLab_h::
-	db LAB ; tileset
-	db CINNABAR_LAB_HEIGHT, CINNABAR_LAB_WIDTH ; dimensions (y, x)
-	dw CinnabarLab_Blocks ; blocks
-	dw CinnabarLab_TextPointers ; texts
-	dw CinnabarLab_Script ; scripts
-	db 0 ; connections
-	dw CinnabarLab_Object ; objects
diff --git a/data/mapHeaders/CinnabarLabFossilRoom.asm b/data/mapHeaders/CinnabarLabFossilRoom.asm
deleted file mode 100755
index 8e833f70..00000000
--- a/data/mapHeaders/CinnabarLabFossilRoom.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CinnabarLabFossilRoom_h::
-	db LAB ; tileset
-	db CINNABAR_LAB_FOSSIL_ROOM_HEIGHT, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; dimensions (y, x)
-	dw CinnabarLabFossilRoom_Blocks ; blocks
-	dw CinnabarLabFossilRoom_TextPointers ; texts
-	dw CinnabarLabFossilRoom_Script ; scripts
-	db 0 ; connections
-	dw CinnabarLabFossilRoom_Object ; objects
diff --git a/data/mapHeaders/CinnabarLabMetronomeRoom.asm b/data/mapHeaders/CinnabarLabMetronomeRoom.asm
deleted file mode 100755
index 35169504..00000000
--- a/data/mapHeaders/CinnabarLabMetronomeRoom.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CinnabarLabMetronomeRoom_h::
-	db LAB ; tileset
-	db CINNABAR_LAB_METRONOME_ROOM_HEIGHT, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; dimensions (y, x)
-	dw CinnabarLabMetronomeRoom_Blocks ; blocks
-	dw CinnabarLabMetronomeRoom_TextPointers ; texts
-	dw CinnabarLabMetronomeRoom_Script ; scripts
-	db 0 ; connections
-	dw CinnabarLabMetronomeRoom_Object ; objects
diff --git a/data/mapHeaders/CinnabarLabTradeRoom.asm b/data/mapHeaders/CinnabarLabTradeRoom.asm
deleted file mode 100755
index a18e6eed..00000000
--- a/data/mapHeaders/CinnabarLabTradeRoom.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CinnabarLabTradeRoom_h::
-	db LAB ; tileset
-	db CINNABAR_LAB_TRADE_ROOM_HEIGHT, CINNABAR_LAB_TRADE_ROOM_WIDTH ; dimensions (y, x)
-	dw CinnabarLabTradeRoom_Blocks ; blocks
-	dw CinnabarLabTradeRoom_TextPointers ; texts
-	dw CinnabarLabTradeRoom_Script ; scripts
-	db 0 ; connections
-	dw CinnabarLabTradeRoom_Object ; objects
diff --git a/data/mapHeaders/CinnabarMart.asm b/data/mapHeaders/CinnabarMart.asm
deleted file mode 100755
index aac1c69f..00000000
--- a/data/mapHeaders/CinnabarMart.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CinnabarMart_h::
-	db MART ; tileset
-	db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x)
-	dw CinnabarMart_Blocks ; blocks
-	dw CinnabarMart_TextPointers ; texts
-	dw CinnabarMart_Script ; scripts
-	db 0 ; connections
-	dw CinnabarMart_Object ; objects
diff --git a/data/mapHeaders/CinnabarPokecenter.asm b/data/mapHeaders/CinnabarPokecenter.asm
deleted file mode 100755
index d9ade14c..00000000
--- a/data/mapHeaders/CinnabarPokecenter.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CinnabarPokecenter_h::
-	db POKECENTER ; tileset
-	db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x)
-	dw CinnabarPokecenter_Blocks ; blocks
-	dw CinnabarPokecenter_TextPointers ; texts
-	dw CinnabarPokecenter_Script ; scripts
-	db 0 ; connections
-	dw CinnabarPokecenter_Object ; objects
diff --git a/data/mapHeaders/Colosseum.asm b/data/mapHeaders/Colosseum.asm
deleted file mode 100755
index 3375e0f1..00000000
--- a/data/mapHeaders/Colosseum.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Colosseum_h::
-	db CLUB ; tileset
-	db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x)
-	dw Colosseum_Blocks ; blocks
-	dw Colosseum_TextPointers ; texts
-	dw Colosseum_Script ; scripts
-	db 0 ; connections
-	dw Colosseum_Object ; objects
diff --git a/data/mapHeaders/CopycatsHouse1F.asm b/data/mapHeaders/CopycatsHouse1F.asm
deleted file mode 100755
index b68728ae..00000000
--- a/data/mapHeaders/CopycatsHouse1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CopycatsHouse1F_h::
-	db REDS_HOUSE_1 ; tileset
-	db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x)
-	dw CopycatsHouse1F_Blocks ; blocks
-	dw CopycatsHouse1F_TextPointers ; texts
-	dw CopycatsHouse1F_Script ; scripts
-	db 0 ; connections
-	dw CopycatsHouse1F_Object ; objects
diff --git a/data/mapHeaders/CopycatsHouse2F.asm b/data/mapHeaders/CopycatsHouse2F.asm
deleted file mode 100755
index 1c7d9af9..00000000
--- a/data/mapHeaders/CopycatsHouse2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CopycatsHouse2F_h::
-	db REDS_HOUSE_2 ; tileset
-	db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x)
-	dw CopycatsHouse2F_Blocks ; blocks
-	dw CopycatsHouse2F_TextPointers ; texts
-	dw CopycatsHouse2F_Script ; scripts
-	db 0 ; connections
-	dw CopycatsHouse2F_Object ; objects
diff --git a/data/mapHeaders/Daycare.asm b/data/mapHeaders/Daycare.asm
deleted file mode 100755
index 4f2e41e7..00000000
--- a/data/mapHeaders/Daycare.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Daycare_h::
-	db HOUSE ; tileset
-	db DAYCARE_HEIGHT, DAYCARE_WIDTH ; dimensions (y, x)
-	dw Daycare_Blocks ; blocks
-	dw Daycare_TextPointers ; texts
-	dw Daycare_Script ; scripts
-	db 0 ; connections
-	dw Daycare_Object ; objects
diff --git a/data/mapHeaders/DiglettsCave.asm b/data/mapHeaders/DiglettsCave.asm
deleted file mode 100755
index 9742d306..00000000
--- a/data/mapHeaders/DiglettsCave.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-DiglettsCave_h::
-	db CAVERN ; tileset
-	db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x)
-	dw DiglettsCave_Blocks ; blocks
-	dw DiglettsCave_TextPointers ; texts
-	dw DiglettsCave_Script ; scripts
-	db 0 ; connections
-	dw DiglettsCave_Object ; objects
diff --git a/data/mapHeaders/DiglettsCaveRoute11.asm b/data/mapHeaders/DiglettsCaveRoute11.asm
deleted file mode 100755
index ac9082ed..00000000
--- a/data/mapHeaders/DiglettsCaveRoute11.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-DiglettsCaveRoute11_h::
-	db CAVERN ; tileset
-	db DIGLETTS_CAVE_ROUTE_11_HEIGHT, DIGLETTS_CAVE_ROUTE_11_WIDTH ; dimensions (y, x)
-	dw DiglettsCaveRoute11_Blocks ; blocks
-	dw DiglettsCaveRoute11_TextPointers ; texts
-	dw DiglettsCaveRoute11_Script ; scripts
-	db 0 ; connections
-	dw DiglettsCaveRoute11_Object ; objects
diff --git a/data/mapHeaders/DiglettsCaveRoute2.asm b/data/mapHeaders/DiglettsCaveRoute2.asm
deleted file mode 100755
index 1279e89f..00000000
--- a/data/mapHeaders/DiglettsCaveRoute2.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-DiglettsCaveRoute2_h::
-	db CAVERN ; tileset
-	db DIGLETTS_CAVE_ROUTE_2_HEIGHT, DIGLETTS_CAVE_ROUTE_2_WIDTH ; dimensions (y, x)
-	dw DiglettsCaveRoute2_Blocks ; blocks
-	dw DiglettsCaveRoute2_TextPointers ; texts
-	dw DiglettsCaveRoute2_Script ; scripts
-	db 0 ; connections
-	dw DiglettsCaveRoute2_Object ; objects
diff --git a/data/mapHeaders/FightingDojo.asm b/data/mapHeaders/FightingDojo.asm
deleted file mode 100755
index da8a589a..00000000
--- a/data/mapHeaders/FightingDojo.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-FightingDojo_h::
-	db DOJO ; tileset
-	db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x)
-	dw FightingDojo_Blocks ; blocks
-	dw FightingDojo_TextPointers ; texts
-	dw FightingDojo_Script ; scripts
-	db 0 ; connections
-	dw FightingDojo_Object ; objects
diff --git a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm b/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm
deleted file mode 100755
index cbef462c..00000000
--- a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-FuchsiaBillsGrandpasHouse_h::
-	db HOUSE ; tileset
-	db FUCHSIA_BILLS_GRANDPAS_HOUSE_HEIGHT, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH ; dimensions (y, x)
-	dw FuchsiaBillsGrandpasHouse_Blocks ; blocks
-	dw FuchsiaBillsGrandpasHouse_TextPointers ; texts
-	dw FuchsiaBillsGrandpasHouse_Script ; scripts
-	db 0 ; connections
-	dw FuchsiaBillsGrandpasHouse_Object ; objects
diff --git a/data/mapHeaders/FuchsiaCity.asm b/data/mapHeaders/FuchsiaCity.asm
deleted file mode 100755
index 1b247678..00000000
--- a/data/mapHeaders/FuchsiaCity.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-FuchsiaCity_h::
-	db OVERWORLD ; tileset
-	db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x)
-	dw FuchsiaCity_Blocks ; blocks
-	dw FuchsiaCity_TextPointers ; texts
-	dw FuchsiaCity_Script ; scripts
-	db SOUTH | WEST | EAST ; connections
-	SOUTH_MAP_CONNECTION FUCHSIA_CITY, ROUTE_19, 5, 0, Route19_Blocks
-	WEST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_18, 4, 0, Route18_Blocks
-	EAST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_15, 4, 0, Route15_Blocks
-	dw FuchsiaCity_Object ; objects
diff --git a/data/mapHeaders/FuchsiaGoodRodHouse.asm b/data/mapHeaders/FuchsiaGoodRodHouse.asm
deleted file mode 100755
index fd2e36b4..00000000
--- a/data/mapHeaders/FuchsiaGoodRodHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-FuchsiaGoodRodHouse_h::
-	db SHIP ; tileset
-	db FUCHSIA_GOOD_ROD_HOUSE_HEIGHT, FUCHSIA_GOOD_ROD_HOUSE_WIDTH ; dimensions (y, x)
-	dw FuchsiaGoodRodHouse_Blocks ; blocks
-	dw FuchsiaGoodRodHouse_TextPointers ; texts
-	dw FuchsiaGoodRodHouse_Script ; scripts
-	db 0 ; connections
-	dw FuchsiaGoodRodHouse_Object ; objects
diff --git a/data/mapHeaders/FuchsiaGym.asm b/data/mapHeaders/FuchsiaGym.asm
deleted file mode 100755
index ffc5c0fe..00000000
--- a/data/mapHeaders/FuchsiaGym.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-FuchsiaGym_h::
-	db GYM ; tileset
-	db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x)
-	dw FuchsiaGym_Blocks ; blocks
-	dw FuchsiaGym_TextPointers ; texts
-	dw FuchsiaGym_Script ; scripts
-	db 0 ; connections
-	dw FuchsiaGym_Object ; objects
diff --git a/data/mapHeaders/FuchsiaMart.asm b/data/mapHeaders/FuchsiaMart.asm
deleted file mode 100755
index b9c0d938..00000000
--- a/data/mapHeaders/FuchsiaMart.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-FuchsiaMart_h::
-	db MART ; tileset
-	db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x)
-	dw FuchsiaMart_Blocks ; blocks
-	dw FuchsiaMart_TextPointers ; texts
-	dw FuchsiaMart_Script ; scripts
-	db 0 ; connections
-	dw FuchsiaMart_Object ; objects
diff --git a/data/mapHeaders/FuchsiaMeetingRoom.asm b/data/mapHeaders/FuchsiaMeetingRoom.asm
deleted file mode 100755
index a3198eea..00000000
--- a/data/mapHeaders/FuchsiaMeetingRoom.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-FuchsiaMeetingRoom_h::
-	db LAB ; tileset
-	db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x)
-	dw FuchsiaMeetingRoom_Blocks ; blocks
-	dw FuchsiaMeetingRoom_TextPointers ; texts
-	dw FuchsiaMeetingRoom_Script ; scripts
-	db 0 ; connections
-	dw FuchsiaMeetingRoom_Object ; objects
diff --git a/data/mapHeaders/FuchsiaPokecenter.asm b/data/mapHeaders/FuchsiaPokecenter.asm
deleted file mode 100755
index beea4fc2..00000000
--- a/data/mapHeaders/FuchsiaPokecenter.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-FuchsiaPokecenter_h::
-	db POKECENTER ; tileset
-	db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x)
-	dw FuchsiaPokecenter_Blocks ; blocks
-	dw FuchsiaPokecenter_TextPointers ; texts
-	dw FuchsiaPokecenter_Script ; scripts
-	db 0 ; connections
-	dw FuchsiaPokecenter_Object ; objects
diff --git a/data/mapHeaders/GameCorner.asm b/data/mapHeaders/GameCorner.asm
deleted file mode 100755
index 6965e276..00000000
--- a/data/mapHeaders/GameCorner.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-GameCorner_h::
-	db LOBBY ; tileset
-	db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x)
-	dw GameCorner_Blocks ; blocks
-	dw GameCorner_TextPointers ; texts
-	dw GameCorner_Script ; scripts
-	db 0 ; connections
-	dw GameCorner_Object ; objects
diff --git a/data/mapHeaders/GameCornerPrizeRoom.asm b/data/mapHeaders/GameCornerPrizeRoom.asm
deleted file mode 100755
index 035f1112..00000000
--- a/data/mapHeaders/GameCornerPrizeRoom.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-GameCornerPrizeRoom_h::
-	db LOBBY ; tileset
-	db GAME_CORNER_PRIZE_ROOM_HEIGHT, GAME_CORNER_PRIZE_ROOM_WIDTH ; dimensions (y, x)
-	dw GameCornerPrizeRoom_Blocks ; blocks
-	dw GameCornerPrizeRoom_TextPointers ; texts
-	dw GameCornerPrizeRoom_Script ; scripts
-	db 0 ; connections
-	dw GameCornerPrizeRoom_Object ; objects
diff --git a/data/mapHeaders/HallOfFame.asm b/data/mapHeaders/HallOfFame.asm
deleted file mode 100755
index 7752ddb5..00000000
--- a/data/mapHeaders/HallOfFame.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-HallOfFame_h::
-	db GYM ; tileset
-	db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x)
-	dw HallOfFame_Blocks ; blocks
-	dw HallOfFame_TextPointers ; texts
-	dw HallOfFame_Script ; scripts
-	db 0 ; connections
-	dw HallOfFame_Object ; objects
diff --git a/data/mapHeaders/IndigoPlateau.asm b/data/mapHeaders/IndigoPlateau.asm
deleted file mode 100755
index b5dcf3de..00000000
--- a/data/mapHeaders/IndigoPlateau.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-IndigoPlateau_h::
-	db PLATEAU ; tileset
-	db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x)
-	dw IndigoPlateau_Blocks ; blocks
-	dw IndigoPlateau_TextPointers ; texts
-	dw IndigoPlateau_Script ; scripts
-	db SOUTH ; connections
-	SOUTH_MAP_CONNECTION INDIGO_PLATEAU, ROUTE_23, 0, 0, Route23_Blocks
-	dw IndigoPlateau_Object ; objects
diff --git a/data/mapHeaders/IndigoPlateauLobby.asm b/data/mapHeaders/IndigoPlateauLobby.asm
deleted file mode 100755
index dc32f7d1..00000000
--- a/data/mapHeaders/IndigoPlateauLobby.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-IndigoPlateauLobby_h::
-	db MART ; tileset
-	db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x)
-	dw IndigoPlateauLobby_Blocks ; blocks
-	dw IndigoPlateauLobby_TextPointers ; texts
-	dw IndigoPlateauLobby_Script ; scripts
-	db 0 ; connections
-	dw IndigoPlateauLobby_Object ; objects
diff --git a/data/mapHeaders/LancesRoom.asm b/data/mapHeaders/LancesRoom.asm
deleted file mode 100755
index 5373f010..00000000
--- a/data/mapHeaders/LancesRoom.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-LancesRoom_h::
-	db DOJO ; tileset
-	db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x)
-	dw LancesRoom_Blocks ; blocks
-	dw LancesRoom_TextPointers ; texts
-	dw LancesRoom_Script ; scripts
-	db 0 ; connections
-	dw LancesRoom_Object ; objects
diff --git a/data/mapHeaders/LavenderCuboneHouse.asm b/data/mapHeaders/LavenderCuboneHouse.asm
deleted file mode 100755
index 6d883655..00000000
--- a/data/mapHeaders/LavenderCuboneHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-LavenderCuboneHouse_h::
-	db HOUSE ; tileset
-	db LAVENDER_CUBONE_HOUSE_HEIGHT, LAVENDER_CUBONE_HOUSE_WIDTH ; dimensions (y, x)
-	dw LavenderCuboneHouse_Blocks ; blocks
-	dw LavenderCuboneHouse_TextPointers ; texts
-	dw LavenderCuboneHouse_Script ; scripts
-	db 0 ; connections
-	dw LavenderCuboneHouse_Object ; objects
diff --git a/data/mapHeaders/LavenderMart.asm b/data/mapHeaders/LavenderMart.asm
deleted file mode 100755
index 500287b4..00000000
--- a/data/mapHeaders/LavenderMart.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-LavenderMart_h::
-	db MART ; tileset
-	db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x)
-	dw LavenderMart_Blocks ; blocks
-	dw LavenderMart_TextPointers ; texts
-	dw LavenderMart_Script ; scripts
-	db 0 ; connections
-	dw LavenderMart_Object ; objects
diff --git a/data/mapHeaders/LavenderPokecenter.asm b/data/mapHeaders/LavenderPokecenter.asm
deleted file mode 100755
index 2c87b401..00000000
--- a/data/mapHeaders/LavenderPokecenter.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-LavenderPokecenter_h::
-	db POKECENTER ; tileset
-	db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x)
-	dw LavenderPokecenter_Blocks ; blocks
-	dw LavenderPokecenter_TextPointers ; texts
-	dw LavenderPokecenter_Script ; scripts
-	db 0 ; connections
-	dw LavenderPokecenter_Object ; objects
diff --git a/data/mapHeaders/LavenderTown.asm b/data/mapHeaders/LavenderTown.asm
deleted file mode 100755
index 67a88189..00000000
--- a/data/mapHeaders/LavenderTown.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-LavenderTown_h::
-	db OVERWORLD ; tileset
-	db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x)
-	dw LavenderTown_Blocks ; blocks
-	dw LavenderTown_TextPointers ; texts
-	dw LavenderTown_Script ; scripts
-	db NORTH | SOUTH | WEST ; connections
-	NORTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_10, 0, 0, Route10_Blocks
-	SOUTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_12, 0, 0, Route12_Blocks, 1
-	WEST_MAP_CONNECTION LAVENDER_TOWN, ROUTE_8, 0, 0, Route8_Blocks
-	dw LavenderTown_Object ; objects
diff --git a/data/mapHeaders/LoreleisRoom.asm b/data/mapHeaders/LoreleisRoom.asm
deleted file mode 100755
index d580d9fe..00000000
--- a/data/mapHeaders/LoreleisRoom.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-LoreleisRoom_h::
-	db GYM ; tileset
-	db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x)
-	dw LoreleisRoom_Blocks ; blocks
-	dw LoreleisRoom_TextPointers ; texts
-	dw LoreleisRoom_Script ; scripts
-	db 0 ; connections
-	dw LoreleisRoom_Object ; objects
diff --git a/data/mapHeaders/MrFujisHouse.asm b/data/mapHeaders/MrFujisHouse.asm
deleted file mode 100755
index ee82e49c..00000000
--- a/data/mapHeaders/MrFujisHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-MrFujisHouse_h::
-	db HOUSE ; tileset
-	db MR_FUJIS_HOUSE_HEIGHT, MR_FUJIS_HOUSE_WIDTH ; dimensions (y, x)
-	dw MrFujisHouse_Blocks ; blocks
-	dw MrFujisHouse_TextPointers ; texts
-	dw MrFujisHouse_Script ; scripts
-	db 0 ; connections
-	dw MrFujisHouse_Object ; objects
diff --git a/data/mapHeaders/MrPsychicsHouse.asm b/data/mapHeaders/MrPsychicsHouse.asm
deleted file mode 100755
index ec559ec7..00000000
--- a/data/mapHeaders/MrPsychicsHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-MrPsychicsHouse_h::
-	db HOUSE ; tileset
-	db MR_PSYCHICS_HOUSE_HEIGHT, MR_PSYCHICS_HOUSE_WIDTH ; dimensions (y, x)
-	dw MrPsychicsHouse_Blocks ; blocks
-	dw MrPsychicsHouse_TextPointers ; texts
-	dw MrPsychicsHouse_Script ; scripts
-	db 0 ; connections
-	dw MrPsychicsHouse_Object ; objects
diff --git a/data/mapHeaders/MtMoon1F.asm b/data/mapHeaders/MtMoon1F.asm
deleted file mode 100755
index 37c0ba59..00000000
--- a/data/mapHeaders/MtMoon1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-MtMoon1F_h::
-	db CAVERN ; tileset
-	db MT_MOON_1F_HEIGHT, MT_MOON_1F_WIDTH ; dimensions (y, x)
-	dw MtMoon1F_Blocks ; blocks
-	dw MtMoon1F_TextPointers ; texts
-	dw MtMoon1F_Script ; scripts
-	db 0 ; connections
-	dw MtMoon1F_Object ; objects
diff --git a/data/mapHeaders/MtMoonB1F.asm b/data/mapHeaders/MtMoonB1F.asm
deleted file mode 100755
index c14d35d0..00000000
--- a/data/mapHeaders/MtMoonB1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-MtMoonB1F_h::
-	db CAVERN ; tileset
-	db MT_MOON_B1F_HEIGHT, MT_MOON_B1F_WIDTH ; dimensions (y, x)
-	dw MtMoonB1F_Blocks ; blocks
-	dw MtMoonB1F_TextPointers ; texts
-	dw MtMoonB1F_Script ; scripts
-	db 0 ; connections
-	dw MtMoonB1F_Object ; objects
diff --git a/data/mapHeaders/MtMoonB2F.asm b/data/mapHeaders/MtMoonB2F.asm
deleted file mode 100755
index cce8454b..00000000
--- a/data/mapHeaders/MtMoonB2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-MtMoonB2F_h::
-	db CAVERN ; tileset
-	db MT_MOON_B2F_HEIGHT, MT_MOON_B2F_WIDTH ; dimensions (y, x)
-	dw MtMoonB2F_Blocks ; blocks
-	dw MtMoonB2F_TextPointers ; texts
-	dw MtMoonB2F_Script ; scripts
-	db 0 ; connections
-	dw MtMoonB2F_Object ; objects
diff --git a/data/mapHeaders/MtMoonPokecenter.asm b/data/mapHeaders/MtMoonPokecenter.asm
deleted file mode 100755
index 31f7ec7a..00000000
--- a/data/mapHeaders/MtMoonPokecenter.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-MtMoonPokecenter_h::
-	db POKECENTER ; tileset
-	db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x)
-	dw MtMoonPokecenter_Blocks ; blocks
-	dw MtMoonPokecenter_TextPointers ; texts
-	dw MtMoonPokecenter_Script ; scripts
-	db 0 ; connections
-	dw MtMoonPokecenter_Object ; objects
diff --git a/data/mapHeaders/Museum1F.asm b/data/mapHeaders/Museum1F.asm
deleted file mode 100755
index f0c967aa..00000000
--- a/data/mapHeaders/Museum1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Museum1F_h::
-	db MUSEUM ; tileset
-	db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x)
-	dw Museum1F_Blocks ; blocks
-	dw Museum1F_TextPointers ; texts
-	dw Museum1F_Script ; scripts
-	db 0 ; connections
-	dw Museum1F_Object ; objects
diff --git a/data/mapHeaders/Museum2F.asm b/data/mapHeaders/Museum2F.asm
deleted file mode 100755
index 9ab38801..00000000
--- a/data/mapHeaders/Museum2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Museum2F_h::
-	db MUSEUM ; tileset
-	db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x)
-	dw Museum2F_Blocks ; blocks
-	dw Museum2F_TextPointers ; texts
-	dw Museum2F_Script ; scripts
-	db 0 ; connections
-	dw Museum2F_Object ; objects
diff --git a/data/mapHeaders/NameRatersHouse.asm b/data/mapHeaders/NameRatersHouse.asm
deleted file mode 100755
index a727b334..00000000
--- a/data/mapHeaders/NameRatersHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-NameRatersHouse_h::
-	db HOUSE ; tileset
-	db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x)
-	dw NameRatersHouse_Blocks ; blocks
-	dw NameRatersHouse_TextPointers ; texts
-	dw NameRatersHouse_Script ; scripts
-	db 0 ; connections
-	dw NameRatersHouse_Object ; objects
diff --git a/data/mapHeaders/OaksLab.asm b/data/mapHeaders/OaksLab.asm
deleted file mode 100755
index ceee34eb..00000000
--- a/data/mapHeaders/OaksLab.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-OaksLab_h::
-	db DOJO ; tileset
-	db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x)
-	dw OaksLab_Blocks ; blocks
-	dw OaksLab_TextPointers ; texts
-	dw OaksLab_Script ; scripts
-	db 0 ; connections
-	dw OaksLab_Object ; objects
diff --git a/data/mapHeaders/PalletTown.asm b/data/mapHeaders/PalletTown.asm
deleted file mode 100755
index 72d138e7..00000000
--- a/data/mapHeaders/PalletTown.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-PalletTown_h::
-	db OVERWORLD ; tileset
-	db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions (y, x)
-	dw PalletTown_Blocks ; blocks
-	dw PalletTown_TextPointers ; texts
-	dw PalletTown_Script ; scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION PALLET_TOWN, ROUTE_1, 0, 0, Route1_Blocks
-	SOUTH_MAP_CONNECTION PALLET_TOWN, ROUTE_21, 0, 0, Route21_Blocks, 1
-	dw PalletTown_Object ; objects
diff --git a/data/mapHeaders/PewterCity.asm b/data/mapHeaders/PewterCity.asm
deleted file mode 100755
index 17d1d2f3..00000000
--- a/data/mapHeaders/PewterCity.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-PewterCity_h::
-	db OVERWORLD ; tileset
-	db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x)
-	dw PewterCity_Blocks ; blocks
-	dw PewterCity_TextPointers ; texts
-	dw PewterCity_Script ; scripts
-	db SOUTH | EAST ; connections
-	SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2_Blocks
-	EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3_Blocks
-	dw PewterCity_Object ; objects
diff --git a/data/mapHeaders/PewterGym.asm b/data/mapHeaders/PewterGym.asm
deleted file mode 100755
index 94cdd401..00000000
--- a/data/mapHeaders/PewterGym.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PewterGym_h::
-	db GYM ; tileset
-	db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x)
-	dw PewterGym_Blocks ; blocks
-	dw PewterGym_TextPointers ; texts
-	dw PewterGym_Script ; scripts
-	db 0 ; connections
-	dw PewterGym_Object ; objects
diff --git a/data/mapHeaders/PewterMart.asm b/data/mapHeaders/PewterMart.asm
deleted file mode 100755
index 962634f4..00000000
--- a/data/mapHeaders/PewterMart.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PewterMart_h::
-	db MART ; tileset
-	db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x)
-	dw PewterMart_Blocks ; blocks
-	dw PewterMart_TextPointers ; texts
-	dw PewterMart_Script ; scripts
-	db 0 ; connections
-	dw PewterMart_Object ; objects
diff --git a/data/mapHeaders/PewterNidoranHouse.asm b/data/mapHeaders/PewterNidoranHouse.asm
deleted file mode 100755
index 9900360b..00000000
--- a/data/mapHeaders/PewterNidoranHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PewterNidoranHouse_h::
-	db HOUSE ; tileset
-	db PEWTER_NIDORAN_HOUSE_HEIGHT, PEWTER_NIDORAN_HOUSE_WIDTH ; dimensions (y, x)
-	dw PewterNidoranHouse_Blocks ; blocks
-	dw PewterNidoranHouse_TextPointers ; texts
-	dw PewterNidoranHouse_Script ; scripts
-	db 0 ; connections
-	dw PewterNidoranHouse_Object ; objects
diff --git a/data/mapHeaders/PewterPokecenter.asm b/data/mapHeaders/PewterPokecenter.asm
deleted file mode 100755
index 5738cb64..00000000
--- a/data/mapHeaders/PewterPokecenter.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PewterPokecenter_h::
-	db POKECENTER ; tileset
-	db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x)
-	dw PewterPokecenter_Blocks ; blocks
-	dw PewterPokecenter_TextPointers ; texts
-	dw PewterPokecenter_Script ; scripts
-	db 0 ; connections
-	dw PewterPokecenter_Object ; objects
diff --git a/data/mapHeaders/PewterSpeechHouse.asm b/data/mapHeaders/PewterSpeechHouse.asm
deleted file mode 100755
index 9cc2d360..00000000
--- a/data/mapHeaders/PewterSpeechHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PewterSpeechHouse_h::
-	db HOUSE ; tileset
-	db PEWTER_SPEECH_HOUSE_HEIGHT, PEWTER_SPEECH_HOUSE_WIDTH ; dimensions (y, x)
-	dw PewterSpeechHouse_Blocks ; blocks
-	dw PewterSpeechHouse_TextPointers ; texts
-	dw PewterSpeechHouse_Script ; scripts
-	db 0 ; connections
-	dw PewterSpeechHouse_Object ; objects
diff --git a/data/mapHeaders/PokemonFanClub.asm b/data/mapHeaders/PokemonFanClub.asm
deleted file mode 100755
index 251ac2c4..00000000
--- a/data/mapHeaders/PokemonFanClub.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PokemonFanClub_h::
-	db INTERIOR ; tileset
-	db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x)
-	dw PokemonFanClub_Blocks ; blocks
-	dw PokemonFanClub_TextPointers ; texts
-	dw PokemonFanClub_Script ; scripts
-	db 0 ; connections
-	dw PokemonFanClub_Object ; objects
diff --git a/data/mapHeaders/PokemonMansion1F.asm b/data/mapHeaders/PokemonMansion1F.asm
deleted file mode 100755
index b3bebb5f..00000000
--- a/data/mapHeaders/PokemonMansion1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PokemonMansion1F_h::
-	db FACILITY ; tileset
-	db POKEMON_MANSION_1F_HEIGHT, POKEMON_MANSION_1F_WIDTH ; dimensions (y, x)
-	dw PokemonMansion1F_Blocks ; blocks
-	dw PokemonMansion1F_TextPointers ; texts
-	dw PokemonMansion1F_Script ; scripts
-	db 0 ; connections
-	dw PokemonMansion1F_Object ; objects
diff --git a/data/mapHeaders/PokemonMansion2F.asm b/data/mapHeaders/PokemonMansion2F.asm
deleted file mode 100755
index d532db2a..00000000
--- a/data/mapHeaders/PokemonMansion2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PokemonMansion2F_h::
-	db FACILITY ; tileset
-	db POKEMON_MANSION_2F_HEIGHT, POKEMON_MANSION_2F_WIDTH ; dimensions (y, x)
-	dw PokemonMansion2F_Blocks ; blocks
-	dw PokemonMansion2F_TextPointers ; texts
-	dw PokemonMansion2F_Script ; scripts
-	db 0 ; connections
-	dw PokemonMansion2F_Object ; objects
diff --git a/data/mapHeaders/PokemonMansion3F.asm b/data/mapHeaders/PokemonMansion3F.asm
deleted file mode 100755
index e8887551..00000000
--- a/data/mapHeaders/PokemonMansion3F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PokemonMansion3F_h::
-	db FACILITY ; tileset
-	db POKEMON_MANSION_3F_HEIGHT, POKEMON_MANSION_3F_WIDTH ; dimensions (y, x)
-	dw PokemonMansion3F_Blocks ; blocks
-	dw PokemonMansion3F_TextPointers ; texts
-	dw PokemonMansion3F_Script ; scripts
-	db 0 ; connections
-	dw PokemonMansion3F_Object ; objects
diff --git a/data/mapHeaders/PokemonMansionB1F.asm b/data/mapHeaders/PokemonMansionB1F.asm
deleted file mode 100755
index 08ec13f4..00000000
--- a/data/mapHeaders/PokemonMansionB1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PokemonMansionB1F_h::
-	db FACILITY ; tileset
-	db POKEMON_MANSION_B1F_HEIGHT, POKEMON_MANSION_B1F_WIDTH ; dimensions (y, x)
-	dw PokemonMansionB1F_Blocks ; blocks
-	dw PokemonMansionB1F_TextPointers ; texts
-	dw PokemonMansionB1F_Script ; scripts
-	db 0 ; connections
-	dw PokemonMansionB1F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower1F.asm b/data/mapHeaders/PokemonTower1F.asm
deleted file mode 100755
index 99b129e8..00000000
--- a/data/mapHeaders/PokemonTower1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PokemonTower1F_h::
-	db CEMETERY ; tileset
-	db POKEMON_TOWER_1F_HEIGHT, POKEMON_TOWER_1F_WIDTH ; dimensions (y, x)
-	dw PokemonTower1F_Blocks ; blocks
-	dw PokemonTower1F_TextPointers ; texts
-	dw PokemonTower1F_Script ; scripts
-	db 0 ; connections
-	dw PokemonTower1F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower2F.asm b/data/mapHeaders/PokemonTower2F.asm
deleted file mode 100755
index ce0ea13d..00000000
--- a/data/mapHeaders/PokemonTower2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PokemonTower2F_h::
-	db CEMETERY ; tileset
-	db POKEMON_TOWER_2F_HEIGHT, POKEMON_TOWER_2F_WIDTH ; dimensions (y, x)
-	dw PokemonTower2F_Blocks ; blocks
-	dw PokemonTower2F_TextPointers ; texts
-	dw PokemonTower2F_Script ; scripts
-	db 0 ; connections
-	dw PokemonTower2F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower3F.asm b/data/mapHeaders/PokemonTower3F.asm
deleted file mode 100755
index a495b30f..00000000
--- a/data/mapHeaders/PokemonTower3F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PokemonTower3F_h::
-	db CEMETERY ; tileset
-	db POKEMON_TOWER_3F_HEIGHT, POKEMON_TOWER_3F_WIDTH ; dimensions (y, x)
-	dw PokemonTower3F_Blocks ; blocks
-	dw PokemonTower3F_TextPointers ; texts
-	dw PokemonTower3F_Script ; scripts
-	db 0 ; connections
-	dw PokemonTower3F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower4F.asm b/data/mapHeaders/PokemonTower4F.asm
deleted file mode 100755
index b6932406..00000000
--- a/data/mapHeaders/PokemonTower4F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PokemonTower4F_h::
-	db CEMETERY ; tileset
-	db POKEMON_TOWER_4F_HEIGHT, POKEMON_TOWER_4F_WIDTH ; dimensions (y, x)
-	dw PokemonTower4F_Blocks ; blocks
-	dw PokemonTower4F_TextPointers ; texts
-	dw PokemonTower4F_Script ; scripts
-	db 0 ; connections
-	dw PokemonTower4F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower5F.asm b/data/mapHeaders/PokemonTower5F.asm
deleted file mode 100755
index f51e6990..00000000
--- a/data/mapHeaders/PokemonTower5F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PokemonTower5F_h::
-	db CEMETERY ; tileset
-	db POKEMON_TOWER_5F_HEIGHT, POKEMON_TOWER_5F_WIDTH ; dimensions (y, x)
-	dw PokemonTower5F_Blocks ; blocks
-	dw PokemonTower5F_TextPointers ; texts
-	dw PokemonTower5F_Script ; scripts
-	db 0 ; connections
-	dw PokemonTower5F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower6F.asm b/data/mapHeaders/PokemonTower6F.asm
deleted file mode 100755
index 5fa1a035..00000000
--- a/data/mapHeaders/PokemonTower6F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PokemonTower6F_h::
-	db CEMETERY ; tileset
-	db POKEMON_TOWER_6F_HEIGHT, POKEMON_TOWER_6F_WIDTH ; dimensions (y, x)
-	dw PokemonTower6F_Blocks ; blocks
-	dw PokemonTower6F_TextPointers ; texts
-	dw PokemonTower6F_Script ; scripts
-	db 0 ; connections
-	dw PokemonTower6F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower7F.asm b/data/mapHeaders/PokemonTower7F.asm
deleted file mode 100755
index 90fc1d8b..00000000
--- a/data/mapHeaders/PokemonTower7F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PokemonTower7F_h::
-	db CEMETERY ; tileset
-	db POKEMON_TOWER_7F_HEIGHT, POKEMON_TOWER_7F_WIDTH ; dimensions (y, x)
-	dw PokemonTower7F_Blocks ; blocks
-	dw PokemonTower7F_TextPointers ; texts
-	dw PokemonTower7F_Script ; scripts
-	db 0 ; connections
-	dw PokemonTower7F_Object ; objects
diff --git a/data/mapHeaders/PowerPlant.asm b/data/mapHeaders/PowerPlant.asm
deleted file mode 100755
index 3cb4efcd..00000000
--- a/data/mapHeaders/PowerPlant.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PowerPlant_h::
-	db FACILITY ; tileset
-	db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x)
-	dw PowerPlant_Blocks ; blocks
-	dw PowerPlant_TextPointers ; texts
-	dw PowerPlant_Script ; scripts
-	db 0 ; connections
-	dw PowerPlant_Object ; objects
diff --git a/data/mapHeaders/RedsHouse1F.asm b/data/mapHeaders/RedsHouse1F.asm
deleted file mode 100755
index b13008ae..00000000
--- a/data/mapHeaders/RedsHouse1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-RedsHouse1F_h::
-	db REDS_HOUSE_1 ; tileset
-	db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions (y, x)
-	dw RedsHouse1F_Blocks ; blocks
-	dw RedsHouse1F_TextPointers ; texts
-	dw RedsHouse1F_Script ; scripts
-	db 0 ; connections
-	dw RedsHouse1F_Object ; objects
diff --git a/data/mapHeaders/RedsHouse2F.asm b/data/mapHeaders/RedsHouse2F.asm
deleted file mode 100755
index 8824ebf2..00000000
--- a/data/mapHeaders/RedsHouse2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-RedsHouse2F_h::
-	db REDS_HOUSE_2 ; tileset
-	db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions (y, x)
-	dw RedsHouse2F_Blocks ; blocks
-	dw RedsHouse2F_TextPointers ; texts
-	dw RedsHouse2F_Script ; scripts
-	db $00 ; connections
-	dw RedsHouse2F_Object ; objects
diff --git a/data/mapHeaders/RockTunnel1F.asm b/data/mapHeaders/RockTunnel1F.asm
deleted file mode 100755
index 8dd5929b..00000000
--- a/data/mapHeaders/RockTunnel1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-RockTunnel1F_h::
-	db CAVERN ; tileset
-	db ROCK_TUNNEL_1F_HEIGHT, ROCK_TUNNEL_1F_WIDTH ; dimensions (y, x)
-	dw RockTunnel1F_Blocks ; blocks
-	dw RockTunnel1F_TextPointers ; texts
-	dw RockTunnel1F_Script ; scripts
-	db 0 ; connections
-	dw RockTunnel1F_Object ; objects
diff --git a/data/mapHeaders/RockTunnelB1F.asm b/data/mapHeaders/RockTunnelB1F.asm
deleted file mode 100755
index 36cd7f37..00000000
--- a/data/mapHeaders/RockTunnelB1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-RockTunnelB1F_h::
-	db CAVERN ; tileset
-	db ROCK_TUNNEL_B1F_HEIGHT, ROCK_TUNNEL_B1F_WIDTH ; dimensions (y, x)
-	dw RockTunnelB1F_Blocks ; blocks
-	dw RockTunnelB1F_TextPointers ; texts
-	dw RockTunnelB1F_Script ; scripts
-	db 0 ; connections
-	dw RockTunnelB1F_Object ; objects
diff --git a/data/mapHeaders/RockTunnelPokecenter.asm b/data/mapHeaders/RockTunnelPokecenter.asm
deleted file mode 100755
index 3d0bbed0..00000000
--- a/data/mapHeaders/RockTunnelPokecenter.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-RockTunnelPokecenter_h::
-	db POKECENTER ; tileset
-	db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x)
-	dw RockTunnelPokecenter_Blocks ; blocks
-	dw RockTunnelPokecenter_TextPointers ; texts
-	dw RockTunnelPokecenter_Script ; scripts
-	db 0 ; connections
-	dw RockTunnelPokecenter_Object ; objects
diff --git a/data/mapHeaders/RocketHideoutB1F.asm b/data/mapHeaders/RocketHideoutB1F.asm
deleted file mode 100755
index 4d875a1b..00000000
--- a/data/mapHeaders/RocketHideoutB1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-RocketHideoutB1F_h::
-	db FACILITY ; tileset
-	db ROCKET_HIDEOUT_B1F_HEIGHT, ROCKET_HIDEOUT_B1F_WIDTH ; dimensions (y, x)
-	dw RocketHideoutB1F_Blocks ; blocks
-	dw RocketHideoutB1F_TextPointers ; texts
-	dw RocketHideoutB1F_Script ; scripts
-	db 0 ; connections
-	dw RocketHideoutB1F_Object ; objects
diff --git a/data/mapHeaders/RocketHideoutB2F.asm b/data/mapHeaders/RocketHideoutB2F.asm
deleted file mode 100755
index 0d56f2a1..00000000
--- a/data/mapHeaders/RocketHideoutB2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-RocketHideoutB2F_h::
-	db FACILITY ; tileset
-	db ROCKET_HIDEOUT_B2F_HEIGHT, ROCKET_HIDEOUT_B2F_WIDTH ; dimensions (y, x)
-	dw RocketHideoutB2F_Blocks ; blocks
-	dw RocketHideoutB2F_TextPointers ; texts
-	dw RocketHideoutB2F_Script ; scripts
-	db 0 ; connections
-	dw RocketHideoutB2F_Object ; objects
diff --git a/data/mapHeaders/RocketHideoutB3F.asm b/data/mapHeaders/RocketHideoutB3F.asm
deleted file mode 100755
index e71fcff1..00000000
--- a/data/mapHeaders/RocketHideoutB3F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-RocketHideoutB3F_h::
-	db FACILITY ; tileset
-	db ROCKET_HIDEOUT_B3F_HEIGHT, ROCKET_HIDEOUT_B3F_WIDTH ; dimensions (y, x)
-	dw RocketHideoutB3F_Blocks ; blocks
-	dw RocketHideoutB3F_TextPointers ; texts
-	dw RocketHideoutB3F_Script ; scripts
-	db 0 ; connections
-	dw RocketHideoutB3F_Object ; objects
diff --git a/data/mapHeaders/RocketHideoutB4F.asm b/data/mapHeaders/RocketHideoutB4F.asm
deleted file mode 100755
index 05ad471a..00000000
--- a/data/mapHeaders/RocketHideoutB4F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-RocketHideoutB4F_h::
-	db FACILITY ; tileset
-	db ROCKET_HIDEOUT_B4F_HEIGHT, ROCKET_HIDEOUT_B4F_WIDTH ; dimensions (y, x)
-	dw RocketHideoutB4F_Blocks ; blocks
-	dw RocketHideoutB4F_TextPointers ; texts
-	dw RocketHideoutB4F_Script ; scripts
-	db 0 ; connections
-	dw RocketHideoutB4F_Object ; objects
diff --git a/data/mapHeaders/RocketHideoutElevator.asm b/data/mapHeaders/RocketHideoutElevator.asm
deleted file mode 100755
index 6221dddd..00000000
--- a/data/mapHeaders/RocketHideoutElevator.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-RocketHideoutElevator_h::
-	db LOBBY ; tileset
-	db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x)
-	dw RocketHideoutElevator_Blocks ; blocks
-	dw RocketHideoutElevator_TextPointers ; texts
-	dw RocketHideoutElevator_Script ; scripts
-	db 0 ; connections
-	dw RocketHideoutElevator_Object ; objects
diff --git a/data/mapHeaders/Route1.asm b/data/mapHeaders/Route1.asm
deleted file mode 100755
index 20d389ab..00000000
--- a/data/mapHeaders/Route1.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route1_h::
-	db OVERWORLD ; tileset
-	db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x)
-	dw Route1_Blocks ; blocks
-	dw Route1_TextPointers ; texts
-	dw Route1_Script ; scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_1, VIRIDIAN_CITY, -3, 2, ViridianCity_Blocks
-	SOUTH_MAP_CONNECTION ROUTE_1, PALLET_TOWN, 0, 0, PalletTown_Blocks, 1
-	dw Route1_Object ; objects
diff --git a/data/mapHeaders/Route10.asm b/data/mapHeaders/Route10.asm
deleted file mode 100755
index 5759483b..00000000
--- a/data/mapHeaders/Route10.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route10_h::
-	db OVERWORLD ; tileset
-	db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x)
-	dw Route10_Blocks ; blocks
-	dw Route10_TextPointers ; texts
-	dw Route10_Script ; scripts
-	db SOUTH | WEST ; connections
-	SOUTH_MAP_CONNECTION ROUTE_10, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks
-	WEST_MAP_CONNECTION ROUTE_10, ROUTE_9, 0, 0, Route9_Blocks
-	dw Route10_Object ; objects
diff --git a/data/mapHeaders/Route11.asm b/data/mapHeaders/Route11.asm
deleted file mode 100755
index 6b95cebc..00000000
--- a/data/mapHeaders/Route11.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route11_h::
-	db OVERWORLD ; tileset
-	db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x)
-	dw Route11_Blocks ; blocks
-	dw Route11_TextPointers ; texts
-	dw Route11_Script ; scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_11, VERMILION_CITY, -3, 1, VermilionCity_Blocks
-	EAST_MAP_CONNECTION ROUTE_11, ROUTE_12, -3, 24, Route12_Blocks, 1
-	dw Route11_Object ; objects
diff --git a/data/mapHeaders/Route11Gate1F.asm b/data/mapHeaders/Route11Gate1F.asm
deleted file mode 100755
index 0f26b117..00000000
--- a/data/mapHeaders/Route11Gate1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route11Gate1F_h::
-	db GATE ; tileset
-	db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route11Gate1F_Blocks ; blocks
-	dw Route11Gate1F_TextPointers ; texts
-	dw Route11Gate1F_Script ; scripts
-	db 0 ; connections
-	dw Route11Gate1F_Object ; objects
diff --git a/data/mapHeaders/Route11Gate2F.asm b/data/mapHeaders/Route11Gate2F.asm
deleted file mode 100755
index b408b5a7..00000000
--- a/data/mapHeaders/Route11Gate2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route11Gate2F_h::
-	db GATE ; tileset
-	db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route11Gate2F_Blocks ; blocks
-	dw Route11Gate2F_TextPointers ; texts
-	dw Route11Gate2F_Script ; scripts
-	db 0 ; connections
-	dw Route11Gate2F_Object ; objects
diff --git a/data/mapHeaders/Route12.asm b/data/mapHeaders/Route12.asm
deleted file mode 100755
index 284105fa..00000000
--- a/data/mapHeaders/Route12.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-Route12_h::
-	db OVERWORLD ; tileset
-	db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x)
-	dw Route12_Blocks ; blocks
-	dw Route12_TextPointers ; texts
-	dw Route12_Script ; scripts
-	db NORTH | SOUTH | WEST ; connections
-	NORTH_MAP_CONNECTION ROUTE_12, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks
-	SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_13, -3, 17, Route13_Blocks
-	WEST_MAP_CONNECTION ROUTE_12, ROUTE_11, 27, 0, Route11_Blocks
-	dw Route12_Object ; objects
diff --git a/data/mapHeaders/Route12Gate1F.asm b/data/mapHeaders/Route12Gate1F.asm
deleted file mode 100755
index dbce0ab9..00000000
--- a/data/mapHeaders/Route12Gate1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route12Gate1F_h::
-	db GATE ; tileset
-	db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route12Gate1F_Blocks ; blocks
-	dw Route12Gate1F_TextPointers ; texts
-	dw Route12Gate1F_Script ; scripts
-	db 0 ; connections
-	dw Route12Gate1F_Object ; objects
diff --git a/data/mapHeaders/Route12Gate2F.asm b/data/mapHeaders/Route12Gate2F.asm
deleted file mode 100755
index f4e2330d..00000000
--- a/data/mapHeaders/Route12Gate2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route12Gate2F_h::
-	db GATE ; tileset
-	db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route12Gate2F_Blocks ; blocks
-	dw Route12Gate2F_TextPointers ; texts
-	dw Route12Gate2F_Script ; scripts
-	db 0 ; connections
-	dw Route12Gate2F_Object ; objects
diff --git a/data/mapHeaders/Route12SuperRodHouse.asm b/data/mapHeaders/Route12SuperRodHouse.asm
deleted file mode 100755
index 70357a3a..00000000
--- a/data/mapHeaders/Route12SuperRodHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route12SuperRodHouse_h::
-	db HOUSE ; tileset
-	db ROUTE_12_SUPER_ROD_HOUSE_HEIGHT, ROUTE_12_SUPER_ROD_HOUSE_WIDTH ; dimensions (y, x)
-	dw Route12SuperRodHouse_Blocks ; blocks
-	dw Route12SuperRodHouse_TextPointers ; texts
-	dw Route12SuperRodHouse_Script ; scripts
-	db 0 ; connections
-	dw Route12SuperRodHouse_Object ; objects
diff --git a/data/mapHeaders/Route13.asm b/data/mapHeaders/Route13.asm
deleted file mode 100755
index fb85dd60..00000000
--- a/data/mapHeaders/Route13.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route13_h::
-	db OVERWORLD ; tileset
-	db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x)
-	dw Route13_Blocks ; blocks
-	dw Route13_TextPointers ; texts
-	dw Route13_Script ; scripts
-	db NORTH | WEST ; connections
-	NORTH_MAP_CONNECTION ROUTE_13, ROUTE_12, 20, 0, Route12_Blocks
-	WEST_MAP_CONNECTION ROUTE_13, ROUTE_14, 0, 0, Route14_Blocks
-	dw Route13_Object ; objects
diff --git a/data/mapHeaders/Route14.asm b/data/mapHeaders/Route14.asm
deleted file mode 100755
index d1484f6b..00000000
--- a/data/mapHeaders/Route14.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route14_h::
-	db OVERWORLD ; tileset
-	db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x)
-	dw Route14_Blocks ; blocks
-	dw Route14_TextPointers ; texts
-	dw Route14_Script ; scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_14, ROUTE_15, 18, 0, Route15_Blocks
-	EAST_MAP_CONNECTION ROUTE_14, ROUTE_13, 0, 0, Route13_Blocks
-	dw Route14_Object ; objects
diff --git a/data/mapHeaders/Route15.asm b/data/mapHeaders/Route15.asm
deleted file mode 100755
index 5f66a521..00000000
--- a/data/mapHeaders/Route15.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route15_h::
-	db OVERWORLD ; tileset
-	db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x)
-	dw Route15_Blocks ; blocks
-	dw Route15_TextPointers ; texts
-	dw Route15_Script ; scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_15, FUCHSIA_CITY, -3, 1, FuchsiaCity_Blocks
-	EAST_MAP_CONNECTION ROUTE_15, ROUTE_14, -3, 15, Route14_Blocks
-	dw Route15_Object ; objects
diff --git a/data/mapHeaders/Route15Gate1F.asm b/data/mapHeaders/Route15Gate1F.asm
deleted file mode 100755
index d3f5a377..00000000
--- a/data/mapHeaders/Route15Gate1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route15Gate1F_h::
-	db GATE ; tileset
-	db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route15Gate1F_Blocks ; blocks
-	dw Route15Gate1F_TextPointers ; texts
-	dw Route15Gate1F_Script ; scripts
-	db 0 ; connections
-	dw Route15Gate1F_Object ; objects
diff --git a/data/mapHeaders/Route15Gate2F.asm b/data/mapHeaders/Route15Gate2F.asm
deleted file mode 100755
index 87b05105..00000000
--- a/data/mapHeaders/Route15Gate2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route15Gate2F_h::
-	db GATE ; tileset
-	db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route15Gate2F_Blocks ; blocks
-	dw Route15Gate2F_TextPointers ; texts
-	dw Route15Gate2F_Script ; scripts
-	db 0 ; connections
-	dw Route15Gate2F_Object ; objects
diff --git a/data/mapHeaders/Route16.asm b/data/mapHeaders/Route16.asm
deleted file mode 100755
index be436134..00000000
--- a/data/mapHeaders/Route16.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route16_h::
-	db OVERWORLD ; tileset
-	db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x)
-	dw Route16_Blocks ; blocks
-	dw Route16_TextPointers ; texts
-	dw Route16_Script ; scripts
-	db SOUTH | EAST ; connections
-	SOUTH_MAP_CONNECTION ROUTE_16, ROUTE_17, 0, 0, Route17_Blocks
-	EAST_MAP_CONNECTION ROUTE_16, CELADON_CITY, -3, 1, CeladonCity_Blocks, 1
-	dw Route16_Object ; objects
diff --git a/data/mapHeaders/Route16FlyHouse.asm b/data/mapHeaders/Route16FlyHouse.asm
deleted file mode 100755
index 6bc41d1d..00000000
--- a/data/mapHeaders/Route16FlyHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route16FlyHouse_h::
-	db HOUSE ; tileset
-	db ROUTE_16_FLY_HOUSE_HEIGHT, ROUTE_16_FLY_HOUSE_WIDTH ; dimensions (y, x)
-	dw Route16FlyHouse_Blocks ; blocks
-	dw Route16FlyHouse_TextPointers ; texts
-	dw Route16FlyHouse_Script ; scripts
-	db 0 ; connections
-	dw Route16FlyHouse_Object ; objects
diff --git a/data/mapHeaders/Route16Gate1F.asm b/data/mapHeaders/Route16Gate1F.asm
deleted file mode 100755
index 16bbb30b..00000000
--- a/data/mapHeaders/Route16Gate1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route16Gate1F_h::
-	db GATE ; tileset
-	db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route16Gate1F_Blocks ; blocks
-	dw Route16Gate1F_TextPointers ; texts
-	dw Route16Gate1F_Script ; scripts
-	db 0 ; connections
-	dw Route16Gate1F_Object ; objects
diff --git a/data/mapHeaders/Route16Gate2F.asm b/data/mapHeaders/Route16Gate2F.asm
deleted file mode 100755
index 600101c9..00000000
--- a/data/mapHeaders/Route16Gate2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route16Gate2F_h::
-	db GATE ; tileset
-	db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route16Gate2F_Blocks ; blocks
-	dw Route16Gate2F_TextPointers ; texts
-	dw Route16Gate2F_Script ; scripts
-	db 0 ; connections
-	dw Route16Gate2F_Object ; objects
diff --git a/data/mapHeaders/Route17.asm b/data/mapHeaders/Route17.asm
deleted file mode 100755
index 32bdb541..00000000
--- a/data/mapHeaders/Route17.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route17_h::
-	db OVERWORLD ; tileset
-	db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x)
-	dw Route17_Blocks ; blocks
-	dw Route17_TextPointers ; texts
-	dw Route17_Script ; scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_17, ROUTE_16, 0, 0, Route16_Blocks
-	SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_18, 0, 0, Route18_Blocks, 1
-	dw Route17_Object ; objects
diff --git a/data/mapHeaders/Route18.asm b/data/mapHeaders/Route18.asm
deleted file mode 100755
index e0b5daef..00000000
--- a/data/mapHeaders/Route18.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route18_h::
-	db OVERWORLD ; tileset
-	db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x)
-	dw Route18_Blocks ; blocks
-	dw Route18_TextPointers ; texts
-	dw Route18_Script ; scripts
-	db NORTH | EAST ; connections
-	NORTH_MAP_CONNECTION ROUTE_18, ROUTE_17, 0, 0, Route17_Blocks
-	EAST_MAP_CONNECTION ROUTE_18, FUCHSIA_CITY, -3, 1, FuchsiaCity_Blocks, 1
-	dw Route18_Object ; objects
diff --git a/data/mapHeaders/Route18Gate1F.asm b/data/mapHeaders/Route18Gate1F.asm
deleted file mode 100755
index d04288d5..00000000
--- a/data/mapHeaders/Route18Gate1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route18Gate1F_h::
-	db GATE ; tileset
-	db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route18Gate1F_Blocks ; blocks
-	dw Route18Gate1F_TextPointers ; texts
-	dw Route18Gate1F_Script ; scripts
-	db 0 ; connections
-	dw Route18Gate1F_Object ; objects
diff --git a/data/mapHeaders/Route18Gate2F.asm b/data/mapHeaders/Route18Gate2F.asm
deleted file mode 100755
index cf8c6d6a..00000000
--- a/data/mapHeaders/Route18Gate2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route18Gate2F_h::
-	db GATE ; tileset
-	db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route18Gate2F_Blocks ; blocks
-	dw Route18Gate2F_TextPointers ; texts
-	dw Route18Gate2F_Script ; scripts
-	db 0 ; connections
-	dw Route18Gate2F_Object ; objects
diff --git a/data/mapHeaders/Route19.asm b/data/mapHeaders/Route19.asm
deleted file mode 100755
index 2b6c8ca2..00000000
--- a/data/mapHeaders/Route19.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route19_h::
-	db OVERWORLD ; tileset
-	db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x)
-	dw Route19_Blocks ; blocks
-	dw Route19_TextPointers ; texts
-	dw Route19_Script ; scripts
-	db NORTH | WEST ; connections
-	NORTH_MAP_CONNECTION ROUTE_19, FUCHSIA_CITY, -3, 2, FuchsiaCity_Blocks
-	WEST_MAP_CONNECTION ROUTE_19, ROUTE_20, 18, 0, Route20_Blocks
-	dw Route19_Object ; objects
diff --git a/data/mapHeaders/Route2.asm b/data/mapHeaders/Route2.asm
deleted file mode 100755
index 6dc96c4e..00000000
--- a/data/mapHeaders/Route2.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route2_h::
-	db OVERWORLD ; tileset
-	db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x)
-	dw Route2_Blocks ; blocks
-	dw Route2_TextPointers ; texts
-	dw Route2_Script ; scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCity_Blocks
-	SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCity_Blocks, 1
-	dw Route2_Object ; objects
diff --git a/data/mapHeaders/Route20.asm b/data/mapHeaders/Route20.asm
deleted file mode 100755
index 03455c54..00000000
--- a/data/mapHeaders/Route20.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route20_h::
-	db OVERWORLD ; tileset
-	db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x)
-	dw Route20_Blocks ; blocks
-	dw Route20_TextPointers ; texts
-	dw Route20_Script ; scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_20, CINNABAR_ISLAND, 0, 0, CinnabarIsland_Blocks
-	EAST_MAP_CONNECTION ROUTE_20, ROUTE_19, -3, 15, Route19_Blocks
-	dw Route20_Object ; objects
diff --git a/data/mapHeaders/Route21.asm b/data/mapHeaders/Route21.asm
deleted file mode 100755
index 81e749e0..00000000
--- a/data/mapHeaders/Route21.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route21_h::
-	db OVERWORLD ; tileset
-	db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x)
-	dw Route21_Blocks ; blocks
-	dw Route21_TextPointers ; texts
-	dw Route21_Script ; scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_21, PALLET_TOWN, 0, 0, PalletTown_Blocks
-	SOUTH_MAP_CONNECTION ROUTE_21, CINNABAR_ISLAND, 0, 0, CinnabarIsland_Blocks, 1
-	dw Route21_Object ; objects
diff --git a/data/mapHeaders/Route22.asm b/data/mapHeaders/Route22.asm
deleted file mode 100755
index 083652cc..00000000
--- a/data/mapHeaders/Route22.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route22_h::
-	db OVERWORLD ; tileset
-	db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x)
-	dw Route22_Blocks ; blocks
-	dw Route22_TextPointers ; texts
-	dw Route22_Script ; scripts
-	db NORTH | EAST ; connections
-	NORTH_MAP_CONNECTION ROUTE_22, ROUTE_23, 0, 0, Route23_Blocks
-	EAST_MAP_CONNECTION ROUTE_22, VIRIDIAN_CITY, -3, 1, ViridianCity_Blocks, 1
-	dw Route22_Object ; objects
diff --git a/data/mapHeaders/Route22Gate.asm b/data/mapHeaders/Route22Gate.asm
deleted file mode 100755
index b0fae3e4..00000000
--- a/data/mapHeaders/Route22Gate.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route22Gate_h::
-	db GATE ; tileset
-	db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x)
-	dw Route22Gate_Blocks ; blocks
-	dw Route22Gate_TextPointers ; texts
-	dw Route22Gate_Script ; scripts
-	db 0 ; connections
-	dw Route22Gate_Object ; objects
diff --git a/data/mapHeaders/Route23.asm b/data/mapHeaders/Route23.asm
deleted file mode 100755
index 1bc27a5f..00000000
--- a/data/mapHeaders/Route23.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route23_h::
-	db PLATEAU ; tileset
-	db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x)
-	dw Route23_Blocks ; blocks
-	dw Route23_TextPointers ; texts
-	dw Route23_Script ; scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_23, INDIGO_PLATEAU, 0, 0, IndigoPlateau_Blocks
-	SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_22, 0, 0, Route22_Blocks, 1
-	dw Route23_Object ; objects
diff --git a/data/mapHeaders/Route24.asm b/data/mapHeaders/Route24.asm
deleted file mode 100755
index acb98d40..00000000
--- a/data/mapHeaders/Route24.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route24_h::
-	db OVERWORLD ; tileset
-	db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x)
-	dw Route24_Blocks ; blocks
-	dw Route24_TextPointers ; texts
-	dw Route24_Script ; scripts
-	db SOUTH | EAST ; connections
-	SOUTH_MAP_CONNECTION ROUTE_24, CERULEAN_CITY, -3, 2, CeruleanCity_Blocks, 1
-	EAST_MAP_CONNECTION ROUTE_24, ROUTE_25, 0, 0, Route25_Blocks
-	dw Route24_Object ; objects
diff --git a/data/mapHeaders/Route25.asm b/data/mapHeaders/Route25.asm
deleted file mode 100755
index d8da8583..00000000
--- a/data/mapHeaders/Route25.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-Route25_h::
-	db OVERWORLD ; tileset
-	db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x)
-	dw Route25_Blocks ; blocks
-	dw Route25_TextPointers ; texts
-	dw Route25_Script ; scripts
-	db WEST ; connections
-	WEST_MAP_CONNECTION ROUTE_25, ROUTE_24, 0, 0, Route24_Blocks
-	dw Route25_Object ; objects
diff --git a/data/mapHeaders/Route2Gate.asm b/data/mapHeaders/Route2Gate.asm
deleted file mode 100755
index 68581910..00000000
--- a/data/mapHeaders/Route2Gate.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route2Gate_h::
-	db GATE ; tileset
-	db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x)
-	dw Route2Gate_Blocks ; blocks
-	dw Route2Gate_TextPointers ; texts
-	dw Route2Gate_Script ; scripts
-	db 0 ; connections
-	dw Route2Gate_Object ; objects
diff --git a/data/mapHeaders/Route2TradeHouse.asm b/data/mapHeaders/Route2TradeHouse.asm
deleted file mode 100755
index 98dc7aed..00000000
--- a/data/mapHeaders/Route2TradeHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route2TradeHouse_h::
-	db HOUSE ; tileset
-	db ROUTE_2_TRADE_HOUSE_HEIGHT, ROUTE_2_TRADE_HOUSE_WIDTH ; dimensions (y, x)
-	dw Route2TradeHouse_Blocks ; blocks
-	dw Route2TradeHouse_TextPointers ; texts
-	dw Route2TradeHouse_Script ; scripts
-	db 0 ; connections
-	dw Route2TradeHouse_Object ; objects
diff --git a/data/mapHeaders/Route3.asm b/data/mapHeaders/Route3.asm
deleted file mode 100755
index a84b5bf9..00000000
--- a/data/mapHeaders/Route3.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route3_h::
-	db OVERWORLD ; tileset
-	db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x)
-	dw Route3_Blocks ; blocks
-	dw Route3_TextPointers ; texts
-	dw Route3_Script ; scripts
-	db NORTH | WEST ; connections
-	NORTH_MAP_CONNECTION ROUTE_3, ROUTE_4, 25, 0, Route4_Blocks
-	WEST_MAP_CONNECTION ROUTE_3, PEWTER_CITY, -3, 1, PewterCity_Blocks
-	dw Route3_Object ; objects
diff --git a/data/mapHeaders/Route4.asm b/data/mapHeaders/Route4.asm
deleted file mode 100755
index d0d27d9c..00000000
--- a/data/mapHeaders/Route4.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route4_h::
-	db OVERWORLD ; tileset
-	db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x)
-	dw Route4_Blocks ; blocks
-	dw Route4_TextPointers ; texts
-	dw Route4_Script ; scripts
-	db SOUTH | EAST ; connections
-	SOUTH_MAP_CONNECTION ROUTE_4, ROUTE_3, -3, 22, Route3_Blocks
-	EAST_MAP_CONNECTION ROUTE_4, CERULEAN_CITY, -3, 1, CeruleanCity_Blocks, 1
-	dw Route4_Object ; objects
diff --git a/data/mapHeaders/Route5.asm b/data/mapHeaders/Route5.asm
deleted file mode 100755
index 5a0e0cd4..00000000
--- a/data/mapHeaders/Route5.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route5_h::
-	db OVERWORLD ; tileset
-	db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x)
-	dw Route5_Blocks ; blocks
-	dw Route5_TextPointers ; texts
-	dw Route5_Script ; scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_5, CERULEAN_CITY, -3, 2, CeruleanCity_Blocks
-	SOUTH_MAP_CONNECTION ROUTE_5, SAFFRON_CITY, -3, 2, SaffronCity_Blocks, 1
-	dw Route5_Object ; objects
diff --git a/data/mapHeaders/Route5Gate.asm b/data/mapHeaders/Route5Gate.asm
deleted file mode 100755
index d5de72b4..00000000
--- a/data/mapHeaders/Route5Gate.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route5Gate_h::
-	db GATE ; tileset
-	db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x)
-	dw Route5Gate_Blocks ; blocks
-	dw Route5Gate_TextPointers ; texts
-	dw Route5Gate_Script ; scripts
-	db 0 ; connections
-	dw Route5Gate_Object ; objects
diff --git a/data/mapHeaders/Route6.asm b/data/mapHeaders/Route6.asm
deleted file mode 100755
index 85cb1054..00000000
--- a/data/mapHeaders/Route6.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route6_h::
-	db OVERWORLD ; tileset
-	db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x)
-	dw Route6_Blocks ; blocks
-	dw Route6_TextPointers ; texts
-	dw Route6_Script ; scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_6, SAFFRON_CITY, -3, 2, SaffronCity_Blocks
-	SOUTH_MAP_CONNECTION ROUTE_6, VERMILION_CITY, -3, 2, VermilionCity_Blocks, 1
-	dw Route6_Object ; objects
diff --git a/data/mapHeaders/Route6Gate.asm b/data/mapHeaders/Route6Gate.asm
deleted file mode 100755
index e5896518..00000000
--- a/data/mapHeaders/Route6Gate.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route6Gate_h::
-	db GATE ; tileset
-	db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x)
-	dw Route6Gate_Blocks ; blocks
-	dw Route6Gate_TextPointers ; texts
-	dw Route6Gate_Script ; scripts
-	db 0 ; connections
-	dw Route6Gate_Object ; objects
diff --git a/data/mapHeaders/Route7.asm b/data/mapHeaders/Route7.asm
deleted file mode 100755
index cb12c75a..00000000
--- a/data/mapHeaders/Route7.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route7_h::
-	db OVERWORLD ; tileset
-	db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x)
-	dw Route7_Blocks ; blocks
-	dw Route7_TextPointers ; texts
-	dw Route7_Script ; scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_7, CELADON_CITY, -3, 1, CeladonCity_Blocks
-	EAST_MAP_CONNECTION ROUTE_7, SAFFRON_CITY, -3, 1, SaffronCity_Blocks, 1
-	dw Route7_Object ; objects
diff --git a/data/mapHeaders/Route7Gate.asm b/data/mapHeaders/Route7Gate.asm
deleted file mode 100755
index d8400dae..00000000
--- a/data/mapHeaders/Route7Gate.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route7Gate_h::
-	db GATE ; tileset
-	db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x)
-	dw Route7Gate_Blocks ; blocks
-	dw Route7Gate_TextPointers ; texts
-	dw Route7Gate_Script ; scripts
-	db 0 ; connections
-	dw Route7Gate_Object ; objects
diff --git a/data/mapHeaders/Route8.asm b/data/mapHeaders/Route8.asm
deleted file mode 100755
index 482e12f9..00000000
--- a/data/mapHeaders/Route8.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route8_h::
-	db OVERWORLD ; tileset
-	db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x)
-	dw Route8_Blocks ; blocks
-	dw Route8_TextPointers ; texts
-	dw Route8_Script ; scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_8, SAFFRON_CITY, -3, 1, SaffronCity_Blocks
-	EAST_MAP_CONNECTION ROUTE_8, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks
-	dw Route8_Object ; objects
diff --git a/data/mapHeaders/Route8Gate.asm b/data/mapHeaders/Route8Gate.asm
deleted file mode 100755
index 7599276b..00000000
--- a/data/mapHeaders/Route8Gate.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route8Gate_h::
-	db GATE ; tileset
-	db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x)
-	dw Route8Gate_Blocks ; blocks
-	dw Route8Gate_TextPointers ; texts
-	dw Route8Gate_Script ; scripts
-	db 0 ; connections
-	dw Route8Gate_Object ; objects
diff --git a/data/mapHeaders/Route9.asm b/data/mapHeaders/Route9.asm
deleted file mode 100755
index a0aef316..00000000
--- a/data/mapHeaders/Route9.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-Route9_h::
-	db OVERWORLD ; tileset
-	db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x)
-	dw Route9_Blocks ; blocks
-	dw Route9_TextPointers ; texts
-	dw Route9_Script ; scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_9, CERULEAN_CITY, -3, 1, CeruleanCity_Blocks
-	EAST_MAP_CONNECTION ROUTE_9, ROUTE_10, 0, 0, Route10_Blocks, 1
-	dw Route9_Object ; objects
diff --git a/data/mapHeaders/SSAnne1F.asm b/data/mapHeaders/SSAnne1F.asm
deleted file mode 100755
index 3b82a4ed..00000000
--- a/data/mapHeaders/SSAnne1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SSAnne1F_h::
-	db SHIP ; tileset
-	db SS_ANNE_1F_HEIGHT, SS_ANNE_1F_WIDTH ; dimensions (y, x)
-	dw SSAnne1F_Blocks ; blocks
-	dw SSAnne1F_TextPointers ; texts
-	dw SSAnne1F_Script ; scripts
-	db 0 ; connections
-	dw SSAnne1F_Object ; objects
diff --git a/data/mapHeaders/SSAnne1FRooms.asm b/data/mapHeaders/SSAnne1FRooms.asm
deleted file mode 100755
index 14260765..00000000
--- a/data/mapHeaders/SSAnne1FRooms.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SSAnne1FRooms_h::
-	db SHIP ; tileset
-	db SS_ANNE_1F_ROOMS_HEIGHT, SS_ANNE_1F_ROOMS_WIDTH ; dimensions (y, x)
-	dw SSAnne1FRooms_Blocks ; blocks
-	dw SSAnne1FRooms_TextPointers ; texts
-	dw SSAnne1FRooms_Script ; scripts
-	db 0 ; connections
-	dw SSAnne1FRooms_Object ; objects
diff --git a/data/mapHeaders/SSAnne2F.asm b/data/mapHeaders/SSAnne2F.asm
deleted file mode 100755
index aef34599..00000000
--- a/data/mapHeaders/SSAnne2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SSAnne2F_h::
-	db SHIP ; tileset
-	db SS_ANNE_2F_HEIGHT, SS_ANNE_2F_WIDTH ; dimensions (y, x)
-	dw SSAnne2F_Blocks ; blocks
-	dw SSAnne2F_TextPointers ; texts
-	dw SSAnne2F_Script ; scripts
-	db 0 ; connections
-	dw SSAnne2F_Object ; objects
diff --git a/data/mapHeaders/SSAnne2FRooms.asm b/data/mapHeaders/SSAnne2FRooms.asm
deleted file mode 100755
index 12ecca80..00000000
--- a/data/mapHeaders/SSAnne2FRooms.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SSAnne2FRooms_h::
-	db SHIP ; tileset
-	db SS_ANNE_2F_ROOMS_HEIGHT, SS_ANNE_2F_ROOMS_WIDTH ; dimensions (y, x)
-	dw SSAnne2FRooms_Blocks ; blocks
-	dw SSAnne2FRooms_TextPointers ; texts
-	dw SSAnne2FRooms_Script ; scripts
-	db 0 ; connections
-	dw SSAnne2FRooms_Object ; objects
diff --git a/data/mapHeaders/SSAnne3F.asm b/data/mapHeaders/SSAnne3F.asm
deleted file mode 100755
index 22ddfa03..00000000
--- a/data/mapHeaders/SSAnne3F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SSAnne3F_h::
-	db SHIP ; tileset
-	db SS_ANNE_3F_HEIGHT, SS_ANNE_3F_WIDTH ; dimensions (y, x)
-	dw SSAnne3F_Blocks ; blocks
-	dw SSAnne3F_TextPointers ; texts
-	dw SSAnne3F_Script ; scripts
-	db 0 ; connections
-	dw SSAnne3F_Object ; objects
diff --git a/data/mapHeaders/SSAnneB1F.asm b/data/mapHeaders/SSAnneB1F.asm
deleted file mode 100755
index 28f0bbe3..00000000
--- a/data/mapHeaders/SSAnneB1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SSAnneB1F_h::
-	db SHIP ; tileset
-	db SS_ANNE_B1F_HEIGHT, SS_ANNE_B1F_WIDTH ; dimensions (y, x)
-	dw SSAnneB1F_Blocks ; blocks
-	dw SSAnneB1F_TextPointers ; texts
-	dw SSAnneB1F_Script ; scripts
-	db 0 ; connections
-	dw SSAnneB1F_Object ; objects
diff --git a/data/mapHeaders/SSAnneB1FRooms.asm b/data/mapHeaders/SSAnneB1FRooms.asm
deleted file mode 100755
index 3d439984..00000000
--- a/data/mapHeaders/SSAnneB1FRooms.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SSAnneB1FRooms_h::
-	db SHIP ; tileset
-	db SS_ANNE_B1F_ROOMS_HEIGHT, SS_ANNE_B1F_ROOMS_WIDTH ; dimensions (y, x)
-	dw SSAnneB1FRooms_Blocks ; blocks
-	dw SSAnneB1FRooms_TextPointers ; texts
-	dw SSAnneB1FRooms_Script ; scripts
-	db 0 ; connections
-	dw SSAnneB1FRooms_Object ; objects
diff --git a/data/mapHeaders/SSAnneBow.asm b/data/mapHeaders/SSAnneBow.asm
deleted file mode 100755
index 1b1be8cb..00000000
--- a/data/mapHeaders/SSAnneBow.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SSAnneBow_h::
-	db SHIP ; tileset
-	db SS_ANNE_BOW_HEIGHT, SS_ANNE_BOW_WIDTH ; dimensions (y, x)
-	dw SSAnneBow_Blocks ; blocks
-	dw SSAnneBow_TextPointers ; texts
-	dw SSAnneBow_Script ; scripts
-	db 0 ; connections
-	dw SSAnneBow_Object ; objects
diff --git a/data/mapHeaders/SSAnneCaptainsRoom.asm b/data/mapHeaders/SSAnneCaptainsRoom.asm
deleted file mode 100755
index 78522804..00000000
--- a/data/mapHeaders/SSAnneCaptainsRoom.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SSAnneCaptainsRoom_h::
-	db SHIP ; tileset
-	db SS_ANNE_CAPTAINS_ROOM_HEIGHT, SS_ANNE_CAPTAINS_ROOM_WIDTH ; dimensions (y, x)
-	dw SSAnneCaptainsRoom_Blocks ; blocks
-	dw SSAnneCaptainsRoom_TextPointers ; texts
-	dw SSAnneCaptainsRoom_Script ; scripts
-	db 0 ; connections
-	dw SSAnneCaptainsRoom_Object ; objects
diff --git a/data/mapHeaders/SSAnneKitchen.asm b/data/mapHeaders/SSAnneKitchen.asm
deleted file mode 100755
index e4c6c472..00000000
--- a/data/mapHeaders/SSAnneKitchen.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SSAnneKitchen_h::
-	db SHIP ; tileset
-	db SS_ANNE_KITCHEN_HEIGHT, SS_ANNE_KITCHEN_WIDTH ; dimensions (y, x)
-	dw SSAnneKitchen_Blocks ; blocks
-	dw SSAnneKitchen_TextPointers ; texts
-	dw SSAnneKitchen_Script ; scripts
-	db 0 ; connections
-	dw SSAnneKitchen_Object ; objects
diff --git a/data/mapHeaders/SafariZoneCenter.asm b/data/mapHeaders/SafariZoneCenter.asm
deleted file mode 100755
index a6e98bc3..00000000
--- a/data/mapHeaders/SafariZoneCenter.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZoneCenter_h::
-	db FOREST ; tileset
-	db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x)
-	dw SafariZoneCenter_Blocks ; blocks
-	dw SafariZoneCenter_TextPointers ; texts
-	dw SafariZoneCenter_Script ; scripts
-	db 0 ; connections
-	dw SafariZoneCenter_Object ; objects
diff --git a/data/mapHeaders/SafariZoneCenterRestHouse.asm b/data/mapHeaders/SafariZoneCenterRestHouse.asm
deleted file mode 100755
index 3dc9fba2..00000000
--- a/data/mapHeaders/SafariZoneCenterRestHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZoneCenterRestHouse_h::
-	db GATE ; tileset
-	db SAFARI_ZONE_CENTER_REST_HOUSE_HEIGHT, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; dimensions (y, x)
-	dw SafariZoneCenterRestHouse_Blocks ; blocks
-	dw SafariZoneCenterRestHouse_TextPointers ; texts
-	dw SafariZoneCenterRestHouse_Script ; scripts
-	db 0 ; connections
-	dw SafariZoneCenterRestHouse_Object ; objects
diff --git a/data/mapHeaders/SafariZoneEast.asm b/data/mapHeaders/SafariZoneEast.asm
deleted file mode 100755
index 4f9c0989..00000000
--- a/data/mapHeaders/SafariZoneEast.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZoneEast_h::
-	db FOREST ; tileset
-	db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x)
-	dw SafariZoneEast_Blocks ; blocks
-	dw SafariZoneEast_TextPointers ; texts
-	dw SafariZoneEast_Script ; scripts
-	db 0 ; connections
-	dw SafariZoneEast_Object ; objects
diff --git a/data/mapHeaders/SafariZoneEastRestHouse.asm b/data/mapHeaders/SafariZoneEastRestHouse.asm
deleted file mode 100755
index 4afa17c4..00000000
--- a/data/mapHeaders/SafariZoneEastRestHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZoneEastRestHouse_h::
-	db GATE ; tileset
-	db SAFARI_ZONE_EAST_REST_HOUSE_HEIGHT, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; dimensions (y, x)
-	dw SafariZoneEastRestHouse_Blocks ; blocks
-	dw SafariZoneEastRestHouse_TextPointers ; texts
-	dw SafariZoneEastRestHouse_Script ; scripts
-	db 0 ; connections
-	dw SafariZoneEastRestHouse_Object ; objects
diff --git a/data/mapHeaders/SafariZoneGate.asm b/data/mapHeaders/SafariZoneGate.asm
deleted file mode 100755
index 49d56b52..00000000
--- a/data/mapHeaders/SafariZoneGate.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZoneGate_h::
-	db GATE ; tileset
-	db SAFARI_ZONE_GATE_HEIGHT, SAFARI_ZONE_GATE_WIDTH ; dimensions (y, x)
-	dw SafariZoneGate_Blocks ; blocks
-	dw SafariZoneGate_TextPointers ; texts
-	dw SafariZoneGate_Script ; scripts
-	db 0 ; connections
-	dw SafariZoneGate_Object ; objects
diff --git a/data/mapHeaders/SafariZoneNorth.asm b/data/mapHeaders/SafariZoneNorth.asm
deleted file mode 100755
index a8364c74..00000000
--- a/data/mapHeaders/SafariZoneNorth.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZoneNorth_h::
-	db FOREST ; tileset
-	db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x)
-	dw SafariZoneNorth_Blocks ; blocks
-	dw SafariZoneNorth_TextPointers ; texts
-	dw SafariZoneNorth_Script ; scripts
-	db 0 ; connections
-	dw SafariZoneNorth_Object ; objects
diff --git a/data/mapHeaders/SafariZoneNorthRestHouse.asm b/data/mapHeaders/SafariZoneNorthRestHouse.asm
deleted file mode 100755
index faf16451..00000000
--- a/data/mapHeaders/SafariZoneNorthRestHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZoneNorthRestHouse_h::
-	db GATE ; tileset
-	db SAFARI_ZONE_NORTH_REST_HOUSE_HEIGHT, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; dimensions (y, x)
-	dw SafariZoneNorthRestHouse_Blocks ; blocks
-	dw SafariZoneNorthRestHouse_TextPointers ; texts
-	dw SafariZoneNorthRestHouse_Script ; scripts
-	db 0 ; connections
-	dw SafariZoneNorthRestHouse_Object ; objects
diff --git a/data/mapHeaders/SafariZoneSecretHouse.asm b/data/mapHeaders/SafariZoneSecretHouse.asm
deleted file mode 100755
index 1db35d37..00000000
--- a/data/mapHeaders/SafariZoneSecretHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZoneSecretHouse_h::
-	db LAB ; tileset
-	db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x)
-	dw SafariZoneSecretHouse_Blocks ; blocks
-	dw SafariZoneSecretHouse_TextPointers ; texts
-	dw SafariZoneSecretHouse_Script ; scripts
-	db 0 ; connections
-	dw SafariZoneSecretHouse_Object ; objects
diff --git a/data/mapHeaders/SafariZoneWest.asm b/data/mapHeaders/SafariZoneWest.asm
deleted file mode 100755
index 00fd7d91..00000000
--- a/data/mapHeaders/SafariZoneWest.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZoneWest_h::
-	db FOREST ; tileset
-	db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x)
-	dw SafariZoneWest_Blocks ; blocks
-	dw SafariZoneWest_TextPointers ; texts
-	dw SafariZoneWest_Script ; scripts
-	db 0 ; connections
-	dw SafariZoneWest_Object ; objects
diff --git a/data/mapHeaders/SafariZoneWestRestHouse.asm b/data/mapHeaders/SafariZoneWestRestHouse.asm
deleted file mode 100755
index 6b630df3..00000000
--- a/data/mapHeaders/SafariZoneWestRestHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZoneWestRestHouse_h::
-	db GATE ; tileset
-	db SAFARI_ZONE_WEST_REST_HOUSE_HEIGHT, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; dimensions (y, x)
-	dw SafariZoneWestRestHouse_Blocks ; blocks
-	dw SafariZoneWestRestHouse_TextPointers ; texts
-	dw SafariZoneWestRestHouse_Script ; scripts
-	db 0 ; connections
-	dw SafariZoneWestRestHouse_Object ; objects
diff --git a/data/mapHeaders/SaffronCity.asm b/data/mapHeaders/SaffronCity.asm
deleted file mode 100755
index c7a498de..00000000
--- a/data/mapHeaders/SaffronCity.asm
+++ /dev/null
@@ -1,12 +0,0 @@
-SaffronCity_h::
-	db OVERWORLD ; tileset
-	db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x)
-	dw SaffronCity_Blocks ; blocks
-	dw SaffronCity_TextPointers ; texts
-	dw SaffronCity_Script ; scripts
-	db NORTH | SOUTH | WEST | EAST ; connections
-	NORTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_5, 5, 0, Route5_Blocks
-	SOUTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_6, 5, 0, Route6_Blocks, 1
-	WEST_MAP_CONNECTION SAFFRON_CITY, ROUTE_7, 4, 0, Route7_Blocks
-	EAST_MAP_CONNECTION SAFFRON_CITY, ROUTE_8, 4, 0, Route8_Blocks
-	dw SaffronCity_Object ; objects
diff --git a/data/mapHeaders/SaffronGym.asm b/data/mapHeaders/SaffronGym.asm
deleted file mode 100755
index d9ca460d..00000000
--- a/data/mapHeaders/SaffronGym.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SaffronGym_h::
-	db FACILITY ; tileset
-	db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x)
-	dw SaffronGym_Blocks ; blocks
-	dw SaffronGym_TextPointers ; texts
-	dw SaffronGym_Script ; scripts
-	db 0 ; connections
-	dw SaffronGym_Object ; objects
diff --git a/data/mapHeaders/SaffronMart.asm b/data/mapHeaders/SaffronMart.asm
deleted file mode 100755
index d8c477a4..00000000
--- a/data/mapHeaders/SaffronMart.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SaffronMart_h::
-	db MART ; tileset
-	db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x)
-	dw SaffronMart_Blocks ; blocks
-	dw SaffronMart_TextPointers ; texts
-	dw SaffronMart_Script ; scripts
-	db 0 ; connections
-	dw SaffronMart_Object ; objects
diff --git a/data/mapHeaders/SaffronPidgeyHouse.asm b/data/mapHeaders/SaffronPidgeyHouse.asm
deleted file mode 100755
index 8e2e8b47..00000000
--- a/data/mapHeaders/SaffronPidgeyHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SaffronPidgeyHouse_h::
-	db HOUSE ; tileset
-	db SAFFRON_PIDGEY_HOUSE_HEIGHT, SAFFRON_PIDGEY_HOUSE_WIDTH ; dimensions (y, x)
-	dw SaffronPidgeyHouse_Blocks ; blocks
-	dw SaffronPidgeyHouse_TextPointers ; texts
-	dw SaffronPidgeyHouse_Script ; scripts
-	db 0 ; connections
-	dw SaffronPidgeyHouse_Object ; objects
diff --git a/data/mapHeaders/SaffronPokecenter.asm b/data/mapHeaders/SaffronPokecenter.asm
deleted file mode 100755
index 18f7a7de..00000000
--- a/data/mapHeaders/SaffronPokecenter.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SaffronPokecenter_h::
-	db POKECENTER ; tileset
-	db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x)
-	dw SaffronPokecenter_Blocks ; blocks
-	dw SaffronPokecenter_TextPointers ; texts
-	dw SaffronPokecenter_Script ; scripts
-	db 0 ; connections
-	dw SaffronPokecenter_Object ; objects
diff --git a/data/mapHeaders/SeafoamIslands1F.asm b/data/mapHeaders/SeafoamIslands1F.asm
deleted file mode 100755
index 67df46fa..00000000
--- a/data/mapHeaders/SeafoamIslands1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SeafoamIslands1F_h::
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_1F_HEIGHT, SEAFOAM_ISLANDS_1F_WIDTH ; dimensions (y, x)
-	dw SeafoamIslands1F_Blocks ; blocks
-	dw SeafoamIslands1F_TextPointers ; texts
-	dw SeafoamIslands1F_Script ; scripts
-	db 0 ; connections
-	dw SeafoamIslands1F_Object ; objects
diff --git a/data/mapHeaders/SeafoamIslandsB1F.asm b/data/mapHeaders/SeafoamIslandsB1F.asm
deleted file mode 100755
index e1a667b6..00000000
--- a/data/mapHeaders/SeafoamIslandsB1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SeafoamIslandsB1F_h::
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_B1F_HEIGHT, SEAFOAM_ISLANDS_B1F_WIDTH ; dimensions (y, x)
-	dw SeafoamIslandsB1F_Blocks ; blocks
-	dw SeafoamIslandsB1F_TextPointers ; texts
-	dw SeafoamIslandsB1F_Script ; scripts
-	db 0 ; connections
-	dw SeafoamIslandsB1F_Object ; objects
diff --git a/data/mapHeaders/SeafoamIslandsB2F.asm b/data/mapHeaders/SeafoamIslandsB2F.asm
deleted file mode 100755
index d8074e20..00000000
--- a/data/mapHeaders/SeafoamIslandsB2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SeafoamIslandsB2F_h::
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_B2F_HEIGHT, SEAFOAM_ISLANDS_B2F_WIDTH ; dimensions (y, x)
-	dw SeafoamIslandsB2F_Blocks ; blocks
-	dw SeafoamIslandsB2F_TextPointers ; texts
-	dw SeafoamIslandsB2F_Script ; scripts
-	db 0 ; connections
-	dw SeafoamIslandsB2F_Object ; objects
diff --git a/data/mapHeaders/SeafoamIslandsB3F.asm b/data/mapHeaders/SeafoamIslandsB3F.asm
deleted file mode 100755
index 2976a45b..00000000
--- a/data/mapHeaders/SeafoamIslandsB3F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SeafoamIslandsB3F_h::
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_B3F_HEIGHT, SEAFOAM_ISLANDS_B3F_WIDTH ; dimensions (y, x)
-	dw SeafoamIslandsB3F_Blocks ; blocks
-	dw SeafoamIslandsB3F_TextPointers ; texts
-	dw SeafoamIslandsB3F_Script ; scripts
-	db 0 ; connections
-	dw SeafoamIslandsB3F_Object ; objects
diff --git a/data/mapHeaders/SeafoamIslandsB4F.asm b/data/mapHeaders/SeafoamIslandsB4F.asm
deleted file mode 100755
index fcc98db5..00000000
--- a/data/mapHeaders/SeafoamIslandsB4F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SeafoamIslandsB4F_h::
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_B4F_HEIGHT, SEAFOAM_ISLANDS_B4F_WIDTH ; dimensions (y, x)
-	dw SeafoamIslandsB4F_Blocks ; blocks
-	dw SeafoamIslandsB4F_TextPointers ; texts
-	dw SeafoamIslandsB4F_Script ; scripts
-	db 0 ; connections
-	dw SeafoamIslandsB4F_Object ; objects
diff --git a/data/mapHeaders/SilphCo10F.asm b/data/mapHeaders/SilphCo10F.asm
deleted file mode 100755
index be016e65..00000000
--- a/data/mapHeaders/SilphCo10F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SilphCo10F_h::
-	db FACILITY ; tileset
-	db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x)
-	dw SilphCo10F_Blocks ; blocks
-	dw SilphCo10F_TextPointers ; texts
-	dw SilphCo10F_Script ; scripts
-	db 0 ; connections
-	dw SilphCo10F_Object ; objects
diff --git a/data/mapHeaders/SilphCo11F.asm b/data/mapHeaders/SilphCo11F.asm
deleted file mode 100755
index c16255dd..00000000
--- a/data/mapHeaders/SilphCo11F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SilphCo11F_h::
-	db INTERIOR ; tileset
-	db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x)
-	dw SilphCo11F_Blocks ; blocks
-	dw SilphCo11F_TextPointers ; texts
-	dw SilphCo11F_Script ; scripts
-	db 0 ; connections
-	dw SilphCo11F_Object ; objects
diff --git a/data/mapHeaders/SilphCo1F.asm b/data/mapHeaders/SilphCo1F.asm
deleted file mode 100755
index 0109677e..00000000
--- a/data/mapHeaders/SilphCo1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SilphCo1F_h::
-	db FACILITY ; tileset
-	db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x)
-	dw SilphCo1F_Blocks ; blocks
-	dw SilphCo1F_TextPointers ; texts
-	dw SilphCo1F_Script ; scripts
-	db 0 ; connections
-	dw SilphCo1F_Object ; objects
diff --git a/data/mapHeaders/SilphCo2F.asm b/data/mapHeaders/SilphCo2F.asm
deleted file mode 100755
index c9a21b17..00000000
--- a/data/mapHeaders/SilphCo2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SilphCo2F_h::
-	db FACILITY ; tileset
-	db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x)
-	dw SilphCo2F_Blocks ; blocks
-	dw SilphCo2F_TextPointers ; texts
-	dw SilphCo2F_Script ; scripts
-	db 0 ; connections
-	dw SilphCo2F_Object ; objects
diff --git a/data/mapHeaders/SilphCo3F.asm b/data/mapHeaders/SilphCo3F.asm
deleted file mode 100755
index bd027dba..00000000
--- a/data/mapHeaders/SilphCo3F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SilphCo3F_h::
-	db FACILITY ; tileset
-	db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x)
-	dw SilphCo3F_Blocks ; blocks
-	dw SilphCo3F_TextPointers ; texts
-	dw SilphCo3F_Script ; scripts
-	db 0 ; connections
-	dw SilphCo3F_Object ; objects
diff --git a/data/mapHeaders/SilphCo4F.asm b/data/mapHeaders/SilphCo4F.asm
deleted file mode 100755
index 6f45da8d..00000000
--- a/data/mapHeaders/SilphCo4F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SilphCo4F_h::
-	db FACILITY ; tileset
-	db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x)
-	dw SilphCo4F_Blocks ; blocks
-	dw SilphCo4F_TextPointers ; texts
-	dw SilphCo4F_Script ; scripts
-	db 0 ; connections
-	dw SilphCo4F_Object ; objects
diff --git a/data/mapHeaders/SilphCo5F.asm b/data/mapHeaders/SilphCo5F.asm
deleted file mode 100755
index 355aa258..00000000
--- a/data/mapHeaders/SilphCo5F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SilphCo5F_h::
-	db FACILITY ; tileset
-	db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x)
-	dw SilphCo5F_Blocks ; blocks
-	dw SilphCo5F_TextPointers ; texts
-	dw SilphCo5F_Script ; scripts
-	db 0 ; connections
-	dw SilphCo5F_Object ; objects
diff --git a/data/mapHeaders/SilphCo6F.asm b/data/mapHeaders/SilphCo6F.asm
deleted file mode 100755
index 732248ac..00000000
--- a/data/mapHeaders/SilphCo6F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SilphCo6F_h::
-	db FACILITY ; tileset
-	db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x)
-	dw SilphCo6F_Blocks ; blocks
-	dw SilphCo6F_TextPointers ; texts
-	dw SilphCo6F_Script ; scripts
-	db 0 ; connections
-	dw SilphCo6F_Object ; objects
diff --git a/data/mapHeaders/SilphCo7F.asm b/data/mapHeaders/SilphCo7F.asm
deleted file mode 100755
index 116e0342..00000000
--- a/data/mapHeaders/SilphCo7F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SilphCo7F_h::
-	db FACILITY ; tileset
-	db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x)
-	dw SilphCo7F_Blocks ; blocks
-	dw SilphCo7F_TextPointers ; texts
-	dw SilphCo7F_Script ; scripts
-	db 0 ; connections
-	dw SilphCo7F_Object ; objects
diff --git a/data/mapHeaders/SilphCo8F.asm b/data/mapHeaders/SilphCo8F.asm
deleted file mode 100755
index 6d1c7faf..00000000
--- a/data/mapHeaders/SilphCo8F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SilphCo8F_h::
-	db FACILITY ; tileset
-	db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x)
-	dw SilphCo8F_Blocks ; blocks
-	dw SilphCo8F_TextPointers ; texts
-	dw SilphCo8F_Script ; scripts
-	db 0 ; connections
-	dw SilphCo8F_Object ; objects
diff --git a/data/mapHeaders/SilphCo9F.asm b/data/mapHeaders/SilphCo9F.asm
deleted file mode 100755
index 3465e2fc..00000000
--- a/data/mapHeaders/SilphCo9F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SilphCo9F_h::
-	db FACILITY ; tileset
-	db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x)
-	dw SilphCo9F_Blocks ; blocks
-	dw SilphCo9F_TextPointers ; texts
-	dw SilphCo9F_Script ; scripts
-	db 0 ; connections
-	dw SilphCo9F_Object ; objects
diff --git a/data/mapHeaders/SilphCoElevator.asm b/data/mapHeaders/SilphCoElevator.asm
deleted file mode 100755
index 5bf164da..00000000
--- a/data/mapHeaders/SilphCoElevator.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SilphCoElevator_h::
-	db LOBBY ; tileset
-	db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x)
-	dw SilphCoElevator_Blocks ; blocks
-	dw SilphCoElevator_TextPointers ; texts
-	dw SilphCoElevator_Script ; scripts
-	db 0 ; connections
-	dw SilphCoElevator_Object ; objects
diff --git a/data/mapHeaders/TradeCenter.asm b/data/mapHeaders/TradeCenter.asm
deleted file mode 100755
index 584cf3c6..00000000
--- a/data/mapHeaders/TradeCenter.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-TradeCenter_h::
-	db CLUB ; tileset
-	db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x)
-	dw TradeCenter_Blocks ; blocks
-	dw TradeCenter_TextPointers ; texts
-	dw TradeCenter_Script ; scripts
-	db 0 ; connections
-	dw TradeCenter_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathNorthSouth.asm b/data/mapHeaders/UndergroundPathNorthSouth.asm
deleted file mode 100755
index 1443d875..00000000
--- a/data/mapHeaders/UndergroundPathNorthSouth.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-UndergroundPathNorthSouth_h::
-	db UNDERGROUND ; tileset
-	db UNDERGROUND_PATH_NORTH_SOUTH_HEIGHT, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; dimensions (y, x)
-	dw UndergroundPathNorthSouth_Blocks ; blocks
-	dw UndergroundPathNorthSouth_TextPointers ; texts
-	dw UndergroundPathNorthSouth_Script ; scripts
-	db 0 ; connections
-	dw UndergroundPathNorthSouth_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathRoute5.asm b/data/mapHeaders/UndergroundPathRoute5.asm
deleted file mode 100755
index 769bd1c0..00000000
--- a/data/mapHeaders/UndergroundPathRoute5.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-UndergroundPathRoute5_h::
-	db GATE ; tileset
-	db UNDERGROUND_PATH_ROUTE_5_HEIGHT, UNDERGROUND_PATH_ROUTE_5_WIDTH ; dimensions (y, x)
-	dw UndergroundPathRoute5_Blocks ; blocks
-	dw UndergroundPathRoute5_TextPointers ; texts
-	dw UndergroundPathRoute5_Script ; scripts
-	db 0 ; connections
-	dw UndergroundPathRoute5_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathRoute6.asm b/data/mapHeaders/UndergroundPathRoute6.asm
deleted file mode 100755
index f2a5beb7..00000000
--- a/data/mapHeaders/UndergroundPathRoute6.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-UndergroundPathRoute6_h::
-	db GATE ; tileset
-	db UNDERGROUND_PATH_ROUTE_6_HEIGHT, UNDERGROUND_PATH_ROUTE_6_WIDTH ; dimensions (y, x)
-	dw UndergroundPathRoute6_Blocks ; blocks
-	dw UndergroundPathRoute6_TextPointers ; texts
-	dw UndergroundPathRoute6_Script ; scripts
-	db 0 ; connections
-	dw UndergroundPathRoute6_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathRoute7.asm b/data/mapHeaders/UndergroundPathRoute7.asm
deleted file mode 100755
index b8120ef4..00000000
--- a/data/mapHeaders/UndergroundPathRoute7.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-UndergroundPathRoute7_h::
-	db GATE ; tileset
-	db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x)
-	dw UndergroundPathRoute7_Blocks ; blocks
-	dw UndergroundPathRoute7_TextPointers ; texts
-	dw UndergroundPathRoute7_Script ; scripts
-	db 0 ; connections
-	dw UndergroundPathRoute7_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathRoute7Copy.asm b/data/mapHeaders/UndergroundPathRoute7Copy.asm
deleted file mode 100755
index 2ccdac57..00000000
--- a/data/mapHeaders/UndergroundPathRoute7Copy.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-UndergroundPathRoute7Copy_h::
-	db GATE ; tileset
-	db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x)
-	dw UndergroundPathRoute7Copy_Blocks ; blocks
-	dw UndergroundPathRoute7Copy_TextPointers ; texts
-	dw UndergroundPathRoute7Copy_Script ; scripts
-	db 0 ; connections
-	dw UndergroundPathRoute7Copy_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathRoute8.asm b/data/mapHeaders/UndergroundPathRoute8.asm
deleted file mode 100755
index a1971c3c..00000000
--- a/data/mapHeaders/UndergroundPathRoute8.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-UndergroundPathRoute8_h::
-	db GATE ; tileset
-	db UNDERGROUND_PATH_ROUTE_8_HEIGHT, UNDERGROUND_PATH_ROUTE_8_WIDTH ; dimensions (y, x)
-	dw UndergroundPathRoute8_Blocks ; blocks
-	dw UndergroundPathRoute8_TextPointers ; texts
-	dw UndergroundPathRoute8_Script ; scripts
-	db 0 ; connections
-	dw UndergroundPathRoute8_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathWestEast.asm b/data/mapHeaders/UndergroundPathWestEast.asm
deleted file mode 100755
index 1d50c103..00000000
--- a/data/mapHeaders/UndergroundPathWestEast.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-UndergroundPathWestEast_h::
-	db UNDERGROUND ; tileset
-	db UNDERGROUND_PATH_WEST_EAST_HEIGHT, UNDERGROUND_PATH_WEST_EAST_WIDTH ; dimensions (y, x)
-	dw UndergroundPathWestEast_Blocks ; blocks
-	dw UndergroundPathWestEast_TextPointers ; texts
-	dw UndergroundPathWestEast_Script ; scripts
-	db 0 ; connections
-	dw UndergroundPathWestEast_Object ; objects
diff --git a/data/mapHeaders/VermilionCity.asm b/data/mapHeaders/VermilionCity.asm
deleted file mode 100755
index 8026c214..00000000
--- a/data/mapHeaders/VermilionCity.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-VermilionCity_h::
-	db OVERWORLD ; tileset
-	db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x)
-	dw VermilionCity_Blocks ; blocks
-	dw VermilionCity_TextPointers ; texts
-	dw VermilionCity_Script ; scripts
-	db NORTH | EAST ; connections
-	NORTH_MAP_CONNECTION VERMILION_CITY, ROUTE_6, 5, 0, Route6_Blocks
-	EAST_MAP_CONNECTION VERMILION_CITY, ROUTE_11, 4, 0, Route11_Blocks
-	dw VermilionCity_Object ; objects
diff --git a/data/mapHeaders/VermilionDock.asm b/data/mapHeaders/VermilionDock.asm
deleted file mode 100755
index 0eb0edac..00000000
--- a/data/mapHeaders/VermilionDock.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-VermilionDock_h::
-	db SHIP_PORT ; tileset
-	db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x)
-	dw VermilionDock_Blocks ; blocks
-	dw VermilionDock_TextPointers ; texts
-	dw VermilionDock_Script ; scripts
-	db 0 ; connections
-	dw VermilionDock_Object ; objects
diff --git a/data/mapHeaders/VermilionGym.asm b/data/mapHeaders/VermilionGym.asm
deleted file mode 100755
index 0b5913f1..00000000
--- a/data/mapHeaders/VermilionGym.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-VermilionGym_h::
-	db GYM ; tileset
-	db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x)
-	dw VermilionGym_Blocks ; blocks
-	dw VermilionGym_TextPointers ; texts
-	dw VermilionGym_Script ; scripts
-	db 0 ; connections
-	dw VermilionGym_Object ; objects
diff --git a/data/mapHeaders/VermilionMart.asm b/data/mapHeaders/VermilionMart.asm
deleted file mode 100755
index 2fc1c79a..00000000
--- a/data/mapHeaders/VermilionMart.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-VermilionMart_h::
-	db MART ; tileset
-	db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x)
-	dw VermilionMart_Blocks ; blocks
-	dw VermilionMart_TextPointers ; texts
-	dw VermilionMart_Script ; scripts
-	db 0 ; connections
-	dw VermilionMart_Object ; objects
diff --git a/data/mapHeaders/VermilionOldRodHouse.asm b/data/mapHeaders/VermilionOldRodHouse.asm
deleted file mode 100755
index 88a6e5d8..00000000
--- a/data/mapHeaders/VermilionOldRodHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-VermilionOldRodHouse_h::
-	db HOUSE ; tileset
-	db VERMILION_OLD_ROD_HOUSE_HEIGHT, VERMILION_OLD_ROD_HOUSE_WIDTH ; dimensions (y, x)
-	dw VermilionOldRodHouse_Blocks ; blocks
-	dw VermilionOldRodHouse_TextPointers ; texts
-	dw VermilionOldRodHouse_Script ; scripts
-	db 0 ; connections
-	dw VermilionOldRodHouse_Object ; objects
diff --git a/data/mapHeaders/VermilionPidgeyHouse.asm b/data/mapHeaders/VermilionPidgeyHouse.asm
deleted file mode 100755
index d355805a..00000000
--- a/data/mapHeaders/VermilionPidgeyHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-VermilionPidgeyHouse_h::
-	db HOUSE ; tileset
-	db VERMILION_PIDGEY_HOUSE_HEIGHT, VERMILION_PIDGEY_HOUSE_WIDTH ; dimensions (y, x)
-	dw VermilionPidgeyHouse_Blocks ; blocks
-	dw VermilionPidgeyHouse_TextPointers ; texts
-	dw VermilionPidgeyHouse_Script ; scripts
-	db 0 ; connections
-	dw VermilionPidgeyHouse_Object ; objects
diff --git a/data/mapHeaders/VermilionPokecenter.asm b/data/mapHeaders/VermilionPokecenter.asm
deleted file mode 100755
index face28d6..00000000
--- a/data/mapHeaders/VermilionPokecenter.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-VermilionPokecenter_h::
-	db POKECENTER ; tileset
-	db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x)
-	dw VermilionPokecenter_Blocks ; blocks
-	dw VermilionPokecenter_TextPointers ; texts
-	dw VermilionPokecenter_Script ; scripts
-	db 0 ; connections
-	dw VermilionPokecenter_Object ; objects
diff --git a/data/mapHeaders/VermilionTradeHouse.asm b/data/mapHeaders/VermilionTradeHouse.asm
deleted file mode 100755
index cadd14b2..00000000
--- a/data/mapHeaders/VermilionTradeHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-VermilionTradeHouse_h::
-	db HOUSE ; tileset
-	db VERMILION_TRADE_HOUSE_HEIGHT, VERMILION_TRADE_HOUSE_WIDTH ; dimensions (y, x)
-	dw VermilionTradeHouse_Blocks ; blocks
-	dw VermilionTradeHouse_TextPointers ; texts
-	dw VermilionTradeHouse_Script ; scripts
-	db 0 ; connections
-	dw VermilionTradeHouse_Object ; objects
diff --git a/data/mapHeaders/VictoryRoad1F.asm b/data/mapHeaders/VictoryRoad1F.asm
deleted file mode 100755
index 239a8de3..00000000
--- a/data/mapHeaders/VictoryRoad1F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-VictoryRoad1F_h::
-	db CAVERN ; tileset
-	db VICTORY_ROAD_1F_HEIGHT, VICTORY_ROAD_1F_WIDTH ; dimensions (y, x)
-	dw VictoryRoad1F_Blocks ; blocks
-	dw VictoryRoad1F_TextPointers ; texts
-	dw VictoryRoad1F_Script ; scripts
-	db 0 ; connections
-	dw VictoryRoad1F_Object ; objects
diff --git a/data/mapHeaders/VictoryRoad2F.asm b/data/mapHeaders/VictoryRoad2F.asm
deleted file mode 100755
index a0138cb2..00000000
--- a/data/mapHeaders/VictoryRoad2F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-VictoryRoad2F_h::
-	db CAVERN ; tileset
-	db VICTORY_ROAD_2F_HEIGHT, VICTORY_ROAD_2F_WIDTH ; dimensions (y, x)
-	dw VictoryRoad2F_Blocks ; blocks
-	dw VictoryRoad2F_TextPointers ; texts
-	dw VictoryRoad2F_Script ; scripts
-	db 0 ; connections
-	dw VictoryRoad2F_Object ; objects
diff --git a/data/mapHeaders/VictoryRoad3F.asm b/data/mapHeaders/VictoryRoad3F.asm
deleted file mode 100755
index 32133afa..00000000
--- a/data/mapHeaders/VictoryRoad3F.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-VictoryRoad3F_h::
-	db CAVERN ; tileset
-	db VICTORY_ROAD_3F_HEIGHT, VICTORY_ROAD_3F_WIDTH ; dimensions (y, x)
-	dw VictoryRoad3F_Blocks ; blocks
-	dw VictoryRoad3F_TextPointers ; texts
-	dw VictoryRoad3F_Script ; scripts
-	db 0 ; connections
-	dw VictoryRoad3F_Object ; objects
diff --git a/data/mapHeaders/ViridianCity.asm b/data/mapHeaders/ViridianCity.asm
deleted file mode 100755
index 5dc56820..00000000
--- a/data/mapHeaders/ViridianCity.asm
+++ /dev/null
@@ -1,11 +0,0 @@
-ViridianCity_h::
-	db OVERWORLD ; tileset
-	db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x)
-	dw ViridianCity_Blocks ; blocks
-	dw ViridianCity_TextPointers ; texts
-	dw ViridianCity_Script ; scripts
-	db NORTH | SOUTH | WEST ; connections
-	NORTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_2, 5, 0, Route2_Blocks
-	SOUTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_1, 5, 0, Route1_Blocks, 1
-	WEST_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_22, 4, 0, Route22_Blocks
-	dw ViridianCity_Object ; objects
diff --git a/data/mapHeaders/ViridianForest.asm b/data/mapHeaders/ViridianForest.asm
deleted file mode 100755
index 557b99ed..00000000
--- a/data/mapHeaders/ViridianForest.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-ViridianForest_h::
-	db FOREST ; tileset
-	db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x)
-	dw ViridianForest_Blocks ; blocks
-	dw ViridianForest_TextPointers ; texts
-	dw ViridianForest_Script ; scripts
-	db 0 ; connections
-	dw ViridianForest_Object ; objects
diff --git a/data/mapHeaders/ViridianForestNorthGate.asm b/data/mapHeaders/ViridianForestNorthGate.asm
deleted file mode 100755
index 1fd4ac7d..00000000
--- a/data/mapHeaders/ViridianForestNorthGate.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-ViridianForestNorthGate_h::
-	db FOREST_GATE ; tileset
-	db VIRIDIAN_FOREST_NORTH_GATE_HEIGHT, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; dimensions (y, x)
-	dw ViridianForestNorthGate_Blocks ; blocks
-	dw ViridianForestNorthGate_TextPointers ; texts
-	dw ViridianForestNorthGate_Script ; scripts
-	db 0 ; connections
-	dw ViridianForestNorthGate_Object ; objects
diff --git a/data/mapHeaders/ViridianForestSouthGate.asm b/data/mapHeaders/ViridianForestSouthGate.asm
deleted file mode 100755
index 65d587f8..00000000
--- a/data/mapHeaders/ViridianForestSouthGate.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-ViridianForestSouthGate_h::
-	db FOREST_GATE ; tileset
-	db VIRIDIAN_FOREST_SOUTH_GATE_HEIGHT, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; dimensions (y, x)
-	dw ViridianForestSouthGate_Blocks ; blocks
-	dw ViridianForestSouthGate_TextPointers ; texts
-	dw ViridianForestSouthGate_Script ; scripts
-	db 0 ; connections
-	dw ViridianForestSouthGate_Object ; objects
diff --git a/data/mapHeaders/ViridianGym.asm b/data/mapHeaders/ViridianGym.asm
deleted file mode 100755
index 136a13b5..00000000
--- a/data/mapHeaders/ViridianGym.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-ViridianGym_h::
-	db GYM ; tileset
-	db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x)
-	dw ViridianGym_Blocks ; blocks
-	dw ViridianGym_TextPointers ; texts
-	dw ViridianGym_Script ; scripts
-	db 0 ; connections
-	dw ViridianGym_Object ; objects
diff --git a/data/mapHeaders/ViridianMart.asm b/data/mapHeaders/ViridianMart.asm
deleted file mode 100755
index 341caa86..00000000
--- a/data/mapHeaders/ViridianMart.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-ViridianMart_h::
-	db MART ; tileset
-	db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x)
-	dw ViridianMart_Blocks ; blocks
-	dw ViridianMart_TextPointers ; texts
-	dw ViridianMart_Script ; scripts
-	db 0 ; connections
-	dw ViridianMart_Object ; objects
diff --git a/data/mapHeaders/ViridianNicknameHouse.asm b/data/mapHeaders/ViridianNicknameHouse.asm
deleted file mode 100755
index db817b2f..00000000
--- a/data/mapHeaders/ViridianNicknameHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-ViridianNicknameHouse_h::
-	db HOUSE ; tileset
-	db VIRIDIAN_NICKNAME_HOUSE_HEIGHT, VIRIDIAN_NICKNAME_HOUSE_WIDTH ; dimensions (y, x)
-	dw ViridianNicknameHouse_Blocks ; blocks
-	dw ViridianNicknameHouse_TextPointers ; texts
-	dw ViridianNicknameHouse_Script ; scripts
-	db 0 ; connections
-	dw ViridianNicknameHouse_Object ; objects
diff --git a/data/mapHeaders/ViridianPokecenter.asm b/data/mapHeaders/ViridianPokecenter.asm
deleted file mode 100755
index 203abf06..00000000
--- a/data/mapHeaders/ViridianPokecenter.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-ViridianPokecenter_h::
-	db POKECENTER ; tileset
-	db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x)
-	dw ViridianPokecenter_Blocks ; blocks
-	dw ViridianPokecenter_TextPointers ; texts
-	dw ViridianPokecenter_Script ; scripts
-	db 0 ; connections
-	dw ViridianPokecenter_Object ; objects
diff --git a/data/mapHeaders/ViridianSchoolHouse.asm b/data/mapHeaders/ViridianSchoolHouse.asm
deleted file mode 100755
index fdf1090a..00000000
--- a/data/mapHeaders/ViridianSchoolHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-ViridianSchoolHouse_h::
-	db HOUSE ; tileset
-	db VIRIDIAN_SCHOOL_HOUSE_HEIGHT, VIRIDIAN_SCHOOL_HOUSE_WIDTH ; dimensions (y, x)
-	dw ViridianSchoolHouse_Blocks ; blocks
-	dw ViridianSchoolHouse_TextPointers ; texts
-	dw ViridianSchoolHouse_Script ; scripts
-	db 0 ; connections
-	dw ViridianSchoolHouse_Object ; objects
diff --git a/data/mapHeaders/WardensHouse.asm b/data/mapHeaders/WardensHouse.asm
deleted file mode 100755
index 6c6b0f6c..00000000
--- a/data/mapHeaders/WardensHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-WardensHouse_h::
-	db LAB ; tileset
-	db WARDENS_HOUSE_HEIGHT, WARDENS_HOUSE_WIDTH ; dimensions (y, x)
-	dw WardensHouse_Blocks ; blocks
-	dw WardensHouse_TextPointers ; texts
-	dw WardensHouse_Script ; scripts
-	db 0 ; connections
-	dw WardensHouse_Object ; objects
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/maps/headers/AgathasRoom.asm b/data/maps/headers/AgathasRoom.asm
new file mode 100755
index 00000000..d04e0cfd
--- /dev/null
+++ b/data/maps/headers/AgathasRoom.asm
@@ -0,0 +1,3 @@
+
+	map_header AgathasRoom, AGATHAS_ROOM, CEMETERY, 0
+	end_map_header
diff --git a/data/maps/headers/BikeShop.asm b/data/maps/headers/BikeShop.asm
new file mode 100755
index 00000000..b4b520e2
--- /dev/null
+++ b/data/maps/headers/BikeShop.asm
@@ -0,0 +1,3 @@
+
+	map_header BikeShop, BIKE_SHOP, CLUB, 0
+	end_map_header
diff --git a/data/maps/headers/BillsHouse.asm b/data/maps/headers/BillsHouse.asm
new file mode 100755
index 00000000..6063175d
--- /dev/null
+++ b/data/maps/headers/BillsHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header BillsHouse, BILLS_HOUSE, INTERIOR, 0
+	end_map_header
diff --git a/data/maps/headers/BluesHouse.asm b/data/maps/headers/BluesHouse.asm
new file mode 100755
index 00000000..33cee254
--- /dev/null
+++ b/data/maps/headers/BluesHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header BluesHouse, BLUES_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/BrunosRoom.asm b/data/maps/headers/BrunosRoom.asm
new file mode 100755
index 00000000..a0b2d4fd
--- /dev/null
+++ b/data/maps/headers/BrunosRoom.asm
@@ -0,0 +1,3 @@
+
+	map_header BrunosRoom, BRUNOS_ROOM, GYM, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonChiefHouse.asm b/data/maps/headers/CeladonChiefHouse.asm
new file mode 100755
index 00000000..34f17273
--- /dev/null
+++ b/data/maps/headers/CeladonChiefHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonChiefHouse, CELADON_CHIEF_HOUSE, MANSION, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonCity.asm b/data/maps/headers/CeladonCity.asm
new file mode 100755
index 00000000..6faa6f48
--- /dev/null
+++ b/data/maps/headers/CeladonCity.asm
@@ -0,0 +1,5 @@
+
+	map_header CeladonCity, CELADON_CITY, OVERWORLD, WEST | EAST
+	connection west, Route16, ROUTE_16, 4
+	connection east, Route7, ROUTE_7, 4
+	end_map_header
diff --git a/data/maps/headers/CeladonDiner.asm b/data/maps/headers/CeladonDiner.asm
new file mode 100755
index 00000000..b18d9633
--- /dev/null
+++ b/data/maps/headers/CeladonDiner.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonDiner, CELADON_DINER, LOBBY, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonGym.asm b/data/maps/headers/CeladonGym.asm
new file mode 100755
index 00000000..2302c65a
--- /dev/null
+++ b/data/maps/headers/CeladonGym.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonGym, CELADON_GYM, GYM, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonHotel.asm b/data/maps/headers/CeladonHotel.asm
new file mode 100755
index 00000000..2339c14d
--- /dev/null
+++ b/data/maps/headers/CeladonHotel.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonHotel, CELADON_HOTEL, POKECENTER, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonMansion1F.asm b/data/maps/headers/CeladonMansion1F.asm
new file mode 100755
index 00000000..45970028
--- /dev/null
+++ b/data/maps/headers/CeladonMansion1F.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonMansion1F, CELADON_MANSION_1F, MANSION, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonMansion2F.asm b/data/maps/headers/CeladonMansion2F.asm
new file mode 100755
index 00000000..d5e3e77b
--- /dev/null
+++ b/data/maps/headers/CeladonMansion2F.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonMansion2F, CELADON_MANSION_2F, MANSION, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonMansion3F.asm b/data/maps/headers/CeladonMansion3F.asm
new file mode 100755
index 00000000..7566caad
--- /dev/null
+++ b/data/maps/headers/CeladonMansion3F.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonMansion3F, CELADON_MANSION_3F, MANSION, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonMansionRoof.asm b/data/maps/headers/CeladonMansionRoof.asm
new file mode 100755
index 00000000..9cbae6f6
--- /dev/null
+++ b/data/maps/headers/CeladonMansionRoof.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonMansionRoof, CELADON_MANSION_ROOF, MANSION, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonMansionRoofHouse.asm b/data/maps/headers/CeladonMansionRoofHouse.asm
new file mode 100755
index 00000000..cb80fac8
--- /dev/null
+++ b/data/maps/headers/CeladonMansionRoofHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonMart1F.asm b/data/maps/headers/CeladonMart1F.asm
new file mode 100755
index 00000000..30bd9ba9
--- /dev/null
+++ b/data/maps/headers/CeladonMart1F.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonMart1F, CELADON_MART_1F, LOBBY, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonMart2F.asm b/data/maps/headers/CeladonMart2F.asm
new file mode 100755
index 00000000..d78dfe28
--- /dev/null
+++ b/data/maps/headers/CeladonMart2F.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonMart2F, CELADON_MART_2F, LOBBY, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonMart3F.asm b/data/maps/headers/CeladonMart3F.asm
new file mode 100755
index 00000000..ad415eee
--- /dev/null
+++ b/data/maps/headers/CeladonMart3F.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonMart3F, CELADON_MART_3F, LOBBY, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonMart4F.asm b/data/maps/headers/CeladonMart4F.asm
new file mode 100755
index 00000000..b9ce5b34
--- /dev/null
+++ b/data/maps/headers/CeladonMart4F.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonMart4F, CELADON_MART_4F, LOBBY, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonMart5F.asm b/data/maps/headers/CeladonMart5F.asm
new file mode 100755
index 00000000..04d65b2b
--- /dev/null
+++ b/data/maps/headers/CeladonMart5F.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonMart5F, CELADON_MART_5F, LOBBY, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonMartElevator.asm b/data/maps/headers/CeladonMartElevator.asm
new file mode 100755
index 00000000..2a98ccb0
--- /dev/null
+++ b/data/maps/headers/CeladonMartElevator.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonMartElevator, CELADON_MART_ELEVATOR, LOBBY, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonMartRoof.asm b/data/maps/headers/CeladonMartRoof.asm
new file mode 100755
index 00000000..823ff25f
--- /dev/null
+++ b/data/maps/headers/CeladonMartRoof.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonMartRoof, CELADON_MART_ROOF, LOBBY, 0
+	end_map_header
diff --git a/data/maps/headers/CeladonPokecenter.asm b/data/maps/headers/CeladonPokecenter.asm
new file mode 100755
index 00000000..378a41ec
--- /dev/null
+++ b/data/maps/headers/CeladonPokecenter.asm
@@ -0,0 +1,3 @@
+
+	map_header CeladonPokecenter, CELADON_POKECENTER, POKECENTER, 0
+	end_map_header
diff --git a/data/maps/headers/CeruleanBadgeHouse.asm b/data/maps/headers/CeruleanBadgeHouse.asm
new file mode 100755
index 00000000..47a97b14
--- /dev/null
+++ b/data/maps/headers/CeruleanBadgeHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header CeruleanBadgeHouse, CERULEAN_BADGE_HOUSE, SHIP, 0
+	end_map_header
diff --git a/data/maps/headers/CeruleanCave1F.asm b/data/maps/headers/CeruleanCave1F.asm
new file mode 100755
index 00000000..7c80bbeb
--- /dev/null
+++ b/data/maps/headers/CeruleanCave1F.asm
@@ -0,0 +1,3 @@
+
+	map_header CeruleanCave1F, CERULEAN_CAVE_1F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/CeruleanCave2F.asm b/data/maps/headers/CeruleanCave2F.asm
new file mode 100755
index 00000000..353e265b
--- /dev/null
+++ b/data/maps/headers/CeruleanCave2F.asm
@@ -0,0 +1,3 @@
+
+	map_header CeruleanCave2F, CERULEAN_CAVE_2F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/CeruleanCaveB1F.asm b/data/maps/headers/CeruleanCaveB1F.asm
new file mode 100755
index 00000000..d759aa6b
--- /dev/null
+++ b/data/maps/headers/CeruleanCaveB1F.asm
@@ -0,0 +1,3 @@
+
+	map_header CeruleanCaveB1F, CERULEAN_CAVE_B1F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/CeruleanCity.asm b/data/maps/headers/CeruleanCity.asm
new file mode 100755
index 00000000..c925713c
--- /dev/null
+++ b/data/maps/headers/CeruleanCity.asm
@@ -0,0 +1,7 @@
+
+	map_header CeruleanCity, CERULEAN_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST
+	connection north, Route24, ROUTE_24, 5
+	connection south, Route5, ROUTE_5, 5
+	connection west, Route4, ROUTE_4, 4
+	connection east, Route9, ROUTE_9, 4
+	end_map_header
diff --git a/data/maps/headers/CeruleanGym.asm b/data/maps/headers/CeruleanGym.asm
new file mode 100755
index 00000000..b1010ac3
--- /dev/null
+++ b/data/maps/headers/CeruleanGym.asm
@@ -0,0 +1,3 @@
+
+	map_header CeruleanGym, CERULEAN_GYM, GYM, 0
+	end_map_header
diff --git a/data/maps/headers/CeruleanMart.asm b/data/maps/headers/CeruleanMart.asm
new file mode 100755
index 00000000..2ee31666
--- /dev/null
+++ b/data/maps/headers/CeruleanMart.asm
@@ -0,0 +1,3 @@
+
+	map_header CeruleanMart, CERULEAN_MART, MART, 0
+	end_map_header
diff --git a/data/maps/headers/CeruleanPokecenter.asm b/data/maps/headers/CeruleanPokecenter.asm
new file mode 100755
index 00000000..b79e7aff
--- /dev/null
+++ b/data/maps/headers/CeruleanPokecenter.asm
@@ -0,0 +1,3 @@
+
+	map_header CeruleanPokecenter, CERULEAN_POKECENTER, POKECENTER, 0
+	end_map_header
diff --git a/data/maps/headers/CeruleanTradeHouse.asm b/data/maps/headers/CeruleanTradeHouse.asm
new file mode 100755
index 00000000..20970b77
--- /dev/null
+++ b/data/maps/headers/CeruleanTradeHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header CeruleanTradeHouse, CERULEAN_TRADE_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/CeruleanTrashedHouse.asm b/data/maps/headers/CeruleanTrashedHouse.asm
new file mode 100755
index 00000000..192a4195
--- /dev/null
+++ b/data/maps/headers/CeruleanTrashedHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header CeruleanTrashedHouse, CERULEAN_TRASHED_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/ChampionsRoom.asm b/data/maps/headers/ChampionsRoom.asm
new file mode 100755
index 00000000..aadc70a6
--- /dev/null
+++ b/data/maps/headers/ChampionsRoom.asm
@@ -0,0 +1,3 @@
+
+	map_header ChampionsRoom, CHAMPIONS_ROOM, GYM, $0
+	end_map_header
diff --git a/data/maps/headers/CinnabarGym.asm b/data/maps/headers/CinnabarGym.asm
new file mode 100755
index 00000000..cc6dc1d7
--- /dev/null
+++ b/data/maps/headers/CinnabarGym.asm
@@ -0,0 +1,3 @@
+
+	map_header CinnabarGym, CINNABAR_GYM, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/CinnabarIsland.asm b/data/maps/headers/CinnabarIsland.asm
new file mode 100755
index 00000000..a94498be
--- /dev/null
+++ b/data/maps/headers/CinnabarIsland.asm
@@ -0,0 +1,5 @@
+
+	map_header CinnabarIsland, CINNABAR_ISLAND, OVERWORLD, NORTH | EAST
+	connection north, Route21, ROUTE_21, 0
+	connection east, Route20, ROUTE_20, 0
+	end_map_header
diff --git a/data/maps/headers/CinnabarLab.asm b/data/maps/headers/CinnabarLab.asm
new file mode 100755
index 00000000..e8081e75
--- /dev/null
+++ b/data/maps/headers/CinnabarLab.asm
@@ -0,0 +1,3 @@
+
+	map_header CinnabarLab, CINNABAR_LAB, LAB, 0
+	end_map_header
diff --git a/data/maps/headers/CinnabarLabFossilRoom.asm b/data/maps/headers/CinnabarLabFossilRoom.asm
new file mode 100755
index 00000000..3cb88437
--- /dev/null
+++ b/data/maps/headers/CinnabarLabFossilRoom.asm
@@ -0,0 +1,3 @@
+
+	map_header CinnabarLabFossilRoom, CINNABAR_LAB_FOSSIL_ROOM, LAB, 0
+	end_map_header
diff --git a/data/maps/headers/CinnabarLabMetronomeRoom.asm b/data/maps/headers/CinnabarLabMetronomeRoom.asm
new file mode 100755
index 00000000..d77338c8
--- /dev/null
+++ b/data/maps/headers/CinnabarLabMetronomeRoom.asm
@@ -0,0 +1,3 @@
+
+	map_header CinnabarLabMetronomeRoom, CINNABAR_LAB_METRONOME_ROOM, LAB, 0
+	end_map_header
diff --git a/data/maps/headers/CinnabarLabTradeRoom.asm b/data/maps/headers/CinnabarLabTradeRoom.asm
new file mode 100755
index 00000000..c23d9c15
--- /dev/null
+++ b/data/maps/headers/CinnabarLabTradeRoom.asm
@@ -0,0 +1,3 @@
+
+	map_header CinnabarLabTradeRoom, CINNABAR_LAB_TRADE_ROOM, LAB, 0
+	end_map_header
diff --git a/data/maps/headers/CinnabarMart.asm b/data/maps/headers/CinnabarMart.asm
new file mode 100755
index 00000000..c68d582a
--- /dev/null
+++ b/data/maps/headers/CinnabarMart.asm
@@ -0,0 +1,3 @@
+
+	map_header CinnabarMart, CINNABAR_MART, MART, 0
+	end_map_header
diff --git a/data/maps/headers/CinnabarPokecenter.asm b/data/maps/headers/CinnabarPokecenter.asm
new file mode 100755
index 00000000..d910133b
--- /dev/null
+++ b/data/maps/headers/CinnabarPokecenter.asm
@@ -0,0 +1,3 @@
+
+	map_header CinnabarPokecenter, CINNABAR_POKECENTER, POKECENTER, 0
+	end_map_header
diff --git a/data/maps/headers/Colosseum.asm b/data/maps/headers/Colosseum.asm
new file mode 100755
index 00000000..faf03eb4
--- /dev/null
+++ b/data/maps/headers/Colosseum.asm
@@ -0,0 +1,3 @@
+
+	map_header Colosseum, COLOSSEUM, CLUB, 0
+	end_map_header
diff --git a/data/maps/headers/CopycatsHouse1F.asm b/data/maps/headers/CopycatsHouse1F.asm
new file mode 100755
index 00000000..532cef93
--- /dev/null
+++ b/data/maps/headers/CopycatsHouse1F.asm
@@ -0,0 +1,3 @@
+
+	map_header CopycatsHouse1F, COPYCATS_HOUSE_1F, REDS_HOUSE_1, 0
+	end_map_header
diff --git a/data/maps/headers/CopycatsHouse2F.asm b/data/maps/headers/CopycatsHouse2F.asm
new file mode 100755
index 00000000..38b1fbbb
--- /dev/null
+++ b/data/maps/headers/CopycatsHouse2F.asm
@@ -0,0 +1,3 @@
+
+	map_header CopycatsHouse2F, COPYCATS_HOUSE_2F, REDS_HOUSE_2, 0
+	end_map_header
diff --git a/data/maps/headers/Daycare.asm b/data/maps/headers/Daycare.asm
new file mode 100755
index 00000000..dabeedd9
--- /dev/null
+++ b/data/maps/headers/Daycare.asm
@@ -0,0 +1,3 @@
+
+	map_header Daycare, DAYCARE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/DiglettsCave.asm b/data/maps/headers/DiglettsCave.asm
new file mode 100755
index 00000000..d3777d31
--- /dev/null
+++ b/data/maps/headers/DiglettsCave.asm
@@ -0,0 +1,3 @@
+
+	map_header DiglettsCave, DIGLETTS_CAVE, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/DiglettsCaveRoute11.asm b/data/maps/headers/DiglettsCaveRoute11.asm
new file mode 100755
index 00000000..d8bdd704
--- /dev/null
+++ b/data/maps/headers/DiglettsCaveRoute11.asm
@@ -0,0 +1,3 @@
+
+	map_header DiglettsCaveRoute11, DIGLETTS_CAVE_ROUTE_11, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/DiglettsCaveRoute2.asm b/data/maps/headers/DiglettsCaveRoute2.asm
new file mode 100755
index 00000000..86f5ae35
--- /dev/null
+++ b/data/maps/headers/DiglettsCaveRoute2.asm
@@ -0,0 +1,3 @@
+
+	map_header DiglettsCaveRoute2, DIGLETTS_CAVE_ROUTE_2, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/FightingDojo.asm b/data/maps/headers/FightingDojo.asm
new file mode 100755
index 00000000..7ecadc57
--- /dev/null
+++ b/data/maps/headers/FightingDojo.asm
@@ -0,0 +1,3 @@
+
+	map_header FightingDojo, FIGHTING_DOJO, DOJO, 0
+	end_map_header
diff --git a/data/maps/headers/FuchsiaBillsGrandpasHouse.asm b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm
new file mode 100755
index 00000000..10ba48e9
--- /dev/null
+++ b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header FuchsiaBillsGrandpasHouse, FUCHSIA_BILLS_GRANDPAS_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/FuchsiaCity.asm b/data/maps/headers/FuchsiaCity.asm
new file mode 100755
index 00000000..6028bce0
--- /dev/null
+++ b/data/maps/headers/FuchsiaCity.asm
@@ -0,0 +1,6 @@
+
+	map_header FuchsiaCity, FUCHSIA_CITY, OVERWORLD, SOUTH | WEST | EAST
+	connection south, Route19, ROUTE_19, 5
+	connection west, Route18, ROUTE_18, 4
+	connection east, Route15, ROUTE_15, 4
+	end_map_header
diff --git a/data/maps/headers/FuchsiaGoodRodHouse.asm b/data/maps/headers/FuchsiaGoodRodHouse.asm
new file mode 100755
index 00000000..d21611c1
--- /dev/null
+++ b/data/maps/headers/FuchsiaGoodRodHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header FuchsiaGoodRodHouse, FUCHSIA_GOOD_ROD_HOUSE, SHIP, 0
+	end_map_header
diff --git a/data/maps/headers/FuchsiaGym.asm b/data/maps/headers/FuchsiaGym.asm
new file mode 100755
index 00000000..44be2971
--- /dev/null
+++ b/data/maps/headers/FuchsiaGym.asm
@@ -0,0 +1,3 @@
+
+	map_header FuchsiaGym, FUCHSIA_GYM, GYM, 0
+	end_map_header
diff --git a/data/maps/headers/FuchsiaMart.asm b/data/maps/headers/FuchsiaMart.asm
new file mode 100755
index 00000000..120fe305
--- /dev/null
+++ b/data/maps/headers/FuchsiaMart.asm
@@ -0,0 +1,3 @@
+
+	map_header FuchsiaMart, FUCHSIA_MART, MART, 0
+	end_map_header
diff --git a/data/maps/headers/FuchsiaMeetingRoom.asm b/data/maps/headers/FuchsiaMeetingRoom.asm
new file mode 100755
index 00000000..a5ab4f04
--- /dev/null
+++ b/data/maps/headers/FuchsiaMeetingRoom.asm
@@ -0,0 +1,3 @@
+
+	map_header FuchsiaMeetingRoom, FUCHSIA_MEETING_ROOM, LAB, 0
+	end_map_header
diff --git a/data/maps/headers/FuchsiaPokecenter.asm b/data/maps/headers/FuchsiaPokecenter.asm
new file mode 100755
index 00000000..c1c683bd
--- /dev/null
+++ b/data/maps/headers/FuchsiaPokecenter.asm
@@ -0,0 +1,3 @@
+
+	map_header FuchsiaPokecenter, FUCHSIA_POKECENTER, POKECENTER, 0
+	end_map_header
diff --git a/data/maps/headers/GameCorner.asm b/data/maps/headers/GameCorner.asm
new file mode 100755
index 00000000..ad367b93
--- /dev/null
+++ b/data/maps/headers/GameCorner.asm
@@ -0,0 +1,3 @@
+
+	map_header GameCorner, GAME_CORNER, LOBBY, 0
+	end_map_header
diff --git a/data/maps/headers/GameCornerPrizeRoom.asm b/data/maps/headers/GameCornerPrizeRoom.asm
new file mode 100755
index 00000000..4668cbb8
--- /dev/null
+++ b/data/maps/headers/GameCornerPrizeRoom.asm
@@ -0,0 +1,3 @@
+
+	map_header GameCornerPrizeRoom, GAME_CORNER_PRIZE_ROOM, LOBBY, 0
+	end_map_header
diff --git a/data/maps/headers/HallOfFame.asm b/data/maps/headers/HallOfFame.asm
new file mode 100755
index 00000000..e2dc3fb3
--- /dev/null
+++ b/data/maps/headers/HallOfFame.asm
@@ -0,0 +1,3 @@
+
+	map_header HallOfFame, HALL_OF_FAME, GYM, 0
+	end_map_header
diff --git a/data/maps/headers/IndigoPlateau.asm b/data/maps/headers/IndigoPlateau.asm
new file mode 100755
index 00000000..ff394dfe
--- /dev/null
+++ b/data/maps/headers/IndigoPlateau.asm
@@ -0,0 +1,4 @@
+
+	map_header IndigoPlateau, INDIGO_PLATEAU, PLATEAU, SOUTH
+	connection south, Route23, ROUTE_23, 0
+	end_map_header
diff --git a/data/maps/headers/IndigoPlateauLobby.asm b/data/maps/headers/IndigoPlateauLobby.asm
new file mode 100755
index 00000000..b13afa12
--- /dev/null
+++ b/data/maps/headers/IndigoPlateauLobby.asm
@@ -0,0 +1,3 @@
+
+	map_header IndigoPlateauLobby, INDIGO_PLATEAU_LOBBY, MART, 0
+	end_map_header
diff --git a/data/maps/headers/LancesRoom.asm b/data/maps/headers/LancesRoom.asm
new file mode 100755
index 00000000..0b69970e
--- /dev/null
+++ b/data/maps/headers/LancesRoom.asm
@@ -0,0 +1,3 @@
+
+	map_header LancesRoom, LANCES_ROOM, DOJO, 0
+	end_map_header
diff --git a/data/maps/headers/LavenderCuboneHouse.asm b/data/maps/headers/LavenderCuboneHouse.asm
new file mode 100755
index 00000000..dfd38ff1
--- /dev/null
+++ b/data/maps/headers/LavenderCuboneHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header LavenderCuboneHouse, LAVENDER_CUBONE_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/LavenderMart.asm b/data/maps/headers/LavenderMart.asm
new file mode 100755
index 00000000..82c239e6
--- /dev/null
+++ b/data/maps/headers/LavenderMart.asm
@@ -0,0 +1,3 @@
+
+	map_header LavenderMart, LAVENDER_MART, MART, 0
+	end_map_header
diff --git a/data/maps/headers/LavenderPokecenter.asm b/data/maps/headers/LavenderPokecenter.asm
new file mode 100755
index 00000000..c0cd0adf
--- /dev/null
+++ b/data/maps/headers/LavenderPokecenter.asm
@@ -0,0 +1,3 @@
+
+	map_header LavenderPokecenter, LAVENDER_POKECENTER, POKECENTER, 0
+	end_map_header
diff --git a/data/maps/headers/LavenderTown.asm b/data/maps/headers/LavenderTown.asm
new file mode 100755
index 00000000..7c1c9c46
--- /dev/null
+++ b/data/maps/headers/LavenderTown.asm
@@ -0,0 +1,6 @@
+
+	map_header LavenderTown, LAVENDER_TOWN, OVERWORLD, NORTH | SOUTH | WEST
+	connection north, Route10, ROUTE_10, 0
+	connection south, Route12, ROUTE_12, 0
+	connection west, Route8, ROUTE_8, 0
+	end_map_header
diff --git a/data/maps/headers/LoreleisRoom.asm b/data/maps/headers/LoreleisRoom.asm
new file mode 100755
index 00000000..feff946c
--- /dev/null
+++ b/data/maps/headers/LoreleisRoom.asm
@@ -0,0 +1,3 @@
+
+	map_header LoreleisRoom, LORELEIS_ROOM, GYM, 0
+	end_map_header
diff --git a/data/maps/headers/MrFujisHouse.asm b/data/maps/headers/MrFujisHouse.asm
new file mode 100755
index 00000000..023cb501
--- /dev/null
+++ b/data/maps/headers/MrFujisHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header MrFujisHouse, MR_FUJIS_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/MrPsychicsHouse.asm b/data/maps/headers/MrPsychicsHouse.asm
new file mode 100755
index 00000000..628db044
--- /dev/null
+++ b/data/maps/headers/MrPsychicsHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header MrPsychicsHouse, MR_PSYCHICS_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/MtMoon1F.asm b/data/maps/headers/MtMoon1F.asm
new file mode 100755
index 00000000..8de2be3e
--- /dev/null
+++ b/data/maps/headers/MtMoon1F.asm
@@ -0,0 +1,3 @@
+
+	map_header MtMoon1F, MT_MOON_1F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/MtMoonB1F.asm b/data/maps/headers/MtMoonB1F.asm
new file mode 100755
index 00000000..9c97b5c7
--- /dev/null
+++ b/data/maps/headers/MtMoonB1F.asm
@@ -0,0 +1,3 @@
+
+	map_header MtMoonB1F, MT_MOON_B1F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/MtMoonB2F.asm b/data/maps/headers/MtMoonB2F.asm
new file mode 100755
index 00000000..0ed1f96e
--- /dev/null
+++ b/data/maps/headers/MtMoonB2F.asm
@@ -0,0 +1,3 @@
+
+	map_header MtMoonB2F, MT_MOON_B2F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/MtMoonPokecenter.asm b/data/maps/headers/MtMoonPokecenter.asm
new file mode 100755
index 00000000..0425eae7
--- /dev/null
+++ b/data/maps/headers/MtMoonPokecenter.asm
@@ -0,0 +1,3 @@
+
+	map_header MtMoonPokecenter, MT_MOON_POKECENTER, POKECENTER, 0
+	end_map_header
diff --git a/data/maps/headers/Museum1F.asm b/data/maps/headers/Museum1F.asm
new file mode 100755
index 00000000..d92176d2
--- /dev/null
+++ b/data/maps/headers/Museum1F.asm
@@ -0,0 +1,3 @@
+
+	map_header Museum1F, MUSEUM_1F, MUSEUM, 0
+	end_map_header
diff --git a/data/maps/headers/Museum2F.asm b/data/maps/headers/Museum2F.asm
new file mode 100755
index 00000000..d5bf8918
--- /dev/null
+++ b/data/maps/headers/Museum2F.asm
@@ -0,0 +1,3 @@
+
+	map_header Museum2F, MUSEUM_2F, MUSEUM, 0
+	end_map_header
diff --git a/data/maps/headers/NameRatersHouse.asm b/data/maps/headers/NameRatersHouse.asm
new file mode 100755
index 00000000..3f9010f0
--- /dev/null
+++ b/data/maps/headers/NameRatersHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header NameRatersHouse, NAME_RATERS_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/OaksLab.asm b/data/maps/headers/OaksLab.asm
new file mode 100755
index 00000000..42bb76e8
--- /dev/null
+++ b/data/maps/headers/OaksLab.asm
@@ -0,0 +1,3 @@
+
+	map_header OaksLab, OAKS_LAB, DOJO, 0
+	end_map_header
diff --git a/data/maps/headers/PalletTown.asm b/data/maps/headers/PalletTown.asm
new file mode 100755
index 00000000..2745bdc1
--- /dev/null
+++ b/data/maps/headers/PalletTown.asm
@@ -0,0 +1,5 @@
+
+	map_header PalletTown, PALLET_TOWN, OVERWORLD, NORTH | SOUTH
+	connection north, Route1, ROUTE_1, 0
+	connection south, Route21, ROUTE_21, 0
+	end_map_header
diff --git a/data/maps/headers/PewterCity.asm b/data/maps/headers/PewterCity.asm
new file mode 100755
index 00000000..268adb7a
--- /dev/null
+++ b/data/maps/headers/PewterCity.asm
@@ -0,0 +1,5 @@
+
+	map_header PewterCity, PEWTER_CITY, OVERWORLD, SOUTH | EAST
+	connection south, Route2, ROUTE_2, 5
+	connection east, Route3, ROUTE_3, 4
+	end_map_header
diff --git a/data/maps/headers/PewterGym.asm b/data/maps/headers/PewterGym.asm
new file mode 100755
index 00000000..a1659e42
--- /dev/null
+++ b/data/maps/headers/PewterGym.asm
@@ -0,0 +1,3 @@
+
+	map_header PewterGym, PEWTER_GYM, GYM, 0
+	end_map_header
diff --git a/data/maps/headers/PewterMart.asm b/data/maps/headers/PewterMart.asm
new file mode 100755
index 00000000..c9b24eb2
--- /dev/null
+++ b/data/maps/headers/PewterMart.asm
@@ -0,0 +1,3 @@
+
+	map_header PewterMart, PEWTER_MART, MART, 0
+	end_map_header
diff --git a/data/maps/headers/PewterNidoranHouse.asm b/data/maps/headers/PewterNidoranHouse.asm
new file mode 100755
index 00000000..ee2e46ca
--- /dev/null
+++ b/data/maps/headers/PewterNidoranHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header PewterNidoranHouse, PEWTER_NIDORAN_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/PewterPokecenter.asm b/data/maps/headers/PewterPokecenter.asm
new file mode 100755
index 00000000..4e420bf8
--- /dev/null
+++ b/data/maps/headers/PewterPokecenter.asm
@@ -0,0 +1,3 @@
+
+	map_header PewterPokecenter, PEWTER_POKECENTER, POKECENTER, 0
+	end_map_header
diff --git a/data/maps/headers/PewterSpeechHouse.asm b/data/maps/headers/PewterSpeechHouse.asm
new file mode 100755
index 00000000..a378d61e
--- /dev/null
+++ b/data/maps/headers/PewterSpeechHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header PewterSpeechHouse, PEWTER_SPEECH_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/PokemonFanClub.asm b/data/maps/headers/PokemonFanClub.asm
new file mode 100755
index 00000000..b4ff8e1c
--- /dev/null
+++ b/data/maps/headers/PokemonFanClub.asm
@@ -0,0 +1,3 @@
+
+	map_header PokemonFanClub, POKEMON_FAN_CLUB, INTERIOR, 0
+	end_map_header
diff --git a/data/maps/headers/PokemonMansion1F.asm b/data/maps/headers/PokemonMansion1F.asm
new file mode 100755
index 00000000..9407f956
--- /dev/null
+++ b/data/maps/headers/PokemonMansion1F.asm
@@ -0,0 +1,3 @@
+
+	map_header PokemonMansion1F, POKEMON_MANSION_1F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/PokemonMansion2F.asm b/data/maps/headers/PokemonMansion2F.asm
new file mode 100755
index 00000000..deb7c84f
--- /dev/null
+++ b/data/maps/headers/PokemonMansion2F.asm
@@ -0,0 +1,3 @@
+
+	map_header PokemonMansion2F, POKEMON_MANSION_2F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/PokemonMansion3F.asm b/data/maps/headers/PokemonMansion3F.asm
new file mode 100755
index 00000000..e4baa709
--- /dev/null
+++ b/data/maps/headers/PokemonMansion3F.asm
@@ -0,0 +1,3 @@
+
+	map_header PokemonMansion3F, POKEMON_MANSION_3F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/PokemonMansionB1F.asm b/data/maps/headers/PokemonMansionB1F.asm
new file mode 100755
index 00000000..0aae67e6
--- /dev/null
+++ b/data/maps/headers/PokemonMansionB1F.asm
@@ -0,0 +1,3 @@
+
+	map_header PokemonMansionB1F, POKEMON_MANSION_B1F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/PokemonTower1F.asm b/data/maps/headers/PokemonTower1F.asm
new file mode 100755
index 00000000..185fd2c0
--- /dev/null
+++ b/data/maps/headers/PokemonTower1F.asm
@@ -0,0 +1,3 @@
+
+	map_header PokemonTower1F, POKEMON_TOWER_1F, CEMETERY, 0
+	end_map_header
diff --git a/data/maps/headers/PokemonTower2F.asm b/data/maps/headers/PokemonTower2F.asm
new file mode 100755
index 00000000..5a6046c8
--- /dev/null
+++ b/data/maps/headers/PokemonTower2F.asm
@@ -0,0 +1,3 @@
+
+	map_header PokemonTower2F, POKEMON_TOWER_2F, CEMETERY, 0
+	end_map_header
diff --git a/data/maps/headers/PokemonTower3F.asm b/data/maps/headers/PokemonTower3F.asm
new file mode 100755
index 00000000..49ebc4e7
--- /dev/null
+++ b/data/maps/headers/PokemonTower3F.asm
@@ -0,0 +1,3 @@
+
+	map_header PokemonTower3F, POKEMON_TOWER_3F, CEMETERY, 0
+	end_map_header
diff --git a/data/maps/headers/PokemonTower4F.asm b/data/maps/headers/PokemonTower4F.asm
new file mode 100755
index 00000000..0eb9a0d6
--- /dev/null
+++ b/data/maps/headers/PokemonTower4F.asm
@@ -0,0 +1,3 @@
+
+	map_header PokemonTower4F, POKEMON_TOWER_4F, CEMETERY, 0
+	end_map_header
diff --git a/data/maps/headers/PokemonTower5F.asm b/data/maps/headers/PokemonTower5F.asm
new file mode 100755
index 00000000..e58c63c6
--- /dev/null
+++ b/data/maps/headers/PokemonTower5F.asm
@@ -0,0 +1,3 @@
+
+	map_header PokemonTower5F, POKEMON_TOWER_5F, CEMETERY, 0
+	end_map_header
diff --git a/data/maps/headers/PokemonTower6F.asm b/data/maps/headers/PokemonTower6F.asm
new file mode 100755
index 00000000..ba53347b
--- /dev/null
+++ b/data/maps/headers/PokemonTower6F.asm
@@ -0,0 +1,3 @@
+
+	map_header PokemonTower6F, POKEMON_TOWER_6F, CEMETERY, 0
+	end_map_header
diff --git a/data/maps/headers/PokemonTower7F.asm b/data/maps/headers/PokemonTower7F.asm
new file mode 100755
index 00000000..bd9f839b
--- /dev/null
+++ b/data/maps/headers/PokemonTower7F.asm
@@ -0,0 +1,3 @@
+
+	map_header PokemonTower7F, POKEMON_TOWER_7F, CEMETERY, 0
+	end_map_header
diff --git a/data/maps/headers/PowerPlant.asm b/data/maps/headers/PowerPlant.asm
new file mode 100755
index 00000000..88d82ae2
--- /dev/null
+++ b/data/maps/headers/PowerPlant.asm
@@ -0,0 +1,3 @@
+
+	map_header PowerPlant, POWER_PLANT, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/RedsHouse1F.asm b/data/maps/headers/RedsHouse1F.asm
new file mode 100755
index 00000000..018bdc80
--- /dev/null
+++ b/data/maps/headers/RedsHouse1F.asm
@@ -0,0 +1,3 @@
+
+	map_header RedsHouse1F, REDS_HOUSE_1F, REDS_HOUSE_1, 0
+	end_map_header
diff --git a/data/maps/headers/RedsHouse2F.asm b/data/maps/headers/RedsHouse2F.asm
new file mode 100755
index 00000000..10332e2c
--- /dev/null
+++ b/data/maps/headers/RedsHouse2F.asm
@@ -0,0 +1,3 @@
+
+	map_header RedsHouse2F, REDS_HOUSE_2F, REDS_HOUSE_2, $00
+	end_map_header
diff --git a/data/maps/headers/RockTunnel1F.asm b/data/maps/headers/RockTunnel1F.asm
new file mode 100755
index 00000000..268ee645
--- /dev/null
+++ b/data/maps/headers/RockTunnel1F.asm
@@ -0,0 +1,3 @@
+
+	map_header RockTunnel1F, ROCK_TUNNEL_1F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/RockTunnelB1F.asm b/data/maps/headers/RockTunnelB1F.asm
new file mode 100755
index 00000000..7b13f647
--- /dev/null
+++ b/data/maps/headers/RockTunnelB1F.asm
@@ -0,0 +1,3 @@
+
+	map_header RockTunnelB1F, ROCK_TUNNEL_B1F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/RockTunnelPokecenter.asm b/data/maps/headers/RockTunnelPokecenter.asm
new file mode 100755
index 00000000..a873854b
--- /dev/null
+++ b/data/maps/headers/RockTunnelPokecenter.asm
@@ -0,0 +1,3 @@
+
+	map_header RockTunnelPokecenter, ROCK_TUNNEL_POKECENTER, POKECENTER, 0
+	end_map_header
diff --git a/data/maps/headers/RocketHideoutB1F.asm b/data/maps/headers/RocketHideoutB1F.asm
new file mode 100755
index 00000000..521a6693
--- /dev/null
+++ b/data/maps/headers/RocketHideoutB1F.asm
@@ -0,0 +1,3 @@
+
+	map_header RocketHideoutB1F, ROCKET_HIDEOUT_B1F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/RocketHideoutB2F.asm b/data/maps/headers/RocketHideoutB2F.asm
new file mode 100755
index 00000000..ab2a965d
--- /dev/null
+++ b/data/maps/headers/RocketHideoutB2F.asm
@@ -0,0 +1,3 @@
+
+	map_header RocketHideoutB2F, ROCKET_HIDEOUT_B2F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/RocketHideoutB3F.asm b/data/maps/headers/RocketHideoutB3F.asm
new file mode 100755
index 00000000..0a04b00e
--- /dev/null
+++ b/data/maps/headers/RocketHideoutB3F.asm
@@ -0,0 +1,3 @@
+
+	map_header RocketHideoutB3F, ROCKET_HIDEOUT_B3F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/RocketHideoutB4F.asm b/data/maps/headers/RocketHideoutB4F.asm
new file mode 100755
index 00000000..11512c01
--- /dev/null
+++ b/data/maps/headers/RocketHideoutB4F.asm
@@ -0,0 +1,3 @@
+
+	map_header RocketHideoutB4F, ROCKET_HIDEOUT_B4F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/RocketHideoutElevator.asm b/data/maps/headers/RocketHideoutElevator.asm
new file mode 100755
index 00000000..90ece237
--- /dev/null
+++ b/data/maps/headers/RocketHideoutElevator.asm
@@ -0,0 +1,3 @@
+
+	map_header RocketHideoutElevator, ROCKET_HIDEOUT_ELEVATOR, LOBBY, 0
+	end_map_header
diff --git a/data/maps/headers/Route1.asm b/data/maps/headers/Route1.asm
new file mode 100755
index 00000000..6eeb0347
--- /dev/null
+++ b/data/maps/headers/Route1.asm
@@ -0,0 +1,5 @@
+
+	map_header Route1, ROUTE_1, OVERWORLD, NORTH | SOUTH
+	connection north, ViridianCity, VIRIDIAN_CITY, -5
+	connection south, PalletTown, PALLET_TOWN, 0
+	end_map_header
diff --git a/data/maps/headers/Route10.asm b/data/maps/headers/Route10.asm
new file mode 100755
index 00000000..ba498b0a
--- /dev/null
+++ b/data/maps/headers/Route10.asm
@@ -0,0 +1,5 @@
+
+	map_header Route10, ROUTE_10, OVERWORLD, SOUTH | WEST
+	connection south, LavenderTown, LAVENDER_TOWN, 0
+	connection west, Route9, ROUTE_9, 0
+	end_map_header
diff --git a/data/maps/headers/Route11.asm b/data/maps/headers/Route11.asm
new file mode 100755
index 00000000..d8f2e72f
--- /dev/null
+++ b/data/maps/headers/Route11.asm
@@ -0,0 +1,5 @@
+
+	map_header Route11, ROUTE_11, OVERWORLD, WEST | EAST
+	connection west, VermilionCity, VERMILION_CITY, -4
+	connection east, Route12, ROUTE_12, -27
+	end_map_header
diff --git a/data/maps/headers/Route11Gate1F.asm b/data/maps/headers/Route11Gate1F.asm
new file mode 100755
index 00000000..aa97b791
--- /dev/null
+++ b/data/maps/headers/Route11Gate1F.asm
@@ -0,0 +1,3 @@
+
+	map_header Route11Gate1F, ROUTE_11_GATE_1F, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route11Gate2F.asm b/data/maps/headers/Route11Gate2F.asm
new file mode 100755
index 00000000..560d38db
--- /dev/null
+++ b/data/maps/headers/Route11Gate2F.asm
@@ -0,0 +1,3 @@
+
+	map_header Route11Gate2F, ROUTE_11_GATE_2F, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route12.asm b/data/maps/headers/Route12.asm
new file mode 100755
index 00000000..931ddf1d
--- /dev/null
+++ b/data/maps/headers/Route12.asm
@@ -0,0 +1,6 @@
+
+	map_header Route12, ROUTE_12, OVERWORLD, NORTH | SOUTH | WEST
+	connection north, LavenderTown, LAVENDER_TOWN, 0
+	connection south, Route13, ROUTE_13, -20
+	connection west, Route11, ROUTE_11, 27
+	end_map_header
diff --git a/data/maps/headers/Route12Gate1F.asm b/data/maps/headers/Route12Gate1F.asm
new file mode 100755
index 00000000..047a670c
--- /dev/null
+++ b/data/maps/headers/Route12Gate1F.asm
@@ -0,0 +1,3 @@
+
+	map_header Route12Gate1F, ROUTE_12_GATE_1F, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route12Gate2F.asm b/data/maps/headers/Route12Gate2F.asm
new file mode 100755
index 00000000..e1366736
--- /dev/null
+++ b/data/maps/headers/Route12Gate2F.asm
@@ -0,0 +1,3 @@
+
+	map_header Route12Gate2F, ROUTE_12_GATE_2F, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route12SuperRodHouse.asm b/data/maps/headers/Route12SuperRodHouse.asm
new file mode 100755
index 00000000..2195a9b1
--- /dev/null
+++ b/data/maps/headers/Route12SuperRodHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/Route13.asm b/data/maps/headers/Route13.asm
new file mode 100755
index 00000000..242aaa02
--- /dev/null
+++ b/data/maps/headers/Route13.asm
@@ -0,0 +1,5 @@
+
+	map_header Route13, ROUTE_13, OVERWORLD, NORTH | WEST
+	connection north, Route12, ROUTE_12, 20
+	connection west, Route14, ROUTE_14, 0
+	end_map_header
diff --git a/data/maps/headers/Route14.asm b/data/maps/headers/Route14.asm
new file mode 100755
index 00000000..c0c39c56
--- /dev/null
+++ b/data/maps/headers/Route14.asm
@@ -0,0 +1,5 @@
+
+	map_header Route14, ROUTE_14, OVERWORLD, WEST | EAST
+	connection west, Route15, ROUTE_15, 18
+	connection east, Route13, ROUTE_13, 0
+	end_map_header
diff --git a/data/maps/headers/Route15.asm b/data/maps/headers/Route15.asm
new file mode 100755
index 00000000..28a811d2
--- /dev/null
+++ b/data/maps/headers/Route15.asm
@@ -0,0 +1,5 @@
+
+	map_header Route15, ROUTE_15, OVERWORLD, WEST | EAST
+	connection west, FuchsiaCity, FUCHSIA_CITY, -4
+	connection east, Route14, ROUTE_14, -18
+	end_map_header
diff --git a/data/maps/headers/Route15Gate1F.asm b/data/maps/headers/Route15Gate1F.asm
new file mode 100755
index 00000000..a23d15a0
--- /dev/null
+++ b/data/maps/headers/Route15Gate1F.asm
@@ -0,0 +1,3 @@
+
+	map_header Route15Gate1F, ROUTE_15_GATE_1F, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route15Gate2F.asm b/data/maps/headers/Route15Gate2F.asm
new file mode 100755
index 00000000..8ca89872
--- /dev/null
+++ b/data/maps/headers/Route15Gate2F.asm
@@ -0,0 +1,3 @@
+
+	map_header Route15Gate2F, ROUTE_15_GATE_2F, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route16.asm b/data/maps/headers/Route16.asm
new file mode 100755
index 00000000..423c7af2
--- /dev/null
+++ b/data/maps/headers/Route16.asm
@@ -0,0 +1,5 @@
+
+	map_header Route16, ROUTE_16, OVERWORLD, SOUTH | EAST
+	connection south, Route17, ROUTE_17, 0
+	connection east, CeladonCity, CELADON_CITY, -4
+	end_map_header
diff --git a/data/maps/headers/Route16FlyHouse.asm b/data/maps/headers/Route16FlyHouse.asm
new file mode 100755
index 00000000..240b6df4
--- /dev/null
+++ b/data/maps/headers/Route16FlyHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header Route16FlyHouse, ROUTE_16_FLY_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/Route16Gate1F.asm b/data/maps/headers/Route16Gate1F.asm
new file mode 100755
index 00000000..74fd1b7f
--- /dev/null
+++ b/data/maps/headers/Route16Gate1F.asm
@@ -0,0 +1,3 @@
+
+	map_header Route16Gate1F, ROUTE_16_GATE_1F, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route16Gate2F.asm b/data/maps/headers/Route16Gate2F.asm
new file mode 100755
index 00000000..ed889f4b
--- /dev/null
+++ b/data/maps/headers/Route16Gate2F.asm
@@ -0,0 +1,3 @@
+
+	map_header Route16Gate2F, ROUTE_16_GATE_2F, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route17.asm b/data/maps/headers/Route17.asm
new file mode 100755
index 00000000..5e853299
--- /dev/null
+++ b/data/maps/headers/Route17.asm
@@ -0,0 +1,5 @@
+
+	map_header Route17, ROUTE_17, OVERWORLD, NORTH | SOUTH
+	connection north, Route16, ROUTE_16, 0
+	connection south, Route18, ROUTE_18, 0
+	end_map_header
diff --git a/data/maps/headers/Route18.asm b/data/maps/headers/Route18.asm
new file mode 100755
index 00000000..34573051
--- /dev/null
+++ b/data/maps/headers/Route18.asm
@@ -0,0 +1,5 @@
+
+	map_header Route18, ROUTE_18, OVERWORLD, NORTH | EAST
+	connection north, Route17, ROUTE_17, 0
+	connection east, FuchsiaCity, FUCHSIA_CITY, -4
+	end_map_header
diff --git a/data/maps/headers/Route18Gate1F.asm b/data/maps/headers/Route18Gate1F.asm
new file mode 100755
index 00000000..2847e0e3
--- /dev/null
+++ b/data/maps/headers/Route18Gate1F.asm
@@ -0,0 +1,3 @@
+
+	map_header Route18Gate1F, ROUTE_18_GATE_1F, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route18Gate2F.asm b/data/maps/headers/Route18Gate2F.asm
new file mode 100755
index 00000000..f25fa700
--- /dev/null
+++ b/data/maps/headers/Route18Gate2F.asm
@@ -0,0 +1,3 @@
+
+	map_header Route18Gate2F, ROUTE_18_GATE_2F, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route19.asm b/data/maps/headers/Route19.asm
new file mode 100755
index 00000000..7f01c804
--- /dev/null
+++ b/data/maps/headers/Route19.asm
@@ -0,0 +1,5 @@
+
+	map_header Route19, ROUTE_19, OVERWORLD, NORTH | WEST
+	connection north, FuchsiaCity, FUCHSIA_CITY, -5
+	connection west, Route20, ROUTE_20, 18
+	end_map_header
diff --git a/data/maps/headers/Route2.asm b/data/maps/headers/Route2.asm
new file mode 100755
index 00000000..521eef69
--- /dev/null
+++ b/data/maps/headers/Route2.asm
@@ -0,0 +1,5 @@
+
+	map_header Route2, ROUTE_2, OVERWORLD, NORTH | SOUTH
+	connection north, PewterCity, PEWTER_CITY, -5
+	connection south, ViridianCity, VIRIDIAN_CITY, -5
+	end_map_header
diff --git a/data/maps/headers/Route20.asm b/data/maps/headers/Route20.asm
new file mode 100755
index 00000000..3495b785
--- /dev/null
+++ b/data/maps/headers/Route20.asm
@@ -0,0 +1,5 @@
+
+	map_header Route20, ROUTE_20, OVERWORLD, WEST | EAST
+	connection west, CinnabarIsland, CINNABAR_ISLAND, 0
+	connection east, Route19, ROUTE_19, -18
+	end_map_header
diff --git a/data/maps/headers/Route21.asm b/data/maps/headers/Route21.asm
new file mode 100755
index 00000000..803bf217
--- /dev/null
+++ b/data/maps/headers/Route21.asm
@@ -0,0 +1,5 @@
+
+	map_header Route21, ROUTE_21, OVERWORLD, NORTH | SOUTH
+	connection north, PalletTown, PALLET_TOWN, 0
+	connection south, CinnabarIsland, CINNABAR_ISLAND, 0
+	end_map_header
diff --git a/data/maps/headers/Route22.asm b/data/maps/headers/Route22.asm
new file mode 100755
index 00000000..e235efa1
--- /dev/null
+++ b/data/maps/headers/Route22.asm
@@ -0,0 +1,5 @@
+
+	map_header Route22, ROUTE_22, OVERWORLD, NORTH | EAST
+	connection north, Route23, ROUTE_23, 0
+	connection east, ViridianCity, VIRIDIAN_CITY, -4
+	end_map_header
diff --git a/data/maps/headers/Route22Gate.asm b/data/maps/headers/Route22Gate.asm
new file mode 100755
index 00000000..a9d1dd37
--- /dev/null
+++ b/data/maps/headers/Route22Gate.asm
@@ -0,0 +1,3 @@
+
+	map_header Route22Gate, ROUTE_22_GATE, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route23.asm b/data/maps/headers/Route23.asm
new file mode 100755
index 00000000..e1535c9d
--- /dev/null
+++ b/data/maps/headers/Route23.asm
@@ -0,0 +1,5 @@
+
+	map_header Route23, ROUTE_23, PLATEAU, NORTH | SOUTH
+	connection north, IndigoPlateau, INDIGO_PLATEAU, 0
+	connection south, Route22, ROUTE_22, 0
+	end_map_header
diff --git a/data/maps/headers/Route24.asm b/data/maps/headers/Route24.asm
new file mode 100755
index 00000000..faf53660
--- /dev/null
+++ b/data/maps/headers/Route24.asm
@@ -0,0 +1,5 @@
+
+	map_header Route24, ROUTE_24, OVERWORLD, SOUTH | EAST
+	connection south, CeruleanCity, CERULEAN_CITY, -5
+	connection east, Route25, ROUTE_25, 0
+	end_map_header
diff --git a/data/maps/headers/Route25.asm b/data/maps/headers/Route25.asm
new file mode 100755
index 00000000..1873d19b
--- /dev/null
+++ b/data/maps/headers/Route25.asm
@@ -0,0 +1,4 @@
+
+	map_header Route25, ROUTE_25, OVERWORLD, WEST
+	connection west, Route24, ROUTE_24, 0
+	end_map_header
diff --git a/data/maps/headers/Route2Gate.asm b/data/maps/headers/Route2Gate.asm
new file mode 100755
index 00000000..730d8f2d
--- /dev/null
+++ b/data/maps/headers/Route2Gate.asm
@@ -0,0 +1,3 @@
+
+	map_header Route2Gate, ROUTE_2_GATE, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route2TradeHouse.asm b/data/maps/headers/Route2TradeHouse.asm
new file mode 100755
index 00000000..b9937dad
--- /dev/null
+++ b/data/maps/headers/Route2TradeHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header Route2TradeHouse, ROUTE_2_TRADE_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/Route3.asm b/data/maps/headers/Route3.asm
new file mode 100755
index 00000000..ddbd7783
--- /dev/null
+++ b/data/maps/headers/Route3.asm
@@ -0,0 +1,5 @@
+
+	map_header Route3, ROUTE_3, OVERWORLD, NORTH | WEST
+	connection north, Route4, ROUTE_4, 25
+	connection west, PewterCity, PEWTER_CITY, -4
+	end_map_header
diff --git a/data/maps/headers/Route4.asm b/data/maps/headers/Route4.asm
new file mode 100755
index 00000000..6c43171a
--- /dev/null
+++ b/data/maps/headers/Route4.asm
@@ -0,0 +1,5 @@
+
+	map_header Route4, ROUTE_4, OVERWORLD, SOUTH | EAST
+	connection south, Route3, ROUTE_3, -25
+	connection east, CeruleanCity, CERULEAN_CITY, -4
+	end_map_header
diff --git a/data/maps/headers/Route5.asm b/data/maps/headers/Route5.asm
new file mode 100755
index 00000000..ea84090c
--- /dev/null
+++ b/data/maps/headers/Route5.asm
@@ -0,0 +1,5 @@
+
+	map_header Route5, ROUTE_5, OVERWORLD, NORTH | SOUTH
+	connection north, CeruleanCity, CERULEAN_CITY, -5
+	connection south, SaffronCity, SAFFRON_CITY, -5
+	end_map_header
diff --git a/data/maps/headers/Route5Gate.asm b/data/maps/headers/Route5Gate.asm
new file mode 100755
index 00000000..a0115533
--- /dev/null
+++ b/data/maps/headers/Route5Gate.asm
@@ -0,0 +1,3 @@
+
+	map_header Route5Gate, ROUTE_5_GATE, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route6.asm b/data/maps/headers/Route6.asm
new file mode 100755
index 00000000..956aa4d6
--- /dev/null
+++ b/data/maps/headers/Route6.asm
@@ -0,0 +1,5 @@
+
+	map_header Route6, ROUTE_6, OVERWORLD, NORTH | SOUTH
+	connection north, SaffronCity, SAFFRON_CITY, -5
+	connection south, VermilionCity, VERMILION_CITY, -5
+	end_map_header
diff --git a/data/maps/headers/Route6Gate.asm b/data/maps/headers/Route6Gate.asm
new file mode 100755
index 00000000..f80b57c8
--- /dev/null
+++ b/data/maps/headers/Route6Gate.asm
@@ -0,0 +1,3 @@
+
+	map_header Route6Gate, ROUTE_6_GATE, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route7.asm b/data/maps/headers/Route7.asm
new file mode 100755
index 00000000..8368c3fe
--- /dev/null
+++ b/data/maps/headers/Route7.asm
@@ -0,0 +1,5 @@
+
+	map_header Route7, ROUTE_7, OVERWORLD, WEST | EAST
+	connection west, CeladonCity, CELADON_CITY, -4
+	connection east, SaffronCity, SAFFRON_CITY, -4
+	end_map_header
diff --git a/data/maps/headers/Route7Gate.asm b/data/maps/headers/Route7Gate.asm
new file mode 100755
index 00000000..e9b9b16d
--- /dev/null
+++ b/data/maps/headers/Route7Gate.asm
@@ -0,0 +1,3 @@
+
+	map_header Route7Gate, ROUTE_7_GATE, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route8.asm b/data/maps/headers/Route8.asm
new file mode 100755
index 00000000..8df9e023
--- /dev/null
+++ b/data/maps/headers/Route8.asm
@@ -0,0 +1,5 @@
+
+	map_header Route8, ROUTE_8, OVERWORLD, WEST | EAST
+	connection west, SaffronCity, SAFFRON_CITY, -4
+	connection east, LavenderTown, LAVENDER_TOWN, 0
+	end_map_header
diff --git a/data/maps/headers/Route8Gate.asm b/data/maps/headers/Route8Gate.asm
new file mode 100755
index 00000000..f6a320a4
--- /dev/null
+++ b/data/maps/headers/Route8Gate.asm
@@ -0,0 +1,3 @@
+
+	map_header Route8Gate, ROUTE_8_GATE, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/Route9.asm b/data/maps/headers/Route9.asm
new file mode 100755
index 00000000..c1ed9225
--- /dev/null
+++ b/data/maps/headers/Route9.asm
@@ -0,0 +1,5 @@
+
+	map_header Route9, ROUTE_9, OVERWORLD, WEST | EAST
+	connection west, CeruleanCity, CERULEAN_CITY, -4
+	connection east, Route10, ROUTE_10, 0
+	end_map_header
diff --git a/data/maps/headers/SSAnne1F.asm b/data/maps/headers/SSAnne1F.asm
new file mode 100755
index 00000000..80d25e2d
--- /dev/null
+++ b/data/maps/headers/SSAnne1F.asm
@@ -0,0 +1,3 @@
+
+	map_header SSAnne1F, SS_ANNE_1F, SHIP, 0
+	end_map_header
diff --git a/data/maps/headers/SSAnne1FRooms.asm b/data/maps/headers/SSAnne1FRooms.asm
new file mode 100755
index 00000000..8bdd8d00
--- /dev/null
+++ b/data/maps/headers/SSAnne1FRooms.asm
@@ -0,0 +1,3 @@
+
+	map_header SSAnne1FRooms, SS_ANNE_1F_ROOMS, SHIP, 0
+	end_map_header
diff --git a/data/maps/headers/SSAnne2F.asm b/data/maps/headers/SSAnne2F.asm
new file mode 100755
index 00000000..b2fe14d7
--- /dev/null
+++ b/data/maps/headers/SSAnne2F.asm
@@ -0,0 +1,3 @@
+
+	map_header SSAnne2F, SS_ANNE_2F, SHIP, 0
+	end_map_header
diff --git a/data/maps/headers/SSAnne2FRooms.asm b/data/maps/headers/SSAnne2FRooms.asm
new file mode 100755
index 00000000..2d349e4c
--- /dev/null
+++ b/data/maps/headers/SSAnne2FRooms.asm
@@ -0,0 +1,3 @@
+
+	map_header SSAnne2FRooms, SS_ANNE_2F_ROOMS, SHIP, 0
+	end_map_header
diff --git a/data/maps/headers/SSAnne3F.asm b/data/maps/headers/SSAnne3F.asm
new file mode 100755
index 00000000..f391a0cd
--- /dev/null
+++ b/data/maps/headers/SSAnne3F.asm
@@ -0,0 +1,3 @@
+
+	map_header SSAnne3F, SS_ANNE_3F, SHIP, 0
+	end_map_header
diff --git a/data/maps/headers/SSAnneB1F.asm b/data/maps/headers/SSAnneB1F.asm
new file mode 100755
index 00000000..c21d7cff
--- /dev/null
+++ b/data/maps/headers/SSAnneB1F.asm
@@ -0,0 +1,3 @@
+
+	map_header SSAnneB1F, SS_ANNE_B1F, SHIP, 0
+	end_map_header
diff --git a/data/maps/headers/SSAnneB1FRooms.asm b/data/maps/headers/SSAnneB1FRooms.asm
new file mode 100755
index 00000000..1b8b4620
--- /dev/null
+++ b/data/maps/headers/SSAnneB1FRooms.asm
@@ -0,0 +1,3 @@
+
+	map_header SSAnneB1FRooms, SS_ANNE_B1F_ROOMS, SHIP, 0
+	end_map_header
diff --git a/data/maps/headers/SSAnneBow.asm b/data/maps/headers/SSAnneBow.asm
new file mode 100755
index 00000000..2195e970
--- /dev/null
+++ b/data/maps/headers/SSAnneBow.asm
@@ -0,0 +1,3 @@
+
+	map_header SSAnneBow, SS_ANNE_BOW, SHIP, 0
+	end_map_header
diff --git a/data/maps/headers/SSAnneCaptainsRoom.asm b/data/maps/headers/SSAnneCaptainsRoom.asm
new file mode 100755
index 00000000..a24f930d
--- /dev/null
+++ b/data/maps/headers/SSAnneCaptainsRoom.asm
@@ -0,0 +1,3 @@
+
+	map_header SSAnneCaptainsRoom, SS_ANNE_CAPTAINS_ROOM, SHIP, 0
+	end_map_header
diff --git a/data/maps/headers/SSAnneKitchen.asm b/data/maps/headers/SSAnneKitchen.asm
new file mode 100755
index 00000000..47e84fbe
--- /dev/null
+++ b/data/maps/headers/SSAnneKitchen.asm
@@ -0,0 +1,3 @@
+
+	map_header SSAnneKitchen, SS_ANNE_KITCHEN, SHIP, 0
+	end_map_header
diff --git a/data/maps/headers/SafariZoneCenter.asm b/data/maps/headers/SafariZoneCenter.asm
new file mode 100755
index 00000000..ccc58ed1
--- /dev/null
+++ b/data/maps/headers/SafariZoneCenter.asm
@@ -0,0 +1,3 @@
+
+	map_header SafariZoneCenter, SAFARI_ZONE_CENTER, FOREST, 0
+	end_map_header
diff --git a/data/maps/headers/SafariZoneCenterRestHouse.asm b/data/maps/headers/SafariZoneCenterRestHouse.asm
new file mode 100755
index 00000000..a866003f
--- /dev/null
+++ b/data/maps/headers/SafariZoneCenterRestHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header SafariZoneCenterRestHouse, SAFARI_ZONE_CENTER_REST_HOUSE, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/SafariZoneEast.asm b/data/maps/headers/SafariZoneEast.asm
new file mode 100755
index 00000000..c23e9334
--- /dev/null
+++ b/data/maps/headers/SafariZoneEast.asm
@@ -0,0 +1,3 @@
+
+	map_header SafariZoneEast, SAFARI_ZONE_EAST, FOREST, 0
+	end_map_header
diff --git a/data/maps/headers/SafariZoneEastRestHouse.asm b/data/maps/headers/SafariZoneEastRestHouse.asm
new file mode 100755
index 00000000..1f8d76c6
--- /dev/null
+++ b/data/maps/headers/SafariZoneEastRestHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header SafariZoneEastRestHouse, SAFARI_ZONE_EAST_REST_HOUSE, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/SafariZoneGate.asm b/data/maps/headers/SafariZoneGate.asm
new file mode 100755
index 00000000..7816460d
--- /dev/null
+++ b/data/maps/headers/SafariZoneGate.asm
@@ -0,0 +1,3 @@
+
+	map_header SafariZoneGate, SAFARI_ZONE_GATE, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/SafariZoneNorth.asm b/data/maps/headers/SafariZoneNorth.asm
new file mode 100755
index 00000000..32639d22
--- /dev/null
+++ b/data/maps/headers/SafariZoneNorth.asm
@@ -0,0 +1,3 @@
+
+	map_header SafariZoneNorth, SAFARI_ZONE_NORTH, FOREST, 0
+	end_map_header
diff --git a/data/maps/headers/SafariZoneNorthRestHouse.asm b/data/maps/headers/SafariZoneNorthRestHouse.asm
new file mode 100755
index 00000000..ec083803
--- /dev/null
+++ b/data/maps/headers/SafariZoneNorthRestHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header SafariZoneNorthRestHouse, SAFARI_ZONE_NORTH_REST_HOUSE, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/SafariZoneSecretHouse.asm b/data/maps/headers/SafariZoneSecretHouse.asm
new file mode 100755
index 00000000..630577c4
--- /dev/null
+++ b/data/maps/headers/SafariZoneSecretHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header SafariZoneSecretHouse, SAFARI_ZONE_SECRET_HOUSE, LAB, 0
+	end_map_header
diff --git a/data/maps/headers/SafariZoneWest.asm b/data/maps/headers/SafariZoneWest.asm
new file mode 100755
index 00000000..a1117d09
--- /dev/null
+++ b/data/maps/headers/SafariZoneWest.asm
@@ -0,0 +1,3 @@
+
+	map_header SafariZoneWest, SAFARI_ZONE_WEST, FOREST, 0
+	end_map_header
diff --git a/data/maps/headers/SafariZoneWestRestHouse.asm b/data/maps/headers/SafariZoneWestRestHouse.asm
new file mode 100755
index 00000000..e4618e1d
--- /dev/null
+++ b/data/maps/headers/SafariZoneWestRestHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header SafariZoneWestRestHouse, SAFARI_ZONE_WEST_REST_HOUSE, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/SaffronCity.asm b/data/maps/headers/SaffronCity.asm
new file mode 100755
index 00000000..ee1f71e4
--- /dev/null
+++ b/data/maps/headers/SaffronCity.asm
@@ -0,0 +1,7 @@
+
+	map_header SaffronCity, SAFFRON_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST
+	connection north, Route5, ROUTE_5, 5
+	connection south, Route6, ROUTE_6, 5
+	connection west, Route7, ROUTE_7, 4
+	connection east, Route8, ROUTE_8, 4
+	end_map_header
diff --git a/data/maps/headers/SaffronGym.asm b/data/maps/headers/SaffronGym.asm
new file mode 100755
index 00000000..14ee3323
--- /dev/null
+++ b/data/maps/headers/SaffronGym.asm
@@ -0,0 +1,3 @@
+
+	map_header SaffronGym, SAFFRON_GYM, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/SaffronMart.asm b/data/maps/headers/SaffronMart.asm
new file mode 100755
index 00000000..f03132d2
--- /dev/null
+++ b/data/maps/headers/SaffronMart.asm
@@ -0,0 +1,3 @@
+
+	map_header SaffronMart, SAFFRON_MART, MART, 0
+	end_map_header
diff --git a/data/maps/headers/SaffronPidgeyHouse.asm b/data/maps/headers/SaffronPidgeyHouse.asm
new file mode 100755
index 00000000..e9f8dde7
--- /dev/null
+++ b/data/maps/headers/SaffronPidgeyHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header SaffronPidgeyHouse, SAFFRON_PIDGEY_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/SaffronPokecenter.asm b/data/maps/headers/SaffronPokecenter.asm
new file mode 100755
index 00000000..9b250050
--- /dev/null
+++ b/data/maps/headers/SaffronPokecenter.asm
@@ -0,0 +1,3 @@
+
+	map_header SaffronPokecenter, SAFFRON_POKECENTER, POKECENTER, 0
+	end_map_header
diff --git a/data/maps/headers/SeafoamIslands1F.asm b/data/maps/headers/SeafoamIslands1F.asm
new file mode 100755
index 00000000..db530549
--- /dev/null
+++ b/data/maps/headers/SeafoamIslands1F.asm
@@ -0,0 +1,3 @@
+
+	map_header SeafoamIslands1F, SEAFOAM_ISLANDS_1F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/SeafoamIslandsB1F.asm b/data/maps/headers/SeafoamIslandsB1F.asm
new file mode 100755
index 00000000..589eef93
--- /dev/null
+++ b/data/maps/headers/SeafoamIslandsB1F.asm
@@ -0,0 +1,3 @@
+
+	map_header SeafoamIslandsB1F, SEAFOAM_ISLANDS_B1F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/SeafoamIslandsB2F.asm b/data/maps/headers/SeafoamIslandsB2F.asm
new file mode 100755
index 00000000..f7e624ed
--- /dev/null
+++ b/data/maps/headers/SeafoamIslandsB2F.asm
@@ -0,0 +1,3 @@
+
+	map_header SeafoamIslandsB2F, SEAFOAM_ISLANDS_B2F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/SeafoamIslandsB3F.asm b/data/maps/headers/SeafoamIslandsB3F.asm
new file mode 100755
index 00000000..b57da3c0
--- /dev/null
+++ b/data/maps/headers/SeafoamIslandsB3F.asm
@@ -0,0 +1,3 @@
+
+	map_header SeafoamIslandsB3F, SEAFOAM_ISLANDS_B3F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/SeafoamIslandsB4F.asm b/data/maps/headers/SeafoamIslandsB4F.asm
new file mode 100755
index 00000000..bae1e3a2
--- /dev/null
+++ b/data/maps/headers/SeafoamIslandsB4F.asm
@@ -0,0 +1,3 @@
+
+	map_header SeafoamIslandsB4F, SEAFOAM_ISLANDS_B4F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/SilphCo10F.asm b/data/maps/headers/SilphCo10F.asm
new file mode 100755
index 00000000..7a6786e7
--- /dev/null
+++ b/data/maps/headers/SilphCo10F.asm
@@ -0,0 +1,3 @@
+
+	map_header SilphCo10F, SILPH_CO_10F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/SilphCo11F.asm b/data/maps/headers/SilphCo11F.asm
new file mode 100755
index 00000000..72eaaca2
--- /dev/null
+++ b/data/maps/headers/SilphCo11F.asm
@@ -0,0 +1,3 @@
+
+	map_header SilphCo11F, SILPH_CO_11F, INTERIOR, 0
+	end_map_header
diff --git a/data/maps/headers/SilphCo1F.asm b/data/maps/headers/SilphCo1F.asm
new file mode 100755
index 00000000..4c4ac97d
--- /dev/null
+++ b/data/maps/headers/SilphCo1F.asm
@@ -0,0 +1,3 @@
+
+	map_header SilphCo1F, SILPH_CO_1F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/SilphCo2F.asm b/data/maps/headers/SilphCo2F.asm
new file mode 100755
index 00000000..7dc44a55
--- /dev/null
+++ b/data/maps/headers/SilphCo2F.asm
@@ -0,0 +1,3 @@
+
+	map_header SilphCo2F, SILPH_CO_2F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/SilphCo3F.asm b/data/maps/headers/SilphCo3F.asm
new file mode 100755
index 00000000..99e4aa15
--- /dev/null
+++ b/data/maps/headers/SilphCo3F.asm
@@ -0,0 +1,3 @@
+
+	map_header SilphCo3F, SILPH_CO_3F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/SilphCo4F.asm b/data/maps/headers/SilphCo4F.asm
new file mode 100755
index 00000000..8eed0f9a
--- /dev/null
+++ b/data/maps/headers/SilphCo4F.asm
@@ -0,0 +1,3 @@
+
+	map_header SilphCo4F, SILPH_CO_4F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/SilphCo5F.asm b/data/maps/headers/SilphCo5F.asm
new file mode 100755
index 00000000..3b40c360
--- /dev/null
+++ b/data/maps/headers/SilphCo5F.asm
@@ -0,0 +1,3 @@
+
+	map_header SilphCo5F, SILPH_CO_5F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/SilphCo6F.asm b/data/maps/headers/SilphCo6F.asm
new file mode 100755
index 00000000..3d2b3b8c
--- /dev/null
+++ b/data/maps/headers/SilphCo6F.asm
@@ -0,0 +1,3 @@
+
+	map_header SilphCo6F, SILPH_CO_6F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/SilphCo7F.asm b/data/maps/headers/SilphCo7F.asm
new file mode 100755
index 00000000..1591837a
--- /dev/null
+++ b/data/maps/headers/SilphCo7F.asm
@@ -0,0 +1,3 @@
+
+	map_header SilphCo7F, SILPH_CO_7F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/SilphCo8F.asm b/data/maps/headers/SilphCo8F.asm
new file mode 100755
index 00000000..e676fa86
--- /dev/null
+++ b/data/maps/headers/SilphCo8F.asm
@@ -0,0 +1,3 @@
+
+	map_header SilphCo8F, SILPH_CO_8F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/SilphCo9F.asm b/data/maps/headers/SilphCo9F.asm
new file mode 100755
index 00000000..89f0300a
--- /dev/null
+++ b/data/maps/headers/SilphCo9F.asm
@@ -0,0 +1,3 @@
+
+	map_header SilphCo9F, SILPH_CO_9F, FACILITY, 0
+	end_map_header
diff --git a/data/maps/headers/SilphCoElevator.asm b/data/maps/headers/SilphCoElevator.asm
new file mode 100755
index 00000000..4dd9cd9f
--- /dev/null
+++ b/data/maps/headers/SilphCoElevator.asm
@@ -0,0 +1,3 @@
+
+	map_header SilphCoElevator, SILPH_CO_ELEVATOR, LOBBY, 0
+	end_map_header
diff --git a/data/maps/headers/TradeCenter.asm b/data/maps/headers/TradeCenter.asm
new file mode 100755
index 00000000..268d76b2
--- /dev/null
+++ b/data/maps/headers/TradeCenter.asm
@@ -0,0 +1,3 @@
+
+	map_header TradeCenter, TRADE_CENTER, CLUB, 0
+	end_map_header
diff --git a/data/maps/headers/UndergroundPathNorthSouth.asm b/data/maps/headers/UndergroundPathNorthSouth.asm
new file mode 100755
index 00000000..4bb03c79
--- /dev/null
+++ b/data/maps/headers/UndergroundPathNorthSouth.asm
@@ -0,0 +1,3 @@
+
+	map_header UndergroundPathNorthSouth, UNDERGROUND_PATH_NORTH_SOUTH, UNDERGROUND, 0
+	end_map_header
diff --git a/data/maps/headers/UndergroundPathRoute5.asm b/data/maps/headers/UndergroundPathRoute5.asm
new file mode 100755
index 00000000..18287254
--- /dev/null
+++ b/data/maps/headers/UndergroundPathRoute5.asm
@@ -0,0 +1,3 @@
+
+	map_header UndergroundPathRoute5, UNDERGROUND_PATH_ROUTE_5, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/UndergroundPathRoute6.asm b/data/maps/headers/UndergroundPathRoute6.asm
new file mode 100755
index 00000000..67772543
--- /dev/null
+++ b/data/maps/headers/UndergroundPathRoute6.asm
@@ -0,0 +1,3 @@
+
+	map_header UndergroundPathRoute6, UNDERGROUND_PATH_ROUTE_6, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/UndergroundPathRoute7.asm b/data/maps/headers/UndergroundPathRoute7.asm
new file mode 100755
index 00000000..d70548ed
--- /dev/null
+++ b/data/maps/headers/UndergroundPathRoute7.asm
@@ -0,0 +1,3 @@
+
+	map_header UndergroundPathRoute7, UNDERGROUND_PATH_ROUTE_7, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/UndergroundPathRoute7Copy.asm b/data/maps/headers/UndergroundPathRoute7Copy.asm
new file mode 100755
index 00000000..30bb70a8
--- /dev/null
+++ b/data/maps/headers/UndergroundPathRoute7Copy.asm
@@ -0,0 +1,3 @@
+
+	map_header UndergroundPathRoute7Copy, UNDERGROUND_PATH_ROUTE_7, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/UndergroundPathRoute8.asm b/data/maps/headers/UndergroundPathRoute8.asm
new file mode 100755
index 00000000..102d8413
--- /dev/null
+++ b/data/maps/headers/UndergroundPathRoute8.asm
@@ -0,0 +1,3 @@
+
+	map_header UndergroundPathRoute8, UNDERGROUND_PATH_ROUTE_8, GATE, 0
+	end_map_header
diff --git a/data/maps/headers/UndergroundPathWestEast.asm b/data/maps/headers/UndergroundPathWestEast.asm
new file mode 100755
index 00000000..05976e87
--- /dev/null
+++ b/data/maps/headers/UndergroundPathWestEast.asm
@@ -0,0 +1,3 @@
+
+	map_header UndergroundPathWestEast, UNDERGROUND_PATH_WEST_EAST, UNDERGROUND, 0
+	end_map_header
diff --git a/data/maps/headers/VermilionCity.asm b/data/maps/headers/VermilionCity.asm
new file mode 100755
index 00000000..e211562c
--- /dev/null
+++ b/data/maps/headers/VermilionCity.asm
@@ -0,0 +1,5 @@
+
+	map_header VermilionCity, VERMILION_CITY, OVERWORLD, NORTH | EAST
+	connection north, Route6, ROUTE_6, 5
+	connection east, Route11, ROUTE_11, 4
+	end_map_header
diff --git a/data/maps/headers/VermilionDock.asm b/data/maps/headers/VermilionDock.asm
new file mode 100755
index 00000000..9a9b61c2
--- /dev/null
+++ b/data/maps/headers/VermilionDock.asm
@@ -0,0 +1,3 @@
+
+	map_header VermilionDock, VERMILION_DOCK, SHIP_PORT, 0
+	end_map_header
diff --git a/data/maps/headers/VermilionGym.asm b/data/maps/headers/VermilionGym.asm
new file mode 100755
index 00000000..ca75b8c1
--- /dev/null
+++ b/data/maps/headers/VermilionGym.asm
@@ -0,0 +1,3 @@
+
+	map_header VermilionGym, VERMILION_GYM, GYM, 0
+	end_map_header
diff --git a/data/maps/headers/VermilionMart.asm b/data/maps/headers/VermilionMart.asm
new file mode 100755
index 00000000..5777db4b
--- /dev/null
+++ b/data/maps/headers/VermilionMart.asm
@@ -0,0 +1,3 @@
+
+	map_header VermilionMart, VERMILION_MART, MART, 0
+	end_map_header
diff --git a/data/maps/headers/VermilionOldRodHouse.asm b/data/maps/headers/VermilionOldRodHouse.asm
new file mode 100755
index 00000000..f9c890e0
--- /dev/null
+++ b/data/maps/headers/VermilionOldRodHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header VermilionOldRodHouse, VERMILION_OLD_ROD_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/VermilionPidgeyHouse.asm b/data/maps/headers/VermilionPidgeyHouse.asm
new file mode 100755
index 00000000..afb81784
--- /dev/null
+++ b/data/maps/headers/VermilionPidgeyHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header VermilionPidgeyHouse, VERMILION_PIDGEY_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/VermilionPokecenter.asm b/data/maps/headers/VermilionPokecenter.asm
new file mode 100755
index 00000000..af9827ac
--- /dev/null
+++ b/data/maps/headers/VermilionPokecenter.asm
@@ -0,0 +1,3 @@
+
+	map_header VermilionPokecenter, VERMILION_POKECENTER, POKECENTER, 0
+	end_map_header
diff --git a/data/maps/headers/VermilionTradeHouse.asm b/data/maps/headers/VermilionTradeHouse.asm
new file mode 100755
index 00000000..3cb82c47
--- /dev/null
+++ b/data/maps/headers/VermilionTradeHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header VermilionTradeHouse, VERMILION_TRADE_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/VictoryRoad1F.asm b/data/maps/headers/VictoryRoad1F.asm
new file mode 100755
index 00000000..dae95f16
--- /dev/null
+++ b/data/maps/headers/VictoryRoad1F.asm
@@ -0,0 +1,3 @@
+
+	map_header VictoryRoad1F, VICTORY_ROAD_1F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/VictoryRoad2F.asm b/data/maps/headers/VictoryRoad2F.asm
new file mode 100755
index 00000000..99079ad3
--- /dev/null
+++ b/data/maps/headers/VictoryRoad2F.asm
@@ -0,0 +1,3 @@
+
+	map_header VictoryRoad2F, VICTORY_ROAD_2F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/VictoryRoad3F.asm b/data/maps/headers/VictoryRoad3F.asm
new file mode 100755
index 00000000..bc15cad7
--- /dev/null
+++ b/data/maps/headers/VictoryRoad3F.asm
@@ -0,0 +1,3 @@
+
+	map_header VictoryRoad3F, VICTORY_ROAD_3F, CAVERN, 0
+	end_map_header
diff --git a/data/maps/headers/ViridianCity.asm b/data/maps/headers/ViridianCity.asm
new file mode 100755
index 00000000..0771cc81
--- /dev/null
+++ b/data/maps/headers/ViridianCity.asm
@@ -0,0 +1,6 @@
+
+	map_header ViridianCity, VIRIDIAN_CITY, OVERWORLD, NORTH | SOUTH | WEST
+	connection north, Route2, ROUTE_2, 5
+	connection south, Route1, ROUTE_1, 5
+	connection west, Route22, ROUTE_22, 4
+	end_map_header
diff --git a/data/maps/headers/ViridianForest.asm b/data/maps/headers/ViridianForest.asm
new file mode 100755
index 00000000..d531ec86
--- /dev/null
+++ b/data/maps/headers/ViridianForest.asm
@@ -0,0 +1,3 @@
+
+	map_header ViridianForest, VIRIDIAN_FOREST, FOREST, 0
+	end_map_header
diff --git a/data/maps/headers/ViridianForestNorthGate.asm b/data/maps/headers/ViridianForestNorthGate.asm
new file mode 100755
index 00000000..5bfcd6ed
--- /dev/null
+++ b/data/maps/headers/ViridianForestNorthGate.asm
@@ -0,0 +1,3 @@
+
+	map_header ViridianForestNorthGate, VIRIDIAN_FOREST_NORTH_GATE, FOREST_GATE, 0
+	end_map_header
diff --git a/data/maps/headers/ViridianForestSouthGate.asm b/data/maps/headers/ViridianForestSouthGate.asm
new file mode 100755
index 00000000..87a49284
--- /dev/null
+++ b/data/maps/headers/ViridianForestSouthGate.asm
@@ -0,0 +1,3 @@
+
+	map_header ViridianForestSouthGate, VIRIDIAN_FOREST_SOUTH_GATE, FOREST_GATE, 0
+	end_map_header
diff --git a/data/maps/headers/ViridianGym.asm b/data/maps/headers/ViridianGym.asm
new file mode 100755
index 00000000..640a71b6
--- /dev/null
+++ b/data/maps/headers/ViridianGym.asm
@@ -0,0 +1,3 @@
+
+	map_header ViridianGym, VIRIDIAN_GYM, GYM, 0
+	end_map_header
diff --git a/data/maps/headers/ViridianMart.asm b/data/maps/headers/ViridianMart.asm
new file mode 100755
index 00000000..817b5265
--- /dev/null
+++ b/data/maps/headers/ViridianMart.asm
@@ -0,0 +1,3 @@
+
+	map_header ViridianMart, VIRIDIAN_MART, MART, 0
+	end_map_header
diff --git a/data/maps/headers/ViridianNicknameHouse.asm b/data/maps/headers/ViridianNicknameHouse.asm
new file mode 100755
index 00000000..5a7c272f
--- /dev/null
+++ b/data/maps/headers/ViridianNicknameHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header ViridianNicknameHouse, VIRIDIAN_NICKNAME_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/ViridianPokecenter.asm b/data/maps/headers/ViridianPokecenter.asm
new file mode 100755
index 00000000..daac19f3
--- /dev/null
+++ b/data/maps/headers/ViridianPokecenter.asm
@@ -0,0 +1,3 @@
+
+	map_header ViridianPokecenter, VIRIDIAN_POKECENTER, POKECENTER, 0
+	end_map_header
diff --git a/data/maps/headers/ViridianSchoolHouse.asm b/data/maps/headers/ViridianSchoolHouse.asm
new file mode 100755
index 00000000..f5b77212
--- /dev/null
+++ b/data/maps/headers/ViridianSchoolHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header ViridianSchoolHouse, VIRIDIAN_SCHOOL_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/WardensHouse.asm b/data/maps/headers/WardensHouse.asm
new file mode 100755
index 00000000..08216f59
--- /dev/null
+++ b/data/maps/headers/WardensHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header WardensHouse, WARDENS_HOUSE, LAB, 0
+	end_map_header
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm
new file mode 100755
index 00000000..bc89d600
--- /dev/null
+++ b/data/maps/hide_show_data.asm
@@ -0,0 +1,577 @@
+; data for default hidden/shown
+; objects for each map ($00-$F8)
+
+; Table of 2-Byte pointers, one pointer per map,
+; goes up to Map_F7, ends with -1.
+; points to table listing all missable object in the area
+MapHSPointers:
+	dw MapHS00
+	dw MapHS01
+	dw MapHS02
+	dw MapHS03
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS0A
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS0D
+	dw MapHSXX
+	dw MapHS0F
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS14
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS17
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS1A
+	dw MapHS1B
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS21
+	dw MapHSXX
+	dw MapHS23
+	dw MapHS24
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS27
+	dw MapHS28
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS2D
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS33
+	dw MapHS34
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS3B
+	dw MapHSXX
+	dw MapHS3D
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS53
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS58
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS60
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS66
+	dw MapHS67
+	dw MapHS68
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS6C
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS78
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS84
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS87
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS8F
+	dw MapHS90
+	dw MapHS91
+	dw MapHS92
+	dw MapHS93
+	dw MapHS94
+	dw MapHS95
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS9B
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHS9F
+	dw MapHSA0
+	dw MapHSA1
+	dw MapHSA2
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSA5
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSB1
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSB5
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSC0
+	dw MapHSXX
+	dw MapHSC2
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSC6
+	dw MapHSC7
+	dw MapHSC8
+	dw MapHSC9
+	dw MapHSCA
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSCF
+	dw MapHSD0
+	dw MapHSD1
+	dw MapHSD2
+	dw MapHSD3
+	dw MapHSD4
+	dw MapHSD5
+	dw MapHSD6
+	dw MapHSD7
+	dw MapHSD8
+	dw MapHSD9
+	dw MapHSDA
+	dw MapHSDB
+	dw MapHSDC
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSE2
+	dw MapHSE3
+	dw MapHSE4
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSE9
+	dw MapHSEA
+	dw MapHSEB
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSF4
+	dw MapHSXX
+	dw MapHSXX
+	dw MapHSXX
+	dw -1 ; end
+
+; Structure:
+; 3 bytes per object
+; [Map_ID][Object_ID][H/S]
+;
+; Program stops reading when either:
+; a) Map_ID = $FF
+; b) Map_ID ≠ currentMapID
+;
+; This Data is loaded into RAM at wd5ce-$D5F?. (wMissableObjectList)
+
+; These constants come from the bytes for Predef functions:
+Hide equ $11
+Show equ $15
+
+MapHSXX:
+	db $FF,$FF,$FF
+MapHS00:
+	db PALLET_TOWN,$01,Hide
+MapHS01:
+	db VIRIDIAN_CITY,$05,Show
+	db VIRIDIAN_CITY,$07,Hide
+MapHS02:
+	db PEWTER_CITY,$03,Show
+	db PEWTER_CITY,$05,Show
+MapHS03:
+	db CERULEAN_CITY,$01,Hide
+	db CERULEAN_CITY,$02,Show
+	db CERULEAN_CITY,$06,Hide
+	db CERULEAN_CITY,$0A,Show
+	db CERULEAN_CITY,$0B,Show
+MapHS0A:
+	db SAFFRON_CITY,$01,Show
+	db SAFFRON_CITY,$02,Show
+	db SAFFRON_CITY,$03,Show
+	db SAFFRON_CITY,$04,Show
+	db SAFFRON_CITY,$05,Show
+	db SAFFRON_CITY,$06,Show
+	db SAFFRON_CITY,$07,Show
+	db SAFFRON_CITY,$08,Hide
+	db SAFFRON_CITY,$09,Hide
+	db SAFFRON_CITY,$0A,Hide
+	db SAFFRON_CITY,$0B,Hide
+	db SAFFRON_CITY,$0C,Hide
+	db SAFFRON_CITY,$0D,Hide
+	db SAFFRON_CITY,$0E,Show
+	db SAFFRON_CITY,$0F,Hide
+MapHS0D:
+	db ROUTE_2,$01,Show
+	db ROUTE_2,$02,Show
+MapHS0F:
+	db ROUTE_4,$03,Show
+MapHS14:
+	db ROUTE_9,$0A,Show
+MapHS17:
+	db ROUTE_12,$01,Show
+	db ROUTE_12,$09,Show
+	db ROUTE_12,$0A,Show
+MapHS1A:
+	db ROUTE_15,$0B,Show
+MapHS1B:
+	db ROUTE_16,$07,Show
+MapHS21:
+	db ROUTE_22,$01,Hide
+	db ROUTE_22,$02,Hide
+MapHS23:
+	db ROUTE_24,$01,Show
+	db ROUTE_24,$08,Show
+MapHS24:
+	db ROUTE_25,$0A,Show
+MapHS27:
+	db BLUES_HOUSE,$01,Show
+	db BLUES_HOUSE,$02,Hide
+	db BLUES_HOUSE,$03,Show
+MapHS28:
+	db OAKS_LAB,$01,Show
+	db OAKS_LAB,$02,Show
+	db OAKS_LAB,$03,Show
+	db OAKS_LAB,$04,Show
+	db OAKS_LAB,$05,Hide
+	db OAKS_LAB,$06,Show
+	db OAKS_LAB,$07,Show
+	db OAKS_LAB,$08,Hide
+MapHS2D:
+	db VIRIDIAN_GYM,$01,Show
+	db VIRIDIAN_GYM,$0B,Show
+MapHS34:
+	db MUSEUM_1F,$05,Show
+MapHSE4:
+	db CERULEAN_CAVE_1F,$01,Show
+	db CERULEAN_CAVE_1F,$02,Show
+	db CERULEAN_CAVE_1F,$03,Show
+MapHS8F:
+	db POKEMON_TOWER_2F,$01,Show
+MapHS90:
+	db POKEMON_TOWER_3F,$04,Show
+MapHS91:
+	db POKEMON_TOWER_4F,$04,Show
+	db POKEMON_TOWER_4F,$05,Show
+	db POKEMON_TOWER_4F,$06,Show
+MapHS92:
+	db POKEMON_TOWER_5F,$06,Show
+MapHS93:
+	db POKEMON_TOWER_6F,$04,Show
+	db POKEMON_TOWER_6F,$05,Show
+MapHS94:
+	db POKEMON_TOWER_7F,$01,Show
+	db POKEMON_TOWER_7F,$02,Show
+	db POKEMON_TOWER_7F,$03,Show
+	db POKEMON_TOWER_7F,$04,Show
+MapHS95:
+	db MR_FUJIS_HOUSE,$05,Hide
+MapHS84:
+	db CELADON_MANSION_ROOF_HOUSE,$02,Show
+MapHS87:
+	db GAME_CORNER,$0B,Show
+MapHS9B:
+	db WARDENS_HOUSE,$02,Show
+MapHSA5:
+	db POKEMON_MANSION_1F,$02,Show
+	db POKEMON_MANSION_1F,$03,Show
+MapHSB1:
+	db FIGHTING_DOJO,$06,Show
+	db FIGHTING_DOJO,$07,Show
+MapHSB5:
+	db SILPH_CO_1F,$01,Hide
+MapHS53:
+	db POWER_PLANT,$01,Show
+	db POWER_PLANT,$02,Show
+	db POWER_PLANT,$03,Show
+	db POWER_PLANT,$04,Show
+	db POWER_PLANT,$05,Show
+	db POWER_PLANT,$06,Show
+	db POWER_PLANT,$07,Show
+	db POWER_PLANT,$08,Show
+	db POWER_PLANT,$09,Show
+	db POWER_PLANT,$0A,Show
+	db POWER_PLANT,$0B,Show
+	db POWER_PLANT,$0C,Show
+	db POWER_PLANT,$0D,Show
+	db POWER_PLANT,$0E,Show
+MapHSC2:
+	db VICTORY_ROAD_2F,$06,Show
+	db VICTORY_ROAD_2F,$07,Show
+	db VICTORY_ROAD_2F,$08,Show
+	db VICTORY_ROAD_2F,$09,Show
+	db VICTORY_ROAD_2F,$0A,Show
+	db VICTORY_ROAD_2F,$0D,Show
+MapHS58:
+	db BILLS_HOUSE,$01,Show
+	db BILLS_HOUSE,$02,Hide
+	db BILLS_HOUSE,$03,Hide
+MapHS33:
+	db VIRIDIAN_FOREST,$05,Show
+	db VIRIDIAN_FOREST,$06,Show
+	db VIRIDIAN_FOREST,$07,Show
+MapHS3B:
+	db MT_MOON_1F,$08,Show
+	db MT_MOON_1F,$09,Show
+	db MT_MOON_1F,$0A,Show
+	db MT_MOON_1F,$0B,Show
+	db MT_MOON_1F,$0C,Show
+	db MT_MOON_1F,$0D,Show
+MapHS3D:
+	db MT_MOON_B2F,$06,Show
+	db MT_MOON_B2F,$07,Show
+	db MT_MOON_B2F,$08,Show
+	db MT_MOON_B2F,$09,Show
+MapHS60:
+	db SS_ANNE_2F,$02,Hide
+MapHS66:
+	db SS_ANNE_1F_ROOMS,$0A,Show
+MapHS67:
+	db SS_ANNE_2F_ROOMS,$06,Show
+	db SS_ANNE_2F_ROOMS,$09,Show
+MapHS68:
+	db SS_ANNE_B1F_ROOMS,$09,Show
+	db SS_ANNE_B1F_ROOMS,$0A,Show
+	db SS_ANNE_B1F_ROOMS,$0B,Show
+MapHSC6:
+	db VICTORY_ROAD_3F,$05,Show
+	db VICTORY_ROAD_3F,$06,Show
+	db VICTORY_ROAD_3F,$0A,Show
+MapHSC7:
+	db ROCKET_HIDEOUT_B1F,$06,Show
+	db ROCKET_HIDEOUT_B1F,$07,Show
+MapHSC8:
+	db ROCKET_HIDEOUT_B2F,$02,Show
+	db ROCKET_HIDEOUT_B2F,$03,Show
+	db ROCKET_HIDEOUT_B2F,$04,Show
+	db ROCKET_HIDEOUT_B2F,$05,Show
+MapHSC9:
+	db ROCKET_HIDEOUT_B3F,$03,Show
+	db ROCKET_HIDEOUT_B3F,$04,Show
+MapHSCA:
+	db ROCKET_HIDEOUT_B4F,$01,Show
+	db ROCKET_HIDEOUT_B4F,$05,Show
+	db ROCKET_HIDEOUT_B4F,$06,Show
+	db ROCKET_HIDEOUT_B4F,$07,Show
+	db ROCKET_HIDEOUT_B4F,$08,Hide
+	db ROCKET_HIDEOUT_B4F,$09,Hide
+MapHSCF:
+	db SILPH_CO_2F,$01,Show
+	db SILPH_CO_2F,$02,Show
+	db SILPH_CO_2F,$03,Show
+	db SILPH_CO_2F,$04,Show
+	db SILPH_CO_2F,$05,Show
+MapHSD0:
+	db SILPH_CO_3F,$02,Show
+	db SILPH_CO_3F,$03,Show
+	db SILPH_CO_3F,$04,Show
+MapHSD1:
+	db SILPH_CO_4F,$02,Show
+	db SILPH_CO_4F,$03,Show
+	db SILPH_CO_4F,$04,Show
+	db SILPH_CO_4F,$05,Show
+	db SILPH_CO_4F,$06,Show
+	db SILPH_CO_4F,$07,Show
+MapHSD2:
+	db SILPH_CO_5F,$02,Show
+	db SILPH_CO_5F,$03,Show
+	db SILPH_CO_5F,$04,Show
+	db SILPH_CO_5F,$05,Show
+	db SILPH_CO_5F,$06,Show
+	db SILPH_CO_5F,$07,Show
+	db SILPH_CO_5F,$08,Show
+MapHSD3:
+	db SILPH_CO_6F,$06,Show
+	db SILPH_CO_6F,$07,Show
+	db SILPH_CO_6F,$08,Show
+	db SILPH_CO_6F,$09,Show
+	db SILPH_CO_6F,$0A,Show
+MapHSD4:
+	db SILPH_CO_7F,$05,Show
+	db SILPH_CO_7F,$06,Show
+	db SILPH_CO_7F,$07,Show
+	db SILPH_CO_7F,$08,Show
+	db SILPH_CO_7F,$09,Show
+	db SILPH_CO_7F,$0A,Show
+	db SILPH_CO_7F,$0B,Show
+	db SILPH_CO_7F,$0C,Show
+MapHSD5:
+	db SILPH_CO_8F,$02,Show
+	db SILPH_CO_8F,$03,Show
+	db SILPH_CO_8F,$04,Show
+MapHSE9:
+	db SILPH_CO_9F,$02,Show
+	db SILPH_CO_9F,$03,Show
+	db SILPH_CO_9F,$04,Show
+MapHSEA:
+	db SILPH_CO_10F,$01,Show
+	db SILPH_CO_10F,$02,Show
+	db SILPH_CO_10F,$03,Show
+	db SILPH_CO_10F,$04,Show
+	db SILPH_CO_10F,$05,Show
+	db SILPH_CO_10F,$06,Show
+MapHSEB:
+	db SILPH_CO_11F,$03,Show
+	db SILPH_CO_11F,$04,Show
+	db SILPH_CO_11F,$05,Show
+MapHSF4:
+	db UNUSED_MAP_F4,$02,Show
+MapHSD6:
+	db POKEMON_MANSION_2F,$02,Show
+MapHSD7:
+	db POKEMON_MANSION_3F,$03,Show
+	db POKEMON_MANSION_3F,$04,Show
+MapHSD8:
+	db POKEMON_MANSION_B1F,$03,Show
+	db POKEMON_MANSION_B1F,$04,Show
+	db POKEMON_MANSION_B1F,$05,Show
+	db POKEMON_MANSION_B1F,$06,Show
+	db POKEMON_MANSION_B1F,$08,Show
+MapHSD9:
+	db SAFARI_ZONE_EAST,$01,Show
+	db SAFARI_ZONE_EAST,$02,Show
+	db SAFARI_ZONE_EAST,$03,Show
+	db SAFARI_ZONE_EAST,$04,Show
+MapHSDA:
+	db SAFARI_ZONE_NORTH,$01,Show
+	db SAFARI_ZONE_NORTH,$02,Show
+MapHSDB:
+	db SAFARI_ZONE_WEST,$01,Show
+	db SAFARI_ZONE_WEST,$02,Show
+	db SAFARI_ZONE_WEST,$03,Show
+	db SAFARI_ZONE_WEST,$04,Show
+MapHSDC:
+	db SAFARI_ZONE_CENTER,$01,Show
+MapHSE2:
+	db CERULEAN_CAVE_2F,$01,Show
+	db CERULEAN_CAVE_2F,$02,Show
+	db CERULEAN_CAVE_2F,$03,Show
+MapHSE3:
+	db CERULEAN_CAVE_B1F,$01,Show
+	db CERULEAN_CAVE_B1F,$02,Show
+	db CERULEAN_CAVE_B1F,$03,Show
+MapHS6C:
+	db VICTORY_ROAD_1F,$03,Show
+	db VICTORY_ROAD_1F,$04,Show
+MapHS78:
+	db CHAMPIONS_ROOM,$02,Hide
+MapHSC0:
+	db SEAFOAM_ISLANDS_1F,$01,Show
+	db SEAFOAM_ISLANDS_1F,$02,Show
+MapHS9F:
+	db SEAFOAM_ISLANDS_B1F,$01,Hide
+	db SEAFOAM_ISLANDS_B1F,$02,Hide
+MapHSA0:
+	db SEAFOAM_ISLANDS_B2F,$01,Hide
+	db SEAFOAM_ISLANDS_B2F,$02,Hide
+MapHSA1:
+	db SEAFOAM_ISLANDS_B3F,$02,Show
+	db SEAFOAM_ISLANDS_B3F,$03,Show
+	db SEAFOAM_ISLANDS_B3F,$05,Hide
+	db SEAFOAM_ISLANDS_B3F,$06,Hide
+MapHSA2:
+	db SEAFOAM_ISLANDS_B4F,$01,Hide
+	db SEAFOAM_ISLANDS_B4F,$02,Hide
+	db SEAFOAM_ISLANDS_B4F,$03,Show
+
+	db $FF,$01,Show
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/mapObjects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm
index 4a82e78d..4a82e78d 100755
--- a/data/mapObjects/AgathasRoom.asm
+++ b/data/maps/objects/AgathasRoom.asm
diff --git a/data/mapObjects/BikeShop.asm b/data/maps/objects/BikeShop.asm
index 9f21ab3e..9f21ab3e 100755
--- a/data/mapObjects/BikeShop.asm
+++ b/data/maps/objects/BikeShop.asm
diff --git a/data/mapObjects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm
index c8f708cb..c8f708cb 100755
--- a/data/mapObjects/BillsHouse.asm
+++ b/data/maps/objects/BillsHouse.asm
diff --git a/data/mapObjects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm
index 45ca1286..45ca1286 100755
--- a/data/mapObjects/BluesHouse.asm
+++ b/data/maps/objects/BluesHouse.asm
diff --git a/data/mapObjects/BrunosRoom.asm b/data/maps/objects/BrunosRoom.asm
index dde1e2dd..dde1e2dd 100755
--- a/data/mapObjects/BrunosRoom.asm
+++ b/data/maps/objects/BrunosRoom.asm
diff --git a/data/mapObjects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm
index 88850f35..88850f35 100755
--- a/data/mapObjects/CeladonChiefHouse.asm
+++ b/data/maps/objects/CeladonChiefHouse.asm
diff --git a/data/mapObjects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm
index 005fc61e..005fc61e 100755
--- a/data/mapObjects/CeladonCity.asm
+++ b/data/maps/objects/CeladonCity.asm
diff --git a/data/mapObjects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm
index 0a4a895d..0a4a895d 100755
--- a/data/mapObjects/CeladonDiner.asm
+++ b/data/maps/objects/CeladonDiner.asm
diff --git a/data/mapObjects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm
index 98fce576..98fce576 100755
--- a/data/mapObjects/CeladonGym.asm
+++ b/data/maps/objects/CeladonGym.asm
diff --git a/data/mapObjects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm
index f4aa1305..f4aa1305 100755
--- a/data/mapObjects/CeladonHotel.asm
+++ b/data/maps/objects/CeladonHotel.asm
diff --git a/data/mapObjects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm
index 1abd434c..1abd434c 100755
--- a/data/mapObjects/CeladonMansion1F.asm
+++ b/data/maps/objects/CeladonMansion1F.asm
diff --git a/data/mapObjects/CeladonMansion2F.asm b/data/maps/objects/CeladonMansion2F.asm
index 09c94d29..09c94d29 100755
--- a/data/mapObjects/CeladonMansion2F.asm
+++ b/data/maps/objects/CeladonMansion2F.asm
diff --git a/data/mapObjects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm
index 32701f14..32701f14 100755
--- a/data/mapObjects/CeladonMansion3F.asm
+++ b/data/maps/objects/CeladonMansion3F.asm
diff --git a/data/mapObjects/CeladonMansionRoof.asm b/data/maps/objects/CeladonMansionRoof.asm
index 353b0b96..353b0b96 100755
--- a/data/mapObjects/CeladonMansionRoof.asm
+++ b/data/maps/objects/CeladonMansionRoof.asm
diff --git a/data/mapObjects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm
index b6a6149f..b6a6149f 100755
--- a/data/mapObjects/CeladonMansionRoofHouse.asm
+++ b/data/maps/objects/CeladonMansionRoofHouse.asm
diff --git a/data/mapObjects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm
index 2037369a..2037369a 100755
--- a/data/mapObjects/CeladonMart1F.asm
+++ b/data/maps/objects/CeladonMart1F.asm
diff --git a/data/mapObjects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm
index 2f5f428e..2f5f428e 100755
--- a/data/mapObjects/CeladonMart2F.asm
+++ b/data/maps/objects/CeladonMart2F.asm
diff --git a/data/mapObjects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm
index 6dfce535..6dfce535 100755
--- a/data/mapObjects/CeladonMart3F.asm
+++ b/data/maps/objects/CeladonMart3F.asm
diff --git a/data/mapObjects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm
index 18ba3bdc..18ba3bdc 100755
--- a/data/mapObjects/CeladonMart4F.asm
+++ b/data/maps/objects/CeladonMart4F.asm
diff --git a/data/mapObjects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm
index fb1201c9..fb1201c9 100755
--- a/data/mapObjects/CeladonMart5F.asm
+++ b/data/maps/objects/CeladonMart5F.asm
diff --git a/data/mapObjects/CeladonMartElevator.asm b/data/maps/objects/CeladonMartElevator.asm
index 9688daef..9688daef 100755
--- a/data/mapObjects/CeladonMartElevator.asm
+++ b/data/maps/objects/CeladonMartElevator.asm
diff --git a/data/mapObjects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm
index 05cef2d4..05cef2d4 100755
--- a/data/mapObjects/CeladonMartRoof.asm
+++ b/data/maps/objects/CeladonMartRoof.asm
diff --git a/data/mapObjects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm
index da5d595f..da5d595f 100755
--- a/data/mapObjects/CeladonPokecenter.asm
+++ b/data/maps/objects/CeladonPokecenter.asm
diff --git a/data/mapObjects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm
index 62a6873b..62a6873b 100755
--- a/data/mapObjects/CeruleanBadgeHouse.asm
+++ b/data/maps/objects/CeruleanBadgeHouse.asm
diff --git a/data/mapObjects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm
index f9670482..f9670482 100755
--- a/data/mapObjects/CeruleanCave1F.asm
+++ b/data/maps/objects/CeruleanCave1F.asm
diff --git a/data/mapObjects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm
index f8312da0..f8312da0 100755
--- a/data/mapObjects/CeruleanCave2F.asm
+++ b/data/maps/objects/CeruleanCave2F.asm
diff --git a/data/mapObjects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm
index 461f77aa..461f77aa 100755
--- a/data/mapObjects/CeruleanCaveB1F.asm
+++ b/data/maps/objects/CeruleanCaveB1F.asm
diff --git a/data/mapObjects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm
index d5adcfd7..d5adcfd7 100755
--- a/data/mapObjects/CeruleanCity.asm
+++ b/data/maps/objects/CeruleanCity.asm
diff --git a/data/mapObjects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm
index 96713648..96713648 100755
--- a/data/mapObjects/CeruleanGym.asm
+++ b/data/maps/objects/CeruleanGym.asm
diff --git a/data/mapObjects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm
index 4659375f..4659375f 100755
--- a/data/mapObjects/CeruleanMart.asm
+++ b/data/maps/objects/CeruleanMart.asm
diff --git a/data/mapObjects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm
index f65db52c..f65db52c 100755
--- a/data/mapObjects/CeruleanPokecenter.asm
+++ b/data/maps/objects/CeruleanPokecenter.asm
diff --git a/data/mapObjects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm
index a4a46e9b..a4a46e9b 100755
--- a/data/mapObjects/CeruleanTradeHouse.asm
+++ b/data/maps/objects/CeruleanTradeHouse.asm
diff --git a/data/mapObjects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm
index 44b7cf20..44b7cf20 100755
--- a/data/mapObjects/CeruleanTrashedHouse.asm
+++ b/data/maps/objects/CeruleanTrashedHouse.asm
diff --git a/data/mapObjects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm
index 1e0cb7f4..1e0cb7f4 100755
--- a/data/mapObjects/ChampionsRoom.asm
+++ b/data/maps/objects/ChampionsRoom.asm
diff --git a/data/mapObjects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm
index ab204d43..ab204d43 100755
--- a/data/mapObjects/CinnabarGym.asm
+++ b/data/maps/objects/CinnabarGym.asm
diff --git a/data/mapObjects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm
index 1932e134..1932e134 100755
--- a/data/mapObjects/CinnabarIsland.asm
+++ b/data/maps/objects/CinnabarIsland.asm
diff --git a/data/mapObjects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm
index deb5d8ed..deb5d8ed 100755
--- a/data/mapObjects/CinnabarLab.asm
+++ b/data/maps/objects/CinnabarLab.asm
diff --git a/data/mapObjects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm
index d31502e6..d31502e6 100755
--- a/data/mapObjects/CinnabarLabFossilRoom.asm
+++ b/data/maps/objects/CinnabarLabFossilRoom.asm
diff --git a/data/mapObjects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm
index 37f93d43..37f93d43 100755
--- a/data/mapObjects/CinnabarLabMetronomeRoom.asm
+++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm
diff --git a/data/mapObjects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm
index 449cc914..449cc914 100755
--- a/data/mapObjects/CinnabarLabTradeRoom.asm
+++ b/data/maps/objects/CinnabarLabTradeRoom.asm
diff --git a/data/mapObjects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm
index af88ddf0..af88ddf0 100755
--- a/data/mapObjects/CinnabarMart.asm
+++ b/data/maps/objects/CinnabarMart.asm
diff --git a/data/mapObjects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm
index 9583ef2a..9583ef2a 100755
--- a/data/mapObjects/CinnabarPokecenter.asm
+++ b/data/maps/objects/CinnabarPokecenter.asm
diff --git a/data/mapObjects/Colosseum.asm b/data/maps/objects/Colosseum.asm
index 18762584..18762584 100755
--- a/data/mapObjects/Colosseum.asm
+++ b/data/maps/objects/Colosseum.asm
diff --git a/data/mapObjects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm
index cb4dbb0b..cb4dbb0b 100755
--- a/data/mapObjects/CopycatsHouse1F.asm
+++ b/data/maps/objects/CopycatsHouse1F.asm
diff --git a/data/mapObjects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm
index 18b56419..18b56419 100755
--- a/data/mapObjects/CopycatsHouse2F.asm
+++ b/data/maps/objects/CopycatsHouse2F.asm
diff --git a/data/mapObjects/Daycare.asm b/data/maps/objects/Daycare.asm
index c58c83e4..c58c83e4 100755
--- a/data/mapObjects/Daycare.asm
+++ b/data/maps/objects/Daycare.asm
diff --git a/data/mapObjects/DiglettsCave.asm b/data/maps/objects/DiglettsCave.asm
index b4fd0af8..b4fd0af8 100755
--- a/data/mapObjects/DiglettsCave.asm
+++ b/data/maps/objects/DiglettsCave.asm
diff --git a/data/mapObjects/DiglettsCaveRoute11.asm b/data/maps/objects/DiglettsCaveRoute11.asm
index a4c70f06..a4c70f06 100755
--- a/data/mapObjects/DiglettsCaveRoute11.asm
+++ b/data/maps/objects/DiglettsCaveRoute11.asm
diff --git a/data/mapObjects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm
index 0567fee6..0567fee6 100755
--- a/data/mapObjects/DiglettsCaveRoute2.asm
+++ b/data/maps/objects/DiglettsCaveRoute2.asm
diff --git a/data/mapObjects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm
index fdc7b838..fdc7b838 100755
--- a/data/mapObjects/FightingDojo.asm
+++ b/data/maps/objects/FightingDojo.asm
diff --git a/data/mapObjects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
index 363b56f9..363b56f9 100755
--- a/data/mapObjects/FuchsiaBillsGrandpasHouse.asm
+++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
diff --git a/data/mapObjects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm
index 09c97b02..09c97b02 100755
--- a/data/mapObjects/FuchsiaCity.asm
+++ b/data/maps/objects/FuchsiaCity.asm
diff --git a/data/mapObjects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm
index 390447c8..390447c8 100755
--- a/data/mapObjects/FuchsiaGoodRodHouse.asm
+++ b/data/maps/objects/FuchsiaGoodRodHouse.asm
diff --git a/data/mapObjects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm
index 5d707d53..5d707d53 100755
--- a/data/mapObjects/FuchsiaGym.asm
+++ b/data/maps/objects/FuchsiaGym.asm
diff --git a/data/mapObjects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm
index cfa71d8d..cfa71d8d 100755
--- a/data/mapObjects/FuchsiaMart.asm
+++ b/data/maps/objects/FuchsiaMart.asm
diff --git a/data/mapObjects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm
index 9130d920..9130d920 100755
--- a/data/mapObjects/FuchsiaMeetingRoom.asm
+++ b/data/maps/objects/FuchsiaMeetingRoom.asm
diff --git a/data/mapObjects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm
index 73dc529d..73dc529d 100755
--- a/data/mapObjects/FuchsiaPokecenter.asm
+++ b/data/maps/objects/FuchsiaPokecenter.asm
diff --git a/data/mapObjects/GameCorner.asm b/data/maps/objects/GameCorner.asm
index 2704f6ab..2704f6ab 100755
--- a/data/mapObjects/GameCorner.asm
+++ b/data/maps/objects/GameCorner.asm
diff --git a/data/mapObjects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm
index 35cd3ac8..35cd3ac8 100755
--- a/data/mapObjects/GameCornerPrizeRoom.asm
+++ b/data/maps/objects/GameCornerPrizeRoom.asm
diff --git a/data/mapObjects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm
index 3762d871..3762d871 100755
--- a/data/mapObjects/HallOfFame.asm
+++ b/data/maps/objects/HallOfFame.asm
diff --git a/data/mapObjects/IndigoPlateau.asm b/data/maps/objects/IndigoPlateau.asm
index 1447be11..1447be11 100755
--- a/data/mapObjects/IndigoPlateau.asm
+++ b/data/maps/objects/IndigoPlateau.asm
diff --git a/data/mapObjects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm
index ea113a16..ea113a16 100755
--- a/data/mapObjects/IndigoPlateauLobby.asm
+++ b/data/maps/objects/IndigoPlateauLobby.asm
diff --git a/data/mapObjects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm
index 6f22631a..6f22631a 100755
--- a/data/mapObjects/LancesRoom.asm
+++ b/data/maps/objects/LancesRoom.asm
diff --git a/data/mapObjects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm
index 96f1b3ba..96f1b3ba 100755
--- a/data/mapObjects/LavenderCuboneHouse.asm
+++ b/data/maps/objects/LavenderCuboneHouse.asm
diff --git a/data/mapObjects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm
index df14ad39..df14ad39 100755
--- a/data/mapObjects/LavenderMart.asm
+++ b/data/maps/objects/LavenderMart.asm
diff --git a/data/mapObjects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm
index 89e25571..89e25571 100755
--- a/data/mapObjects/LavenderPokecenter.asm
+++ b/data/maps/objects/LavenderPokecenter.asm
diff --git a/data/mapObjects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm
index 4aead666..4aead666 100755
--- a/data/mapObjects/LavenderTown.asm
+++ b/data/maps/objects/LavenderTown.asm
diff --git a/data/mapObjects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm
index 06450bb4..06450bb4 100755
--- a/data/mapObjects/LoreleisRoom.asm
+++ b/data/maps/objects/LoreleisRoom.asm
diff --git a/data/mapObjects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm
index 5b6ca2a6..5b6ca2a6 100755
--- a/data/mapObjects/MrFujisHouse.asm
+++ b/data/maps/objects/MrFujisHouse.asm
diff --git a/data/mapObjects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm
index 01f9e11c..01f9e11c 100755
--- a/data/mapObjects/MrPsychicsHouse.asm
+++ b/data/maps/objects/MrPsychicsHouse.asm
diff --git a/data/mapObjects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm
index 56820161..56820161 100755
--- a/data/mapObjects/MtMoon1F.asm
+++ b/data/maps/objects/MtMoon1F.asm
diff --git a/data/mapObjects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm
index a8365ba7..a8365ba7 100755
--- a/data/mapObjects/MtMoonB1F.asm
+++ b/data/maps/objects/MtMoonB1F.asm
diff --git a/data/mapObjects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm
index 27b2383f..27b2383f 100755
--- a/data/mapObjects/MtMoonB2F.asm
+++ b/data/maps/objects/MtMoonB2F.asm
diff --git a/data/mapObjects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm
index b23703e6..b23703e6 100755
--- a/data/mapObjects/MtMoonPokecenter.asm
+++ b/data/maps/objects/MtMoonPokecenter.asm
diff --git a/data/mapObjects/Museum1F.asm b/data/maps/objects/Museum1F.asm
index 1cfd2c68..1cfd2c68 100755
--- a/data/mapObjects/Museum1F.asm
+++ b/data/maps/objects/Museum1F.asm
diff --git a/data/mapObjects/Museum2F.asm b/data/maps/objects/Museum2F.asm
index 80815820..80815820 100755
--- a/data/mapObjects/Museum2F.asm
+++ b/data/maps/objects/Museum2F.asm
diff --git a/data/mapObjects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm
index da95bc43..da95bc43 100755
--- a/data/mapObjects/NameRatersHouse.asm
+++ b/data/maps/objects/NameRatersHouse.asm
diff --git a/data/mapObjects/OaksLab.asm b/data/maps/objects/OaksLab.asm
index fa78ccdf..fa78ccdf 100755
--- a/data/mapObjects/OaksLab.asm
+++ b/data/maps/objects/OaksLab.asm
diff --git a/data/mapObjects/PalletTown.asm b/data/maps/objects/PalletTown.asm
index 68b01175..68b01175 100755
--- a/data/mapObjects/PalletTown.asm
+++ b/data/maps/objects/PalletTown.asm
diff --git a/data/mapObjects/PewterCity.asm b/data/maps/objects/PewterCity.asm
index e1a3eecb..e1a3eecb 100755
--- a/data/mapObjects/PewterCity.asm
+++ b/data/maps/objects/PewterCity.asm
diff --git a/data/mapObjects/PewterGym.asm b/data/maps/objects/PewterGym.asm
index 538c3923..538c3923 100755
--- a/data/mapObjects/PewterGym.asm
+++ b/data/maps/objects/PewterGym.asm
diff --git a/data/mapObjects/PewterMart.asm b/data/maps/objects/PewterMart.asm
index 9b983316..9b983316 100755
--- a/data/mapObjects/PewterMart.asm
+++ b/data/maps/objects/PewterMart.asm
diff --git a/data/mapObjects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm
index f00317d1..f00317d1 100755
--- a/data/mapObjects/PewterNidoranHouse.asm
+++ b/data/maps/objects/PewterNidoranHouse.asm
diff --git a/data/mapObjects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm
index 2b375bf9..2b375bf9 100755
--- a/data/mapObjects/PewterPokecenter.asm
+++ b/data/maps/objects/PewterPokecenter.asm
diff --git a/data/mapObjects/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm
index e7134cb5..e7134cb5 100755
--- a/data/mapObjects/PewterSpeechHouse.asm
+++ b/data/maps/objects/PewterSpeechHouse.asm
diff --git a/data/mapObjects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm
index e1f175f0..e1f175f0 100755
--- a/data/mapObjects/PokemonFanClub.asm
+++ b/data/maps/objects/PokemonFanClub.asm
diff --git a/data/mapObjects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm
index 109b5b8e..109b5b8e 100755
--- a/data/mapObjects/PokemonMansion1F.asm
+++ b/data/maps/objects/PokemonMansion1F.asm
diff --git a/data/mapObjects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm
index 6c0cc5f8..6c0cc5f8 100755
--- a/data/mapObjects/PokemonMansion2F.asm
+++ b/data/maps/objects/PokemonMansion2F.asm
diff --git a/data/mapObjects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm
index 7c8c9c22..7c8c9c22 100755
--- a/data/mapObjects/PokemonMansion3F.asm
+++ b/data/maps/objects/PokemonMansion3F.asm
diff --git a/data/mapObjects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm
index ac232799..ac232799 100755
--- a/data/mapObjects/PokemonMansionB1F.asm
+++ b/data/maps/objects/PokemonMansionB1F.asm
diff --git a/data/mapObjects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm
index cf62836b..cf62836b 100755
--- a/data/mapObjects/PokemonTower1F.asm
+++ b/data/maps/objects/PokemonTower1F.asm
diff --git a/data/mapObjects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm
index 5ce437d1..5ce437d1 100755
--- a/data/mapObjects/PokemonTower2F.asm
+++ b/data/maps/objects/PokemonTower2F.asm
diff --git a/data/mapObjects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm
index 79b83f88..79b83f88 100755
--- a/data/mapObjects/PokemonTower3F.asm
+++ b/data/maps/objects/PokemonTower3F.asm
diff --git a/data/mapObjects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm
index db86c02c..db86c02c 100755
--- a/data/mapObjects/PokemonTower4F.asm
+++ b/data/maps/objects/PokemonTower4F.asm
diff --git a/data/mapObjects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm
index b482871f..b482871f 100755
--- a/data/mapObjects/PokemonTower5F.asm
+++ b/data/maps/objects/PokemonTower5F.asm
diff --git a/data/mapObjects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm
index 823fe78a..823fe78a 100755
--- a/data/mapObjects/PokemonTower6F.asm
+++ b/data/maps/objects/PokemonTower6F.asm
diff --git a/data/mapObjects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm
index 79cb5b0d..79cb5b0d 100755
--- a/data/mapObjects/PokemonTower7F.asm
+++ b/data/maps/objects/PokemonTower7F.asm
diff --git a/data/mapObjects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm
index a8548b1c..a8548b1c 100755
--- a/data/mapObjects/PowerPlant.asm
+++ b/data/maps/objects/PowerPlant.asm
diff --git a/data/mapObjects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm
index a54b5411..a54b5411 100755
--- a/data/mapObjects/RedsHouse1F.asm
+++ b/data/maps/objects/RedsHouse1F.asm
diff --git a/data/mapObjects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm
index 98e9c236..98e9c236 100755
--- a/data/mapObjects/RedsHouse2F.asm
+++ b/data/maps/objects/RedsHouse2F.asm
diff --git a/data/mapObjects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm
index 1cf5a12f..1cf5a12f 100755
--- a/data/mapObjects/RockTunnel1F.asm
+++ b/data/maps/objects/RockTunnel1F.asm
diff --git a/data/mapObjects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm
index f562168e..f562168e 100755
--- a/data/mapObjects/RockTunnelB1F.asm
+++ b/data/maps/objects/RockTunnelB1F.asm
diff --git a/data/mapObjects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm
index a7619f7f..a7619f7f 100755
--- a/data/mapObjects/RockTunnelPokecenter.asm
+++ b/data/maps/objects/RockTunnelPokecenter.asm
diff --git a/data/mapObjects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm
index 99537510..99537510 100755
--- a/data/mapObjects/RocketHideoutB1F.asm
+++ b/data/maps/objects/RocketHideoutB1F.asm
diff --git a/data/mapObjects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm
index 36fe9289..36fe9289 100755
--- a/data/mapObjects/RocketHideoutB2F.asm
+++ b/data/maps/objects/RocketHideoutB2F.asm
diff --git a/data/mapObjects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm
index 6169dbed..6169dbed 100755
--- a/data/mapObjects/RocketHideoutB3F.asm
+++ b/data/maps/objects/RocketHideoutB3F.asm
diff --git a/data/mapObjects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm
index be353f25..be353f25 100755
--- a/data/mapObjects/RocketHideoutB4F.asm
+++ b/data/maps/objects/RocketHideoutB4F.asm
diff --git a/data/mapObjects/RocketHideoutElevator.asm b/data/maps/objects/RocketHideoutElevator.asm
index bc4fd7ff..bc4fd7ff 100755
--- a/data/mapObjects/RocketHideoutElevator.asm
+++ b/data/maps/objects/RocketHideoutElevator.asm
diff --git a/data/mapObjects/Route1.asm b/data/maps/objects/Route1.asm
index 0815fe67..0815fe67 100755
--- a/data/mapObjects/Route1.asm
+++ b/data/maps/objects/Route1.asm
diff --git a/data/mapObjects/Route10.asm b/data/maps/objects/Route10.asm
index 12850577..12850577 100755
--- a/data/mapObjects/Route10.asm
+++ b/data/maps/objects/Route10.asm
diff --git a/data/mapObjects/Route11.asm b/data/maps/objects/Route11.asm
index 5ed232f5..5ed232f5 100755
--- a/data/mapObjects/Route11.asm
+++ b/data/maps/objects/Route11.asm
diff --git a/data/mapObjects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm
index 5c4a120c..5c4a120c 100755
--- a/data/mapObjects/Route11Gate1F.asm
+++ b/data/maps/objects/Route11Gate1F.asm
diff --git a/data/mapObjects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm
index bf305bba..bf305bba 100755
--- a/data/mapObjects/Route11Gate2F.asm
+++ b/data/maps/objects/Route11Gate2F.asm
diff --git a/data/mapObjects/Route12.asm b/data/maps/objects/Route12.asm
index a9d84cf0..a9d84cf0 100755
--- a/data/mapObjects/Route12.asm
+++ b/data/maps/objects/Route12.asm
diff --git a/data/mapObjects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm
index 94f6b91a..94f6b91a 100755
--- a/data/mapObjects/Route12Gate1F.asm
+++ b/data/maps/objects/Route12Gate1F.asm
diff --git a/data/mapObjects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm
index cc6c1c19..cc6c1c19 100755
--- a/data/mapObjects/Route12Gate2F.asm
+++ b/data/maps/objects/Route12Gate2F.asm
diff --git a/data/mapObjects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm
index 458378a2..458378a2 100755
--- a/data/mapObjects/Route12SuperRodHouse.asm
+++ b/data/maps/objects/Route12SuperRodHouse.asm
diff --git a/data/mapObjects/Route13.asm b/data/maps/objects/Route13.asm
index 3f460901..3f460901 100755
--- a/data/mapObjects/Route13.asm
+++ b/data/maps/objects/Route13.asm
diff --git a/data/mapObjects/Route14.asm b/data/maps/objects/Route14.asm
index 565e587f..565e587f 100755
--- a/data/mapObjects/Route14.asm
+++ b/data/maps/objects/Route14.asm
diff --git a/data/mapObjects/Route15.asm b/data/maps/objects/Route15.asm
index f52cc1b8..f52cc1b8 100755
--- a/data/mapObjects/Route15.asm
+++ b/data/maps/objects/Route15.asm
diff --git a/data/mapObjects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm
index 23b1f5a7..23b1f5a7 100755
--- a/data/mapObjects/Route15Gate1F.asm
+++ b/data/maps/objects/Route15Gate1F.asm
diff --git a/data/mapObjects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm
index 162f2b1f..162f2b1f 100755
--- a/data/mapObjects/Route15Gate2F.asm
+++ b/data/maps/objects/Route15Gate2F.asm
diff --git a/data/mapObjects/Route16.asm b/data/maps/objects/Route16.asm
index fb23e6ca..fb23e6ca 100755
--- a/data/mapObjects/Route16.asm
+++ b/data/maps/objects/Route16.asm
diff --git a/data/mapObjects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm
index ec493fef..ec493fef 100755
--- a/data/mapObjects/Route16FlyHouse.asm
+++ b/data/maps/objects/Route16FlyHouse.asm
diff --git a/data/mapObjects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm
index 1d5baa1d..1d5baa1d 100755
--- a/data/mapObjects/Route16Gate1F.asm
+++ b/data/maps/objects/Route16Gate1F.asm
diff --git a/data/mapObjects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm
index 5914f854..5914f854 100755
--- a/data/mapObjects/Route16Gate2F.asm
+++ b/data/maps/objects/Route16Gate2F.asm
diff --git a/data/mapObjects/Route17.asm b/data/maps/objects/Route17.asm
index f5bc4307..f5bc4307 100755
--- a/data/mapObjects/Route17.asm
+++ b/data/maps/objects/Route17.asm
diff --git a/data/mapObjects/Route18.asm b/data/maps/objects/Route18.asm
index 8bacd6c0..8bacd6c0 100755
--- a/data/mapObjects/Route18.asm
+++ b/data/maps/objects/Route18.asm
diff --git a/data/mapObjects/Route18Gate1F.asm b/data/maps/objects/Route18Gate1F.asm
index 83cb386a..83cb386a 100755
--- a/data/mapObjects/Route18Gate1F.asm
+++ b/data/maps/objects/Route18Gate1F.asm
diff --git a/data/mapObjects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm
index e48ec3b8..e48ec3b8 100755
--- a/data/mapObjects/Route18Gate2F.asm
+++ b/data/maps/objects/Route18Gate2F.asm
diff --git a/data/mapObjects/Route19.asm b/data/maps/objects/Route19.asm
index 9b39618e..9b39618e 100755
--- a/data/mapObjects/Route19.asm
+++ b/data/maps/objects/Route19.asm
diff --git a/data/mapObjects/Route2.asm b/data/maps/objects/Route2.asm
index b27ad199..b27ad199 100755
--- a/data/mapObjects/Route2.asm
+++ b/data/maps/objects/Route2.asm
diff --git a/data/mapObjects/Route20.asm b/data/maps/objects/Route20.asm
index 7bceef97..7bceef97 100755
--- a/data/mapObjects/Route20.asm
+++ b/data/maps/objects/Route20.asm
diff --git a/data/mapObjects/Route21.asm b/data/maps/objects/Route21.asm
index b7759b59..b7759b59 100755
--- a/data/mapObjects/Route21.asm
+++ b/data/maps/objects/Route21.asm
diff --git a/data/mapObjects/Route22.asm b/data/maps/objects/Route22.asm
index 56e759fd..56e759fd 100755
--- a/data/mapObjects/Route22.asm
+++ b/data/maps/objects/Route22.asm
diff --git a/data/mapObjects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm
index 3f693c7f..3f693c7f 100755
--- a/data/mapObjects/Route22Gate.asm
+++ b/data/maps/objects/Route22Gate.asm
diff --git a/data/mapObjects/Route23.asm b/data/maps/objects/Route23.asm
index b510c285..b510c285 100755
--- a/data/mapObjects/Route23.asm
+++ b/data/maps/objects/Route23.asm
diff --git a/data/mapObjects/Route24.asm b/data/maps/objects/Route24.asm
index 8ef0d2b9..8ef0d2b9 100755
--- a/data/mapObjects/Route24.asm
+++ b/data/maps/objects/Route24.asm
diff --git a/data/mapObjects/Route25.asm b/data/maps/objects/Route25.asm
index a85f85ca..a85f85ca 100755
--- a/data/mapObjects/Route25.asm
+++ b/data/maps/objects/Route25.asm
diff --git a/data/mapObjects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm
index a7feb780..a7feb780 100755
--- a/data/mapObjects/Route2Gate.asm
+++ b/data/maps/objects/Route2Gate.asm
diff --git a/data/mapObjects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm
index 89ece3ea..89ece3ea 100755
--- a/data/mapObjects/Route2TradeHouse.asm
+++ b/data/maps/objects/Route2TradeHouse.asm
diff --git a/data/mapObjects/Route3.asm b/data/maps/objects/Route3.asm
index 372ea6cf..372ea6cf 100755
--- a/data/mapObjects/Route3.asm
+++ b/data/maps/objects/Route3.asm
diff --git a/data/mapObjects/Route4.asm b/data/maps/objects/Route4.asm
index 4ab88f8f..4ab88f8f 100755
--- a/data/mapObjects/Route4.asm
+++ b/data/maps/objects/Route4.asm
diff --git a/data/mapObjects/Route5.asm b/data/maps/objects/Route5.asm
index df2c8c03..df2c8c03 100755
--- a/data/mapObjects/Route5.asm
+++ b/data/maps/objects/Route5.asm
diff --git a/data/mapObjects/Route5Gate.asm b/data/maps/objects/Route5Gate.asm
index e0e06a1d..e0e06a1d 100755
--- a/data/mapObjects/Route5Gate.asm
+++ b/data/maps/objects/Route5Gate.asm
diff --git a/data/mapObjects/Route6.asm b/data/maps/objects/Route6.asm
index fc2d7e24..fc2d7e24 100755
--- a/data/mapObjects/Route6.asm
+++ b/data/maps/objects/Route6.asm
diff --git a/data/mapObjects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm
index 8ed96d04..8ed96d04 100755
--- a/data/mapObjects/Route6Gate.asm
+++ b/data/maps/objects/Route6Gate.asm
diff --git a/data/mapObjects/Route7.asm b/data/maps/objects/Route7.asm
index 182904ef..182904ef 100755
--- a/data/mapObjects/Route7.asm
+++ b/data/maps/objects/Route7.asm
diff --git a/data/mapObjects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm
index 7f1afe0a..7f1afe0a 100755
--- a/data/mapObjects/Route7Gate.asm
+++ b/data/maps/objects/Route7Gate.asm
diff --git a/data/mapObjects/Route8.asm b/data/maps/objects/Route8.asm
index 137d70a0..137d70a0 100755
--- a/data/mapObjects/Route8.asm
+++ b/data/maps/objects/Route8.asm
diff --git a/data/mapObjects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm
index 3bba95a0..3bba95a0 100755
--- a/data/mapObjects/Route8Gate.asm
+++ b/data/maps/objects/Route8Gate.asm
diff --git a/data/mapObjects/Route9.asm b/data/maps/objects/Route9.asm
index a991c0c7..a991c0c7 100755
--- a/data/mapObjects/Route9.asm
+++ b/data/maps/objects/Route9.asm
diff --git a/data/mapObjects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm
index 3e454f06..3e454f06 100755
--- a/data/mapObjects/SSAnne1F.asm
+++ b/data/maps/objects/SSAnne1F.asm
diff --git a/data/mapObjects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm
index 617d2a55..617d2a55 100755
--- a/data/mapObjects/SSAnne1FRooms.asm
+++ b/data/maps/objects/SSAnne1FRooms.asm
diff --git a/data/mapObjects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm
index 6abd5ac4..6abd5ac4 100755
--- a/data/mapObjects/SSAnne2F.asm
+++ b/data/maps/objects/SSAnne2F.asm
diff --git a/data/mapObjects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm
index ebb053a8..ebb053a8 100755
--- a/data/mapObjects/SSAnne2FRooms.asm
+++ b/data/maps/objects/SSAnne2FRooms.asm
diff --git a/data/mapObjects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm
index f0bfc17b..f0bfc17b 100755
--- a/data/mapObjects/SSAnne3F.asm
+++ b/data/maps/objects/SSAnne3F.asm
diff --git a/data/mapObjects/SSAnneB1F.asm b/data/maps/objects/SSAnneB1F.asm
index fe54ea24..fe54ea24 100755
--- a/data/mapObjects/SSAnneB1F.asm
+++ b/data/maps/objects/SSAnneB1F.asm
diff --git a/data/mapObjects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm
index 1d31b89c..1d31b89c 100755
--- a/data/mapObjects/SSAnneB1FRooms.asm
+++ b/data/maps/objects/SSAnneB1FRooms.asm
diff --git a/data/mapObjects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm
index 8873c8f8..8873c8f8 100755
--- a/data/mapObjects/SSAnneBow.asm
+++ b/data/maps/objects/SSAnneBow.asm
diff --git a/data/mapObjects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm
index 545656cc..545656cc 100755
--- a/data/mapObjects/SSAnneCaptainsRoom.asm
+++ b/data/maps/objects/SSAnneCaptainsRoom.asm
diff --git a/data/mapObjects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm
index b5771e68..b5771e68 100755
--- a/data/mapObjects/SSAnneKitchen.asm
+++ b/data/maps/objects/SSAnneKitchen.asm
diff --git a/data/mapObjects/SafariZoneCenter.asm b/data/maps/objects/SafariZoneCenter.asm
index e54cec74..e54cec74 100755
--- a/data/mapObjects/SafariZoneCenter.asm
+++ b/data/maps/objects/SafariZoneCenter.asm
diff --git a/data/mapObjects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm
index 9eda9970..9eda9970 100755
--- a/data/mapObjects/SafariZoneCenterRestHouse.asm
+++ b/data/maps/objects/SafariZoneCenterRestHouse.asm
diff --git a/data/mapObjects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm
index df612ea9..df612ea9 100755
--- a/data/mapObjects/SafariZoneEast.asm
+++ b/data/maps/objects/SafariZoneEast.asm
diff --git a/data/mapObjects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm
index e7c68343..e7c68343 100755
--- a/data/mapObjects/SafariZoneEastRestHouse.asm
+++ b/data/maps/objects/SafariZoneEastRestHouse.asm
diff --git a/data/mapObjects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm
index 6749b45b..6749b45b 100755
--- a/data/mapObjects/SafariZoneGate.asm
+++ b/data/maps/objects/SafariZoneGate.asm
diff --git a/data/mapObjects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm
index 9eda7b4b..9eda7b4b 100755
--- a/data/mapObjects/SafariZoneNorth.asm
+++ b/data/maps/objects/SafariZoneNorth.asm
diff --git a/data/mapObjects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm
index 34b3ab4f..34b3ab4f 100755
--- a/data/mapObjects/SafariZoneNorthRestHouse.asm
+++ b/data/maps/objects/SafariZoneNorthRestHouse.asm
diff --git a/data/mapObjects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm
index 2a5fc22d..2a5fc22d 100755
--- a/data/mapObjects/SafariZoneSecretHouse.asm
+++ b/data/maps/objects/SafariZoneSecretHouse.asm
diff --git a/data/mapObjects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm
index 7faced72..7faced72 100755
--- a/data/mapObjects/SafariZoneWest.asm
+++ b/data/maps/objects/SafariZoneWest.asm
diff --git a/data/mapObjects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm
index 9f1bc0ed..9f1bc0ed 100755
--- a/data/mapObjects/SafariZoneWestRestHouse.asm
+++ b/data/maps/objects/SafariZoneWestRestHouse.asm
diff --git a/data/mapObjects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm
index b8d3a9cf..b8d3a9cf 100755
--- a/data/mapObjects/SaffronCity.asm
+++ b/data/maps/objects/SaffronCity.asm
diff --git a/data/mapObjects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm
index 1869421a..1869421a 100755
--- a/data/mapObjects/SaffronGym.asm
+++ b/data/maps/objects/SaffronGym.asm
diff --git a/data/mapObjects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm
index c376f2de..c376f2de 100755
--- a/data/mapObjects/SaffronMart.asm
+++ b/data/maps/objects/SaffronMart.asm
diff --git a/data/mapObjects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm
index 65a851bf..65a851bf 100755
--- a/data/mapObjects/SaffronPidgeyHouse.asm
+++ b/data/maps/objects/SaffronPidgeyHouse.asm
diff --git a/data/mapObjects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm
index e54fd76b..e54fd76b 100755
--- a/data/mapObjects/SaffronPokecenter.asm
+++ b/data/maps/objects/SaffronPokecenter.asm
diff --git a/data/mapObjects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm
index 8707ee0a..8707ee0a 100755
--- a/data/mapObjects/SeafoamIslands1F.asm
+++ b/data/maps/objects/SeafoamIslands1F.asm
diff --git a/data/mapObjects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm
index 426ca0c3..426ca0c3 100755
--- a/data/mapObjects/SeafoamIslandsB1F.asm
+++ b/data/maps/objects/SeafoamIslandsB1F.asm
diff --git a/data/mapObjects/SeafoamIslandsB2F.asm b/data/maps/objects/SeafoamIslandsB2F.asm
index 9c1a7898..9c1a7898 100755
--- a/data/mapObjects/SeafoamIslandsB2F.asm
+++ b/data/maps/objects/SeafoamIslandsB2F.asm
diff --git a/data/mapObjects/SeafoamIslandsB3F.asm b/data/maps/objects/SeafoamIslandsB3F.asm
index d194e1cd..d194e1cd 100755
--- a/data/mapObjects/SeafoamIslandsB3F.asm
+++ b/data/maps/objects/SeafoamIslandsB3F.asm
diff --git a/data/mapObjects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm
index 62d88b0c..62d88b0c 100755
--- a/data/mapObjects/SeafoamIslandsB4F.asm
+++ b/data/maps/objects/SeafoamIslandsB4F.asm
diff --git a/data/mapObjects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm
index 1c8948d3..1c8948d3 100755
--- a/data/mapObjects/SilphCo10F.asm
+++ b/data/maps/objects/SilphCo10F.asm
diff --git a/data/mapObjects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm
index 7a1dff73..7a1dff73 100755
--- a/data/mapObjects/SilphCo11F.asm
+++ b/data/maps/objects/SilphCo11F.asm
diff --git a/data/mapObjects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm
index fc040091..fc040091 100755
--- a/data/mapObjects/SilphCo1F.asm
+++ b/data/maps/objects/SilphCo1F.asm
diff --git a/data/mapObjects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm
index bc30d78d..bc30d78d 100755
--- a/data/mapObjects/SilphCo2F.asm
+++ b/data/maps/objects/SilphCo2F.asm
diff --git a/data/mapObjects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm
index f45cdf81..f45cdf81 100755
--- a/data/mapObjects/SilphCo3F.asm
+++ b/data/maps/objects/SilphCo3F.asm
diff --git a/data/mapObjects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm
index 3d865bbc..3d865bbc 100755
--- a/data/mapObjects/SilphCo4F.asm
+++ b/data/maps/objects/SilphCo4F.asm
diff --git a/data/mapObjects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm
index c10f17c8..c10f17c8 100755
--- a/data/mapObjects/SilphCo5F.asm
+++ b/data/maps/objects/SilphCo5F.asm
diff --git a/data/mapObjects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm
index ad2ac32f..ad2ac32f 100755
--- a/data/mapObjects/SilphCo6F.asm
+++ b/data/maps/objects/SilphCo6F.asm
diff --git a/data/mapObjects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm
index 255f4b33..255f4b33 100755
--- a/data/mapObjects/SilphCo7F.asm
+++ b/data/maps/objects/SilphCo7F.asm
diff --git a/data/mapObjects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm
index d05c7844..d05c7844 100755
--- a/data/mapObjects/SilphCo8F.asm
+++ b/data/maps/objects/SilphCo8F.asm
diff --git a/data/mapObjects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm
index 28ef5f10..28ef5f10 100755
--- a/data/mapObjects/SilphCo9F.asm
+++ b/data/maps/objects/SilphCo9F.asm
diff --git a/data/mapObjects/SilphCoElevator.asm b/data/maps/objects/SilphCoElevator.asm
index 9c4b5a79..9c4b5a79 100755
--- a/data/mapObjects/SilphCoElevator.asm
+++ b/data/maps/objects/SilphCoElevator.asm
diff --git a/data/mapObjects/TradeCenter.asm b/data/maps/objects/TradeCenter.asm
index e6df8087..e6df8087 100755
--- a/data/mapObjects/TradeCenter.asm
+++ b/data/maps/objects/TradeCenter.asm
diff --git a/data/mapObjects/UndergroundPathNorthSouth.asm b/data/maps/objects/UndergroundPathNorthSouth.asm
index 35e21cca..35e21cca 100755
--- a/data/mapObjects/UndergroundPathNorthSouth.asm
+++ b/data/maps/objects/UndergroundPathNorthSouth.asm
diff --git a/data/mapObjects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm
index af71ebb4..af71ebb4 100755
--- a/data/mapObjects/UndergroundPathRoute5.asm
+++ b/data/maps/objects/UndergroundPathRoute5.asm
diff --git a/data/mapObjects/UndergroundPathRoute6.asm b/data/maps/objects/UndergroundPathRoute6.asm
index 5a40ade2..5a40ade2 100755
--- a/data/mapObjects/UndergroundPathRoute6.asm
+++ b/data/maps/objects/UndergroundPathRoute6.asm
diff --git a/data/mapObjects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm
index 4666e0c9..4666e0c9 100755
--- a/data/mapObjects/UndergroundPathRoute7.asm
+++ b/data/maps/objects/UndergroundPathRoute7.asm
diff --git a/data/mapObjects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm
index c020646e..c020646e 100755
--- a/data/mapObjects/UndergroundPathRoute7Copy.asm
+++ b/data/maps/objects/UndergroundPathRoute7Copy.asm
diff --git a/data/mapObjects/UndergroundPathRoute8.asm b/data/maps/objects/UndergroundPathRoute8.asm
index 8be0d474..8be0d474 100755
--- a/data/mapObjects/UndergroundPathRoute8.asm
+++ b/data/maps/objects/UndergroundPathRoute8.asm
diff --git a/data/mapObjects/UndergroundPathWestEast.asm b/data/maps/objects/UndergroundPathWestEast.asm
index fa064aca..fa064aca 100755
--- a/data/mapObjects/UndergroundPathWestEast.asm
+++ b/data/maps/objects/UndergroundPathWestEast.asm
diff --git a/data/mapObjects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm
index b1e1a005..b1e1a005 100755
--- a/data/mapObjects/VermilionCity.asm
+++ b/data/maps/objects/VermilionCity.asm
diff --git a/data/mapObjects/VermilionDock.asm b/data/maps/objects/VermilionDock.asm
index 6f07554a..6f07554a 100755
--- a/data/mapObjects/VermilionDock.asm
+++ b/data/maps/objects/VermilionDock.asm
diff --git a/data/mapObjects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm
index 4ace83be..4ace83be 100755
--- a/data/mapObjects/VermilionGym.asm
+++ b/data/maps/objects/VermilionGym.asm
diff --git a/data/mapObjects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm
index 74bcf35f..74bcf35f 100755
--- a/data/mapObjects/VermilionMart.asm
+++ b/data/maps/objects/VermilionMart.asm
diff --git a/data/mapObjects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm
index f5b4b96a..f5b4b96a 100755
--- a/data/mapObjects/VermilionOldRodHouse.asm
+++ b/data/maps/objects/VermilionOldRodHouse.asm
diff --git a/data/mapObjects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm
index 0e820f86..0e820f86 100755
--- a/data/mapObjects/VermilionPidgeyHouse.asm
+++ b/data/maps/objects/VermilionPidgeyHouse.asm
diff --git a/data/mapObjects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm
index d2142045..d2142045 100755
--- a/data/mapObjects/VermilionPokecenter.asm
+++ b/data/maps/objects/VermilionPokecenter.asm
diff --git a/data/mapObjects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm
index 30212b2a..30212b2a 100755
--- a/data/mapObjects/VermilionTradeHouse.asm
+++ b/data/maps/objects/VermilionTradeHouse.asm
diff --git a/data/mapObjects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm
index cc0c47ce..cc0c47ce 100755
--- a/data/mapObjects/VictoryRoad1F.asm
+++ b/data/maps/objects/VictoryRoad1F.asm
diff --git a/data/mapObjects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm
index 55559bca..55559bca 100755
--- a/data/mapObjects/VictoryRoad2F.asm
+++ b/data/maps/objects/VictoryRoad2F.asm
diff --git a/data/mapObjects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm
index 2eb42417..2eb42417 100755
--- a/data/mapObjects/VictoryRoad3F.asm
+++ b/data/maps/objects/VictoryRoad3F.asm
diff --git a/data/mapObjects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm
index 32fe8d3a..32fe8d3a 100755
--- a/data/mapObjects/ViridianCity.asm
+++ b/data/maps/objects/ViridianCity.asm
diff --git a/data/mapObjects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm
index cbcb6ff8..cbcb6ff8 100755
--- a/data/mapObjects/ViridianForest.asm
+++ b/data/maps/objects/ViridianForest.asm
diff --git a/data/mapObjects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm
index 81e7fece..81e7fece 100755
--- a/data/mapObjects/ViridianForestNorthGate.asm
+++ b/data/maps/objects/ViridianForestNorthGate.asm
diff --git a/data/mapObjects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm
index 76f87e51..76f87e51 100755
--- a/data/mapObjects/ViridianForestSouthGate.asm
+++ b/data/maps/objects/ViridianForestSouthGate.asm
diff --git a/data/mapObjects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm
index e3fd17bd..e3fd17bd 100755
--- a/data/mapObjects/ViridianGym.asm
+++ b/data/maps/objects/ViridianGym.asm
diff --git a/data/mapObjects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm
index b3e7fee5..b3e7fee5 100755
--- a/data/mapObjects/ViridianMart.asm
+++ b/data/maps/objects/ViridianMart.asm
diff --git a/data/mapObjects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm
index aaf20a91..aaf20a91 100755
--- a/data/mapObjects/ViridianNicknameHouse.asm
+++ b/data/maps/objects/ViridianNicknameHouse.asm
diff --git a/data/mapObjects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm
index 43b73e68..43b73e68 100755
--- a/data/mapObjects/ViridianPokecenter.asm
+++ b/data/maps/objects/ViridianPokecenter.asm
diff --git a/data/mapObjects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm
index 01f2465d..01f2465d 100755
--- a/data/mapObjects/ViridianSchoolHouse.asm
+++ b/data/maps/objects/ViridianSchoolHouse.asm
diff --git a/data/mapObjects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm
index d8445738..d8445738 100755
--- a/data/mapObjects/WardensHouse.asm
+++ b/data/maps/objects/WardensHouse.asm
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/maps/sprite_sets.asm b/data/maps/sprite_sets.asm
new file mode 100755
index 00000000..faba21b5
--- /dev/null
+++ b/data/maps/sprite_sets.asm
@@ -0,0 +1,190 @@
+MapSpriteSets:
+	db $01 ; PALLET_TOWN
+	db $01 ; VIRIDIAN_CITY
+	db $02 ; PEWTER_CITY
+	db $02 ; CERULEAN_CITY
+	db $03 ; LAVENDER_TOWN
+	db $04 ; VERMILION_CITY
+	db $05 ; CELADON_CITY
+	db $0a ; FUCHSIA_CITY
+	db $01 ; CINNABAR_ISLAND
+	db $06 ; INDIGO_PLATEAU
+	db $07 ; SAFFRON_CITY
+	db $01 ; unused map ID
+	db $01 ; ROUTE_1
+	db $f1 ; ROUTE_2
+	db $02 ; ROUTE_3
+	db $02 ; ROUTE_4
+	db $f9 ; ROUTE_5
+	db $fa ; ROUTE_6
+	db $fb ; ROUTE_7
+	db $fc ; ROUTE_8
+	db $02 ; ROUTE_9
+	db $f2 ; ROUTE_10
+	db $f3 ; ROUTE_11
+	db $f4 ; ROUTE_12
+	db $08 ; ROUTE_13
+	db $08 ; ROUTE_14
+	db $f5 ; ROUTE_15
+	db $f6 ; ROUTE_16
+	db $09 ; ROUTE_17
+	db $f7 ; ROUTE_18
+	db $0a ; ROUTE_19
+	db $f8 ; ROUTE_20
+	db $01 ; ROUTE_21
+	db $01 ; ROUTE_22
+	db $06 ; ROUTE_23
+	db $02 ; ROUTE_24
+	db $02 ; ROUTE_25
+
+; Format:
+; 00: determines whether the map is split East/West or North/South
+; $01 = East/West divide
+; $02 = North/South divide
+; 01: coordinate of dividing line
+; 02: sprite set ID if in the West or North side
+; 03: sprite set ID if in the East or South side
+SplitMapSpriteSets:
+	db $02,$25,$02,$01 ; $f1
+	db $02,$32,$02,$03 ; $f2
+	db $01,$39,$04,$08 ; $f3
+	db $02,$15,$03,$08 ; $f4
+	db $01,$08,$0A,$08 ; $f5
+	db $01,$18,$09,$05 ; $f6
+	db $01,$22,$09,$0A ; $f7
+	db $01,$35,$01,$0A ; $f8
+	db $02,$21,$02,$07 ; $f9
+	db $02,$02,$07,$04 ; $fa
+	db $01,$11,$05,$07 ; $fb
+	db $01,$03,$07,$03 ; $fc
+
+SpriteSets:
+; sprite set $01
+	db SPRITE_BLUE
+	db SPRITE_BUG_CATCHER
+	db SPRITE_GIRL
+	db SPRITE_FISHER2
+	db SPRITE_BLACK_HAIR_BOY_1
+	db SPRITE_GAMBLER
+	db SPRITE_SEEL
+	db SPRITE_OAK
+	db SPRITE_SWIMMER
+	db SPRITE_BALL
+	db SPRITE_LYING_OLD_MAN
+
+; sprite set $02
+	db SPRITE_BUG_CATCHER
+	db SPRITE_ROCKET
+	db SPRITE_BLACK_HAIR_BOY_2
+	db SPRITE_HIKER
+	db SPRITE_SLOWBRO
+	db SPRITE_BLUE
+	db SPRITE_GUARD
+	db SPRITE_LASS
+	db SPRITE_BLACK_HAIR_BOY_1
+	db SPRITE_BALL
+	db SPRITE_LYING_OLD_MAN_UNUSED_2
+
+; sprite set $03
+	db SPRITE_LITTLE_GIRL
+	db SPRITE_GIRL
+	db SPRITE_BLACK_HAIR_BOY_2
+	db SPRITE_HIKER
+	db SPRITE_GAMBLER
+	db SPRITE_SLOWBRO
+	db SPRITE_LASS
+	db SPRITE_BLACK_HAIR_BOY_1
+	db SPRITE_GUARD
+	db SPRITE_BALL
+	db SPRITE_LYING_OLD_MAN_UNUSED_2
+
+; sprite set $04
+	db SPRITE_FOULARD_WOMAN
+	db SPRITE_BLACK_HAIR_BOY_2
+	db SPRITE_BUG_CATCHER
+	db SPRITE_GAMBLER
+	db SPRITE_SLOWBRO
+	db SPRITE_GUARD
+	db SPRITE_SAILOR
+	db SPRITE_LASS
+	db SPRITE_BLACK_HAIR_BOY_1
+	db SPRITE_BALL
+	db SPRITE_LYING_OLD_MAN_UNUSED_2
+
+; sprite set $05
+	db SPRITE_LITTLE_GIRL
+	db SPRITE_YOUNG_BOY
+	db SPRITE_GIRL
+	db SPRITE_FISHER2
+	db SPRITE_FAT_BALD_GUY
+	db SPRITE_OLD_PERSON
+	db SPRITE_SLOWBRO
+	db SPRITE_GUARD
+	db SPRITE_ROCKET
+	db SPRITE_BALL
+	db SPRITE_SNORLAX
+
+; sprite set $06
+	db SPRITE_BUG_CATCHER
+	db SPRITE_GYM_HELPER
+	db SPRITE_SLOWBRO
+	db SPRITE_BLUE
+	db SPRITE_LASS
+	db SPRITE_BLACK_HAIR_BOY_1
+	db SPRITE_SWIMMER
+	db SPRITE_GUARD
+	db SPRITE_GAMBLER
+	db SPRITE_BALL
+	db SPRITE_LYING_OLD_MAN_UNUSED_2
+
+; sprite set $07
+	db SPRITE_ROCKET
+	db SPRITE_OAK_AIDE
+	db SPRITE_LAPRAS_GIVER
+	db SPRITE_ERIKA
+	db SPRITE_GENTLEMAN
+	db SPRITE_BIRD
+	db SPRITE_ROCKER
+	db SPRITE_BLACK_HAIR_BOY_1
+	db SPRITE_SLOWBRO
+	db SPRITE_BALL
+	db SPRITE_LYING_OLD_MAN_UNUSED_2
+
+; sprite set $08
+	db SPRITE_BIKER
+	db SPRITE_BLACK_HAIR_BOY_2
+	db SPRITE_FAT_BALD_GUY
+	db SPRITE_LASS
+	db SPRITE_BLACK_HAIR_BOY_1
+	db SPRITE_FOULARD_WOMAN
+	db SPRITE_FISHER2
+	db SPRITE_ROCKER
+	db SPRITE_SLOWBRO
+	db SPRITE_BALL
+	db SPRITE_SNORLAX
+
+; sprite set $09
+	db SPRITE_BIKER
+	db SPRITE_BLACK_HAIR_BOY_1
+	db SPRITE_LAPRAS_GIVER
+	db SPRITE_FISHER2
+	db SPRITE_ROCKER
+	db SPRITE_HIKER
+	db SPRITE_GAMBLER
+	db SPRITE_FAT_BALD_GUY
+	db SPRITE_BLACK_HAIR_BOY_2
+	db SPRITE_BALL
+	db SPRITE_SNORLAX
+
+; sprite set $0a
+	db SPRITE_BIRD
+	db SPRITE_BLACK_HAIR_BOY_1
+	db SPRITE_CLEFAIRY
+	db SPRITE_FISHER2
+	db SPRITE_GAMBLER
+	db SPRITE_SLOWBRO
+	db SPRITE_SEEL
+	db SPRITE_SWIMMER
+	db SPRITE_BUG_CATCHER
+	db SPRITE_BALL
+	db SPRITE_OMANYTE
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/moves/effects_pointers.asm b/data/moves/effects_pointers.asm
new file mode 100644
index 00000000..02f6e5c6
--- /dev/null
+++ b/data/moves/effects_pointers.asm
@@ -0,0 +1,87 @@
+MoveEffectPointerTable:
+	dw SleepEffect               ; unused effect
+	dw PoisonEffect              ; POISON_SIDE_EFFECT1
+	dw DrainHPEffect             ; DRAIN_HP_EFFECT
+	dw FreezeBurnParalyzeEffect  ; BURN_SIDE_EFFECT1
+	dw FreezeBurnParalyzeEffect  ; FREEZE_SIDE_EFFECT
+	dw FreezeBurnParalyzeEffect  ; PARALYZE_SIDE_EFFECT1
+	dw ExplodeEffect             ; EXPLODE_EFFECT
+	dw DrainHPEffect             ; DREAM_EATER_EFFECT
+	dw NULL                      ; MIRROR_MOVE_EFFECT
+	dw StatModifierUpEffect      ; ATTACK_UP1_EFFECT
+	dw StatModifierUpEffect      ; DEFENSE_UP1_EFFECT
+	dw StatModifierUpEffect      ; SPEED_UP1_EFFECT
+	dw StatModifierUpEffect      ; SPECIAL_UP1_EFFECT
+	dw StatModifierUpEffect      ; ACCURACY_UP1_EFFECT
+	dw StatModifierUpEffect      ; EVASION_UP1_EFFECT
+	dw PayDayEffect              ; PAY_DAY_EFFECT
+	dw NULL                      ; SWIFT_EFFECT
+	dw StatModifierDownEffect    ; ATTACK_DOWN1_EFFECT
+	dw StatModifierDownEffect    ; DEFENSE_DOWN1_EFFECT
+	dw StatModifierDownEffect    ; SPEED_DOWN1_EFFECT
+	dw StatModifierDownEffect    ; SPECIAL_DOWN1_EFFECT
+	dw StatModifierDownEffect    ; ACCURACY_DOWN1_EFFECT
+	dw StatModifierDownEffect    ; EVASION_DOWN1_EFFECT
+	dw ConversionEffect          ; CONVERSION_EFFECT
+	dw HazeEffect                ; HAZE_EFFECT
+	dw BideEffect                ; BIDE_EFFECT
+	dw ThrashPetalDanceEffect    ; THRASH_PETAL_DANCE_EFFECT
+	dw SwitchAndTeleportEffect   ; SWITCH_AND_TELEPORT_EFFECT
+	dw TwoToFiveAttacksEffect    ; TWO_TO_FIVE_ATTACKS_EFFECT
+	dw TwoToFiveAttacksEffect    ; unused effect
+	dw FlinchSideEffect           ; FLINCH_SIDE_EFFECT1
+	dw SleepEffect               ; SLEEP_EFFECT
+	dw PoisonEffect              ; POISON_SIDE_EFFECT2
+	dw FreezeBurnParalyzeEffect  ; BURN_SIDE_EFFECT2
+	dw FreezeBurnParalyzeEffect  ; unused effect
+	dw FreezeBurnParalyzeEffect  ; PARALYZE_SIDE_EFFECT2
+	dw FlinchSideEffect           ; FLINCH_SIDE_EFFECT2
+	dw OneHitKOEffect            ; OHKO_EFFECT
+	dw ChargeEffect              ; CHARGE_EFFECT
+	dw NULL                      ; SUPER_FANG_EFFECT
+	dw NULL                      ; SPECIAL_DAMAGE_EFFECT
+	dw TrappingEffect            ; TRAPPING_EFFECT
+	dw ChargeEffect              ; FLY_EFFECT
+	dw TwoToFiveAttacksEffect    ; ATTACK_TWICE_EFFECT
+	dw NULL                      ; JUMP_KICK_EFFECT
+	dw MistEffect                ; MIST_EFFECT
+	dw FocusEnergyEffect         ; FOCUS_ENERGY_EFFECT
+	dw RecoilEffect              ; RECOIL_EFFECT
+	dw ConfusionEffect           ; CONFUSION_EFFECT
+	dw StatModifierUpEffect      ; ATTACK_UP2_EFFECT
+	dw StatModifierUpEffect      ; DEFENSE_UP2_EFFECT
+	dw StatModifierUpEffect      ; SPEED_UP2_EFFECT
+	dw StatModifierUpEffect      ; SPECIAL_UP2_EFFECT
+	dw StatModifierUpEffect      ; ACCURACY_UP2_EFFECT
+	dw StatModifierUpEffect      ; EVASION_UP2_EFFECT
+	dw HealEffect                ; HEAL_EFFECT
+	dw TransformEffect           ; TRANSFORM_EFFECT
+	dw StatModifierDownEffect    ; ATTACK_DOWN2_EFFECT
+	dw StatModifierDownEffect    ; DEFENSE_DOWN2_EFFECT
+	dw StatModifierDownEffect    ; SPEED_DOWN2_EFFECT
+	dw StatModifierDownEffect    ; SPECIAL_DOWN2_EFFECT
+	dw StatModifierDownEffect    ; ACCURACY_DOWN2_EFFECT
+	dw StatModifierDownEffect    ; EVASION_DOWN2_EFFECT
+	dw ReflectLightScreenEffect  ; LIGHT_SCREEN_EFFECT
+	dw ReflectLightScreenEffect  ; REFLECT_EFFECT
+	dw PoisonEffect              ; POISON_EFFECT
+	dw ParalyzeEffect            ; PARALYZE_EFFECT
+	dw StatModifierDownEffect    ; ATTACK_DOWN_SIDE_EFFECT
+	dw StatModifierDownEffect    ; DEFENSE_DOWN_SIDE_EFFECT
+	dw StatModifierDownEffect    ; SPEED_DOWN_SIDE_EFFECT
+	dw StatModifierDownEffect    ; SPECIAL_DOWN_SIDE_EFFECT
+	dw StatModifierDownEffect    ; unused effect
+	dw StatModifierDownEffect    ; unused effect
+	dw StatModifierDownEffect    ; unused effect
+	dw StatModifierDownEffect    ; unused effect
+	dw ConfusionSideEffect       ; CONFUSION_SIDE_EFFECT
+	dw TwoToFiveAttacksEffect    ; TWINEEDLE_EFFECT
+	dw NULL                      ; unused effect
+	dw SubstituteEffect          ; SUBSTITUTE_EFFECT
+	dw HyperBeamEffect           ; HYPER_BEAM_EFFECT
+	dw RageEffect                ; RAGE_EFFECT
+	dw MimicEffect               ; MIMIC_EFFECT
+	dw NULL                      ; METRONOME_EFFECT
+	dw LeechSeedEffect           ; LEECH_SEED_EFFECT
+	dw SplashEffect              ; SPLASH_EFFECT
+	dw DisableEffect             ; DISABLE_EFFECT
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/moves/hm_moves.asm b/data/moves/hm_moves.asm
new file mode 100644
index 00000000..4f14b8df
--- /dev/null
+++ b/data/moves/hm_moves.asm
@@ -0,0 +1,10 @@
+; This file is INCLUDEd twice:
+; - for HMMoves in home/names.asm
+; - for HMMoveArray in engine/pokemon/bills_pc.asm
+
+	db CUT
+	db FLY
+	db SURF
+	db STRENGTH
+	db FLASH
+	db -1 ; end
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/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm
new file mode 100755
index 00000000..51f6b244
--- /dev/null
+++ b/data/pokemon/evos_moves.asm
@@ -0,0 +1,2134 @@
+; See constants/pokemon_data_constants.asm
+; The max number of evolutions per monster is MAX_EVOLUTIONS
+
+EvosMovesPointerTable:
+	dw RhydonEvosMoves
+	dw KangaskhanEvosMoves
+	dw NidoranMEvosMoves
+	dw ClefairyEvosMoves
+	dw SpearowEvosMoves
+	dw VoltorbEvosMoves
+	dw NidokingEvosMoves
+	dw SlowbroEvosMoves
+	dw IvysaurEvosMoves
+	dw ExeggutorEvosMoves
+	dw LickitungEvosMoves
+	dw ExeggcuteEvosMoves
+	dw GrimerEvosMoves
+	dw GengarEvosMoves
+	dw NidoranFEvosMoves
+	dw NidoqueenEvosMoves
+	dw CuboneEvosMoves
+	dw RhyhornEvosMoves
+	dw LaprasEvosMoves
+	dw ArcanineEvosMoves
+	dw MewEvosMoves
+	dw GyaradosEvosMoves
+	dw ShellderEvosMoves
+	dw TentacoolEvosMoves
+	dw GastlyEvosMoves
+	dw ScytherEvosMoves
+	dw StaryuEvosMoves
+	dw BlastoiseEvosMoves
+	dw PinsirEvosMoves
+	dw TangelaEvosMoves
+	dw MissingNo1FEvosMoves
+	dw MissingNo20EvosMoves
+	dw GrowlitheEvosMoves
+	dw OnixEvosMoves
+	dw FearowEvosMoves
+	dw PidgeyEvosMoves
+	dw SlowpokeEvosMoves
+	dw KadabraEvosMoves
+	dw GravelerEvosMoves
+	dw ChanseyEvosMoves
+	dw MachokeEvosMoves
+	dw MrMimeEvosMoves
+	dw HitmonleeEvosMoves
+	dw HitmonchanEvosMoves
+	dw ArbokEvosMoves
+	dw ParasectEvosMoves
+	dw PsyduckEvosMoves
+	dw DrowzeeEvosMoves
+	dw GolemEvosMoves
+	dw MissingNo32EvosMoves
+	dw MagmarEvosMoves
+	dw MissingNo34EvosMoves
+	dw ElectabuzzEvosMoves
+	dw MagnetonEvosMoves
+	dw KoffingEvosMoves
+	dw MissingNo38EvosMoves
+	dw MankeyEvosMoves
+	dw SeelEvosMoves
+	dw DiglettEvosMoves
+	dw TaurosEvosMoves
+	dw MissingNo3DEvosMoves
+	dw MissingNo3EEvosMoves
+	dw MissingNo3FEvosMoves
+	dw FarfetchdEvosMoves
+	dw VenonatEvosMoves
+	dw DragoniteEvosMoves
+	dw MissingNo43EvosMoves
+	dw MissingNo44EvosMoves
+	dw MissingNo45EvosMoves
+	dw DoduoEvosMoves
+	dw PoliwagEvosMoves
+	dw JynxEvosMoves
+	dw MoltresEvosMoves
+	dw ArticunoEvosMoves
+	dw ZapdosEvosMoves
+	dw DittoEvosMoves
+	dw MeowthEvosMoves
+	dw KrabbyEvosMoves
+	dw MissingNo4FEvosMoves
+	dw MissingNo50EvosMoves
+	dw MissingNo51EvosMoves
+	dw VulpixEvosMoves
+	dw NinetalesEvosMoves
+	dw PikachuEvosMoves
+	dw RaichuEvosMoves
+	dw MissingNo56EvosMoves
+	dw MissingNo57EvosMoves
+	dw DratiniEvosMoves
+	dw DragonairEvosMoves
+	dw KabutoEvosMoves
+	dw KabutopsEvosMoves
+	dw HorseaEvosMoves
+	dw SeadraEvosMoves
+	dw MissingNo5EEvosMoves
+	dw MissingNo5FEvosMoves
+	dw SandshrewEvosMoves
+	dw SandslashEvosMoves
+	dw OmanyteEvosMoves
+	dw OmastarEvosMoves
+	dw JigglypuffEvosMoves
+	dw WigglytuffEvosMoves
+	dw EeveeEvosMoves
+	dw FlareonEvosMoves
+	dw JolteonEvosMoves
+	dw VaporeonEvosMoves
+	dw MachopEvosMoves
+	dw ZubatEvosMoves
+	dw EkansEvosMoves
+	dw ParasEvosMoves
+	dw PoliwhirlEvosMoves
+	dw PoliwrathEvosMoves
+	dw WeedleEvosMoves
+	dw KakunaEvosMoves
+	dw BeedrillEvosMoves
+	dw MissingNo73EvosMoves
+	dw DodrioEvosMoves
+	dw PrimeapeEvosMoves
+	dw DugtrioEvosMoves
+	dw VenomothEvosMoves
+	dw DewgongEvosMoves
+	dw MissingNo79EvosMoves
+	dw MissingNo7AEvosMoves
+	dw CaterpieEvosMoves
+	dw MetapodEvosMoves
+	dw ButterfreeEvosMoves
+	dw MachampEvosMoves
+	dw MissingNo7FEvosMoves
+	dw GolduckEvosMoves
+	dw HypnoEvosMoves
+	dw GolbatEvosMoves
+	dw MewtwoEvosMoves
+	dw SnorlaxEvosMoves
+	dw MagikarpEvosMoves
+	dw MissingNo86EvosMoves
+	dw MissingNo87EvosMoves
+	dw MukEvosMoves
+	dw MissingNo8AEvosMoves
+	dw KinglerEvosMoves
+	dw CloysterEvosMoves
+	dw MissingNo8CEvosMoves
+	dw ElectrodeEvosMoves
+	dw ClefableEvosMoves
+	dw WeezingEvosMoves
+	dw PersianEvosMoves
+	dw MarowakEvosMoves
+	dw MissingNo92EvosMoves
+	dw HaunterEvosMoves
+	dw AbraEvosMoves
+	dw AlakazamEvosMoves
+	dw PidgeottoEvosMoves
+	dw PidgeotEvosMoves
+	dw StarmieEvosMoves
+	dw BulbasaurEvosMoves
+	dw VenusaurEvosMoves
+	dw TentacruelEvosMoves
+	dw MissingNo9CEvosMoves
+	dw GoldeenEvosMoves
+	dw SeakingEvosMoves
+	dw MissingNo9FEvosMoves
+	dw MissingNoA0EvosMoves
+	dw MissingNoA1EvosMoves
+	dw MissingNoA2EvosMoves
+	dw PonytaEvosMoves
+	dw RapidashEvosMoves
+	dw RattataEvosMoves
+	dw RaticateEvosMoves
+	dw NidorinoEvosMoves
+	dw NidorinaEvosMoves
+	dw GeodudeEvosMoves
+	dw PorygonEvosMoves
+	dw AerodactylEvosMoves
+	dw MissingNoACEvosMoves
+	dw MagnemiteEvosMoves
+	dw MissingNoAEEvosMoves
+	dw MissingNoAFEvosMoves
+	dw CharmanderEvosMoves
+	dw SquirtleEvosMoves
+	dw CharmeleonEvosMoves
+	dw WartortleEvosMoves
+	dw CharizardEvosMoves
+	dw MissingNoB5EvosMoves
+	dw FossilKabutopsEvosMoves
+	dw FossilAerodactylEvosMoves
+	dw MonGhostEvosMoves
+	dw OddishEvosMoves
+	dw GloomEvosMoves
+	dw VileplumeEvosMoves
+	dw BellsproutEvosMoves
+	dw WeepinbellEvosMoves
+	dw VictreebelEvosMoves
+
+RhydonEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 30, STOMP
+	db 35, TAIL_WHIP
+	db 40, FURY_ATTACK
+	db 48, HORN_DRILL
+	db 55, LEER
+	db 64, TAKE_DOWN
+	db 0
+
+KangaskhanEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 26, BITE
+	db 31, TAIL_WHIP
+	db 36, MEGA_PUNCH
+	db 41, LEER
+	db 46, DIZZY_PUNCH
+	db 0
+
+NidoranMEvosMoves:
+; Evolutions
+	db EV_LEVEL, 16, NIDORINO
+	db 0
+; Learnset
+	db 8, HORN_ATTACK
+	db 14, POISON_STING
+	db 21, FOCUS_ENERGY
+	db 29, FURY_ATTACK
+	db 36, HORN_DRILL
+	db 43, DOUBLE_KICK
+	db 0
+
+ClefairyEvosMoves:
+; Evolutions
+	db EV_ITEM, MOON_STONE, 1, CLEFABLE
+	db 0
+; Learnset
+	db 13, SING
+	db 18, DOUBLESLAP
+	db 24, MINIMIZE
+	db 31, METRONOME
+	db 39, DEFENSE_CURL
+	db 48, LIGHT_SCREEN
+	db 0
+
+SpearowEvosMoves:
+; Evolutions
+	db EV_LEVEL, 20, FEAROW
+	db 0
+; Learnset
+	db 9, LEER
+	db 15, FURY_ATTACK
+	db 22, MIRROR_MOVE
+	db 29, DRILL_PECK
+	db 36, AGILITY
+	db 0
+
+VoltorbEvosMoves:
+; Evolutions
+	db EV_LEVEL, 30, ELECTRODE
+	db 0
+; Learnset
+	db 17, SONICBOOM
+	db 22, SELFDESTRUCT
+	db 29, LIGHT_SCREEN
+	db 36, SWIFT
+	db 43, EXPLOSION
+	db 0
+
+NidokingEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 8, HORN_ATTACK
+	db 14, POISON_STING
+	db 23, THRASH
+	db 0
+
+SlowbroEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 18, DISABLE
+	db 22, HEADBUTT
+	db 27, GROWL
+	db 33, WATER_GUN
+	db 37, WITHDRAW
+	db 44, AMNESIA
+	db 55, PSYCHIC_M
+	db 0
+
+IvysaurEvosMoves:
+; Evolutions
+	db EV_LEVEL, 32, VENUSAUR
+	db 0
+; Learnset
+	db 7, LEECH_SEED
+	db 13, VINE_WHIP
+	db 22, POISONPOWDER
+	db 30, RAZOR_LEAF
+	db 38, GROWTH
+	db 46, SLEEP_POWDER
+	db 54, SOLARBEAM
+	db 0
+
+ExeggutorEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 28, STOMP
+	db 0
+
+LickitungEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 7, STOMP
+	db 15, DISABLE
+	db 23, DEFENSE_CURL
+	db 31, SLAM
+	db 39, SCREECH
+	db 0
+
+ExeggcuteEvosMoves:
+; Evolutions
+	db EV_ITEM, LEAF_STONE, 1, EXEGGUTOR
+	db 0
+; Learnset
+	db 25, REFLECT
+	db 28, LEECH_SEED
+	db 32, STUN_SPORE
+	db 37, POISONPOWDER
+	db 42, SOLARBEAM
+	db 48, SLEEP_POWDER
+	db 0
+
+GrimerEvosMoves:
+; Evolutions
+	db EV_LEVEL, 38, MUK
+	db 0
+; Learnset
+	db 30, POISON_GAS
+	db 33, MINIMIZE
+	db 37, SLUDGE
+	db 42, HARDEN
+	db 48, SCREECH
+	db 55, ACID_ARMOR
+	db 0
+
+GengarEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 29, HYPNOSIS
+	db 38, DREAM_EATER
+	db 0
+
+NidoranFEvosMoves:
+; Evolutions
+	db EV_LEVEL, 16, NIDORINA
+	db 0
+; Learnset
+	db 8, SCRATCH
+	db 14, POISON_STING
+	db 21, TAIL_WHIP
+	db 29, BITE
+	db 36, FURY_SWIPES
+	db 43, DOUBLE_KICK
+	db 0
+
+NidoqueenEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 8, SCRATCH
+	db 14, POISON_STING
+	db 23, BODY_SLAM
+	db 0
+
+CuboneEvosMoves:
+; Evolutions
+	db EV_LEVEL, 28, MAROWAK
+	db 0
+; Learnset
+	db 25, LEER
+	db 31, FOCUS_ENERGY
+	db 38, THRASH
+	db 43, BONEMERANG
+	db 46, RAGE
+	db 0
+
+RhyhornEvosMoves:
+; Evolutions
+	db EV_LEVEL, 42, RHYDON
+	db 0
+; Learnset
+	db 30, STOMP
+	db 35, TAIL_WHIP
+	db 40, FURY_ATTACK
+	db 45, HORN_DRILL
+	db 50, LEER
+	db 55, TAKE_DOWN
+	db 0
+
+LaprasEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 16, SING
+	db 20, MIST
+	db 25, BODY_SLAM
+	db 31, CONFUSE_RAY
+	db 38, ICE_BEAM
+	db 46, HYDRO_PUMP
+	db 0
+
+ArcanineEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MewEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 10, TRANSFORM
+	db 20, MEGA_PUNCH
+	db 30, METRONOME
+	db 40, PSYCHIC_M
+	db 0
+
+GyaradosEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 20, BITE
+	db 25, DRAGON_RAGE
+	db 32, LEER
+	db 41, HYDRO_PUMP
+	db 52, HYPER_BEAM
+	db 0
+
+ShellderEvosMoves:
+; Evolutions
+	db EV_ITEM, WATER_STONE, 1, CLOYSTER
+	db 0
+; Learnset
+	db 18, SUPERSONIC
+	db 23, CLAMP
+	db 30, AURORA_BEAM
+	db 39, LEER
+	db 50, ICE_BEAM
+	db 0
+
+TentacoolEvosMoves:
+; Evolutions
+	db EV_LEVEL, 30, TENTACRUEL
+	db 0
+; Learnset
+	db 7, SUPERSONIC
+	db 13, WRAP
+	db 18, POISON_STING
+	db 22, WATER_GUN
+	db 27, CONSTRICT
+	db 33, BARRIER
+	db 40, SCREECH
+	db 48, HYDRO_PUMP
+	db 0
+
+GastlyEvosMoves:
+; Evolutions
+	db EV_LEVEL, 25, HAUNTER
+	db 0
+; Learnset
+	db 27, HYPNOSIS
+	db 35, DREAM_EATER
+	db 0
+
+ScytherEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 17, LEER
+	db 20, FOCUS_ENERGY
+	db 24, DOUBLE_TEAM
+	db 29, SLASH
+	db 35, SWORDS_DANCE
+	db 42, AGILITY
+	db 0
+
+StaryuEvosMoves:
+; Evolutions
+	db EV_ITEM, WATER_STONE, 1, STARMIE
+	db 0
+; Learnset
+	db 17, WATER_GUN
+	db 22, HARDEN
+	db 27, RECOVER
+	db 32, SWIFT
+	db 37, MINIMIZE
+	db 42, LIGHT_SCREEN
+	db 47, HYDRO_PUMP
+	db 0
+
+BlastoiseEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 8, BUBBLE
+	db 15, WATER_GUN
+	db 24, BITE
+	db 31, WITHDRAW
+	db 42, SKULL_BASH
+	db 52, HYDRO_PUMP
+	db 0
+
+PinsirEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 25, SEISMIC_TOSS
+	db 30, GUILLOTINE
+	db 36, FOCUS_ENERGY
+	db 43, HARDEN
+	db 49, SLASH
+	db 54, SWORDS_DANCE
+	db 0
+
+TangelaEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 29, ABSORB
+	db 32, POISONPOWDER
+	db 36, STUN_SPORE
+	db 39, SLEEP_POWDER
+	db 45, SLAM
+	db 49, GROWTH
+	db 0
+
+MissingNo1FEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNo20EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+GrowlitheEvosMoves:
+; Evolutions
+	db EV_ITEM, FIRE_STONE, 1, ARCANINE
+	db 0
+; Learnset
+	db 18, EMBER
+	db 23, LEER
+	db 30, TAKE_DOWN
+	db 39, AGILITY
+	db 50, FLAMETHROWER
+	db 0
+
+OnixEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 15, BIND
+	db 19, ROCK_THROW
+	db 25, RAGE
+	db 33, SLAM
+	db 43, HARDEN
+	db 0
+
+FearowEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 9, LEER
+	db 15, FURY_ATTACK
+	db 25, MIRROR_MOVE
+	db 34, DRILL_PECK
+	db 43, AGILITY
+	db 0
+
+PidgeyEvosMoves:
+; Evolutions
+	db EV_LEVEL, 18, PIDGEOTTO
+	db 0
+; Learnset
+	db 5, SAND_ATTACK
+	db 12, QUICK_ATTACK
+	db 19, WHIRLWIND
+	db 28, WING_ATTACK
+	db 36, AGILITY
+	db 44, MIRROR_MOVE
+	db 0
+
+SlowpokeEvosMoves:
+; Evolutions
+	db EV_LEVEL, 37, SLOWBRO
+	db 0
+; Learnset
+	db 18, DISABLE
+	db 22, HEADBUTT
+	db 27, GROWL
+	db 33, WATER_GUN
+	db 40, AMNESIA
+	db 48, PSYCHIC_M
+	db 0
+
+KadabraEvosMoves:
+; Evolutions
+	db EV_TRADE, 1, ALAKAZAM
+	db 0
+; Learnset
+	db 16, CONFUSION
+	db 20, DISABLE
+	db 27, PSYBEAM
+	db 31, RECOVER
+	db 38, PSYCHIC_M
+	db 42, REFLECT
+	db 0
+
+GravelerEvosMoves:
+; Evolutions
+	db EV_TRADE, 1, GOLEM
+	db 0
+; Learnset
+	db 11, DEFENSE_CURL
+	db 16, ROCK_THROW
+	db 21, SELFDESTRUCT
+	db 29, HARDEN
+	db 36, EARTHQUAKE
+	db 43, EXPLOSION
+	db 0
+
+ChanseyEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 24, SING
+	db 30, GROWL
+	db 38, MINIMIZE
+	db 44, DEFENSE_CURL
+	db 48, LIGHT_SCREEN
+	db 54, DOUBLE_EDGE
+	db 0
+
+MachokeEvosMoves:
+; Evolutions
+	db EV_TRADE, 1, MACHAMP
+	db 0
+; Learnset
+	db 20, LOW_KICK
+	db 25, LEER
+	db 36, FOCUS_ENERGY
+	db 44, SEISMIC_TOSS
+	db 52, SUBMISSION
+	db 0
+
+MrMimeEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 15, CONFUSION
+	db 23, LIGHT_SCREEN
+	db 31, DOUBLESLAP
+	db 39, MEDITATE
+	db 47, SUBSTITUTE
+	db 0
+
+HitmonleeEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 33, ROLLING_KICK
+	db 38, JUMP_KICK
+	db 43, FOCUS_ENERGY
+	db 48, HI_JUMP_KICK
+	db 53, MEGA_KICK
+	db 0
+
+HitmonchanEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 33, FIRE_PUNCH
+	db 38, ICE_PUNCH
+	db 43, THUNDERPUNCH
+	db 48, MEGA_PUNCH
+	db 53, COUNTER
+	db 0
+
+ArbokEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 10, POISON_STING
+	db 17, BITE
+	db 27, GLARE
+	db 36, SCREECH
+	db 47, ACID
+	db 0
+
+ParasectEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 13, STUN_SPORE
+	db 20, LEECH_LIFE
+	db 30, SPORE
+	db 39, SLASH
+	db 48, GROWTH
+	db 0
+
+PsyduckEvosMoves:
+; Evolutions
+	db EV_LEVEL, 33, GOLDUCK
+	db 0
+; Learnset
+	db 28, TAIL_WHIP
+	db 31, DISABLE
+	db 36, CONFUSION
+	db 43, FURY_SWIPES
+	db 52, HYDRO_PUMP
+	db 0
+
+DrowzeeEvosMoves:
+; Evolutions
+	db EV_LEVEL, 26, HYPNO
+	db 0
+; Learnset
+	db 12, DISABLE
+	db 17, CONFUSION
+	db 24, HEADBUTT
+	db 29, POISON_GAS
+	db 32, PSYCHIC_M
+	db 37, MEDITATE
+	db 0
+
+GolemEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 11, DEFENSE_CURL
+	db 16, ROCK_THROW
+	db 21, SELFDESTRUCT
+	db 29, HARDEN
+	db 36, EARTHQUAKE
+	db 43, EXPLOSION
+	db 0
+
+MissingNo32EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MagmarEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 36, LEER
+	db 39, CONFUSE_RAY
+	db 43, FIRE_PUNCH
+	db 48, SMOKESCREEN
+	db 52, SMOG
+	db 55, FLAMETHROWER
+	db 0
+
+MissingNo34EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+ElectabuzzEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 34, THUNDERSHOCK
+	db 37, SCREECH
+	db 42, THUNDERPUNCH
+	db 49, LIGHT_SCREEN
+	db 54, THUNDER
+	db 0
+
+MagnetonEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 21, SONICBOOM
+	db 25, THUNDERSHOCK
+	db 29, SUPERSONIC
+	db 38, THUNDER_WAVE
+	db 46, SWIFT
+	db 54, SCREECH
+	db 0
+
+KoffingEvosMoves:
+; Evolutions
+	db EV_LEVEL, 35, WEEZING
+	db 0
+; Learnset
+	db 32, SLUDGE
+	db 37, SMOKESCREEN
+	db 40, SELFDESTRUCT
+	db 45, HAZE
+	db 48, EXPLOSION
+	db 0
+
+MissingNo38EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MankeyEvosMoves:
+; Evolutions
+	db EV_LEVEL, 28, PRIMEAPE
+	db 0
+; Learnset
+	db 15, KARATE_CHOP
+	db 21, FURY_SWIPES
+	db 27, FOCUS_ENERGY
+	db 33, SEISMIC_TOSS
+	db 39, THRASH
+	db 0
+
+SeelEvosMoves:
+; Evolutions
+	db EV_LEVEL, 34, DEWGONG
+	db 0
+; Learnset
+	db 30, GROWL
+	db 35, AURORA_BEAM
+	db 40, REST
+	db 45, TAKE_DOWN
+	db 50, ICE_BEAM
+	db 0
+
+DiglettEvosMoves:
+; Evolutions
+	db EV_LEVEL, 26, DUGTRIO
+	db 0
+; Learnset
+	db 15, GROWL
+	db 19, DIG
+	db 24, SAND_ATTACK
+	db 31, SLASH
+	db 40, EARTHQUAKE
+	db 0
+
+TaurosEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 21, STOMP
+	db 28, TAIL_WHIP
+	db 35, LEER
+	db 44, RAGE
+	db 51, TAKE_DOWN
+	db 0
+
+MissingNo3DEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNo3EEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNo3FEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+FarfetchdEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 7, LEER
+	db 15, FURY_ATTACK
+	db 23, SWORDS_DANCE
+	db 31, AGILITY
+	db 39, SLASH
+	db 0
+
+VenonatEvosMoves:
+; Evolutions
+	db EV_LEVEL, 31, VENOMOTH
+	db 0
+; Learnset
+	db 24, POISONPOWDER
+	db 27, LEECH_LIFE
+	db 30, STUN_SPORE
+	db 35, PSYBEAM
+	db 38, SLEEP_POWDER
+	db 43, PSYCHIC_M
+	db 0
+
+DragoniteEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 10, THUNDER_WAVE
+	db 20, AGILITY
+	db 35, SLAM
+	db 45, DRAGON_RAGE
+	db 60, HYPER_BEAM
+	db 0
+
+MissingNo43EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNo44EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNo45EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+DoduoEvosMoves:
+; Evolutions
+	db EV_LEVEL, 31, DODRIO
+	db 0
+; Learnset
+	db 20, GROWL
+	db 24, FURY_ATTACK
+	db 30, DRILL_PECK
+	db 36, RAGE
+	db 40, TRI_ATTACK
+	db 44, AGILITY
+	db 0
+
+PoliwagEvosMoves:
+; Evolutions
+	db EV_LEVEL, 25, POLIWHIRL
+	db 0
+; Learnset
+	db 16, HYPNOSIS
+	db 19, WATER_GUN
+	db 25, DOUBLESLAP
+	db 31, BODY_SLAM
+	db 38, AMNESIA
+	db 45, HYDRO_PUMP
+	db 0
+
+JynxEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 18, LICK
+	db 23, DOUBLESLAP
+	db 31, ICE_PUNCH
+	db 39, BODY_SLAM
+	db 47, THRASH
+	db 58, BLIZZARD
+	db 0
+
+MoltresEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 51, LEER
+	db 55, AGILITY
+	db 60, SKY_ATTACK
+	db 0
+
+ArticunoEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 51, BLIZZARD
+	db 55, AGILITY
+	db 60, MIST
+	db 0
+
+ZapdosEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 51, THUNDER
+	db 55, AGILITY
+	db 60, LIGHT_SCREEN
+	db 0
+
+DittoEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MeowthEvosMoves:
+; Evolutions
+	db EV_LEVEL, 28, PERSIAN
+	db 0
+; Learnset
+	db 12, BITE
+	db 17, PAY_DAY
+	db 24, SCREECH
+	db 33, FURY_SWIPES
+	db 44, SLASH
+	db 0
+
+KrabbyEvosMoves:
+; Evolutions
+	db EV_LEVEL, 28, KINGLER
+	db 0
+; Learnset
+	db 20, VICEGRIP
+	db 25, GUILLOTINE
+	db 30, STOMP
+	db 35, CRABHAMMER
+	db 40, HARDEN
+	db 0
+
+MissingNo4FEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNo50EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNo51EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+VulpixEvosMoves:
+; Evolutions
+	db EV_ITEM, FIRE_STONE, 1, NINETALES
+	db 0
+; Learnset
+	db 16, QUICK_ATTACK
+	db 21, ROAR
+	db 28, CONFUSE_RAY
+	db 35, FLAMETHROWER
+	db 42, FIRE_SPIN
+	db 0
+
+NinetalesEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+PikachuEvosMoves:
+; Evolutions
+	db EV_ITEM, THUNDER_STONE, 1, RAICHU
+	db 0
+; Learnset
+	db 9, THUNDER_WAVE
+	db 16, QUICK_ATTACK
+	db 26, SWIFT
+	db 33, AGILITY
+	db 43, THUNDER
+	db 0
+
+RaichuEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNo56EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNo57EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+DratiniEvosMoves:
+; Evolutions
+	db EV_LEVEL, 30, DRAGONAIR
+	db 0
+; Learnset
+	db 10, THUNDER_WAVE
+	db 20, AGILITY
+	db 30, SLAM
+	db 40, DRAGON_RAGE
+	db 50, HYPER_BEAM
+	db 0
+
+DragonairEvosMoves:
+; Evolutions
+	db EV_LEVEL, 55, DRAGONITE
+	db 0
+; Learnset
+	db 10, THUNDER_WAVE
+	db 20, AGILITY
+	db 35, SLAM
+	db 45, DRAGON_RAGE
+	db 55, HYPER_BEAM
+	db 0
+
+KabutoEvosMoves:
+; Evolutions
+	db EV_LEVEL, 40, KABUTOPS
+	db 0
+; Learnset
+	db 34, ABSORB
+	db 39, SLASH
+	db 44, LEER
+	db 49, HYDRO_PUMP
+	db 0
+
+KabutopsEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 34, ABSORB
+	db 39, SLASH
+	db 46, LEER
+	db 53, HYDRO_PUMP
+	db 0
+
+HorseaEvosMoves:
+; Evolutions
+	db EV_LEVEL, 32, SEADRA
+	db 0
+; Learnset
+	db 19, SMOKESCREEN
+	db 24, LEER
+	db 30, WATER_GUN
+	db 37, AGILITY
+	db 45, HYDRO_PUMP
+	db 0
+
+SeadraEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 19, SMOKESCREEN
+	db 24, LEER
+	db 30, WATER_GUN
+	db 41, AGILITY
+	db 52, HYDRO_PUMP
+	db 0
+
+MissingNo5EEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNo5FEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+SandshrewEvosMoves:
+; Evolutions
+	db EV_LEVEL, 22, SANDSLASH
+	db 0
+; Learnset
+	db 10, SAND_ATTACK
+	db 17, SLASH
+	db 24, POISON_STING
+	db 31, SWIFT
+	db 38, FURY_SWIPES
+	db 0
+
+SandslashEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 10, SAND_ATTACK
+	db 17, SLASH
+	db 27, POISON_STING
+	db 36, SWIFT
+	db 47, FURY_SWIPES
+	db 0
+
+OmanyteEvosMoves:
+; Evolutions
+	db EV_LEVEL, 40, OMASTAR
+	db 0
+; Learnset
+	db 34, HORN_ATTACK
+	db 39, LEER
+	db 46, SPIKE_CANNON
+	db 53, HYDRO_PUMP
+	db 0
+
+OmastarEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 34, HORN_ATTACK
+	db 39, LEER
+	db 44, SPIKE_CANNON
+	db 49, HYDRO_PUMP
+	db 0
+
+JigglypuffEvosMoves:
+; Evolutions
+	db EV_ITEM, MOON_STONE, 1, WIGGLYTUFF
+	db 0
+; Learnset
+	db 9, POUND
+	db 14, DISABLE
+	db 19, DEFENSE_CURL
+	db 24, DOUBLESLAP
+	db 29, REST
+	db 34, BODY_SLAM
+	db 39, DOUBLE_EDGE
+	db 0
+
+WigglytuffEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+EeveeEvosMoves:
+; Evolutions
+	db EV_ITEM, FIRE_STONE, 1, FLAREON
+	db EV_ITEM, THUNDER_STONE, 1, JOLTEON
+	db EV_ITEM, WATER_STONE, 1, VAPOREON
+	db 0
+; Learnset
+	db 27, QUICK_ATTACK
+	db 31, TAIL_WHIP
+	db 37, BITE
+	db 45, TAKE_DOWN
+	db 0
+
+FlareonEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 27, QUICK_ATTACK
+	db 31, EMBER
+	db 37, TAIL_WHIP
+	db 40, BITE
+	db 42, LEER
+	db 44, FIRE_SPIN
+	db 48, RAGE
+	db 54, FLAMETHROWER
+	db 0
+
+JolteonEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 27, QUICK_ATTACK
+	db 31, THUNDERSHOCK
+	db 37, TAIL_WHIP
+	db 40, THUNDER_WAVE
+	db 42, DOUBLE_KICK
+	db 44, AGILITY
+	db 48, PIN_MISSILE
+	db 54, THUNDER
+	db 0
+
+VaporeonEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 27, QUICK_ATTACK
+	db 31, WATER_GUN
+	db 37, TAIL_WHIP
+	db 40, BITE
+	db 42, ACID_ARMOR
+	db 44, HAZE
+	db 48, MIST
+	db 54, HYDRO_PUMP
+	db 0
+
+MachopEvosMoves:
+; Evolutions
+	db EV_LEVEL, 28, MACHOKE
+	db 0
+; Learnset
+	db 20, LOW_KICK
+	db 25, LEER
+	db 32, FOCUS_ENERGY
+	db 39, SEISMIC_TOSS
+	db 46, SUBMISSION
+	db 0
+
+ZubatEvosMoves:
+; Evolutions
+	db EV_LEVEL, 22, GOLBAT
+	db 0
+; Learnset
+	db 10, SUPERSONIC
+	db 15, BITE
+	db 21, CONFUSE_RAY
+	db 28, WING_ATTACK
+	db 36, HAZE
+	db 0
+
+EkansEvosMoves:
+; Evolutions
+	db EV_LEVEL, 22, ARBOK
+	db 0
+; Learnset
+	db 10, POISON_STING
+	db 17, BITE
+	db 24, GLARE
+	db 31, SCREECH
+	db 38, ACID
+	db 0
+
+ParasEvosMoves:
+; Evolutions
+	db EV_LEVEL, 24, PARASECT
+	db 0
+; Learnset
+	db 13, STUN_SPORE
+	db 20, LEECH_LIFE
+	db 27, SPORE
+	db 34, SLASH
+	db 41, GROWTH
+	db 0
+
+PoliwhirlEvosMoves:
+; Evolutions
+	db EV_ITEM, WATER_STONE, 1, POLIWRATH
+	db 0
+; Learnset
+	db 16, HYPNOSIS
+	db 19, WATER_GUN
+	db 26, DOUBLESLAP
+	db 33, BODY_SLAM
+	db 41, AMNESIA
+	db 49, HYDRO_PUMP
+	db 0
+
+PoliwrathEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 16, HYPNOSIS
+	db 19, WATER_GUN
+	db 0
+
+WeedleEvosMoves:
+; Evolutions
+	db EV_LEVEL, 7, KAKUNA
+	db 0
+; Learnset
+	db 0
+
+KakunaEvosMoves:
+; Evolutions
+	db EV_LEVEL, 10, BEEDRILL
+	db 0
+; Learnset
+	db 0
+
+BeedrillEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 12, FURY_ATTACK
+	db 16, FOCUS_ENERGY
+	db 20, TWINEEDLE
+	db 25, RAGE
+	db 30, PIN_MISSILE
+	db 35, AGILITY
+	db 0
+
+MissingNo73EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+DodrioEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 20, GROWL
+	db 24, FURY_ATTACK
+	db 30, DRILL_PECK
+	db 39, RAGE
+	db 45, TRI_ATTACK
+	db 51, AGILITY
+	db 0
+
+PrimeapeEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 15, KARATE_CHOP
+	db 21, FURY_SWIPES
+	db 27, FOCUS_ENERGY
+	db 37, SEISMIC_TOSS
+	db 46, THRASH
+	db 0
+
+DugtrioEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 15, GROWL
+	db 19, DIG
+	db 24, SAND_ATTACK
+	db 35, SLASH
+	db 47, EARTHQUAKE
+	db 0
+
+VenomothEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 24, POISONPOWDER
+	db 27, LEECH_LIFE
+	db 30, STUN_SPORE
+	db 38, PSYBEAM
+	db 43, SLEEP_POWDER
+	db 50, PSYCHIC_M
+	db 0
+
+DewgongEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 30, GROWL
+	db 35, AURORA_BEAM
+	db 44, REST
+	db 50, TAKE_DOWN
+	db 56, ICE_BEAM
+	db 0
+
+MissingNo79EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNo7AEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+CaterpieEvosMoves:
+; Evolutions
+	db EV_LEVEL, 7, METAPOD
+	db 0
+; Learnset
+	db 0
+
+MetapodEvosMoves:
+; Evolutions
+	db EV_LEVEL, 10, BUTTERFREE
+	db 0
+; Learnset
+	db 0
+
+ButterfreeEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 12, CONFUSION
+	db 15, POISONPOWDER
+	db 16, STUN_SPORE
+	db 17, SLEEP_POWDER
+	db 21, SUPERSONIC
+	db 26, WHIRLWIND
+	db 32, PSYBEAM
+	db 0
+
+MachampEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 20, LOW_KICK
+	db 25, LEER
+	db 36, FOCUS_ENERGY
+	db 44, SEISMIC_TOSS
+	db 52, SUBMISSION
+	db 0
+
+MissingNo7FEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+GolduckEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 28, TAIL_WHIP
+	db 31, DISABLE
+	db 39, CONFUSION
+	db 48, FURY_SWIPES
+	db 59, HYDRO_PUMP
+	db 0
+
+HypnoEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 12, DISABLE
+	db 17, CONFUSION
+	db 24, HEADBUTT
+	db 33, POISON_GAS
+	db 37, PSYCHIC_M
+	db 43, MEDITATE
+	db 0
+
+GolbatEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 10, SUPERSONIC
+	db 15, BITE
+	db 21, CONFUSE_RAY
+	db 32, WING_ATTACK
+	db 43, HAZE
+	db 0
+
+MewtwoEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 63, BARRIER
+	db 66, PSYCHIC_M
+	db 70, RECOVER
+	db 75, MIST
+	db 81, AMNESIA
+	db 0
+
+SnorlaxEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 35, BODY_SLAM
+	db 41, HARDEN
+	db 48, DOUBLE_EDGE
+	db 56, HYPER_BEAM
+	db 0
+
+MagikarpEvosMoves:
+; Evolutions
+	db EV_LEVEL, 20, GYARADOS
+	db 0
+; Learnset
+	db 15, TACKLE
+	db 0
+
+MissingNo86EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNo87EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MukEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 30, POISON_GAS
+	db 33, MINIMIZE
+	db 37, SLUDGE
+	db 45, HARDEN
+	db 53, SCREECH
+	db 60, ACID_ARMOR
+	db 0
+
+MissingNo8AEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+KinglerEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 20, VICEGRIP
+	db 25, GUILLOTINE
+	db 34, STOMP
+	db 42, CRABHAMMER
+	db 49, HARDEN
+	db 0
+
+CloysterEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 50, SPIKE_CANNON
+	db 0
+
+MissingNo8CEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+ElectrodeEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 17, SONICBOOM
+	db 22, SELFDESTRUCT
+	db 29, LIGHT_SCREEN
+	db 40, SWIFT
+	db 50, EXPLOSION
+	db 0
+
+ClefableEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+WeezingEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 32, SLUDGE
+	db 39, SMOKESCREEN
+	db 43, SELFDESTRUCT
+	db 49, HAZE
+	db 53, EXPLOSION
+	db 0
+
+PersianEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 12, BITE
+	db 17, PAY_DAY
+	db 24, SCREECH
+	db 37, FURY_SWIPES
+	db 51, SLASH
+	db 0
+
+MarowakEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 25, LEER
+	db 33, FOCUS_ENERGY
+	db 41, THRASH
+	db 48, BONEMERANG
+	db 55, RAGE
+	db 0
+
+MissingNo92EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+HaunterEvosMoves:
+; Evolutions
+	db EV_TRADE, 1, GENGAR
+	db 0
+; Learnset
+	db 29, HYPNOSIS
+	db 38, DREAM_EATER
+	db 0
+
+AbraEvosMoves:
+; Evolutions
+	db EV_LEVEL, 16, KADABRA
+	db 0
+; Learnset
+	db 0
+
+AlakazamEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 16, CONFUSION
+	db 20, DISABLE
+	db 27, PSYBEAM
+	db 31, RECOVER
+	db 38, PSYCHIC_M
+	db 42, REFLECT
+	db 0
+
+PidgeottoEvosMoves:
+; Evolutions
+	db EV_LEVEL, 36, PIDGEOT
+	db 0
+; Learnset
+	db 5, SAND_ATTACK
+	db 12, QUICK_ATTACK
+	db 21, WHIRLWIND
+	db 31, WING_ATTACK
+	db 40, AGILITY
+	db 49, MIRROR_MOVE
+	db 0
+
+PidgeotEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 5, SAND_ATTACK
+	db 12, QUICK_ATTACK
+	db 21, WHIRLWIND
+	db 31, WING_ATTACK
+	db 44, AGILITY
+	db 54, MIRROR_MOVE
+	db 0
+
+StarmieEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+BulbasaurEvosMoves:
+; Evolutions
+	db EV_LEVEL, 16, IVYSAUR
+	db 0
+; Learnset
+	db 7, LEECH_SEED
+	db 13, VINE_WHIP
+	db 20, POISONPOWDER
+	db 27, RAZOR_LEAF
+	db 34, GROWTH
+	db 41, SLEEP_POWDER
+	db 48, SOLARBEAM
+	db 0
+
+VenusaurEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 7, LEECH_SEED
+	db 13, VINE_WHIP
+	db 22, POISONPOWDER
+	db 30, RAZOR_LEAF
+	db 43, GROWTH
+	db 55, SLEEP_POWDER
+	db 65, SOLARBEAM
+	db 0
+
+TentacruelEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 7, SUPERSONIC
+	db 13, WRAP
+	db 18, POISON_STING
+	db 22, WATER_GUN
+	db 27, CONSTRICT
+	db 35, BARRIER
+	db 43, SCREECH
+	db 50, HYDRO_PUMP
+	db 0
+
+MissingNo9CEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+GoldeenEvosMoves:
+; Evolutions
+	db EV_LEVEL, 33, SEAKING
+	db 0
+; Learnset
+	db 19, SUPERSONIC
+	db 24, HORN_ATTACK
+	db 30, FURY_ATTACK
+	db 37, WATERFALL
+	db 45, HORN_DRILL
+	db 54, AGILITY
+	db 0
+
+SeakingEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 19, SUPERSONIC
+	db 24, HORN_ATTACK
+	db 30, FURY_ATTACK
+	db 39, WATERFALL
+	db 48, HORN_DRILL
+	db 54, AGILITY
+	db 0
+
+MissingNo9FEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNoA0EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNoA1EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNoA2EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+PonytaEvosMoves:
+; Evolutions
+	db EV_LEVEL, 40, RAPIDASH
+	db 0
+; Learnset
+	db 30, TAIL_WHIP
+	db 32, STOMP
+	db 35, GROWL
+	db 39, FIRE_SPIN
+	db 43, TAKE_DOWN
+	db 48, AGILITY
+	db 0
+
+RapidashEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 30, TAIL_WHIP
+	db 32, STOMP
+	db 35, GROWL
+	db 39, FIRE_SPIN
+	db 47, TAKE_DOWN
+	db 55, AGILITY
+	db 0
+
+RattataEvosMoves:
+; Evolutions
+	db EV_LEVEL, 20, RATICATE
+	db 0
+; Learnset
+	db 7, QUICK_ATTACK
+	db 14, HYPER_FANG
+	db 23, FOCUS_ENERGY
+	db 34, SUPER_FANG
+	db 0
+
+RaticateEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 7, QUICK_ATTACK
+	db 14, HYPER_FANG
+	db 27, FOCUS_ENERGY
+	db 41, SUPER_FANG
+	db 0
+
+NidorinoEvosMoves:
+; Evolutions
+	db EV_ITEM, MOON_STONE, 1, NIDOKING
+	db 0
+; Learnset
+	db 8, HORN_ATTACK
+	db 14, POISON_STING
+	db 23, FOCUS_ENERGY
+	db 32, FURY_ATTACK
+	db 41, HORN_DRILL
+	db 50, DOUBLE_KICK
+	db 0
+
+NidorinaEvosMoves:
+; Evolutions
+	db EV_ITEM, MOON_STONE, 1, NIDOQUEEN
+	db 0
+; Learnset
+	db 8, SCRATCH
+	db 14, POISON_STING
+	db 23, TAIL_WHIP
+	db 32, BITE
+	db 41, FURY_SWIPES
+	db 50, DOUBLE_KICK
+	db 0
+
+GeodudeEvosMoves:
+; Evolutions
+	db EV_LEVEL, 25, GRAVELER
+	db 0
+; Learnset
+	db 11, DEFENSE_CURL
+	db 16, ROCK_THROW
+	db 21, SELFDESTRUCT
+	db 26, HARDEN
+	db 31, EARTHQUAKE
+	db 36, EXPLOSION
+	db 0
+
+PorygonEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 23, PSYBEAM
+	db 28, RECOVER
+	db 35, AGILITY
+	db 42, TRI_ATTACK
+	db 0
+
+AerodactylEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 33, SUPERSONIC
+	db 38, BITE
+	db 45, TAKE_DOWN
+	db 54, HYPER_BEAM
+	db 0
+
+MissingNoACEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MagnemiteEvosMoves:
+; Evolutions
+	db EV_LEVEL, 30, MAGNETON
+	db 0
+; Learnset
+	db 21, SONICBOOM
+	db 25, THUNDERSHOCK
+	db 29, SUPERSONIC
+	db 35, THUNDER_WAVE
+	db 41, SWIFT
+	db 47, SCREECH
+	db 0
+
+MissingNoAEEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MissingNoAFEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+CharmanderEvosMoves:
+; Evolutions
+	db EV_LEVEL, 16, CHARMELEON
+	db 0
+; Learnset
+	db 9, EMBER
+	db 15, LEER
+	db 22, RAGE
+	db 30, SLASH
+	db 38, FLAMETHROWER
+	db 46, FIRE_SPIN
+	db 0
+
+SquirtleEvosMoves:
+; Evolutions
+	db EV_LEVEL, 16, WARTORTLE
+	db 0
+; Learnset
+	db 8, BUBBLE
+	db 15, WATER_GUN
+	db 22, BITE
+	db 28, WITHDRAW
+	db 35, SKULL_BASH
+	db 42, HYDRO_PUMP
+	db 0
+
+CharmeleonEvosMoves:
+; Evolutions
+	db EV_LEVEL, 36, CHARIZARD
+	db 0
+; Learnset
+	db 9, EMBER
+	db 15, LEER
+	db 24, RAGE
+	db 33, SLASH
+	db 42, FLAMETHROWER
+	db 56, FIRE_SPIN
+	db 0
+
+WartortleEvosMoves:
+; Evolutions
+	db EV_LEVEL, 36, BLASTOISE
+	db 0
+; Learnset
+	db 8, BUBBLE
+	db 15, WATER_GUN
+	db 24, BITE
+	db 31, WITHDRAW
+	db 39, SKULL_BASH
+	db 47, HYDRO_PUMP
+	db 0
+
+CharizardEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 9, EMBER
+	db 15, LEER
+	db 24, RAGE
+	db 36, SLASH
+	db 46, FLAMETHROWER
+	db 55, FIRE_SPIN
+	db 0
+
+MissingNoB5EvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+FossilKabutopsEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+FossilAerodactylEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+MonGhostEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 0
+
+OddishEvosMoves:
+; Evolutions
+	db EV_LEVEL, 21, GLOOM
+	db 0
+; Learnset
+	db 15, POISONPOWDER
+	db 17, STUN_SPORE
+	db 19, SLEEP_POWDER
+	db 24, ACID
+	db 33, PETAL_DANCE
+	db 46, SOLARBEAM
+	db 0
+
+GloomEvosMoves:
+; Evolutions
+	db EV_ITEM, LEAF_STONE, 1, VILEPLUME
+	db 0
+; Learnset
+	db 15, POISONPOWDER
+	db 17, STUN_SPORE
+	db 19, SLEEP_POWDER
+	db 28, ACID
+	db 38, PETAL_DANCE
+	db 52, SOLARBEAM
+	db 0
+
+VileplumeEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 15, POISONPOWDER
+	db 17, STUN_SPORE
+	db 19, SLEEP_POWDER
+	db 0
+
+BellsproutEvosMoves:
+; Evolutions
+	db EV_LEVEL, 21, WEEPINBELL
+	db 0
+; Learnset
+	db 13, WRAP
+	db 15, POISONPOWDER
+	db 18, SLEEP_POWDER
+	db 21, STUN_SPORE
+	db 26, ACID
+	db 33, RAZOR_LEAF
+	db 42, SLAM
+	db 0
+
+WeepinbellEvosMoves:
+; Evolutions
+	db EV_ITEM, LEAF_STONE, 1, VICTREEBEL
+	db 0
+; Learnset
+	db 13, WRAP
+	db 15, POISONPOWDER
+	db 18, SLEEP_POWDER
+	db 23, STUN_SPORE
+	db 29, ACID
+	db 38, RAZOR_LEAF
+	db 49, SLAM
+	db 0
+
+VictreebelEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 13, WRAP
+	db 15, POISONPOWDER
+	db 18, SLEEP_POWDER
+	db 0
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/mew.asm b/data/pokemon/mew.asm
new file mode 100644
index 00000000..ad8cb9b8
--- /dev/null
+++ b/data/pokemon/mew.asm
@@ -0,0 +1,14 @@
+; Mew's pics and base data are not grouped with the other Pokémon
+; because it was a last-minute addition "as a kind of prank".
+; Shigeki Morimoto explained in an Iwata Asks interview:
+; "We put Mew in right at the very end. The cartridge was really full and
+; there wasn't room for much more on there. Then the debug features which
+; weren't going to be included in the final version of the game were removed,
+; creating a miniscule 300 bytes of free space. So we thought that we could
+; slot Mew in there. What we did would be unthinkable nowadays!"
+; http://iwataasks.nintendo.com/interviews/#/ds/pokemon/0/0
+
+MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic"
+MewPicBack::  INCBIN "gfx/pokemon/back/mewb.pic"
+
+INCLUDE "data/pokemon/base_stats/mew.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/predef_pointers.asm b/data/predef_pointers.asm
index 5ce797e0..9d206a48 100644
--- a/data/predef_pointers.asm
+++ b/data/predef_pointers.asm
@@ -1,3 +1,9 @@
+add_predef: MACRO
+\1Predef::
+	db BANK(\1)
+	dw \1
+ENDM
+
 PredefPointers::
 ; these are pointers to ASM routines.
 ; they appear to be used in overworld map scripts.
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/sprite_sets.asm b/data/sprite_sets.asm
deleted file mode 100755
index 5b0e1e00..00000000
--- a/data/sprite_sets.asm
+++ /dev/null
@@ -1,551 +0,0 @@
-MapSpriteSets:
-	db $01 ; PALLET_TOWN
-	db $01 ; VIRIDIAN_CITY
-	db $02 ; PEWTER_CITY
-	db $02 ; CERULEAN_CITY
-	db $03 ; LAVENDER_TOWN
-	db $04 ; VERMILION_CITY
-	db $05 ; CELADON_CITY
-	db $0a ; FUCHSIA_CITY
-	db $01 ; CINNABAR_ISLAND
-	db $06 ; INDIGO_PLATEAU
-	db $07 ; SAFFRON_CITY
-	db $01 ; unused map ID
-	db $01 ; ROUTE_1
-	db $f1 ; ROUTE_2
-	db $02 ; ROUTE_3
-	db $02 ; ROUTE_4
-	db $f9 ; ROUTE_5
-	db $fa ; ROUTE_6
-	db $fb ; ROUTE_7
-	db $fc ; ROUTE_8
-	db $02 ; ROUTE_9
-	db $f2 ; ROUTE_10
-	db $f3 ; ROUTE_11
-	db $f4 ; ROUTE_12
-	db $08 ; ROUTE_13
-	db $08 ; ROUTE_14
-	db $f5 ; ROUTE_15
-	db $f6 ; ROUTE_16
-	db $09 ; ROUTE_17
-	db $f7 ; ROUTE_18
-	db $0a ; ROUTE_19
-	db $f8 ; ROUTE_20
-	db $01 ; ROUTE_21
-	db $01 ; ROUTE_22
-	db $06 ; ROUTE_23
-	db $02 ; ROUTE_24
-	db $02 ; ROUTE_25
-
-; Format:
-; 00: determines whether the map is split East/West or North/South
-; $01 = East/West divide
-; $02 = North/South divide
-; 01: coordinate of dividing line
-; 02: sprite set ID if in the West or North side
-; 03: sprite set ID if in the East or South side
-SplitMapSpriteSets:
-	db $02,$25,$02,$01 ; $f1
-	db $02,$32,$02,$03 ; $f2
-	db $01,$39,$04,$08 ; $f3
-	db $02,$15,$03,$08 ; $f4
-	db $01,$08,$0A,$08 ; $f5
-	db $01,$18,$09,$05 ; $f6
-	db $01,$22,$09,$0A ; $f7
-	db $01,$35,$01,$0A ; $f8
-	db $02,$21,$02,$07 ; $f9
-	db $02,$02,$07,$04 ; $fa
-	db $01,$11,$05,$07 ; $fb
-	db $01,$03,$07,$03 ; $fc
-
-SpriteSets:
-; sprite set $01
-	db SPRITE_BLUE
-	db SPRITE_BUG_CATCHER
-	db SPRITE_GIRL
-	db SPRITE_FISHER2
-	db SPRITE_BLACK_HAIR_BOY_1
-	db SPRITE_GAMBLER
-	db SPRITE_SEEL
-	db SPRITE_OAK
-	db SPRITE_SWIMMER
-	db SPRITE_BALL
-	db SPRITE_LYING_OLD_MAN
-
-; sprite set $02
-	db SPRITE_BUG_CATCHER
-	db SPRITE_ROCKET
-	db SPRITE_BLACK_HAIR_BOY_2
-	db SPRITE_HIKER
-	db SPRITE_SLOWBRO
-	db SPRITE_BLUE
-	db SPRITE_GUARD
-	db SPRITE_LASS
-	db SPRITE_BLACK_HAIR_BOY_1
-	db SPRITE_BALL
-	db SPRITE_LYING_OLD_MAN_UNUSED_2
-
-; sprite set $03
-	db SPRITE_LITTLE_GIRL
-	db SPRITE_GIRL
-	db SPRITE_BLACK_HAIR_BOY_2
-	db SPRITE_HIKER
-	db SPRITE_GAMBLER
-	db SPRITE_SLOWBRO
-	db SPRITE_LASS
-	db SPRITE_BLACK_HAIR_BOY_1
-	db SPRITE_GUARD
-	db SPRITE_BALL
-	db SPRITE_LYING_OLD_MAN_UNUSED_2
-
-; sprite set $04
-	db SPRITE_FOULARD_WOMAN
-	db SPRITE_BLACK_HAIR_BOY_2
-	db SPRITE_BUG_CATCHER
-	db SPRITE_GAMBLER
-	db SPRITE_SLOWBRO
-	db SPRITE_GUARD
-	db SPRITE_SAILOR
-	db SPRITE_LASS
-	db SPRITE_BLACK_HAIR_BOY_1
-	db SPRITE_BALL
-	db SPRITE_LYING_OLD_MAN_UNUSED_2
-
-; sprite set $05
-	db SPRITE_LITTLE_GIRL
-	db SPRITE_YOUNG_BOY
-	db SPRITE_GIRL
-	db SPRITE_FISHER2
-	db SPRITE_FAT_BALD_GUY
-	db SPRITE_OLD_PERSON
-	db SPRITE_SLOWBRO
-	db SPRITE_GUARD
-	db SPRITE_ROCKET
-	db SPRITE_BALL
-	db SPRITE_SNORLAX
-
-; sprite set $06
-	db SPRITE_BUG_CATCHER
-	db SPRITE_GYM_HELPER
-	db SPRITE_SLOWBRO
-	db SPRITE_BLUE
-	db SPRITE_LASS
-	db SPRITE_BLACK_HAIR_BOY_1
-	db SPRITE_SWIMMER
-	db SPRITE_GUARD
-	db SPRITE_GAMBLER
-	db SPRITE_BALL
-	db SPRITE_LYING_OLD_MAN_UNUSED_2
-
-; sprite set $07
-	db SPRITE_ROCKET
-	db SPRITE_OAK_AIDE
-	db SPRITE_LAPRAS_GIVER
-	db SPRITE_ERIKA
-	db SPRITE_GENTLEMAN
-	db SPRITE_BIRD
-	db SPRITE_ROCKER
-	db SPRITE_BLACK_HAIR_BOY_1
-	db SPRITE_SLOWBRO
-	db SPRITE_BALL
-	db SPRITE_LYING_OLD_MAN_UNUSED_2
-
-; sprite set $08
-	db SPRITE_BIKER
-	db SPRITE_BLACK_HAIR_BOY_2
-	db SPRITE_FAT_BALD_GUY
-	db SPRITE_LASS
-	db SPRITE_BLACK_HAIR_BOY_1
-	db SPRITE_FOULARD_WOMAN
-	db SPRITE_FISHER2
-	db SPRITE_ROCKER
-	db SPRITE_SLOWBRO
-	db SPRITE_BALL
-	db SPRITE_SNORLAX
-
-; sprite set $09
-	db SPRITE_BIKER
-	db SPRITE_BLACK_HAIR_BOY_1
-	db SPRITE_LAPRAS_GIVER
-	db SPRITE_FISHER2
-	db SPRITE_ROCKER
-	db SPRITE_HIKER
-	db SPRITE_GAMBLER
-	db SPRITE_FAT_BALD_GUY
-	db SPRITE_BLACK_HAIR_BOY_2
-	db SPRITE_BALL
-	db SPRITE_SNORLAX
-
-; sprite set $0a
-	db SPRITE_BIRD
-	db SPRITE_BLACK_HAIR_BOY_1
-	db SPRITE_CLEFAIRY
-	db SPRITE_FISHER2
-	db SPRITE_GAMBLER
-	db SPRITE_SLOWBRO
-	db SPRITE_SEEL
-	db SPRITE_SWIMMER
-	db SPRITE_BUG_CATCHER
-	db SPRITE_BALL
-	db SPRITE_OMANYTE
-
-SpriteSheetPointerTable:
-	; SPRITE_RED
-	dw RedSprite
-	db $c0 ; byte count
-	db BANK(RedSprite)
-
-	; SPRITE_BLUE
-	dw BlueSprite
-	db $c0 ; byte count
-	db BANK(BlueSprite)
-
-	; SPRITE_OAK
-	dw OakSprite
-	db $c0 ; byte count
-	db BANK(OakSprite)
-
-	; SPRITE_BUG_CATCHER
-	dw BugCatcherSprite
-	db $c0 ; byte count
-	db BANK(BugCatcherSprite)
-
-	; SPRITE_SLOWBRO
-	dw SlowbroSprite
-	db $c0 ; byte count
-	db BANK(SlowbroSprite)
-
-	; SPRITE_LASS
-	dw LassSprite
-	db $c0 ; byte count
-	db BANK(LassSprite)
-
-	; SPRITE_BLACK_HAIR_BOY_1
-	dw BlackHairBoy1Sprite
-	db $c0 ; byte count
-	db BANK(BlackHairBoy1Sprite)
-
-	; SPRITE_LITTLE_GIRL
-	dw LittleGirlSprite
-	db $c0 ; byte count
-	db BANK(LittleGirlSprite)
-
-	; SPRITE_BIRD
-	dw BirdSprite
-	db $c0 ; byte count
-	db BANK(BirdSprite)
-
-	; SPRITE_FAT_BALD_GUY
-	dw FatBaldGuySprite
-	db $c0 ; byte count
-	db BANK(FatBaldGuySprite)
-
-	; SPRITE_GAMBLER
-	dw GamblerSprite
-	db $c0 ; byte count
-	db BANK(GamblerSprite)
-
-	; SPRITE_BLACK_HAIR_BOY_2
-	dw BlackHairBoy2Sprite
-	db $c0 ; byte count
-	db BANK(BlackHairBoy2Sprite)
-
-	; SPRITE_GIRL
-	dw GirlSprite
-	db $c0 ; byte count
-	db BANK(GirlSprite)
-
-	; SPRITE_HIKER
-	dw HikerSprite
-	db $c0 ; byte count
-	db BANK(HikerSprite)
-
-	; SPRITE_FOULARD_WOMAN
-	dw FoulardWomanSprite
-	db $c0 ; byte count
-	db BANK(FoulardWomanSprite)
-
-	; SPRITE_GENTLEMAN
-	dw GentlemanSprite
-	db $c0 ; byte count
-	db BANK(GentlemanSprite)
-
-	; SPRITE_DAISY
-	dw DaisySprite
-	db $c0 ; byte count
-	db BANK(DaisySprite)
-
-	; SPRITE_BIKER
-	dw BikerSprite
-	db $c0 ; byte count
-	db BANK(BikerSprite)
-
-	; SPRITE_SAILOR
-	dw SailorSprite
-	db $c0 ; byte count
-	db BANK(SailorSprite)
-
-	; SPRITE_COOK
-	dw CookSprite
-	db $c0 ; byte count
-	db BANK(CookSprite)
-
-	; SPRITE_BIKE_SHOP_GUY
-	dw BikeShopGuySprite
-	db $c0 ; byte count
-	db BANK(BikeShopGuySprite)
-
-	; SPRITE_MR_FUJI
-	dw MrFujiSprite
-	db $c0 ; byte count
-	db BANK(MrFujiSprite)
-
-	; SPRITE_GIOVANNI
-	dw GiovanniSprite
-	db $c0 ; byte count
-	db BANK(GiovanniSprite)
-
-	; SPRITE_ROCKET
-	dw RocketSprite
-	db $c0 ; byte count
-	db BANK(RocketSprite)
-
-	; SPRITE_MEDIUM
-	dw MediumSprite
-	db $c0 ; byte count
-	db BANK(MediumSprite)
-
-	; SPRITE_WAITER
-	dw WaiterSprite
-	db $c0 ; byte count
-	db BANK(WaiterSprite)
-
-	; SPRITE_ERIKA
-	dw ErikaSprite
-	db $c0 ; byte count
-	db BANK(ErikaSprite)
-
-	; SPRITE_MOM_GEISHA
-	dw MomGeishaSprite
-	db $c0 ; byte count
-	db BANK(MomGeishaSprite)
-
-	; SPRITE_BRUNETTE_GIRL
-	dw BrunetteGirlSprite
-	db $c0 ; byte count
-	db BANK(BrunetteGirlSprite)
-
-	; SPRITE_LANCE
-	dw LanceSprite
-	db $c0 ; byte count
-	db BANK(LanceSprite)
-
-	; SPRITE_OAK_SCIENTIST_AIDE
-	dw OakAideSprite
-	db $c0 ; byte count
-	db BANK(OakAideSprite)
-
-	; SPRITE_OAK_AIDE
-	dw OakAideSprite
-	db $c0 ; byte count
-	db BANK(OakAideSprite)
-
-	; SPRITE_ROCKER
-	dw RockerSprite
-	db $c0 ; byte count
-	db BANK(RockerSprite)
-
-	; SPRITE_SWIMMER
-	dw SwimmerSprite
-	db $c0 ; byte count
-	db BANK(SwimmerSprite)
-
-	; SPRITE_WHITE_PLAYER
-	dw WhitePlayerSprite
-	db $c0 ; byte count
-	db BANK(WhitePlayerSprite)
-
-	; SPRITE_GYM_HELPER
-	dw GymHelperSprite
-	db $c0 ; byte count
-	db BANK(GymHelperSprite)
-
-	; SPRITE_OLD_PERSON
-	dw OldPersonSprite
-	db $c0 ; byte count
-	db BANK(OldPersonSprite)
-
-	; SPRITE_MART_GUY
-	dw MartGuySprite
-	db $c0 ; byte count
-	db BANK(MartGuySprite)
-
-	; SPRITE_FISHER
-	dw FisherSprite
-	db $c0 ; byte count
-	db BANK(FisherSprite)
-
-	; SPRITE_OLD_MEDIUM_WOMAN
-	dw OldMediumWomanSprite
-	db $c0 ; byte count
-	db BANK(OldMediumWomanSprite)
-
-	; SPRITE_NURSE
-	dw NurseSprite
-	db $c0 ; byte count
-	db BANK(NurseSprite)
-
-	; SPRITE_CABLE_CLUB_WOMAN
-	dw CableClubWomanSprite
-	db $c0 ; byte count
-	db BANK(CableClubWomanSprite)
-
-	; SPRITE_MR_MASTERBALL
-	dw MrMasterballSprite
-	db $c0 ; byte count
-	db BANK(MrMasterballSprite)
-
-	; SPRITE_LAPRAS_GIVER
-	dw LaprasGiverSprite
-	db $c0 ; byte count
-	db BANK(LaprasGiverSprite)
-
-	; SPRITE_WARDEN
-	dw WardenSprite
-	db $c0 ; byte count
-	db BANK(WardenSprite)
-
-	; SPRITE_SS_CAPTAIN
-	dw SsCaptainSprite
-	db $c0 ; byte count
-	db BANK(SsCaptainSprite)
-
-	; SPRITE_FISHER2
-	dw Fisher2Sprite
-	db $c0 ; byte count
-	db BANK(Fisher2Sprite)
-
-	; SPRITE_BLACKBELT
-	dw BlackbeltSprite
-	db $c0 ; byte count
-	db BANK(BlackbeltSprite)
-
-	; SPRITE_GUARD
-	dw GuardSprite
-	db $c0 ; byte count
-	db BANK(GuardSprite)
-
-	; $32
-	dw GuardSprite
-	db $c0 ; byte count
-	db BANK(GuardSprite)
-
-	; SPRITE_MOM
-	dw MomSprite
-	db $c0 ; byte count
-	db BANK(MomSprite)
-
-	; SPRITE_BALDING_GUY
-	dw BaldingGuySprite
-	db $c0 ; byte count
-	db BANK(BaldingGuySprite)
-
-	; SPRITE_YOUNG_BOY
-	dw YoungBoySprite
-	db $c0 ; byte count
-	db BANK(YoungBoySprite)
-
-	; SPRITE_GAMEBOY_KID
-	dw GameboyKidSprite
-	db $c0 ; byte count
-	db BANK(GameboyKidSprite)
-
-	; SPRITE_GAMEBOY_KID_COPY
-	dw GameboyKidSprite
-	db $c0 ; byte count
-	db BANK(GameboyKidSprite)
-
-	; SPRITE_CLEFAIRY
-	dw ClefairySprite
-	db $c0 ; byte count
-	db BANK(ClefairySprite)
-
-	; SPRITE_AGATHA
-	dw AgathaSprite
-	db $c0 ; byte count
-	db BANK(AgathaSprite)
-
-	; SPRITE_BRUNO
-	dw BrunoSprite
-	db $c0 ; byte count
-	db BANK(BrunoSprite)
-
-	; SPRITE_LORELEI
-	dw LoreleiSprite
-	db $c0 ; byte count
-	db BANK(LoreleiSprite)
-
-	; SPRITE_SEEL
-	dw SeelSprite
-	db $c0 ; byte count
-	db BANK(SeelSprite)
-
-	; SPRITE_BALL
-	dw BallSprite
-	db $40 ; byte count
-	db BANK(BallSprite)
-
-	; SPRITE_OMANYTE
-	dw OmanyteSprite
-	db $40 ; byte count
-	db BANK(OmanyteSprite)
-
-	; SPRITE_BOULDER
-	dw BoulderSprite
-	db $40 ; byte count
-	db BANK(BoulderSprite)
-
-	; SPRITE_PAPER_SHEET
-	dw PaperSheetSprite
-	db $40 ; byte count
-	db BANK(PaperSheetSprite)
-
-	; SPRITE_BOOK_MAP_DEX
-	dw BookMapDexSprite
-	db $40 ; byte count
-	db BANK(BookMapDexSprite)
-
-	; SPRITE_CLIPBOARD
-	dw ClipboardSprite
-	db $40 ; byte count
-	db BANK(ClipboardSprite)
-
-	; SPRITE_SNORLAX
-	dw SnorlaxSprite
-	db $40 ; byte count
-	db BANK(SnorlaxSprite)
-
-	; SPRITE_OLD_AMBER_COPY
-	dw OldAmberSprite
-	db $40 ; byte count
-	db BANK(OldAmberSprite)
-
-	; SPRITE_OLD_AMBER
-	dw OldAmberSprite
-	db $40 ; byte count
-	db BANK(OldAmberSprite)
-
-	; SPRITE_LYING_OLD_MAN_UNUSED_1
-	dw LyingOldManSprite
-	db $40 ; byte count
-	db BANK(LyingOldManSprite)
-
-	; SPRITE_LYING_OLD_MAN_UNUSED_2
-	dw LyingOldManSprite
-	db $40 ; byte count
-	db BANK(LyingOldManSprite)
-
-	; SPRITE_LYING_OLD_MAN
-	dw LyingOldManSprite
-	db $40 ; byte count
-	db BANK(LyingOldManSprite)
diff --git a/data/facing.asm b/data/sprites/facings.asm
index c412247a..c412247a 100644
--- a/data/facing.asm
+++ b/data/sprites/facings.asm
diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm
new file mode 100644
index 00000000..9a6f383f
--- /dev/null
+++ b/data/sprites/sprites.asm
@@ -0,0 +1,360 @@
+SpriteSheetPointerTable:
+	; SPRITE_RED
+	dw RedSprite
+	db $c0 ; byte count
+	db BANK(RedSprite)
+
+	; SPRITE_BLUE
+	dw BlueSprite
+	db $c0 ; byte count
+	db BANK(BlueSprite)
+
+	; SPRITE_OAK
+	dw OakSprite
+	db $c0 ; byte count
+	db BANK(OakSprite)
+
+	; SPRITE_BUG_CATCHER
+	dw BugCatcherSprite
+	db $c0 ; byte count
+	db BANK(BugCatcherSprite)
+
+	; SPRITE_SLOWBRO
+	dw SlowbroSprite
+	db $c0 ; byte count
+	db BANK(SlowbroSprite)
+
+	; SPRITE_LASS
+	dw LassSprite
+	db $c0 ; byte count
+	db BANK(LassSprite)
+
+	; SPRITE_BLACK_HAIR_BOY_1
+	dw BlackHairBoy1Sprite
+	db $c0 ; byte count
+	db BANK(BlackHairBoy1Sprite)
+
+	; SPRITE_LITTLE_GIRL
+	dw LittleGirlSprite
+	db $c0 ; byte count
+	db BANK(LittleGirlSprite)
+
+	; SPRITE_BIRD
+	dw BirdSprite
+	db $c0 ; byte count
+	db BANK(BirdSprite)
+
+	; SPRITE_FAT_BALD_GUY
+	dw FatBaldGuySprite
+	db $c0 ; byte count
+	db BANK(FatBaldGuySprite)
+
+	; SPRITE_GAMBLER
+	dw GamblerSprite
+	db $c0 ; byte count
+	db BANK(GamblerSprite)
+
+	; SPRITE_BLACK_HAIR_BOY_2
+	dw BlackHairBoy2Sprite
+	db $c0 ; byte count
+	db BANK(BlackHairBoy2Sprite)
+
+	; SPRITE_GIRL
+	dw GirlSprite
+	db $c0 ; byte count
+	db BANK(GirlSprite)
+
+	; SPRITE_HIKER
+	dw HikerSprite
+	db $c0 ; byte count
+	db BANK(HikerSprite)
+
+	; SPRITE_FOULARD_WOMAN
+	dw FoulardWomanSprite
+	db $c0 ; byte count
+	db BANK(FoulardWomanSprite)
+
+	; SPRITE_GENTLEMAN
+	dw GentlemanSprite
+	db $c0 ; byte count
+	db BANK(GentlemanSprite)
+
+	; SPRITE_DAISY
+	dw DaisySprite
+	db $c0 ; byte count
+	db BANK(DaisySprite)
+
+	; SPRITE_BIKER
+	dw BikerSprite
+	db $c0 ; byte count
+	db BANK(BikerSprite)
+
+	; SPRITE_SAILOR
+	dw SailorSprite
+	db $c0 ; byte count
+	db BANK(SailorSprite)
+
+	; SPRITE_COOK
+	dw CookSprite
+	db $c0 ; byte count
+	db BANK(CookSprite)
+
+	; SPRITE_BIKE_SHOP_GUY
+	dw BikeShopGuySprite
+	db $c0 ; byte count
+	db BANK(BikeShopGuySprite)
+
+	; SPRITE_MR_FUJI
+	dw MrFujiSprite
+	db $c0 ; byte count
+	db BANK(MrFujiSprite)
+
+	; SPRITE_GIOVANNI
+	dw GiovanniSprite
+	db $c0 ; byte count
+	db BANK(GiovanniSprite)
+
+	; SPRITE_ROCKET
+	dw RocketSprite
+	db $c0 ; byte count
+	db BANK(RocketSprite)
+
+	; SPRITE_MEDIUM
+	dw MediumSprite
+	db $c0 ; byte count
+	db BANK(MediumSprite)
+
+	; SPRITE_WAITER
+	dw WaiterSprite
+	db $c0 ; byte count
+	db BANK(WaiterSprite)
+
+	; SPRITE_ERIKA
+	dw ErikaSprite
+	db $c0 ; byte count
+	db BANK(ErikaSprite)
+
+	; SPRITE_MOM_GEISHA
+	dw MomGeishaSprite
+	db $c0 ; byte count
+	db BANK(MomGeishaSprite)
+
+	; SPRITE_BRUNETTE_GIRL
+	dw BrunetteGirlSprite
+	db $c0 ; byte count
+	db BANK(BrunetteGirlSprite)
+
+	; SPRITE_LANCE
+	dw LanceSprite
+	db $c0 ; byte count
+	db BANK(LanceSprite)
+
+	; SPRITE_OAK_SCIENTIST_AIDE
+	dw OakAideSprite
+	db $c0 ; byte count
+	db BANK(OakAideSprite)
+
+	; SPRITE_OAK_AIDE
+	dw OakAideSprite
+	db $c0 ; byte count
+	db BANK(OakAideSprite)
+
+	; SPRITE_ROCKER
+	dw RockerSprite
+	db $c0 ; byte count
+	db BANK(RockerSprite)
+
+	; SPRITE_SWIMMER
+	dw SwimmerSprite
+	db $c0 ; byte count
+	db BANK(SwimmerSprite)
+
+	; SPRITE_WHITE_PLAYER
+	dw WhitePlayerSprite
+	db $c0 ; byte count
+	db BANK(WhitePlayerSprite)
+
+	; SPRITE_GYM_HELPER
+	dw GymHelperSprite
+	db $c0 ; byte count
+	db BANK(GymHelperSprite)
+
+	; SPRITE_OLD_PERSON
+	dw OldPersonSprite
+	db $c0 ; byte count
+	db BANK(OldPersonSprite)
+
+	; SPRITE_MART_GUY
+	dw MartGuySprite
+	db $c0 ; byte count
+	db BANK(MartGuySprite)
+
+	; SPRITE_FISHER
+	dw FisherSprite
+	db $c0 ; byte count
+	db BANK(FisherSprite)
+
+	; SPRITE_OLD_MEDIUM_WOMAN
+	dw OldMediumWomanSprite
+	db $c0 ; byte count
+	db BANK(OldMediumWomanSprite)
+
+	; SPRITE_NURSE
+	dw NurseSprite
+	db $c0 ; byte count
+	db BANK(NurseSprite)
+
+	; SPRITE_CABLE_CLUB_WOMAN
+	dw CableClubWomanSprite
+	db $c0 ; byte count
+	db BANK(CableClubWomanSprite)
+
+	; SPRITE_MR_MASTERBALL
+	dw MrMasterballSprite
+	db $c0 ; byte count
+	db BANK(MrMasterballSprite)
+
+	; SPRITE_LAPRAS_GIVER
+	dw LaprasGiverSprite
+	db $c0 ; byte count
+	db BANK(LaprasGiverSprite)
+
+	; SPRITE_WARDEN
+	dw WardenSprite
+	db $c0 ; byte count
+	db BANK(WardenSprite)
+
+	; SPRITE_SS_CAPTAIN
+	dw SsCaptainSprite
+	db $c0 ; byte count
+	db BANK(SsCaptainSprite)
+
+	; SPRITE_FISHER2
+	dw Fisher2Sprite
+	db $c0 ; byte count
+	db BANK(Fisher2Sprite)
+
+	; SPRITE_BLACKBELT
+	dw BlackbeltSprite
+	db $c0 ; byte count
+	db BANK(BlackbeltSprite)
+
+	; SPRITE_GUARD
+	dw GuardSprite
+	db $c0 ; byte count
+	db BANK(GuardSprite)
+
+	; $32
+	dw GuardSprite
+	db $c0 ; byte count
+	db BANK(GuardSprite)
+
+	; SPRITE_MOM
+	dw MomSprite
+	db $c0 ; byte count
+	db BANK(MomSprite)
+
+	; SPRITE_BALDING_GUY
+	dw BaldingGuySprite
+	db $c0 ; byte count
+	db BANK(BaldingGuySprite)
+
+	; SPRITE_YOUNG_BOY
+	dw YoungBoySprite
+	db $c0 ; byte count
+	db BANK(YoungBoySprite)
+
+	; SPRITE_GAMEBOY_KID
+	dw GameboyKidSprite
+	db $c0 ; byte count
+	db BANK(GameboyKidSprite)
+
+	; SPRITE_GAMEBOY_KID_COPY
+	dw GameboyKidSprite
+	db $c0 ; byte count
+	db BANK(GameboyKidSprite)
+
+	; SPRITE_CLEFAIRY
+	dw ClefairySprite
+	db $c0 ; byte count
+	db BANK(ClefairySprite)
+
+	; SPRITE_AGATHA
+	dw AgathaSprite
+	db $c0 ; byte count
+	db BANK(AgathaSprite)
+
+	; SPRITE_BRUNO
+	dw BrunoSprite
+	db $c0 ; byte count
+	db BANK(BrunoSprite)
+
+	; SPRITE_LORELEI
+	dw LoreleiSprite
+	db $c0 ; byte count
+	db BANK(LoreleiSprite)
+
+	; SPRITE_SEEL
+	dw SeelSprite
+	db $c0 ; byte count
+	db BANK(SeelSprite)
+
+	; SPRITE_BALL
+	dw BallSprite
+	db $40 ; byte count
+	db BANK(BallSprite)
+
+	; SPRITE_OMANYTE
+	dw OmanyteSprite
+	db $40 ; byte count
+	db BANK(OmanyteSprite)
+
+	; SPRITE_BOULDER
+	dw BoulderSprite
+	db $40 ; byte count
+	db BANK(BoulderSprite)
+
+	; SPRITE_PAPER_SHEET
+	dw PaperSheetSprite
+	db $40 ; byte count
+	db BANK(PaperSheetSprite)
+
+	; SPRITE_BOOK_MAP_DEX
+	dw BookMapDexSprite
+	db $40 ; byte count
+	db BANK(BookMapDexSprite)
+
+	; SPRITE_CLIPBOARD
+	dw ClipboardSprite
+	db $40 ; byte count
+	db BANK(ClipboardSprite)
+
+	; SPRITE_SNORLAX
+	dw SnorlaxSprite
+	db $40 ; byte count
+	db BANK(SnorlaxSprite)
+
+	; SPRITE_OLD_AMBER_COPY
+	dw OldAmberSprite
+	db $40 ; byte count
+	db BANK(OldAmberSprite)
+
+	; SPRITE_OLD_AMBER
+	dw OldAmberSprite
+	db $40 ; byte count
+	db BANK(OldAmberSprite)
+
+	; SPRITE_LYING_OLD_MAN_UNUSED_1
+	dw LyingOldManSprite
+	db $40 ; byte count
+	db BANK(LyingOldManSprite)
+
+	; SPRITE_LYING_OLD_MAN_UNUSED_2
+	dw LyingOldManSprite
+	db $40 ; byte count
+	db BANK(LyingOldManSprite)
+
+	; SPRITE_LYING_OLD_MAN
+	dw LyingOldManSprite
+	db $40 ; byte count
+	db BANK(LyingOldManSprite)
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/text_predef_pointers.asm b/data/text_predef_pointers.asm
new file mode 100644
index 00000000..bbe9c8d8
--- /dev/null
+++ b/data/text_predef_pointers.asm
@@ -0,0 +1,71 @@
+add_tx_pre: MACRO
+\1_id:: dw \1
+ENDM
+
+TextPredefs::
+	add_tx_pre CardKeySuccessText                   ; 01
+	add_tx_pre CardKeyFailText                      ; 02
+	add_tx_pre RedBedroomPCText                     ; 03
+	add_tx_pre RedBedroomSNESText                   ; 04
+	add_tx_pre PushStartText                        ; 05
+	add_tx_pre SaveOptionText                       ; 06
+	add_tx_pre StrengthsAndWeaknessesText           ; 07
+	add_tx_pre OakLabEmailText                      ; 08
+	add_tx_pre AerodactylFossilText                 ; 09
+	add_tx_pre Route15UpstairsBinocularsText        ; 0A
+	add_tx_pre KabutopsFossilText                   ; 0B
+	add_tx_pre GymStatueText1                       ; 0C
+	add_tx_pre GymStatueText2                       ; 0D
+	add_tx_pre BookcaseText                         ; 0E
+	add_tx_pre ViridianCityPokecenterBenchGuyText   ; 0F
+	add_tx_pre PewterCityPokecenterBenchGuyText     ; 10
+	add_tx_pre CeruleanCityPokecenterBenchGuyText   ; 11
+	add_tx_pre LavenderCityPokecenterBenchGuyText   ; 12
+	add_tx_pre VermilionCityPokecenterBenchGuyText  ; 13
+	add_tx_pre CeladonCityPokecenterBenchGuyText    ; 14
+	add_tx_pre CeladonCityHotelText                 ; 15
+	add_tx_pre FuchsiaCityPokecenterBenchGuyText    ; 16
+	add_tx_pre CinnabarIslandPokecenterBenchGuyText ; 17
+	add_tx_pre SaffronCityPokecenterBenchGuyText    ; 18
+	add_tx_pre MtMoonPokecenterBenchGuyText         ; 19
+	add_tx_pre RockTunnelPokecenterBenchGuyText     ; 1A
+	add_tx_pre UnusedBenchGuyText1                  ; 1B XXX unused
+	add_tx_pre UnusedBenchGuyText2                  ; 1C XXX unused
+	add_tx_pre UnusedBenchGuyText3                  ; 1D XXX unused
+	add_tx_pre UnusedPredefText                     ; 1E XXX unused
+	add_tx_pre PokemonCenterPCText                  ; 1F
+	add_tx_pre ViridianSchoolNotebook               ; 20
+	add_tx_pre ViridianSchoolBlackboard             ; 21
+	add_tx_pre JustAMomentText                      ; 22
+	add_tx_pre OpenBillsPCText                      ; 23
+	add_tx_pre FoundHiddenItemText                  ; 24
+	add_tx_pre HiddenItemBagFullText                ; 25 XXX unused
+	add_tx_pre VermilionGymTrashText                ; 26
+	add_tx_pre IndigoPlateauHQText                  ; 27
+	add_tx_pre GameCornerOutOfOrderText             ; 28
+	add_tx_pre GameCornerOutToLunchText             ; 29
+	add_tx_pre GameCornerSomeonesKeysText           ; 2A
+	add_tx_pre FoundHiddenCoinsText                 ; 2B
+	add_tx_pre DroppedHiddenCoinsText               ; 2C
+	add_tx_pre BillsHouseMonitorText                ; 2D
+	add_tx_pre BillsHouseInitiatedText              ; 2E
+	add_tx_pre BillsHousePokemonList                ; 2F
+	add_tx_pre MagazinesText                        ; 30
+	add_tx_pre CinnabarGymQuiz                      ; 31
+	add_tx_pre GameCornerNoCoinsText                ; 32
+	add_tx_pre GameCornerCoinCaseText               ; 33
+	add_tx_pre LinkCableHelp                        ; 34
+	add_tx_pre TMNotebook                           ; 35
+	add_tx_pre FightingDojoText                     ; 36
+	add_tx_pre EnemiesOnEverySideText               ; 37
+	add_tx_pre WhatGoesAroundComesAroundText        ; 38
+	add_tx_pre NewBicycleText                       ; 39
+	add_tx_pre IndigoPlateauStatues                 ; 3A
+	add_tx_pre VermilionGymTrashSuccessText1        ; 3B
+	add_tx_pre VermilionGymTrashSuccessText2        ; 3C XXX unused
+	add_tx_pre VermilionGymTrashSuccessText3        ; 3D
+	add_tx_pre VermilionGymTrashFailText            ; 3E
+	add_tx_pre TownMapText                          ; 3F
+	add_tx_pre BookOrSculptureText                  ; 40
+	add_tx_pre ElevatorText                         ; 41
+	add_tx_pre PokemonStuffText                     ; 42
diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm
deleted file mode 100755
index d8e0d9b4..00000000
--- a/data/tileset_headers.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-Tilesets:
-	tileset Overworld_Block,   Overworld_GFX,   Overworld_Coll,   $FF,$FF,$FF, $52, OUTDOOR
-	tileset RedsHouse1_Block,  RedsHouse1_GFX,  RedsHouse1_Coll,  $FF,$FF,$FF, $FF, INDOOR
-	tileset Mart_Block,        Mart_GFX,        Mart_Coll,        $18,$19,$1E, $FF, INDOOR
-	tileset Forest_Block,      Forest_GFX,      Forest_Coll,      $FF,$FF,$FF, $20, CAVE
-	tileset RedsHouse2_Block,  RedsHouse2_GFX,  RedsHouse2_Coll,  $FF,$FF,$FF, $FF, INDOOR
-	tileset Dojo_Block,        Dojo_GFX,        Dojo_Coll,        $3A,$FF,$FF, $FF, OUTDOOR
-	tileset Pokecenter_Block,  Pokecenter_GFX,  Pokecenter_Coll,  $18,$19,$1E, $FF, INDOOR
-	tileset Gym_Block,         Gym_GFX,         Gym_Coll,         $3A,$FF,$FF, $FF, OUTDOOR
-	tileset House_Block,       House_GFX,       House_Coll,       $FF,$FF,$FF, $FF, INDOOR
-	tileset ForestGate_Block,  ForestGate_GFX,  ForestGate_Coll,  $17,$32,$FF, $FF, INDOOR
-	tileset Museum_Block,      Museum_GFX,      Museum_Coll,      $17,$32,$FF, $FF, INDOOR
-	tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, INDOOR
-	tileset Gate_Block,        Gate_GFX,        Gate_Coll,        $17,$32,$FF, $FF, INDOOR
-	tileset Ship_Block,        Ship_GFX,        Ship_Coll,        $FF,$FF,$FF, $FF, CAVE
-	tileset ShipPort_Block,    ShipPort_GFX,    ShipPort_Coll,    $FF,$FF,$FF, $FF, CAVE
-	tileset Cemetery_Block,    Cemetery_GFX,    Cemetery_Coll,    $12,$FF,$FF, $FF, INDOOR
-	tileset Interior_Block,    Interior_GFX,    Interior_Coll,    $FF,$FF,$FF, $FF, INDOOR
-	tileset Cavern_Block,      Cavern_GFX,      Cavern_Coll,      $FF,$FF,$FF, $FF, CAVE
-	tileset Lobby_Block,       Lobby_GFX,       Lobby_Coll,       $15,$36,$FF, $FF, INDOOR
-	tileset Mansion_Block,     Mansion_GFX,     Mansion_Coll,     $FF,$FF,$FF, $FF, INDOOR
-	tileset Lab_Block,         Lab_GFX,         Lab_Coll,         $FF,$FF,$FF, $FF, INDOOR
-	tileset Club_Block,        Club_GFX,        Club_Coll,        $07,$17,$FF, $FF, INDOOR
-	tileset Facility_Block,    Facility_GFX,    Facility_Coll,    $12,$FF,$FF, $FF, CAVE
-	tileset Plateau_Block,     Plateau_GFX,     Plateau_Coll,     $FF,$FF,$FF, $45, CAVE
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/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm
new file mode 100755
index 00000000..8f825330
--- /dev/null
+++ b/data/tilesets/tileset_headers.asm
@@ -0,0 +1,33 @@
+tileset: MACRO
+	db BANK(\2)   ; BANK(GFX)
+	dw \1, \2, \3 ; Block, GFX, Coll
+	db \4, \5, \6 ; counter tiles
+	db \7         ; grass tile
+	db \8         ; permission (indoor, cave, outdoor)
+ENDM
+
+Tilesets:
+	tileset Overworld_Block,   Overworld_GFX,   Overworld_Coll,   $FF,$FF,$FF, $52, OUTDOOR
+	tileset RedsHouse1_Block,  RedsHouse1_GFX,  RedsHouse1_Coll,  $FF,$FF,$FF, $FF, INDOOR
+	tileset Mart_Block,        Mart_GFX,        Mart_Coll,        $18,$19,$1E, $FF, INDOOR
+	tileset Forest_Block,      Forest_GFX,      Forest_Coll,      $FF,$FF,$FF, $20, CAVE
+	tileset RedsHouse2_Block,  RedsHouse2_GFX,  RedsHouse2_Coll,  $FF,$FF,$FF, $FF, INDOOR
+	tileset Dojo_Block,        Dojo_GFX,        Dojo_Coll,        $3A,$FF,$FF, $FF, OUTDOOR
+	tileset Pokecenter_Block,  Pokecenter_GFX,  Pokecenter_Coll,  $18,$19,$1E, $FF, INDOOR
+	tileset Gym_Block,         Gym_GFX,         Gym_Coll,         $3A,$FF,$FF, $FF, OUTDOOR
+	tileset House_Block,       House_GFX,       House_Coll,       $FF,$FF,$FF, $FF, INDOOR
+	tileset ForestGate_Block,  ForestGate_GFX,  ForestGate_Coll,  $17,$32,$FF, $FF, INDOOR
+	tileset Museum_Block,      Museum_GFX,      Museum_Coll,      $17,$32,$FF, $FF, INDOOR
+	tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, INDOOR
+	tileset Gate_Block,        Gate_GFX,        Gate_Coll,        $17,$32,$FF, $FF, INDOOR
+	tileset Ship_Block,        Ship_GFX,        Ship_Coll,        $FF,$FF,$FF, $FF, CAVE
+	tileset ShipPort_Block,    ShipPort_GFX,    ShipPort_Coll,    $FF,$FF,$FF, $FF, CAVE
+	tileset Cemetery_Block,    Cemetery_GFX,    Cemetery_Coll,    $12,$FF,$FF, $FF, INDOOR
+	tileset Interior_Block,    Interior_GFX,    Interior_Coll,    $FF,$FF,$FF, $FF, INDOOR
+	tileset Cavern_Block,      Cavern_GFX,      Cavern_Coll,      $FF,$FF,$FF, $FF, CAVE
+	tileset Lobby_Block,       Lobby_GFX,       Lobby_Coll,       $15,$36,$FF, $FF, INDOOR
+	tileset Mansion_Block,     Mansion_GFX,     Mansion_Coll,     $FF,$FF,$FF, $FF, INDOOR
+	tileset Lab_Block,         Lab_GFX,         Lab_Coll,         $FF,$FF,$FF, $FF, INDOOR
+	tileset Club_Block,        Club_GFX,        Club_Coll,        $07,$17,$FF, $FF, INDOOR
+	tileset Facility_Block,    Facility_GFX,    Facility_Coll,    $12,$FF,$FF, $FF, CAVE
+	tileset Plateau_Block,     Plateau_GFX,     Plateau_Coll,     $FF,$FF,$FF, $45, CAVE
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/trainer_ai_pointers.asm
deleted file mode 100644
index d7cb5f19..00000000
--- a/data/trainer_ai_pointers.asm
+++ /dev/null
@@ -1,51 +0,0 @@
-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
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,JugglerAI ; juggler_x
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 3,JugglerAI ; juggler
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 2,BlackbeltAI ; blackbelt
-	dbw 3,GenericAI
-	dbw 3,GenericAI
-	dbw 1,GenericAI ; chief
-	dbw 3,GenericAI
-	dbw 1,GiovanniAI ; giovanni
-	dbw 3,GenericAI
-	dbw 2,CooltrainerMAI ; cooltrainerm
-	dbw 1,CooltrainerFAI ; cooltrainerf
-	dbw 2,BrunoAI ; bruno
-	dbw 5,BrockAI ; brock
-	dbw 1,MistyAI ; misty
-	dbw 1,LtSurgeAI ; surge
-	dbw 1,ErikaAI ; erika
-	dbw 2,KogaAI ; koga
-	dbw 2,BlaineAI ; blaine
-	dbw 1,SabrinaAI ; sabrina
-	dbw 3,GenericAI
-	dbw 1,Sony2AI ; sony2
-	dbw 1,Sony3AI ; sony3
-	dbw 2,LoreleiAI ; lorelei
-	dbw 3,GenericAI
-	dbw 2,AgathaAI ; agatha
-	dbw 1,LanceAI ; lance
diff --git a/data/trainers/ai_pointers.asm b/data/trainers/ai_pointers.asm
new file mode 100644
index 00000000..26f3001e
--- /dev/null
+++ b/data/trainers/ai_pointers.asm
@@ -0,0 +1,52 @@
+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
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,JugglerAI ; juggler_x
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 3,JugglerAI ; juggler
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 2,BlackbeltAI ; blackbelt
+	dbw 3,GenericAI
+	dbw 3,GenericAI
+	dbw 1,GenericAI ; chief
+	dbw 3,GenericAI
+	dbw 1,GiovanniAI ; giovanni
+	dbw 3,GenericAI
+	dbw 2,CooltrainerMAI ; cooltrainerm
+	dbw 1,CooltrainerFAI ; cooltrainerf
+	dbw 2,BrunoAI ; bruno
+	dbw 5,BrockAI ; brock
+	dbw 1,MistyAI ; misty
+	dbw 1,LtSurgeAI ; surge
+	dbw 1,ErikaAI ; erika
+	dbw 2,KogaAI ; koga
+	dbw 2,BlaineAI ; blaine
+	dbw 1,SabrinaAI ; sabrina
+	dbw 3,GenericAI
+	dbw 1,Sony2AI ; sony2
+	dbw 1,Sony3AI ; sony3
+	dbw 2,LoreleiAI ; lorelei
+	dbw 3,GenericAI
+	dbw 2,AgathaAI ; agatha
+	dbw 1,LanceAI ; lance
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/grass_water.asm b/data/wild/grass_water.asm
new file mode 100755
index 00000000..9dc41f82
--- /dev/null
+++ b/data/wild/grass_water.asm
@@ -0,0 +1,321 @@
+WildDataPointers:
+	dw NoMons      ; PALLET_TOWN
+	dw NoMons      ; VIRIDIAN_CITY
+	dw NoMons      ; PEWTER_CITY
+	dw NoMons      ; CERULEAN_CITY
+	dw NoMons      ; LAVENDER_TOWN
+	dw NoMons      ; VERMILION_CITY
+	dw NoMons      ; CELADON_CITY
+	dw NoMons      ; FUCHSIA_CITY
+	dw NoMons      ; CINNABAR_ISLAND
+	dw NoMons      ; INDIGO_PLATEAU
+	dw NoMons      ; SAFFRON_CITY
+	dw NoMons      ; unused
+	dw Route1Mons  ; ROUTE_1
+	dw Route2Mons  ; ROUTE_2
+	dw Route3Mons  ; ROUTE_3
+	dw Route4Mons  ; ROUTE_4
+	dw Route5Mons  ; ROUTE_5
+	dw Route6Mons  ; ROUTE_6
+	dw Route7Mons  ; ROUTE_7
+	dw Route8Mons  ; ROUTE_8
+	dw Route9Mons  ; ROUTE_9
+	dw Route10Mons ; ROUTE_10
+	dw Route11Mons ; ROUTE_11
+	dw Route12Mons ; ROUTE_12
+	dw Route13Mons ; ROUTE_13
+	dw Route14Mons ; ROUTE_14
+	dw Route15Mons ; ROUTE_15
+	dw Route16Mons ; ROUTE_16
+	dw Route17Mons ; ROUTE_17
+	dw Route18Mons ; ROUTE_18
+	dw WaterMons   ; ROUTE_19
+	dw WaterMons   ; ROUTE_20
+	dw Route21Mons ; ROUTE_21
+	dw Route22Mons ; ROUTE_22
+	dw Route23Mons ; ROUTE_23
+	dw Route24Mons ; ROUTE_24
+	dw Route25Mons ; ROUTE_25
+	dw NoMons      ; REDS_HOUSE_1F
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw ForestMons ; ViridianForest
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw MoonMons1
+	dw MoonMonsB1
+	dw MoonMonsB2
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw TunnelMonsB1
+	dw PowerPlantMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw PlateauMons1
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw TowerMons1
+	dw TowerMons2
+	dw TowerMons3
+	dw TowerMons4
+	dw TowerMons5
+	dw TowerMons6
+	dw TowerMons7
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw IslandMonsB1
+	dw IslandMonsB2
+	dw IslandMonsB3
+	dw IslandMonsB4
+	dw NoMons
+	dw NoMons
+	dw MansionMons1
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw IslandMons1
+	dw NoMons
+	dw PlateauMons2
+	dw NoMons
+	dw NoMons
+	dw CaveMons
+	dw PlateauMons3
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw MansionMons2
+	dw MansionMons3
+	dw MansionMonsB1
+	dw ZoneMons1
+	dw ZoneMons2
+	dw ZoneMons3
+	dw ZoneMonsCenter
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw DungeonMons2
+	dw DungeonMonsB1
+	dw DungeonMons1
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw TunnelMonsB2
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw NoMons
+	dw -1 ; end
+
+; wild pokemon data is divided into two parts.
+; first part:  pokemon found in grass
+; second part: pokemon found while surfing
+; each part goes as follows:
+    ; if first byte == 00, then
+        ; no wild pokemon on this map
+    ; if first byte != 00, then
+        ; first byte is encounter rate
+        ; followed by 20 bytes:
+        ; level, species (ten times)
+
+INCLUDE "data/wild/maps/nothing.asm"
+INCLUDE "data/wild/maps/Route1.asm"
+INCLUDE "data/wild/maps/Route2.asm"
+INCLUDE "data/wild/maps/Route22.asm"
+INCLUDE "data/wild/maps/ViridianForest.asm"
+INCLUDE "data/wild/maps/Route3.asm"
+INCLUDE "data/wild/maps/MtMoon1F.asm"
+INCLUDE "data/wild/maps/MtMoonB1F.asm"
+INCLUDE "data/wild/maps/MtMoonB2F.asm"
+INCLUDE "data/wild/maps/Route4.asm"
+INCLUDE "data/wild/maps/Route24.asm"
+INCLUDE "data/wild/maps/Route25.asm"
+INCLUDE "data/wild/maps/Route9.asm"
+INCLUDE "data/wild/maps/Route5.asm"
+INCLUDE "data/wild/maps/Route6.asm"
+INCLUDE "data/wild/maps/Route11.asm"
+INCLUDE "data/wild/maps/RockTunnel1F.asm"
+INCLUDE "data/wild/maps/RockTunnelB1F.asm"
+INCLUDE "data/wild/maps/Route10.asm"
+INCLUDE "data/wild/maps/Route12.asm"
+INCLUDE "data/wild/maps/Route8.asm"
+INCLUDE "data/wild/maps/Route7.asm"
+INCLUDE "data/wild/maps/PokemonTower1F.asm"
+INCLUDE "data/wild/maps/PokemonTower2F.asm"
+INCLUDE "data/wild/maps/PokemonTower3F.asm"
+INCLUDE "data/wild/maps/PokemonTower4F.asm"
+INCLUDE "data/wild/maps/PokemonTower5F.asm"
+INCLUDE "data/wild/maps/PokemonTower6F.asm"
+INCLUDE "data/wild/maps/PokemonTower7F.asm"
+INCLUDE "data/wild/maps/Route13.asm"
+INCLUDE "data/wild/maps/Route14.asm"
+INCLUDE "data/wild/maps/Route15.asm"
+INCLUDE "data/wild/maps/Route16.asm"
+INCLUDE "data/wild/maps/Route17.asm"
+INCLUDE "data/wild/maps/Route18.asm"
+INCLUDE "data/wild/maps/SafariZoneCenter.asm"
+INCLUDE "data/wild/maps/SafariZoneEast.asm"
+INCLUDE "data/wild/maps/SafariZoneNorth.asm"
+INCLUDE "data/wild/maps/SafariZoneWest.asm"
+INCLUDE "data/wild/maps/SeaRoutes.asm"
+INCLUDE "data/wild/maps/SeafoamIslands1F.asm"
+INCLUDE "data/wild/maps/SeafoamIslandsB1F.asm"
+INCLUDE "data/wild/maps/SeafoamIslandsB2F.asm"
+INCLUDE "data/wild/maps/SeafoamIslandsB3F.asm"
+INCLUDE "data/wild/maps/SeafoamIslandsB4F.asm"
+INCLUDE "data/wild/maps/PokemonMansion1F.asm"
+INCLUDE "data/wild/maps/PokemonMansion2F.asm"
+INCLUDE "data/wild/maps/PokemonMansion3F.asm"
+INCLUDE "data/wild/maps/PokemonMansionB1F.asm"
+INCLUDE "data/wild/maps/Route21.asm"
+INCLUDE "data/wild/maps/CeruleanCave1F.asm"
+INCLUDE "data/wild/maps/CeruleanCave2F.asm"
+INCLUDE "data/wild/maps/CeruleanCaveB1F.asm"
+INCLUDE "data/wild/maps/PowerPlant.asm"
+INCLUDE "data/wild/maps/Route23.asm"
+INCLUDE "data/wild/maps/VictoryRoad2F.asm"
+INCLUDE "data/wild/maps/VictoryRoad3F.asm"
+INCLUDE "data/wild/maps/VictoryRoad1F.asm"
+INCLUDE "data/wild/maps/DiglettsCave.asm"
diff --git a/data/wildPokemon/ceruleancave1.asm b/data/wild/maps/CeruleanCave1F.asm
index 20e8643a..20e8643a 100644
--- a/data/wildPokemon/ceruleancave1.asm
+++ b/data/wild/maps/CeruleanCave1F.asm
diff --git a/data/wildPokemon/ceruleancave2.asm b/data/wild/maps/CeruleanCave2F.asm
index 5afe55ac..5afe55ac 100644
--- a/data/wildPokemon/ceruleancave2.asm
+++ b/data/wild/maps/CeruleanCave2F.asm
diff --git a/data/wildPokemon/ceruleancaveb1.asm b/data/wild/maps/CeruleanCaveB1F.asm
index 245d5912..245d5912 100644
--- a/data/wildPokemon/ceruleancaveb1.asm
+++ b/data/wild/maps/CeruleanCaveB1F.asm
diff --git a/data/wildPokemon/diglettscave.asm b/data/wild/maps/DiglettsCave.asm
index 37512687..37512687 100755
--- a/data/wildPokemon/diglettscave.asm
+++ b/data/wild/maps/DiglettsCave.asm
diff --git a/data/wildPokemon/mtmoon1.asm b/data/wild/maps/MtMoon1F.asm
index 44b34c45..44b34c45 100755
--- a/data/wildPokemon/mtmoon1.asm
+++ b/data/wild/maps/MtMoon1F.asm
diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wild/maps/MtMoonB1F.asm
index 5c0d8a53..5c0d8a53 100755
--- a/data/wildPokemon/mtmoonb1.asm
+++ b/data/wild/maps/MtMoonB1F.asm
diff --git a/data/wildPokemon/mtmoonb2.asm b/data/wild/maps/MtMoonB2F.asm
index cbf97e7e..cbf97e7e 100755
--- a/data/wildPokemon/mtmoonb2.asm
+++ b/data/wild/maps/MtMoonB2F.asm
diff --git a/data/wildPokemon/mansion1.asm b/data/wild/maps/PokemonMansion1F.asm
index 22ad032b..22ad032b 100755
--- a/data/wildPokemon/mansion1.asm
+++ b/data/wild/maps/PokemonMansion1F.asm
diff --git a/data/wildPokemon/mansion2.asm b/data/wild/maps/PokemonMansion2F.asm
index 985474fc..985474fc 100755
--- a/data/wildPokemon/mansion2.asm
+++ b/data/wild/maps/PokemonMansion2F.asm
diff --git a/data/wildPokemon/mansion3.asm b/data/wild/maps/PokemonMansion3F.asm
index 9c5521ae..9c5521ae 100755
--- a/data/wildPokemon/mansion3.asm
+++ b/data/wild/maps/PokemonMansion3F.asm
diff --git a/data/wildPokemon/mansionb1.asm b/data/wild/maps/PokemonMansionB1F.asm
index 83266ddd..83266ddd 100755
--- a/data/wildPokemon/mansionb1.asm
+++ b/data/wild/maps/PokemonMansionB1F.asm
diff --git a/data/wildPokemon/pokemontower1.asm b/data/wild/maps/PokemonTower1F.asm
index df951e70..df951e70 100755
--- a/data/wildPokemon/pokemontower1.asm
+++ b/data/wild/maps/PokemonTower1F.asm
diff --git a/data/wildPokemon/pokemontower2.asm b/data/wild/maps/PokemonTower2F.asm
index dcbe0da0..dcbe0da0 100755
--- a/data/wildPokemon/pokemontower2.asm
+++ b/data/wild/maps/PokemonTower2F.asm
diff --git a/data/wildPokemon/pokemontower3.asm b/data/wild/maps/PokemonTower3F.asm
index 135ed84f..135ed84f 100755
--- a/data/wildPokemon/pokemontower3.asm
+++ b/data/wild/maps/PokemonTower3F.asm
diff --git a/data/wildPokemon/pokemontower4.asm b/data/wild/maps/PokemonTower4F.asm
index 0c84b0cf..0c84b0cf 100755
--- a/data/wildPokemon/pokemontower4.asm
+++ b/data/wild/maps/PokemonTower4F.asm
diff --git a/data/wildPokemon/pokemontower5.asm b/data/wild/maps/PokemonTower5F.asm
index 440dbf8d..440dbf8d 100755
--- a/data/wildPokemon/pokemontower5.asm
+++ b/data/wild/maps/PokemonTower5F.asm
diff --git a/data/wildPokemon/pokemontower6.asm b/data/wild/maps/PokemonTower6F.asm
index 553fdb5d..553fdb5d 100755
--- a/data/wildPokemon/pokemontower6.asm
+++ b/data/wild/maps/PokemonTower6F.asm
diff --git a/data/wildPokemon/pokemontower7.asm b/data/wild/maps/PokemonTower7F.asm
index 0f7e66e9..0f7e66e9 100755
--- a/data/wildPokemon/pokemontower7.asm
+++ b/data/wild/maps/PokemonTower7F.asm
diff --git a/data/wildPokemon/powerplant.asm b/data/wild/maps/PowerPlant.asm
index 35eece95..35eece95 100755
--- a/data/wildPokemon/powerplant.asm
+++ b/data/wild/maps/PowerPlant.asm
diff --git a/data/wildPokemon/rocktunnel1.asm b/data/wild/maps/RockTunnel1F.asm
index a36f2092..a36f2092 100755
--- a/data/wildPokemon/rocktunnel1.asm
+++ b/data/wild/maps/RockTunnel1F.asm
diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wild/maps/RockTunnelB1F.asm
index 2fc7ef94..2fc7ef94 100755
--- a/data/wildPokemon/rocktunnel2.asm
+++ b/data/wild/maps/RockTunnelB1F.asm
diff --git a/data/wildPokemon/route1.asm b/data/wild/maps/Route1.asm
index f618c34f..f618c34f 100755
--- a/data/wildPokemon/route1.asm
+++ b/data/wild/maps/Route1.asm
diff --git a/data/wildPokemon/route10.asm b/data/wild/maps/Route10.asm
index 34e0b5ee..34e0b5ee 100755
--- a/data/wildPokemon/route10.asm
+++ b/data/wild/maps/Route10.asm
diff --git a/data/wildPokemon/route11.asm b/data/wild/maps/Route11.asm
index 9e4e3644..9e4e3644 100755
--- a/data/wildPokemon/route11.asm
+++ b/data/wild/maps/Route11.asm
diff --git a/data/wildPokemon/route12.asm b/data/wild/maps/Route12.asm
index 45dfbc9d..45dfbc9d 100755
--- a/data/wildPokemon/route12.asm
+++ b/data/wild/maps/Route12.asm
diff --git a/data/wildPokemon/route13.asm b/data/wild/maps/Route13.asm
index 2a1a6cb5..2a1a6cb5 100755
--- a/data/wildPokemon/route13.asm
+++ b/data/wild/maps/Route13.asm
diff --git a/data/wildPokemon/route14.asm b/data/wild/maps/Route14.asm
index aad5aa48..aad5aa48 100755
--- a/data/wildPokemon/route14.asm
+++ b/data/wild/maps/Route14.asm
diff --git a/data/wildPokemon/route15.asm b/data/wild/maps/Route15.asm
index b4762230..b4762230 100755
--- a/data/wildPokemon/route15.asm
+++ b/data/wild/maps/Route15.asm
diff --git a/data/wildPokemon/route16.asm b/data/wild/maps/Route16.asm
index c2421c50..c2421c50 100755
--- a/data/wildPokemon/route16.asm
+++ b/data/wild/maps/Route16.asm
diff --git a/data/wildPokemon/route17.asm b/data/wild/maps/Route17.asm
index 8dffd9a3..8dffd9a3 100755
--- a/data/wildPokemon/route17.asm
+++ b/data/wild/maps/Route17.asm
diff --git a/data/wildPokemon/route18.asm b/data/wild/maps/Route18.asm
index 47bd247d..47bd247d 100755
--- a/data/wildPokemon/route18.asm
+++ b/data/wild/maps/Route18.asm
diff --git a/data/wildPokemon/route2.asm b/data/wild/maps/Route2.asm
index ad958ea5..ad958ea5 100755
--- a/data/wildPokemon/route2.asm
+++ b/data/wild/maps/Route2.asm
diff --git a/data/wildPokemon/route21.asm b/data/wild/maps/Route21.asm
index 3cc73ba0..3cc73ba0 100755
--- a/data/wildPokemon/route21.asm
+++ b/data/wild/maps/Route21.asm
diff --git a/data/wildPokemon/route22.asm b/data/wild/maps/Route22.asm
index 750a2f4e..750a2f4e 100755
--- a/data/wildPokemon/route22.asm
+++ b/data/wild/maps/Route22.asm
diff --git a/data/wildPokemon/route23.asm b/data/wild/maps/Route23.asm
index a057d24d..a057d24d 100755
--- a/data/wildPokemon/route23.asm
+++ b/data/wild/maps/Route23.asm
diff --git a/data/wildPokemon/route24.asm b/data/wild/maps/Route24.asm
index 3a745f36..3a745f36 100755
--- a/data/wildPokemon/route24.asm
+++ b/data/wild/maps/Route24.asm
diff --git a/data/wildPokemon/route25.asm b/data/wild/maps/Route25.asm
index 4884fa64..4884fa64 100755
--- a/data/wildPokemon/route25.asm
+++ b/data/wild/maps/Route25.asm
diff --git a/data/wildPokemon/route3.asm b/data/wild/maps/Route3.asm
index dea820a4..dea820a4 100755
--- a/data/wildPokemon/route3.asm
+++ b/data/wild/maps/Route3.asm
diff --git a/data/wildPokemon/route4.asm b/data/wild/maps/Route4.asm
index 624d58de..624d58de 100755
--- a/data/wildPokemon/route4.asm
+++ b/data/wild/maps/Route4.asm
diff --git a/data/wildPokemon/route5.asm b/data/wild/maps/Route5.asm
index cb8c583b..cb8c583b 100755
--- a/data/wildPokemon/route5.asm
+++ b/data/wild/maps/Route5.asm
diff --git a/data/wildPokemon/route6.asm b/data/wild/maps/Route6.asm
index 92512ffb..92512ffb 100755
--- a/data/wildPokemon/route6.asm
+++ b/data/wild/maps/Route6.asm
diff --git a/data/wildPokemon/route7.asm b/data/wild/maps/Route7.asm
index 559c98ee..559c98ee 100755
--- a/data/wildPokemon/route7.asm
+++ b/data/wild/maps/Route7.asm
diff --git a/data/wildPokemon/route8.asm b/data/wild/maps/Route8.asm
index 8a0bfa31..8a0bfa31 100755
--- a/data/wildPokemon/route8.asm
+++ b/data/wild/maps/Route8.asm
diff --git a/data/wildPokemon/route9.asm b/data/wild/maps/Route9.asm
index 716589b0..716589b0 100755
--- a/data/wildPokemon/route9.asm
+++ b/data/wild/maps/Route9.asm
diff --git a/data/wildPokemon/safarizonecenter.asm b/data/wild/maps/SafariZoneCenter.asm
index 0cd5323a..0cd5323a 100755
--- a/data/wildPokemon/safarizonecenter.asm
+++ b/data/wild/maps/SafariZoneCenter.asm
diff --git a/data/wildPokemon/safarizone1.asm b/data/wild/maps/SafariZoneEast.asm
index 3d77b6fe..3d77b6fe 100755
--- a/data/wildPokemon/safarizone1.asm
+++ b/data/wild/maps/SafariZoneEast.asm
diff --git a/data/wildPokemon/safarizone2.asm b/data/wild/maps/SafariZoneNorth.asm
index c1b6a547..c1b6a547 100755
--- a/data/wildPokemon/safarizone2.asm
+++ b/data/wild/maps/SafariZoneNorth.asm
diff --git a/data/wildPokemon/safarizone3.asm b/data/wild/maps/SafariZoneWest.asm
index 47b6a102..47b6a102 100755
--- a/data/wildPokemon/safarizone3.asm
+++ b/data/wild/maps/SafariZoneWest.asm
diff --git a/data/wildPokemon/waterpokemon.asm b/data/wild/maps/SeaRoutes.asm
index 07c6a187..07c6a187 100755
--- a/data/wildPokemon/waterpokemon.asm
+++ b/data/wild/maps/SeaRoutes.asm
diff --git a/data/wildPokemon/seafoamisland1.asm b/data/wild/maps/SeafoamIslands1F.asm
index 3c431f9a..3c431f9a 100755
--- a/data/wildPokemon/seafoamisland1.asm
+++ b/data/wild/maps/SeafoamIslands1F.asm
diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/wild/maps/SeafoamIslandsB1F.asm
index 6f96f240..6f96f240 100755
--- a/data/wildPokemon/seafoamislandb1.asm
+++ b/data/wild/maps/SeafoamIslandsB1F.asm
diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/wild/maps/SeafoamIslandsB2F.asm
index 7191fea9..7191fea9 100755
--- a/data/wildPokemon/seafoamislandb2.asm
+++ b/data/wild/maps/SeafoamIslandsB2F.asm
diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/wild/maps/SeafoamIslandsB3F.asm
index 9778c0e9..9778c0e9 100755
--- a/data/wildPokemon/seafoamislandb3.asm
+++ b/data/wild/maps/SeafoamIslandsB3F.asm
diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/wild/maps/SeafoamIslandsB4F.asm
index 3948470b..3948470b 100755
--- a/data/wildPokemon/seafoamislandb4.asm
+++ b/data/wild/maps/SeafoamIslandsB4F.asm
diff --git a/data/wildPokemon/victoryroad1.asm b/data/wild/maps/VictoryRoad1F.asm
index 60aae31a..60aae31a 100755
--- a/data/wildPokemon/victoryroad1.asm
+++ b/data/wild/maps/VictoryRoad1F.asm
diff --git a/data/wildPokemon/victoryroad2.asm b/data/wild/maps/VictoryRoad2F.asm
index 580d644d..580d644d 100755
--- a/data/wildPokemon/victoryroad2.asm
+++ b/data/wild/maps/VictoryRoad2F.asm
diff --git a/data/wildPokemon/victoryroad3.asm b/data/wild/maps/VictoryRoad3F.asm
index 80d7ef3e..80d7ef3e 100755
--- a/data/wildPokemon/victoryroad3.asm
+++ b/data/wild/maps/VictoryRoad3F.asm
diff --git a/data/wildPokemon/viridianforest.asm b/data/wild/maps/ViridianForest.asm
index ae9a5a70..ae9a5a70 100755
--- a/data/wildPokemon/viridianforest.asm
+++ b/data/wild/maps/ViridianForest.asm
diff --git a/data/wildPokemon/nomons.asm b/data/wild/maps/nothing.asm
index ce7f7ede..ce7f7ede 100755
--- a/data/wildPokemon/nomons.asm
+++ b/data/wild/maps/nothing.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
diff --git a/data/wild_mons.asm b/data/wild_mons.asm
deleted file mode 100755
index e089a582..00000000
--- a/data/wild_mons.asm
+++ /dev/null
@@ -1,321 +0,0 @@
-WildDataPointers:
-	dw NoMons      ; PALLET_TOWN
-	dw NoMons      ; VIRIDIAN_CITY
-	dw NoMons      ; PEWTER_CITY
-	dw NoMons      ; CERULEAN_CITY
-	dw NoMons      ; LAVENDER_TOWN
-	dw NoMons      ; VERMILION_CITY
-	dw NoMons      ; CELADON_CITY
-	dw NoMons      ; FUCHSIA_CITY
-	dw NoMons      ; CINNABAR_ISLAND
-	dw NoMons      ; INDIGO_PLATEAU
-	dw NoMons      ; SAFFRON_CITY
-	dw NoMons      ; unused
-	dw Route1Mons  ; ROUTE_1
-	dw Route2Mons  ; ROUTE_2
-	dw Route3Mons  ; ROUTE_3
-	dw Route4Mons  ; ROUTE_4
-	dw Route5Mons  ; ROUTE_5
-	dw Route6Mons  ; ROUTE_6
-	dw Route7Mons  ; ROUTE_7
-	dw Route8Mons  ; ROUTE_8
-	dw Route9Mons  ; ROUTE_9
-	dw Route10Mons ; ROUTE_10
-	dw Route11Mons ; ROUTE_11
-	dw Route12Mons ; ROUTE_12
-	dw Route13Mons ; ROUTE_13
-	dw Route14Mons ; ROUTE_14
-	dw Route15Mons ; ROUTE_15
-	dw Route16Mons ; ROUTE_16
-	dw Route17Mons ; ROUTE_17
-	dw Route18Mons ; ROUTE_18
-	dw WaterMons   ; ROUTE_19
-	dw WaterMons   ; ROUTE_20
-	dw Route21Mons ; ROUTE_21
-	dw Route22Mons ; ROUTE_22
-	dw Route23Mons ; ROUTE_23
-	dw Route24Mons ; ROUTE_24
-	dw Route25Mons ; ROUTE_25
-	dw NoMons      ; REDS_HOUSE_1F
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw ForestMons ; ViridianForest
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw MoonMons1
-	dw MoonMonsB1
-	dw MoonMonsB2
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw TunnelMonsB1
-	dw PowerPlantMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw PlateauMons1
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw TowerMons1
-	dw TowerMons2
-	dw TowerMons3
-	dw TowerMons4
-	dw TowerMons5
-	dw TowerMons6
-	dw TowerMons7
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw IslandMonsB1
-	dw IslandMonsB2
-	dw IslandMonsB3
-	dw IslandMonsB4
-	dw NoMons
-	dw NoMons
-	dw MansionMons1
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw IslandMons1
-	dw NoMons
-	dw PlateauMons2
-	dw NoMons
-	dw NoMons
-	dw CaveMons
-	dw PlateauMons3
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw MansionMons2
-	dw MansionMons3
-	dw MansionMonsB1
-	dw ZoneMons1
-	dw ZoneMons2
-	dw ZoneMons3
-	dw ZoneMonsCenter
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw DungeonMons2
-	dw DungeonMonsB1
-	dw DungeonMons1
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw TunnelMonsB2
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw NoMons
-	dw $FFFF
-
-; wild pokemon data is divided into two parts.
-; first part:  pokemon found in grass
-; second part: pokemon found while surfing
-; each part goes as follows:
-    ; if first byte == 00, then
-        ; no wild pokemon on this map
-    ; if first byte != 00, then
-        ; first byte is encounter rate
-        ; 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"