diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 15:06:23 -0500 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 23:33:10 -0500 |
commit | c7796024590fec48ac79756793c1a6e3b54daf8f (patch) | |
tree | 0d61caa7ebe429995a61e800d1d78c3a82aec886 /text | |
parent | 90430e6dee9e207dc0b618d07566f83617343f60 (diff) |
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to 'text')
-rw-r--r-- | text/maps/AgathasRoom.asm (renamed from text/maps/agatha.asm) | 0 | ||||
-rw-r--r-- | text/maps/BikeShop.asm (renamed from text/maps/bike_shop.asm) | 0 | ||||
-rw-r--r-- | text/maps/BillsHouse.asm (renamed from text/maps/bills_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/BluesHouse.asm (renamed from text/maps/blues_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/BrunosRoom.asm (renamed from text/maps/bruno.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonChiefHouse.asm (renamed from text/maps/celadon_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonCity.asm (renamed from text/maps/celadon_city.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonDiner.asm (renamed from text/maps/celadon_diner.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonGym.asm (renamed from text/maps/celadon_gym.asm) | 3 | ||||
-rw-r--r-- | text/maps/CeladonHotel.asm (renamed from text/maps/celadon_hotel.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonMansion1F.asm (renamed from text/maps/celadon_mansion_1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonMansion2F.asm (renamed from text/maps/celadon_mansion_2f.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonMansion3F.asm (renamed from text/maps/celadon_mansion_3f.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonMansionRoof.asm (renamed from text/maps/celadon_mansion_4f_outside.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonMansionRoofHouse.asm (renamed from text/maps/celadon_mansion_4f_inside.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonMart1F.asm (renamed from text/maps/celadon_dept_store_1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonMart2F.asm (renamed from text/maps/celadon_dept_store_2f.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonMart3F.asm (renamed from text/maps/celadon_dept_store_3f.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonMart4F.asm (renamed from text/maps/celadon_dept_store_4f.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonMart5F.asm (renamed from text/maps/celadon_dept_store_5f.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeladonMartRoof.asm (renamed from text/maps/celadon_dept_store_roof.asm) | 11 | ||||
-rw-r--r-- | text/maps/CeladonPokecenter.asm (renamed from text/maps/celadon_pokecenter.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeruleanBadgeHouse.asm (renamed from text/maps/cerulean_badge_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeruleanCaveB1F.asm (renamed from text/maps/unknown_dungeon_b1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeruleanCity.asm (renamed from text/maps/cerulean_city.asm) | 3 | ||||
-rw-r--r-- | text/maps/CeruleanGym.asm (renamed from text/maps/cerulean_gym.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeruleanMart.asm (renamed from text/maps/cerulean_mart.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeruleanPokecenter.asm (renamed from text/maps/cerulean_pokecenter.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeruleanTradeHouse.asm (renamed from text/maps/cerulean_trade_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/CeruleanTrashedHouse.asm (renamed from text/maps/cerulean_trashed_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/ChampionsRoom.asm (renamed from text/maps/champion.asm) | 0 | ||||
-rw-r--r-- | text/maps/CinnabarGym.asm (renamed from text/maps/cinnabar_gym.asm) | 3 | ||||
-rw-r--r-- | text/maps/CinnabarIsland.asm (renamed from text/maps/cinnabar_island.asm) | 0 | ||||
-rw-r--r-- | text/maps/CinnabarLab.asm (renamed from text/maps/cinnabar_lab.asm) | 0 | ||||
-rw-r--r-- | text/maps/CinnabarLabFossilRoom.asm (renamed from text/maps/cinnabar_lab_fossil_room.asm) | 2 | ||||
-rw-r--r-- | text/maps/CinnabarLabMetronomeRoom.asm (renamed from text/maps/cinnabar_lab_metronome_room.asm) | 0 | ||||
-rw-r--r-- | text/maps/CinnabarLabTradeRoom.asm (renamed from text/maps/cinnabar_lab_trade_room.asm) | 0 | ||||
-rw-r--r-- | text/maps/CinnabarMart.asm (renamed from text/maps/cinnabar_mart.asm) | 0 | ||||
-rw-r--r-- | text/maps/CinnabarPokecenter.asm (renamed from text/maps/cinnabar_pokecenter.asm) | 0 | ||||
-rw-r--r-- | text/maps/CopycatsHouse1F.asm (renamed from text/maps/copycats_house_1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/CopycatsHouse2F.asm (renamed from text/maps/copycats_house_2f.asm) | 3 | ||||
-rw-r--r-- | text/maps/Daycare.asm (renamed from text/maps/daycare_1.asm) | 8 | ||||
-rw-r--r-- | text/maps/Daycare_2.asm (renamed from text/maps/daycare_2.asm) | 0 | ||||
-rw-r--r-- | text/maps/DiglettsCaveRoute11.asm (renamed from text/maps/digletts_cave_route_11_entrance.asm) | 0 | ||||
-rw-r--r-- | text/maps/DiglettsCaveRoute2.asm (renamed from text/maps/digletts_cave_route_2_entrance.asm) | 0 | ||||
-rw-r--r-- | text/maps/FightingDojo.asm (renamed from text/maps/fighting_dojo.asm) | 0 | ||||
-rw-r--r-- | text/maps/FuchsiaBillsGrandpasHouse.asm (renamed from text/maps/fuchsia_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/FuchsiaCity.asm (renamed from text/maps/fuchsia_city.asm) | 0 | ||||
-rw-r--r-- | text/maps/FuchsiaGoodRodHouse.asm (renamed from text/maps/fuchsia_fishing_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/FuchsiaGym.asm (renamed from text/maps/fuchsia_gym_1.asm) | 0 | ||||
-rw-r--r-- | text/maps/FuchsiaGym_2.asm (renamed from text/maps/fuchsia_gym_2.asm) | 2 | ||||
-rw-r--r-- | text/maps/FuchsiaMart.asm (renamed from text/maps/fuchsia_mart.asm) | 0 | ||||
-rw-r--r-- | text/maps/FuchsiaMeetingRoom.asm (renamed from text/maps/fuchsia_meeting_room.asm) | 0 | ||||
-rw-r--r-- | text/maps/FuchsiaPokecenter.asm (renamed from text/maps/fuchsia_pokecenter.asm) | 0 | ||||
-rw-r--r-- | text/maps/GameCorner.asm (renamed from text/maps/celadon_game_corner.asm) | 0 | ||||
-rw-r--r-- | text/maps/GameCornerPrizeRoom.asm (renamed from text/maps/celadon_prize_room.asm) | 0 | ||||
-rw-r--r-- | text/maps/HallOfFame.asm (renamed from text/maps/hall_of_fame.asm) | 0 | ||||
-rw-r--r-- | text/maps/IndigoPlateauLobby.asm (renamed from text/maps/indigo_plateau_lobby.asm) | 0 | ||||
-rw-r--r-- | text/maps/LancesRoom.asm (renamed from text/maps/lance.asm) | 0 | ||||
-rw-r--r-- | text/maps/LavenderCuboneHouse.asm (renamed from text/maps/lavender_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/LavenderMart.asm (renamed from text/maps/lavender_mart.asm) | 0 | ||||
-rw-r--r-- | text/maps/LavenderPokecenter.asm (renamed from text/maps/lavender_pokecenter.asm) | 0 | ||||
-rw-r--r-- | text/maps/LavenderTown.asm (renamed from text/maps/lavender_town.asm) | 0 | ||||
-rw-r--r-- | text/maps/LoreleisRoom.asm (renamed from text/maps/lorelei.asm) | 0 | ||||
-rw-r--r-- | text/maps/MrFujisHouse.asm (renamed from text/maps/fujis_house.asm) | 3 | ||||
-rw-r--r-- | text/maps/MrPsychicsHouse.asm (renamed from text/maps/mr_psychics_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/MtMoon1F.asm (renamed from text/maps/mt_moon_1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/MtMoonB1F.asm (renamed from text/maps/mt_moon_b1f.asm) | 2 | ||||
-rw-r--r-- | text/maps/MtMoonB2F.asm (renamed from text/maps/mt_moon_b2f.asm) | 0 | ||||
-rw-r--r-- | text/maps/MtMoonPokecenter.asm (renamed from text/maps/mt_moon_pokecenter.asm) | 2 | ||||
-rw-r--r-- | text/maps/Museum1F.asm (renamed from text/maps/museum_1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/Museum2F.asm (renamed from text/maps/museum_2f.asm) | 0 | ||||
-rw-r--r-- | text/maps/NameRatersHouse.asm (renamed from text/maps/name_rater.asm) | 0 | ||||
-rw-r--r-- | text/maps/OaksLab.asm (renamed from text/maps/oaks_lab.asm) | 0 | ||||
-rw-r--r-- | text/maps/PalletTown.asm (renamed from text/maps/pallet_town.asm) | 0 | ||||
-rw-r--r-- | text/maps/PewterCity.asm (renamed from text/maps/pewter_city.asm) | 0 | ||||
-rw-r--r-- | text/maps/PewterGym.asm (renamed from text/maps/pewter_gym_1.asm) | 0 | ||||
-rw-r--r-- | text/maps/PewterGym_2.asm (renamed from text/maps/pewter_gym_2.asm) | 6 | ||||
-rw-r--r-- | text/maps/PewterMart.asm (renamed from text/maps/pewter_mart.asm) | 0 | ||||
-rw-r--r-- | text/maps/PewterNidoranHouse.asm (renamed from text/maps/pewter_house_1.asm) | 0 | ||||
-rw-r--r-- | text/maps/PewterPokecenter.asm (renamed from text/maps/pewter_pokecenter.asm) | 0 | ||||
-rw-r--r-- | text/maps/PewterSpeechHouse.asm (renamed from text/maps/pewter_house_2.asm) | 0 | ||||
-rw-r--r-- | text/maps/PokemonFanClub.asm (renamed from text/maps/fan_club.asm) | 0 | ||||
-rw-r--r-- | text/maps/PokemonMansion1F.asm (renamed from text/maps/mansion_1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/PokemonMansion2F.asm (renamed from text/maps/mansion_2f.asm) | 0 | ||||
-rw-r--r-- | text/maps/PokemonMansion3F.asm (renamed from text/maps/mansion_3f.asm) | 0 | ||||
-rw-r--r-- | text/maps/PokemonMansionB1F.asm (renamed from text/maps/mansion_b1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/PokemonTower1F.asm (renamed from text/maps/pokemon_tower_1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/PokemonTower2F.asm (renamed from text/maps/pokemon_tower_2f.asm) | 0 | ||||
-rw-r--r-- | text/maps/PokemonTower3F.asm (renamed from text/maps/pokemon_tower_3f.asm) | 0 | ||||
-rw-r--r-- | text/maps/PokemonTower4F.asm (renamed from text/maps/pokemon_tower_4f.asm) | 0 | ||||
-rw-r--r-- | text/maps/PokemonTower5F.asm (renamed from text/maps/pokemon_tower_5f.asm) | 0 | ||||
-rw-r--r-- | text/maps/PokemonTower6F.asm (renamed from text/maps/pokemon_tower_6f.asm) | 0 | ||||
-rw-r--r-- | text/maps/PokemonTower7F.asm (renamed from text/maps/pokemon_tower_7f.asm) | 0 | ||||
-rw-r--r-- | text/maps/PowerPlant.asm (renamed from text/maps/power_plant.asm) | 0 | ||||
-rw-r--r-- | text/maps/RedsHouse1F.asm (renamed from text/maps/reds_house_1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/RockTunnel1F.asm (renamed from text/maps/rock_tunnel_b1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/RockTunnelB1F.asm (renamed from text/maps/rock_tunnel_b2f_1.asm) | 0 | ||||
-rw-r--r-- | text/maps/RockTunnelB1F_2.asm (renamed from text/maps/rock_tunnel_b2f_2.asm) | 0 | ||||
-rw-r--r-- | text/maps/RockTunnelPokecenter.asm (renamed from text/maps/rock_tunnel_pokecenter.asm) | 0 | ||||
-rw-r--r-- | text/maps/RocketHideoutB1F.asm (renamed from text/maps/rocket_hideout_b1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/RocketHideoutB2F.asm (renamed from text/maps/rocket_hideout_b2f.asm) | 0 | ||||
-rw-r--r-- | text/maps/RocketHideoutB3F.asm (renamed from text/maps/rocket_hideout_b3f.asm) | 0 | ||||
-rw-r--r-- | text/maps/RocketHideoutB4F.asm (renamed from text/maps/rocket_hideout_b4f.asm) | 0 | ||||
-rw-r--r-- | text/maps/RocketHideoutElevator.asm (renamed from text/maps/rocket_hideout_elevator.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route1.asm (renamed from text/maps/route_1.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route10.asm (renamed from text/maps/route_10.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route11.asm (renamed from text/maps/route_11_1.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route11Gate1F.asm (renamed from text/maps/route_11_gate.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route11Gate2F.asm (renamed from text/maps/route_11_gate_upstairs.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route11_2.asm (renamed from text/maps/route_11_2.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route12.asm (renamed from text/maps/route_12.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route12Gate1F.asm (renamed from text/maps/route_12_gate.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route12Gate2F.asm (renamed from text/maps/route_12_gate_upstairs.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route12SuperRodHouse.asm (renamed from text/maps/route_12_house.asm) | 3 | ||||
-rw-r--r-- | text/maps/Route13.asm (renamed from text/maps/route_13.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route14.asm (renamed from text/maps/route_14.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route15.asm (renamed from text/maps/route_15.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route15Gate1F.asm (renamed from text/maps/route_15_gate.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route15Gate2F.asm (renamed from text/maps/route_15_gate_upstairs.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route16.asm (renamed from text/maps/route_16.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route16FlyHouse.asm (renamed from text/maps/route_16_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route16Gate1F.asm (renamed from text/maps/route_16_gate.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route16Gate2F.asm (renamed from text/maps/route_16_gate_upstairs.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route17.asm (renamed from text/maps/route_17.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route18.asm (renamed from text/maps/route_18.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route18Gate1F.asm (renamed from text/maps/route_18_gate.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route18Gate2F.asm (renamed from text/maps/route_18_gate_upstairs.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route19.asm (renamed from text/maps/route_19.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route2.asm (renamed from text/maps/route_2.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route20.asm (renamed from text/maps/route_20.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route21.asm (renamed from text/maps/route_21.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route22.asm (renamed from text/maps/route_22.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route22Gate.asm (renamed from text/maps/pokemon_league_gate.asm) | 3 | ||||
-rw-r--r-- | text/maps/Route23.asm (renamed from text/maps/route_23.asm) | 3 | ||||
-rw-r--r-- | text/maps/Route24.asm (renamed from text/maps/route_24_1.asm) | 3 | ||||
-rw-r--r-- | text/maps/Route24_2.asm (renamed from text/maps/route_24_2.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route25.asm (renamed from text/maps/route_25.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route2Gate.asm (renamed from text/maps/route_2_gate.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route2TradeHouse.asm (renamed from text/maps/route_2_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route3.asm (renamed from text/maps/route_3.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route4.asm (renamed from text/maps/route_4.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route5.asm (renamed from text/maps/route_5.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route6.asm (renamed from text/maps/route_6.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route7.asm (renamed from text/maps/route_7.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route8.asm (renamed from text/maps/route_8.asm) | 0 | ||||
-rw-r--r-- | text/maps/Route9.asm (renamed from text/maps/route_9.asm) | 0 | ||||
-rw-r--r-- | text/maps/SSAnne1F.asm (renamed from text/maps/ss_anne_1.asm) | 0 | ||||
-rw-r--r-- | text/maps/SSAnne1FRooms.asm (renamed from text/maps/ss_anne_8.asm) | 0 | ||||
-rw-r--r-- | text/maps/SSAnne2F.asm (renamed from text/maps/ss_anne_2.asm) | 0 | ||||
-rw-r--r-- | text/maps/SSAnne2FRooms.asm (renamed from text/maps/ss_anne_9.asm) | 0 | ||||
-rw-r--r-- | text/maps/SSAnne3F.asm (renamed from text/maps/ss_anne_3.asm) | 0 | ||||
-rw-r--r-- | text/maps/SSAnneB1FRooms.asm (renamed from text/maps/ss_anne_10.asm) | 0 | ||||
-rw-r--r-- | text/maps/SSAnneBow.asm (renamed from text/maps/ss_anne_5.asm) | 0 | ||||
-rw-r--r-- | text/maps/SSAnneCaptainsRoom.asm (renamed from text/maps/ss_anne_7.asm) | 0 | ||||
-rw-r--r-- | text/maps/SSAnneKitchen.asm (renamed from text/maps/ss_anne_6.asm) | 0 | ||||
-rw-r--r-- | text/maps/SafariZoneCenter.asm (renamed from text/maps/safari_zone_center.asm) | 0 | ||||
-rw-r--r-- | text/maps/SafariZoneCenterRestHouse.asm (renamed from text/maps/safari_zone_rest_house_1.asm) | 0 | ||||
-rw-r--r-- | text/maps/SafariZoneEast.asm (renamed from text/maps/safari_zone_east.asm) | 0 | ||||
-rw-r--r-- | text/maps/SafariZoneEastRestHouse.asm (renamed from text/maps/safari_zone_rest_house_3.asm) | 0 | ||||
-rw-r--r-- | text/maps/SafariZoneGate.asm (renamed from text/maps/safari_zone_entrance.asm) | 3 | ||||
-rw-r--r-- | text/maps/SafariZoneNorth.asm (renamed from text/maps/safari_zone_north.asm) | 0 | ||||
-rw-r--r-- | text/maps/SafariZoneNorthRestHouse.asm (renamed from text/maps/safari_zone_rest_house_4.asm) | 0 | ||||
-rw-r--r-- | text/maps/SafariZoneSecretHouse.asm (renamed from text/maps/safari_zone_secret_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/SafariZoneWest.asm (renamed from text/maps/safari_zone_west.asm) | 0 | ||||
-rw-r--r-- | text/maps/SafariZoneWestRestHouse.asm (renamed from text/maps/safari_zone_rest_house_2.asm) | 0 | ||||
-rw-r--r-- | text/maps/SaffronCity.asm (renamed from text/maps/saffron_city.asm) | 0 | ||||
-rw-r--r-- | text/maps/SaffronGates.asm (renamed from text/maps/saffron_gates.asm) | 3 | ||||
-rw-r--r-- | text/maps/SaffronGym.asm (renamed from text/maps/saffron_gym.asm) | 3 | ||||
-rw-r--r-- | text/maps/SaffronMart.asm (renamed from text/maps/saffron_mart.asm) | 0 | ||||
-rw-r--r-- | text/maps/SaffronPidgeyHouse.asm (renamed from text/maps/saffron_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/SaffronPokecenter.asm (renamed from text/maps/saffron_pokecenter.asm) | 0 | ||||
-rw-r--r-- | text/maps/SeafoamIslandsB4F.asm (renamed from text/maps/seafoam_islands_b4f.asm) | 0 | ||||
-rw-r--r-- | text/maps/SilphCo10F.asm (renamed from text/maps/silph_co_10f.asm) | 0 | ||||
-rw-r--r-- | text/maps/SilphCo11F.asm (renamed from text/maps/silph_co_11f.asm) | 0 | ||||
-rw-r--r-- | text/maps/SilphCo1F.asm (renamed from text/maps/silph_co_1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/SilphCo2F.asm (renamed from text/maps/silph_co_2f.asm) | 0 | ||||
-rw-r--r-- | text/maps/SilphCo3F.asm (renamed from text/maps/silph_co_3f.asm) | 0 | ||||
-rw-r--r-- | text/maps/SilphCo4F.asm (renamed from text/maps/silph_co_4f.asm) | 0 | ||||
-rw-r--r-- | text/maps/SilphCo5F.asm (renamed from text/maps/silph_co_5f_1.asm) | 0 | ||||
-rw-r--r-- | text/maps/SilphCo5F_2.asm (renamed from text/maps/silph_co_5f_2.asm) | 0 | ||||
-rw-r--r-- | text/maps/SilphCo6F.asm (renamed from text/maps/silph_co_6f.asm) | 0 | ||||
-rw-r--r-- | text/maps/SilphCo7F.asm (renamed from text/maps/silph_co_7f.asm) | 0 | ||||
-rw-r--r-- | text/maps/SilphCo8F.asm (renamed from text/maps/silph_co_8f.asm) | 0 | ||||
-rw-r--r-- | text/maps/SilphCo9F.asm (renamed from text/maps/silph_co_9f.asm) | 0 | ||||
-rw-r--r-- | text/maps/UndergroundPathRoute6.asm (renamed from text/maps/underground_path_route_6_entrance.asm) | 0 | ||||
-rw-r--r-- | text/maps/UndergroundPathRoute7.asm (renamed from text/maps/underground_path_route_7_entrance.asm) | 0 | ||||
-rw-r--r-- | text/maps/UndergroundPathRoute7Copy.asm (renamed from text/maps/underground_path_route_7_entrance_unused.asm) | 0 | ||||
-rw-r--r-- | text/maps/UndergroundPathRoute8.asm (renamed from text/maps/underground_path_route_8_entrance.asm) | 0 | ||||
-rw-r--r-- | text/maps/VermilionCity.asm (renamed from text/maps/vermilion_city.asm) | 0 | ||||
-rw-r--r-- | text/maps/VermilionDock.asm (renamed from text/maps/vermilion_dock.asm) | 0 | ||||
-rw-r--r-- | text/maps/VermilionGym.asm (renamed from text/maps/vermilion_gym_1.asm) | 0 | ||||
-rw-r--r-- | text/maps/VermilionGym_2.asm (renamed from text/maps/vermilion_gym_2.asm) | 3 | ||||
-rw-r--r-- | text/maps/VermilionMart.asm (renamed from text/maps/vermilion_mart.asm) | 0 | ||||
-rw-r--r-- | text/maps/VermilionOldRodHouse.asm (renamed from text/maps/vermilion_fishing_house.asm) | 3 | ||||
-rw-r--r-- | text/maps/VermilionPidgeyHouse.asm (renamed from text/maps/vermilion_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/VermilionPokecenter.asm (renamed from text/maps/vermilion_pokecenter.asm) | 0 | ||||
-rw-r--r-- | text/maps/VictoryRoad1F.asm (renamed from text/maps/victory_road_1f.asm) | 0 | ||||
-rw-r--r-- | text/maps/VictoryRoad2F.asm (renamed from text/maps/victory_road_2f.asm) | 0 | ||||
-rw-r--r-- | text/maps/VictoryRoad3F.asm (renamed from text/maps/victory_road_3f.asm) | 0 | ||||
-rw-r--r-- | text/maps/ViridianCity.asm (renamed from text/maps/viridian_city.asm) | 0 | ||||
-rw-r--r-- | text/maps/ViridianForest.asm (renamed from text/maps/viridian_forest.asm) | 0 | ||||
-rw-r--r-- | text/maps/ViridianForestNorthGate.asm (renamed from text/maps/viridian_forest_exit.asm) | 0 | ||||
-rw-r--r-- | text/maps/ViridianForestSouthGate.asm (renamed from text/maps/viridian_forest_entrance.asm) | 0 | ||||
-rw-r--r-- | text/maps/ViridianGym.asm (renamed from text/maps/viridian_gym.asm) | 3 | ||||
-rw-r--r-- | text/maps/ViridianMart.asm (renamed from text/maps/viridian_mart.asm) | 0 | ||||
-rw-r--r-- | text/maps/ViridianNicknameHouse.asm (renamed from text/maps/viridian_house.asm) | 0 | ||||
-rw-r--r-- | text/maps/ViridianPokecenter.asm (renamed from text/maps/viridian_pokecenter.asm) | 0 | ||||
-rw-r--r-- | text/maps/ViridianSchoolHouse.asm (renamed from text/maps/school.asm) | 0 | ||||
-rw-r--r-- | text/maps/WardensHouse.asm (renamed from text/maps/wardens_house.asm) | 3 |
210 files changed, 51 insertions, 30 deletions
diff --git a/text/maps/agatha.asm b/text/maps/AgathasRoom.asm index 9ef5059a..9ef5059a 100644 --- a/text/maps/agatha.asm +++ b/text/maps/AgathasRoom.asm diff --git a/text/maps/bike_shop.asm b/text/maps/BikeShop.asm index 86799865..86799865 100644 --- a/text/maps/bike_shop.asm +++ b/text/maps/BikeShop.asm diff --git a/text/maps/bills_house.asm b/text/maps/BillsHouse.asm index 5ece48d7..5ece48d7 100644 --- a/text/maps/bills_house.asm +++ b/text/maps/BillsHouse.asm diff --git a/text/maps/blues_house.asm b/text/maps/BluesHouse.asm index 1898636a..1898636a 100644 --- a/text/maps/blues_house.asm +++ b/text/maps/BluesHouse.asm diff --git a/text/maps/bruno.asm b/text/maps/BrunosRoom.asm index 9c493c4a..9c493c4a 100644 --- a/text/maps/bruno.asm +++ b/text/maps/BrunosRoom.asm diff --git a/text/maps/celadon_house.asm b/text/maps/CeladonChiefHouse.asm index 19e59bd6..19e59bd6 100644 --- a/text/maps/celadon_house.asm +++ b/text/maps/CeladonChiefHouse.asm diff --git a/text/maps/celadon_city.asm b/text/maps/CeladonCity.asm index 1dbd5cdf..1dbd5cdf 100644 --- a/text/maps/celadon_city.asm +++ b/text/maps/CeladonCity.asm diff --git a/text/maps/celadon_diner.asm b/text/maps/CeladonDiner.asm index dc5e9350..dc5e9350 100644 --- a/text/maps/celadon_diner.asm +++ b/text/maps/CeladonDiner.asm diff --git a/text/maps/celadon_gym.asm b/text/maps/CeladonGym.asm index d8f9394c..d6586035 100644 --- a/text/maps/celadon_gym.asm +++ b/text/maps/CeladonGym.asm @@ -68,7 +68,8 @@ _ReceivedTM21Text:: text "!@@" _TM21ExplanationText:: - db $0 + text "" + para "TM21 contains" line "MEGA DRAIN." diff --git a/text/maps/celadon_hotel.asm b/text/maps/CeladonHotel.asm index f2eb059e..f2eb059e 100644 --- a/text/maps/celadon_hotel.asm +++ b/text/maps/CeladonHotel.asm diff --git a/text/maps/celadon_mansion_1f.asm b/text/maps/CeladonMansion1F.asm index fc175cd5..fc175cd5 100644 --- a/text/maps/celadon_mansion_1f.asm +++ b/text/maps/CeladonMansion1F.asm diff --git a/text/maps/celadon_mansion_2f.asm b/text/maps/CeladonMansion2F.asm index b2ecb4fa..b2ecb4fa 100644 --- a/text/maps/celadon_mansion_2f.asm +++ b/text/maps/CeladonMansion2F.asm diff --git a/text/maps/celadon_mansion_3f.asm b/text/maps/CeladonMansion3F.asm index c8858281..c8858281 100644 --- a/text/maps/celadon_mansion_3f.asm +++ b/text/maps/CeladonMansion3F.asm diff --git a/text/maps/celadon_mansion_4f_outside.asm b/text/maps/CeladonMansionRoof.asm index c8fd7ec8..c8fd7ec8 100644 --- a/text/maps/celadon_mansion_4f_outside.asm +++ b/text/maps/CeladonMansionRoof.asm diff --git a/text/maps/celadon_mansion_4f_inside.asm b/text/maps/CeladonMansionRoofHouse.asm index dab81a8d..dab81a8d 100644 --- a/text/maps/celadon_mansion_4f_inside.asm +++ b/text/maps/CeladonMansionRoofHouse.asm diff --git a/text/maps/celadon_dept_store_1f.asm b/text/maps/CeladonMart1F.asm index 8d805edc..8d805edc 100644 --- a/text/maps/celadon_dept_store_1f.asm +++ b/text/maps/CeladonMart1F.asm diff --git a/text/maps/celadon_dept_store_2f.asm b/text/maps/CeladonMart2F.asm index 74869902..74869902 100644 --- a/text/maps/celadon_dept_store_2f.asm +++ b/text/maps/CeladonMart2F.asm diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/CeladonMart3F.asm index 8211750d..8211750d 100644 --- a/text/maps/celadon_dept_store_3f.asm +++ b/text/maps/CeladonMart3F.asm diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/CeladonMart4F.asm index 78fa0b66..78fa0b66 100644 --- a/text/maps/celadon_dept_store_4f.asm +++ b/text/maps/CeladonMart4F.asm diff --git a/text/maps/celadon_dept_store_5f.asm b/text/maps/CeladonMart5F.asm index 1871194b..1871194b 100644 --- a/text/maps/celadon_dept_store_5f.asm +++ b/text/maps/CeladonMart5F.asm diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/CeladonMartRoof.asm index 5d104cf5..1ed52e86 100644 --- a/text/maps/celadon_dept_store_roof.asm +++ b/text/maps/CeladonMartRoof.asm @@ -20,7 +20,8 @@ _CeladonMartRoofText_484f9:: text "!@@" _CeladonMartRoofText_484fe:: - db $0 + text "" + para "@" TX_RAM wcf4b text " contains" @@ -46,7 +47,8 @@ _CeladonMartRoofText_4850a:: text "!@@" _CeladonMartRoofText_4850f:: - db $0 + text "" + para "@" TX_RAM wcf4b text " contains" @@ -70,7 +72,8 @@ _ReceivedTM49Text:: line "TM49!@@" _CeladonMartRoofText_48520:: - db $0 + text "" + para "TM49 contains" line "TRI ATTACK!@@" @@ -124,7 +127,7 @@ _VendingMachineText4:: _VendingMachineText5:: TX_RAM wcf4b - db $0 + text "" line "popped out!" done diff --git a/text/maps/celadon_pokecenter.asm b/text/maps/CeladonPokecenter.asm index a04f51c9..a04f51c9 100644 --- a/text/maps/celadon_pokecenter.asm +++ b/text/maps/CeladonPokecenter.asm diff --git a/text/maps/cerulean_badge_house.asm b/text/maps/CeruleanBadgeHouse.asm index 9d701443..9d701443 100644 --- a/text/maps/cerulean_badge_house.asm +++ b/text/maps/CeruleanBadgeHouse.asm diff --git a/text/maps/unknown_dungeon_b1f.asm b/text/maps/CeruleanCaveB1F.asm index 0918a3ce..0918a3ce 100644 --- a/text/maps/unknown_dungeon_b1f.asm +++ b/text/maps/CeruleanCaveB1F.asm diff --git a/text/maps/cerulean_city.asm b/text/maps/CeruleanCity.asm index b5319d04..f0d2c29e 100644 --- a/text/maps/cerulean_city.asm +++ b/text/maps/CeruleanCity.asm @@ -73,7 +73,8 @@ _ReceivedTM28Text:: line "TM28!@@" _ReceivedTM28Text2:: - db $0 + text "" + para "I better get" line "moving! Bye!@@" diff --git a/text/maps/cerulean_gym.asm b/text/maps/CeruleanGym.asm index 1d1d6d1c..1d1d6d1c 100644 --- a/text/maps/cerulean_gym.asm +++ b/text/maps/CeruleanGym.asm diff --git a/text/maps/cerulean_mart.asm b/text/maps/CeruleanMart.asm index 86a74588..86a74588 100644 --- a/text/maps/cerulean_mart.asm +++ b/text/maps/CeruleanMart.asm diff --git a/text/maps/cerulean_pokecenter.asm b/text/maps/CeruleanPokecenter.asm index 497fbce3..497fbce3 100644 --- a/text/maps/cerulean_pokecenter.asm +++ b/text/maps/CeruleanPokecenter.asm diff --git a/text/maps/cerulean_trade_house.asm b/text/maps/CeruleanTradeHouse.asm index b606613b..b606613b 100644 --- a/text/maps/cerulean_trade_house.asm +++ b/text/maps/CeruleanTradeHouse.asm diff --git a/text/maps/cerulean_trashed_house.asm b/text/maps/CeruleanTrashedHouse.asm index f79540ae..f79540ae 100644 --- a/text/maps/cerulean_trashed_house.asm +++ b/text/maps/CeruleanTrashedHouse.asm diff --git a/text/maps/champion.asm b/text/maps/ChampionsRoom.asm index 61050565..61050565 100644 --- a/text/maps/champion.asm +++ b/text/maps/ChampionsRoom.asm diff --git a/text/maps/cinnabar_gym.asm b/text/maps/CinnabarGym.asm index 173f94d2..1b531571 100644 --- a/text/maps/cinnabar_gym.asm +++ b/text/maps/CinnabarGym.asm @@ -48,7 +48,8 @@ _ReceivedTM38Text:: text "!@@" _TM38ExplanationText:: - db $0 + text "" + para "TM38 contains" line "FIRE BLAST!" diff --git a/text/maps/cinnabar_island.asm b/text/maps/CinnabarIsland.asm index 352ab8ea..352ab8ea 100644 --- a/text/maps/cinnabar_island.asm +++ b/text/maps/CinnabarIsland.asm diff --git a/text/maps/cinnabar_lab.asm b/text/maps/CinnabarLab.asm index a93a484d..a93a484d 100644 --- a/text/maps/cinnabar_lab.asm +++ b/text/maps/CinnabarLab.asm diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/CinnabarLabFossilRoom.asm index 3978814e..95bde685 100644 --- a/text/maps/cinnabar_lab_fossil_room.asm +++ b/text/maps/CinnabarLabFossilRoom.asm @@ -31,7 +31,7 @@ _Lab4Text_75dd5:: para "It was @" TX_RAM wcf4b - db $0 + text "" line "like I think!" prompt diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/CinnabarLabMetronomeRoom.asm index fa04677f..fa04677f 100644 --- a/text/maps/cinnabar_lab_metronome_room.asm +++ b/text/maps/CinnabarLabMetronomeRoom.asm diff --git a/text/maps/cinnabar_lab_trade_room.asm b/text/maps/CinnabarLabTradeRoom.asm index 196124e7..196124e7 100644 --- a/text/maps/cinnabar_lab_trade_room.asm +++ b/text/maps/CinnabarLabTradeRoom.asm diff --git a/text/maps/cinnabar_mart.asm b/text/maps/CinnabarMart.asm index 42a41d06..42a41d06 100644 --- a/text/maps/cinnabar_mart.asm +++ b/text/maps/CinnabarMart.asm diff --git a/text/maps/cinnabar_pokecenter.asm b/text/maps/CinnabarPokecenter.asm index cf481764..cf481764 100644 --- a/text/maps/cinnabar_pokecenter.asm +++ b/text/maps/CinnabarPokecenter.asm diff --git a/text/maps/copycats_house_1f.asm b/text/maps/CopycatsHouse1F.asm index 3ec2b151..3ec2b151 100644 --- a/text/maps/copycats_house_1f.asm +++ b/text/maps/CopycatsHouse1F.asm diff --git a/text/maps/copycats_house_2f.asm b/text/maps/CopycatsHouse2F.asm index 44988e58..561b2ac5 100644 --- a/text/maps/copycats_house_2f.asm +++ b/text/maps/CopycatsHouse2F.asm @@ -33,7 +33,8 @@ _ReceivedTM31Text:: text "!@@" _TM31ExplanationText1:: - db $0 + text "" + para "TM31 contains my" line "favorite, MIMIC!" diff --git a/text/maps/daycare_1.asm b/text/maps/Daycare.asm index f4cec10e..2759c798 100644 --- a/text/maps/daycare_1.asm +++ b/text/maps/Daycare.asm @@ -14,7 +14,7 @@ _DayCareWillLookAfterMonText:: text "Fine, I'll look" line "after @" TX_RAM wcd6d - db $0 + text "" cont "for a while." prompt @@ -26,7 +26,7 @@ _DayCareComeSeeMeInAWhileText:: _DayCareMonHasGrownText:: text "Your @" TX_RAM wcd6d - db $0 + text "" line "has grown a lot!" para "By level, it's" @@ -40,7 +40,7 @@ _DayCareMonHasGrownText:: _DayCareOweMoneyText:: text "You owe me ¥@" TX_BCD wDayCareTotalCost, $c2 - db $0 + text "" line "for the return" cont "of this #MON." done @@ -56,7 +56,7 @@ _DayCareMonNeedsMoreTimeText:: text "Back already?" line "Your @" TX_RAM wcd6d - db $0 + text "" cont "needs some more" cont "time with me." prompt diff --git a/text/maps/daycare_2.asm b/text/maps/Daycare_2.asm index 20c0e5ad..20c0e5ad 100644 --- a/text/maps/daycare_2.asm +++ b/text/maps/Daycare_2.asm diff --git a/text/maps/digletts_cave_route_11_entrance.asm b/text/maps/DiglettsCaveRoute11.asm index ecd3225e..ecd3225e 100644 --- a/text/maps/digletts_cave_route_11_entrance.asm +++ b/text/maps/DiglettsCaveRoute11.asm diff --git a/text/maps/digletts_cave_route_2_entrance.asm b/text/maps/DiglettsCaveRoute2.asm index a04bbef7..a04bbef7 100644 --- a/text/maps/digletts_cave_route_2_entrance.asm +++ b/text/maps/DiglettsCaveRoute2.asm diff --git a/text/maps/fighting_dojo.asm b/text/maps/FightingDojo.asm index 3df069c1..3df069c1 100644 --- a/text/maps/fighting_dojo.asm +++ b/text/maps/FightingDojo.asm diff --git a/text/maps/fuchsia_house.asm b/text/maps/FuchsiaBillsGrandpasHouse.asm index 7b6556b1..7b6556b1 100644 --- a/text/maps/fuchsia_house.asm +++ b/text/maps/FuchsiaBillsGrandpasHouse.asm diff --git a/text/maps/fuchsia_city.asm b/text/maps/FuchsiaCity.asm index a90d0021..a90d0021 100644 --- a/text/maps/fuchsia_city.asm +++ b/text/maps/FuchsiaCity.asm diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/FuchsiaGoodRodHouse.asm index b1b8b2f2..b1b8b2f2 100644 --- a/text/maps/fuchsia_fishing_house.asm +++ b/text/maps/FuchsiaGoodRodHouse.asm diff --git a/text/maps/fuchsia_gym_1.asm b/text/maps/FuchsiaGym.asm index 9108fc79..9108fc79 100644 --- a/text/maps/fuchsia_gym_1.asm +++ b/text/maps/FuchsiaGym.asm diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/FuchsiaGym_2.asm index 2913fb8f..f7b39d9c 100644 --- a/text/maps/fuchsia_gym_2.asm +++ b/text/maps/FuchsiaGym_2.asm @@ -31,7 +31,7 @@ _ReceivedTM06Text:: text "!@@" _TM06ExplanationText:: - db $0 + text "" para "TM06 contains" line "TOXIC!" diff --git a/text/maps/fuchsia_mart.asm b/text/maps/FuchsiaMart.asm index 574898ce..574898ce 100644 --- a/text/maps/fuchsia_mart.asm +++ b/text/maps/FuchsiaMart.asm diff --git a/text/maps/fuchsia_meeting_room.asm b/text/maps/FuchsiaMeetingRoom.asm index 10675ead..10675ead 100644 --- a/text/maps/fuchsia_meeting_room.asm +++ b/text/maps/FuchsiaMeetingRoom.asm diff --git a/text/maps/fuchsia_pokecenter.asm b/text/maps/FuchsiaPokecenter.asm index a0def7eb..a0def7eb 100644 --- a/text/maps/fuchsia_pokecenter.asm +++ b/text/maps/FuchsiaPokecenter.asm diff --git a/text/maps/celadon_game_corner.asm b/text/maps/GameCorner.asm index 1e59f83e..1e59f83e 100644 --- a/text/maps/celadon_game_corner.asm +++ b/text/maps/GameCorner.asm diff --git a/text/maps/celadon_prize_room.asm b/text/maps/GameCornerPrizeRoom.asm index 6b2bb537..6b2bb537 100644 --- a/text/maps/celadon_prize_room.asm +++ b/text/maps/GameCornerPrizeRoom.asm diff --git a/text/maps/hall_of_fame.asm b/text/maps/HallOfFame.asm index c799268b..c799268b 100644 --- a/text/maps/hall_of_fame.asm +++ b/text/maps/HallOfFame.asm diff --git a/text/maps/indigo_plateau_lobby.asm b/text/maps/IndigoPlateauLobby.asm index 8487e29a..8487e29a 100644 --- a/text/maps/indigo_plateau_lobby.asm +++ b/text/maps/IndigoPlateauLobby.asm diff --git a/text/maps/lance.asm b/text/maps/LancesRoom.asm index ed3dcada..ed3dcada 100644 --- a/text/maps/lance.asm +++ b/text/maps/LancesRoom.asm diff --git a/text/maps/lavender_house.asm b/text/maps/LavenderCuboneHouse.asm index 66cc85a5..66cc85a5 100644 --- a/text/maps/lavender_house.asm +++ b/text/maps/LavenderCuboneHouse.asm diff --git a/text/maps/lavender_mart.asm b/text/maps/LavenderMart.asm index 222712c6..222712c6 100644 --- a/text/maps/lavender_mart.asm +++ b/text/maps/LavenderMart.asm diff --git a/text/maps/lavender_pokecenter.asm b/text/maps/LavenderPokecenter.asm index 3aa7b67d..3aa7b67d 100644 --- a/text/maps/lavender_pokecenter.asm +++ b/text/maps/LavenderPokecenter.asm diff --git a/text/maps/lavender_town.asm b/text/maps/LavenderTown.asm index 19b6c8c8..19b6c8c8 100644 --- a/text/maps/lavender_town.asm +++ b/text/maps/LavenderTown.asm diff --git a/text/maps/lorelei.asm b/text/maps/LoreleisRoom.asm index fdbb55b4..fdbb55b4 100644 --- a/text/maps/lorelei.asm +++ b/text/maps/LoreleisRoom.asm diff --git a/text/maps/fujis_house.asm b/text/maps/MrFujisHouse.asm index 86cade68..f903eb6a 100644 --- a/text/maps/fujis_house.asm +++ b/text/maps/MrFujisHouse.asm @@ -52,7 +52,8 @@ _ReceivedFluteText:: text "!@@" _FluteExplanationText:: - db $0 + text "" + para "Upon hearing #" line "FLUTE, sleeping" cont "#MON will" diff --git a/text/maps/mr_psychics_house.asm b/text/maps/MrPsychicsHouse.asm index 7be2e11e..7be2e11e 100644 --- a/text/maps/mr_psychics_house.asm +++ b/text/maps/MrPsychicsHouse.asm diff --git a/text/maps/mt_moon_1f.asm b/text/maps/MtMoon1F.asm index 761a5240..761a5240 100644 --- a/text/maps/mt_moon_1f.asm +++ b/text/maps/MtMoon1F.asm diff --git a/text/maps/mt_moon_b1f.asm b/text/maps/MtMoonB1F.asm index cd995ed5..755fa583 100644 --- a/text/maps/mt_moon_b1f.asm +++ b/text/maps/MtMoonB1F.asm @@ -1,3 +1,3 @@ _MtMoonText1:: - db $0 + text "" done diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/MtMoonB2F.asm index 472649b9..472649b9 100644 --- a/text/maps/mt_moon_b2f.asm +++ b/text/maps/MtMoonB2F.asm diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/MtMoonPokecenter.asm index 90fd811e..7bc99dae 100644 --- a/text/maps/mt_moon_pokecenter.asm +++ b/text/maps/MtMoonPokecenter.asm @@ -44,5 +44,5 @@ _MagikarpSalesmanText2:: done _MtMoonPokecenterText5:: - db $0 + text "" done diff --git a/text/maps/museum_1f.asm b/text/maps/Museum1F.asm index 16431bda..16431bda 100644 --- a/text/maps/museum_1f.asm +++ b/text/maps/Museum1F.asm diff --git a/text/maps/museum_2f.asm b/text/maps/Museum2F.asm index 4f34a249..4f34a249 100644 --- a/text/maps/museum_2f.asm +++ b/text/maps/Museum2F.asm diff --git a/text/maps/name_rater.asm b/text/maps/NameRatersHouse.asm index 65d3e8a4..65d3e8a4 100644 --- a/text/maps/name_rater.asm +++ b/text/maps/NameRatersHouse.asm diff --git a/text/maps/oaks_lab.asm b/text/maps/OaksLab.asm index 7a6f57b7..7a6f57b7 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/OaksLab.asm diff --git a/text/maps/pallet_town.asm b/text/maps/PalletTown.asm index d5eda74f..d5eda74f 100644 --- a/text/maps/pallet_town.asm +++ b/text/maps/PalletTown.asm diff --git a/text/maps/pewter_city.asm b/text/maps/PewterCity.asm index 14240c9e..14240c9e 100644 --- a/text/maps/pewter_city.asm +++ b/text/maps/PewterCity.asm diff --git a/text/maps/pewter_gym_1.asm b/text/maps/PewterGym.asm index 6426dd72..6426dd72 100644 --- a/text/maps/pewter_gym_1.asm +++ b/text/maps/PewterGym.asm diff --git a/text/maps/pewter_gym_2.asm b/text/maps/PewterGym_2.asm index 86b97018..5312e4f2 100644 --- a/text/maps/pewter_gym_2.asm +++ b/text/maps/PewterGym_2.asm @@ -22,7 +22,8 @@ _ReceivedTM34Text:: line "TM34!@@" _TM34ExplanationText:: - db $0 + text "" + para "A TM contains a" line "technique that" cont "can be taught to" @@ -61,7 +62,8 @@ _PewterGymText_5c4bc:: line "the BOULDERBADGE!@@" _PewterGymText_5c4c1:: - db $0 + text "" + para "That's an official" line "#MON LEAGUE" cont "BADGE!" diff --git a/text/maps/pewter_mart.asm b/text/maps/PewterMart.asm index 0d5b07a2..0d5b07a2 100644 --- a/text/maps/pewter_mart.asm +++ b/text/maps/PewterMart.asm diff --git a/text/maps/pewter_house_1.asm b/text/maps/PewterNidoranHouse.asm index 450e8372..450e8372 100644 --- a/text/maps/pewter_house_1.asm +++ b/text/maps/PewterNidoranHouse.asm diff --git a/text/maps/pewter_pokecenter.asm b/text/maps/PewterPokecenter.asm index 6a1b373e..6a1b373e 100644 --- a/text/maps/pewter_pokecenter.asm +++ b/text/maps/PewterPokecenter.asm diff --git a/text/maps/pewter_house_2.asm b/text/maps/PewterSpeechHouse.asm index 615536f7..615536f7 100644 --- a/text/maps/pewter_house_2.asm +++ b/text/maps/PewterSpeechHouse.asm diff --git a/text/maps/fan_club.asm b/text/maps/PokemonFanClub.asm index 4827f2e8..4827f2e8 100644 --- a/text/maps/fan_club.asm +++ b/text/maps/PokemonFanClub.asm diff --git a/text/maps/mansion_1f.asm b/text/maps/PokemonMansion1F.asm index a3c517fb..a3c517fb 100644 --- a/text/maps/mansion_1f.asm +++ b/text/maps/PokemonMansion1F.asm diff --git a/text/maps/mansion_2f.asm b/text/maps/PokemonMansion2F.asm index 378efb30..378efb30 100644 --- a/text/maps/mansion_2f.asm +++ b/text/maps/PokemonMansion2F.asm diff --git a/text/maps/mansion_3f.asm b/text/maps/PokemonMansion3F.asm index 70331fdf..70331fdf 100644 --- a/text/maps/mansion_3f.asm +++ b/text/maps/PokemonMansion3F.asm diff --git a/text/maps/mansion_b1f.asm b/text/maps/PokemonMansionB1F.asm index 1bc1ef89..1bc1ef89 100644 --- a/text/maps/mansion_b1f.asm +++ b/text/maps/PokemonMansionB1F.asm diff --git a/text/maps/pokemon_tower_1f.asm b/text/maps/PokemonTower1F.asm index 50a2cd29..50a2cd29 100644 --- a/text/maps/pokemon_tower_1f.asm +++ b/text/maps/PokemonTower1F.asm diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/PokemonTower2F.asm index 79323001..79323001 100644 --- a/text/maps/pokemon_tower_2f.asm +++ b/text/maps/PokemonTower2F.asm diff --git a/text/maps/pokemon_tower_3f.asm b/text/maps/PokemonTower3F.asm index 67098e6b..67098e6b 100644 --- a/text/maps/pokemon_tower_3f.asm +++ b/text/maps/PokemonTower3F.asm diff --git a/text/maps/pokemon_tower_4f.asm b/text/maps/PokemonTower4F.asm index 771325a0..771325a0 100644 --- a/text/maps/pokemon_tower_4f.asm +++ b/text/maps/PokemonTower4F.asm diff --git a/text/maps/pokemon_tower_5f.asm b/text/maps/PokemonTower5F.asm index b329118d..b329118d 100644 --- a/text/maps/pokemon_tower_5f.asm +++ b/text/maps/PokemonTower5F.asm diff --git a/text/maps/pokemon_tower_6f.asm b/text/maps/PokemonTower6F.asm index 7532d56d..7532d56d 100644 --- a/text/maps/pokemon_tower_6f.asm +++ b/text/maps/PokemonTower6F.asm diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/PokemonTower7F.asm index 704a71eb..704a71eb 100644 --- a/text/maps/pokemon_tower_7f.asm +++ b/text/maps/PokemonTower7F.asm diff --git a/text/maps/power_plant.asm b/text/maps/PowerPlant.asm index e5df6674..e5df6674 100644 --- a/text/maps/power_plant.asm +++ b/text/maps/PowerPlant.asm diff --git a/text/maps/reds_house_1f.asm b/text/maps/RedsHouse1F.asm index 07768af9..07768af9 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/RedsHouse1F.asm diff --git a/text/maps/rock_tunnel_b1f.asm b/text/maps/RockTunnel1F.asm index 472c52f8..472c52f8 100644 --- a/text/maps/rock_tunnel_b1f.asm +++ b/text/maps/RockTunnel1F.asm diff --git a/text/maps/rock_tunnel_b2f_1.asm b/text/maps/RockTunnelB1F.asm index 1a565eb3..1a565eb3 100644 --- a/text/maps/rock_tunnel_b2f_1.asm +++ b/text/maps/RockTunnelB1F.asm diff --git a/text/maps/rock_tunnel_b2f_2.asm b/text/maps/RockTunnelB1F_2.asm index e8e45a7f..e8e45a7f 100644 --- a/text/maps/rock_tunnel_b2f_2.asm +++ b/text/maps/RockTunnelB1F_2.asm diff --git a/text/maps/rock_tunnel_pokecenter.asm b/text/maps/RockTunnelPokecenter.asm index 0fc249ff..0fc249ff 100644 --- a/text/maps/rock_tunnel_pokecenter.asm +++ b/text/maps/RockTunnelPokecenter.asm diff --git a/text/maps/rocket_hideout_b1f.asm b/text/maps/RocketHideoutB1F.asm index 36117804..36117804 100644 --- a/text/maps/rocket_hideout_b1f.asm +++ b/text/maps/RocketHideoutB1F.asm diff --git a/text/maps/rocket_hideout_b2f.asm b/text/maps/RocketHideoutB2F.asm index c13c3593..c13c3593 100644 --- a/text/maps/rocket_hideout_b2f.asm +++ b/text/maps/RocketHideoutB2F.asm diff --git a/text/maps/rocket_hideout_b3f.asm b/text/maps/RocketHideoutB3F.asm index a146a383..a146a383 100644 --- a/text/maps/rocket_hideout_b3f.asm +++ b/text/maps/RocketHideoutB3F.asm diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/RocketHideoutB4F.asm index f3ba43f3..f3ba43f3 100644 --- a/text/maps/rocket_hideout_b4f.asm +++ b/text/maps/RocketHideoutB4F.asm diff --git a/text/maps/rocket_hideout_elevator.asm b/text/maps/RocketHideoutElevator.asm index 6f2aa638..6f2aa638 100644 --- a/text/maps/rocket_hideout_elevator.asm +++ b/text/maps/RocketHideoutElevator.asm diff --git a/text/maps/route_1.asm b/text/maps/Route1.asm index 73188f09..73188f09 100644 --- a/text/maps/route_1.asm +++ b/text/maps/Route1.asm diff --git a/text/maps/route_10.asm b/text/maps/Route10.asm index 057ddcb5..057ddcb5 100644 --- a/text/maps/route_10.asm +++ b/text/maps/Route10.asm diff --git a/text/maps/route_11_1.asm b/text/maps/Route11.asm index 13e37bdf..13e37bdf 100644 --- a/text/maps/route_11_1.asm +++ b/text/maps/Route11.asm diff --git a/text/maps/route_11_gate.asm b/text/maps/Route11Gate1F.asm index ef371d06..ef371d06 100644 --- a/text/maps/route_11_gate.asm +++ b/text/maps/Route11Gate1F.asm diff --git a/text/maps/route_11_gate_upstairs.asm b/text/maps/Route11Gate2F.asm index 10236081..10236081 100644 --- a/text/maps/route_11_gate_upstairs.asm +++ b/text/maps/Route11Gate2F.asm diff --git a/text/maps/route_11_2.asm b/text/maps/Route11_2.asm index b9b68d6d..b9b68d6d 100644 --- a/text/maps/route_11_2.asm +++ b/text/maps/Route11_2.asm diff --git a/text/maps/route_12.asm b/text/maps/Route12.asm index 82696fda..82696fda 100644 --- a/text/maps/route_12.asm +++ b/text/maps/Route12.asm diff --git a/text/maps/route_12_gate.asm b/text/maps/Route12Gate1F.asm index 51d75539..51d75539 100644 --- a/text/maps/route_12_gate.asm +++ b/text/maps/Route12Gate1F.asm diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/Route12Gate2F.asm index 95a89527..95a89527 100644 --- a/text/maps/route_12_gate_upstairs.asm +++ b/text/maps/Route12Gate2F.asm diff --git a/text/maps/route_12_house.asm b/text/maps/Route12SuperRodHouse.asm index e04ce5fb..7dfaa74f 100644 --- a/text/maps/route_12_house.asm +++ b/text/maps/Route12SuperRodHouse.asm @@ -22,7 +22,8 @@ _Route12HouseText_564c5:: text "!@@" _Route12HouseText_564ca:: - db $0 + text "" + para "Fishing is a way" line "of life!" diff --git a/text/maps/route_13.asm b/text/maps/Route13.asm index e2718919..e2718919 100644 --- a/text/maps/route_13.asm +++ b/text/maps/Route13.asm diff --git a/text/maps/route_14.asm b/text/maps/Route14.asm index 18e85ed4..18e85ed4 100644 --- a/text/maps/route_14.asm +++ b/text/maps/Route14.asm diff --git a/text/maps/route_15.asm b/text/maps/Route15.asm index a23b8500..a23b8500 100644 --- a/text/maps/route_15.asm +++ b/text/maps/Route15.asm diff --git a/text/maps/route_15_gate.asm b/text/maps/Route15Gate1F.asm index 0a526142..0a526142 100644 --- a/text/maps/route_15_gate.asm +++ b/text/maps/Route15Gate1F.asm diff --git a/text/maps/route_15_gate_upstairs.asm b/text/maps/Route15Gate2F.asm index ade4a358..ade4a358 100644 --- a/text/maps/route_15_gate_upstairs.asm +++ b/text/maps/Route15Gate2F.asm diff --git a/text/maps/route_16.asm b/text/maps/Route16.asm index 45265829..45265829 100644 --- a/text/maps/route_16.asm +++ b/text/maps/Route16.asm diff --git a/text/maps/route_16_house.asm b/text/maps/Route16FlyHouse.asm index 77efde87..77efde87 100644 --- a/text/maps/route_16_house.asm +++ b/text/maps/Route16FlyHouse.asm diff --git a/text/maps/route_16_gate.asm b/text/maps/Route16Gate1F.asm index f548977f..f548977f 100644 --- a/text/maps/route_16_gate.asm +++ b/text/maps/Route16Gate1F.asm diff --git a/text/maps/route_16_gate_upstairs.asm b/text/maps/Route16Gate2F.asm index d76b70ca..d76b70ca 100644 --- a/text/maps/route_16_gate_upstairs.asm +++ b/text/maps/Route16Gate2F.asm diff --git a/text/maps/route_17.asm b/text/maps/Route17.asm index a0affd90..a0affd90 100644 --- a/text/maps/route_17.asm +++ b/text/maps/Route17.asm diff --git a/text/maps/route_18.asm b/text/maps/Route18.asm index d09caf82..d09caf82 100644 --- a/text/maps/route_18.asm +++ b/text/maps/Route18.asm diff --git a/text/maps/route_18_gate.asm b/text/maps/Route18Gate1F.asm index f2f51039..f2f51039 100644 --- a/text/maps/route_18_gate.asm +++ b/text/maps/Route18Gate1F.asm diff --git a/text/maps/route_18_gate_upstairs.asm b/text/maps/Route18Gate2F.asm index 0fd2de09..0fd2de09 100644 --- a/text/maps/route_18_gate_upstairs.asm +++ b/text/maps/Route18Gate2F.asm diff --git a/text/maps/route_19.asm b/text/maps/Route19.asm index 244e31d0..244e31d0 100644 --- a/text/maps/route_19.asm +++ b/text/maps/Route19.asm diff --git a/text/maps/route_2.asm b/text/maps/Route2.asm index dd7becc0..dd7becc0 100644 --- a/text/maps/route_2.asm +++ b/text/maps/Route2.asm diff --git a/text/maps/route_20.asm b/text/maps/Route20.asm index 1ccf0b6c..1ccf0b6c 100644 --- a/text/maps/route_20.asm +++ b/text/maps/Route20.asm diff --git a/text/maps/route_21.asm b/text/maps/Route21.asm index 3451953f..3451953f 100644 --- a/text/maps/route_21.asm +++ b/text/maps/Route21.asm diff --git a/text/maps/route_22.asm b/text/maps/Route22.asm index 3a1d28f0..3a1d28f0 100644 --- a/text/maps/route_22.asm +++ b/text/maps/Route22.asm diff --git a/text/maps/pokemon_league_gate.asm b/text/maps/Route22Gate.asm index ac92f4b0..ce3f6824 100644 --- a/text/maps/pokemon_league_gate.asm +++ b/text/maps/Route22Gate.asm @@ -7,7 +7,8 @@ _Route22GateText_1e704:: line "BOULDERBADGE yet!@@" _Route22GateText_1e715:: - db $0 + text "" + para "The rules are" line "rules. I can't" cont "let you pass." diff --git a/text/maps/route_23.asm b/text/maps/Route23.asm index 2ecb020e..a7e534de 100644 --- a/text/maps/route_23.asm +++ b/text/maps/Route23.asm @@ -27,7 +27,8 @@ _VictoryRoadGuardText2:: text "!@@" _VictoryRoadGuardText_513a3:: - db $0 + text "" + para "OK then! Please," line "go right ahead!" done diff --git a/text/maps/route_24_1.asm b/text/maps/Route24.asm index ae861eda..c14b689a 100644 --- a/text/maps/route_24_1.asm +++ b/text/maps/Route24.asm @@ -4,7 +4,8 @@ _Route24Text_51510:: cont "contest trainers!@@" _Route24Text_51515:: - db $0 + text "" + para "You just earned a" line "fabulous prize!" prompt diff --git a/text/maps/route_24_2.asm b/text/maps/Route24_2.asm index 325dea13..325dea13 100644 --- a/text/maps/route_24_2.asm +++ b/text/maps/Route24_2.asm diff --git a/text/maps/route_25.asm b/text/maps/Route25.asm index 325ab348..325ab348 100644 --- a/text/maps/route_25.asm +++ b/text/maps/Route25.asm diff --git a/text/maps/route_2_gate.asm b/text/maps/Route2Gate.asm index 566830f8..566830f8 100644 --- a/text/maps/route_2_gate.asm +++ b/text/maps/Route2Gate.asm diff --git a/text/maps/route_2_house.asm b/text/maps/Route2TradeHouse.asm index 46fc1062..46fc1062 100644 --- a/text/maps/route_2_house.asm +++ b/text/maps/Route2TradeHouse.asm diff --git a/text/maps/route_3.asm b/text/maps/Route3.asm index 966a0786..966a0786 100644 --- a/text/maps/route_3.asm +++ b/text/maps/Route3.asm diff --git a/text/maps/route_4.asm b/text/maps/Route4.asm index 0a36f4cd..0a36f4cd 100644 --- a/text/maps/route_4.asm +++ b/text/maps/Route4.asm diff --git a/text/maps/route_5.asm b/text/maps/Route5.asm index 54ff0f84..54ff0f84 100644 --- a/text/maps/route_5.asm +++ b/text/maps/Route5.asm diff --git a/text/maps/route_6.asm b/text/maps/Route6.asm index c48b5d3d..c48b5d3d 100644 --- a/text/maps/route_6.asm +++ b/text/maps/Route6.asm diff --git a/text/maps/route_7.asm b/text/maps/Route7.asm index 6500be96..6500be96 100644 --- a/text/maps/route_7.asm +++ b/text/maps/Route7.asm diff --git a/text/maps/route_8.asm b/text/maps/Route8.asm index 57a9a5f9..57a9a5f9 100644 --- a/text/maps/route_8.asm +++ b/text/maps/Route8.asm diff --git a/text/maps/route_9.asm b/text/maps/Route9.asm index 9975000d..9975000d 100644 --- a/text/maps/route_9.asm +++ b/text/maps/Route9.asm diff --git a/text/maps/ss_anne_1.asm b/text/maps/SSAnne1F.asm index 2bbdcbac..2bbdcbac 100644 --- a/text/maps/ss_anne_1.asm +++ b/text/maps/SSAnne1F.asm diff --git a/text/maps/ss_anne_8.asm b/text/maps/SSAnne1FRooms.asm index 7a09303e..7a09303e 100644 --- a/text/maps/ss_anne_8.asm +++ b/text/maps/SSAnne1FRooms.asm diff --git a/text/maps/ss_anne_2.asm b/text/maps/SSAnne2F.asm index 58d804ba..58d804ba 100644 --- a/text/maps/ss_anne_2.asm +++ b/text/maps/SSAnne2F.asm diff --git a/text/maps/ss_anne_9.asm b/text/maps/SSAnne2FRooms.asm index a9be8cee..a9be8cee 100644 --- a/text/maps/ss_anne_9.asm +++ b/text/maps/SSAnne2FRooms.asm diff --git a/text/maps/ss_anne_3.asm b/text/maps/SSAnne3F.asm index 76490594..76490594 100644 --- a/text/maps/ss_anne_3.asm +++ b/text/maps/SSAnne3F.asm diff --git a/text/maps/ss_anne_10.asm b/text/maps/SSAnneB1FRooms.asm index 7df629b5..7df629b5 100644 --- a/text/maps/ss_anne_10.asm +++ b/text/maps/SSAnneB1FRooms.asm diff --git a/text/maps/ss_anne_5.asm b/text/maps/SSAnneBow.asm index 76cd5631..76cd5631 100644 --- a/text/maps/ss_anne_5.asm +++ b/text/maps/SSAnneBow.asm diff --git a/text/maps/ss_anne_7.asm b/text/maps/SSAnneCaptainsRoom.asm index 7bf004da..7bf004da 100644 --- a/text/maps/ss_anne_7.asm +++ b/text/maps/SSAnneCaptainsRoom.asm diff --git a/text/maps/ss_anne_6.asm b/text/maps/SSAnneKitchen.asm index 7fcc9973..7fcc9973 100644 --- a/text/maps/ss_anne_6.asm +++ b/text/maps/SSAnneKitchen.asm diff --git a/text/maps/safari_zone_center.asm b/text/maps/SafariZoneCenter.asm index 09918f93..09918f93 100644 --- a/text/maps/safari_zone_center.asm +++ b/text/maps/SafariZoneCenter.asm diff --git a/text/maps/safari_zone_rest_house_1.asm b/text/maps/SafariZoneCenterRestHouse.asm index b6c87818..b6c87818 100644 --- a/text/maps/safari_zone_rest_house_1.asm +++ b/text/maps/SafariZoneCenterRestHouse.asm diff --git a/text/maps/safari_zone_east.asm b/text/maps/SafariZoneEast.asm index eebe5de7..eebe5de7 100644 --- a/text/maps/safari_zone_east.asm +++ b/text/maps/SafariZoneEast.asm diff --git a/text/maps/safari_zone_rest_house_3.asm b/text/maps/SafariZoneEastRestHouse.asm index d5f7abc8..d5f7abc8 100644 --- a/text/maps/safari_zone_rest_house_3.asm +++ b/text/maps/SafariZoneEastRestHouse.asm diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/SafariZoneGate.asm index dcc1fd9b..5c143891 100644 --- a/text/maps/safari_zone_entrance.asm +++ b/text/maps/SafariZoneGate.asm @@ -24,7 +24,8 @@ SafariZoneEntranceText_9e747:: line "30 SAFARI BALLs!@@" _SafariZoneEntranceText_75360:: - db $0 + text "" + para "We'll call you on" line "the PA when you" cont "run out of time" diff --git a/text/maps/safari_zone_north.asm b/text/maps/SafariZoneNorth.asm index 1e148f0b..1e148f0b 100644 --- a/text/maps/safari_zone_north.asm +++ b/text/maps/SafariZoneNorth.asm diff --git a/text/maps/safari_zone_rest_house_4.asm b/text/maps/SafariZoneNorthRestHouse.asm index 93f02c8f..93f02c8f 100644 --- a/text/maps/safari_zone_rest_house_4.asm +++ b/text/maps/SafariZoneNorthRestHouse.asm diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/SafariZoneSecretHouse.asm index 3df79d90..3df79d90 100644 --- a/text/maps/safari_zone_secret_house.asm +++ b/text/maps/SafariZoneSecretHouse.asm diff --git a/text/maps/safari_zone_west.asm b/text/maps/SafariZoneWest.asm index dcb2fe6c..dcb2fe6c 100644 --- a/text/maps/safari_zone_west.asm +++ b/text/maps/SafariZoneWest.asm diff --git a/text/maps/safari_zone_rest_house_2.asm b/text/maps/SafariZoneWestRestHouse.asm index 94802b13..94802b13 100644 --- a/text/maps/safari_zone_rest_house_2.asm +++ b/text/maps/SafariZoneWestRestHouse.asm diff --git a/text/maps/saffron_city.asm b/text/maps/SaffronCity.asm index a0422c8c..a0422c8c 100644 --- a/text/maps/saffron_city.asm +++ b/text/maps/SaffronCity.asm diff --git a/text/maps/saffron_gates.asm b/text/maps/SaffronGates.asm index c16e880e..9bb4601f 100644 --- a/text/maps/saffron_gates.asm +++ b/text/maps/SaffronGates.asm @@ -16,7 +16,8 @@ _SaffronGateText_8aaa9:: cont "Gee, thanks!@@" _SaffronGateText_1dff1:: - db $0 + text "" + para "..." line "Glug glug..." cont "..." diff --git a/text/maps/saffron_gym.asm b/text/maps/SaffronGym.asm index 419b56ac..6f49a331 100644 --- a/text/maps/saffron_gym.asm +++ b/text/maps/SaffronGym.asm @@ -59,7 +59,8 @@ ReceivedTM46Text:: line "TM46!@@" _TM46ExplanationText:: - db $0 + text "" + para "TM46 is PSYWAVE!" line "It uses powerful" cont "psychic waves to" diff --git a/text/maps/saffron_mart.asm b/text/maps/SaffronMart.asm index a43b0d94..a43b0d94 100644 --- a/text/maps/saffron_mart.asm +++ b/text/maps/SaffronMart.asm diff --git a/text/maps/saffron_house.asm b/text/maps/SaffronPidgeyHouse.asm index 214bf089..214bf089 100644 --- a/text/maps/saffron_house.asm +++ b/text/maps/SaffronPidgeyHouse.asm diff --git a/text/maps/saffron_pokecenter.asm b/text/maps/SaffronPokecenter.asm index 6548aff8..6548aff8 100644 --- a/text/maps/saffron_pokecenter.asm +++ b/text/maps/SaffronPokecenter.asm diff --git a/text/maps/seafoam_islands_b4f.asm b/text/maps/SeafoamIslandsB4F.asm index 608d165f..608d165f 100644 --- a/text/maps/seafoam_islands_b4f.asm +++ b/text/maps/SeafoamIslandsB4F.asm diff --git a/text/maps/silph_co_10f.asm b/text/maps/SilphCo10F.asm index e916c64a..e916c64a 100644 --- a/text/maps/silph_co_10f.asm +++ b/text/maps/SilphCo10F.asm diff --git a/text/maps/silph_co_11f.asm b/text/maps/SilphCo11F.asm index fbaa6086..fbaa6086 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/SilphCo11F.asm diff --git a/text/maps/silph_co_1f.asm b/text/maps/SilphCo1F.asm index 1ef80189..1ef80189 100644 --- a/text/maps/silph_co_1f.asm +++ b/text/maps/SilphCo1F.asm diff --git a/text/maps/silph_co_2f.asm b/text/maps/SilphCo2F.asm index bd87630a..bd87630a 100644 --- a/text/maps/silph_co_2f.asm +++ b/text/maps/SilphCo2F.asm diff --git a/text/maps/silph_co_3f.asm b/text/maps/SilphCo3F.asm index b6a023f9..b6a023f9 100644 --- a/text/maps/silph_co_3f.asm +++ b/text/maps/SilphCo3F.asm diff --git a/text/maps/silph_co_4f.asm b/text/maps/SilphCo4F.asm index 5b484ec7..5b484ec7 100644 --- a/text/maps/silph_co_4f.asm +++ b/text/maps/SilphCo4F.asm diff --git a/text/maps/silph_co_5f_1.asm b/text/maps/SilphCo5F.asm index dab42539..dab42539 100644 --- a/text/maps/silph_co_5f_1.asm +++ b/text/maps/SilphCo5F.asm diff --git a/text/maps/silph_co_5f_2.asm b/text/maps/SilphCo5F_2.asm index 3c1b8ead..3c1b8ead 100644 --- a/text/maps/silph_co_5f_2.asm +++ b/text/maps/SilphCo5F_2.asm diff --git a/text/maps/silph_co_6f.asm b/text/maps/SilphCo6F.asm index 90456b5c..90456b5c 100644 --- a/text/maps/silph_co_6f.asm +++ b/text/maps/SilphCo6F.asm diff --git a/text/maps/silph_co_7f.asm b/text/maps/SilphCo7F.asm index 1cc2bc30..1cc2bc30 100644 --- a/text/maps/silph_co_7f.asm +++ b/text/maps/SilphCo7F.asm diff --git a/text/maps/silph_co_8f.asm b/text/maps/SilphCo8F.asm index fabae5e6..fabae5e6 100644 --- a/text/maps/silph_co_8f.asm +++ b/text/maps/SilphCo8F.asm diff --git a/text/maps/silph_co_9f.asm b/text/maps/SilphCo9F.asm index fd1aa91c..fd1aa91c 100644 --- a/text/maps/silph_co_9f.asm +++ b/text/maps/SilphCo9F.asm diff --git a/text/maps/underground_path_route_6_entrance.asm b/text/maps/UndergroundPathRoute6.asm index dacc44f7..dacc44f7 100644 --- a/text/maps/underground_path_route_6_entrance.asm +++ b/text/maps/UndergroundPathRoute6.asm diff --git a/text/maps/underground_path_route_7_entrance.asm b/text/maps/UndergroundPathRoute7.asm index 5cde3614..5cde3614 100644 --- a/text/maps/underground_path_route_7_entrance.asm +++ b/text/maps/UndergroundPathRoute7.asm diff --git a/text/maps/underground_path_route_7_entrance_unused.asm b/text/maps/UndergroundPathRoute7Copy.asm index 4e0dc3ca..4e0dc3ca 100644 --- a/text/maps/underground_path_route_7_entrance_unused.asm +++ b/text/maps/UndergroundPathRoute7Copy.asm diff --git a/text/maps/underground_path_route_8_entrance.asm b/text/maps/UndergroundPathRoute8.asm index da785c8e..da785c8e 100644 --- a/text/maps/underground_path_route_8_entrance.asm +++ b/text/maps/UndergroundPathRoute8.asm diff --git a/text/maps/vermilion_city.asm b/text/maps/VermilionCity.asm index b060a123..b060a123 100644 --- a/text/maps/vermilion_city.asm +++ b/text/maps/VermilionCity.asm diff --git a/text/maps/vermilion_dock.asm b/text/maps/VermilionDock.asm index 5d998e82..5d998e82 100644 --- a/text/maps/vermilion_dock.asm +++ b/text/maps/VermilionDock.asm diff --git a/text/maps/vermilion_gym_1.asm b/text/maps/VermilionGym.asm index f718d899..f718d899 100644 --- a/text/maps/vermilion_gym_1.asm +++ b/text/maps/VermilionGym.asm diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/VermilionGym_2.asm index d0a01932..7f645d59 100644 --- a/text/maps/vermilion_gym_2.asm +++ b/text/maps/VermilionGym_2.asm @@ -30,7 +30,8 @@ _ReceivedTM24Text:: text "!@@" _TM24ExplanationText:: - db $0 + text "" + para "TM24 contains" line "THUNDERBOLT!" diff --git a/text/maps/vermilion_mart.asm b/text/maps/VermilionMart.asm index 10743989..10743989 100644 --- a/text/maps/vermilion_mart.asm +++ b/text/maps/VermilionMart.asm diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/VermilionOldRodHouse.asm index 6857bb5b..32526e36 100644 --- a/text/maps/vermilion_fishing_house.asm +++ b/text/maps/VermilionOldRodHouse.asm @@ -22,7 +22,8 @@ _VermilionHouse2Text_560b6:: text "!@@" _VermilionHouse2Text_560bb:: - db $0 + text "" + para "Fishing is a way" line "of life!" diff --git a/text/maps/vermilion_house.asm b/text/maps/VermilionPidgeyHouse.asm index 91c18708..91c18708 100644 --- a/text/maps/vermilion_house.asm +++ b/text/maps/VermilionPidgeyHouse.asm diff --git a/text/maps/vermilion_pokecenter.asm b/text/maps/VermilionPokecenter.asm index c9e9a581..c9e9a581 100644 --- a/text/maps/vermilion_pokecenter.asm +++ b/text/maps/VermilionPokecenter.asm diff --git a/text/maps/victory_road_1f.asm b/text/maps/VictoryRoad1F.asm index 1523db88..1523db88 100644 --- a/text/maps/victory_road_1f.asm +++ b/text/maps/VictoryRoad1F.asm diff --git a/text/maps/victory_road_2f.asm b/text/maps/VictoryRoad2F.asm index ec9dcf4f..ec9dcf4f 100644 --- a/text/maps/victory_road_2f.asm +++ b/text/maps/VictoryRoad2F.asm diff --git a/text/maps/victory_road_3f.asm b/text/maps/VictoryRoad3F.asm index 07e0be70..07e0be70 100644 --- a/text/maps/victory_road_3f.asm +++ b/text/maps/VictoryRoad3F.asm diff --git a/text/maps/viridian_city.asm b/text/maps/ViridianCity.asm index 67ab5c40..67ab5c40 100644 --- a/text/maps/viridian_city.asm +++ b/text/maps/ViridianCity.asm diff --git a/text/maps/viridian_forest.asm b/text/maps/ViridianForest.asm index 813b193a..813b193a 100644 --- a/text/maps/viridian_forest.asm +++ b/text/maps/ViridianForest.asm diff --git a/text/maps/viridian_forest_exit.asm b/text/maps/ViridianForestNorthGate.asm index ab6a5a1d..ab6a5a1d 100644 --- a/text/maps/viridian_forest_exit.asm +++ b/text/maps/ViridianForestNorthGate.asm diff --git a/text/maps/viridian_forest_entrance.asm b/text/maps/ViridianForestSouthGate.asm index c1a8df22..c1a8df22 100644 --- a/text/maps/viridian_forest_entrance.asm +++ b/text/maps/ViridianForestSouthGate.asm diff --git a/text/maps/viridian_gym.asm b/text/maps/ViridianGym.asm index f87d8d58..4c7b5207 100644 --- a/text/maps/viridian_gym.asm +++ b/text/maps/ViridianGym.asm @@ -64,7 +64,8 @@ _ReceivedTM27Text:: line "TM27!@@" _TM27ExplanationText:: - db $0 + text "" + para "TM27 is FISSURE!" line "It will take out" cont "#MON with just" diff --git a/text/maps/viridian_mart.asm b/text/maps/ViridianMart.asm index 61750afe..61750afe 100644 --- a/text/maps/viridian_mart.asm +++ b/text/maps/ViridianMart.asm diff --git a/text/maps/viridian_house.asm b/text/maps/ViridianNicknameHouse.asm index 757f597a..757f597a 100644 --- a/text/maps/viridian_house.asm +++ b/text/maps/ViridianNicknameHouse.asm diff --git a/text/maps/viridian_pokecenter.asm b/text/maps/ViridianPokecenter.asm index 4ac18bf6..4ac18bf6 100644 --- a/text/maps/viridian_pokecenter.asm +++ b/text/maps/ViridianPokecenter.asm diff --git a/text/maps/school.asm b/text/maps/ViridianSchoolHouse.asm index f6041e0d..f6041e0d 100644 --- a/text/maps/school.asm +++ b/text/maps/ViridianSchoolHouse.asm diff --git a/text/maps/wardens_house.asm b/text/maps/WardensHouse.asm index 9d40cace..7efddb90 100644 --- a/text/maps/wardens_house.asm +++ b/text/maps/WardensHouse.asm @@ -23,7 +23,8 @@ _WardenTeethText1:: cont "WARDEN!@@" _WardenTeethText2:: - db $0 + text "" + para "The WARDEN popped" line "in his teeth!" prompt |