From b29e5ee203b6fa4592180ef6cca732462cca9af6 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Fri, 3 Jul 2020 11:51:00 -0400
Subject: [PATCH] Add subdirectories to data/ similar to pokecrystal

Top level text/ is now solely for the former text/maps/ files, and other files are in their respective subdirectories in data/.
---
 constants/evolution_constants.asm             |    2 +-
 data/base_stats.asm                           |  153 -
 {text => data/battle}/stat_names.asm          |    0
 .../credits_mons.asm}                         |    0
 data/{ => credits}/credits_order.asm          |    0
 {text => data/credits}/credits_text.asm       |    0
 data/{ => events}/hidden_coins.asm            |    0
 data/{ => events}/hidden_item_coords.asm      |    0
 data/{ => events}/hidden_objects.asm          |    0
 data/{ => events}/prize_mon_levels.asm        |    0
 data/{ => events}/prizes.asm                  |    0
 data/{ => events}/slot_machine_wheels.asm     |    0
 data/{ => events}/trades.asm                  |    0
 ..._sprite_pointers.asm => icon_pointers.asm} |    0
 data/{ => items}/guard_drink_items.asm        |    0
 data/{ => items}/key_items.asm                |    0
 .../{mart_inventories.asm => items/marts.asm} |    0
 text/item_names.asm => data/items/names.asm   |    0
 data/{item_prices.asm => items/prices.asm}    |    0
 data/{ => items}/tm_prices.asm                |    0
 .../use_overworld.asm}                        |    0
 data/{party_items.asm => items/use_party.asm} |    0
 data/{ => items}/vending_prices.asm           |    0
 .../CeruleanCave1F.asm}                       |    0
 .../CeruleanCave2F.asm}                       |    0
 .../CeruleanCaveB1F.asm}                      |    0
 .../DiglettsCave.asm}                         |    0
 .../mtmoon1.asm => mapWilds/MtMoon1F.asm}     |    0
 .../mtmoonb1.asm => mapWilds/MtMoonB1F.asm}   |    0
 .../mtmoonb2.asm => mapWilds/MtMoonB2F.asm}   |    0
 .../PokemonMansion1F.asm}                     |    0
 .../PokemonMansion2F.asm}                     |    0
 .../PokemonMansion3F.asm}                     |    0
 .../PokemonMansionB1F.asm}                    |    0
 .../PokemonTower1F.asm}                       |    0
 .../PokemonTower2F.asm}                       |    0
 .../PokemonTower3F.asm}                       |    0
 .../PokemonTower4F.asm}                       |    0
 .../PokemonTower5F.asm}                       |    0
 .../PokemonTower6F.asm}                       |    0
 .../PokemonTower7F.asm}                       |    0
 .../PowerPlant.asm}                           |    0
 .../RockTunnel1F.asm}                         |    0
 .../RockTunnelB1F.asm}                        |    0
 .../route1.asm => mapWilds/Route1.asm}        |    0
 .../route10.asm => mapWilds/Route10.asm}      |    0
 .../route11.asm => mapWilds/Route11.asm}      |    0
 .../route12.asm => mapWilds/Route12.asm}      |    0
 .../route13.asm => mapWilds/Route13.asm}      |    0
 .../route14.asm => mapWilds/Route14.asm}      |    0
 .../route15.asm => mapWilds/Route15.asm}      |    0
 .../route16.asm => mapWilds/Route16.asm}      |    0
 .../route17.asm => mapWilds/Route17.asm}      |    0
 .../route18.asm => mapWilds/Route18.asm}      |    0
 .../route2.asm => mapWilds/Route2.asm}        |    0
 .../route21.asm => mapWilds/Route21.asm}      |    0
 .../route22.asm => mapWilds/Route22.asm}      |    0
 .../route23.asm => mapWilds/Route23.asm}      |    0
 .../route24.asm => mapWilds/Route24.asm}      |    0
 .../route25.asm => mapWilds/Route25.asm}      |    0
 .../route3.asm => mapWilds/Route3.asm}        |    0
 .../route4.asm => mapWilds/Route4.asm}        |    0
 .../route5.asm => mapWilds/Route5.asm}        |    0
 .../route6.asm => mapWilds/Route6.asm}        |    0
 .../route7.asm => mapWilds/Route7.asm}        |    0
 .../route8.asm => mapWilds/Route8.asm}        |    0
 .../route9.asm => mapWilds/Route9.asm}        |    0
 .../SafariZoneCenter.asm}                     |    0
 .../SafariZoneEast.asm}                       |    0
 .../SafariZoneNorth.asm}                      |    0
 .../SafariZoneWest.asm}                       |    0
 .../SeaRoutes.asm}                            |    0
 .../SeafoamIslands1F.asm}                     |    0
 .../SeafoamIslandsB1F.asm}                    |    0
 .../SeafoamIslandsB2F.asm}                    |    0
 .../SeafoamIslandsB3F.asm}                    |    0
 .../SeafoamIslandsB4F.asm}                    |    0
 .../VictoryRoad1F.asm}                        |    0
 .../VictoryRoad2F.asm}                        |    0
 .../VictoryRoad3F.asm}                        |    0
 .../ViridianForest.asm}                       |    0
 .../nomons.asm => mapWilds/nothing.asm}       |    0
 data/{ => maps}/dungeon_maps.asm              |    0
 data/{ => maps}/force_bike_surf.asm           |    0
 data/{ => maps}/hide_show_data.asm            |    0
 data/{ => maps}/map_header_banks.asm          |    0
 data/{ => maps}/map_header_pointers.asm       |    0
 text/map_names.asm => data/maps/names.asm     |    0
 data/{ => maps}/rest_house_maps.asm           |    0
 data/{map_songs.asm => maps/songs.asm}        |    0
 data/{ => maps}/special_warps.asm             |    0
 data/{ => maps}/sprite_sets.asm               |    0
 data/{ => maps}/town_map_entries.asm          |    0
 data/{ => maps}/town_map_order.asm            |    0
 .../animation_special_effect_pointers.asm}    |    0
 .../animation_special_effects.asm}            |    0
 data/{ => moves}/animations.asm               |    0
 data/{ => moves}/effects_pointers.asm         |    0
 data/{move_grammar.asm => moves/grammar.asm}  |    0
 data/{ => moves}/hm_moves.asm                 |    0
 data/{ => moves}/moves.asm                    |    0
 text/move_names.asm => data/moves/names.asm   |    0
 data/{move_sfx.asm => moves/sfx.asm}          |    0
 data/{tms.asm => moves/tmhm_moves.asm}        |    0
 {text => data}/player_names.asm               |    0
 {text => data}/player_names_list.asm          |    0
 data/pokemon/base_stats.asm                   |  153 +
 .../base_stats}/abra.asm                      |    0
 .../base_stats}/aerodactyl.asm                |    0
 .../base_stats}/alakazam.asm                  |    0
 .../base_stats}/arbok.asm                     |    0
 .../base_stats}/arcanine.asm                  |    0
 .../base_stats}/articuno.asm                  |    0
 .../base_stats}/beedrill.asm                  |    0
 .../base_stats}/bellsprout.asm                |    0
 .../base_stats}/blastoise.asm                 |    0
 .../base_stats}/bulbasaur.asm                 |    0
 .../base_stats}/butterfree.asm                |    0
 .../base_stats}/caterpie.asm                  |    0
 .../base_stats}/chansey.asm                   |    0
 .../base_stats}/charizard.asm                 |    0
 .../base_stats}/charmander.asm                |    0
 .../base_stats}/charmeleon.asm                |    0
 .../base_stats}/clefable.asm                  |    0
 .../base_stats}/clefairy.asm                  |    0
 .../base_stats}/cloyster.asm                  |    0
 .../base_stats}/cubone.asm                    |    0
 .../base_stats}/dewgong.asm                   |    0
 .../base_stats}/diglett.asm                   |    0
 .../base_stats}/ditto.asm                     |    0
 .../base_stats}/dodrio.asm                    |    0
 .../base_stats}/doduo.asm                     |    0
 .../base_stats}/dragonair.asm                 |    0
 .../base_stats}/dragonite.asm                 |    0
 .../base_stats}/dratini.asm                   |    0
 .../base_stats}/drowzee.asm                   |    0
 .../base_stats}/dugtrio.asm                   |    0
 .../base_stats}/eevee.asm                     |    0
 .../base_stats}/ekans.asm                     |    0
 .../base_stats}/electabuzz.asm                |    0
 .../base_stats}/electrode.asm                 |    0
 .../base_stats}/exeggcute.asm                 |    0
 .../base_stats}/exeggutor.asm                 |    0
 .../base_stats}/farfetchd.asm                 |    0
 .../base_stats}/fearow.asm                    |    0
 .../base_stats}/flareon.asm                   |    0
 .../base_stats}/gastly.asm                    |    0
 .../base_stats}/gengar.asm                    |    0
 .../base_stats}/geodude.asm                   |    0
 .../base_stats}/gloom.asm                     |    0
 .../base_stats}/golbat.asm                    |    0
 .../base_stats}/goldeen.asm                   |    0
 .../base_stats}/golduck.asm                   |    0
 .../base_stats}/golem.asm                     |    0
 .../base_stats}/graveler.asm                  |    0
 .../base_stats}/grimer.asm                    |    0
 .../base_stats}/growlithe.asm                 |    0
 .../base_stats}/gyarados.asm                  |    0
 .../base_stats}/haunter.asm                   |    0
 .../base_stats}/hitmonchan.asm                |    0
 .../base_stats}/hitmonlee.asm                 |    0
 .../base_stats}/horsea.asm                    |    0
 .../base_stats}/hypno.asm                     |    0
 .../base_stats}/ivysaur.asm                   |    0
 .../base_stats}/jigglypuff.asm                |    0
 .../base_stats}/jolteon.asm                   |    0
 .../base_stats}/jynx.asm                      |    0
 .../base_stats}/kabuto.asm                    |    0
 .../base_stats}/kabutops.asm                  |    0
 .../base_stats}/kadabra.asm                   |    0
 .../base_stats}/kakuna.asm                    |    0
 .../base_stats}/kangaskhan.asm                |    0
 .../base_stats}/kingler.asm                   |    0
 .../base_stats}/koffing.asm                   |    0
 .../base_stats}/krabby.asm                    |    0
 .../base_stats}/lapras.asm                    |    0
 .../base_stats}/lickitung.asm                 |    0
 .../base_stats}/machamp.asm                   |    0
 .../base_stats}/machoke.asm                   |    0
 .../base_stats}/machop.asm                    |    0
 .../base_stats}/magikarp.asm                  |    0
 .../base_stats}/magmar.asm                    |    0
 .../base_stats}/magnemite.asm                 |    0
 .../base_stats}/magneton.asm                  |    0
 .../base_stats}/mankey.asm                    |    0
 .../base_stats}/marowak.asm                   |    0
 .../base_stats}/meowth.asm                    |    0
 .../base_stats}/metapod.asm                   |    0
 .../{baseStats => pokemon/base_stats}/mew.asm |    0
 .../base_stats}/mewtwo.asm                    |    0
 .../base_stats}/moltres.asm                   |    0
 .../base_stats}/mrmime.asm                    |    0
 .../{baseStats => pokemon/base_stats}/muk.asm |    0
 .../base_stats}/nidoking.asm                  |    0
 .../base_stats}/nidoqueen.asm                 |    0
 .../base_stats}/nidoranf.asm                  |    0
 .../base_stats}/nidoranm.asm                  |    0
 .../base_stats}/nidorina.asm                  |    0
 .../base_stats}/nidorino.asm                  |    0
 .../base_stats}/ninetales.asm                 |    0
 .../base_stats}/oddish.asm                    |    0
 .../base_stats}/omanyte.asm                   |    0
 .../base_stats}/omastar.asm                   |    0
 .../base_stats}/onix.asm                      |    0
 .../base_stats}/paras.asm                     |    0
 .../base_stats}/parasect.asm                  |    0
 .../base_stats}/persian.asm                   |    0
 .../base_stats}/pidgeot.asm                   |    0
 .../base_stats}/pidgeotto.asm                 |    0
 .../base_stats}/pidgey.asm                    |    0
 .../base_stats}/pikachu.asm                   |    0
 .../base_stats}/pinsir.asm                    |    0
 .../base_stats}/poliwag.asm                   |    0
 .../base_stats}/poliwhirl.asm                 |    0
 .../base_stats}/poliwrath.asm                 |    0
 .../base_stats}/ponyta.asm                    |    0
 .../base_stats}/porygon.asm                   |    0
 .../base_stats}/primeape.asm                  |    0
 .../base_stats}/psyduck.asm                   |    0
 .../base_stats}/raichu.asm                    |    0
 .../base_stats}/rapidash.asm                  |    0
 .../base_stats}/raticate.asm                  |    0
 .../base_stats}/rattata.asm                   |    0
 .../base_stats}/rhydon.asm                    |    0
 .../base_stats}/rhyhorn.asm                   |    0
 .../base_stats}/sandshrew.asm                 |    0
 .../base_stats}/sandslash.asm                 |    0
 .../base_stats}/scyther.asm                   |    0
 .../base_stats}/seadra.asm                    |    0
 .../base_stats}/seaking.asm                   |    0
 .../base_stats}/seel.asm                      |    0
 .../base_stats}/shellder.asm                  |    0
 .../base_stats}/slowbro.asm                   |    0
 .../base_stats}/slowpoke.asm                  |    0
 .../base_stats}/snorlax.asm                   |    0
 .../base_stats}/spearow.asm                   |    0
 .../base_stats}/squirtle.asm                  |    0
 .../base_stats}/starmie.asm                   |    0
 .../base_stats}/staryu.asm                    |    0
 .../base_stats}/tangela.asm                   |    0
 .../base_stats}/tauros.asm                    |    0
 .../base_stats}/tentacool.asm                 |    0
 .../base_stats}/tentacruel.asm                |    0
 .../base_stats}/vaporeon.asm                  |    0
 .../base_stats}/venomoth.asm                  |    0
 .../base_stats}/venonat.asm                   |    0
 .../base_stats}/venusaur.asm                  |    0
 .../base_stats}/victreebel.asm                |    0
 .../base_stats}/vileplume.asm                 |    0
 .../base_stats}/voltorb.asm                   |    0
 .../base_stats}/vulpix.asm                    |    0
 .../base_stats}/wartortle.asm                 |    0
 .../base_stats}/weedle.asm                    |    0
 .../base_stats}/weepinbell.asm                |    0
 .../base_stats}/weezing.asm                   |    0
 .../base_stats}/wigglytuff.asm                |    0
 .../base_stats}/zapdos.asm                    |    0
 .../base_stats}/zubat.asm                     |    0
 data/{ => pokemon}/cries.asm                  |    0
 .../dex_entries.asm}                          |    0
 .../dex_order.asm}                            |    0
 text/pokedex.asm => data/pokemon/dex_text.asm |    0
 data/{ => pokemon}/evos_moves.asm             |    0
 .../menu_icons.asm}                           |    0
 .../pokemon/names.asm                         |    0
 .../palettes.asm}                             |    0
 data/{ => pokemon}/title_mons.asm             |    0
 data/{ => sgb}/sgb_border.asm                 |    0
 data/{ => sgb}/sgb_packets.asm                |    0
 .../sgb_palettes.asm}                         |    0
 data/{facing.asm => sprite_facings.asm}       |    0
 {text => data/text}/alphabets.asm             |    0
 {text => data/text}/dakutens.asm              |    0
 data/text/text_1.asm                          |  145 +
 data/text/text_2.asm                          | 1753 +++++++++
 data/text/text_3.asm                          |  324 ++
 data/text/text_4.asm                          |  217 ++
 data/text/text_5.asm                          |  102 +
 data/text/text_6.asm                          |  228 ++
 data/text/text_7.asm                          |  196 +
 data/text/unused_names.asm                    |   20 +
 data/{ => tilesets}/bike_riding_tilesets.asm  |    0
 data/{ => tilesets}/bookshelf_tile_ids.asm    |    0
 data/{ => tilesets}/collision_tile_ids.asm    |    0
 data/{ => tilesets}/cut_tree_blocks.asm       |    0
 data/{ => tilesets}/door_tile_ids.asm         |    0
 data/{ => tilesets}/dungeon_tilesets.asm      |    0
 data/{ => tilesets}/ledge_tiles.asm           |    0
 data/{ => tilesets}/tileset_headers.asm       |    0
 data/{ => tilesets}/warp_carpet_tile_ids.asm  |    0
 .../{ => tilesets}/warp_pad_hole_tile_ids.asm |    0
 data/{ => tilesets}/warp_tile_ids.asm         |    0
 data/{ => tilesets}/water_tilesets.asm        |    0
 .../ai_pointers.asm}                          |    1 +
 .../encounter_types.asm}                      |    0
 .../move_choices.asm}                         |    0
 .../trainers/name_pointers.asm                |    0
 .../trainers/names.asm                        |    0
 .../parties.asm}                              |    0
 .../pic_pointers_money.asm}                   |    0
 .../special_moves.asm}                        |    0
 text/type_names.asm => data/types/names.asm   |    0
 .../type_matchups.asm}                        |    0
 data/{ => wild}/good_rod.asm                  |    0
 data/{wild_mons.asm => wild/grass_water.asm}  |  118 +-
 .../probabilities.asm}                        |    0
 data/{ => wild}/super_rod.asm                 |    0
 engine/battle/animations.asm                  |    6 +-
 engine/battle/battle_transitions.asm          |    2 +-
 engine/battle/core.asm                        |    4 +-
 engine/battle/effects.asm                     |    4 +-
 engine/battle/print_type.asm                  |    2 +-
 engine/battle/save_trainer_name.asm           |    2 +-
 engine/battle/trainer_ai.asm                  |   12 +-
 engine/battle/wild_encounters.asm             |    2 +-
 engine/events/hidden_items.asm                |    4 +-
 engine/events/hidden_object_functions3.asm    |    2 +-
 engine/events/in_game_trades.asm              |    2 +-
 engine/events/prize_menu.asm                  |    4 +-
 engine/events/saffron_guards.asm              |    2 +-
 engine/events/set_blackout_map.asm            |    2 +-
 engine/events/vending_machine.asm             |    2 +-
 engine/gfx/mon_icons.asm                      |    4 +-
 engine/gfx/palettes.asm                       |    8 +-
 engine/items/item_effects.asm                 |    8 +-
 engine/items/tm_prices.asm                    |    2 +-
 engine/items/tms.asm                          |    2 +-
 engine/items/town_map.asm                     |    6 +-
 engine/menus/naming_screen.asm                |    4 +-
 engine/menus/pokedex.asm                      |    4 +-
 engine/menus/start_sub_menus.asm              |    4 +-
 engine/movie/credits.asm                      |    6 +-
 engine/movie/oak_speech/oak_speech2.asm       |    4 +-
 engine/movie/{titlescreen.asm => title.asm}   |    2 +-
 engine/movie/{titlescreen2.asm => title2.asm} |    0
 engine/overworld/cut.asm                      |    2 +-
 engine/overworld/doors.asm                    |    2 +-
 engine/overworld/hidden_objects.asm           |    2 +-
 engine/overworld/ledges.asm                   |    2 +-
 engine/overworld/map_sprites.asm              |    2 +-
 engine/overworld/player_animations.asm        |    2 +-
 engine/overworld/player_state.asm             |    6 +-
 engine/overworld/special_warps.asm            |    2 +-
 engine/overworld/tilesets.asm                 |    4 +-
 engine/overworld/wild_mons.asm                |    2 +-
 engine/pokemon/bills_pc.asm                   |    2 +-
 engine/pokemon/evos_moves.asm                 |    2 +-
 engine/slots/slot_machine.asm                 |    2 +-
 home.asm                                      |    8 +-
 home/overworld.asm                            |    2 +-
 main.asm                                      |   31 +-
 text.asm                                      | 3350 ++---------------
 text/{maps => }/AgathasRoom.asm               |    0
 text/{maps => }/BikeShop.asm                  |    0
 text/{maps => }/BillsHouse.asm                |    0
 text/{maps => }/BluesHouse.asm                |    0
 text/{maps => }/BrunosRoom.asm                |    0
 text/{maps => }/CeladonChiefHouse.asm         |    0
 text/{maps => }/CeladonCity.asm               |    0
 text/{maps => }/CeladonDiner.asm              |    0
 text/{maps => }/CeladonGym.asm                |    0
 text/{maps => }/CeladonHotel.asm              |    0
 text/{maps => }/CeladonMansion1F.asm          |    0
 text/{maps => }/CeladonMansion2F.asm          |    0
 text/{maps => }/CeladonMansion3F.asm          |    0
 text/{maps => }/CeladonMansionRoof.asm        |    0
 text/{maps => }/CeladonMansionRoofHouse.asm   |    0
 text/{maps => }/CeladonMart1F.asm             |    0
 text/{maps => }/CeladonMart2F.asm             |    0
 text/{maps => }/CeladonMart3F.asm             |    0
 text/{maps => }/CeladonMart4F.asm             |    0
 text/{maps => }/CeladonMart5F.asm             |    0
 text/{maps => }/CeladonMartRoof.asm           |    0
 text/{maps => }/CeladonPokecenter.asm         |    0
 text/{maps => }/CeruleanBadgeHouse.asm        |    0
 text/{maps => }/CeruleanCaveB1F.asm           |    0
 text/{maps => }/CeruleanCity.asm              |    0
 text/{maps => }/CeruleanGym.asm               |    0
 text/{maps => }/CeruleanMart.asm              |    0
 text/{maps => }/CeruleanPokecenter.asm        |    0
 text/{maps => }/CeruleanTradeHouse.asm        |    0
 text/{maps => }/CeruleanTrashedHouse.asm      |    0
 text/{maps => }/ChampionsRoom.asm             |    0
 text/{maps => }/CinnabarGym.asm               |    0
 text/{maps => }/CinnabarIsland.asm            |    0
 text/{maps => }/CinnabarLab.asm               |    0
 text/{maps => }/CinnabarLabFossilRoom.asm     |    0
 text/{maps => }/CinnabarLabMetronomeRoom.asm  |    0
 text/{maps => }/CinnabarLabTradeRoom.asm      |    0
 text/{maps => }/CinnabarMart.asm              |    0
 text/{maps => }/CinnabarPokecenter.asm        |    0
 text/{maps => }/CopycatsHouse1F.asm           |    0
 text/{maps => }/CopycatsHouse2F.asm           |    0
 text/{maps => }/Daycare.asm                   |    0
 text/{maps => }/Daycare_2.asm                 |    0
 text/{maps => }/DiglettsCaveRoute11.asm       |    0
 text/{maps => }/DiglettsCaveRoute2.asm        |    0
 text/{maps => }/FightingDojo.asm              |    0
 text/{maps => }/FuchsiaBillsGrandpasHouse.asm |    0
 text/{maps => }/FuchsiaCity.asm               |    0
 text/{maps => }/FuchsiaGoodRodHouse.asm       |    0
 text/{maps => }/FuchsiaGym.asm                |    0
 text/{maps => }/FuchsiaGym_2.asm              |    0
 text/{maps => }/FuchsiaMart.asm               |    0
 text/{maps => }/FuchsiaMeetingRoom.asm        |    0
 text/{maps => }/FuchsiaPokecenter.asm         |    0
 text/{maps => }/GameCorner.asm                |    0
 text/{maps => }/GameCornerPrizeRoom.asm       |    0
 text/{maps => }/HallOfFame.asm                |    0
 text/{maps => }/IndigoPlateauLobby.asm        |    0
 text/{maps => }/LancesRoom.asm                |    0
 text/{maps => }/LavenderCuboneHouse.asm       |    0
 text/{maps => }/LavenderMart.asm              |    0
 text/{maps => }/LavenderPokecenter.asm        |    0
 text/{maps => }/LavenderTown.asm              |    0
 text/{maps => }/LoreleisRoom.asm              |    0
 text/{maps => }/MrFujisHouse.asm              |    0
 text/{maps => }/MrPsychicsHouse.asm           |    0
 text/{maps => }/MtMoon1F.asm                  |    0
 text/{maps => }/MtMoonB1F.asm                 |    0
 text/{maps => }/MtMoonB2F.asm                 |    0
 text/{maps => }/MtMoonPokecenter.asm          |    0
 text/{maps => }/Museum1F.asm                  |    0
 text/{maps => }/Museum2F.asm                  |    0
 text/{maps => }/NameRatersHouse.asm           |    0
 text/{maps => }/OaksLab.asm                   |    0
 text/{maps => }/PalletTown.asm                |    0
 text/{maps => }/PewterCity.asm                |    0
 text/{maps => }/PewterGym.asm                 |    0
 text/{maps => }/PewterGym_2.asm               |    0
 text/{maps => }/PewterMart.asm                |    0
 text/{maps => }/PewterNidoranHouse.asm        |    0
 text/{maps => }/PewterPokecenter.asm          |    0
 text/{maps => }/PewterSpeechHouse.asm         |    0
 text/{maps => }/PokemonFanClub.asm            |    0
 text/{maps => }/PokemonMansion1F.asm          |    0
 text/{maps => }/PokemonMansion2F.asm          |    0
 text/{maps => }/PokemonMansion3F.asm          |    0
 text/{maps => }/PokemonMansionB1F.asm         |    0
 text/{maps => }/PokemonTower1F.asm            |    0
 text/{maps => }/PokemonTower2F.asm            |    0
 text/{maps => }/PokemonTower3F.asm            |    0
 text/{maps => }/PokemonTower4F.asm            |    0
 text/{maps => }/PokemonTower5F.asm            |    0
 text/{maps => }/PokemonTower6F.asm            |    0
 text/{maps => }/PokemonTower7F.asm            |    0
 text/{maps => }/PowerPlant.asm                |    0
 text/{maps => }/RedsHouse1F.asm               |    0
 text/{maps => }/RockTunnel1F.asm              |    0
 text/{maps => }/RockTunnelB1F.asm             |    0
 text/{maps => }/RockTunnelB1F_2.asm           |    0
 text/{maps => }/RockTunnelPokecenter.asm      |    0
 text/{maps => }/RocketHideoutB1F.asm          |    0
 text/{maps => }/RocketHideoutB2F.asm          |    0
 text/{maps => }/RocketHideoutB3F.asm          |    0
 text/{maps => }/RocketHideoutB4F.asm          |    0
 text/{maps => }/RocketHideoutElevator.asm     |    0
 text/{maps => }/Route1.asm                    |    0
 text/{maps => }/Route10.asm                   |    0
 text/{maps => }/Route11.asm                   |    0
 text/{maps => }/Route11Gate1F.asm             |    0
 text/{maps => }/Route11Gate2F.asm             |    0
 text/{maps => }/Route11_2.asm                 |    0
 text/{maps => }/Route12.asm                   |    0
 text/{maps => }/Route12Gate1F.asm             |    0
 text/{maps => }/Route12Gate2F.asm             |    0
 text/{maps => }/Route12SuperRodHouse.asm      |    0
 text/{maps => }/Route13.asm                   |    0
 text/{maps => }/Route14.asm                   |    0
 text/{maps => }/Route15.asm                   |    0
 text/{maps => }/Route15Gate1F.asm             |    0
 text/{maps => }/Route15Gate2F.asm             |    0
 text/{maps => }/Route16.asm                   |    0
 text/{maps => }/Route16FlyHouse.asm           |    0
 text/{maps => }/Route16Gate1F.asm             |    0
 text/{maps => }/Route16Gate2F.asm             |    0
 text/{maps => }/Route17.asm                   |    0
 text/{maps => }/Route18.asm                   |    0
 text/{maps => }/Route18Gate1F.asm             |    0
 text/{maps => }/Route18Gate2F.asm             |    0
 text/{maps => }/Route19.asm                   |    0
 text/{maps => }/Route2.asm                    |    0
 text/{maps => }/Route20.asm                   |    0
 text/{maps => }/Route21.asm                   |    0
 text/{maps => }/Route22.asm                   |    0
 text/{maps => }/Route22Gate.asm               |    0
 text/{maps => }/Route23.asm                   |    0
 text/{maps => }/Route24.asm                   |    0
 text/{maps => }/Route24_2.asm                 |    0
 text/{maps => }/Route25.asm                   |    0
 text/{maps => }/Route2Gate.asm                |    0
 text/{maps => }/Route2TradeHouse.asm          |    0
 text/{maps => }/Route3.asm                    |    0
 text/{maps => }/Route4.asm                    |    0
 text/{maps => }/Route5.asm                    |    0
 text/{maps => }/Route6.asm                    |    0
 text/{maps => }/Route7.asm                    |    0
 text/{maps => }/Route8.asm                    |    0
 text/{maps => }/Route9.asm                    |    0
 text/{maps => }/SSAnne1F.asm                  |    0
 text/{maps => }/SSAnne1FRooms.asm             |    0
 text/{maps => }/SSAnne2F.asm                  |    0
 text/{maps => }/SSAnne2FRooms.asm             |    0
 text/{maps => }/SSAnne3F.asm                  |    0
 text/{maps => }/SSAnneB1FRooms.asm            |    0
 text/{maps => }/SSAnneBow.asm                 |    0
 text/{maps => }/SSAnneCaptainsRoom.asm        |    0
 text/{maps => }/SSAnneKitchen.asm             |    0
 text/{maps => }/SafariZoneCenter.asm          |    0
 text/{maps => }/SafariZoneCenterRestHouse.asm |    0
 text/{maps => }/SafariZoneEast.asm            |    0
 text/{maps => }/SafariZoneEastRestHouse.asm   |    0
 text/{maps => }/SafariZoneGate.asm            |    0
 text/{maps => }/SafariZoneNorth.asm           |    0
 text/{maps => }/SafariZoneNorthRestHouse.asm  |    0
 text/{maps => }/SafariZoneSecretHouse.asm     |    0
 text/{maps => }/SafariZoneWest.asm            |    0
 text/{maps => }/SafariZoneWestRestHouse.asm   |    0
 text/{maps => }/SaffronCity.asm               |    0
 text/{maps => }/SaffronGates.asm              |    0
 text/{maps => }/SaffronGym.asm                |    0
 text/{maps => }/SaffronMart.asm               |    0
 text/{maps => }/SaffronPidgeyHouse.asm        |    0
 text/{maps => }/SaffronPokecenter.asm         |    0
 text/{maps => }/SeafoamIslandsB4F.asm         |    0
 text/{maps => }/SilphCo10F.asm                |    0
 text/{maps => }/SilphCo11F.asm                |    0
 text/{maps => }/SilphCo1F.asm                 |    0
 text/{maps => }/SilphCo2F.asm                 |    0
 text/{maps => }/SilphCo3F.asm                 |    0
 text/{maps => }/SilphCo4F.asm                 |    0
 text/{maps => }/SilphCo5F.asm                 |    0
 text/{maps => }/SilphCo5F_2.asm               |    0
 text/{maps => }/SilphCo6F.asm                 |    0
 text/{maps => }/SilphCo7F.asm                 |    0
 text/{maps => }/SilphCo8F.asm                 |    0
 text/{maps => }/SilphCo9F.asm                 |    0
 text/{maps => }/UndergroundPathRoute6.asm     |    0
 text/{maps => }/UndergroundPathRoute7.asm     |    0
 text/{maps => }/UndergroundPathRoute7Copy.asm |    0
 text/{maps => }/UndergroundPathRoute8.asm     |    0
 text/{maps => }/VermilionCity.asm             |    0
 text/{maps => }/VermilionDock.asm             |    0
 text/{maps => }/VermilionGym.asm              |    0
 text/{maps => }/VermilionGym_2.asm            |    0
 text/{maps => }/VermilionMart.asm             |    0
 text/{maps => }/VermilionOldRodHouse.asm      |    0
 text/{maps => }/VermilionPidgeyHouse.asm      |    0
 text/{maps => }/VermilionPokecenter.asm       |    0
 text/{maps => }/VictoryRoad1F.asm             |    0
 text/{maps => }/VictoryRoad2F.asm             |    0
 text/{maps => }/VictoryRoad3F.asm             |    0
 text/{maps => }/ViridianCity.asm              |    0
 text/{maps => }/ViridianForest.asm            |    0
 text/{maps => }/ViridianForestNorthGate.asm   |    0
 text/{maps => }/ViridianForestSouthGate.asm   |    0
 text/{maps => }/ViridianGym.asm               |    0
 text/{maps => }/ViridianMart.asm              |    0
 text/{maps => }/ViridianNicknameHouse.asm     |    0
 text/{maps => }/ViridianPokecenter.asm        |    0
 text/{maps => }/ViridianSchoolHouse.asm       |    0
 text/{maps => }/WardensHouse.asm              |    0
 text/oakspeech.asm                            |   55 -
 text/unused_names.asm                         |   20 -
 564 files changed, 3511 insertions(+), 3505 deletions(-)
 delete mode 100755 data/base_stats.asm
 rename {text => data/battle}/stat_names.asm (100%)
 rename data/{credit_mons.asm => credits/credits_mons.asm} (100%)
 rename data/{ => credits}/credits_order.asm (100%)
 rename {text => data/credits}/credits_text.asm (100%)
 rename data/{ => events}/hidden_coins.asm (100%)
 rename data/{ => events}/hidden_item_coords.asm (100%)
 rename data/{ => events}/hidden_objects.asm (100%)
 rename data/{ => events}/prize_mon_levels.asm (100%)
 rename data/{ => events}/prizes.asm (100%)
 rename data/{ => events}/slot_machine_wheels.asm (100%)
 rename data/{ => events}/trades.asm (100%)
 rename data/{mon_party_sprite_pointers.asm => icon_pointers.asm} (100%)
 rename data/{ => items}/guard_drink_items.asm (100%)
 rename data/{ => items}/key_items.asm (100%)
 rename data/{mart_inventories.asm => items/marts.asm} (100%)
 rename text/item_names.asm => data/items/names.asm (100%)
 rename data/{item_prices.asm => items/prices.asm} (100%)
 rename data/{ => items}/tm_prices.asm (100%)
 rename data/{overworld_items.asm => items/use_overworld.asm} (100%)
 rename data/{party_items.asm => items/use_party.asm} (100%)
 rename data/{ => items}/vending_prices.asm (100%)
 rename data/{wildPokemon/ceruleancave1.asm => mapWilds/CeruleanCave1F.asm} (100%)
 rename data/{wildPokemon/ceruleancave2.asm => mapWilds/CeruleanCave2F.asm} (100%)
 rename data/{wildPokemon/ceruleancaveb1.asm => mapWilds/CeruleanCaveB1F.asm} (100%)
 rename data/{wildPokemon/diglettscave.asm => mapWilds/DiglettsCave.asm} (100%)
 rename data/{wildPokemon/mtmoon1.asm => mapWilds/MtMoon1F.asm} (100%)
 rename data/{wildPokemon/mtmoonb1.asm => mapWilds/MtMoonB1F.asm} (100%)
 rename data/{wildPokemon/mtmoonb2.asm => mapWilds/MtMoonB2F.asm} (100%)
 rename data/{wildPokemon/mansion1.asm => mapWilds/PokemonMansion1F.asm} (100%)
 rename data/{wildPokemon/mansion2.asm => mapWilds/PokemonMansion2F.asm} (100%)
 rename data/{wildPokemon/mansion3.asm => mapWilds/PokemonMansion3F.asm} (100%)
 rename data/{wildPokemon/mansionb1.asm => mapWilds/PokemonMansionB1F.asm} (100%)
 rename data/{wildPokemon/pokemontower1.asm => mapWilds/PokemonTower1F.asm} (100%)
 rename data/{wildPokemon/pokemontower2.asm => mapWilds/PokemonTower2F.asm} (100%)
 rename data/{wildPokemon/pokemontower3.asm => mapWilds/PokemonTower3F.asm} (100%)
 rename data/{wildPokemon/pokemontower4.asm => mapWilds/PokemonTower4F.asm} (100%)
 rename data/{wildPokemon/pokemontower5.asm => mapWilds/PokemonTower5F.asm} (100%)
 rename data/{wildPokemon/pokemontower6.asm => mapWilds/PokemonTower6F.asm} (100%)
 rename data/{wildPokemon/pokemontower7.asm => mapWilds/PokemonTower7F.asm} (100%)
 rename data/{wildPokemon/powerplant.asm => mapWilds/PowerPlant.asm} (100%)
 rename data/{wildPokemon/rocktunnel1.asm => mapWilds/RockTunnel1F.asm} (100%)
 rename data/{wildPokemon/rocktunnel2.asm => mapWilds/RockTunnelB1F.asm} (100%)
 rename data/{wildPokemon/route1.asm => mapWilds/Route1.asm} (100%)
 rename data/{wildPokemon/route10.asm => mapWilds/Route10.asm} (100%)
 rename data/{wildPokemon/route11.asm => mapWilds/Route11.asm} (100%)
 rename data/{wildPokemon/route12.asm => mapWilds/Route12.asm} (100%)
 rename data/{wildPokemon/route13.asm => mapWilds/Route13.asm} (100%)
 rename data/{wildPokemon/route14.asm => mapWilds/Route14.asm} (100%)
 rename data/{wildPokemon/route15.asm => mapWilds/Route15.asm} (100%)
 rename data/{wildPokemon/route16.asm => mapWilds/Route16.asm} (100%)
 rename data/{wildPokemon/route17.asm => mapWilds/Route17.asm} (100%)
 rename data/{wildPokemon/route18.asm => mapWilds/Route18.asm} (100%)
 rename data/{wildPokemon/route2.asm => mapWilds/Route2.asm} (100%)
 rename data/{wildPokemon/route21.asm => mapWilds/Route21.asm} (100%)
 rename data/{wildPokemon/route22.asm => mapWilds/Route22.asm} (100%)
 rename data/{wildPokemon/route23.asm => mapWilds/Route23.asm} (100%)
 rename data/{wildPokemon/route24.asm => mapWilds/Route24.asm} (100%)
 rename data/{wildPokemon/route25.asm => mapWilds/Route25.asm} (100%)
 rename data/{wildPokemon/route3.asm => mapWilds/Route3.asm} (100%)
 rename data/{wildPokemon/route4.asm => mapWilds/Route4.asm} (100%)
 rename data/{wildPokemon/route5.asm => mapWilds/Route5.asm} (100%)
 rename data/{wildPokemon/route6.asm => mapWilds/Route6.asm} (100%)
 rename data/{wildPokemon/route7.asm => mapWilds/Route7.asm} (100%)
 rename data/{wildPokemon/route8.asm => mapWilds/Route8.asm} (100%)
 rename data/{wildPokemon/route9.asm => mapWilds/Route9.asm} (100%)
 rename data/{wildPokemon/safarizonecenter.asm => mapWilds/SafariZoneCenter.asm} (100%)
 rename data/{wildPokemon/safarizone1.asm => mapWilds/SafariZoneEast.asm} (100%)
 rename data/{wildPokemon/safarizone2.asm => mapWilds/SafariZoneNorth.asm} (100%)
 rename data/{wildPokemon/safarizone3.asm => mapWilds/SafariZoneWest.asm} (100%)
 rename data/{wildPokemon/waterpokemon.asm => mapWilds/SeaRoutes.asm} (100%)
 rename data/{wildPokemon/seafoamisland1.asm => mapWilds/SeafoamIslands1F.asm} (100%)
 rename data/{wildPokemon/seafoamislandb1.asm => mapWilds/SeafoamIslandsB1F.asm} (100%)
 rename data/{wildPokemon/seafoamislandb2.asm => mapWilds/SeafoamIslandsB2F.asm} (100%)
 rename data/{wildPokemon/seafoamislandb3.asm => mapWilds/SeafoamIslandsB3F.asm} (100%)
 rename data/{wildPokemon/seafoamislandb4.asm => mapWilds/SeafoamIslandsB4F.asm} (100%)
 rename data/{wildPokemon/victoryroad1.asm => mapWilds/VictoryRoad1F.asm} (100%)
 rename data/{wildPokemon/victoryroad2.asm => mapWilds/VictoryRoad2F.asm} (100%)
 rename data/{wildPokemon/victoryroad3.asm => mapWilds/VictoryRoad3F.asm} (100%)
 rename data/{wildPokemon/viridianforest.asm => mapWilds/ViridianForest.asm} (100%)
 rename data/{wildPokemon/nomons.asm => mapWilds/nothing.asm} (100%)
 rename data/{ => maps}/dungeon_maps.asm (100%)
 rename data/{ => maps}/force_bike_surf.asm (100%)
 rename data/{ => maps}/hide_show_data.asm (100%)
 rename data/{ => maps}/map_header_banks.asm (100%)
 rename data/{ => maps}/map_header_pointers.asm (100%)
 rename text/map_names.asm => data/maps/names.asm (100%)
 rename data/{ => maps}/rest_house_maps.asm (100%)
 rename data/{map_songs.asm => maps/songs.asm} (100%)
 rename data/{ => maps}/special_warps.asm (100%)
 rename data/{ => maps}/sprite_sets.asm (100%)
 rename data/{ => maps}/town_map_entries.asm (100%)
 rename data/{ => maps}/town_map_order.asm (100%)
 rename data/{move_animation_pointers.asm => moves/animation_special_effect_pointers.asm} (100%)
 rename data/{move_animation_special_effects.asm => moves/animation_special_effects.asm} (100%)
 rename data/{ => moves}/animations.asm (100%)
 rename data/{ => moves}/effects_pointers.asm (100%)
 rename data/{move_grammar.asm => moves/grammar.asm} (100%)
 rename data/{ => moves}/hm_moves.asm (100%)
 rename data/{ => moves}/moves.asm (100%)
 rename text/move_names.asm => data/moves/names.asm (100%)
 rename data/{move_sfx.asm => moves/sfx.asm} (100%)
 rename data/{tms.asm => moves/tmhm_moves.asm} (100%)
 rename {text => data}/player_names.asm (100%)
 rename {text => data}/player_names_list.asm (100%)
 create mode 100755 data/pokemon/base_stats.asm
 rename data/{baseStats => pokemon/base_stats}/abra.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/aerodactyl.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/alakazam.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/arbok.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/arcanine.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/articuno.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/beedrill.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/bellsprout.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/blastoise.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/bulbasaur.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/butterfree.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/caterpie.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/chansey.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/charizard.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/charmander.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/charmeleon.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/clefable.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/clefairy.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/cloyster.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/cubone.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/dewgong.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/diglett.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/ditto.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/dodrio.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/doduo.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/dragonair.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/dragonite.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/dratini.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/drowzee.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/dugtrio.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/eevee.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/ekans.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/electabuzz.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/electrode.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/exeggcute.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/exeggutor.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/farfetchd.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/fearow.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/flareon.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/gastly.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/gengar.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/geodude.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/gloom.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/golbat.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/goldeen.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/golduck.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/golem.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/graveler.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/grimer.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/growlithe.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/gyarados.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/haunter.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/hitmonchan.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/hitmonlee.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/horsea.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/hypno.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/ivysaur.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/jigglypuff.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/jolteon.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/jynx.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/kabuto.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/kabutops.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/kadabra.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/kakuna.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/kangaskhan.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/kingler.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/koffing.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/krabby.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/lapras.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/lickitung.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/machamp.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/machoke.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/machop.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/magikarp.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/magmar.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/magnemite.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/magneton.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/mankey.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/marowak.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/meowth.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/metapod.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/mew.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/mewtwo.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/moltres.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/mrmime.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/muk.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/nidoking.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/nidoqueen.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/nidoranf.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/nidoranm.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/nidorina.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/nidorino.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/ninetales.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/oddish.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/omanyte.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/omastar.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/onix.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/paras.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/parasect.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/persian.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/pidgeot.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/pidgeotto.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/pidgey.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/pikachu.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/pinsir.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/poliwag.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/poliwhirl.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/poliwrath.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/ponyta.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/porygon.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/primeape.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/psyduck.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/raichu.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/rapidash.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/raticate.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/rattata.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/rhydon.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/rhyhorn.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/sandshrew.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/sandslash.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/scyther.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/seadra.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/seaking.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/seel.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/shellder.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/slowbro.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/slowpoke.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/snorlax.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/spearow.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/squirtle.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/starmie.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/staryu.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/tangela.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/tauros.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/tentacool.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/tentacruel.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/vaporeon.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/venomoth.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/venonat.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/venusaur.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/victreebel.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/vileplume.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/voltorb.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/vulpix.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/wartortle.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/weedle.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/weepinbell.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/weezing.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/wigglytuff.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/zapdos.asm (100%)
 rename data/{baseStats => pokemon/base_stats}/zubat.asm (100%)
 rename data/{ => pokemon}/cries.asm (100%)
 rename data/{pokedex_entries.asm => pokemon/dex_entries.asm} (100%)
 rename data/{pokedex_order.asm => pokemon/dex_order.asm} (100%)
 rename text/pokedex.asm => data/pokemon/dex_text.asm (100%)
 rename data/{ => pokemon}/evos_moves.asm (100%)
 rename data/{mon_party_sprites.asm => pokemon/menu_icons.asm} (100%)
 rename text/monster_names.asm => data/pokemon/names.asm (100%)
 rename data/{mon_palettes.asm => pokemon/palettes.asm} (100%)
 rename data/{ => pokemon}/title_mons.asm (100%)
 rename data/{ => sgb}/sgb_border.asm (100%)
 rename data/{ => sgb}/sgb_packets.asm (100%)
 rename data/{super_palettes.asm => sgb/sgb_palettes.asm} (100%)
 rename data/{facing.asm => sprite_facings.asm} (100%)
 rename {text => data/text}/alphabets.asm (100%)
 rename {text => data/text}/dakutens.asm (100%)
 create mode 100644 data/text/text_1.asm
 create mode 100644 data/text/text_2.asm
 create mode 100644 data/text/text_3.asm
 create mode 100644 data/text/text_4.asm
 create mode 100644 data/text/text_5.asm
 create mode 100644 data/text/text_6.asm
 create mode 100644 data/text/text_7.asm
 create mode 100644 data/text/unused_names.asm
 rename data/{ => tilesets}/bike_riding_tilesets.asm (100%)
 rename data/{ => tilesets}/bookshelf_tile_ids.asm (100%)
 rename data/{ => tilesets}/collision_tile_ids.asm (100%)
 rename data/{ => tilesets}/cut_tree_blocks.asm (100%)
 rename data/{ => tilesets}/door_tile_ids.asm (100%)
 rename data/{ => tilesets}/dungeon_tilesets.asm (100%)
 rename data/{ => tilesets}/ledge_tiles.asm (100%)
 rename data/{ => tilesets}/tileset_headers.asm (100%)
 rename data/{ => tilesets}/warp_carpet_tile_ids.asm (100%)
 rename data/{ => tilesets}/warp_pad_hole_tile_ids.asm (100%)
 rename data/{ => tilesets}/warp_tile_ids.asm (100%)
 rename data/{ => tilesets}/water_tilesets.asm (100%)
 rename data/{trainer_ai_pointers.asm => trainers/ai_pointers.asm} (95%)
 rename data/{trainer_types.asm => trainers/encounter_types.asm} (100%)
 rename data/{trainer_move_choices.asm => trainers/move_choices.asm} (100%)
 rename text/trainer_name_pointers.asm => data/trainers/name_pointers.asm (100%)
 rename text/trainer_names.asm => data/trainers/names.asm (100%)
 rename data/{trainer_parties.asm => trainers/parties.asm} (100%)
 rename data/{trainer_pic_money_pointers.asm => trainers/pic_pointers_money.asm} (100%)
 rename data/{trainer_moves.asm => trainers/special_moves.asm} (100%)
 rename text/type_names.asm => data/types/names.asm (100%)
 rename data/{type_effects.asm => types/type_matchups.asm} (100%)
 rename data/{ => wild}/good_rod.asm (100%)
 rename data/{wild_mons.asm => wild/grass_water.asm} (61%)
 rename data/{wild_probabilities.asm => wild/probabilities.asm} (100%)
 rename data/{ => wild}/super_rod.asm (100%)
 rename engine/movie/{titlescreen.asm => title.asm} (99%)
 rename engine/movie/{titlescreen2.asm => title2.asm} (100%)
 rename text/{maps => }/AgathasRoom.asm (100%)
 rename text/{maps => }/BikeShop.asm (100%)
 rename text/{maps => }/BillsHouse.asm (100%)
 rename text/{maps => }/BluesHouse.asm (100%)
 rename text/{maps => }/BrunosRoom.asm (100%)
 rename text/{maps => }/CeladonChiefHouse.asm (100%)
 rename text/{maps => }/CeladonCity.asm (100%)
 rename text/{maps => }/CeladonDiner.asm (100%)
 rename text/{maps => }/CeladonGym.asm (100%)
 rename text/{maps => }/CeladonHotel.asm (100%)
 rename text/{maps => }/CeladonMansion1F.asm (100%)
 rename text/{maps => }/CeladonMansion2F.asm (100%)
 rename text/{maps => }/CeladonMansion3F.asm (100%)
 rename text/{maps => }/CeladonMansionRoof.asm (100%)
 rename text/{maps => }/CeladonMansionRoofHouse.asm (100%)
 rename text/{maps => }/CeladonMart1F.asm (100%)
 rename text/{maps => }/CeladonMart2F.asm (100%)
 rename text/{maps => }/CeladonMart3F.asm (100%)
 rename text/{maps => }/CeladonMart4F.asm (100%)
 rename text/{maps => }/CeladonMart5F.asm (100%)
 rename text/{maps => }/CeladonMartRoof.asm (100%)
 rename text/{maps => }/CeladonPokecenter.asm (100%)
 rename text/{maps => }/CeruleanBadgeHouse.asm (100%)
 rename text/{maps => }/CeruleanCaveB1F.asm (100%)
 rename text/{maps => }/CeruleanCity.asm (100%)
 rename text/{maps => }/CeruleanGym.asm (100%)
 rename text/{maps => }/CeruleanMart.asm (100%)
 rename text/{maps => }/CeruleanPokecenter.asm (100%)
 rename text/{maps => }/CeruleanTradeHouse.asm (100%)
 rename text/{maps => }/CeruleanTrashedHouse.asm (100%)
 rename text/{maps => }/ChampionsRoom.asm (100%)
 rename text/{maps => }/CinnabarGym.asm (100%)
 rename text/{maps => }/CinnabarIsland.asm (100%)
 rename text/{maps => }/CinnabarLab.asm (100%)
 rename text/{maps => }/CinnabarLabFossilRoom.asm (100%)
 rename text/{maps => }/CinnabarLabMetronomeRoom.asm (100%)
 rename text/{maps => }/CinnabarLabTradeRoom.asm (100%)
 rename text/{maps => }/CinnabarMart.asm (100%)
 rename text/{maps => }/CinnabarPokecenter.asm (100%)
 rename text/{maps => }/CopycatsHouse1F.asm (100%)
 rename text/{maps => }/CopycatsHouse2F.asm (100%)
 rename text/{maps => }/Daycare.asm (100%)
 rename text/{maps => }/Daycare_2.asm (100%)
 rename text/{maps => }/DiglettsCaveRoute11.asm (100%)
 rename text/{maps => }/DiglettsCaveRoute2.asm (100%)
 rename text/{maps => }/FightingDojo.asm (100%)
 rename text/{maps => }/FuchsiaBillsGrandpasHouse.asm (100%)
 rename text/{maps => }/FuchsiaCity.asm (100%)
 rename text/{maps => }/FuchsiaGoodRodHouse.asm (100%)
 rename text/{maps => }/FuchsiaGym.asm (100%)
 rename text/{maps => }/FuchsiaGym_2.asm (100%)
 rename text/{maps => }/FuchsiaMart.asm (100%)
 rename text/{maps => }/FuchsiaMeetingRoom.asm (100%)
 rename text/{maps => }/FuchsiaPokecenter.asm (100%)
 rename text/{maps => }/GameCorner.asm (100%)
 rename text/{maps => }/GameCornerPrizeRoom.asm (100%)
 rename text/{maps => }/HallOfFame.asm (100%)
 rename text/{maps => }/IndigoPlateauLobby.asm (100%)
 rename text/{maps => }/LancesRoom.asm (100%)
 rename text/{maps => }/LavenderCuboneHouse.asm (100%)
 rename text/{maps => }/LavenderMart.asm (100%)
 rename text/{maps => }/LavenderPokecenter.asm (100%)
 rename text/{maps => }/LavenderTown.asm (100%)
 rename text/{maps => }/LoreleisRoom.asm (100%)
 rename text/{maps => }/MrFujisHouse.asm (100%)
 rename text/{maps => }/MrPsychicsHouse.asm (100%)
 rename text/{maps => }/MtMoon1F.asm (100%)
 rename text/{maps => }/MtMoonB1F.asm (100%)
 rename text/{maps => }/MtMoonB2F.asm (100%)
 rename text/{maps => }/MtMoonPokecenter.asm (100%)
 rename text/{maps => }/Museum1F.asm (100%)
 rename text/{maps => }/Museum2F.asm (100%)
 rename text/{maps => }/NameRatersHouse.asm (100%)
 rename text/{maps => }/OaksLab.asm (100%)
 rename text/{maps => }/PalletTown.asm (100%)
 rename text/{maps => }/PewterCity.asm (100%)
 rename text/{maps => }/PewterGym.asm (100%)
 rename text/{maps => }/PewterGym_2.asm (100%)
 rename text/{maps => }/PewterMart.asm (100%)
 rename text/{maps => }/PewterNidoranHouse.asm (100%)
 rename text/{maps => }/PewterPokecenter.asm (100%)
 rename text/{maps => }/PewterSpeechHouse.asm (100%)
 rename text/{maps => }/PokemonFanClub.asm (100%)
 rename text/{maps => }/PokemonMansion1F.asm (100%)
 rename text/{maps => }/PokemonMansion2F.asm (100%)
 rename text/{maps => }/PokemonMansion3F.asm (100%)
 rename text/{maps => }/PokemonMansionB1F.asm (100%)
 rename text/{maps => }/PokemonTower1F.asm (100%)
 rename text/{maps => }/PokemonTower2F.asm (100%)
 rename text/{maps => }/PokemonTower3F.asm (100%)
 rename text/{maps => }/PokemonTower4F.asm (100%)
 rename text/{maps => }/PokemonTower5F.asm (100%)
 rename text/{maps => }/PokemonTower6F.asm (100%)
 rename text/{maps => }/PokemonTower7F.asm (100%)
 rename text/{maps => }/PowerPlant.asm (100%)
 rename text/{maps => }/RedsHouse1F.asm (100%)
 rename text/{maps => }/RockTunnel1F.asm (100%)
 rename text/{maps => }/RockTunnelB1F.asm (100%)
 rename text/{maps => }/RockTunnelB1F_2.asm (100%)
 rename text/{maps => }/RockTunnelPokecenter.asm (100%)
 rename text/{maps => }/RocketHideoutB1F.asm (100%)
 rename text/{maps => }/RocketHideoutB2F.asm (100%)
 rename text/{maps => }/RocketHideoutB3F.asm (100%)
 rename text/{maps => }/RocketHideoutB4F.asm (100%)
 rename text/{maps => }/RocketHideoutElevator.asm (100%)
 rename text/{maps => }/Route1.asm (100%)
 rename text/{maps => }/Route10.asm (100%)
 rename text/{maps => }/Route11.asm (100%)
 rename text/{maps => }/Route11Gate1F.asm (100%)
 rename text/{maps => }/Route11Gate2F.asm (100%)
 rename text/{maps => }/Route11_2.asm (100%)
 rename text/{maps => }/Route12.asm (100%)
 rename text/{maps => }/Route12Gate1F.asm (100%)
 rename text/{maps => }/Route12Gate2F.asm (100%)
 rename text/{maps => }/Route12SuperRodHouse.asm (100%)
 rename text/{maps => }/Route13.asm (100%)
 rename text/{maps => }/Route14.asm (100%)
 rename text/{maps => }/Route15.asm (100%)
 rename text/{maps => }/Route15Gate1F.asm (100%)
 rename text/{maps => }/Route15Gate2F.asm (100%)
 rename text/{maps => }/Route16.asm (100%)
 rename text/{maps => }/Route16FlyHouse.asm (100%)
 rename text/{maps => }/Route16Gate1F.asm (100%)
 rename text/{maps => }/Route16Gate2F.asm (100%)
 rename text/{maps => }/Route17.asm (100%)
 rename text/{maps => }/Route18.asm (100%)
 rename text/{maps => }/Route18Gate1F.asm (100%)
 rename text/{maps => }/Route18Gate2F.asm (100%)
 rename text/{maps => }/Route19.asm (100%)
 rename text/{maps => }/Route2.asm (100%)
 rename text/{maps => }/Route20.asm (100%)
 rename text/{maps => }/Route21.asm (100%)
 rename text/{maps => }/Route22.asm (100%)
 rename text/{maps => }/Route22Gate.asm (100%)
 rename text/{maps => }/Route23.asm (100%)
 rename text/{maps => }/Route24.asm (100%)
 rename text/{maps => }/Route24_2.asm (100%)
 rename text/{maps => }/Route25.asm (100%)
 rename text/{maps => }/Route2Gate.asm (100%)
 rename text/{maps => }/Route2TradeHouse.asm (100%)
 rename text/{maps => }/Route3.asm (100%)
 rename text/{maps => }/Route4.asm (100%)
 rename text/{maps => }/Route5.asm (100%)
 rename text/{maps => }/Route6.asm (100%)
 rename text/{maps => }/Route7.asm (100%)
 rename text/{maps => }/Route8.asm (100%)
 rename text/{maps => }/Route9.asm (100%)
 rename text/{maps => }/SSAnne1F.asm (100%)
 rename text/{maps => }/SSAnne1FRooms.asm (100%)
 rename text/{maps => }/SSAnne2F.asm (100%)
 rename text/{maps => }/SSAnne2FRooms.asm (100%)
 rename text/{maps => }/SSAnne3F.asm (100%)
 rename text/{maps => }/SSAnneB1FRooms.asm (100%)
 rename text/{maps => }/SSAnneBow.asm (100%)
 rename text/{maps => }/SSAnneCaptainsRoom.asm (100%)
 rename text/{maps => }/SSAnneKitchen.asm (100%)
 rename text/{maps => }/SafariZoneCenter.asm (100%)
 rename text/{maps => }/SafariZoneCenterRestHouse.asm (100%)
 rename text/{maps => }/SafariZoneEast.asm (100%)
 rename text/{maps => }/SafariZoneEastRestHouse.asm (100%)
 rename text/{maps => }/SafariZoneGate.asm (100%)
 rename text/{maps => }/SafariZoneNorth.asm (100%)
 rename text/{maps => }/SafariZoneNorthRestHouse.asm (100%)
 rename text/{maps => }/SafariZoneSecretHouse.asm (100%)
 rename text/{maps => }/SafariZoneWest.asm (100%)
 rename text/{maps => }/SafariZoneWestRestHouse.asm (100%)
 rename text/{maps => }/SaffronCity.asm (100%)
 rename text/{maps => }/SaffronGates.asm (100%)
 rename text/{maps => }/SaffronGym.asm (100%)
 rename text/{maps => }/SaffronMart.asm (100%)
 rename text/{maps => }/SaffronPidgeyHouse.asm (100%)
 rename text/{maps => }/SaffronPokecenter.asm (100%)
 rename text/{maps => }/SeafoamIslandsB4F.asm (100%)
 rename text/{maps => }/SilphCo10F.asm (100%)
 rename text/{maps => }/SilphCo11F.asm (100%)
 rename text/{maps => }/SilphCo1F.asm (100%)
 rename text/{maps => }/SilphCo2F.asm (100%)
 rename text/{maps => }/SilphCo3F.asm (100%)
 rename text/{maps => }/SilphCo4F.asm (100%)
 rename text/{maps => }/SilphCo5F.asm (100%)
 rename text/{maps => }/SilphCo5F_2.asm (100%)
 rename text/{maps => }/SilphCo6F.asm (100%)
 rename text/{maps => }/SilphCo7F.asm (100%)
 rename text/{maps => }/SilphCo8F.asm (100%)
 rename text/{maps => }/SilphCo9F.asm (100%)
 rename text/{maps => }/UndergroundPathRoute6.asm (100%)
 rename text/{maps => }/UndergroundPathRoute7.asm (100%)
 rename text/{maps => }/UndergroundPathRoute7Copy.asm (100%)
 rename text/{maps => }/UndergroundPathRoute8.asm (100%)
 rename text/{maps => }/VermilionCity.asm (100%)
 rename text/{maps => }/VermilionDock.asm (100%)
 rename text/{maps => }/VermilionGym.asm (100%)
 rename text/{maps => }/VermilionGym_2.asm (100%)
 rename text/{maps => }/VermilionMart.asm (100%)
 rename text/{maps => }/VermilionOldRodHouse.asm (100%)
 rename text/{maps => }/VermilionPidgeyHouse.asm (100%)
 rename text/{maps => }/VermilionPokecenter.asm (100%)
 rename text/{maps => }/VictoryRoad1F.asm (100%)
 rename text/{maps => }/VictoryRoad2F.asm (100%)
 rename text/{maps => }/VictoryRoad3F.asm (100%)
 rename text/{maps => }/ViridianCity.asm (100%)
 rename text/{maps => }/ViridianForest.asm (100%)
 rename text/{maps => }/ViridianForestNorthGate.asm (100%)
 rename text/{maps => }/ViridianForestSouthGate.asm (100%)
 rename text/{maps => }/ViridianGym.asm (100%)
 rename text/{maps => }/ViridianMart.asm (100%)
 rename text/{maps => }/ViridianNicknameHouse.asm (100%)
 rename text/{maps => }/ViridianPokecenter.asm (100%)
 rename text/{maps => }/ViridianSchoolHouse.asm (100%)
 rename text/{maps => }/WardensHouse.asm (100%)
 delete mode 100644 text/oakspeech.asm
 delete mode 100644 text/unused_names.asm

diff --git a/constants/evolution_constants.asm b/constants/evolution_constants.asm
index 86c466d8..01c4c078 100755
--- a/constants/evolution_constants.asm
+++ b/constants/evolution_constants.asm
@@ -1,4 +1,4 @@
-; See data/evos_moves.asm
+; See data/pokemon/evos_moves.asm
 
 ; Evolution types
 EV_LEVEL EQU 1
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/text/stat_names.asm b/data/battle/stat_names.asm
similarity index 100%
rename from text/stat_names.asm
rename to data/battle/stat_names.asm
diff --git a/data/credit_mons.asm b/data/credits/credits_mons.asm
similarity index 100%
rename from data/credit_mons.asm
rename to data/credits/credits_mons.asm
diff --git a/data/credits_order.asm b/data/credits/credits_order.asm
similarity index 100%
rename from data/credits_order.asm
rename to data/credits/credits_order.asm
diff --git a/text/credits_text.asm b/data/credits/credits_text.asm
similarity index 100%
rename from text/credits_text.asm
rename to data/credits/credits_text.asm
diff --git a/data/hidden_coins.asm b/data/events/hidden_coins.asm
similarity index 100%
rename from data/hidden_coins.asm
rename to data/events/hidden_coins.asm
diff --git a/data/hidden_item_coords.asm b/data/events/hidden_item_coords.asm
similarity index 100%
rename from data/hidden_item_coords.asm
rename to data/events/hidden_item_coords.asm
diff --git a/data/hidden_objects.asm b/data/events/hidden_objects.asm
similarity index 100%
rename from data/hidden_objects.asm
rename to data/events/hidden_objects.asm
diff --git a/data/prize_mon_levels.asm b/data/events/prize_mon_levels.asm
similarity index 100%
rename from data/prize_mon_levels.asm
rename to data/events/prize_mon_levels.asm
diff --git a/data/prizes.asm b/data/events/prizes.asm
similarity index 100%
rename from data/prizes.asm
rename to data/events/prizes.asm
diff --git a/data/slot_machine_wheels.asm b/data/events/slot_machine_wheels.asm
similarity index 100%
rename from data/slot_machine_wheels.asm
rename to data/events/slot_machine_wheels.asm
diff --git a/data/trades.asm b/data/events/trades.asm
similarity index 100%
rename from data/trades.asm
rename to data/events/trades.asm
diff --git a/data/mon_party_sprite_pointers.asm b/data/icon_pointers.asm
similarity index 100%
rename from data/mon_party_sprite_pointers.asm
rename to data/icon_pointers.asm
diff --git a/data/guard_drink_items.asm b/data/items/guard_drink_items.asm
similarity index 100%
rename from data/guard_drink_items.asm
rename to data/items/guard_drink_items.asm
diff --git a/data/key_items.asm b/data/items/key_items.asm
similarity index 100%
rename from data/key_items.asm
rename to data/items/key_items.asm
diff --git a/data/mart_inventories.asm b/data/items/marts.asm
similarity index 100%
rename from data/mart_inventories.asm
rename to data/items/marts.asm
diff --git a/text/item_names.asm b/data/items/names.asm
similarity index 100%
rename from text/item_names.asm
rename to data/items/names.asm
diff --git a/data/item_prices.asm b/data/items/prices.asm
similarity index 100%
rename from data/item_prices.asm
rename to data/items/prices.asm
diff --git a/data/tm_prices.asm b/data/items/tm_prices.asm
similarity index 100%
rename from data/tm_prices.asm
rename to data/items/tm_prices.asm
diff --git a/data/overworld_items.asm b/data/items/use_overworld.asm
similarity index 100%
rename from data/overworld_items.asm
rename to data/items/use_overworld.asm
diff --git a/data/party_items.asm b/data/items/use_party.asm
similarity index 100%
rename from data/party_items.asm
rename to data/items/use_party.asm
diff --git a/data/vending_prices.asm b/data/items/vending_prices.asm
similarity index 100%
rename from data/vending_prices.asm
rename to data/items/vending_prices.asm
diff --git a/data/wildPokemon/ceruleancave1.asm b/data/mapWilds/CeruleanCave1F.asm
similarity index 100%
rename from data/wildPokemon/ceruleancave1.asm
rename to data/mapWilds/CeruleanCave1F.asm
diff --git a/data/wildPokemon/ceruleancave2.asm b/data/mapWilds/CeruleanCave2F.asm
similarity index 100%
rename from data/wildPokemon/ceruleancave2.asm
rename to data/mapWilds/CeruleanCave2F.asm
diff --git a/data/wildPokemon/ceruleancaveb1.asm b/data/mapWilds/CeruleanCaveB1F.asm
similarity index 100%
rename from data/wildPokemon/ceruleancaveb1.asm
rename to data/mapWilds/CeruleanCaveB1F.asm
diff --git a/data/wildPokemon/diglettscave.asm b/data/mapWilds/DiglettsCave.asm
similarity index 100%
rename from data/wildPokemon/diglettscave.asm
rename to data/mapWilds/DiglettsCave.asm
diff --git a/data/wildPokemon/mtmoon1.asm b/data/mapWilds/MtMoon1F.asm
similarity index 100%
rename from data/wildPokemon/mtmoon1.asm
rename to data/mapWilds/MtMoon1F.asm
diff --git a/data/wildPokemon/mtmoonb1.asm b/data/mapWilds/MtMoonB1F.asm
similarity index 100%
rename from data/wildPokemon/mtmoonb1.asm
rename to data/mapWilds/MtMoonB1F.asm
diff --git a/data/wildPokemon/mtmoonb2.asm b/data/mapWilds/MtMoonB2F.asm
similarity index 100%
rename from data/wildPokemon/mtmoonb2.asm
rename to data/mapWilds/MtMoonB2F.asm
diff --git a/data/wildPokemon/mansion1.asm b/data/mapWilds/PokemonMansion1F.asm
similarity index 100%
rename from data/wildPokemon/mansion1.asm
rename to data/mapWilds/PokemonMansion1F.asm
diff --git a/data/wildPokemon/mansion2.asm b/data/mapWilds/PokemonMansion2F.asm
similarity index 100%
rename from data/wildPokemon/mansion2.asm
rename to data/mapWilds/PokemonMansion2F.asm
diff --git a/data/wildPokemon/mansion3.asm b/data/mapWilds/PokemonMansion3F.asm
similarity index 100%
rename from data/wildPokemon/mansion3.asm
rename to data/mapWilds/PokemonMansion3F.asm
diff --git a/data/wildPokemon/mansionb1.asm b/data/mapWilds/PokemonMansionB1F.asm
similarity index 100%
rename from data/wildPokemon/mansionb1.asm
rename to data/mapWilds/PokemonMansionB1F.asm
diff --git a/data/wildPokemon/pokemontower1.asm b/data/mapWilds/PokemonTower1F.asm
similarity index 100%
rename from data/wildPokemon/pokemontower1.asm
rename to data/mapWilds/PokemonTower1F.asm
diff --git a/data/wildPokemon/pokemontower2.asm b/data/mapWilds/PokemonTower2F.asm
similarity index 100%
rename from data/wildPokemon/pokemontower2.asm
rename to data/mapWilds/PokemonTower2F.asm
diff --git a/data/wildPokemon/pokemontower3.asm b/data/mapWilds/PokemonTower3F.asm
similarity index 100%
rename from data/wildPokemon/pokemontower3.asm
rename to data/mapWilds/PokemonTower3F.asm
diff --git a/data/wildPokemon/pokemontower4.asm b/data/mapWilds/PokemonTower4F.asm
similarity index 100%
rename from data/wildPokemon/pokemontower4.asm
rename to data/mapWilds/PokemonTower4F.asm
diff --git a/data/wildPokemon/pokemontower5.asm b/data/mapWilds/PokemonTower5F.asm
similarity index 100%
rename from data/wildPokemon/pokemontower5.asm
rename to data/mapWilds/PokemonTower5F.asm
diff --git a/data/wildPokemon/pokemontower6.asm b/data/mapWilds/PokemonTower6F.asm
similarity index 100%
rename from data/wildPokemon/pokemontower6.asm
rename to data/mapWilds/PokemonTower6F.asm
diff --git a/data/wildPokemon/pokemontower7.asm b/data/mapWilds/PokemonTower7F.asm
similarity index 100%
rename from data/wildPokemon/pokemontower7.asm
rename to data/mapWilds/PokemonTower7F.asm
diff --git a/data/wildPokemon/powerplant.asm b/data/mapWilds/PowerPlant.asm
similarity index 100%
rename from data/wildPokemon/powerplant.asm
rename to data/mapWilds/PowerPlant.asm
diff --git a/data/wildPokemon/rocktunnel1.asm b/data/mapWilds/RockTunnel1F.asm
similarity index 100%
rename from data/wildPokemon/rocktunnel1.asm
rename to data/mapWilds/RockTunnel1F.asm
diff --git a/data/wildPokemon/rocktunnel2.asm b/data/mapWilds/RockTunnelB1F.asm
similarity index 100%
rename from data/wildPokemon/rocktunnel2.asm
rename to data/mapWilds/RockTunnelB1F.asm
diff --git a/data/wildPokemon/route1.asm b/data/mapWilds/Route1.asm
similarity index 100%
rename from data/wildPokemon/route1.asm
rename to data/mapWilds/Route1.asm
diff --git a/data/wildPokemon/route10.asm b/data/mapWilds/Route10.asm
similarity index 100%
rename from data/wildPokemon/route10.asm
rename to data/mapWilds/Route10.asm
diff --git a/data/wildPokemon/route11.asm b/data/mapWilds/Route11.asm
similarity index 100%
rename from data/wildPokemon/route11.asm
rename to data/mapWilds/Route11.asm
diff --git a/data/wildPokemon/route12.asm b/data/mapWilds/Route12.asm
similarity index 100%
rename from data/wildPokemon/route12.asm
rename to data/mapWilds/Route12.asm
diff --git a/data/wildPokemon/route13.asm b/data/mapWilds/Route13.asm
similarity index 100%
rename from data/wildPokemon/route13.asm
rename to data/mapWilds/Route13.asm
diff --git a/data/wildPokemon/route14.asm b/data/mapWilds/Route14.asm
similarity index 100%
rename from data/wildPokemon/route14.asm
rename to data/mapWilds/Route14.asm
diff --git a/data/wildPokemon/route15.asm b/data/mapWilds/Route15.asm
similarity index 100%
rename from data/wildPokemon/route15.asm
rename to data/mapWilds/Route15.asm
diff --git a/data/wildPokemon/route16.asm b/data/mapWilds/Route16.asm
similarity index 100%
rename from data/wildPokemon/route16.asm
rename to data/mapWilds/Route16.asm
diff --git a/data/wildPokemon/route17.asm b/data/mapWilds/Route17.asm
similarity index 100%
rename from data/wildPokemon/route17.asm
rename to data/mapWilds/Route17.asm
diff --git a/data/wildPokemon/route18.asm b/data/mapWilds/Route18.asm
similarity index 100%
rename from data/wildPokemon/route18.asm
rename to data/mapWilds/Route18.asm
diff --git a/data/wildPokemon/route2.asm b/data/mapWilds/Route2.asm
similarity index 100%
rename from data/wildPokemon/route2.asm
rename to data/mapWilds/Route2.asm
diff --git a/data/wildPokemon/route21.asm b/data/mapWilds/Route21.asm
similarity index 100%
rename from data/wildPokemon/route21.asm
rename to data/mapWilds/Route21.asm
diff --git a/data/wildPokemon/route22.asm b/data/mapWilds/Route22.asm
similarity index 100%
rename from data/wildPokemon/route22.asm
rename to data/mapWilds/Route22.asm
diff --git a/data/wildPokemon/route23.asm b/data/mapWilds/Route23.asm
similarity index 100%
rename from data/wildPokemon/route23.asm
rename to data/mapWilds/Route23.asm
diff --git a/data/wildPokemon/route24.asm b/data/mapWilds/Route24.asm
similarity index 100%
rename from data/wildPokemon/route24.asm
rename to data/mapWilds/Route24.asm
diff --git a/data/wildPokemon/route25.asm b/data/mapWilds/Route25.asm
similarity index 100%
rename from data/wildPokemon/route25.asm
rename to data/mapWilds/Route25.asm
diff --git a/data/wildPokemon/route3.asm b/data/mapWilds/Route3.asm
similarity index 100%
rename from data/wildPokemon/route3.asm
rename to data/mapWilds/Route3.asm
diff --git a/data/wildPokemon/route4.asm b/data/mapWilds/Route4.asm
similarity index 100%
rename from data/wildPokemon/route4.asm
rename to data/mapWilds/Route4.asm
diff --git a/data/wildPokemon/route5.asm b/data/mapWilds/Route5.asm
similarity index 100%
rename from data/wildPokemon/route5.asm
rename to data/mapWilds/Route5.asm
diff --git a/data/wildPokemon/route6.asm b/data/mapWilds/Route6.asm
similarity index 100%
rename from data/wildPokemon/route6.asm
rename to data/mapWilds/Route6.asm
diff --git a/data/wildPokemon/route7.asm b/data/mapWilds/Route7.asm
similarity index 100%
rename from data/wildPokemon/route7.asm
rename to data/mapWilds/Route7.asm
diff --git a/data/wildPokemon/route8.asm b/data/mapWilds/Route8.asm
similarity index 100%
rename from data/wildPokemon/route8.asm
rename to data/mapWilds/Route8.asm
diff --git a/data/wildPokemon/route9.asm b/data/mapWilds/Route9.asm
similarity index 100%
rename from data/wildPokemon/route9.asm
rename to data/mapWilds/Route9.asm
diff --git a/data/wildPokemon/safarizonecenter.asm b/data/mapWilds/SafariZoneCenter.asm
similarity index 100%
rename from data/wildPokemon/safarizonecenter.asm
rename to data/mapWilds/SafariZoneCenter.asm
diff --git a/data/wildPokemon/safarizone1.asm b/data/mapWilds/SafariZoneEast.asm
similarity index 100%
rename from data/wildPokemon/safarizone1.asm
rename to data/mapWilds/SafariZoneEast.asm
diff --git a/data/wildPokemon/safarizone2.asm b/data/mapWilds/SafariZoneNorth.asm
similarity index 100%
rename from data/wildPokemon/safarizone2.asm
rename to data/mapWilds/SafariZoneNorth.asm
diff --git a/data/wildPokemon/safarizone3.asm b/data/mapWilds/SafariZoneWest.asm
similarity index 100%
rename from data/wildPokemon/safarizone3.asm
rename to data/mapWilds/SafariZoneWest.asm
diff --git a/data/wildPokemon/waterpokemon.asm b/data/mapWilds/SeaRoutes.asm
similarity index 100%
rename from data/wildPokemon/waterpokemon.asm
rename to data/mapWilds/SeaRoutes.asm
diff --git a/data/wildPokemon/seafoamisland1.asm b/data/mapWilds/SeafoamIslands1F.asm
similarity index 100%
rename from data/wildPokemon/seafoamisland1.asm
rename to data/mapWilds/SeafoamIslands1F.asm
diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/mapWilds/SeafoamIslandsB1F.asm
similarity index 100%
rename from data/wildPokemon/seafoamislandb1.asm
rename to data/mapWilds/SeafoamIslandsB1F.asm
diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/mapWilds/SeafoamIslandsB2F.asm
similarity index 100%
rename from data/wildPokemon/seafoamislandb2.asm
rename to data/mapWilds/SeafoamIslandsB2F.asm
diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/mapWilds/SeafoamIslandsB3F.asm
similarity index 100%
rename from data/wildPokemon/seafoamislandb3.asm
rename to data/mapWilds/SeafoamIslandsB3F.asm
diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/mapWilds/SeafoamIslandsB4F.asm
similarity index 100%
rename from data/wildPokemon/seafoamislandb4.asm
rename to data/mapWilds/SeafoamIslandsB4F.asm
diff --git a/data/wildPokemon/victoryroad1.asm b/data/mapWilds/VictoryRoad1F.asm
similarity index 100%
rename from data/wildPokemon/victoryroad1.asm
rename to data/mapWilds/VictoryRoad1F.asm
diff --git a/data/wildPokemon/victoryroad2.asm b/data/mapWilds/VictoryRoad2F.asm
similarity index 100%
rename from data/wildPokemon/victoryroad2.asm
rename to data/mapWilds/VictoryRoad2F.asm
diff --git a/data/wildPokemon/victoryroad3.asm b/data/mapWilds/VictoryRoad3F.asm
similarity index 100%
rename from data/wildPokemon/victoryroad3.asm
rename to data/mapWilds/VictoryRoad3F.asm
diff --git a/data/wildPokemon/viridianforest.asm b/data/mapWilds/ViridianForest.asm
similarity index 100%
rename from data/wildPokemon/viridianforest.asm
rename to data/mapWilds/ViridianForest.asm
diff --git a/data/wildPokemon/nomons.asm b/data/mapWilds/nothing.asm
similarity index 100%
rename from data/wildPokemon/nomons.asm
rename to data/mapWilds/nothing.asm
diff --git a/data/dungeon_maps.asm b/data/maps/dungeon_maps.asm
similarity index 100%
rename from data/dungeon_maps.asm
rename to data/maps/dungeon_maps.asm
diff --git a/data/force_bike_surf.asm b/data/maps/force_bike_surf.asm
similarity index 100%
rename from data/force_bike_surf.asm
rename to data/maps/force_bike_surf.asm
diff --git a/data/hide_show_data.asm b/data/maps/hide_show_data.asm
similarity index 100%
rename from data/hide_show_data.asm
rename to data/maps/hide_show_data.asm
diff --git a/data/map_header_banks.asm b/data/maps/map_header_banks.asm
similarity index 100%
rename from data/map_header_banks.asm
rename to data/maps/map_header_banks.asm
diff --git a/data/map_header_pointers.asm b/data/maps/map_header_pointers.asm
similarity index 100%
rename from data/map_header_pointers.asm
rename to data/maps/map_header_pointers.asm
diff --git a/text/map_names.asm b/data/maps/names.asm
similarity index 100%
rename from text/map_names.asm
rename to data/maps/names.asm
diff --git a/data/rest_house_maps.asm b/data/maps/rest_house_maps.asm
similarity index 100%
rename from data/rest_house_maps.asm
rename to data/maps/rest_house_maps.asm
diff --git a/data/map_songs.asm b/data/maps/songs.asm
similarity index 100%
rename from data/map_songs.asm
rename to data/maps/songs.asm
diff --git a/data/special_warps.asm b/data/maps/special_warps.asm
similarity index 100%
rename from data/special_warps.asm
rename to data/maps/special_warps.asm
diff --git a/data/sprite_sets.asm b/data/maps/sprite_sets.asm
similarity index 100%
rename from data/sprite_sets.asm
rename to data/maps/sprite_sets.asm
diff --git a/data/town_map_entries.asm b/data/maps/town_map_entries.asm
similarity index 100%
rename from data/town_map_entries.asm
rename to data/maps/town_map_entries.asm
diff --git a/data/town_map_order.asm b/data/maps/town_map_order.asm
similarity index 100%
rename from data/town_map_order.asm
rename to data/maps/town_map_order.asm
diff --git a/data/move_animation_pointers.asm b/data/moves/animation_special_effect_pointers.asm
similarity index 100%
rename from data/move_animation_pointers.asm
rename to data/moves/animation_special_effect_pointers.asm
diff --git a/data/move_animation_special_effects.asm b/data/moves/animation_special_effects.asm
similarity index 100%
rename from data/move_animation_special_effects.asm
rename to data/moves/animation_special_effects.asm
diff --git a/data/animations.asm b/data/moves/animations.asm
similarity index 100%
rename from data/animations.asm
rename to data/moves/animations.asm
diff --git a/data/effects_pointers.asm b/data/moves/effects_pointers.asm
similarity index 100%
rename from data/effects_pointers.asm
rename to data/moves/effects_pointers.asm
diff --git a/data/move_grammar.asm b/data/moves/grammar.asm
similarity index 100%
rename from data/move_grammar.asm
rename to data/moves/grammar.asm
diff --git a/data/hm_moves.asm b/data/moves/hm_moves.asm
similarity index 100%
rename from data/hm_moves.asm
rename to data/moves/hm_moves.asm
diff --git a/data/moves.asm b/data/moves/moves.asm
similarity index 100%
rename from data/moves.asm
rename to data/moves/moves.asm
diff --git a/text/move_names.asm b/data/moves/names.asm
similarity index 100%
rename from text/move_names.asm
rename to data/moves/names.asm
diff --git a/data/move_sfx.asm b/data/moves/sfx.asm
similarity index 100%
rename from data/move_sfx.asm
rename to data/moves/sfx.asm
diff --git a/data/tms.asm b/data/moves/tmhm_moves.asm
similarity index 100%
rename from data/tms.asm
rename to data/moves/tmhm_moves.asm
diff --git a/text/player_names.asm b/data/player_names.asm
similarity index 100%
rename from text/player_names.asm
rename to data/player_names.asm
diff --git a/text/player_names_list.asm b/data/player_names_list.asm
similarity index 100%
rename from text/player_names_list.asm
rename to data/player_names_list.asm
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
similarity index 100%
rename from data/baseStats/abra.asm
rename to data/pokemon/base_stats/abra.asm
diff --git a/data/baseStats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm
similarity index 100%
rename from data/baseStats/aerodactyl.asm
rename to data/pokemon/base_stats/aerodactyl.asm
diff --git a/data/baseStats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm
similarity index 100%
rename from data/baseStats/alakazam.asm
rename to data/pokemon/base_stats/alakazam.asm
diff --git a/data/baseStats/arbok.asm b/data/pokemon/base_stats/arbok.asm
similarity index 100%
rename from data/baseStats/arbok.asm
rename to data/pokemon/base_stats/arbok.asm
diff --git a/data/baseStats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm
similarity index 100%
rename from data/baseStats/arcanine.asm
rename to data/pokemon/base_stats/arcanine.asm
diff --git a/data/baseStats/articuno.asm b/data/pokemon/base_stats/articuno.asm
similarity index 100%
rename from data/baseStats/articuno.asm
rename to data/pokemon/base_stats/articuno.asm
diff --git a/data/baseStats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm
similarity index 100%
rename from data/baseStats/beedrill.asm
rename to data/pokemon/base_stats/beedrill.asm
diff --git a/data/baseStats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm
similarity index 100%
rename from data/baseStats/bellsprout.asm
rename to data/pokemon/base_stats/bellsprout.asm
diff --git a/data/baseStats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm
similarity index 100%
rename from data/baseStats/blastoise.asm
rename to data/pokemon/base_stats/blastoise.asm
diff --git a/data/baseStats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm
similarity index 100%
rename from data/baseStats/bulbasaur.asm
rename to data/pokemon/base_stats/bulbasaur.asm
diff --git a/data/baseStats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm
similarity index 100%
rename from data/baseStats/butterfree.asm
rename to data/pokemon/base_stats/butterfree.asm
diff --git a/data/baseStats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm
similarity index 100%
rename from data/baseStats/caterpie.asm
rename to data/pokemon/base_stats/caterpie.asm
diff --git a/data/baseStats/chansey.asm b/data/pokemon/base_stats/chansey.asm
similarity index 100%
rename from data/baseStats/chansey.asm
rename to data/pokemon/base_stats/chansey.asm
diff --git a/data/baseStats/charizard.asm b/data/pokemon/base_stats/charizard.asm
similarity index 100%
rename from data/baseStats/charizard.asm
rename to data/pokemon/base_stats/charizard.asm
diff --git a/data/baseStats/charmander.asm b/data/pokemon/base_stats/charmander.asm
similarity index 100%
rename from data/baseStats/charmander.asm
rename to data/pokemon/base_stats/charmander.asm
diff --git a/data/baseStats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm
similarity index 100%
rename from data/baseStats/charmeleon.asm
rename to data/pokemon/base_stats/charmeleon.asm
diff --git a/data/baseStats/clefable.asm b/data/pokemon/base_stats/clefable.asm
similarity index 100%
rename from data/baseStats/clefable.asm
rename to data/pokemon/base_stats/clefable.asm
diff --git a/data/baseStats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm
similarity index 100%
rename from data/baseStats/clefairy.asm
rename to data/pokemon/base_stats/clefairy.asm
diff --git a/data/baseStats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm
similarity index 100%
rename from data/baseStats/cloyster.asm
rename to data/pokemon/base_stats/cloyster.asm
diff --git a/data/baseStats/cubone.asm b/data/pokemon/base_stats/cubone.asm
similarity index 100%
rename from data/baseStats/cubone.asm
rename to data/pokemon/base_stats/cubone.asm
diff --git a/data/baseStats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm
similarity index 100%
rename from data/baseStats/dewgong.asm
rename to data/pokemon/base_stats/dewgong.asm
diff --git a/data/baseStats/diglett.asm b/data/pokemon/base_stats/diglett.asm
similarity index 100%
rename from data/baseStats/diglett.asm
rename to data/pokemon/base_stats/diglett.asm
diff --git a/data/baseStats/ditto.asm b/data/pokemon/base_stats/ditto.asm
similarity index 100%
rename from data/baseStats/ditto.asm
rename to data/pokemon/base_stats/ditto.asm
diff --git a/data/baseStats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm
similarity index 100%
rename from data/baseStats/dodrio.asm
rename to data/pokemon/base_stats/dodrio.asm
diff --git a/data/baseStats/doduo.asm b/data/pokemon/base_stats/doduo.asm
similarity index 100%
rename from data/baseStats/doduo.asm
rename to data/pokemon/base_stats/doduo.asm
diff --git a/data/baseStats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm
similarity index 100%
rename from data/baseStats/dragonair.asm
rename to data/pokemon/base_stats/dragonair.asm
diff --git a/data/baseStats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm
similarity index 100%
rename from data/baseStats/dragonite.asm
rename to data/pokemon/base_stats/dragonite.asm
diff --git a/data/baseStats/dratini.asm b/data/pokemon/base_stats/dratini.asm
similarity index 100%
rename from data/baseStats/dratini.asm
rename to data/pokemon/base_stats/dratini.asm
diff --git a/data/baseStats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm
similarity index 100%
rename from data/baseStats/drowzee.asm
rename to data/pokemon/base_stats/drowzee.asm
diff --git a/data/baseStats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm
similarity index 100%
rename from data/baseStats/dugtrio.asm
rename to data/pokemon/base_stats/dugtrio.asm
diff --git a/data/baseStats/eevee.asm b/data/pokemon/base_stats/eevee.asm
similarity index 100%
rename from data/baseStats/eevee.asm
rename to data/pokemon/base_stats/eevee.asm
diff --git a/data/baseStats/ekans.asm b/data/pokemon/base_stats/ekans.asm
similarity index 100%
rename from data/baseStats/ekans.asm
rename to data/pokemon/base_stats/ekans.asm
diff --git a/data/baseStats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm
similarity index 100%
rename from data/baseStats/electabuzz.asm
rename to data/pokemon/base_stats/electabuzz.asm
diff --git a/data/baseStats/electrode.asm b/data/pokemon/base_stats/electrode.asm
similarity index 100%
rename from data/baseStats/electrode.asm
rename to data/pokemon/base_stats/electrode.asm
diff --git a/data/baseStats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm
similarity index 100%
rename from data/baseStats/exeggcute.asm
rename to data/pokemon/base_stats/exeggcute.asm
diff --git a/data/baseStats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm
similarity index 100%
rename from data/baseStats/exeggutor.asm
rename to data/pokemon/base_stats/exeggutor.asm
diff --git a/data/baseStats/farfetchd.asm b/data/pokemon/base_stats/farfetchd.asm
similarity index 100%
rename from data/baseStats/farfetchd.asm
rename to data/pokemon/base_stats/farfetchd.asm
diff --git a/data/baseStats/fearow.asm b/data/pokemon/base_stats/fearow.asm
similarity index 100%
rename from data/baseStats/fearow.asm
rename to data/pokemon/base_stats/fearow.asm
diff --git a/data/baseStats/flareon.asm b/data/pokemon/base_stats/flareon.asm
similarity index 100%
rename from data/baseStats/flareon.asm
rename to data/pokemon/base_stats/flareon.asm
diff --git a/data/baseStats/gastly.asm b/data/pokemon/base_stats/gastly.asm
similarity index 100%
rename from data/baseStats/gastly.asm
rename to data/pokemon/base_stats/gastly.asm
diff --git a/data/baseStats/gengar.asm b/data/pokemon/base_stats/gengar.asm
similarity index 100%
rename from data/baseStats/gengar.asm
rename to data/pokemon/base_stats/gengar.asm
diff --git a/data/baseStats/geodude.asm b/data/pokemon/base_stats/geodude.asm
similarity index 100%
rename from data/baseStats/geodude.asm
rename to data/pokemon/base_stats/geodude.asm
diff --git a/data/baseStats/gloom.asm b/data/pokemon/base_stats/gloom.asm
similarity index 100%
rename from data/baseStats/gloom.asm
rename to data/pokemon/base_stats/gloom.asm
diff --git a/data/baseStats/golbat.asm b/data/pokemon/base_stats/golbat.asm
similarity index 100%
rename from data/baseStats/golbat.asm
rename to data/pokemon/base_stats/golbat.asm
diff --git a/data/baseStats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm
similarity index 100%
rename from data/baseStats/goldeen.asm
rename to data/pokemon/base_stats/goldeen.asm
diff --git a/data/baseStats/golduck.asm b/data/pokemon/base_stats/golduck.asm
similarity index 100%
rename from data/baseStats/golduck.asm
rename to data/pokemon/base_stats/golduck.asm
diff --git a/data/baseStats/golem.asm b/data/pokemon/base_stats/golem.asm
similarity index 100%
rename from data/baseStats/golem.asm
rename to data/pokemon/base_stats/golem.asm
diff --git a/data/baseStats/graveler.asm b/data/pokemon/base_stats/graveler.asm
similarity index 100%
rename from data/baseStats/graveler.asm
rename to data/pokemon/base_stats/graveler.asm
diff --git a/data/baseStats/grimer.asm b/data/pokemon/base_stats/grimer.asm
similarity index 100%
rename from data/baseStats/grimer.asm
rename to data/pokemon/base_stats/grimer.asm
diff --git a/data/baseStats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm
similarity index 100%
rename from data/baseStats/growlithe.asm
rename to data/pokemon/base_stats/growlithe.asm
diff --git a/data/baseStats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm
similarity index 100%
rename from data/baseStats/gyarados.asm
rename to data/pokemon/base_stats/gyarados.asm
diff --git a/data/baseStats/haunter.asm b/data/pokemon/base_stats/haunter.asm
similarity index 100%
rename from data/baseStats/haunter.asm
rename to data/pokemon/base_stats/haunter.asm
diff --git a/data/baseStats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm
similarity index 100%
rename from data/baseStats/hitmonchan.asm
rename to data/pokemon/base_stats/hitmonchan.asm
diff --git a/data/baseStats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm
similarity index 100%
rename from data/baseStats/hitmonlee.asm
rename to data/pokemon/base_stats/hitmonlee.asm
diff --git a/data/baseStats/horsea.asm b/data/pokemon/base_stats/horsea.asm
similarity index 100%
rename from data/baseStats/horsea.asm
rename to data/pokemon/base_stats/horsea.asm
diff --git a/data/baseStats/hypno.asm b/data/pokemon/base_stats/hypno.asm
similarity index 100%
rename from data/baseStats/hypno.asm
rename to data/pokemon/base_stats/hypno.asm
diff --git a/data/baseStats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm
similarity index 100%
rename from data/baseStats/ivysaur.asm
rename to data/pokemon/base_stats/ivysaur.asm
diff --git a/data/baseStats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm
similarity index 100%
rename from data/baseStats/jigglypuff.asm
rename to data/pokemon/base_stats/jigglypuff.asm
diff --git a/data/baseStats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm
similarity index 100%
rename from data/baseStats/jolteon.asm
rename to data/pokemon/base_stats/jolteon.asm
diff --git a/data/baseStats/jynx.asm b/data/pokemon/base_stats/jynx.asm
similarity index 100%
rename from data/baseStats/jynx.asm
rename to data/pokemon/base_stats/jynx.asm
diff --git a/data/baseStats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm
similarity index 100%
rename from data/baseStats/kabuto.asm
rename to data/pokemon/base_stats/kabuto.asm
diff --git a/data/baseStats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm
similarity index 100%
rename from data/baseStats/kabutops.asm
rename to data/pokemon/base_stats/kabutops.asm
diff --git a/data/baseStats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm
similarity index 100%
rename from data/baseStats/kadabra.asm
rename to data/pokemon/base_stats/kadabra.asm
diff --git a/data/baseStats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm
similarity index 100%
rename from data/baseStats/kakuna.asm
rename to data/pokemon/base_stats/kakuna.asm
diff --git a/data/baseStats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm
similarity index 100%
rename from data/baseStats/kangaskhan.asm
rename to data/pokemon/base_stats/kangaskhan.asm
diff --git a/data/baseStats/kingler.asm b/data/pokemon/base_stats/kingler.asm
similarity index 100%
rename from data/baseStats/kingler.asm
rename to data/pokemon/base_stats/kingler.asm
diff --git a/data/baseStats/koffing.asm b/data/pokemon/base_stats/koffing.asm
similarity index 100%
rename from data/baseStats/koffing.asm
rename to data/pokemon/base_stats/koffing.asm
diff --git a/data/baseStats/krabby.asm b/data/pokemon/base_stats/krabby.asm
similarity index 100%
rename from data/baseStats/krabby.asm
rename to data/pokemon/base_stats/krabby.asm
diff --git a/data/baseStats/lapras.asm b/data/pokemon/base_stats/lapras.asm
similarity index 100%
rename from data/baseStats/lapras.asm
rename to data/pokemon/base_stats/lapras.asm
diff --git a/data/baseStats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm
similarity index 100%
rename from data/baseStats/lickitung.asm
rename to data/pokemon/base_stats/lickitung.asm
diff --git a/data/baseStats/machamp.asm b/data/pokemon/base_stats/machamp.asm
similarity index 100%
rename from data/baseStats/machamp.asm
rename to data/pokemon/base_stats/machamp.asm
diff --git a/data/baseStats/machoke.asm b/data/pokemon/base_stats/machoke.asm
similarity index 100%
rename from data/baseStats/machoke.asm
rename to data/pokemon/base_stats/machoke.asm
diff --git a/data/baseStats/machop.asm b/data/pokemon/base_stats/machop.asm
similarity index 100%
rename from data/baseStats/machop.asm
rename to data/pokemon/base_stats/machop.asm
diff --git a/data/baseStats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm
similarity index 100%
rename from data/baseStats/magikarp.asm
rename to data/pokemon/base_stats/magikarp.asm
diff --git a/data/baseStats/magmar.asm b/data/pokemon/base_stats/magmar.asm
similarity index 100%
rename from data/baseStats/magmar.asm
rename to data/pokemon/base_stats/magmar.asm
diff --git a/data/baseStats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm
similarity index 100%
rename from data/baseStats/magnemite.asm
rename to data/pokemon/base_stats/magnemite.asm
diff --git a/data/baseStats/magneton.asm b/data/pokemon/base_stats/magneton.asm
similarity index 100%
rename from data/baseStats/magneton.asm
rename to data/pokemon/base_stats/magneton.asm
diff --git a/data/baseStats/mankey.asm b/data/pokemon/base_stats/mankey.asm
similarity index 100%
rename from data/baseStats/mankey.asm
rename to data/pokemon/base_stats/mankey.asm
diff --git a/data/baseStats/marowak.asm b/data/pokemon/base_stats/marowak.asm
similarity index 100%
rename from data/baseStats/marowak.asm
rename to data/pokemon/base_stats/marowak.asm
diff --git a/data/baseStats/meowth.asm b/data/pokemon/base_stats/meowth.asm
similarity index 100%
rename from data/baseStats/meowth.asm
rename to data/pokemon/base_stats/meowth.asm
diff --git a/data/baseStats/metapod.asm b/data/pokemon/base_stats/metapod.asm
similarity index 100%
rename from data/baseStats/metapod.asm
rename to data/pokemon/base_stats/metapod.asm
diff --git a/data/baseStats/mew.asm b/data/pokemon/base_stats/mew.asm
similarity index 100%
rename from data/baseStats/mew.asm
rename to data/pokemon/base_stats/mew.asm
diff --git a/data/baseStats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm
similarity index 100%
rename from data/baseStats/mewtwo.asm
rename to data/pokemon/base_stats/mewtwo.asm
diff --git a/data/baseStats/moltres.asm b/data/pokemon/base_stats/moltres.asm
similarity index 100%
rename from data/baseStats/moltres.asm
rename to data/pokemon/base_stats/moltres.asm
diff --git a/data/baseStats/mrmime.asm b/data/pokemon/base_stats/mrmime.asm
similarity index 100%
rename from data/baseStats/mrmime.asm
rename to data/pokemon/base_stats/mrmime.asm
diff --git a/data/baseStats/muk.asm b/data/pokemon/base_stats/muk.asm
similarity index 100%
rename from data/baseStats/muk.asm
rename to data/pokemon/base_stats/muk.asm
diff --git a/data/baseStats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm
similarity index 100%
rename from data/baseStats/nidoking.asm
rename to data/pokemon/base_stats/nidoking.asm
diff --git a/data/baseStats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm
similarity index 100%
rename from data/baseStats/nidoqueen.asm
rename to data/pokemon/base_stats/nidoqueen.asm
diff --git a/data/baseStats/nidoranf.asm b/data/pokemon/base_stats/nidoranf.asm
similarity index 100%
rename from data/baseStats/nidoranf.asm
rename to data/pokemon/base_stats/nidoranf.asm
diff --git a/data/baseStats/nidoranm.asm b/data/pokemon/base_stats/nidoranm.asm
similarity index 100%
rename from data/baseStats/nidoranm.asm
rename to data/pokemon/base_stats/nidoranm.asm
diff --git a/data/baseStats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm
similarity index 100%
rename from data/baseStats/nidorina.asm
rename to data/pokemon/base_stats/nidorina.asm
diff --git a/data/baseStats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm
similarity index 100%
rename from data/baseStats/nidorino.asm
rename to data/pokemon/base_stats/nidorino.asm
diff --git a/data/baseStats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm
similarity index 100%
rename from data/baseStats/ninetales.asm
rename to data/pokemon/base_stats/ninetales.asm
diff --git a/data/baseStats/oddish.asm b/data/pokemon/base_stats/oddish.asm
similarity index 100%
rename from data/baseStats/oddish.asm
rename to data/pokemon/base_stats/oddish.asm
diff --git a/data/baseStats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm
similarity index 100%
rename from data/baseStats/omanyte.asm
rename to data/pokemon/base_stats/omanyte.asm
diff --git a/data/baseStats/omastar.asm b/data/pokemon/base_stats/omastar.asm
similarity index 100%
rename from data/baseStats/omastar.asm
rename to data/pokemon/base_stats/omastar.asm
diff --git a/data/baseStats/onix.asm b/data/pokemon/base_stats/onix.asm
similarity index 100%
rename from data/baseStats/onix.asm
rename to data/pokemon/base_stats/onix.asm
diff --git a/data/baseStats/paras.asm b/data/pokemon/base_stats/paras.asm
similarity index 100%
rename from data/baseStats/paras.asm
rename to data/pokemon/base_stats/paras.asm
diff --git a/data/baseStats/parasect.asm b/data/pokemon/base_stats/parasect.asm
similarity index 100%
rename from data/baseStats/parasect.asm
rename to data/pokemon/base_stats/parasect.asm
diff --git a/data/baseStats/persian.asm b/data/pokemon/base_stats/persian.asm
similarity index 100%
rename from data/baseStats/persian.asm
rename to data/pokemon/base_stats/persian.asm
diff --git a/data/baseStats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm
similarity index 100%
rename from data/baseStats/pidgeot.asm
rename to data/pokemon/base_stats/pidgeot.asm
diff --git a/data/baseStats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm
similarity index 100%
rename from data/baseStats/pidgeotto.asm
rename to data/pokemon/base_stats/pidgeotto.asm
diff --git a/data/baseStats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm
similarity index 100%
rename from data/baseStats/pidgey.asm
rename to data/pokemon/base_stats/pidgey.asm
diff --git a/data/baseStats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm
similarity index 100%
rename from data/baseStats/pikachu.asm
rename to data/pokemon/base_stats/pikachu.asm
diff --git a/data/baseStats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm
similarity index 100%
rename from data/baseStats/pinsir.asm
rename to data/pokemon/base_stats/pinsir.asm
diff --git a/data/baseStats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm
similarity index 100%
rename from data/baseStats/poliwag.asm
rename to data/pokemon/base_stats/poliwag.asm
diff --git a/data/baseStats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm
similarity index 100%
rename from data/baseStats/poliwhirl.asm
rename to data/pokemon/base_stats/poliwhirl.asm
diff --git a/data/baseStats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm
similarity index 100%
rename from data/baseStats/poliwrath.asm
rename to data/pokemon/base_stats/poliwrath.asm
diff --git a/data/baseStats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm
similarity index 100%
rename from data/baseStats/ponyta.asm
rename to data/pokemon/base_stats/ponyta.asm
diff --git a/data/baseStats/porygon.asm b/data/pokemon/base_stats/porygon.asm
similarity index 100%
rename from data/baseStats/porygon.asm
rename to data/pokemon/base_stats/porygon.asm
diff --git a/data/baseStats/primeape.asm b/data/pokemon/base_stats/primeape.asm
similarity index 100%
rename from data/baseStats/primeape.asm
rename to data/pokemon/base_stats/primeape.asm
diff --git a/data/baseStats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm
similarity index 100%
rename from data/baseStats/psyduck.asm
rename to data/pokemon/base_stats/psyduck.asm
diff --git a/data/baseStats/raichu.asm b/data/pokemon/base_stats/raichu.asm
similarity index 100%
rename from data/baseStats/raichu.asm
rename to data/pokemon/base_stats/raichu.asm
diff --git a/data/baseStats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm
similarity index 100%
rename from data/baseStats/rapidash.asm
rename to data/pokemon/base_stats/rapidash.asm
diff --git a/data/baseStats/raticate.asm b/data/pokemon/base_stats/raticate.asm
similarity index 100%
rename from data/baseStats/raticate.asm
rename to data/pokemon/base_stats/raticate.asm
diff --git a/data/baseStats/rattata.asm b/data/pokemon/base_stats/rattata.asm
similarity index 100%
rename from data/baseStats/rattata.asm
rename to data/pokemon/base_stats/rattata.asm
diff --git a/data/baseStats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm
similarity index 100%
rename from data/baseStats/rhydon.asm
rename to data/pokemon/base_stats/rhydon.asm
diff --git a/data/baseStats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm
similarity index 100%
rename from data/baseStats/rhyhorn.asm
rename to data/pokemon/base_stats/rhyhorn.asm
diff --git a/data/baseStats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm
similarity index 100%
rename from data/baseStats/sandshrew.asm
rename to data/pokemon/base_stats/sandshrew.asm
diff --git a/data/baseStats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm
similarity index 100%
rename from data/baseStats/sandslash.asm
rename to data/pokemon/base_stats/sandslash.asm
diff --git a/data/baseStats/scyther.asm b/data/pokemon/base_stats/scyther.asm
similarity index 100%
rename from data/baseStats/scyther.asm
rename to data/pokemon/base_stats/scyther.asm
diff --git a/data/baseStats/seadra.asm b/data/pokemon/base_stats/seadra.asm
similarity index 100%
rename from data/baseStats/seadra.asm
rename to data/pokemon/base_stats/seadra.asm
diff --git a/data/baseStats/seaking.asm b/data/pokemon/base_stats/seaking.asm
similarity index 100%
rename from data/baseStats/seaking.asm
rename to data/pokemon/base_stats/seaking.asm
diff --git a/data/baseStats/seel.asm b/data/pokemon/base_stats/seel.asm
similarity index 100%
rename from data/baseStats/seel.asm
rename to data/pokemon/base_stats/seel.asm
diff --git a/data/baseStats/shellder.asm b/data/pokemon/base_stats/shellder.asm
similarity index 100%
rename from data/baseStats/shellder.asm
rename to data/pokemon/base_stats/shellder.asm
diff --git a/data/baseStats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm
similarity index 100%
rename from data/baseStats/slowbro.asm
rename to data/pokemon/base_stats/slowbro.asm
diff --git a/data/baseStats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm
similarity index 100%
rename from data/baseStats/slowpoke.asm
rename to data/pokemon/base_stats/slowpoke.asm
diff --git a/data/baseStats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm
similarity index 100%
rename from data/baseStats/snorlax.asm
rename to data/pokemon/base_stats/snorlax.asm
diff --git a/data/baseStats/spearow.asm b/data/pokemon/base_stats/spearow.asm
similarity index 100%
rename from data/baseStats/spearow.asm
rename to data/pokemon/base_stats/spearow.asm
diff --git a/data/baseStats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm
similarity index 100%
rename from data/baseStats/squirtle.asm
rename to data/pokemon/base_stats/squirtle.asm
diff --git a/data/baseStats/starmie.asm b/data/pokemon/base_stats/starmie.asm
similarity index 100%
rename from data/baseStats/starmie.asm
rename to data/pokemon/base_stats/starmie.asm
diff --git a/data/baseStats/staryu.asm b/data/pokemon/base_stats/staryu.asm
similarity index 100%
rename from data/baseStats/staryu.asm
rename to data/pokemon/base_stats/staryu.asm
diff --git a/data/baseStats/tangela.asm b/data/pokemon/base_stats/tangela.asm
similarity index 100%
rename from data/baseStats/tangela.asm
rename to data/pokemon/base_stats/tangela.asm
diff --git a/data/baseStats/tauros.asm b/data/pokemon/base_stats/tauros.asm
similarity index 100%
rename from data/baseStats/tauros.asm
rename to data/pokemon/base_stats/tauros.asm
diff --git a/data/baseStats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm
similarity index 100%
rename from data/baseStats/tentacool.asm
rename to data/pokemon/base_stats/tentacool.asm
diff --git a/data/baseStats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm
similarity index 100%
rename from data/baseStats/tentacruel.asm
rename to data/pokemon/base_stats/tentacruel.asm
diff --git a/data/baseStats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm
similarity index 100%
rename from data/baseStats/vaporeon.asm
rename to data/pokemon/base_stats/vaporeon.asm
diff --git a/data/baseStats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm
similarity index 100%
rename from data/baseStats/venomoth.asm
rename to data/pokemon/base_stats/venomoth.asm
diff --git a/data/baseStats/venonat.asm b/data/pokemon/base_stats/venonat.asm
similarity index 100%
rename from data/baseStats/venonat.asm
rename to data/pokemon/base_stats/venonat.asm
diff --git a/data/baseStats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm
similarity index 100%
rename from data/baseStats/venusaur.asm
rename to data/pokemon/base_stats/venusaur.asm
diff --git a/data/baseStats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm
similarity index 100%
rename from data/baseStats/victreebel.asm
rename to data/pokemon/base_stats/victreebel.asm
diff --git a/data/baseStats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm
similarity index 100%
rename from data/baseStats/vileplume.asm
rename to data/pokemon/base_stats/vileplume.asm
diff --git a/data/baseStats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm
similarity index 100%
rename from data/baseStats/voltorb.asm
rename to data/pokemon/base_stats/voltorb.asm
diff --git a/data/baseStats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm
similarity index 100%
rename from data/baseStats/vulpix.asm
rename to data/pokemon/base_stats/vulpix.asm
diff --git a/data/baseStats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm
similarity index 100%
rename from data/baseStats/wartortle.asm
rename to data/pokemon/base_stats/wartortle.asm
diff --git a/data/baseStats/weedle.asm b/data/pokemon/base_stats/weedle.asm
similarity index 100%
rename from data/baseStats/weedle.asm
rename to data/pokemon/base_stats/weedle.asm
diff --git a/data/baseStats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm
similarity index 100%
rename from data/baseStats/weepinbell.asm
rename to data/pokemon/base_stats/weepinbell.asm
diff --git a/data/baseStats/weezing.asm b/data/pokemon/base_stats/weezing.asm
similarity index 100%
rename from data/baseStats/weezing.asm
rename to data/pokemon/base_stats/weezing.asm
diff --git a/data/baseStats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm
similarity index 100%
rename from data/baseStats/wigglytuff.asm
rename to data/pokemon/base_stats/wigglytuff.asm
diff --git a/data/baseStats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm
similarity index 100%
rename from data/baseStats/zapdos.asm
rename to data/pokemon/base_stats/zapdos.asm
diff --git a/data/baseStats/zubat.asm b/data/pokemon/base_stats/zubat.asm
similarity index 100%
rename from data/baseStats/zubat.asm
rename to data/pokemon/base_stats/zubat.asm
diff --git a/data/cries.asm b/data/pokemon/cries.asm
similarity index 100%
rename from data/cries.asm
rename to data/pokemon/cries.asm
diff --git a/data/pokedex_entries.asm b/data/pokemon/dex_entries.asm
similarity index 100%
rename from data/pokedex_entries.asm
rename to data/pokemon/dex_entries.asm
diff --git a/data/pokedex_order.asm b/data/pokemon/dex_order.asm
similarity index 100%
rename from data/pokedex_order.asm
rename to data/pokemon/dex_order.asm
diff --git a/text/pokedex.asm b/data/pokemon/dex_text.asm
similarity index 100%
rename from text/pokedex.asm
rename to data/pokemon/dex_text.asm
diff --git a/data/evos_moves.asm b/data/pokemon/evos_moves.asm
similarity index 100%
rename from data/evos_moves.asm
rename to data/pokemon/evos_moves.asm
diff --git a/data/mon_party_sprites.asm b/data/pokemon/menu_icons.asm
similarity index 100%
rename from data/mon_party_sprites.asm
rename to data/pokemon/menu_icons.asm
diff --git a/text/monster_names.asm b/data/pokemon/names.asm
similarity index 100%
rename from text/monster_names.asm
rename to data/pokemon/names.asm
diff --git a/data/mon_palettes.asm b/data/pokemon/palettes.asm
similarity index 100%
rename from data/mon_palettes.asm
rename to data/pokemon/palettes.asm
diff --git a/data/title_mons.asm b/data/pokemon/title_mons.asm
similarity index 100%
rename from data/title_mons.asm
rename to data/pokemon/title_mons.asm
diff --git a/data/sgb_border.asm b/data/sgb/sgb_border.asm
similarity index 100%
rename from data/sgb_border.asm
rename to data/sgb/sgb_border.asm
diff --git a/data/sgb_packets.asm b/data/sgb/sgb_packets.asm
similarity index 100%
rename from data/sgb_packets.asm
rename to data/sgb/sgb_packets.asm
diff --git a/data/super_palettes.asm b/data/sgb/sgb_palettes.asm
similarity index 100%
rename from data/super_palettes.asm
rename to data/sgb/sgb_palettes.asm
diff --git a/data/facing.asm b/data/sprite_facings.asm
similarity index 100%
rename from data/facing.asm
rename to data/sprite_facings.asm
diff --git a/text/alphabets.asm b/data/text/alphabets.asm
similarity index 100%
rename from text/alphabets.asm
rename to data/text/alphabets.asm
diff --git a/text/dakutens.asm b/data/text/dakutens.asm
similarity index 100%
rename from text/dakutens.asm
rename to data/text/dakutens.asm
diff --git a/data/text/text_1.asm b/data/text/text_1.asm
new file mode 100644
index 00000000..1ab54da3
--- /dev/null
+++ b/data/text/text_1.asm
@@ -0,0 +1,145 @@
+_CardKeySuccessText1::
+	text "Bingo!@@"
+
+_CardKeySuccessText2::
+	text ""
+	line "The CARD KEY"
+	cont "opened the door!"
+	done
+
+_CardKeyFailText::
+	text "Darn! It needs a"
+	line "CARD KEY!"
+	done
+
+_TrainerNameText::
+	TX_RAM wcd6d
+	text ": @@"
+
+_NoNibbleText::
+	text "Not even a nibble!"
+	prompt
+
+_NothingHereText::
+	text "Looks like there's"
+	line "nothing here."
+	prompt
+
+_ItsABiteText::
+	text "Oh!"
+	line "It's a bite!"
+	prompt
+
+_ExclamationText::
+	text "!"
+	done
+
+_GroundRoseText::
+	text "Ground rose up"
+	line "somewhere!"
+	done
+
+_BoulderText::
+	text "This requires"
+	line "STRENGTH to move!"
+	done
+
+_MartSignText::
+	text "All your item"
+	line "needs fulfilled!"
+	cont "#MON MART"
+	done
+
+_PokeCenterSignText::
+	text "Heal Your #MON!"
+	line "#MON CENTER"
+	done
+
+_FoundItemText::
+	text "<PLAYER> found"
+	line "@"
+	TX_RAM wcf4b
+	text "!@@"
+
+_NoMoreRoomForItemText::
+	text "No more room for"
+	line "items!"
+	done
+
+_OaksAideHiText::
+	text "Hi! Remember me?"
+	line "I'm PROF.OAK's"
+	cont "AIDE!"
+
+	para "If you caught @"
+	TX_NUM hOaksAideRequirement, 1, 3
+	text ""
+	line "kinds of #MON,"
+	cont "I'm supposed to"
+	cont "give you an"
+	cont "@"
+	TX_RAM wOaksAideRewardItemName
+	text "!"
+
+	para "So, <PLAYER>! Have"
+	line "you caught at"
+	cont "least @"
+	TX_NUM hOaksAideRequirement, 1, 3
+	text " kinds of"
+	cont "#MON?"
+	done
+
+_OaksAideUhOhText::
+	text "Let's see..."
+	line "Uh-oh! You have"
+	cont "caught only @"
+	TX_NUM hOaksAideNumMonsOwned, 1, 3
+	text ""
+	cont "kinds of #MON!"
+
+	para "You need @"
+	TX_NUM hOaksAideRequirement, 1, 3
+	text " kinds"
+	line "if you want the"
+	cont "@"
+	TX_RAM wOaksAideRewardItemName
+	text "."
+	done
+
+_OaksAideComeBackText::
+	text "Oh. I see."
+
+	para "When you get @"
+	TX_NUM hOaksAideRequirement, 1, 3
+	text ""
+	line "kinds, come back"
+	cont "for @"
+	TX_RAM wOaksAideRewardItemName
+	text "."
+	done
+
+_OaksAideHereYouGoText::
+	text "Great! You have"
+	line "caught @"
+	TX_NUM hOaksAideNumMonsOwned, 1, 3
+	text " kinds "
+	cont "of #MON!"
+	cont "Congratulations!"
+
+	para "Here you go!"
+	prompt
+
+_OaksAideGotItemText::
+	text "<PLAYER> got the"
+	line "@"
+	TX_RAM wOaksAideRewardItemName
+	text "!@@"
+
+_OaksAideNoRoomText::
+	text "Oh! I see you"
+	line "don't have any"
+	cont "room for the"
+	cont "@"
+	TX_RAM wOaksAideRewardItemName
+	text "."
+	done
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
new file mode 100644
index 00000000..01e8641b
--- /dev/null
+++ b/data/text/text_2.asm
@@ -0,0 +1,1753 @@
+_AIBattleWithdrawText::
+	TX_RAM wTrainerName
+	text " with-"
+	line "drew @"
+	TX_RAM wEnemyMonNick
+	text "!"
+	prompt
+
+_AIBattleUseItemText::
+	TX_RAM wTrainerName
+	text ""
+	line "used @"
+	TX_RAM wcd6d
+	text ""
+	cont "on @"
+	TX_RAM wEnemyMonNick
+	text "!"
+	prompt
+
+_TradeWentToText::
+	TX_RAM wcf4b
+	text " went"
+	line "to @"
+	TX_RAM wLinkEnemyTrainerName
+	text "."
+	done
+
+_TradeForText::
+	text "For <PLAYER>'s"
+	line "@"
+	TX_RAM wcf4b
+	text ","
+	done
+
+_TradeSendsText::
+	TX_RAM wLinkEnemyTrainerName
+	text " sends"
+	line "@"
+	TX_RAM wcd6d
+	text "."
+	done
+
+_TradeWavesFarewellText::
+	TX_RAM wLinkEnemyTrainerName
+	text " waves"
+	line "farewell as"
+	done
+
+_TradeTransferredText::
+	TX_RAM wcd6d
+	text " is"
+	line "transferred."
+	done
+
+_TradeTakeCareText::
+	text "Take good care of"
+	line "@"
+	TX_RAM wcd6d
+	text "."
+	done
+
+_TradeWillTradeText::
+	TX_RAM wLinkEnemyTrainerName
+	text " will"
+	line "trade @"
+	TX_RAM wcd6d
+	text ""
+	done
+
+_TradeforText::
+	text "for <PLAYER>'s"
+	line "@"
+	TX_RAM wcf4b
+	text "."
+	done
+
+_PlaySlotMachineText::
+	text "A slot machine!"
+	line "Want to play?"
+	done
+
+_OutOfCoinsSlotMachineText::
+	text "Darn!"
+	line "Ran out of coins!"
+	done
+
+_BetHowManySlotMachineText::
+	text "Bet how many"
+	line "coins?"
+	done
+
+_StartSlotMachineText::
+	text "Start!"
+	done
+
+_NotEnoughCoinsSlotMachineText::
+	text "Not enough"
+	line "coins!"
+	prompt
+
+_OneMoreGoSlotMachineText::
+	text "One more "
+	line "go?"
+	done
+
+_LinedUpText::
+	text " lined up!"
+	line "Scored @"
+	TX_RAM wcf4b
+	text " coins!"
+	done
+
+_NotThisTimeText::
+	text "Not this time!"
+	prompt
+
+_YeahText::
+	text "Yeah!@@"
+
+_DexSeenOwnedText::
+	text "#DEX   Seen:@"
+	TX_NUM wDexRatingNumMonsSeen, 1, 3
+	text ""
+	line "         Owned:@"
+	TX_NUM wDexRatingNumMonsOwned, 1, 3
+	db "@"
+
+_DexRatingText::
+	text "#DEX Rating", $6d
+	done
+
+_GymStatueText1::
+	TX_RAM wGymCityName
+	text ""
+	line "#MON GYM"
+	cont "LEADER: @"
+	TX_RAM wGymLeaderName
+	text ""
+
+	para "WINNING TRAINERS:"
+	line "<RIVAL>"
+	done
+
+_GymStatueText2::
+	TX_RAM wGymCityName
+	text ""
+	line "#MON GYM"
+	cont "LEADER: @"
+	TX_RAM wGymLeaderName
+	text ""
+
+	para "WINNING TRAINERS:"
+	line "<RIVAL>"
+	cont "<PLAYER>"
+	done
+
+_ViridianCityPokecenterGuyText::
+	text "#MON CENTERs"
+	line "heal your tired,"
+	cont "hurt or fainted"
+	cont "#MON!"
+	done
+
+_PewterCityPokecenterGuyText::
+	text "Yawn!"
+
+	para "When JIGGLYPUFF"
+	line "sings, #MON"
+	cont "get drowsy..."
+
+	para "...Me too..."
+	line "Snore..."
+	done
+
+_CeruleanPokecenterGuyText::
+	text "BILL has lots of"
+	line "#MON!"
+
+	para "He collects rare"
+	line "ones too!"
+	done
+
+_LavenderPokecenterGuyText::
+	text "CUBONEs wear"
+	line "skulls, right?"
+
+	para "People will pay a"
+	line "lot for one!"
+	done
+
+_MtMoonPokecenterBenchGuyText::
+	text "If you have too"
+	line "many #MON, you"
+	cont "should store them"
+	cont "via PC!"
+	done
+
+_RockTunnelPokecenterGuyText::
+	text "I heard that"
+	line "GHOSTs haunt"
+	cont "LAVENDER TOWN!"
+	done
+
+_UnusedBenchGuyText1::
+	text "I wish I could"
+	line "catch #MON."
+	done
+
+_UnusedBenchGuyText2::
+	text "I'm tired from"
+	line "all the fun..."
+	done
+
+_UnusedBenchGuyText3::
+	text "SILPH's manager"
+	line "is hiding in the"
+	cont "SAFARI ZONE."
+	done
+
+_VermilionPokecenterGuyText::
+	text "It is true that a"
+	line "higher level"
+	cont "#MON will be"
+	cont "more powerful..."
+
+	para "But, all #MON"
+	line "will have weak"
+	cont "points against"
+	cont "specific types."
+
+	para "So, there is no"
+	line "universally"
+	cont "strong #MON."
+	done
+
+_CeladonCityPokecenterGuyText::
+	text "If I had a BIKE,"
+	line "I would go to"
+	cont "CYCLING ROAD!"
+	done
+
+_FuchsiaCityPokecenterGuyText::
+	text "If you're studying "
+	line "#MON, visit"
+	cont "the SAFARI ZONE."
+
+	para "It has all sorts"
+	line "of rare #MON."
+	done
+
+_CinnabarPokecenterGuyText::
+	text "#MON can still"
+	line "learn techniques"
+	cont "after canceling"
+	cont "evolution."
+
+	para "Evolution can wait"
+	line "until new moves"
+	cont "have been learned."
+	done
+
+_SaffronCityPokecenterGuyText1::
+	text "It would be great"
+	line "if the ELITE FOUR"
+	cont "came and stomped"
+	cont "TEAM ROCKET!"
+	done
+
+_SaffronCityPokecenterGuyText2::
+	text "TEAM ROCKET took"
+	line "off! We can go"
+	cont "out safely again!"
+	cont "That's great!"
+	done
+
+_CeladonCityHotelText::
+	text "My sis brought me"
+	line "on this vacation!"
+	done
+
+_BookcaseText::
+	text "Crammed full of"
+	line "#MON books!"
+	done
+
+_NewBicycleText::
+	text "A shiny new"
+	line "BICYCLE!"
+	done
+
+_PushStartText::
+	text "Push START to"
+	line "open the MENU!"
+	done
+
+_SaveOptionText::
+	text "The SAVE option is"
+	line "on the MENU"
+	cont "screen."
+	done
+
+_StrengthsAndWeaknessesText::
+	text "All #MON types"
+	line "have strong and"
+	cont "weak points"
+	cont "against others."
+	done
+
+_TimesUpText::
+	text "PA: Ding-dong!"
+
+	para "Time's up!"
+	prompt
+
+_GameOverText::
+	text "PA: Your SAFARI"
+	line "GAME is over!"
+	done
+
+_CinnabarGymQuizIntroText::
+	text "#MON Quiz!"
+
+	para "Get it right and"
+	line "the door opens to"
+	cont "the next room!"
+
+	para "Get it wrong and"
+	line "face a trainer!"
+
+	para "If you want to"
+	line "conserve your"
+	cont "#MON for the"
+	cont "GYM LEADER..."
+
+	para "Then get it right!"
+	line "Here we go!"
+	prompt
+
+_CinnabarQuizQuestionsText1::
+	text "CATERPIE evolves"
+	line "into BUTTERFREE?"
+	done
+
+_CinnabarQuizQuestionsText2::
+	text "There are 9"
+	line "certified #MON"
+	cont "LEAGUE BADGEs?"
+	done
+
+_CinnabarQuizQuestionsText3::
+	text "POLIWAG evolves 3"
+	line "times?"
+	done
+
+_CinnabarQuizQuestionsText4::
+	text "Are thunder moves"
+	line "effective against"
+	cont "ground element-"
+	cont "type #MON?"
+	done
+
+_CinnabarQuizQuestionsText5::
+	text "#MON of the"
+	line "same kind and"
+	cont "level are not"
+	cont "identical?"
+	done
+
+_CinnabarQuizQuestionsText6::
+	text "TM28 contains"
+	line "TOMBSTONER?"
+	done
+
+_CinnabarGymQuizCorrectText::
+	text "You're absolutely"
+	line "correct!"
+
+	para "Go on through!@@"
+
+_CinnabarGymQuizIncorrectText::
+	text "Sorry! Bad call!"
+	prompt
+
+_MagazinesText::
+	text "#MON magazines!"
+
+	para "#MON notebooks!"
+
+	para "#MON graphs!"
+	done
+
+_BillsHouseMonitorText::
+	text "TELEPORTER is"
+	line "displayed on the"
+	cont "PC monitor."
+	done
+
+_BillsHouseInitiatedText::
+	text "<PLAYER> initiated"
+	line "TELEPORTER's Cell"
+	cont "Separator!@@"
+
+_BillsHousePokemonListText1::
+	text "BILL's favorite"
+	line "#MON list!"
+	prompt
+
+_BillsHousePokemonListText2::
+	text "Which #MON do"
+	line "you want to see?"
+	done
+
+_OakLabEmailText::
+	text "There's an e-mail"
+	line "message here!"
+
+	para "..."
+
+	para "Calling all"
+	line "#MON trainers!"
+
+	para "The elite trainers"
+	line "of #MON LEAGUE"
+	cont "are ready to take"
+	cont "on all comers!"
+
+	para "Bring your best"
+	line "#MON and see"
+	cont "how you rate as a"
+	cont "trainer!"
+
+	para "#MON LEAGUE HQ"
+	line "INDIGO PLATEAU"
+
+	para "PS: PROF.OAK,"
+	line "please visit us!"
+	cont "..."
+	done
+
+_GameCornerCoinCaseText::
+	text "A COIN CASE is"
+	line "required!"
+	done
+
+_GameCornerNoCoinsText::
+	text "You don't have"
+	line "any coins!"
+	done
+
+_GameCornerOutOfOrderText::
+	text "OUT OF ORDER"
+	line "This is broken."
+	done
+
+_GameCornerOutToLunchText::
+	text "OUT TO LUNCH"
+	line "This is reserved."
+	done
+
+_GameCornerSomeonesKeysText::
+	text "Someone's keys!"
+	line "They'll be back."
+	done
+
+_JustAMomentText::
+	text "Just a moment."
+	done
+
+TMNotebookText::
+	text "It's a pamphlet"
+	line "on TMs."
+
+	para "..."
+
+	para "There are 50 TMs"
+	line "in all."
+
+	para "There are also 5"
+	line "HMs that can be"
+	cont "used repeatedly."
+
+	para "SILPH CO.@@"
+
+_TurnPageText::
+	text "Turn the page?"
+	done
+
+_ViridianSchoolNotebookText5::
+	text "GIRL: Hey! Don't"
+	line "look at my notes!@@"
+
+_ViridianSchoolNotebookText1::
+	text "Looked at the"
+	line "notebook!"
+
+	para "First page..."
+
+	para "# BALLs are"
+	line "used to catch"
+	cont "#MON."
+
+	para "Up to 6 #MON"
+	line "can be carried."
+
+	para "People who raise"
+	line "and make #MON"
+	cont "fight are called"
+	cont "#MON trainers."
+	prompt
+
+_ViridianSchoolNotebookText2::
+	text "Second page..."
+
+	para "A healthy #MON"
+	line "may be hard to"
+	cont "catch, so weaken"
+	cont "it first!"
+
+	para "Poison, burns and"
+	line "other damage are"
+	cont "effective!"
+	prompt
+
+_ViridianSchoolNotebookText3::
+	text "Third page..."
+
+	para "#MON trainers"
+	line "seek others to"
+	cont "engage in #MON"
+	cont "fights."
+
+	para "Battles are"
+	line "constantly fought"
+	cont "at #MON GYMs."
+	prompt
+
+_ViridianSchoolNotebookText4::
+	text "Fourth page..."
+
+	para "The goal for"
+	line "#MON trainers"
+	cont "is to beat the "
+	cont "top 8 #MON"
+	cont "GYM LEADERs."
+
+	para "Do so to earn the"
+	line "right to face..."
+
+	para "The ELITE FOUR of"
+	line "#MON LEAGUE!"
+	prompt
+
+_EnemiesOnEverySideText::
+	text "Enemies on every"
+	line "side!"
+	done
+
+_WhatGoesAroundComesAroundText::
+	text "What goes around"
+	line "comes around!"
+	done
+
+_FightingDojoText::
+	text "FIGHTING DOJO"
+	done
+
+_IndigoPlateauHQText::
+	text "INDIGO PLATEAU"
+	line "#MON LEAGUE HQ"
+	done
+
+_RedBedroomSNESText::
+	text "<PLAYER> is"
+	line "playing the SNES!"
+	cont "...Okay!"
+	cont "It's time to go!"
+	done
+
+_Route15UpstairsBinocularsText::
+	text "Looked into the"
+	line "binoculars..."
+
+	para "A large, shining"
+	line "bird is flying"
+	cont "toward the sea."
+	done
+
+_AerodactylFossilText::
+	text "AERODACTYL Fossil"
+	line "A primitive and"
+	cont "rare #MON."
+	done
+
+_KabutopsFossilText::
+	text "KABUTOPS Fossil"
+	line "A primitive and"
+	cont "rare #MON."
+	done
+
+_LinkCableHelpText1::
+	text "TRAINER TIPS"
+
+	para "Using a Game Link"
+	line "Cable"
+	prompt
+
+_LinkCableHelpText2::
+	text "Which heading do"
+	line "you want to read?"
+	done
+
+_LinkCableInfoText1::
+	text "When you have"
+	line "linked your GAME"
+	cont "BOY with another"
+	cont "GAME BOY, talk to"
+	cont "the attendant on"
+	cont "the right in any"
+	cont "#MON CENTER."
+	prompt
+
+_LinkCableInfoText2::
+	text "COLOSSEUM lets"
+	line "you play against"
+	cont "a friend."
+	prompt
+
+_LinkCableInfoText3::
+	text "TRADE CENTER is"
+	line "used for trading"
+	cont "#MON."
+	prompt
+
+_ViridianSchoolBlackboardText1::
+	text "The blackboard"
+	line "describes #MON"
+	cont "STATUS changes"
+	cont "during battles."
+	prompt
+
+_ViridianSchoolBlackboardText2::
+	text "Which heading do"
+	line "you want to read?"
+	done
+
+_ViridianBlackboardSleepText::
+	text "A #MON can't"
+	line "attack if it's"
+	cont "asleep!"
+
+	para "#MON will stay"
+	line "asleep even after"
+	cont "battles."
+
+	para "Use AWAKENING to"
+	line "wake them up!"
+	prompt
+
+_ViridianBlackboardPoisonText::
+	text "When poisoned, a"
+	line "#MON's health"
+	cont "steadily drops."
+
+	para "Poison lingers"
+	line "after battles."
+
+	para "Use an ANTIDOTE"
+	line "to cure poison!"
+	prompt
+
+_ViridianBlackboardPrlzText::
+	text "Paralysis could"
+	line "make #MON"
+	cont "moves misfire!"
+
+	para "Paralysis remains"
+	line "after battles."
+
+	para "Use PARLYZ HEAL"
+	line "for treatment!"
+	prompt
+
+_ViridianBlackboardBurnText::
+	text "A burn reduces"
+	line "power and speed."
+	cont "It also causes"
+	cont "ongoing damage."
+
+	para "Burns remain"
+	line "after battles."
+
+	para "Use BURN HEAL to"
+	line "cure a burn!"
+	prompt
+
+_ViridianBlackboardFrozenText::
+	text "If frozen, a"
+	line "#MON becomes"
+	cont "totally immobile!"
+
+	para "It stays frozen"
+	line "even after the"
+	cont "battle ends."
+
+	para "Use ICE HEAL to"
+	line "thaw out #MON!"
+	prompt
+
+_VermilionGymTrashText::
+	text "Nope, there's"
+	line "only trash here."
+	done
+
+_VermilionGymTrashSuccessText1::
+	text "Hey! There's a"
+	line "switch under the"
+	cont "trash!"
+	cont "Turn it on!"
+
+	para "The 1st electric"
+	line "lock opened!@@"
+
+_VermilionGymTrashSuccessText2::
+	text "Hey! There's"
+	line "another switch"
+	cont "under the trash!"
+	cont "Turn it on!"
+	prompt
+
+_VermilionGymTrashSuccessText3::
+	text "The 2nd electric"
+	line "lock opened!"
+
+	para "The motorized door"
+	line "opened!@@"
+
+_VermilionGymTrashFailText::
+	text "Nope! There's"
+	line "only trash here."
+	cont "Hey! The electric"
+	cont "locks were reset!@@"
+
+_FoundHiddenItemText::
+	text "<PLAYER> found"
+	line "@"
+	TX_RAM wcd6d
+	text "!@@"
+
+_HiddenItemBagFullText::
+	text "But, <PLAYER> has"
+	line "no more room for"
+	cont "other items!"
+	done
+
+_FoundHiddenCoinsText::
+	text "<PLAYER> found"
+	line "@"
+	TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text " coins!@@"
+
+_FoundHiddenCoins2Text::
+	text "<PLAYER> found"
+	line "@"
+	TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text " coins!@@"
+
+_DroppedHiddenCoinsText::
+	text ""
+	para "Oops! Dropped"
+	line "some coins!"
+	done
+
+_IndigoPlateauStatuesText1::
+	text "INDIGO PLATEAU"
+	prompt
+
+_IndigoPlateauStatuesText2::
+	text "The ultimate goal"
+	line "of trainers!"
+	cont "#MON LEAGUE HQ"
+	done
+
+_IndigoPlateauStatuesText3::
+	text "The highest"
+	line "#MON authority"
+	cont "#MON LEAGUE HQ"
+	done
+
+_PokemonBooksText::
+	text "Crammed full of"
+	line "#MON books!"
+	done
+
+_DiglettSculptureText::
+	text "It's a sculpture"
+	line "of DIGLETT."
+	done
+
+_ElevatorText::
+	text "This is an"
+	line "elevator."
+	done
+
+_TownMapText::
+	text "A TOWN MAP.@@"
+
+_PokemonStuffText::
+	text "Wow! Tons of"
+	line "#MON stuff!"
+	done
+
+_OutOfSafariBallsText::
+	text "PA: Ding-dong!"
+
+	para "You are out of"
+	line "SAFARI BALLs!"
+	prompt
+
+_WildRanText::
+	text "Wild @"
+	TX_RAM wEnemyMonNick
+	text ""
+	line "ran!"
+	prompt
+
+_EnemyRanText::
+	text "Enemy @"
+	TX_RAM wEnemyMonNick
+	text ""
+	line "ran!"
+	prompt
+
+_HurtByPoisonText::
+	text "<USER>'s"
+	line "hurt by poison!"
+	prompt
+
+_HurtByBurnText::
+	text "<USER>'s"
+	line "hurt by the burn!"
+	prompt
+
+_HurtByLeechSeedText::
+	text "LEECH SEED saps"
+	line "<USER>!"
+	prompt
+
+_EnemyMonFaintedText::
+	text "Enemy @"
+	TX_RAM wEnemyMonNick
+	text ""
+	line "fainted!"
+	prompt
+
+_MoneyForWinningText::
+	text "<PLAYER> got ¥@"
+	TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text ""
+	line "for winning!"
+	prompt
+
+_TrainerDefeatedText::
+	text "<PLAYER> defeated"
+	line "@"
+	TX_RAM wTrainerName
+	text "!"
+	prompt
+
+_PlayerMonFaintedText::
+	TX_RAM wBattleMonNick
+	text ""
+	line "fainted!"
+	prompt
+
+_UseNextMonText::
+	text "Use next #MON?"
+	done
+
+_Sony1WinText::
+	text "<RIVAL>: Yeah! Am"
+	line "I great or what?"
+	prompt
+
+_PlayerBlackedOutText2::
+	text "<PLAYER> is out of"
+	line "useable #MON!"
+
+	para "<PLAYER> blacked"
+	line "out!"
+	prompt
+
+_LinkBattleLostText::
+	text "<PLAYER> lost to"
+	line "@"
+	TX_RAM wTrainerName
+	text "!"
+	prompt
+
+_TrainerAboutToUseText::
+	TX_RAM wTrainerName
+	text " is"
+	line "about to use"
+	cont"@"
+	TX_RAM wEnemyMonNick
+	text "!"
+
+	para "Will <PLAYER>"
+	line "change #MON?"
+	done
+
+_TrainerSentOutText::
+	TX_RAM wTrainerName
+	text " sent"
+	line "out @"
+	TX_RAM wEnemyMonNick
+	text "!"
+	done
+
+_NoWillText::
+	text "There's no will"
+	line "to fight!"
+	prompt
+
+_CantEscapeText::
+	text "Can't escape!"
+	prompt
+
+_NoRunningText::
+	text "No! There's no"
+	line "running from a"
+	cont "trainer battle!"
+	prompt
+
+_GotAwayText::
+	text "Got away safely!"
+	prompt
+
+_ItemsCantBeUsedHereText::
+	text "Items can't be"
+	line "used here."
+	prompt
+
+_AlreadyOutText::
+	TX_RAM wBattleMonNick
+	text " is"
+	line "already out!"
+	prompt
+
+_MoveNoPPText::
+	text "No PP left for"
+	line "this move!"
+	prompt
+
+_MoveDisabledText::
+	text "The move is"
+	line "disabled!"
+	prompt
+
+_NoMovesLeftText::
+	TX_RAM wBattleMonNick
+	text " has no"
+	line "moves left!"
+	done
+
+_MultiHitText::
+	text "Hit the enemy"
+	line "@"
+	TX_NUM wPlayerNumHits,1,1
+	text " times!"
+	prompt
+
+_ScaredText::
+	TX_RAM wBattleMonNick
+	text " is too"
+	line "scared to move!"
+	prompt
+
+_GetOutText::
+	text "GHOST: Get out..."
+	line "Get out..."
+	prompt
+
+_FastAsleepText::
+	text "<USER>"
+	line "is fast asleep!"
+	prompt
+
+_WokeUpText::
+	text "<USER>"
+	line "woke up!"
+	prompt
+
+_IsFrozenText::
+	text "<USER>"
+	line "is frozen solid!"
+	prompt
+
+_FullyParalyzedText::
+	text "<USER>'s"
+	line "fully paralyzed!"
+	prompt
+
+_FlinchedText::
+	text "<USER>"
+	line "flinched!"
+	prompt
+
+_MustRechargeText::
+	text "<USER>"
+	line "must recharge!"
+	prompt
+
+_DisabledNoMoreText::
+	text "<USER>'s"
+	line "disabled no more!"
+	prompt
+
+_IsConfusedText::
+	text "<USER>"
+	line "is confused!"
+	prompt
+
+_HurtItselfText::
+	text "It hurt itself in"
+	line "its confusion!"
+	prompt
+
+_ConfusedNoMoreText::
+	text "<USER>'s"
+	line "confused no more!"
+	prompt
+
+_SavingEnergyText::
+	text "<USER>"
+	line "is saving energy!"
+	prompt
+
+_UnleashedEnergyText::
+	text "<USER>"
+	line "unleashed energy!"
+	prompt
+
+_ThrashingAboutText::
+	text "<USER>'s"
+	line "thrashing about!"
+	done
+
+_AttackContinuesText::
+	text "<USER>'s"
+	line "attack continues!"
+	done
+
+_CantMoveText::
+	text "<USER>"
+	line "can't move!"
+	prompt
+
+_MoveIsDisabledText::
+	text "<USER>'s"
+	line "@"
+	TX_RAM wcd6d
+	text " is"
+	cont "disabled!"
+	prompt
+
+_MonName1Text::
+	text "<USER>@@"
+
+_Used1Text::
+	text ""
+	line "used @@"
+
+_Used2Text::
+	text ""
+	line "used @@"
+
+_InsteadText::
+	text "instead,"
+	cont "@@"
+
+_CF4BText::
+	TX_RAM wcf4b
+	text "@"
+
+_ExclamationPoint1Text::
+	text "!"
+	done
+
+_ExclamationPoint2Text::
+	text "!"
+	done
+
+_ExclamationPoint3Text::
+	text "!"
+	done
+
+_ExclamationPoint4Text::
+	text "!"
+	done
+
+_ExclamationPoint5Text::
+	text "!"
+	done
+
+_AttackMissedText::
+	text "<USER>'s"
+	line "attack missed!"
+	prompt
+
+_KeptGoingAndCrashedText::
+	text "<USER>"
+	line "kept going and"
+	cont "crashed!"
+	prompt
+
+_UnaffectedText::
+	text "<TARGET>'s"
+	line "unaffected!"
+	prompt
+
+_DoesntAffectMonText::
+	text "It doesn't affect"
+	line "<TARGET>!"
+	prompt
+
+_CriticalHitText::
+	text "Critical hit!"
+	prompt
+
+_OHKOText::
+	text "One-hit KO!"
+	prompt
+
+_LoafingAroundText::
+	TX_RAM wBattleMonNick
+	text " is"
+	line "loafing around."
+	prompt
+
+_BeganToNapText::
+	TX_RAM wBattleMonNick
+	text " began"
+	line "to nap!"
+	prompt
+
+_WontObeyText::
+	TX_RAM wBattleMonNick
+	text " won't"
+	line "obey!"
+	prompt
+
+_TurnedAwayText::
+	TX_RAM wBattleMonNick
+	text " turned"
+	line "away!"
+	prompt
+
+_IgnoredOrdersText::
+	TX_RAM wBattleMonNick
+	text ""
+	line "ignored orders!"
+	prompt
+
+_SubstituteTookDamageText::
+	text "The SUBSTITUTE"
+	line "took damage for"
+	cont "<TARGET>!"
+	prompt
+
+_SubstituteBrokeText::
+	text "<TARGET>'s"
+	line "SUBSTITUTE broke!"
+	prompt
+
+_BuildingRageText::
+	text "<USER>'s"
+	line "RAGE is building!"
+	prompt
+
+_MirrorMoveFailedText::
+	text "The MIRROR MOVE"
+	next "failed!"
+	prompt
+
+_HitXTimesText::
+	text "Hit @"
+	TX_NUM wEnemyNumHits, 1, 1
+	text " times!"
+	prompt
+
+_GainedText::
+	TX_RAM wcd6d
+	text " gained"
+	line "@@"
+
+_WithExpAllText::
+	text "with EXP.ALL,"
+	cont "@@"
+
+_BoostedText::
+	text "a boosted"
+	cont "@@"
+
+_ExpPointsText::
+	TX_NUM wExpAmountGained, 2, 4
+	text " EXP. Points!"
+	prompt
+
+_GrewLevelText::
+	TX_RAM wcd6d
+	text " grew"
+	line "to level @"
+	TX_NUM wCurEnemyLVL, 1, 3
+	text "!@@"
+
+_WildMonAppearedText::
+	text "Wild @"
+	TX_RAM wEnemyMonNick
+	text ""
+	line "appeared!"
+	prompt
+
+_HookedMonAttackedText::
+	text "The hooked"
+	line "@"
+	TX_RAM wEnemyMonNick
+	text ""
+	cont "attacked!"
+	prompt
+
+_EnemyAppearedText::
+	TX_RAM wEnemyMonNick
+	text ""
+	line "appeared!"
+	prompt
+
+_TrainerWantsToFightText::
+	TX_RAM wTrainerName
+	text " wants"
+	line "to fight!"
+	prompt
+
+_UnveiledGhostText::
+	text "SILPH SCOPE"
+	line "unveiled the"
+	cont "GHOST's identity!"
+	prompt
+
+_GhostCantBeIDdText::
+	text "Darn! The GHOST"
+	line "can't be ID'd!"
+	prompt
+
+_GoText::
+	text "Go! @@"
+
+_DoItText::
+	text "Do it! @@"
+
+_GetmText::
+	text "Get'm! @@"
+
+_EnemysWeakText::
+	text "The enemy's weak!"
+	line "Get'm! @@"
+
+_PlayerMon1Text::
+	TX_RAM wBattleMonNick
+	text "!"
+	done
+
+_PlayerMon2Text::
+	TX_RAM wBattleMonNick
+	text " @@"
+
+_EnoughText::
+	text "enough!@@"
+
+_OKExclamationText::
+	text "OK!@@"
+
+_GoodText::
+	text "good!@@"
+
+_ComeBackText::
+	text ""
+	line "Come back!"
+	done
+
+_SuperEffectiveText::
+	text "It's super"
+	line "effective!"
+	prompt
+
+_NotVeryEffectiveText::
+	text "It's not very"
+	line "effective..."
+	prompt
+
+_SafariZoneEatingText::
+	text "Wild @"
+	TX_RAM wEnemyMonNick
+	text ""
+	line "is eating!"
+	prompt
+
+_SafariZoneAngryText::
+	text "Wild @"
+	TX_RAM wEnemyMonNick
+	text ""
+	line "is angry!"
+	prompt
+
+; money related
+_PickUpPayDayMoneyText::
+	text "<PLAYER> picked up"
+	line "¥@"
+	TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text "!"
+	prompt
+
+_ClearSaveDataText::
+	text "Clear all saved"
+	line "data?"
+	done
+
+_WhichFloorText::
+	text "Which floor do"
+	line "you want? "
+	done
+
+_PartyMenuNormalText::
+	text "Choose a #MON."
+	done
+
+_PartyMenuItemUseText::
+	text "Use item on which"
+	line "#MON?"
+	done
+
+_PartyMenuBattleText::
+	text "Bring out which"
+	line "#MON?"
+	done
+
+_PartyMenuUseTMText::
+	text "Use TM on which"
+	line "#MON?"
+	done
+
+_PartyMenuSwapMonText::
+	text "Move #MON"
+	line "where?"
+	done
+
+_PotionText::
+	TX_RAM wcd6d
+	text ""
+	line "recovered by @"
+	TX_NUM wHPBarHPDifference, 2, 3
+	text "!"
+	done
+
+_AntidoteText::
+	TX_RAM wcd6d
+	text " was"
+	line "cured of poison!"
+	done
+
+_ParlyzHealText::
+	TX_RAM wcd6d
+	text "'s"
+	line "rid of paralysis!"
+	done
+
+_BurnHealText::
+	TX_RAM wcd6d
+	text "'s"
+	line "burn was healed!"
+	done
+
+_IceHealText::
+	TX_RAM wcd6d
+	text " was"
+	line "defrosted!"
+	done
+
+_AwakeningText::
+	TX_RAM wcd6d
+	text ""
+	line "woke up!"
+	done
+
+_FullHealText::
+	TX_RAM wcd6d
+	text "'s"
+	line "health returned!"
+	done
+
+_ReviveText::
+	TX_RAM wcd6d
+	text ""
+	line "is revitalized!"
+	done
+
+_RareCandyText::
+	TX_RAM wcd6d
+	text " grew"
+	line "to level @"
+	TX_NUM wCurEnemyLVL, 1, 3
+	text "!@@"
+
+_TurnedOnPC1Text::
+	text "<PLAYER> turned on"
+	line "the PC."
+	prompt
+
+_AccessedBillsPCText::
+	text "Accessed BILL's"
+	line "PC."
+
+	para "Accessed #MON"
+	line "Storage System."
+	prompt
+
+_AccessedSomeonesPCText::
+	text "Accessed someone's"
+	line "PC."
+
+	para "Accessed #MON"
+	line "Storage System."
+	prompt
+
+_AccessedMyPCText::
+	text "Accessed my PC."
+
+	para "Accessed Item"
+	line "Storage System."
+	prompt
+
+_TurnedOnPC2Text::
+	text "<PLAYER> turned on"
+	line "the PC."
+	prompt
+
+_WhatDoYouWantText::
+	text "What do you want"
+	line "to do?"
+	done
+
+_WhatToDepositText::
+	text "What do you want"
+	line "to deposit?"
+	done
+
+_DepositHowManyText::
+	text "How many?"
+	done
+
+_ItemWasStoredText::
+	TX_RAM wcd6d
+	text " was"
+	line "stored via PC."
+	prompt
+
+_NothingToDepositText::
+	text "You have nothing"
+	line "to deposit."
+	prompt
+
+_NoRoomToStoreText::
+	text "No room left to"
+	line "store items."
+	prompt
+
+_WhatToWithdrawText::
+	text "What do you want"
+	line "to withdraw?"
+	done
+
+_WithdrawHowManyText::
+	text "How many?"
+	done
+
+_WithdrewItemText::
+	text "Withdrew"
+	line "@"
+	TX_RAM wcd6d
+	text "."
+	prompt
+
+_NothingStoredText::
+	text "There is nothing"
+	line "stored."
+	prompt
+
+_CantCarryMoreText::
+	text "You can't carry"
+	line "any more items."
+	prompt
+
+_WhatToTossText::
+	text "What do you want"
+	line "to toss away?"
+	done
+
+_TossHowManyText::
+	text "How many?"
+	done
+
+_AccessedHoFPCText::
+	text "Accessed #MON"
+	line "LEAGUE's site."
+
+	para "Accessed the HALL"
+	line "OF FAME List."
+	prompt
+
+_SwitchOnText::
+	text "Switch on!"
+	prompt
+
+_WhatText::
+	text "What?"
+	done
+
+_DepositWhichMonText::
+	text "Deposit which"
+	line "#MON?"
+	done
+
+_MonWasStoredText::
+	TX_RAM wcf4b
+	text " was"
+	line "stored in Box @"
+	TX_RAM wBoxNumString
+	text "."
+	prompt
+
+_CantDepositLastMonText::
+	text "You can't deposit"
+	line "the last #MON!"
+	prompt
+
+_BoxFullText::
+	text "Oops! This Box is"
+	line "full of #MON."
+	prompt
+
+_MonIsTakenOutText::
+	TX_RAM wcf4b
+	text " is"
+	line "taken out."
+	cont "Got @"
+	TX_RAM wcf4b
+	text "."
+	prompt
+
+_NoMonText::
+	text "What? There are"
+	line "no #MON here!"
+	prompt
+
+_CantTakeMonText::
+	text "You can't take"
+	line "any more #MON."
+
+	para "Deposit #MON"
+	line "first."
+	prompt
+
+_ReleaseWhichMonText::
+	text "Release which"
+	line "#MON?"
+	done
+
+_OnceReleasedText::
+	text "Once released,"
+	line "@"
+	TX_RAM wcf4b
+	text " is"
+	cont "gone forever. OK?"
+	done
+
+_MonWasReleasedText::
+	TX_RAM wcf4b
+	text " was"
+	line "released outside."
+	cont "Bye @"
+
+_CF4BExclamationText::
+	TX_RAM wcf4b
+	text "!"
+	prompt
+
+_RequireCoinCaseText::
+	text "A COIN CASE is"
+	line "required!@@"
+
+_ExchangeCoinsForPrizesText::
+	text "We exchange your"
+	line "coins for prizes."
+	prompt
+
+_WhichPrizeText::
+	text "Which prize do"
+	line "you want?"
+	done
+
+_HereYouGoText::
+	text "Here you go!@@"
+
+_SoYouWantPrizeText::
+	text "So, you want"
+	line "@"
+	TX_RAM wcd6d
+	text "?"
+	done
+
+_SorryNeedMoreCoinsText::
+	text "Sorry, you need"
+	line "more coins.@@"
+
+_OopsYouDontHaveEnoughRoomText::
+	text "Oops! You don't"
+	line "have enough room.@@"
+
+_OhFineThenText::
+	text "Oh, fine then.@@"
+
+_GetDexRatedText::
+	text "Want to get your"
+	line "#DEX rated?"
+	done
+
+_ClosedOaksPCText::
+	text "Closed link to"
+	line "PROF.OAK's PC.@@"
+
+_AccessedOaksPCText::
+	text "Accessed PROF."
+	line "OAK's PC."
+
+	para "Accessed #DEX"
+	line "Rating System."
+	prompt
+
+_WhereWouldYouLikeText::
+	text "Where would you"
+	line "like to go?"
+	done
+
+_PleaseWaitText::
+	text "OK, please wait"
+	line "just a moment."
+	done
+
+_LinkCanceledText::
+	text "The link was"
+	line "canceled."
+	done
+
+_OakSpeechText1::
+	text "Hello there!"
+	line "Welcome to the"
+	cont "world of #MON!"
+
+	para "My name is OAK!"
+	line "People call me"
+	cont "the #MON PROF!"
+	prompt
+
+_OakSpeechText2A::
+	text "This world is"
+	line "inhabited by"
+	cont "creatures called"
+	cont "#MON!@@"
+
+_OakSpeechText2B::
+	text $51,"For some people,"
+	line "#MON are"
+	cont "pets. Others use"
+	cont "them for fights."
+
+	para "Myself..."
+
+	para "I study #MON"
+	line "as a profession."
+	prompt
+
+_IntroducePlayerText::
+	text "First, what is"
+	line "your name?"
+	prompt
+
+_IntroduceRivalText::
+	text "This is my grand-"
+	line "son. He's been"
+	cont "your rival since"
+	cont "you were a baby."
+
+	para "...Erm, what is"
+	line "his name again?"
+	prompt
+
+_OakSpeechText3::
+	text "<PLAYER>!"
+
+	para "Your very own"
+	line "#MON legend is"
+	cont "about to unfold!"
+
+	para "A world of dreams"
+	line "and adventures"
+	cont "with #MON"
+	cont "awaits! Let's go!"
+	done
+
+_DoYouWantToNicknameText::
+	text "Do you want to"
+	line "give a nickname"
+	cont "to @"
+	TX_RAM wcd6d
+	text "?"
+	done
+
+_YourNameIsText::
+	text "Right! So your"
+	line "name is <PLAYER>!"
+	prompt
+
+_HisNameIsText::
+	text "That's right! I"
+	line "remember now! His"
+	cont "name is <RIVAL>!"
+	prompt
+
+_WillBeTradedText::
+	TX_RAM wNameOfPlayerMonToBeTraded
+	text " and"
+	line "@"
+	TX_RAM wcd6d
+	text " will"
+	cont "be traded."
+	done
+
+_Char00Text::
+	TX_NUM hSpriteIndexOrTextID,1,2
+	text " ERROR."
+	done
+
+_Char55Text::
+	text $4B,"@@"
diff --git a/data/text/text_3.asm b/data/text/text_3.asm
new file mode 100644
index 00000000..3b2ff787
--- /dev/null
+++ b/data/text/text_3.asm
@@ -0,0 +1,324 @@
+_FileDataDestroyedText::
+	text "The file data is"
+	line "destroyed!"
+	prompt
+
+_WouldYouLikeToSaveText::
+	text "Would you like to"
+	line "SAVE the game?"
+	done
+
+_GameSavedText::
+	text "<PLAYER> saved"
+	line "the game!"
+	done
+
+_OlderFileWillBeErasedText::
+	text "The older file"
+	line "will be erased to"
+	cont "save. Okay?"
+	done
+
+_WhenYouChangeBoxText::
+	text "When you change a"
+	line "#MON BOX, data"
+	cont "will be saved."
+
+	para "Is that okay?"
+	done
+
+_ChooseABoxText::
+	text "Choose a"
+	line "<pkmn> BOX.@@"
+
+_EvolvedText::
+	TX_RAM wcf4b
+	text " evolved"
+	done
+
+_IntoText::
+	text ""
+	line "into @"
+	TX_RAM wcd6d
+	text "!"
+	done
+
+_StoppedEvolvingText::
+	text "Huh? @"
+	TX_RAM wcf4b
+	text ""
+	line "stopped evolving!"
+	prompt
+
+_IsEvolvingText::
+	text "What? @"
+	TX_RAM wcf4b
+	text ""
+	line "is evolving!"
+	done
+
+_FellAsleepText::
+	text "<TARGET>"
+	line "fell asleep!"
+	prompt
+
+_AlreadyAsleepText::
+	text "<TARGET>'s"
+	line "already asleep!"
+	prompt
+
+_PoisonedText::
+	text "<TARGET>"
+	line "was poisoned!"
+	prompt
+
+_BadlyPoisonedText::
+	text "<TARGET>'s"
+	line "badly poisoned!"
+	prompt
+
+_BurnedText::
+	text "<TARGET>"
+	line "was burned!"
+	prompt
+
+_FrozenText::
+	text "<TARGET>"
+	line "was frozen solid!"
+	prompt
+
+_FireDefrostedText::
+	text "Fire defrosted"
+	line "<TARGET>!"
+	prompt
+
+_MonsStatsRoseText::
+	text "<USER>'s"
+	line "@"
+	TX_RAM wcf4b
+	text "@@"
+
+_GreatlyRoseText::
+	text $4c, "greatly@@"
+
+_RoseText::
+	text " rose!"
+	prompt
+
+_MonsStatsFellText::
+	text "<TARGET>'s"
+	line "@"
+	TX_RAM wcf4b
+	text "@@"
+
+_GreatlyFellText::
+	text $4c, "greatly@@"
+
+_FellText::
+	text " fell!"
+	prompt
+
+_RanFromBattleText::
+	text "<USER>"
+	line "ran from battle!"
+	prompt
+
+_RanAwayScaredText::
+	text "<TARGET>"
+	line "ran away scared!"
+	prompt
+
+_WasBlownAwayText::
+	text "<TARGET>"
+	line "was blown away!"
+	prompt
+
+_ChargeMoveEffectText::
+	text "<USER>@@"
+
+_MadeWhirlwindText::
+	text ""
+	line "made a whirlwind!"
+	prompt
+
+_TookInSunlightText::
+	text ""
+	line "took in sunlight!"
+	prompt
+
+_LoweredItsHeadText::
+	text ""
+	line "lowered its head!"
+	prompt
+
+_SkyAttackGlowingText::
+	text ""
+	line "is glowing!"
+	prompt
+
+_FlewUpHighText::
+	text ""
+	line "flew up high!"
+	prompt
+
+_DugAHoleText::
+	text ""
+	line "dug a hole!"
+	prompt
+
+_BecameConfusedText::
+	text "<TARGET>"
+	line "became confused!"
+	prompt
+
+_MimicLearnedMoveText::
+	text "<USER>"
+	line "learned"
+	cont "@"
+	TX_RAM wcd6d
+	text "!"
+	prompt
+
+_MoveWasDisabledText::
+	text "<TARGET>'s"
+	line "@"
+	TX_RAM wcd6d
+	text " was"
+	cont "disabled!"
+	prompt
+
+_NothingHappenedText::
+	text "Nothing happened!"
+	prompt
+
+_NoEffectText::
+	text "No effect!"
+	prompt
+
+_ButItFailedText::
+	text "But, it failed! "
+	prompt
+
+_DidntAffectText::
+	text "It didn't affect"
+	line "<TARGET>!"
+	prompt
+
+_IsUnaffectedText::
+	text "<TARGET>"
+	line "is unaffected!"
+	prompt
+
+_ParalyzedMayNotAttackText::
+	text "<TARGET>'s"
+	line "paralyzed! It may"
+	cont "not attack!"
+	prompt
+
+_SubstituteText::
+	text "It created a"
+	line "SUBSTITUTE!"
+	prompt
+
+_HasSubstituteText::
+	text "<USER>"
+	line "has a SUBSTITUTE!"
+	prompt
+
+_TooWeakSubstituteText::
+	text "Too weak to make"
+	line "a SUBSTITUTE!"
+	prompt
+
+_CoinsScatteredText::
+	text "Coins scattered"
+	line "everywhere!"
+	prompt
+
+_GettingPumpedText::
+	text "<USER>'s"
+	line "getting pumped!"
+	prompt
+
+_WasSeededText::
+	text "<TARGET>"
+	line "was seeded!"
+	prompt
+
+_EvadedAttackText::
+	text "<TARGET>"
+	line "evaded attack!"
+	prompt
+
+_HitWithRecoilText::
+	text "<USER>'s"
+	line "hit with recoil!"
+	prompt
+
+_ConvertedTypeText::
+	text "Converted type to"
+	line "<TARGET>'s!"
+	prompt
+
+_StatusChangesEliminatedText::
+	text "All STATUS changes"
+	line "are eliminated!"
+	prompt
+
+_StartedSleepingEffect::
+	text "<USER>"
+	line "started sleeping!"
+	done
+
+_FellAsleepBecameHealthyText::
+	text "<USER>"
+	line "fell asleep and"
+	cont "became healthy!"
+	done
+
+_RegainedHealthText::
+	text "<USER>"
+	line "regained health!"
+	prompt
+
+_TransformedText::
+	text "<USER>"
+	line "transformed into"
+	cont "@"
+	TX_RAM wcd6d
+	text "!"
+	prompt
+
+_LightScreenProtectedText::
+	text "<USER>'s"
+	line "protected against"
+	cont "special attacks!"
+	prompt
+
+_ReflectGainedArmorText::
+	text "<USER>"
+	line "gained armor!"
+	prompt
+
+_ShroudedInMistText::
+	text "<USER>'s"
+	line "shrouded in mist!"
+	prompt
+
+_SuckedHealthText::
+	text "Sucked health from"
+	line "<TARGET>!"
+	prompt
+
+_DreamWasEatenText::
+	text "<TARGET>'s"
+	line "dream was eaten!"
+	prompt
+
+_TradeCenterText1::
+	text "!"
+	done
+
+_ColosseumText1::
+	text "!"
+	done
diff --git a/data/text/text_4.asm b/data/text/text_4.asm
new file mode 100644
index 00000000..6ec22680
--- /dev/null
+++ b/data/text/text_4.asm
@@ -0,0 +1,217 @@
+_PokemartGreetingText::
+	text "Hi there!"
+	next "May I help you?"
+	done
+
+_PokemonFaintedText::
+	TX_RAM wcd6d
+	text ""
+	line "fainted!"
+	done
+
+_PlayerBlackedOutText::
+	text "<PLAYER> is out of"
+	line "useable #MON!"
+
+	para "<PLAYER> blacked"
+	line "out!"
+	prompt
+
+_RepelWoreOffText::
+	text "REPEL's effect"
+	line "wore off."
+	done
+
+_PokemartBuyingGreetingText::
+	text "Take your time."
+	done
+
+_PokemartTellBuyPriceText::
+	TX_RAM wcf4b
+	text "?"
+	line "That will be"
+	cont "¥@"
+	TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text ". OK?"
+	done
+
+_PokemartBoughtItemText::
+	text "Here you are!"
+	line "Thank you!"
+	prompt
+
+_PokemartNotEnoughMoneyText::
+	text "You don't have"
+	line "enough money."
+	prompt
+
+_PokemartItemBagFullText::
+	text "You can't carry"
+	line "any more items."
+	prompt
+
+_PokemonSellingGreetingText::
+	text "What would you"
+	line "like to sell?"
+	done
+
+_PokemartTellSellPriceText::
+	text "I can pay you"
+	line "¥@"
+	TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text " for that."
+	done
+
+_PokemartItemBagEmptyText::
+	text "You don't have"
+	line "anything to sell."
+	prompt
+
+_PokemartUnsellableItemText::
+	text "I can't put a"
+	line "price on that."
+	prompt
+
+_PokemartThankYouText::
+	text "Thank you!"
+	done
+
+_PokemartAnythingElseText::
+	text "Is there anything"
+	line "else I can do?"
+	done
+
+_LearnedMove1Text::
+	TX_RAM wLearnMoveMonName
+	text " learned"
+	line "@"
+	TX_RAM wcf4b
+	text "!@@"
+
+_WhichMoveToForgetText::
+	text "Which move should"
+	next "be forgotten?"
+	done
+
+_AbandonLearningText::
+	text "Abandon learning"
+	line "@"
+	TX_RAM wcf4b
+	text "?"
+	done
+
+_DidNotLearnText::
+	TX_RAM wLearnMoveMonName
+	text ""
+	line "did not learn"
+	cont "@"
+	TX_RAM wcf4b
+	text "!"
+	prompt
+
+_TryingToLearnText::
+	TX_RAM wLearnMoveMonName
+	text " is"
+	line "trying to learn"
+	cont "@"
+	TX_RAM wcf4b
+	text "!"
+
+	para "But, @"
+	TX_RAM wLearnMoveMonName
+	text ""
+	line "can't learn more"
+	cont "than 4 moves!"
+
+	para "Delete an older"
+	line "move to make room"
+	cont "for @"
+	TX_RAM wcf4b
+	text "?"
+	done
+
+_OneTwoAndText::
+	text "1, 2 and...@@"
+
+_PoofText::
+	text " Poof!@@"
+
+_ForgotAndText::
+	text ""
+	para "@"
+	TX_RAM wLearnMoveMonName
+	text " forgot"
+	line "@"
+	TX_RAM wcd6d
+	text "!"
+
+	para "And..."
+	prompt
+
+_HMCantDeleteText::
+	text "HM techniques"
+	line "can't be deleted!"
+	prompt
+
+_PokemonCenterWelcomeText::
+	text "Welcome to our"
+	line "#MON CENTER!"
+
+	para "We heal your"
+	line "#MON back to"
+	cont "perfect health!"
+	prompt
+
+_ShallWeHealYourPokemonText::
+	text "Shall we heal your"
+	line "#MON?"
+	done
+
+_NeedYourPokemonText::
+	text "OK. We'll need"
+	line "your #MON."
+	done
+
+_PokemonFightingFitText::
+	text "Thank you!"
+	line "Your #MON are"
+	cont "fighting fit!"
+	prompt
+
+_PokemonCenterFarewellText::
+	text "We hope to see"
+	line "you again!"
+	done
+
+_CableClubNPCAreaReservedFor2FriendsLinkedByCableText::
+	text "This area is"
+	line "reserved for 2"
+	cont "friends who are"
+	cont "linked by cable."
+	done
+
+_CableClubNPCWelcomeText::
+	text "Welcome to the"
+	line "Cable Club!"
+	done
+
+_CableClubNPCPleaseApplyHereHaveToSaveText::
+	text "Please apply here."
+
+	para "Before opening"
+	line "the link, we have"
+	cont "to save the game."
+	done
+
+_CableClubNPCPleaseWaitText::
+	text "Please wait.@@"
+
+_CableClubNPCLinkClosedBecauseOfInactivityText::
+	text "The link has been"
+	line "closed because of"
+	cont "inactivity."
+
+	para "Please contact"
+	line "your friend and"
+	cont "come again!"
+	done
diff --git a/data/text/text_5.asm b/data/text/text_5.asm
new file mode 100644
index 00000000..26a11a40
--- /dev/null
+++ b/data/text/text_5.asm
@@ -0,0 +1,102 @@
+_CableClubNPCPleaseComeAgainText::
+	text "Please come again!"
+	done
+
+_CableClubNPCMakingPreparationsText::
+	text "We're making"
+	line "preparations."
+	cont "Please wait."
+	done
+
+_UsedStrengthText::
+	TX_RAM wcd6d
+	text " used"
+	line "STRENGTH.@@"
+
+_CanMoveBouldersText::
+	TX_RAM wcd6d
+	text " can"
+	line "move boulders."
+	prompt
+
+_CurrentTooFastText::
+	text "The current is"
+	line "much too fast!"
+	prompt
+
+_CyclingIsFunText::
+	text "Cycling is fun!"
+	line "Forget SURFing!"
+	prompt
+
+_FlashLightsAreaText::
+	text "A blinding FLASH"
+	line "lights the area!"
+	prompt
+
+_WarpToLastPokemonCenterText::
+	text "Warp to the last"
+	line "#MON CENTER."
+	done
+
+_CannotUseTeleportNowText::
+	TX_RAM wcd6d
+	text " can't"
+	line "use TELEPORT now."
+	prompt
+
+_CannotFlyHereText::
+	TX_RAM wcd6d
+	text " can't"
+	line "FLY here."
+	prompt
+
+_NotHealthyEnoughText::
+	text "Not healthy"
+	line "enough."
+	prompt
+
+_NewBadgeRequiredText::
+	text "No! A new BADGE"
+	line "is required."
+	prompt
+
+_CannotUseItemsHereText::
+	text "You can't use items"
+	line "here."
+	prompt
+
+_CannotGetOffHereText::
+	text "You can't get off"
+	line "here."
+	prompt
+
+_GotMonText::
+	text "<PLAYER> got"
+	line "@"
+	TX_RAM wcd6d
+	text "!@@"
+
+_SentToBoxText::
+	text "There's no more"
+	line "room for #MON!"
+	cont "@"
+	TX_RAM wBoxMonNicks
+	text " was"
+	cont "sent to #MON"
+	cont "BOX @"
+	TX_RAM wcf4b
+	text " on PC!"
+	done
+
+_BoxIsFullText::
+	text "There's no more"
+	line "room for #MON!"
+
+	para "The #MON BOX"
+	line "is full and can't"
+	cont "accept any more!"
+
+	para "Change the BOX at"
+	line "a #MON CENTER!"
+	done
diff --git a/data/text/text_6.asm b/data/text/text_6.asm
new file mode 100644
index 00000000..45c553cd
--- /dev/null
+++ b/data/text/text_6.asm
@@ -0,0 +1,228 @@
+_ItemUseBallText00::
+	text "It dodged the"
+	line "thrown BALL!"
+
+	para "This #MON"
+	line "can't be caught!"
+	prompt
+
+_ItemUseBallText01::
+	text "You missed the"
+	line "#MON!"
+	prompt
+
+_ItemUseBallText02::
+	text "Darn! The #MON"
+	line "broke free!"
+	prompt
+
+_ItemUseBallText03::
+	text "Aww! It appeared"
+	line "to be caught! "
+	prompt
+
+_ItemUseBallText04::
+	text "Shoot! It was so"
+	line "close too!"
+	prompt
+
+_ItemUseBallText05::
+	text "All right!"
+	line "@"
+	TX_RAM wEnemyMonNick
+	text " was"
+	cont "caught!@@"
+
+_ItemUseBallText07::
+	TX_RAM wBoxMonNicks
+	text " was"
+	line "transferred to"
+	cont "BILL's PC!"
+	prompt
+
+_ItemUseBallText08::
+	TX_RAM wBoxMonNicks
+	text " was"
+	line "transferred to"
+	cont "someone's PC!"
+	prompt
+
+_ItemUseBallText06::
+	text "New #DEX data"
+	line "will be added for"
+	cont "@"
+	TX_RAM wEnemyMonNick
+	text "!@@"
+
+_SurfingGotOnText::
+	text "<PLAYER> got on"
+	line "@"
+	TX_RAM wcd6d
+	text "!"
+	prompt
+
+_SurfingNoPlaceToGetOffText::
+	text "There's no place"
+	line "to get off!"
+	prompt
+
+_VitaminStatRoseText::
+	TX_RAM wcd6d
+	text "'s"
+	line "@"
+	TX_RAM wcf4b
+	text " rose."
+	prompt
+
+_VitaminNoEffectText::
+	text "It won't have any"
+	line "effect."
+	prompt
+
+_ThrewBaitText::
+	text "<PLAYER> threw"
+	line "some BAIT."
+	done
+
+_ThrewRockText::
+	text "<PLAYER> threw a"
+	line "ROCK."
+	done
+
+_PlayedFluteNoEffectText::
+	text "Played the #"
+	line "FLUTE."
+
+	para "Now, that's a"
+	line "catchy tune!"
+	prompt
+
+_FluteWokeUpText::
+	text "All sleeping"
+	line "#MON woke up."
+	prompt
+
+_PlayedFluteHadEffectText::
+	text "<PLAYER> played the"
+	line "# FLUTE.@@"
+
+_CoinCaseNumCoinsText::
+	text "Coins"
+	line "@"
+	TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text " "
+	prompt
+
+_ItemfinderFoundItemText::
+	text "Yes! ITEMFINDER"
+	line "indicates there's"
+	cont "an item nearby."
+	prompt
+
+_ItemfinderFoundNothingText::
+	text "Nope! ITEMFINDER"
+	line "isn't responding."
+	prompt
+
+_RaisePPWhichTechniqueText::
+	text "Raise PP of which"
+	line "technique?"
+	done
+
+_RestorePPWhichTechniqueText::
+	text "Restore PP of"
+	line "which technique?"
+	done
+
+_PPMaxedOutText::
+	TX_RAM wcf4b
+	text "'s PP"
+	line "is maxed out."
+	prompt
+
+_PPIncreasedText::
+	TX_RAM wcf4b
+	text "'s PP"
+	line "increased."
+	prompt
+
+_PPRestoredText::
+	text "PP was restored."
+	prompt
+
+_BootedUpTMText::
+	text "Booted up a TM!"
+	prompt
+
+_BootedUpHMText::
+	text "Booted up an HM!"
+	prompt
+
+_TeachMachineMoveText::
+	text "It contained"
+	line "@"
+	TX_RAM wcf4b
+	text "!"
+
+	para "Teach @"
+	TX_RAM wcf4b
+	text ""
+	line "to a #MON?"
+	done
+
+_MonCannotLearnMachineMoveText::
+	TX_RAM wcd6d
+	text " is not"
+	line "compatible with"
+	cont "@"
+	TX_RAM wcf4b
+	text "."
+
+	para "It can't learn"
+	line "@"
+	TX_RAM wcf4b
+	text "."
+	prompt
+
+_ItemUseNotTimeText::
+	text "OAK: <PLAYER>!"
+	line "This isn't the"
+	cont "time to use that! "
+	prompt
+
+_ItemUseNotYoursToUseText::
+	text "This isn't yours"
+	line "to use!"
+	prompt
+
+_ItemUseNoEffectText::
+	text "It won't have any"
+	line "effect."
+	prompt
+
+_ThrowBallAtTrainerMonText1::
+	text "The trainer"
+	line "blocked the BALL!"
+	prompt
+
+_ThrowBallAtTrainerMonText2::
+	text "Don't be a thief!"
+	prompt
+
+_NoCyclingAllowedHereText::
+	text "No cycling"
+	next "allowed here."
+	prompt
+
+_NoSurfingHereText::
+	text "No SURFing on"
+	line "@"
+	TX_RAM wcd6d
+	text " here!"
+	prompt
+
+_BoxFullCannotThrowBallText::
+	text "The #MON BOX"
+	line "is full! Can't"
+	cont "use that item!"
+	prompt
diff --git a/data/text/text_7.asm b/data/text/text_7.asm
new file mode 100644
index 00000000..e836fc8e
--- /dev/null
+++ b/data/text/text_7.asm
@@ -0,0 +1,196 @@
+_ItemUseText001::
+	text "<PLAYER> used@@"
+
+_ItemUseText002::
+	TX_RAM wcf4b
+	text "!"
+	done
+
+_GotOnBicycleText1::
+	text "<PLAYER> got on the@@"
+
+_GotOnBicycleText2::
+	TX_RAM wcf4b
+	text "!"
+	prompt
+
+_GotOffBicycleText1::
+	text "<PLAYER> got off@@"
+
+_GotOffBicycleText2::
+	text "the @"
+	TX_RAM wcf4b
+	text "."
+	prompt
+
+_ThrewAwayItemText::
+	text "Threw away"
+	line "@"
+	TX_RAM wcd6d
+	text "."
+	prompt
+
+_IsItOKToTossItemText::
+	text "Is it OK to toss"
+	line "@"
+	TX_RAM wcf4b
+	text "?"
+	prompt
+
+_TooImportantToTossText::
+	text "That's too impor-"
+	line "tant to toss!"
+	prompt
+
+_AlreadyKnowsText::
+	TX_RAM wcd6d
+	text " knows"
+	line "@"
+	TX_RAM wcf4b
+	text "!"
+	prompt
+
+_ConnectCableText::
+	text "Okay, connect the"
+	line "cable like so!"
+	prompt
+
+_TradedForText::
+	text "<PLAYER> traded"
+	line "@"
+	TX_RAM wInGameTradeGiveMonName
+	text " for"
+	cont "@"
+	TX_RAM wInGameTradeReceiveMonName
+	text "!@@"
+
+_WannaTrade1Text::
+	text "I'm looking for"
+	line "@"
+	TX_RAM wInGameTradeGiveMonName
+	text "! Wanna"
+
+	para "trade one for"
+	line "@"
+	TX_RAM wInGameTradeReceiveMonName
+	text "? "
+	done
+
+_NoTrade1Text::
+	text "Awww!"
+	line "Oh well..."
+	done
+
+_WrongMon1Text::
+	text "What? That's not"
+	line "@"
+	TX_RAM wInGameTradeGiveMonName
+	text "!"
+
+	para "If you get one,"
+	line "come back here!"
+	done
+
+_Thanks1Text::
+	text "Hey thanks!"
+	done
+
+_AfterTrade1Text::
+	text "Isn't my old"
+	line "@"
+	TX_RAM wInGameTradeReceiveMonName
+	text " great?"
+	done
+
+_WannaTrade2Text::
+	text "Hello there! Do"
+	line "you want to trade"
+
+	para "your @"
+	TX_RAM wInGameTradeGiveMonName
+	text ""
+	line "for @"
+	TX_RAM wInGameTradeReceiveMonName
+	text "?"
+	done
+
+_NoTrade2Text::
+	text "Well, if you"
+	line "don't want to..."
+	done
+
+_WrongMon2Text::
+	text "Hmmm? This isn't"
+	line "@"
+	TX_RAM wInGameTradeGiveMonName
+	text "."
+
+	para "Think of me when"
+	line "you get one."
+	done
+
+_Thanks2Text::
+	text "Thanks!"
+	done
+
+_AfterTrade2Text::
+	text "The @"
+	TX_RAM wInGameTradeGiveMonName
+	text " you"
+	line "traded to me"
+
+	para "went and evolved!"
+	done
+
+_WannaTrade3Text::
+	text "Hi! Do you have"
+	line "@"
+	TX_RAM wInGameTradeGiveMonName
+	text "?"
+
+	para "Want to trade it"
+	line "for @"
+	TX_RAM wInGameTradeReceiveMonName
+	text "?"
+	done
+
+_NoTrade3Text::
+	text "That's too bad."
+	done
+
+_WrongMon3Text::
+	text "...This is no"
+	line "@"
+	TX_RAM wInGameTradeGiveMonName
+	text "."
+
+	para "If you get one,"
+	line "trade it with me!"
+	done
+
+_Thanks3Text::
+	text "Thanks pal!"
+	done
+
+_AfterTrade3Text::
+	text "How is my old"
+	line "@"
+	TX_RAM wInGameTradeReceiveMonName
+	text "?"
+
+	para "My @"
+	TX_RAM wInGameTradeGiveMonName
+	text " is"
+	line "doing great!"
+	done
+
+_NothingToCutText::
+	text "There isn't"
+	line "anything to CUT!"
+	prompt
+
+_UsedCutText::
+	TX_RAM wcd6d
+	text " hacked"
+	line "away with CUT!"
+	prompt
diff --git a/data/text/unused_names.asm b/data/text/unused_names.asm
new file mode 100644
index 00000000..e629c44e
--- /dev/null
+++ b/data/text/unused_names.asm
@@ -0,0 +1,20 @@
+UnusedNames::
+	db "かみなりバッヂ@" ; THUNDER BADGE
+	db "かいがらバッヂ@" ; SHELL BADGE
+	db "おじぞうバッヂ@" ; JIZOU BADGE
+	db "はやぶさバッヂ@" ; FALCON BADGE
+	db "ひんやりバッヂ@" ; CHILL BADGE
+	db "なかよしバッヂ@" ; FRIENDSHIP BADGE
+	db "バラバッヂ@" ; ROSE BADGE
+	db "ひのたまバッヂ@" ; FIREBALL BADGE
+	db "ゴールドバッヂ@" ; GOLD BADGE
+	db "たまご@" ; EGG
+	db "ひよこ@" ; CHICK
+	db "ブロンズ@" ; BRONZE
+	db "シルバー@" ; SILVER
+	db "ゴールド@" ; GOLD
+	db "プチキャプテン@" ; PETIT CAPTAIN
+	db "キャプテン@" ; CAPTAIN
+	db "プチマスター@" ; PETIT MASTER
+	db "マスター@" ; MASTER
+	db "エクセレント" ; EXCELLENT
diff --git a/data/bike_riding_tilesets.asm b/data/tilesets/bike_riding_tilesets.asm
similarity index 100%
rename from data/bike_riding_tilesets.asm
rename to data/tilesets/bike_riding_tilesets.asm
diff --git a/data/bookshelf_tile_ids.asm b/data/tilesets/bookshelf_tile_ids.asm
similarity index 100%
rename from data/bookshelf_tile_ids.asm
rename to data/tilesets/bookshelf_tile_ids.asm
diff --git a/data/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm
similarity index 100%
rename from data/collision_tile_ids.asm
rename to data/tilesets/collision_tile_ids.asm
diff --git a/data/cut_tree_blocks.asm b/data/tilesets/cut_tree_blocks.asm
similarity index 100%
rename from data/cut_tree_blocks.asm
rename to data/tilesets/cut_tree_blocks.asm
diff --git a/data/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm
similarity index 100%
rename from data/door_tile_ids.asm
rename to data/tilesets/door_tile_ids.asm
diff --git a/data/dungeon_tilesets.asm b/data/tilesets/dungeon_tilesets.asm
similarity index 100%
rename from data/dungeon_tilesets.asm
rename to data/tilesets/dungeon_tilesets.asm
diff --git a/data/ledge_tiles.asm b/data/tilesets/ledge_tiles.asm
similarity index 100%
rename from data/ledge_tiles.asm
rename to data/tilesets/ledge_tiles.asm
diff --git a/data/tileset_headers.asm b/data/tilesets/tileset_headers.asm
similarity index 100%
rename from data/tileset_headers.asm
rename to data/tilesets/tileset_headers.asm
diff --git a/data/warp_carpet_tile_ids.asm b/data/tilesets/warp_carpet_tile_ids.asm
similarity index 100%
rename from data/warp_carpet_tile_ids.asm
rename to 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
similarity index 100%
rename from data/warp_pad_hole_tile_ids.asm
rename to data/tilesets/warp_pad_hole_tile_ids.asm
diff --git a/data/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm
similarity index 100%
rename from data/warp_tile_ids.asm
rename to data/tilesets/warp_tile_ids.asm
diff --git a/data/water_tilesets.asm b/data/tilesets/water_tilesets.asm
similarity index 100%
rename from data/water_tilesets.asm
rename to data/tilesets/water_tilesets.asm
diff --git a/data/trainer_ai_pointers.asm b/data/trainers/ai_pointers.asm
similarity index 95%
rename from data/trainer_ai_pointers.asm
rename to data/trainers/ai_pointers.asm
index d7cb5f19..26f3001e 100644
--- a/data/trainer_ai_pointers.asm
+++ b/data/trainers/ai_pointers.asm
@@ -2,6 +2,7 @@ TrainerAIPointers:
 ; one entry per trainer class
 ; first byte, number of times (per Pokémon) it can occur
 ; next two bytes, pointer to AI subroutine for trainer class
+; subroutines are defined in engine/battle/trainer_ai.asm
 	dbw 3,GenericAI
 	dbw 3,GenericAI
 	dbw 3,GenericAI
diff --git a/data/trainer_types.asm b/data/trainers/encounter_types.asm
similarity index 100%
rename from data/trainer_types.asm
rename to data/trainers/encounter_types.asm
diff --git a/data/trainer_move_choices.asm b/data/trainers/move_choices.asm
similarity index 100%
rename from data/trainer_move_choices.asm
rename to data/trainers/move_choices.asm
diff --git a/text/trainer_name_pointers.asm b/data/trainers/name_pointers.asm
similarity index 100%
rename from text/trainer_name_pointers.asm
rename to data/trainers/name_pointers.asm
diff --git a/text/trainer_names.asm b/data/trainers/names.asm
similarity index 100%
rename from text/trainer_names.asm
rename to data/trainers/names.asm
diff --git a/data/trainer_parties.asm b/data/trainers/parties.asm
similarity index 100%
rename from data/trainer_parties.asm
rename to data/trainers/parties.asm
diff --git a/data/trainer_pic_money_pointers.asm b/data/trainers/pic_pointers_money.asm
similarity index 100%
rename from data/trainer_pic_money_pointers.asm
rename to data/trainers/pic_pointers_money.asm
diff --git a/data/trainer_moves.asm b/data/trainers/special_moves.asm
similarity index 100%
rename from data/trainer_moves.asm
rename to data/trainers/special_moves.asm
diff --git a/text/type_names.asm b/data/types/names.asm
similarity index 100%
rename from text/type_names.asm
rename to data/types/names.asm
diff --git a/data/type_effects.asm b/data/types/type_matchups.asm
similarity index 100%
rename from data/type_effects.asm
rename to data/types/type_matchups.asm
diff --git a/data/good_rod.asm b/data/wild/good_rod.asm
similarity index 100%
rename from data/good_rod.asm
rename to data/wild/good_rod.asm
diff --git a/data/wild_mons.asm b/data/wild/grass_water.asm
similarity index 61%
rename from data/wild_mons.asm
rename to data/wild/grass_water.asm
index e089a582..5697300e 100755
--- a/data/wild_mons.asm
+++ b/data/wild/grass_water.asm
@@ -260,62 +260,62 @@ WildDataPointers:
         ; followed by 20 bytes:
         ; level, species (ten times)
 
-INCLUDE "data/wildPokemon/nomons.asm"
-INCLUDE "data/wildPokemon/route1.asm"
-INCLUDE "data/wildPokemon/route2.asm"
-INCLUDE "data/wildPokemon/route22.asm"
-INCLUDE "data/wildPokemon/viridianforest.asm"
-INCLUDE "data/wildPokemon/route3.asm"
-INCLUDE "data/wildPokemon/mtmoon1.asm"
-INCLUDE "data/wildPokemon/mtmoonb1.asm"
-INCLUDE "data/wildPokemon/mtmoonb2.asm"
-INCLUDE "data/wildPokemon/route4.asm"
-INCLUDE "data/wildPokemon/route24.asm"
-INCLUDE "data/wildPokemon/route25.asm"
-INCLUDE "data/wildPokemon/route9.asm"
-INCLUDE "data/wildPokemon/route5.asm"
-INCLUDE "data/wildPokemon/route6.asm"
-INCLUDE "data/wildPokemon/route11.asm"
-INCLUDE "data/wildPokemon/rocktunnel1.asm"
-INCLUDE "data/wildPokemon/rocktunnel2.asm"
-INCLUDE "data/wildPokemon/route10.asm"
-INCLUDE "data/wildPokemon/route12.asm"
-INCLUDE "data/wildPokemon/route8.asm"
-INCLUDE "data/wildPokemon/route7.asm"
-INCLUDE "data/wildPokemon/pokemontower1.asm"
-INCLUDE "data/wildPokemon/pokemontower2.asm"
-INCLUDE "data/wildPokemon/pokemontower3.asm"
-INCLUDE "data/wildPokemon/pokemontower4.asm"
-INCLUDE "data/wildPokemon/pokemontower5.asm"
-INCLUDE "data/wildPokemon/pokemontower6.asm"
-INCLUDE "data/wildPokemon/pokemontower7.asm"
-INCLUDE "data/wildPokemon/route13.asm"
-INCLUDE "data/wildPokemon/route14.asm"
-INCLUDE "data/wildPokemon/route15.asm"
-INCLUDE "data/wildPokemon/route16.asm"
-INCLUDE "data/wildPokemon/route17.asm"
-INCLUDE "data/wildPokemon/route18.asm"
-INCLUDE "data/wildPokemon/safarizonecenter.asm"
-INCLUDE "data/wildPokemon/safarizone1.asm"
-INCLUDE "data/wildPokemon/safarizone2.asm"
-INCLUDE "data/wildPokemon/safarizone3.asm"
-INCLUDE "data/wildPokemon/waterpokemon.asm"
-INCLUDE "data/wildPokemon/seafoamisland1.asm"
-INCLUDE "data/wildPokemon/seafoamislandb1.asm"
-INCLUDE "data/wildPokemon/seafoamislandb2.asm"
-INCLUDE "data/wildPokemon/seafoamislandb3.asm"
-INCLUDE "data/wildPokemon/seafoamislandb4.asm"
-INCLUDE "data/wildPokemon/mansion1.asm"
-INCLUDE "data/wildPokemon/mansion2.asm"
-INCLUDE "data/wildPokemon/mansion3.asm"
-INCLUDE "data/wildPokemon/mansionb1.asm"
-INCLUDE "data/wildPokemon/route21.asm"
-INCLUDE "data/wildPokemon/ceruleancave1.asm"
-INCLUDE "data/wildPokemon/ceruleancave2.asm"
-INCLUDE "data/wildPokemon/ceruleancaveb1.asm"
-INCLUDE "data/wildPokemon/powerplant.asm"
-INCLUDE "data/wildPokemon/route23.asm"
-INCLUDE "data/wildPokemon/victoryroad2.asm"
-INCLUDE "data/wildPokemon/victoryroad3.asm"
-INCLUDE "data/wildPokemon/victoryroad1.asm"
-INCLUDE "data/wildPokemon/diglettscave.asm"
+INCLUDE "data/mapWilds/nothing.asm"
+INCLUDE "data/mapWilds/Route1.asm"
+INCLUDE "data/mapWilds/Route2.asm"
+INCLUDE "data/mapWilds/Route22.asm"
+INCLUDE "data/mapWilds/ViridianForest.asm"
+INCLUDE "data/mapWilds/Route3.asm"
+INCLUDE "data/mapWilds/MtMoon1F.asm"
+INCLUDE "data/mapWilds/MtMoonB1F.asm"
+INCLUDE "data/mapWilds/MtMoonB2F.asm"
+INCLUDE "data/mapWilds/Route4.asm"
+INCLUDE "data/mapWilds/Route24.asm"
+INCLUDE "data/mapWilds/Route25.asm"
+INCLUDE "data/mapWilds/Route9.asm"
+INCLUDE "data/mapWilds/Route5.asm"
+INCLUDE "data/mapWilds/Route6.asm"
+INCLUDE "data/mapWilds/Route11.asm"
+INCLUDE "data/mapWilds/RockTunnel1F.asm"
+INCLUDE "data/mapWilds/RockTunnelB1F.asm"
+INCLUDE "data/mapWilds/Route10.asm"
+INCLUDE "data/mapWilds/Route12.asm"
+INCLUDE "data/mapWilds/Route8.asm"
+INCLUDE "data/mapWilds/Route7.asm"
+INCLUDE "data/mapWilds/PokemonTower1F.asm"
+INCLUDE "data/mapWilds/PokemonTower2F.asm"
+INCLUDE "data/mapWilds/PokemonTower3F.asm"
+INCLUDE "data/mapWilds/PokemonTower4F.asm"
+INCLUDE "data/mapWilds/PokemonTower5F.asm"
+INCLUDE "data/mapWilds/PokemonTower6F.asm"
+INCLUDE "data/mapWilds/PokemonTower7F.asm"
+INCLUDE "data/mapWilds/Route13.asm"
+INCLUDE "data/mapWilds/Route14.asm"
+INCLUDE "data/mapWilds/Route15.asm"
+INCLUDE "data/mapWilds/Route16.asm"
+INCLUDE "data/mapWilds/Route17.asm"
+INCLUDE "data/mapWilds/Route18.asm"
+INCLUDE "data/mapWilds/SafariZoneCenter.asm"
+INCLUDE "data/mapWilds/SafariZoneEast.asm"
+INCLUDE "data/mapWilds/SafariZoneNorth.asm"
+INCLUDE "data/mapWilds/SafariZoneWest.asm"
+INCLUDE "data/mapWilds/SeaRoutes.asm"
+INCLUDE "data/mapWilds/SeafoamIslands1F.asm"
+INCLUDE "data/mapWilds/SeafoamIslandsB1F.asm"
+INCLUDE "data/mapWilds/SeafoamIslandsB2F.asm"
+INCLUDE "data/mapWilds/SeafoamIslandsB3F.asm"
+INCLUDE "data/mapWilds/SeafoamIslandsB4F.asm"
+INCLUDE "data/mapWilds/PokemonMansion1F.asm"
+INCLUDE "data/mapWilds/PokemonMansion2F.asm"
+INCLUDE "data/mapWilds/PokemonMansion3F.asm"
+INCLUDE "data/mapWilds/PokemonMansionB1F.asm"
+INCLUDE "data/mapWilds/Route21.asm"
+INCLUDE "data/mapWilds/CeruleanCave1F.asm"
+INCLUDE "data/mapWilds/CeruleanCave2F.asm"
+INCLUDE "data/mapWilds/CeruleanCaveB1F.asm"
+INCLUDE "data/mapWilds/PowerPlant.asm"
+INCLUDE "data/mapWilds/Route23.asm"
+INCLUDE "data/mapWilds/VictoryRoad2F.asm"
+INCLUDE "data/mapWilds/VictoryRoad3F.asm"
+INCLUDE "data/mapWilds/VictoryRoad1F.asm"
+INCLUDE "data/mapWilds/DiglettsCave.asm"
diff --git a/data/wild_probabilities.asm b/data/wild/probabilities.asm
similarity index 100%
rename from data/wild_probabilities.asm
rename to data/wild/probabilities.asm
diff --git a/data/super_rod.asm b/data/wild/super_rod.asm
similarity index 100%
rename from data/super_rod.asm
rename to data/wild/super_rod.asm
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index fcc3c99f..4f75aab9 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -649,7 +649,7 @@ DoSpecialEffectByAnimationId:
 	pop hl
 	ret
 
-INCLUDE "data/move_animation_special_effects.asm"
+INCLUDE "data/moves/animation_special_effects.asm"
 
 DoBallTossSpecialEffects:
 	ld a, [wcf91]
@@ -911,7 +911,7 @@ TailWhipAnimationUnused:
 	ld c, 20
 	jp DelayFrames
 
-INCLUDE "data/move_animation_pointers.asm"
+INCLUDE "data/moves/animation_special_effect_pointers.asm"
 
 AnimationDelay10:
 	ld c, 10
@@ -2208,7 +2208,7 @@ IsCryMove:
 	scf
 	ret
 
-INCLUDE "data/move_sfx.asm"
+INCLUDE "data/moves/sfx.asm"
 
 CopyPicTiles:
 	ld a, [H_WHOSETURN]
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm
index 62b023b0..06b02aec 100644
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -151,7 +151,7 @@ GetBattleTransitionID_IsDungeonMap:
 	res 2, c
 	ret
 
-INCLUDE "data/dungeon_maps.asm"
+INCLUDE "data/maps/dungeon_maps.asm"
 
 LoadBattleTransitionTile:
 	ld hl, vChars1 + $7f0
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 75841ccf..fec10215 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -3814,7 +3814,7 @@ DetermineExclamationPointTextNum:
 	pop bc
 	ret
 
-INCLUDE "data/move_grammar.asm"
+INCLUDE "data/moves/grammar.asm"
 
 PrintMoveFailureText:
 	ld de, wPlayerMoveEffect
@@ -5317,7 +5317,7 @@ AIGetTypeEffectiveness:
 	ld [wTypeEffectiveness], a ; store damage multiplier
 	ret
 
-INCLUDE "data/type_effects.asm"
+INCLUDE "data/types/type_matchups.asm"
 
 ; some tests that need to pass for a move to hit
 MoveHitTest:
diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm
index 8bb22a1c..2c015097 100644
--- a/engine/battle/effects.asm
+++ b/engine/battle/effects.asm
@@ -21,7 +21,7 @@ _JumpMoveEffect:
 	ld l, a
 	jp hl ; jump to special effect handler
 
-INCLUDE "data/effects_pointers.asm"
+INCLUDE "data/moves/effects_pointers.asm"
 
 SleepEffect:
 	ld de, wEnemyMonStatus
@@ -751,7 +751,7 @@ PrintStatText:
 	ld bc, $a
 	jp CopyData
 
-INCLUDE "text/stat_names.asm"
+INCLUDE "data/battle/stat_names.asm"
 
 INCLUDE "data/battle/stat_modifiers.asm"
 
diff --git a/engine/battle/print_type.asm b/engine/battle/print_type.asm
index f717f871..7da0dc8c 100644
--- a/engine/battle/print_type.asm
+++ b/engine/battle/print_type.asm
@@ -49,4 +49,4 @@ PrintType_:
 	pop hl
 	jp PlaceString
 
-INCLUDE "text/type_names.asm"
+INCLUDE "data/types/names.asm"
diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm
index 78e53b87..4d40fd82 100644
--- a/engine/battle/save_trainer_name.asm
+++ b/engine/battle/save_trainer_name.asm
@@ -18,4 +18,4 @@ SaveTrainerName::
 	jr nz, .CopyCharacter
 	ret
 
-INCLUDE "text/trainer_name_pointers.asm"
+INCLUDE "data/trainers/name_pointers.asm"
diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm
index 2850b9c2..91aef0f1 100644
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -273,19 +273,19 @@ ReadMove:
 	pop hl
 	ret
 
-INCLUDE "data/trainer_move_choices.asm"
+INCLUDE "data/trainers/move_choices.asm"
 
-INCLUDE "data/trainer_pic_money_pointers.asm"
+INCLUDE "data/trainers/pic_pointers_money.asm"
 
-INCLUDE "text/trainer_names.asm"
+INCLUDE "data/trainers/names.asm"
 
 INCLUDE "engine/battle/misc.asm"
 
 INCLUDE "engine/battle/read_trainer_party.asm"
 
-INCLUDE "data/trainer_moves.asm"
+INCLUDE "data/trainers/special_moves.asm"
 
-INCLUDE "data/trainer_parties.asm"
+INCLUDE "data/trainers/parties.asm"
 
 TrainerAI:
 	and a
@@ -319,7 +319,7 @@ TrainerAI:
 	call Random
 	jp hl
 
-INCLUDE "data/trainer_ai_pointers.asm"
+INCLUDE "data/trainers/ai_pointers.asm"
 
 JugglerAI:
 	cp 25 percent + 1
diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm
index 93409051..9d6fcb8d 100644
--- a/engine/battle/wild_encounters.asm
+++ b/engine/battle/wild_encounters.asm
@@ -101,4 +101,4 @@ TryDoWildEncounter:
 	xor a
 	ret
 
-INCLUDE "data/wild_probabilities.asm"
+INCLUDE "data/wild/probabilities.asm"
diff --git a/engine/events/hidden_items.asm b/engine/events/hidden_items.asm
index e40b0ac7..ad954c9f 100755
--- a/engine/events/hidden_items.asm
+++ b/engine/events/hidden_items.asm
@@ -18,7 +18,7 @@ HiddenItems:
 	call GetItemName
 	tx_pre_jump FoundHiddenItemText
 
-INCLUDE "data/hidden_item_coords.asm"
+INCLUDE "data/events/hidden_item_coords.asm"
 
 FoundHiddenItemText::
 	TX_FAR _FoundHiddenItemText
@@ -118,7 +118,7 @@ HiddenCoins:
 .done
 	jp PrintPredefTextID
 
-INCLUDE "data/hidden_coins.asm"
+INCLUDE "data/events/hidden_coins.asm"
 
 FoundHiddenCoinsText::
 	TX_FAR _FoundHiddenCoinsText
diff --git a/engine/events/hidden_object_functions3.asm b/engine/events/hidden_object_functions3.asm
index 1237e960..4b3262f7 100755
--- a/engine/events/hidden_object_functions3.asm
+++ b/engine/events/hidden_object_functions3.asm
@@ -36,7 +36,7 @@ PrintBookshelfText::
 	ld [$ffdb], a
 	jpba PrintCardKeyText
 
-INCLUDE "data/bookshelf_tile_ids.asm"
+INCLUDE "data/tilesets/bookshelf_tile_ids.asm"
 
 IndigoPlateauStatues::
 	TX_ASM
diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm
index c01bc3c3..c1466485 100755
--- a/engine/events/in_game_trades.asm
+++ b/engine/events/in_game_trades.asm
@@ -84,7 +84,7 @@ InGameTrade_GetMonName:
 	ld bc, NAME_LENGTH
 	jp CopyData
 
-INCLUDE "data/trades.asm"
+INCLUDE "data/events/trades.asm"
 
 InGameTrade_DoTrade:
 	xor a ; NORMAL_PARTY_MENU
diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm
index 5e08bb8f..aa86f828 100755
--- a/engine/events/prize_menu.asm
+++ b/engine/events/prize_menu.asm
@@ -145,7 +145,7 @@ GetPrizeMenuId:
 	ld c, (1 << 7 | 2)
 	jp PrintBCDNumber
 
-INCLUDE "data/prizes.asm"
+INCLUDE "data/events/prizes.asm"
 
 PrintPrizePrice:
 	coord hl, 11, 0
@@ -303,4 +303,4 @@ GetPrizeMonLevel:
 	ld [wCurEnemyLVL], a
 	ret
 
-INCLUDE "data/prize_mon_levels.asm"
+INCLUDE "data/events/prize_mon_levels.asm"
diff --git a/engine/events/saffron_guards.asm b/engine/events/saffron_guards.asm
index 091cfa1a..02ab92ea 100755
--- a/engine/events/saffron_guards.asm
+++ b/engine/events/saffron_guards.asm
@@ -12,4 +12,4 @@ RemoveGuardDrink::
 	jr z, .drinkLoop
 	jpba RemoveItemByID
 
-INCLUDE "data/guard_drink_items.asm"
+INCLUDE "data/items/guard_drink_items.asm"
diff --git a/engine/events/set_blackout_map.asm b/engine/events/set_blackout_map.asm
index 14f0ba28..e8460240 100644
--- a/engine/events/set_blackout_map.asm
+++ b/engine/events/set_blackout_map.asm
@@ -22,4 +22,4 @@ SetLastBlackoutMap:
 	pop hl
 	ret
 
-INCLUDE "data/rest_house_maps.asm"
+INCLUDE "data/maps/rest_house_maps.asm"
diff --git a/engine/events/vending_machine.asm b/engine/events/vending_machine.asm
index 554c5d4f..4a39f7b9 100755
--- a/engine/events/vending_machine.asm
+++ b/engine/events/vending_machine.asm
@@ -130,4 +130,4 @@ LoadVendingMachineItem:
 	ld [hVendingMachinePrice + 2], a
 	ret
 
-INCLUDE "data/vending_prices.asm"
+INCLUDE "data/items/vending_prices.asm"
diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm
index d2913715..7a96b36c 100755
--- a/engine/gfx/mon_icons.asm
+++ b/engine/gfx/mon_icons.asm
@@ -162,7 +162,7 @@ LoadMonPartySpriteGfxWithLCDDisabled:
 	jr nz, .loop
 	jp EnableLCD
 
-INCLUDE "data/mon_party_sprite_pointers.asm"
+INCLUDE "data/icon_pointers.asm"
 
 WriteMonPartySpriteOAMByPartyIndex:
 ; Write OAM blocks for the party mon in [hPartyMonIndex].
@@ -278,7 +278,7 @@ GetPartyMonSpriteID:
 	srl a
 	ret
 
-INCLUDE "data/mon_party_sprites.asm"
+INCLUDE "data/pokemon/menu_icons.asm"
 
 INC_FRAME_1 EQUS "0, $20"
 INC_FRAME_2 EQUS "$20, $20"
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm
index 39991d48..9ec0f04a 100755
--- a/engine/gfx/palettes.asm
+++ b/engine/gfx/palettes.asm
@@ -632,10 +632,10 @@ CopySGBBorderTiles:
 	jr nz, .tileLoop
 	ret
 
-INCLUDE "data/sgb_packets.asm"
+INCLUDE "data/sgb/sgb_packets.asm"
 
-INCLUDE "data/mon_palettes.asm"
+INCLUDE "data/pokemon/palettes.asm"
 
-INCLUDE "data/super_palettes.asm"
+INCLUDE "data/sgb/sgb_palettes.asm"
 
-INCLUDE "data/sgb_border.asm"
+INCLUDE "data/sgb/sgb_border.asm"
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 6e7bed1e..e1723118 100755
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1901,7 +1901,7 @@ ItemUseGoodRod:
 	xor 1
 	jr RodResponse
 
-INCLUDE "data/good_rod.asm"
+INCLUDE "data/wild/good_rod.asm"
 
 ItemUseSuperRod:
 	call FishingInit
@@ -2686,7 +2686,7 @@ IsKeyItem_::
 	ld [wIsKeyItem], a
 	ret
 
-INCLUDE "data/key_items.asm"
+INCLUDE "data/items/key_items.asm"
 
 SendNewMonToBox:
 	ld de, wNumInBox
@@ -2881,7 +2881,7 @@ IsNextTileShoreOrWater:
 	and a
 	ret
 
-INCLUDE "data/water_tilesets.asm"
+INCLUDE "data/tilesets/water_tilesets.asm"
 
 ReadSuperRodData:
 ; return e = 2 if no fish on this map
@@ -2928,7 +2928,7 @@ ReadSuperRodData:
 	ld e, $1 ; $1 if there's a bite
 	ret
 
-INCLUDE "data/super_rod.asm"
+INCLUDE "data/wild/super_rod.asm"
 
 ; reloads map view and processes sprite data
 ; for items that cause the overworld to be displayed
diff --git a/engine/items/tm_prices.asm b/engine/items/tm_prices.asm
index c359dc1d..85531bab 100755
--- a/engine/items/tm_prices.asm
+++ b/engine/items/tm_prices.asm
@@ -22,4 +22,4 @@ GetMachinePrice::
 	ld [hItemPrice + 2], a
 	ret
 
-INCLUDE "data/tm_prices.asm"
+INCLUDE "data/items/tm_prices.asm"
diff --git a/engine/items/tms.asm b/engine/items/tms.asm
index da1b5e72..ea7fbcad 100755
--- a/engine/items/tms.asm
+++ b/engine/items/tms.asm
@@ -33,4 +33,4 @@ TMToMove:
 	ld [wd11e], a
 	ret
 
-INCLUDE "data/tms.asm"
+INCLUDE "data/moves/tmhm_moves.asm"
diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm
index 84a92994..285dbfa5 100755
--- a/engine/items/town_map.asm
+++ b/engine/items/town_map.asm
@@ -103,7 +103,7 @@ DisplayTownMap:
 	ld [wWhichTownMapLocation], a
 	jp .townMapLoop
 
-INCLUDE "data/town_map_order.asm"
+INCLUDE "data/maps/town_map_order.asm"
 
 TownMapCursor:
 	INCBIN "gfx/town_map/town_map_cursor.1bpp"
@@ -581,9 +581,9 @@ LoadTownMapEntry:
 	ld l, a
 	ret
 
-INCLUDE "data/town_map_entries.asm"
+INCLUDE "data/maps/town_map_entries.asm"
 
-INCLUDE "text/map_names.asm"
+INCLUDE "data/maps/names.asm"
 
 MonNestIcon:
 	INCBIN "gfx/town_map/mon_nest_icon.1bpp"
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 2b86d6f4..6e78c5c3 100755
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -365,7 +365,7 @@ PrintAlphabet:
 	ld [H_AUTOBGTRANSFERENABLED], a
 	jp Delay3
 
-INCLUDE "text/alphabets.asm"
+INCLUDE "data/text/alphabets.asm"
 
 PrintNicknameAndUnderscores:
 	call CalcStringLength
@@ -435,7 +435,7 @@ DakutensAndHandakutens:
 	ld [wNamingScreenLetter], a
 	ret
 
-INCLUDE "text/dakutens.asm"
+INCLUDE "data/text/dakutens.asm"
 
 ; calculates the length of the string at wcf4b and stores it in c
 CalcStringLength:
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm
index 8e1fd480..25c9ad89 100755
--- a/engine/menus/pokedex.asm
+++ b/engine/menus/pokedex.asm
@@ -623,7 +623,7 @@ DrawTileLine:
 	pop bc
 	ret
 
-INCLUDE "data/pokedex_entries.asm"
+INCLUDE "data/pokemon/dex_entries.asm"
 
 PokedexToIndex:
 	; converts the Pokédex number at wd11e to an index
@@ -662,4 +662,4 @@ IndexToPokedex:
 	pop bc
 	ret
 
-INCLUDE "data/pokedex_order.asm"
+INCLUDE "data/pokemon/dex_order.asm"
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index b81769a2..d9501da7 100755
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -446,9 +446,9 @@ CannotGetOffHereText:
 	TX_FAR _CannotGetOffHereText
 	db "@"
 
-INCLUDE "data/party_items.asm"
+INCLUDE "data/items/use_party.asm"
 
-INCLUDE "data/overworld_items.asm"
+INCLUDE "data/items/use_overworld.asm"
 
 StartMenu_TrainerInfo::
 	call GBPalWhiteOut
diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm
index f820aae3..f6900602 100755
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -104,7 +104,7 @@ DisplayCreditsMon:
 	ld [rBGP], a
 	ret
 
-INCLUDE "data/credit_mons.asm"
+INCLUDE "data/credits/credits_mons.asm"
 
 ScrollCreditsMonLeft:
 	ld h, b
@@ -261,9 +261,9 @@ TheEndTextString:
 	db $60," ",$62," ",$64,"  ",$64," ",$66," ",$68,"@"
 	db $61," ",$63," ",$65,"  ",$65," ",$67," ",$69,"@"
 
-INCLUDE "data/credits_order.asm"
+INCLUDE "data/credits/credits_order.asm"
 
-INCLUDE "text/credits_text.asm"
+INCLUDE "data/credits/credits_text.asm"
 
 TheEndGfx:
 	INCBIN "gfx/intro_credits/the_end.2bpp"
diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index fdc9ffa3..d7112440 100755
--- a/engine/movie/oak_speech/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
@@ -187,7 +187,7 @@ DisplayIntroNameTextBox:
 .namestring
 	db "NAME@"
 
-INCLUDE "text/player_names.asm"
+INCLUDE "data/player_names.asm"
 
 GetDefaultName:
 ; a = name index
@@ -213,7 +213,7 @@ GetDefaultName:
 	ld bc, $14
 	jp CopyData
 
-INCLUDE "text/player_names_list.asm"
+INCLUDE "data/player_names_list.asm"
 
 TextTerminator_6b20:
 	db "@"
diff --git a/engine/movie/titlescreen.asm b/engine/movie/title.asm
similarity index 99%
rename from engine/movie/titlescreen.asm
rename to engine/movie/title.asm
index c30f83a9..4bdbb05d 100755
--- a/engine/movie/titlescreen.asm
+++ b/engine/movie/title.asm
@@ -382,7 +382,7 @@ CopyrightTextString:
 	next $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©'95.'96.'98 GAME FREAK inc.
 	db   "@"
 
-INCLUDE "data/title_mons.asm"
+INCLUDE "data/pokemon/title_mons.asm"
 
 ; prints version text (red, blue)
 PrintGameVersionOnTitleScreen:
diff --git a/engine/movie/titlescreen2.asm b/engine/movie/title2.asm
similarity index 100%
rename from engine/movie/titlescreen2.asm
rename to engine/movie/title2.asm
diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm
index f61ca65f..c75fbbb6 100755
--- a/engine/overworld/cut.asm
+++ b/engine/overworld/cut.asm
@@ -248,4 +248,4 @@ ReplaceTreeTileBlock:
 	ld [hl], a
 	ret
 
-INCLUDE "data/cut_tree_blocks.asm"
+INCLUDE "data/tilesets/cut_tree_blocks.asm"
diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm
index 1339430a..ed893773 100755
--- a/engine/overworld/doors.asm
+++ b/engine/overworld/doors.asm
@@ -25,4 +25,4 @@ IsPlayerStandingOnDoorTile:
 	and a
 	ret
 
-INCLUDE "data/door_tile_ids.asm"
+INCLUDE "data/tilesets/door_tile_ids.asm"
diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm
index c93f2e1b..5887660e 100755
--- a/engine/overworld/hidden_objects.asm
+++ b/engine/overworld/hidden_objects.asm
@@ -130,4 +130,4 @@ CheckIfCoordsInFrontOfPlayerMatch:
 	ld [hCoordsInFrontOfPlayerMatch], a
 	ret
 
-INCLUDE "data/hidden_objects.asm"
+INCLUDE "data/events/hidden_objects.asm"
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index 290c8c80..c56914f6 100755
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -54,7 +54,7 @@ HandleLedges::
 	call PlaySound
 	ret
 
-INCLUDE "data/ledge_tiles.asm"
+INCLUDE "data/tilesets/ledge_tiles.asm"
 
 LoadHoppingShadowOAM:
 	ld hl, vChars1 + $7f0
diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm
index 19e25435..2079bb6a 100755
--- a/engine/overworld/map_sprites.asm
+++ b/engine/overworld/map_sprites.asm
@@ -437,4 +437,4 @@ GetSplitMapSpriteSetID:
 	ld a, $01
 	ret
 
-INCLUDE "data/sprite_sets.asm"
+INCLUDE "data/maps/sprite_sets.asm"
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 0ac4f3b2..a3f6e051 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -373,7 +373,7 @@ IsPlayerStandingOnWarpPadOrHole::
 	ld [wStandingOnWarpPadOrHole], a
 	ret
 
-INCLUDE "data/warp_pad_hole_tile_ids.asm"
+INCLUDE "data/tilesets/warp_pad_hole_tile_ids.asm"
 
 FishingAnim:
 	ld c, 10
diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm
index 23da664c..69b9201f 100644
--- a/engine/overworld/player_state.asm
+++ b/engine/overworld/player_state.asm
@@ -82,7 +82,7 @@ CheckForceBikeOrSurf::
 	ld [wWalkBikeSurfStateCopy], a
 	jp ForceBikeOrSurf
 
-INCLUDE "data/force_bike_surf.asm"
+INCLUDE "data/maps/force_bike_surf.asm"
 
 IsPlayerFacingEdgeOfMap::
 	push hl
@@ -176,7 +176,7 @@ IsWarpTileInFrontOfPlayer::
 	pop hl
 	ret
 
-INCLUDE "data/warp_carpet_tile_ids.asm"
+INCLUDE "data/tilesets/warp_carpet_tile_ids.asm"
 
 IsSSAnneBowWarpTileInFrontOfPlayer:
 	ld a, [wTileInFrontOfPlayer]
@@ -215,7 +215,7 @@ IsPlayerStandingOnDoorTileOrWarpTile::
 	pop hl
 	ret
 
-INCLUDE "data/warp_tile_ids.asm"
+INCLUDE "data/tilesets/warp_tile_ids.asm"
 
 PrintSafariZoneSteps::
 	ld a, [wCurMap]
diff --git a/engine/overworld/special_warps.asm b/engine/overworld/special_warps.asm
index eee85402..042146f9 100644
--- a/engine/overworld/special_warps.asm
+++ b/engine/overworld/special_warps.asm
@@ -146,4 +146,4 @@ LoadSpecialWarpData:
 	ld [wDestinationWarpID], a
 	ret
 
-INCLUDE "data/special_warps.asm"
+INCLUDE "data/maps/special_warps.asm"
diff --git a/engine/overworld/tilesets.asm b/engine/overworld/tilesets.asm
index 6e33974f..d6b8221c 100644
--- a/engine/overworld/tilesets.asm
+++ b/engine/overworld/tilesets.asm
@@ -55,6 +55,6 @@ LoadTilesetHeader:
 .done
 	ret
 
-INCLUDE "data/dungeon_tilesets.asm"
+INCLUDE "data/tilesets/dungeon_tilesets.asm"
 
-INCLUDE "data/tileset_headers.asm"
+INCLUDE "data/tilesets/tileset_headers.asm"
diff --git a/engine/overworld/wild_mons.asm b/engine/overworld/wild_mons.asm
index df4d3121..24dc7681 100644
--- a/engine/overworld/wild_mons.asm
+++ b/engine/overworld/wild_mons.asm
@@ -30,4 +30,4 @@ LoadWildData::
 	ld bc, $0014
 	jp CopyData
 
-INCLUDE "data/wild_mons.asm"
+INCLUDE "data/wild/grass_water.asm"
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index e5855f1d..7d599404 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -376,7 +376,7 @@ KnowsHMMove::
 	and a
 	ret
 
-INCLUDE "data/hm_moves.asm"
+INCLUDE "data/moves/hm_moves.asm"
 
 DisplayDepositWithdrawMenu:
 	coord hl, 9, 10
diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm
index f50f8081..d25b71ec 100755
--- a/engine/pokemon/evos_moves.asm
+++ b/engine/pokemon/evos_moves.asm
@@ -510,4 +510,4 @@ WriteMonMoves_ShiftMoveData:
 Evolution_FlagAction:
 	predef_jump FlagActionPredef
 
-INCLUDE "data/evos_moves.asm"
+INCLUDE "data/pokemon/evos_moves.asm"
diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm
index 0a92c69b..16696713 100755
--- a/engine/slots/slot_machine.asm
+++ b/engine/slots/slot_machine.asm
@@ -881,7 +881,7 @@ SlotMachineMap:
 	INCBIN "gfx/slots/slots.tilemap"
 SlotMachineMapEnd:
 
-INCLUDE "data/slot_machine_wheels.asm"
+INCLUDE "data/events/slot_machine_wheels.asm"
 
 SlotMachineTiles1:
 IF DEF(_RED)
diff --git a/home.asm b/home.asm
index dfa1bec2..de7e90ea 100644
--- a/home.asm
+++ b/home.asm
@@ -114,7 +114,7 @@ Start::
 
 
 INCLUDE "home/joypad.asm"
-INCLUDE "data/map_header_pointers.asm"
+INCLUDE "data/maps/map_header_pointers.asm"
 INCLUDE "home/overworld.asm"
 
 CheckForUserInterruption::
@@ -910,7 +910,7 @@ InterlaceMergeSpriteBuffers::
 	jp CopyVideoData
 
 
-INCLUDE "data/collision_tile_ids.asm"
+INCLUDE "data/tilesets/collision_tile_ids.asm"
 INCLUDE "home/copy2.asm"
 INCLUDE "home/text.asm"
 INCLUDE "home/vcopy.asm"
@@ -937,7 +937,7 @@ UpdateSprites::
 	ld [MBC1RomBank], a
 	ret
 
-INCLUDE "data/mart_inventories.asm"
+INCLUDE "data/items/marts.asm"
 
 TextScriptEndingChar::
 	db "@"
@@ -2634,7 +2634,7 @@ PlayTrainerMusic::
 	ld [wNewSoundID], a
 	jp PlaySound
 
-INCLUDE "data/trainer_types.asm"
+INCLUDE "data/trainers/encounter_types.asm"
 
 ; checks if the player's coordinates match an arrow movement tile's coordinates
 ; and if so, decodes the RLE movement data
diff --git a/home/overworld.asm b/home/overworld.asm
index b96efcb4..460ce11e 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -867,7 +867,7 @@ IsBikeRidingAllowed::
 	scf
 	ret
 
-INCLUDE "data/bike_riding_tilesets.asm"
+INCLUDE "data/tilesets/bike_riding_tilesets.asm"
 
 ; load the tile pattern data of the current tileset into VRAM
 LoadTilesetTilePatternData::
diff --git a/main.asm b/main.asm
index 1c3b5800..fc920b79 100755
--- a/main.asm
+++ b/main.asm
@@ -3,19 +3,19 @@ INCLUDE "constants.asm"
 
 SECTION "bank1", ROMX
 
-INCLUDE "data/facing.asm"
+INCLUDE "data/sprite_facings.asm"
 INCLUDE "engine/events/black_out.asm"
 
 MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic"
 MewPicBack::  INCBIN "gfx/pokemon/back/mewb.pic"
-INCLUDE "data/baseStats/mew.asm"
+INCLUDE "data/pokemon/base_stats/mew.asm"
 
 INCLUDE "engine/battle/safari_zone.asm"
-INCLUDE "engine/movie/titlescreen.asm"
+INCLUDE "engine/movie/title.asm"
 INCLUDE "engine/pokemon/load_mon_data.asm"
-INCLUDE "data/item_prices.asm"
-INCLUDE "text/item_names.asm"
-INCLUDE "text/unused_names.asm"
+INCLUDE "data/items/prices.asm"
+INCLUDE "data/items/names.asm"
+INCLUDE "data/text/unused_names.asm"
 INCLUDE "engine/gfx/sprite_oam.asm"
 INCLUDE "engine/gfx/oam_dma.asm"
 INCLUDE "engine/link/print_waiting_text.asm"
@@ -49,14 +49,14 @@ INCLUDE "engine/events/display_pokedex.asm"
 SECTION "bank3", ROMX
 
 INCLUDE "engine/joypad.asm"
-INCLUDE "data/map_songs.asm"
-INCLUDE "data/map_header_banks.asm"
+INCLUDE "data/maps/songs.asm"
+INCLUDE "data/maps/map_header_banks.asm"
 INCLUDE "engine/overworld/clear_variables.asm"
 INCLUDE "engine/overworld/player_state.asm"
 INCLUDE "engine/events/poison.asm"
 INCLUDE "engine/overworld/tilesets.asm"
 INCLUDE "engine/overworld/daycare_exp.asm"
-INCLUDE "data/hide_show_data.asm"
+INCLUDE "data/maps/hide_show_data.asm"
 INCLUDE "engine/overworld/field_move_messages.asm"
 INCLUDE "engine/items/inventory.asm"
 INCLUDE "engine/overworld/wild_mons.asm"
@@ -149,7 +149,7 @@ INCLUDE "engine/overworld/ledges.asm"
 
 SECTION "bank7_1", ROMX
 
-INCLUDE "text/monster_names.asm"
+INCLUDE "data/pokemon/names.asm"
 INCLUDE "engine/movie/oak_speech/clear_save.asm"
 INCLUDE "engine/events/elevator.asm"
 
@@ -201,7 +201,7 @@ INCLUDE "engine/battle/move_effects/one_hit_ko.asm"
 
 SECTION "Battle (BANK D)", ROMX
 
-INCLUDE "engine/movie/titlescreen2.asm"
+INCLUDE "engine/movie/title2.asm"
 INCLUDE "engine/battle/link_battle_versus_text.asm"
 INCLUDE "engine/slots/slot_machine.asm"
 INCLUDE "engine/events/pewter_guys.asm"
@@ -211,9 +211,9 @@ INCLUDE "engine/slots/game_corner_slots.asm"
 
 SECTION "bankE", ROMX
 
-INCLUDE "data/moves.asm"
-INCLUDE "data/base_stats.asm"
-INCLUDE "data/cries.asm"
+INCLUDE "data/moves/moves.asm"
+INCLUDE "data/pokemon/base_stats.asm"
+INCLUDE "data/pokemon/cries.asm"
 INCLUDE "engine/battle/unused_stats_functions.asm"
 INCLUDE "engine/battle/scroll_draw_trainer_pic.asm"
 INCLUDE "engine/battle/trainer_ai.asm"
@@ -224,7 +224,6 @@ INCBIN "gfx/trade/game_boy.2bpp"
 INCBIN "gfx/trade/link_cable.2bpp"
 TradingAnimationGraphicsEnd:
 
-; Pokeball traveling through the link cable.
 TradingAnimationGraphics2: INCBIN "gfx/trade/cable_ball.2bpp"
 TradingAnimationGraphics2End:
 
@@ -380,7 +379,7 @@ RedFishingTilesBack:  INCBIN "gfx/overworld/red_fish_back.2bpp"
 RedFishingTilesSide:  INCBIN "gfx/overworld/red_fish_side.2bpp"
 RedFishingRodTiles:   INCBIN "gfx/overworld/fishing_rod.2bpp"
 
-INCLUDE "data/animations.asm"
+INCLUDE "data/moves/animations.asm"
 INCLUDE "engine/movie/evolution.asm"
 INCLUDE "engine/overworld/elevator.asm"
 INCLUDE "engine/items/tm_prices.asm"
diff --git a/text.asm b/text.asm
index a426de39..49e22ef0 100644
--- a/text.asm
+++ b/text.asm
@@ -8,3182 +8,278 @@ INCLUDE "constants/text_constants.asm"
 
 SECTION "Text 1", ROMX
 
-_CardKeySuccessText1::
-	text "Bingo!@@"
+INCLUDE "data/text/text_1.asm"
 
-_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
-
-INCLUDE "text/maps/ViridianForest.asm"
-INCLUDE "text/maps/MtMoon1F.asm"
-INCLUDE "text/maps/MtMoonB1F.asm"
-INCLUDE "text/maps/MtMoonB2F.asm"
-INCLUDE "text/maps/SSAnne1F.asm"
-INCLUDE "text/maps/SSAnne2F.asm"
-INCLUDE "text/maps/SSAnne3F.asm"
-INCLUDE "text/maps/SSAnneBow.asm"
-INCLUDE "text/maps/SSAnneKitchen.asm"
-INCLUDE "text/maps/SSAnneCaptainsRoom.asm"
-INCLUDE "text/maps/SSAnne1FRooms.asm"
-INCLUDE "text/maps/SSAnne2FRooms.asm"
-INCLUDE "text/maps/SSAnneB1FRooms.asm"
-INCLUDE "text/maps/VictoryRoad3F.asm"
-INCLUDE "text/maps/RocketHideoutB1F.asm"
-INCLUDE "text/maps/RocketHideoutB2F.asm"
-INCLUDE "text/maps/RocketHideoutB3F.asm"
-INCLUDE "text/maps/RocketHideoutB4F.asm"
-INCLUDE "text/maps/RocketHideoutElevator.asm"
-INCLUDE "text/maps/SilphCo2F.asm"
-INCLUDE "text/maps/SilphCo3F.asm"
-INCLUDE "text/maps/SilphCo4F.asm"
-INCLUDE "text/maps/SilphCo5F.asm"
+INCLUDE "text/ViridianForest.asm"
+INCLUDE "text/MtMoon1F.asm"
+INCLUDE "text/MtMoonB1F.asm"
+INCLUDE "text/MtMoonB2F.asm"
+INCLUDE "text/SSAnne1F.asm"
+INCLUDE "text/SSAnne2F.asm"
+INCLUDE "text/SSAnne3F.asm"
+INCLUDE "text/SSAnneBow.asm"
+INCLUDE "text/SSAnneKitchen.asm"
+INCLUDE "text/SSAnneCaptainsRoom.asm"
+INCLUDE "text/SSAnne1FRooms.asm"
+INCLUDE "text/SSAnne2FRooms.asm"
+INCLUDE "text/SSAnneB1FRooms.asm"
+INCLUDE "text/VictoryRoad3F.asm"
+INCLUDE "text/RocketHideoutB1F.asm"
+INCLUDE "text/RocketHideoutB2F.asm"
+INCLUDE "text/RocketHideoutB3F.asm"
+INCLUDE "text/RocketHideoutB4F.asm"
+INCLUDE "text/RocketHideoutElevator.asm"
+INCLUDE "text/SilphCo2F.asm"
+INCLUDE "text/SilphCo3F.asm"
+INCLUDE "text/SilphCo4F.asm"
+INCLUDE "text/SilphCo5F.asm"
 
 
 SECTION "Text 2", ROMX
 
-INCLUDE "text/maps/SilphCo5F_2.asm"
-INCLUDE "text/maps/SilphCo6F.asm"
-INCLUDE "text/maps/SilphCo7F.asm"
-INCLUDE "text/maps/SilphCo8F.asm"
-INCLUDE "text/maps/SilphCo9F.asm"
-INCLUDE "text/maps/SilphCo10F.asm"
-INCLUDE "text/maps/SilphCo11F.asm"
-INCLUDE "text/maps/PokemonMansion2F.asm"
-INCLUDE "text/maps/PokemonMansion3F.asm"
-INCLUDE "text/maps/PokemonMansionB1F.asm"
-INCLUDE "text/maps/SafariZoneEast.asm"
-INCLUDE "text/maps/SafariZoneNorth.asm"
-INCLUDE "text/maps/SafariZoneWest.asm"
-INCLUDE "text/maps/SafariZoneCenter.asm"
-INCLUDE "text/maps/SafariZoneCenterRestHouse.asm"
-INCLUDE "text/maps/SafariZoneSecretHouse.asm"
-INCLUDE "text/maps/SafariZoneWestRestHouse.asm"
-INCLUDE "text/maps/SafariZoneEastRestHouse.asm"
-INCLUDE "text/maps/SafariZoneNorthRestHouse.asm"
-INCLUDE "text/maps/CeruleanCaveB1F.asm"
-INCLUDE "text/maps/VictoryRoad1F.asm"
-INCLUDE "text/maps/LancesRoom.asm"
-INCLUDE "text/maps/HallOfFame.asm"
-INCLUDE "text/maps/ChampionsRoom.asm"
-INCLUDE "text/maps/LoreleisRoom.asm"
-INCLUDE "text/maps/BrunosRoom.asm"
-INCLUDE "text/maps/AgathasRoom.asm"
-INCLUDE "text/maps/RockTunnelB1F.asm"
+INCLUDE "text/SilphCo5F_2.asm"
+INCLUDE "text/SilphCo6F.asm"
+INCLUDE "text/SilphCo7F.asm"
+INCLUDE "text/SilphCo8F.asm"
+INCLUDE "text/SilphCo9F.asm"
+INCLUDE "text/SilphCo10F.asm"
+INCLUDE "text/SilphCo11F.asm"
+INCLUDE "text/PokemonMansion2F.asm"
+INCLUDE "text/PokemonMansion3F.asm"
+INCLUDE "text/PokemonMansionB1F.asm"
+INCLUDE "text/SafariZoneEast.asm"
+INCLUDE "text/SafariZoneNorth.asm"
+INCLUDE "text/SafariZoneWest.asm"
+INCLUDE "text/SafariZoneCenter.asm"
+INCLUDE "text/SafariZoneCenterRestHouse.asm"
+INCLUDE "text/SafariZoneSecretHouse.asm"
+INCLUDE "text/SafariZoneWestRestHouse.asm"
+INCLUDE "text/SafariZoneEastRestHouse.asm"
+INCLUDE "text/SafariZoneNorthRestHouse.asm"
+INCLUDE "text/CeruleanCaveB1F.asm"
+INCLUDE "text/VictoryRoad1F.asm"
+INCLUDE "text/LancesRoom.asm"
+INCLUDE "text/HallOfFame.asm"
+INCLUDE "text/ChampionsRoom.asm"
+INCLUDE "text/LoreleisRoom.asm"
+INCLUDE "text/BrunosRoom.asm"
+INCLUDE "text/AgathasRoom.asm"
+INCLUDE "text/RockTunnelB1F.asm"
 
 
 SECTION "Text 3", ROMX
 
-INCLUDE "text/maps/RockTunnelB1F_2.asm"
-INCLUDE "text/maps/SeafoamIslandsB4F.asm"
-
-_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
-
-INCLUDE "text/oakspeech.asm"
-
-_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,"@@"
-
-INCLUDE "text/maps/DiglettsCaveRoute2.asm"
-INCLUDE "text/maps/ViridianForestNorthGate.asm"
-INCLUDE "text/maps/Route2TradeHouse.asm"
-INCLUDE "text/maps/Route2Gate.asm"
-INCLUDE "text/maps/ViridianForestSouthGate.asm"
-INCLUDE "text/maps/MtMoonPokecenter.asm"
-INCLUDE "text/maps/SaffronGates.asm"
-INCLUDE "text/maps/Daycare.asm"
+INCLUDE "text/RockTunnelB1F_2.asm"
+INCLUDE "text/SeafoamIslandsB4F.asm"
+
+INCLUDE "data/text/text_2.asm"
+
+INCLUDE "text/DiglettsCaveRoute2.asm"
+INCLUDE "text/ViridianForestNorthGate.asm"
+INCLUDE "text/Route2TradeHouse.asm"
+INCLUDE "text/Route2Gate.asm"
+INCLUDE "text/ViridianForestSouthGate.asm"
+INCLUDE "text/MtMoonPokecenter.asm"
+INCLUDE "text/SaffronGates.asm"
+INCLUDE "text/Daycare.asm"
 
 
 SECTION "Text 4", ROMX
 
-INCLUDE "text/maps/Daycare_2.asm"
-INCLUDE "text/maps/UndergroundPathRoute6.asm"
-INCLUDE "text/maps/UndergroundPathRoute7.asm"
-INCLUDE "text/maps/UndergroundPathRoute7Copy.asm"
-INCLUDE "text/maps/UndergroundPathRoute8.asm"
-INCLUDE "text/maps/RockTunnelPokecenter.asm"
-INCLUDE "text/maps/RockTunnel1F.asm"
-INCLUDE "text/maps/PowerPlant.asm"
-INCLUDE "text/maps/Route11Gate1F.asm"
-INCLUDE "text/maps/Route11Gate2F.asm"
-INCLUDE "text/maps/DiglettsCaveRoute11.asm"
-INCLUDE "text/maps/Route12Gate1F.asm"
-INCLUDE "text/maps/Route12Gate2F.asm"
-INCLUDE "text/maps/Route12SuperRodHouse.asm"
-INCLUDE "text/maps/Route15Gate1F.asm"
-INCLUDE "text/maps/Route15Gate2F.asm"
-INCLUDE "text/maps/Route16Gate1F.asm"
-INCLUDE "text/maps/Route16Gate2F.asm"
-INCLUDE "text/maps/Route16FlyHouse.asm"
-INCLUDE "text/maps/Route18Gate1F.asm"
-INCLUDE "text/maps/Route18Gate2F.asm"
-INCLUDE "text/maps/Route22Gate.asm"
-INCLUDE "text/maps/VictoryRoad2F.asm"
-INCLUDE "text/maps/BillsHouse.asm"
-INCLUDE "text/maps/Route1.asm"
-INCLUDE "text/maps/Route2.asm"
-INCLUDE "text/maps/Route3.asm"
-INCLUDE "text/maps/Route4.asm"
-INCLUDE "text/maps/Route5.asm"
-INCLUDE "text/maps/Route6.asm"
-INCLUDE "text/maps/Route7.asm"
-INCLUDE "text/maps/Route8.asm"
-INCLUDE "text/maps/Route9.asm"
-INCLUDE "text/maps/Route10.asm"
-INCLUDE "text/maps/Route11.asm"
+INCLUDE "text/Daycare_2.asm"
+INCLUDE "text/UndergroundPathRoute6.asm"
+INCLUDE "text/UndergroundPathRoute7.asm"
+INCLUDE "text/UndergroundPathRoute7Copy.asm"
+INCLUDE "text/UndergroundPathRoute8.asm"
+INCLUDE "text/RockTunnelPokecenter.asm"
+INCLUDE "text/RockTunnel1F.asm"
+INCLUDE "text/PowerPlant.asm"
+INCLUDE "text/Route11Gate1F.asm"
+INCLUDE "text/Route11Gate2F.asm"
+INCLUDE "text/DiglettsCaveRoute11.asm"
+INCLUDE "text/Route12Gate1F.asm"
+INCLUDE "text/Route12Gate2F.asm"
+INCLUDE "text/Route12SuperRodHouse.asm"
+INCLUDE "text/Route15Gate1F.asm"
+INCLUDE "text/Route15Gate2F.asm"
+INCLUDE "text/Route16Gate1F.asm"
+INCLUDE "text/Route16Gate2F.asm"
+INCLUDE "text/Route16FlyHouse.asm"
+INCLUDE "text/Route18Gate1F.asm"
+INCLUDE "text/Route18Gate2F.asm"
+INCLUDE "text/Route22Gate.asm"
+INCLUDE "text/VictoryRoad2F.asm"
+INCLUDE "text/BillsHouse.asm"
+INCLUDE "text/Route1.asm"
+INCLUDE "text/Route2.asm"
+INCLUDE "text/Route3.asm"
+INCLUDE "text/Route4.asm"
+INCLUDE "text/Route5.asm"
+INCLUDE "text/Route6.asm"
+INCLUDE "text/Route7.asm"
+INCLUDE "text/Route8.asm"
+INCLUDE "text/Route9.asm"
+INCLUDE "text/Route10.asm"
+INCLUDE "text/Route11.asm"
 
 
 SECTION "Text 5", ROMX
 
-INCLUDE "text/maps/Route11_2.asm"
-INCLUDE "text/maps/Route12.asm"
-INCLUDE "text/maps/Route13.asm"
-INCLUDE "text/maps/Route14.asm"
-INCLUDE "text/maps/Route15.asm"
-INCLUDE "text/maps/Route16.asm"
-INCLUDE "text/maps/Route17.asm"
-INCLUDE "text/maps/Route18.asm"
-INCLUDE "text/maps/Route19.asm"
-INCLUDE "text/maps/Route20.asm"
-INCLUDE "text/maps/Route21.asm"
-INCLUDE "text/maps/Route22.asm"
-INCLUDE "text/maps/Route23.asm"
-INCLUDE "text/maps/Route24.asm"
+INCLUDE "text/Route11_2.asm"
+INCLUDE "text/Route12.asm"
+INCLUDE "text/Route13.asm"
+INCLUDE "text/Route14.asm"
+INCLUDE "text/Route15.asm"
+INCLUDE "text/Route16.asm"
+INCLUDE "text/Route17.asm"
+INCLUDE "text/Route18.asm"
+INCLUDE "text/Route19.asm"
+INCLUDE "text/Route20.asm"
+INCLUDE "text/Route21.asm"
+INCLUDE "text/Route22.asm"
+INCLUDE "text/Route23.asm"
+INCLUDE "text/Route24.asm"
 
 
 SECTION "Text 6", ROMX
 
-INCLUDE "text/maps/Route24_2.asm"
-INCLUDE "text/maps/Route25.asm"
-
-_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
-
-INCLUDE "text/maps/RedsHouse1F.asm"
-INCLUDE "text/maps/BluesHouse.asm"
-INCLUDE "text/maps/OaksLab.asm"
-INCLUDE "text/maps/ViridianPokecenter.asm"
-INCLUDE "text/maps/ViridianMart.asm"
-INCLUDE "text/maps/ViridianSchoolHouse.asm"
-INCLUDE "text/maps/ViridianNicknameHouse.asm"
-INCLUDE "text/maps/ViridianGym.asm"
-INCLUDE "text/maps/Museum1F.asm"
-INCLUDE "text/maps/Museum2F.asm"
-INCLUDE "text/maps/PewterGym.asm"
+INCLUDE "text/Route24_2.asm"
+INCLUDE "text/Route25.asm"
+
+INCLUDE "data/text/text_3.asm"
+
+INCLUDE "text/RedsHouse1F.asm"
+INCLUDE "text/BluesHouse.asm"
+INCLUDE "text/OaksLab.asm"
+INCLUDE "text/ViridianPokecenter.asm"
+INCLUDE "text/ViridianMart.asm"
+INCLUDE "text/ViridianSchoolHouse.asm"
+INCLUDE "text/ViridianNicknameHouse.asm"
+INCLUDE "text/ViridianGym.asm"
+INCLUDE "text/Museum1F.asm"
+INCLUDE "text/Museum2F.asm"
+INCLUDE "text/PewterGym.asm"
 
 
 SECTION "Text 7", ROMX
 
-INCLUDE "text/maps/PewterGym_2.asm"
-INCLUDE "text/maps/PewterNidoranHouse.asm"
-INCLUDE "text/maps/PewterMart.asm"
-INCLUDE "text/maps/PewterSpeechHouse.asm"
-INCLUDE "text/maps/PewterPokecenter.asm"
-INCLUDE "text/maps/CeruleanTrashedHouse.asm"
-INCLUDE "text/maps/CeruleanTradeHouse.asm"
-INCLUDE "text/maps/CeruleanPokecenter.asm"
-INCLUDE "text/maps/CeruleanGym.asm"
-INCLUDE "text/maps/BikeShop.asm"
-INCLUDE "text/maps/CeruleanMart.asm"
-INCLUDE "text/maps/CeruleanBadgeHouse.asm"
-INCLUDE "text/maps/LavenderPokecenter.asm"
-INCLUDE "text/maps/PokemonTower1F.asm"
-INCLUDE "text/maps/PokemonTower2F.asm"
-INCLUDE "text/maps/PokemonTower3F.asm"
-INCLUDE "text/maps/PokemonTower4F.asm"
-INCLUDE "text/maps/PokemonTower5F.asm"
-INCLUDE "text/maps/PokemonTower6F.asm"
-INCLUDE "text/maps/PokemonTower7F.asm"
-INCLUDE "text/maps/MrFujisHouse.asm"
-INCLUDE "text/maps/LavenderMart.asm"
-INCLUDE "text/maps/LavenderCuboneHouse.asm"
-INCLUDE "text/maps/NameRatersHouse.asm"
-INCLUDE "text/maps/VermilionPokecenter.asm"
-INCLUDE "text/maps/PokemonFanClub.asm"
-INCLUDE "text/maps/VermilionMart.asm"
-INCLUDE "text/maps/VermilionGym.asm"
+INCLUDE "text/PewterGym_2.asm"
+INCLUDE "text/PewterNidoranHouse.asm"
+INCLUDE "text/PewterMart.asm"
+INCLUDE "text/PewterSpeechHouse.asm"
+INCLUDE "text/PewterPokecenter.asm"
+INCLUDE "text/CeruleanTrashedHouse.asm"
+INCLUDE "text/CeruleanTradeHouse.asm"
+INCLUDE "text/CeruleanPokecenter.asm"
+INCLUDE "text/CeruleanGym.asm"
+INCLUDE "text/BikeShop.asm"
+INCLUDE "text/CeruleanMart.asm"
+INCLUDE "text/CeruleanBadgeHouse.asm"
+INCLUDE "text/LavenderPokecenter.asm"
+INCLUDE "text/PokemonTower1F.asm"
+INCLUDE "text/PokemonTower2F.asm"
+INCLUDE "text/PokemonTower3F.asm"
+INCLUDE "text/PokemonTower4F.asm"
+INCLUDE "text/PokemonTower5F.asm"
+INCLUDE "text/PokemonTower6F.asm"
+INCLUDE "text/PokemonTower7F.asm"
+INCLUDE "text/MrFujisHouse.asm"
+INCLUDE "text/LavenderMart.asm"
+INCLUDE "text/LavenderCuboneHouse.asm"
+INCLUDE "text/NameRatersHouse.asm"
+INCLUDE "text/VermilionPokecenter.asm"
+INCLUDE "text/PokemonFanClub.asm"
+INCLUDE "text/VermilionMart.asm"
+INCLUDE "text/VermilionGym.asm"
 
 
 SECTION "Text 8", ROMX
 
-INCLUDE "text/maps/VermilionGym_2.asm"
-INCLUDE "text/maps/VermilionPidgeyHouse.asm"
-INCLUDE "text/maps/VermilionDock.asm"
-INCLUDE "text/maps/VermilionOldRodHouse.asm"
-INCLUDE "text/maps/CeladonMart1F.asm"
-INCLUDE "text/maps/CeladonMart2F.asm"
-INCLUDE "text/maps/CeladonMart3F.asm"
-INCLUDE "text/maps/CeladonMart4F.asm"
-INCLUDE "text/maps/CeladonMartRoof.asm"
-INCLUDE "text/maps/CeladonMansion1F.asm"
-INCLUDE "text/maps/CeladonMansion2F.asm"
-INCLUDE "text/maps/CeladonMansion3F.asm"
-INCLUDE "text/maps/CeladonMansionRoof.asm"
-INCLUDE "text/maps/CeladonMansionRoofHouse.asm"
-INCLUDE "text/maps/CeladonPokecenter.asm"
-INCLUDE "text/maps/CeladonGym.asm"
-INCLUDE "text/maps/GameCorner.asm"
-INCLUDE "text/maps/CeladonMart5F.asm"
-INCLUDE "text/maps/GameCornerPrizeRoom.asm"
-INCLUDE "text/maps/CeladonDiner.asm"
-INCLUDE "text/maps/CeladonChiefHouse.asm"
-INCLUDE "text/maps/CeladonHotel.asm"
-INCLUDE "text/maps/FuchsiaMart.asm"
-INCLUDE "text/maps/FuchsiaBillsGrandpasHouse.asm"
-INCLUDE "text/maps/FuchsiaPokecenter.asm"
-INCLUDE "text/maps/WardensHouse.asm"
-INCLUDE "text/maps/SafariZoneGate.asm"
-INCLUDE "text/maps/FuchsiaGym.asm"
+INCLUDE "text/VermilionGym_2.asm"
+INCLUDE "text/VermilionPidgeyHouse.asm"
+INCLUDE "text/VermilionDock.asm"
+INCLUDE "text/VermilionOldRodHouse.asm"
+INCLUDE "text/CeladonMart1F.asm"
+INCLUDE "text/CeladonMart2F.asm"
+INCLUDE "text/CeladonMart3F.asm"
+INCLUDE "text/CeladonMart4F.asm"
+INCLUDE "text/CeladonMartRoof.asm"
+INCLUDE "text/CeladonMansion1F.asm"
+INCLUDE "text/CeladonMansion2F.asm"
+INCLUDE "text/CeladonMansion3F.asm"
+INCLUDE "text/CeladonMansionRoof.asm"
+INCLUDE "text/CeladonMansionRoofHouse.asm"
+INCLUDE "text/CeladonPokecenter.asm"
+INCLUDE "text/CeladonGym.asm"
+INCLUDE "text/GameCorner.asm"
+INCLUDE "text/CeladonMart5F.asm"
+INCLUDE "text/GameCornerPrizeRoom.asm"
+INCLUDE "text/CeladonDiner.asm"
+INCLUDE "text/CeladonChiefHouse.asm"
+INCLUDE "text/CeladonHotel.asm"
+INCLUDE "text/FuchsiaMart.asm"
+INCLUDE "text/FuchsiaBillsGrandpasHouse.asm"
+INCLUDE "text/FuchsiaPokecenter.asm"
+INCLUDE "text/WardensHouse.asm"
+INCLUDE "text/SafariZoneGate.asm"
+INCLUDE "text/FuchsiaGym.asm"
 
 
 SECTION "Text 9", ROMX
 
-INCLUDE "text/maps/FuchsiaGym_2.asm"
-INCLUDE "text/maps/FuchsiaMeetingRoom.asm"
-INCLUDE "text/maps/FuchsiaGoodRodHouse.asm"
-INCLUDE "text/maps/PokemonMansion1F.asm"
-INCLUDE "text/maps/CinnabarGym.asm"
-INCLUDE "text/maps/CinnabarLab.asm"
-INCLUDE "text/maps/CinnabarLabTradeRoom.asm"
-INCLUDE "text/maps/CinnabarLabMetronomeRoom.asm"
-INCLUDE "text/maps/CinnabarLabFossilRoom.asm"
-INCLUDE "text/maps/CinnabarPokecenter.asm"
-INCLUDE "text/maps/CinnabarMart.asm"
-INCLUDE "text/maps/IndigoPlateauLobby.asm"
-INCLUDE "text/maps/CopycatsHouse1F.asm"
-INCLUDE "text/maps/CopycatsHouse2F.asm"
-INCLUDE "text/maps/FightingDojo.asm"
-INCLUDE "text/maps/SaffronGym.asm"
-INCLUDE "text/maps/SaffronPidgeyHouse.asm"
-INCLUDE "text/maps/SaffronMart.asm"
-INCLUDE "text/maps/SilphCo1F.asm"
-INCLUDE "text/maps/SaffronPokecenter.asm"
-INCLUDE "text/maps/MrPsychicsHouse.asm"
+INCLUDE "text/FuchsiaGym_2.asm"
+INCLUDE "text/FuchsiaMeetingRoom.asm"
+INCLUDE "text/FuchsiaGoodRodHouse.asm"
+INCLUDE "text/PokemonMansion1F.asm"
+INCLUDE "text/CinnabarGym.asm"
+INCLUDE "text/CinnabarLab.asm"
+INCLUDE "text/CinnabarLabTradeRoom.asm"
+INCLUDE "text/CinnabarLabMetronomeRoom.asm"
+INCLUDE "text/CinnabarLabFossilRoom.asm"
+INCLUDE "text/CinnabarPokecenter.asm"
+INCLUDE "text/CinnabarMart.asm"
+INCLUDE "text/IndigoPlateauLobby.asm"
+INCLUDE "text/CopycatsHouse1F.asm"
+INCLUDE "text/CopycatsHouse2F.asm"
+INCLUDE "text/FightingDojo.asm"
+INCLUDE "text/SaffronGym.asm"
+INCLUDE "text/SaffronPidgeyHouse.asm"
+INCLUDE "text/SaffronMart.asm"
+INCLUDE "text/SilphCo1F.asm"
+INCLUDE "text/SaffronPokecenter.asm"
+INCLUDE "text/MrPsychicsHouse.asm"
 
-_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
+INCLUDE "data/text/text_4.asm"
 
 
 SECTION "Text 10", ROMX
 
-_CableClubNPCPleaseComeAgainText::
-	text "Please come again!"
-	done
+INCLUDE "data/text/text_5.asm"
 
-_CableClubNPCMakingPreparationsText::
-	text "We're making"
-	line "preparations."
-	cont "Please wait."
-	done
+INCLUDE "text/PalletTown.asm"
+INCLUDE "text/ViridianCity.asm"
+INCLUDE "text/PewterCity.asm"
+INCLUDE "text/CeruleanCity.asm"
+INCLUDE "text/LavenderTown.asm"
+INCLUDE "text/VermilionCity.asm"
+INCLUDE "text/CeladonCity.asm"
+INCLUDE "text/FuchsiaCity.asm"
+INCLUDE "text/CinnabarIsland.asm"
+INCLUDE "text/SaffronCity.asm"
 
-_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
-
-INCLUDE "text/maps/PalletTown.asm"
-INCLUDE "text/maps/ViridianCity.asm"
-INCLUDE "text/maps/PewterCity.asm"
-INCLUDE "text/maps/CeruleanCity.asm"
-INCLUDE "text/maps/LavenderTown.asm"
-INCLUDE "text/maps/VermilionCity.asm"
-INCLUDE "text/maps/CeladonCity.asm"
-INCLUDE "text/maps/FuchsiaCity.asm"
-INCLUDE "text/maps/CinnabarIsland.asm"
-INCLUDE "text/maps/SaffronCity.asm"
-
-_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
+INCLUDE "data/text/text_6.asm"
 
 
 SECTION "Text 11", ROMX
 
-_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
+INCLUDE "data/text/text_7.asm"
 
 
 SECTION "Pokedex Text", ROMX
 
-INCLUDE "text/pokedex.asm"
+INCLUDE "data/pokemon/dex_text.asm"
 
 
 SECTION "Move Names", ROMX
 
-INCLUDE "text/move_names.asm"
+INCLUDE "data/moves/names.asm"
diff --git a/text/maps/AgathasRoom.asm b/text/AgathasRoom.asm
similarity index 100%
rename from text/maps/AgathasRoom.asm
rename to text/AgathasRoom.asm
diff --git a/text/maps/BikeShop.asm b/text/BikeShop.asm
similarity index 100%
rename from text/maps/BikeShop.asm
rename to text/BikeShop.asm
diff --git a/text/maps/BillsHouse.asm b/text/BillsHouse.asm
similarity index 100%
rename from text/maps/BillsHouse.asm
rename to text/BillsHouse.asm
diff --git a/text/maps/BluesHouse.asm b/text/BluesHouse.asm
similarity index 100%
rename from text/maps/BluesHouse.asm
rename to text/BluesHouse.asm
diff --git a/text/maps/BrunosRoom.asm b/text/BrunosRoom.asm
similarity index 100%
rename from text/maps/BrunosRoom.asm
rename to text/BrunosRoom.asm
diff --git a/text/maps/CeladonChiefHouse.asm b/text/CeladonChiefHouse.asm
similarity index 100%
rename from text/maps/CeladonChiefHouse.asm
rename to text/CeladonChiefHouse.asm
diff --git a/text/maps/CeladonCity.asm b/text/CeladonCity.asm
similarity index 100%
rename from text/maps/CeladonCity.asm
rename to text/CeladonCity.asm
diff --git a/text/maps/CeladonDiner.asm b/text/CeladonDiner.asm
similarity index 100%
rename from text/maps/CeladonDiner.asm
rename to text/CeladonDiner.asm
diff --git a/text/maps/CeladonGym.asm b/text/CeladonGym.asm
similarity index 100%
rename from text/maps/CeladonGym.asm
rename to text/CeladonGym.asm
diff --git a/text/maps/CeladonHotel.asm b/text/CeladonHotel.asm
similarity index 100%
rename from text/maps/CeladonHotel.asm
rename to text/CeladonHotel.asm
diff --git a/text/maps/CeladonMansion1F.asm b/text/CeladonMansion1F.asm
similarity index 100%
rename from text/maps/CeladonMansion1F.asm
rename to text/CeladonMansion1F.asm
diff --git a/text/maps/CeladonMansion2F.asm b/text/CeladonMansion2F.asm
similarity index 100%
rename from text/maps/CeladonMansion2F.asm
rename to text/CeladonMansion2F.asm
diff --git a/text/maps/CeladonMansion3F.asm b/text/CeladonMansion3F.asm
similarity index 100%
rename from text/maps/CeladonMansion3F.asm
rename to text/CeladonMansion3F.asm
diff --git a/text/maps/CeladonMansionRoof.asm b/text/CeladonMansionRoof.asm
similarity index 100%
rename from text/maps/CeladonMansionRoof.asm
rename to text/CeladonMansionRoof.asm
diff --git a/text/maps/CeladonMansionRoofHouse.asm b/text/CeladonMansionRoofHouse.asm
similarity index 100%
rename from text/maps/CeladonMansionRoofHouse.asm
rename to text/CeladonMansionRoofHouse.asm
diff --git a/text/maps/CeladonMart1F.asm b/text/CeladonMart1F.asm
similarity index 100%
rename from text/maps/CeladonMart1F.asm
rename to text/CeladonMart1F.asm
diff --git a/text/maps/CeladonMart2F.asm b/text/CeladonMart2F.asm
similarity index 100%
rename from text/maps/CeladonMart2F.asm
rename to text/CeladonMart2F.asm
diff --git a/text/maps/CeladonMart3F.asm b/text/CeladonMart3F.asm
similarity index 100%
rename from text/maps/CeladonMart3F.asm
rename to text/CeladonMart3F.asm
diff --git a/text/maps/CeladonMart4F.asm b/text/CeladonMart4F.asm
similarity index 100%
rename from text/maps/CeladonMart4F.asm
rename to text/CeladonMart4F.asm
diff --git a/text/maps/CeladonMart5F.asm b/text/CeladonMart5F.asm
similarity index 100%
rename from text/maps/CeladonMart5F.asm
rename to text/CeladonMart5F.asm
diff --git a/text/maps/CeladonMartRoof.asm b/text/CeladonMartRoof.asm
similarity index 100%
rename from text/maps/CeladonMartRoof.asm
rename to text/CeladonMartRoof.asm
diff --git a/text/maps/CeladonPokecenter.asm b/text/CeladonPokecenter.asm
similarity index 100%
rename from text/maps/CeladonPokecenter.asm
rename to text/CeladonPokecenter.asm
diff --git a/text/maps/CeruleanBadgeHouse.asm b/text/CeruleanBadgeHouse.asm
similarity index 100%
rename from text/maps/CeruleanBadgeHouse.asm
rename to text/CeruleanBadgeHouse.asm
diff --git a/text/maps/CeruleanCaveB1F.asm b/text/CeruleanCaveB1F.asm
similarity index 100%
rename from text/maps/CeruleanCaveB1F.asm
rename to text/CeruleanCaveB1F.asm
diff --git a/text/maps/CeruleanCity.asm b/text/CeruleanCity.asm
similarity index 100%
rename from text/maps/CeruleanCity.asm
rename to text/CeruleanCity.asm
diff --git a/text/maps/CeruleanGym.asm b/text/CeruleanGym.asm
similarity index 100%
rename from text/maps/CeruleanGym.asm
rename to text/CeruleanGym.asm
diff --git a/text/maps/CeruleanMart.asm b/text/CeruleanMart.asm
similarity index 100%
rename from text/maps/CeruleanMart.asm
rename to text/CeruleanMart.asm
diff --git a/text/maps/CeruleanPokecenter.asm b/text/CeruleanPokecenter.asm
similarity index 100%
rename from text/maps/CeruleanPokecenter.asm
rename to text/CeruleanPokecenter.asm
diff --git a/text/maps/CeruleanTradeHouse.asm b/text/CeruleanTradeHouse.asm
similarity index 100%
rename from text/maps/CeruleanTradeHouse.asm
rename to text/CeruleanTradeHouse.asm
diff --git a/text/maps/CeruleanTrashedHouse.asm b/text/CeruleanTrashedHouse.asm
similarity index 100%
rename from text/maps/CeruleanTrashedHouse.asm
rename to text/CeruleanTrashedHouse.asm
diff --git a/text/maps/ChampionsRoom.asm b/text/ChampionsRoom.asm
similarity index 100%
rename from text/maps/ChampionsRoom.asm
rename to text/ChampionsRoom.asm
diff --git a/text/maps/CinnabarGym.asm b/text/CinnabarGym.asm
similarity index 100%
rename from text/maps/CinnabarGym.asm
rename to text/CinnabarGym.asm
diff --git a/text/maps/CinnabarIsland.asm b/text/CinnabarIsland.asm
similarity index 100%
rename from text/maps/CinnabarIsland.asm
rename to text/CinnabarIsland.asm
diff --git a/text/maps/CinnabarLab.asm b/text/CinnabarLab.asm
similarity index 100%
rename from text/maps/CinnabarLab.asm
rename to text/CinnabarLab.asm
diff --git a/text/maps/CinnabarLabFossilRoom.asm b/text/CinnabarLabFossilRoom.asm
similarity index 100%
rename from text/maps/CinnabarLabFossilRoom.asm
rename to text/CinnabarLabFossilRoom.asm
diff --git a/text/maps/CinnabarLabMetronomeRoom.asm b/text/CinnabarLabMetronomeRoom.asm
similarity index 100%
rename from text/maps/CinnabarLabMetronomeRoom.asm
rename to text/CinnabarLabMetronomeRoom.asm
diff --git a/text/maps/CinnabarLabTradeRoom.asm b/text/CinnabarLabTradeRoom.asm
similarity index 100%
rename from text/maps/CinnabarLabTradeRoom.asm
rename to text/CinnabarLabTradeRoom.asm
diff --git a/text/maps/CinnabarMart.asm b/text/CinnabarMart.asm
similarity index 100%
rename from text/maps/CinnabarMart.asm
rename to text/CinnabarMart.asm
diff --git a/text/maps/CinnabarPokecenter.asm b/text/CinnabarPokecenter.asm
similarity index 100%
rename from text/maps/CinnabarPokecenter.asm
rename to text/CinnabarPokecenter.asm
diff --git a/text/maps/CopycatsHouse1F.asm b/text/CopycatsHouse1F.asm
similarity index 100%
rename from text/maps/CopycatsHouse1F.asm
rename to text/CopycatsHouse1F.asm
diff --git a/text/maps/CopycatsHouse2F.asm b/text/CopycatsHouse2F.asm
similarity index 100%
rename from text/maps/CopycatsHouse2F.asm
rename to text/CopycatsHouse2F.asm
diff --git a/text/maps/Daycare.asm b/text/Daycare.asm
similarity index 100%
rename from text/maps/Daycare.asm
rename to text/Daycare.asm
diff --git a/text/maps/Daycare_2.asm b/text/Daycare_2.asm
similarity index 100%
rename from text/maps/Daycare_2.asm
rename to text/Daycare_2.asm
diff --git a/text/maps/DiglettsCaveRoute11.asm b/text/DiglettsCaveRoute11.asm
similarity index 100%
rename from text/maps/DiglettsCaveRoute11.asm
rename to text/DiglettsCaveRoute11.asm
diff --git a/text/maps/DiglettsCaveRoute2.asm b/text/DiglettsCaveRoute2.asm
similarity index 100%
rename from text/maps/DiglettsCaveRoute2.asm
rename to text/DiglettsCaveRoute2.asm
diff --git a/text/maps/FightingDojo.asm b/text/FightingDojo.asm
similarity index 100%
rename from text/maps/FightingDojo.asm
rename to text/FightingDojo.asm
diff --git a/text/maps/FuchsiaBillsGrandpasHouse.asm b/text/FuchsiaBillsGrandpasHouse.asm
similarity index 100%
rename from text/maps/FuchsiaBillsGrandpasHouse.asm
rename to text/FuchsiaBillsGrandpasHouse.asm
diff --git a/text/maps/FuchsiaCity.asm b/text/FuchsiaCity.asm
similarity index 100%
rename from text/maps/FuchsiaCity.asm
rename to text/FuchsiaCity.asm
diff --git a/text/maps/FuchsiaGoodRodHouse.asm b/text/FuchsiaGoodRodHouse.asm
similarity index 100%
rename from text/maps/FuchsiaGoodRodHouse.asm
rename to text/FuchsiaGoodRodHouse.asm
diff --git a/text/maps/FuchsiaGym.asm b/text/FuchsiaGym.asm
similarity index 100%
rename from text/maps/FuchsiaGym.asm
rename to text/FuchsiaGym.asm
diff --git a/text/maps/FuchsiaGym_2.asm b/text/FuchsiaGym_2.asm
similarity index 100%
rename from text/maps/FuchsiaGym_2.asm
rename to text/FuchsiaGym_2.asm
diff --git a/text/maps/FuchsiaMart.asm b/text/FuchsiaMart.asm
similarity index 100%
rename from text/maps/FuchsiaMart.asm
rename to text/FuchsiaMart.asm
diff --git a/text/maps/FuchsiaMeetingRoom.asm b/text/FuchsiaMeetingRoom.asm
similarity index 100%
rename from text/maps/FuchsiaMeetingRoom.asm
rename to text/FuchsiaMeetingRoom.asm
diff --git a/text/maps/FuchsiaPokecenter.asm b/text/FuchsiaPokecenter.asm
similarity index 100%
rename from text/maps/FuchsiaPokecenter.asm
rename to text/FuchsiaPokecenter.asm
diff --git a/text/maps/GameCorner.asm b/text/GameCorner.asm
similarity index 100%
rename from text/maps/GameCorner.asm
rename to text/GameCorner.asm
diff --git a/text/maps/GameCornerPrizeRoom.asm b/text/GameCornerPrizeRoom.asm
similarity index 100%
rename from text/maps/GameCornerPrizeRoom.asm
rename to text/GameCornerPrizeRoom.asm
diff --git a/text/maps/HallOfFame.asm b/text/HallOfFame.asm
similarity index 100%
rename from text/maps/HallOfFame.asm
rename to text/HallOfFame.asm
diff --git a/text/maps/IndigoPlateauLobby.asm b/text/IndigoPlateauLobby.asm
similarity index 100%
rename from text/maps/IndigoPlateauLobby.asm
rename to text/IndigoPlateauLobby.asm
diff --git a/text/maps/LancesRoom.asm b/text/LancesRoom.asm
similarity index 100%
rename from text/maps/LancesRoom.asm
rename to text/LancesRoom.asm
diff --git a/text/maps/LavenderCuboneHouse.asm b/text/LavenderCuboneHouse.asm
similarity index 100%
rename from text/maps/LavenderCuboneHouse.asm
rename to text/LavenderCuboneHouse.asm
diff --git a/text/maps/LavenderMart.asm b/text/LavenderMart.asm
similarity index 100%
rename from text/maps/LavenderMart.asm
rename to text/LavenderMart.asm
diff --git a/text/maps/LavenderPokecenter.asm b/text/LavenderPokecenter.asm
similarity index 100%
rename from text/maps/LavenderPokecenter.asm
rename to text/LavenderPokecenter.asm
diff --git a/text/maps/LavenderTown.asm b/text/LavenderTown.asm
similarity index 100%
rename from text/maps/LavenderTown.asm
rename to text/LavenderTown.asm
diff --git a/text/maps/LoreleisRoom.asm b/text/LoreleisRoom.asm
similarity index 100%
rename from text/maps/LoreleisRoom.asm
rename to text/LoreleisRoom.asm
diff --git a/text/maps/MrFujisHouse.asm b/text/MrFujisHouse.asm
similarity index 100%
rename from text/maps/MrFujisHouse.asm
rename to text/MrFujisHouse.asm
diff --git a/text/maps/MrPsychicsHouse.asm b/text/MrPsychicsHouse.asm
similarity index 100%
rename from text/maps/MrPsychicsHouse.asm
rename to text/MrPsychicsHouse.asm
diff --git a/text/maps/MtMoon1F.asm b/text/MtMoon1F.asm
similarity index 100%
rename from text/maps/MtMoon1F.asm
rename to text/MtMoon1F.asm
diff --git a/text/maps/MtMoonB1F.asm b/text/MtMoonB1F.asm
similarity index 100%
rename from text/maps/MtMoonB1F.asm
rename to text/MtMoonB1F.asm
diff --git a/text/maps/MtMoonB2F.asm b/text/MtMoonB2F.asm
similarity index 100%
rename from text/maps/MtMoonB2F.asm
rename to text/MtMoonB2F.asm
diff --git a/text/maps/MtMoonPokecenter.asm b/text/MtMoonPokecenter.asm
similarity index 100%
rename from text/maps/MtMoonPokecenter.asm
rename to text/MtMoonPokecenter.asm
diff --git a/text/maps/Museum1F.asm b/text/Museum1F.asm
similarity index 100%
rename from text/maps/Museum1F.asm
rename to text/Museum1F.asm
diff --git a/text/maps/Museum2F.asm b/text/Museum2F.asm
similarity index 100%
rename from text/maps/Museum2F.asm
rename to text/Museum2F.asm
diff --git a/text/maps/NameRatersHouse.asm b/text/NameRatersHouse.asm
similarity index 100%
rename from text/maps/NameRatersHouse.asm
rename to text/NameRatersHouse.asm
diff --git a/text/maps/OaksLab.asm b/text/OaksLab.asm
similarity index 100%
rename from text/maps/OaksLab.asm
rename to text/OaksLab.asm
diff --git a/text/maps/PalletTown.asm b/text/PalletTown.asm
similarity index 100%
rename from text/maps/PalletTown.asm
rename to text/PalletTown.asm
diff --git a/text/maps/PewterCity.asm b/text/PewterCity.asm
similarity index 100%
rename from text/maps/PewterCity.asm
rename to text/PewterCity.asm
diff --git a/text/maps/PewterGym.asm b/text/PewterGym.asm
similarity index 100%
rename from text/maps/PewterGym.asm
rename to text/PewterGym.asm
diff --git a/text/maps/PewterGym_2.asm b/text/PewterGym_2.asm
similarity index 100%
rename from text/maps/PewterGym_2.asm
rename to text/PewterGym_2.asm
diff --git a/text/maps/PewterMart.asm b/text/PewterMart.asm
similarity index 100%
rename from text/maps/PewterMart.asm
rename to text/PewterMart.asm
diff --git a/text/maps/PewterNidoranHouse.asm b/text/PewterNidoranHouse.asm
similarity index 100%
rename from text/maps/PewterNidoranHouse.asm
rename to text/PewterNidoranHouse.asm
diff --git a/text/maps/PewterPokecenter.asm b/text/PewterPokecenter.asm
similarity index 100%
rename from text/maps/PewterPokecenter.asm
rename to text/PewterPokecenter.asm
diff --git a/text/maps/PewterSpeechHouse.asm b/text/PewterSpeechHouse.asm
similarity index 100%
rename from text/maps/PewterSpeechHouse.asm
rename to text/PewterSpeechHouse.asm
diff --git a/text/maps/PokemonFanClub.asm b/text/PokemonFanClub.asm
similarity index 100%
rename from text/maps/PokemonFanClub.asm
rename to text/PokemonFanClub.asm
diff --git a/text/maps/PokemonMansion1F.asm b/text/PokemonMansion1F.asm
similarity index 100%
rename from text/maps/PokemonMansion1F.asm
rename to text/PokemonMansion1F.asm
diff --git a/text/maps/PokemonMansion2F.asm b/text/PokemonMansion2F.asm
similarity index 100%
rename from text/maps/PokemonMansion2F.asm
rename to text/PokemonMansion2F.asm
diff --git a/text/maps/PokemonMansion3F.asm b/text/PokemonMansion3F.asm
similarity index 100%
rename from text/maps/PokemonMansion3F.asm
rename to text/PokemonMansion3F.asm
diff --git a/text/maps/PokemonMansionB1F.asm b/text/PokemonMansionB1F.asm
similarity index 100%
rename from text/maps/PokemonMansionB1F.asm
rename to text/PokemonMansionB1F.asm
diff --git a/text/maps/PokemonTower1F.asm b/text/PokemonTower1F.asm
similarity index 100%
rename from text/maps/PokemonTower1F.asm
rename to text/PokemonTower1F.asm
diff --git a/text/maps/PokemonTower2F.asm b/text/PokemonTower2F.asm
similarity index 100%
rename from text/maps/PokemonTower2F.asm
rename to text/PokemonTower2F.asm
diff --git a/text/maps/PokemonTower3F.asm b/text/PokemonTower3F.asm
similarity index 100%
rename from text/maps/PokemonTower3F.asm
rename to text/PokemonTower3F.asm
diff --git a/text/maps/PokemonTower4F.asm b/text/PokemonTower4F.asm
similarity index 100%
rename from text/maps/PokemonTower4F.asm
rename to text/PokemonTower4F.asm
diff --git a/text/maps/PokemonTower5F.asm b/text/PokemonTower5F.asm
similarity index 100%
rename from text/maps/PokemonTower5F.asm
rename to text/PokemonTower5F.asm
diff --git a/text/maps/PokemonTower6F.asm b/text/PokemonTower6F.asm
similarity index 100%
rename from text/maps/PokemonTower6F.asm
rename to text/PokemonTower6F.asm
diff --git a/text/maps/PokemonTower7F.asm b/text/PokemonTower7F.asm
similarity index 100%
rename from text/maps/PokemonTower7F.asm
rename to text/PokemonTower7F.asm
diff --git a/text/maps/PowerPlant.asm b/text/PowerPlant.asm
similarity index 100%
rename from text/maps/PowerPlant.asm
rename to text/PowerPlant.asm
diff --git a/text/maps/RedsHouse1F.asm b/text/RedsHouse1F.asm
similarity index 100%
rename from text/maps/RedsHouse1F.asm
rename to text/RedsHouse1F.asm
diff --git a/text/maps/RockTunnel1F.asm b/text/RockTunnel1F.asm
similarity index 100%
rename from text/maps/RockTunnel1F.asm
rename to text/RockTunnel1F.asm
diff --git a/text/maps/RockTunnelB1F.asm b/text/RockTunnelB1F.asm
similarity index 100%
rename from text/maps/RockTunnelB1F.asm
rename to text/RockTunnelB1F.asm
diff --git a/text/maps/RockTunnelB1F_2.asm b/text/RockTunnelB1F_2.asm
similarity index 100%
rename from text/maps/RockTunnelB1F_2.asm
rename to text/RockTunnelB1F_2.asm
diff --git a/text/maps/RockTunnelPokecenter.asm b/text/RockTunnelPokecenter.asm
similarity index 100%
rename from text/maps/RockTunnelPokecenter.asm
rename to text/RockTunnelPokecenter.asm
diff --git a/text/maps/RocketHideoutB1F.asm b/text/RocketHideoutB1F.asm
similarity index 100%
rename from text/maps/RocketHideoutB1F.asm
rename to text/RocketHideoutB1F.asm
diff --git a/text/maps/RocketHideoutB2F.asm b/text/RocketHideoutB2F.asm
similarity index 100%
rename from text/maps/RocketHideoutB2F.asm
rename to text/RocketHideoutB2F.asm
diff --git a/text/maps/RocketHideoutB3F.asm b/text/RocketHideoutB3F.asm
similarity index 100%
rename from text/maps/RocketHideoutB3F.asm
rename to text/RocketHideoutB3F.asm
diff --git a/text/maps/RocketHideoutB4F.asm b/text/RocketHideoutB4F.asm
similarity index 100%
rename from text/maps/RocketHideoutB4F.asm
rename to text/RocketHideoutB4F.asm
diff --git a/text/maps/RocketHideoutElevator.asm b/text/RocketHideoutElevator.asm
similarity index 100%
rename from text/maps/RocketHideoutElevator.asm
rename to text/RocketHideoutElevator.asm
diff --git a/text/maps/Route1.asm b/text/Route1.asm
similarity index 100%
rename from text/maps/Route1.asm
rename to text/Route1.asm
diff --git a/text/maps/Route10.asm b/text/Route10.asm
similarity index 100%
rename from text/maps/Route10.asm
rename to text/Route10.asm
diff --git a/text/maps/Route11.asm b/text/Route11.asm
similarity index 100%
rename from text/maps/Route11.asm
rename to text/Route11.asm
diff --git a/text/maps/Route11Gate1F.asm b/text/Route11Gate1F.asm
similarity index 100%
rename from text/maps/Route11Gate1F.asm
rename to text/Route11Gate1F.asm
diff --git a/text/maps/Route11Gate2F.asm b/text/Route11Gate2F.asm
similarity index 100%
rename from text/maps/Route11Gate2F.asm
rename to text/Route11Gate2F.asm
diff --git a/text/maps/Route11_2.asm b/text/Route11_2.asm
similarity index 100%
rename from text/maps/Route11_2.asm
rename to text/Route11_2.asm
diff --git a/text/maps/Route12.asm b/text/Route12.asm
similarity index 100%
rename from text/maps/Route12.asm
rename to text/Route12.asm
diff --git a/text/maps/Route12Gate1F.asm b/text/Route12Gate1F.asm
similarity index 100%
rename from text/maps/Route12Gate1F.asm
rename to text/Route12Gate1F.asm
diff --git a/text/maps/Route12Gate2F.asm b/text/Route12Gate2F.asm
similarity index 100%
rename from text/maps/Route12Gate2F.asm
rename to text/Route12Gate2F.asm
diff --git a/text/maps/Route12SuperRodHouse.asm b/text/Route12SuperRodHouse.asm
similarity index 100%
rename from text/maps/Route12SuperRodHouse.asm
rename to text/Route12SuperRodHouse.asm
diff --git a/text/maps/Route13.asm b/text/Route13.asm
similarity index 100%
rename from text/maps/Route13.asm
rename to text/Route13.asm
diff --git a/text/maps/Route14.asm b/text/Route14.asm
similarity index 100%
rename from text/maps/Route14.asm
rename to text/Route14.asm
diff --git a/text/maps/Route15.asm b/text/Route15.asm
similarity index 100%
rename from text/maps/Route15.asm
rename to text/Route15.asm
diff --git a/text/maps/Route15Gate1F.asm b/text/Route15Gate1F.asm
similarity index 100%
rename from text/maps/Route15Gate1F.asm
rename to text/Route15Gate1F.asm
diff --git a/text/maps/Route15Gate2F.asm b/text/Route15Gate2F.asm
similarity index 100%
rename from text/maps/Route15Gate2F.asm
rename to text/Route15Gate2F.asm
diff --git a/text/maps/Route16.asm b/text/Route16.asm
similarity index 100%
rename from text/maps/Route16.asm
rename to text/Route16.asm
diff --git a/text/maps/Route16FlyHouse.asm b/text/Route16FlyHouse.asm
similarity index 100%
rename from text/maps/Route16FlyHouse.asm
rename to text/Route16FlyHouse.asm
diff --git a/text/maps/Route16Gate1F.asm b/text/Route16Gate1F.asm
similarity index 100%
rename from text/maps/Route16Gate1F.asm
rename to text/Route16Gate1F.asm
diff --git a/text/maps/Route16Gate2F.asm b/text/Route16Gate2F.asm
similarity index 100%
rename from text/maps/Route16Gate2F.asm
rename to text/Route16Gate2F.asm
diff --git a/text/maps/Route17.asm b/text/Route17.asm
similarity index 100%
rename from text/maps/Route17.asm
rename to text/Route17.asm
diff --git a/text/maps/Route18.asm b/text/Route18.asm
similarity index 100%
rename from text/maps/Route18.asm
rename to text/Route18.asm
diff --git a/text/maps/Route18Gate1F.asm b/text/Route18Gate1F.asm
similarity index 100%
rename from text/maps/Route18Gate1F.asm
rename to text/Route18Gate1F.asm
diff --git a/text/maps/Route18Gate2F.asm b/text/Route18Gate2F.asm
similarity index 100%
rename from text/maps/Route18Gate2F.asm
rename to text/Route18Gate2F.asm
diff --git a/text/maps/Route19.asm b/text/Route19.asm
similarity index 100%
rename from text/maps/Route19.asm
rename to text/Route19.asm
diff --git a/text/maps/Route2.asm b/text/Route2.asm
similarity index 100%
rename from text/maps/Route2.asm
rename to text/Route2.asm
diff --git a/text/maps/Route20.asm b/text/Route20.asm
similarity index 100%
rename from text/maps/Route20.asm
rename to text/Route20.asm
diff --git a/text/maps/Route21.asm b/text/Route21.asm
similarity index 100%
rename from text/maps/Route21.asm
rename to text/Route21.asm
diff --git a/text/maps/Route22.asm b/text/Route22.asm
similarity index 100%
rename from text/maps/Route22.asm
rename to text/Route22.asm
diff --git a/text/maps/Route22Gate.asm b/text/Route22Gate.asm
similarity index 100%
rename from text/maps/Route22Gate.asm
rename to text/Route22Gate.asm
diff --git a/text/maps/Route23.asm b/text/Route23.asm
similarity index 100%
rename from text/maps/Route23.asm
rename to text/Route23.asm
diff --git a/text/maps/Route24.asm b/text/Route24.asm
similarity index 100%
rename from text/maps/Route24.asm
rename to text/Route24.asm
diff --git a/text/maps/Route24_2.asm b/text/Route24_2.asm
similarity index 100%
rename from text/maps/Route24_2.asm
rename to text/Route24_2.asm
diff --git a/text/maps/Route25.asm b/text/Route25.asm
similarity index 100%
rename from text/maps/Route25.asm
rename to text/Route25.asm
diff --git a/text/maps/Route2Gate.asm b/text/Route2Gate.asm
similarity index 100%
rename from text/maps/Route2Gate.asm
rename to text/Route2Gate.asm
diff --git a/text/maps/Route2TradeHouse.asm b/text/Route2TradeHouse.asm
similarity index 100%
rename from text/maps/Route2TradeHouse.asm
rename to text/Route2TradeHouse.asm
diff --git a/text/maps/Route3.asm b/text/Route3.asm
similarity index 100%
rename from text/maps/Route3.asm
rename to text/Route3.asm
diff --git a/text/maps/Route4.asm b/text/Route4.asm
similarity index 100%
rename from text/maps/Route4.asm
rename to text/Route4.asm
diff --git a/text/maps/Route5.asm b/text/Route5.asm
similarity index 100%
rename from text/maps/Route5.asm
rename to text/Route5.asm
diff --git a/text/maps/Route6.asm b/text/Route6.asm
similarity index 100%
rename from text/maps/Route6.asm
rename to text/Route6.asm
diff --git a/text/maps/Route7.asm b/text/Route7.asm
similarity index 100%
rename from text/maps/Route7.asm
rename to text/Route7.asm
diff --git a/text/maps/Route8.asm b/text/Route8.asm
similarity index 100%
rename from text/maps/Route8.asm
rename to text/Route8.asm
diff --git a/text/maps/Route9.asm b/text/Route9.asm
similarity index 100%
rename from text/maps/Route9.asm
rename to text/Route9.asm
diff --git a/text/maps/SSAnne1F.asm b/text/SSAnne1F.asm
similarity index 100%
rename from text/maps/SSAnne1F.asm
rename to text/SSAnne1F.asm
diff --git a/text/maps/SSAnne1FRooms.asm b/text/SSAnne1FRooms.asm
similarity index 100%
rename from text/maps/SSAnne1FRooms.asm
rename to text/SSAnne1FRooms.asm
diff --git a/text/maps/SSAnne2F.asm b/text/SSAnne2F.asm
similarity index 100%
rename from text/maps/SSAnne2F.asm
rename to text/SSAnne2F.asm
diff --git a/text/maps/SSAnne2FRooms.asm b/text/SSAnne2FRooms.asm
similarity index 100%
rename from text/maps/SSAnne2FRooms.asm
rename to text/SSAnne2FRooms.asm
diff --git a/text/maps/SSAnne3F.asm b/text/SSAnne3F.asm
similarity index 100%
rename from text/maps/SSAnne3F.asm
rename to text/SSAnne3F.asm
diff --git a/text/maps/SSAnneB1FRooms.asm b/text/SSAnneB1FRooms.asm
similarity index 100%
rename from text/maps/SSAnneB1FRooms.asm
rename to text/SSAnneB1FRooms.asm
diff --git a/text/maps/SSAnneBow.asm b/text/SSAnneBow.asm
similarity index 100%
rename from text/maps/SSAnneBow.asm
rename to text/SSAnneBow.asm
diff --git a/text/maps/SSAnneCaptainsRoom.asm b/text/SSAnneCaptainsRoom.asm
similarity index 100%
rename from text/maps/SSAnneCaptainsRoom.asm
rename to text/SSAnneCaptainsRoom.asm
diff --git a/text/maps/SSAnneKitchen.asm b/text/SSAnneKitchen.asm
similarity index 100%
rename from text/maps/SSAnneKitchen.asm
rename to text/SSAnneKitchen.asm
diff --git a/text/maps/SafariZoneCenter.asm b/text/SafariZoneCenter.asm
similarity index 100%
rename from text/maps/SafariZoneCenter.asm
rename to text/SafariZoneCenter.asm
diff --git a/text/maps/SafariZoneCenterRestHouse.asm b/text/SafariZoneCenterRestHouse.asm
similarity index 100%
rename from text/maps/SafariZoneCenterRestHouse.asm
rename to text/SafariZoneCenterRestHouse.asm
diff --git a/text/maps/SafariZoneEast.asm b/text/SafariZoneEast.asm
similarity index 100%
rename from text/maps/SafariZoneEast.asm
rename to text/SafariZoneEast.asm
diff --git a/text/maps/SafariZoneEastRestHouse.asm b/text/SafariZoneEastRestHouse.asm
similarity index 100%
rename from text/maps/SafariZoneEastRestHouse.asm
rename to text/SafariZoneEastRestHouse.asm
diff --git a/text/maps/SafariZoneGate.asm b/text/SafariZoneGate.asm
similarity index 100%
rename from text/maps/SafariZoneGate.asm
rename to text/SafariZoneGate.asm
diff --git a/text/maps/SafariZoneNorth.asm b/text/SafariZoneNorth.asm
similarity index 100%
rename from text/maps/SafariZoneNorth.asm
rename to text/SafariZoneNorth.asm
diff --git a/text/maps/SafariZoneNorthRestHouse.asm b/text/SafariZoneNorthRestHouse.asm
similarity index 100%
rename from text/maps/SafariZoneNorthRestHouse.asm
rename to text/SafariZoneNorthRestHouse.asm
diff --git a/text/maps/SafariZoneSecretHouse.asm b/text/SafariZoneSecretHouse.asm
similarity index 100%
rename from text/maps/SafariZoneSecretHouse.asm
rename to text/SafariZoneSecretHouse.asm
diff --git a/text/maps/SafariZoneWest.asm b/text/SafariZoneWest.asm
similarity index 100%
rename from text/maps/SafariZoneWest.asm
rename to text/SafariZoneWest.asm
diff --git a/text/maps/SafariZoneWestRestHouse.asm b/text/SafariZoneWestRestHouse.asm
similarity index 100%
rename from text/maps/SafariZoneWestRestHouse.asm
rename to text/SafariZoneWestRestHouse.asm
diff --git a/text/maps/SaffronCity.asm b/text/SaffronCity.asm
similarity index 100%
rename from text/maps/SaffronCity.asm
rename to text/SaffronCity.asm
diff --git a/text/maps/SaffronGates.asm b/text/SaffronGates.asm
similarity index 100%
rename from text/maps/SaffronGates.asm
rename to text/SaffronGates.asm
diff --git a/text/maps/SaffronGym.asm b/text/SaffronGym.asm
similarity index 100%
rename from text/maps/SaffronGym.asm
rename to text/SaffronGym.asm
diff --git a/text/maps/SaffronMart.asm b/text/SaffronMart.asm
similarity index 100%
rename from text/maps/SaffronMart.asm
rename to text/SaffronMart.asm
diff --git a/text/maps/SaffronPidgeyHouse.asm b/text/SaffronPidgeyHouse.asm
similarity index 100%
rename from text/maps/SaffronPidgeyHouse.asm
rename to text/SaffronPidgeyHouse.asm
diff --git a/text/maps/SaffronPokecenter.asm b/text/SaffronPokecenter.asm
similarity index 100%
rename from text/maps/SaffronPokecenter.asm
rename to text/SaffronPokecenter.asm
diff --git a/text/maps/SeafoamIslandsB4F.asm b/text/SeafoamIslandsB4F.asm
similarity index 100%
rename from text/maps/SeafoamIslandsB4F.asm
rename to text/SeafoamIslandsB4F.asm
diff --git a/text/maps/SilphCo10F.asm b/text/SilphCo10F.asm
similarity index 100%
rename from text/maps/SilphCo10F.asm
rename to text/SilphCo10F.asm
diff --git a/text/maps/SilphCo11F.asm b/text/SilphCo11F.asm
similarity index 100%
rename from text/maps/SilphCo11F.asm
rename to text/SilphCo11F.asm
diff --git a/text/maps/SilphCo1F.asm b/text/SilphCo1F.asm
similarity index 100%
rename from text/maps/SilphCo1F.asm
rename to text/SilphCo1F.asm
diff --git a/text/maps/SilphCo2F.asm b/text/SilphCo2F.asm
similarity index 100%
rename from text/maps/SilphCo2F.asm
rename to text/SilphCo2F.asm
diff --git a/text/maps/SilphCo3F.asm b/text/SilphCo3F.asm
similarity index 100%
rename from text/maps/SilphCo3F.asm
rename to text/SilphCo3F.asm
diff --git a/text/maps/SilphCo4F.asm b/text/SilphCo4F.asm
similarity index 100%
rename from text/maps/SilphCo4F.asm
rename to text/SilphCo4F.asm
diff --git a/text/maps/SilphCo5F.asm b/text/SilphCo5F.asm
similarity index 100%
rename from text/maps/SilphCo5F.asm
rename to text/SilphCo5F.asm
diff --git a/text/maps/SilphCo5F_2.asm b/text/SilphCo5F_2.asm
similarity index 100%
rename from text/maps/SilphCo5F_2.asm
rename to text/SilphCo5F_2.asm
diff --git a/text/maps/SilphCo6F.asm b/text/SilphCo6F.asm
similarity index 100%
rename from text/maps/SilphCo6F.asm
rename to text/SilphCo6F.asm
diff --git a/text/maps/SilphCo7F.asm b/text/SilphCo7F.asm
similarity index 100%
rename from text/maps/SilphCo7F.asm
rename to text/SilphCo7F.asm
diff --git a/text/maps/SilphCo8F.asm b/text/SilphCo8F.asm
similarity index 100%
rename from text/maps/SilphCo8F.asm
rename to text/SilphCo8F.asm
diff --git a/text/maps/SilphCo9F.asm b/text/SilphCo9F.asm
similarity index 100%
rename from text/maps/SilphCo9F.asm
rename to text/SilphCo9F.asm
diff --git a/text/maps/UndergroundPathRoute6.asm b/text/UndergroundPathRoute6.asm
similarity index 100%
rename from text/maps/UndergroundPathRoute6.asm
rename to text/UndergroundPathRoute6.asm
diff --git a/text/maps/UndergroundPathRoute7.asm b/text/UndergroundPathRoute7.asm
similarity index 100%
rename from text/maps/UndergroundPathRoute7.asm
rename to text/UndergroundPathRoute7.asm
diff --git a/text/maps/UndergroundPathRoute7Copy.asm b/text/UndergroundPathRoute7Copy.asm
similarity index 100%
rename from text/maps/UndergroundPathRoute7Copy.asm
rename to text/UndergroundPathRoute7Copy.asm
diff --git a/text/maps/UndergroundPathRoute8.asm b/text/UndergroundPathRoute8.asm
similarity index 100%
rename from text/maps/UndergroundPathRoute8.asm
rename to text/UndergroundPathRoute8.asm
diff --git a/text/maps/VermilionCity.asm b/text/VermilionCity.asm
similarity index 100%
rename from text/maps/VermilionCity.asm
rename to text/VermilionCity.asm
diff --git a/text/maps/VermilionDock.asm b/text/VermilionDock.asm
similarity index 100%
rename from text/maps/VermilionDock.asm
rename to text/VermilionDock.asm
diff --git a/text/maps/VermilionGym.asm b/text/VermilionGym.asm
similarity index 100%
rename from text/maps/VermilionGym.asm
rename to text/VermilionGym.asm
diff --git a/text/maps/VermilionGym_2.asm b/text/VermilionGym_2.asm
similarity index 100%
rename from text/maps/VermilionGym_2.asm
rename to text/VermilionGym_2.asm
diff --git a/text/maps/VermilionMart.asm b/text/VermilionMart.asm
similarity index 100%
rename from text/maps/VermilionMart.asm
rename to text/VermilionMart.asm
diff --git a/text/maps/VermilionOldRodHouse.asm b/text/VermilionOldRodHouse.asm
similarity index 100%
rename from text/maps/VermilionOldRodHouse.asm
rename to text/VermilionOldRodHouse.asm
diff --git a/text/maps/VermilionPidgeyHouse.asm b/text/VermilionPidgeyHouse.asm
similarity index 100%
rename from text/maps/VermilionPidgeyHouse.asm
rename to text/VermilionPidgeyHouse.asm
diff --git a/text/maps/VermilionPokecenter.asm b/text/VermilionPokecenter.asm
similarity index 100%
rename from text/maps/VermilionPokecenter.asm
rename to text/VermilionPokecenter.asm
diff --git a/text/maps/VictoryRoad1F.asm b/text/VictoryRoad1F.asm
similarity index 100%
rename from text/maps/VictoryRoad1F.asm
rename to text/VictoryRoad1F.asm
diff --git a/text/maps/VictoryRoad2F.asm b/text/VictoryRoad2F.asm
similarity index 100%
rename from text/maps/VictoryRoad2F.asm
rename to text/VictoryRoad2F.asm
diff --git a/text/maps/VictoryRoad3F.asm b/text/VictoryRoad3F.asm
similarity index 100%
rename from text/maps/VictoryRoad3F.asm
rename to text/VictoryRoad3F.asm
diff --git a/text/maps/ViridianCity.asm b/text/ViridianCity.asm
similarity index 100%
rename from text/maps/ViridianCity.asm
rename to text/ViridianCity.asm
diff --git a/text/maps/ViridianForest.asm b/text/ViridianForest.asm
similarity index 100%
rename from text/maps/ViridianForest.asm
rename to text/ViridianForest.asm
diff --git a/text/maps/ViridianForestNorthGate.asm b/text/ViridianForestNorthGate.asm
similarity index 100%
rename from text/maps/ViridianForestNorthGate.asm
rename to text/ViridianForestNorthGate.asm
diff --git a/text/maps/ViridianForestSouthGate.asm b/text/ViridianForestSouthGate.asm
similarity index 100%
rename from text/maps/ViridianForestSouthGate.asm
rename to text/ViridianForestSouthGate.asm
diff --git a/text/maps/ViridianGym.asm b/text/ViridianGym.asm
similarity index 100%
rename from text/maps/ViridianGym.asm
rename to text/ViridianGym.asm
diff --git a/text/maps/ViridianMart.asm b/text/ViridianMart.asm
similarity index 100%
rename from text/maps/ViridianMart.asm
rename to text/ViridianMart.asm
diff --git a/text/maps/ViridianNicknameHouse.asm b/text/ViridianNicknameHouse.asm
similarity index 100%
rename from text/maps/ViridianNicknameHouse.asm
rename to text/ViridianNicknameHouse.asm
diff --git a/text/maps/ViridianPokecenter.asm b/text/ViridianPokecenter.asm
similarity index 100%
rename from text/maps/ViridianPokecenter.asm
rename to text/ViridianPokecenter.asm
diff --git a/text/maps/ViridianSchoolHouse.asm b/text/ViridianSchoolHouse.asm
similarity index 100%
rename from text/maps/ViridianSchoolHouse.asm
rename to text/ViridianSchoolHouse.asm
diff --git a/text/maps/WardensHouse.asm b/text/WardensHouse.asm
similarity index 100%
rename from text/maps/WardensHouse.asm
rename to text/WardensHouse.asm
diff --git a/text/oakspeech.asm b/text/oakspeech.asm
deleted file mode 100644
index e006d16f..00000000
--- a/text/oakspeech.asm
+++ /dev/null
@@ -1,55 +0,0 @@
-_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
diff --git a/text/unused_names.asm b/text/unused_names.asm
deleted file mode 100644
index 4aca7ca2..00000000
--- a/text/unused_names.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-UnusedNames::
-	db "かみなりバッヂ@"
-	db "かいがらバッヂ@"
-	db "おじぞうバッヂ@"
-	db "はやぶさバッヂ@"
-	db "ひんやりバッヂ@"
-	db "なかよしバッヂ@"
-	db "バラバッヂ@"
-	db "ひのたまバッヂ@"
-	db "ゴールドバッヂ@"
-	db "たまご@"
-	db "ひよこ@"
-	db "ブロンズ@"
-	db "シルバー@"
-	db "ゴールド@"
-	db "プチキャプテン@"
-	db "キャプテン@"
-	db "プチマスター@"
-	db "マスター@"
-	db "エクセレント"