ref: 3425fd6ef8f620d3366dcf9462b89c4b7f7e1b37
parent: 674b4dcc4aabde8b5556c0ed32383c32b11a4f0e
author: IIMarckus <iimarckus@gmail.com>
date: Wed Jun 8 01:45:50 EDT 2016
Sync somewhat with pokeyellow.
--- a/scripts/bikeshop.asm
+++ b/scripts/bikeshop.asm
@@ -1,12 +1,12 @@
-BikeShopScript: ; 1d73c (7:573c)
+BikeShopScript:
jp EnableAutoTextBoxDrawing
-BikeShopTextPointers: ; 1d73f (7:573f)
+BikeShopTextPointers:
dw BikeShopText1
dw BikeShopText2
dw BikeShopText3
-BikeShopText1: ; 1d745 (7:5745)
+BikeShopText1:
TX_ASM
CheckEvent EVENT_GOT_BICYCLE
jr z, .asm_260d4
@@ -78,56 +78,56 @@
.Done
jp TextScriptEnd
-BikeShopMenuText: ; 1d7f8 (7:57f8)
+BikeShopMenuText:
db "BICYCLE"
next "CANCEL@"
-BikeShopMenuPrice: ; 1d807 (7:5807)
+BikeShopMenuPrice:
db "¥1000000@"
-BikeShopText_1d810: ; 1d810 (7:5810)
+BikeShopText_1d810:
TX_FAR _BikeShopText_1d810
db "@"
-BikeShopText_1d815: ; 1d815 (7:5815)
+BikeShopText_1d815:
TX_FAR _BikeShopText_1d815
db "@"
-BikeShopCantAffordText: ; 1d81a (7:581a)
+BikeShopCantAffordText:
TX_FAR _BikeShopCantAffordText
db "@"
-BikeShopText_1d81f: ; 1d81f (7:581f)
+BikeShopText_1d81f:
TX_FAR _BikeShopText_1d81f
db "@"
-BikeShopText_1d824: ; 1d824 (7:5824)
+BikeShopText_1d824:
TX_FAR _BikeShopText_1d824
db $11, "@"
-BikeShopComeAgainText: ; 1d82a (7:582a)
+BikeShopComeAgainText:
TX_FAR _BikeShopComeAgainText
db "@"
-BikeShopText_1d82f: ; 1d82f (7:582f)
+BikeShopText_1d82f:
TX_FAR _BikeShopText_1d82f
db "@"
-BikeShopText_1d834: ; 1d834 (7:5834)
+BikeShopText_1d834:
TX_FAR _BikeShopText_1d834
db "@"
-BikeShopText2: ; 1d839 (7:5839)
+BikeShopText2:
TX_ASM
ld hl, BikeShopText_1d843
call PrintText
jp TextScriptEnd
-BikeShopText_1d843: ; 1d843 (7:5843)
+BikeShopText_1d843:
TX_FAR _BikeShopText_1d843
db "@"
-BikeShopText3: ; 1d848 (7:5848)
+BikeShopText3:
TX_ASM
CheckEvent EVENT_GOT_BICYCLE
ld hl, BikeShopText_1d861
@@ -137,10 +137,10 @@
call PrintText
jp TextScriptEnd
-BikeShopText_1d85c: ; 1d85c (7:585c)
+BikeShopText_1d85c:
TX_FAR _BikeShopText_1d85c
db "@"
-BikeShopText_1d861: ; 1d861 (7:5861)
+BikeShopText_1d861:
TX_FAR _BikeShopText_1d861
db "@"
--- a/text.asm
+++ b/text.asm
@@ -174,7 +174,6 @@
INCLUDE "text/maps/ss_anne_1.asm"
INCLUDE "text/maps/ss_anne_2.asm"
INCLUDE "text/maps/ss_anne_3.asm"
-INCLUDE "text/maps/ss_anne_4.asm"
INCLUDE "text/maps/ss_anne_5.asm"
INCLUDE "text/maps/ss_anne_6.asm"
INCLUDE "text/maps/ss_anne_7.asm"
@@ -214,8 +213,6 @@
INCLUDE "text/maps/safari_zone_rest_house_2.asm"
INCLUDE "text/maps/safari_zone_rest_house_3.asm"
INCLUDE "text/maps/safari_zone_rest_house_4.asm"
-INCLUDE "text/maps/unknown_dungeon_1f.asm"
-INCLUDE "text/maps/unknown_dungeon_2f.asm"
INCLUDE "text/maps/unknown_dungeon_b1f.asm"
INCLUDE "text/maps/victory_road_1f.asm"
INCLUDE "text/maps/lance.asm"
@@ -230,10 +227,6 @@
SECTION "Text 3", ROMX, BANK[TEXT_3]
INCLUDE "text/maps/rock_tunnel_b2f_2.asm"
-INCLUDE "text/maps/seafoam_islands_1f.asm"
-INCLUDE "text/maps/seafoam_islands_b1f.asm"
-INCLUDE "text/maps/seafoam_islands_b2f.asm"
-INCLUDE "text/maps/seafoam_islands_b3f.asm"
INCLUDE "text/maps/seafoam_islands_b4f.asm"
_AIBattleWithdrawText::
@@ -1948,7 +1941,6 @@
SECTION "Text 4", ROMX, BANK[TEXT_4]
INCLUDE "text/maps/daycare_2.asm"
-INCLUDE "text/maps/underground_path_route_5_entrance.asm"
INCLUDE "text/maps/underground_path_route_6_entrance.asm"
INCLUDE "text/maps/underground_path_route_7_entrance.asm"
INCLUDE "text/maps/underground_path_route_7_entrance_unused.asm"
--- a/text/maps/agatha.asm
+++ b/text/maps/agatha.asm
@@ -42,4 +42,3 @@
text "Someone's voice:"
line "Don't run away!"
done
-
--- a/text/maps/bike_shop.asm
+++ b/text/maps/bike_shop.asm
@@ -68,4 +68,3 @@
text "Wow. Your BIKE is"
line "really cool!"
done
-
--- a/text/maps/bills_house.asm
+++ b/text/maps/bills_house.asm
@@ -85,4 +85,3 @@
cont "some of my rare"
cont "#MON on my PC!"
done
-
--- a/text/maps/blues_house.asm
+++ b/text/maps/blues_house.asm
@@ -39,4 +39,3 @@
text "It's a big map!"
line "This is useful!"
done
-
--- a/text/maps/bruno.asm
+++ b/text/maps/bruno.asm
@@ -35,4 +35,3 @@
text "Someone's voice:"
line "Don't run away!"
done
-
--- a/text/maps/celadon_city.asm
+++ b/text/maps/celadon_city.asm
@@ -150,4 +150,3 @@
line "The playground"
cont "for grown-ups!"
done
-
--- a/text/maps/celadon_diner.asm
+++ b/text/maps/celadon_diner.asm
@@ -57,4 +57,3 @@
line "I was going to"
cont "win it back..."
done
-
--- a/text/maps/celadon_game_corner.asm
+++ b/text/maps/celadon_game_corner.asm
@@ -184,4 +184,3 @@
text "Oops! Forgot the"
line "COIN CASE!"
done
-
--- a/text/maps/celadon_gym.asm
+++ b/text/maps/celadon_gym.asm
@@ -216,4 +216,3 @@
para "Wait 'til next"
line "time!"
done
-
--- a/text/maps/celadon_hotel.asm
+++ b/text/maps/celadon_hotel.asm
@@ -19,4 +19,3 @@
text "Why did she bring"
line "her brother?"
done
-
--- a/text/maps/celadon_house.asm
+++ b/text/maps/celadon_house.asm
@@ -20,4 +20,3 @@
para "There's no secret"
line "switch behind it!"
done
-
--- a/text/maps/celadon_mansion_1f.asm
+++ b/text/maps/celadon_mansion_1f.asm
@@ -21,4 +21,3 @@
text "CELADON MANSION"
line "Manager's Suite"
done
-
--- a/text/maps/celadon_mansion_2f.asm
+++ b/text/maps/celadon_mansion_2f.asm
@@ -2,4 +2,3 @@
text "GAME FREAK"
line "Meeting Room"
done
-
--- a/text/maps/celadon_mansion_3f.asm
+++ b/text/maps/celadon_mansion_3f.asm
@@ -64,4 +64,3 @@
text "GAME FREAK"
line "Development Room"
done
-
--- a/text/maps/celadon_mansion_4f_inside.asm
+++ b/text/maps/celadon_mansion_4f_inside.asm
@@ -8,4 +8,3 @@
line "your friends and"
cont "trade #MON!"
done
-
--- a/text/maps/celadon_mansion_4f_outside.asm
+++ b/text/maps/celadon_mansion_4f_outside.asm
@@ -1,4 +1,3 @@
_CeladonMansion4Text1::
text "I KNOW EVERYTHING!"
done
-
--- a/text/maps/celadon_prize_room.asm
+++ b/text/maps/celadon_prize_room.asm
@@ -10,4 +10,3 @@
text "I had a major"
line "haul today!"
done
-
--- a/text/maps/cerulean_badge_house.asm
+++ b/text/maps/cerulean_badge_house.asm
@@ -95,4 +95,3 @@
text "All #MON will"
line "obey you!"
prompt
-
--- a/text/maps/cerulean_city.asm
+++ b/text/maps/cerulean_city.asm
@@ -230,4 +230,3 @@
para "The Tomboyish"
line "Mermaid!"
done
-
--- a/text/maps/cerulean_gym.asm
+++ b/text/maps/cerulean_gym.asm
@@ -129,4 +129,3 @@
line "we make a pretty"
cont "darn good team!"
done
-
--- a/text/maps/cerulean_trashed_house.asm
+++ b/text/maps/cerulean_trashed_house.asm
@@ -34,4 +34,3 @@
text "TEAM ROCKET left"
line "a way out!"
done
-
--- a/text/maps/champion.asm
+++ b/text/maps/champion.asm
@@ -144,4 +144,3 @@
para $52, "!"
line "Come with me!"
done
-
--- a/text/maps/cinnabar_gym.asm
+++ b/text/maps/cinnabar_gym.asm
@@ -207,4 +207,3 @@
text $52, "! You beat"
line "that fire brand!"
done
-
--- a/text/maps/cinnabar_island.asm
+++ b/text/maps/cinnabar_island.asm
@@ -35,4 +35,3 @@
para "The Hot-Headed"
line "Quiz Master!"
done
-
--- a/text/maps/cinnabar_lab.asm
+++ b/text/maps/cinnabar_lab.asm
@@ -27,4 +27,3 @@
text "#MON LAB"
line "Testing Room"
done
-
--- a/text/maps/cinnabar_lab_fossil_room.asm
+++ b/text/maps/cinnabar_lab_fossil_room.asm
@@ -76,4 +76,3 @@
text "Aiyah! You come"
line "again!"
done
-
--- a/text/maps/cinnabar_lab_metronome_room.asm
+++ b/text/maps/cinnabar_lab_metronome_room.asm
@@ -61,4 +61,3 @@
_Lab3Text5::
text "An amber pipe!"
done
-
--- a/text/maps/cinnabar_lab_trade_room.asm
+++ b/text/maps/cinnabar_lab_trade_room.asm
@@ -7,4 +7,3 @@
line "rare, prehistoric"
cont "#MON!"
done
-
--- a/text/maps/copycats_house_2f.asm
+++ b/text/maps/copycats_house_2f.asm
@@ -94,4 +94,3 @@
_CopycatsHouse2FText_5cd1c::
text "Huh? Can't see!"
done
-
--- a/text/maps/daycare_1.asm
+++ b/text/maps/daycare_1.asm
@@ -60,4 +60,3 @@
cont "needs some more"
cont "time with me."
prompt
-
--- a/text/maps/daycare_2.asm
+++ b/text/maps/daycare_2.asm
@@ -31,4 +31,3 @@
text "Hey, you don't"
line "have enough ¥!"
done
-
--- a/text/maps/digletts_cave_route_11_entrance.asm
+++ b/text/maps/digletts_cave_route_11_entrance.asm
@@ -6,4 +6,3 @@
para "It goes right to"
line "VIRIDIAN CITY!"
done
-
--- a/text/maps/digletts_cave_route_2_entrance.asm
+++ b/text/maps/digletts_cave_route_2_entrance.asm
@@ -7,4 +7,3 @@
line "FLASH could light"
cont "it up..."
done
-
--- a/text/maps/fan_club.asm
+++ b/text/maps/fan_club.asm
@@ -141,4 +141,3 @@
text "If someone brags,"
line "brag right back!"
done
-
--- a/text/maps/fighting_dojo.asm
+++ b/text/maps/fighting_dojo.asm
@@ -128,4 +128,3 @@
text "Better not get"
line "greedy..."
done
-
--- a/text/maps/fuchsia_city.asm
+++ b/text/maps/fuchsia_city.asm
@@ -117,4 +117,3 @@
_FuchsiaCityText_19b2a::
text "..."
done
-
--- a/text/maps/fuchsia_fishing_house.asm
+++ b/text/maps/fuchsia_fishing_house.asm
@@ -41,4 +41,3 @@
para "You have no room"
line "for my gift!"
done
-
--- a/text/maps/fuchsia_gym_1.asm
+++ b/text/maps/fuchsia_gym_1.asm
@@ -24,4 +24,3 @@
para "Here! Take the"
line "SOULBADGE!"
prompt
-
--- a/text/maps/fuchsia_gym_2.asm
+++ b/text/maps/fuchsia_gym_2.asm
@@ -191,4 +191,3 @@
line "ninja can terrify"
cont "even now!"
done
-
--- a/text/maps/fuchsia_house.asm
+++ b/text/maps/fuchsia_house.asm
@@ -25,4 +25,3 @@
para "Did he show you?"
done
-
--- a/text/maps/fuchsia_meeting_room.asm
+++ b/text/maps/fuchsia_meeting_room.asm
@@ -24,4 +24,3 @@
para "I think he's got"
line "a speech problem!"
done
-
--- a/text/maps/fujis_house.asm
+++ b/text/maps/fujis_house.asm
@@ -83,4 +83,3 @@
para "Gone! It's been"
line "clipped out!"
done
-
--- a/text/maps/hall_of_fame.asm
+++ b/text/maps/hall_of_fame.asm
@@ -26,4 +26,3 @@
cont "your #MON are"
cont "HALL OF FAMERs!"
done
-
--- a/text/maps/lance.asm
+++ b/text/maps/lance.asm
@@ -61,4 +61,3 @@
para "He is the real"
line "#MON LEAGUE"
cont "champion!@@"
-
--- a/text/maps/lavender_house.asm
+++ b/text/maps/lavender_house.asm
@@ -22,4 +22,3 @@
line "soothed its"
cont "restless soul!"
done
-
--- a/text/maps/lavender_town.asm
+++ b/text/maps/lavender_town.asm
@@ -62,4 +62,3 @@
line "#MON Rest Easy"
cont "#MON TOWER"
done
-
--- a/text/maps/lorelei.asm
+++ b/text/maps/lorelei.asm
@@ -40,4 +40,3 @@
text "Someone's voice:"
line "Don't run away!"
done
-
--- a/text/maps/mansion_1f.asm
+++ b/text/maps/mansion_1f.asm
@@ -27,4 +27,3 @@
_MansionSwitchNotPressedText::
text "Not quite yet!"
done
-
--- a/text/maps/mansion_2f.asm
+++ b/text/maps/mansion_2f.asm
@@ -45,4 +45,3 @@
_Mansion2Text_520cc::
text "Not quite yet!"
done
-
--- a/text/maps/mansion_3f.asm
+++ b/text/maps/mansion_3f.asm
@@ -35,4 +35,3 @@
para "We named the"
line "newborn MEWTWO."
done
-
--- a/text/maps/mansion_b1f.asm
+++ b/text/maps/mansion_b1f.asm
@@ -37,4 +37,3 @@
line "curb its vicious"
cont "tendencies..."
done
-
--- a/text/maps/mr_psychics_house.asm
+++ b/text/maps/mr_psychics_house.asm
@@ -23,4 +23,3 @@
text "Where do you plan"
line "to put this?"
done
-
--- a/text/maps/mt_moon_b1f.asm
+++ b/text/maps/mt_moon_b1f.asm
@@ -1,4 +1,3 @@
_MtMoonText1::
db $0
done
-
--- a/text/maps/museum_1f.asm
+++ b/text/maps/museum_1f.asm
@@ -105,4 +105,3 @@
text "The AMBER is"
line "clear and gold!"
done
-
--- a/text/maps/name_rater.asm
+++ b/text/maps/name_rater.asm
@@ -58,4 +58,3 @@
TX_RAM wcd6d
text "!"
done
-
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -475,4 +475,3 @@
line "entirely complete!"
cont "Congratulations!"
done
-
--- a/text/maps/pallet_town.asm
+++ b/text/maps/pallet_town.asm
@@ -53,4 +53,3 @@
_PalletTownText7::
text $53,"'s house "
done
-
--- a/text/maps/pewter_city.asm
+++ b/text/maps/pewter_city.asm
@@ -115,4 +115,3 @@
line "A Stone Gray"
cont "City"
done
-
--- a/text/maps/pewter_gym_1.asm
+++ b/text/maps/pewter_gym_1.asm
@@ -16,4 +16,3 @@
cont "Fine then! Show"
cont "me your best!"
done
-
--- a/text/maps/pewter_house_1.asm
+++ b/text/maps/pewter_house_1.asm
@@ -22,4 +22,3 @@
para "If only we had"
line "some BADGEs..."
done
-
--- a/text/maps/pewter_house_2.asm
+++ b/text/maps/pewter_house_2.asm
@@ -17,4 +17,3 @@
para "But, it's not a"
line "sure thing!"
done
-
--- a/text/maps/pokemon_league_gate.asm
+++ b/text/maps/pokemon_league_gate.asm
@@ -17,4 +17,3 @@
text "Oh! That is the"
line "BOULDERBADGE!"
cont "Go right ahead!@@"
-
--- a/text/maps/pokemon_tower_1f.asm
+++ b/text/maps/pokemon_tower_1f.asm
@@ -29,4 +29,3 @@
line "There are spirits"
cont "up to mischief!"
done
-
--- a/text/maps/pokemon_tower_2f.asm
+++ b/text/maps/pokemon_tower_2f.asm
@@ -55,4 +55,3 @@
line "might be able to"
cont "unmask them."
done
-
--- a/text/maps/pokemon_tower_3f.asm
+++ b/text/maps/pokemon_tower_3f.asm
@@ -43,4 +43,3 @@
text "My friends were"
line "possessed too!"
done
-
--- a/text/maps/pokemon_tower_4f.asm
+++ b/text/maps/pokemon_tower_4f.asm
@@ -43,4 +43,3 @@
line "souls of #MON"
cont "rest in peace..."
done
-
--- a/text/maps/pokemon_tower_5f.asm
+++ b/text/maps/pokemon_tower_5f.asm
@@ -69,4 +69,3 @@
para $52, "'s #MON"
line "are fully healed!"
done
-
--- a/text/maps/pokemon_tower_6f.asm
+++ b/text/maps/pokemon_tower_6f.asm
@@ -59,4 +59,3 @@
text "Be gone..."
line "Intruders..."
done
-
--- a/text/maps/power_plant.asm
+++ b/text/maps/power_plant.asm
@@ -4,4 +4,3 @@
_ZapdosBattleText::
text "Gyaoo!@@"
-
--- a/text/maps/reds_house_1f.asm
+++ b/text/maps/reds_house_1f.asm
@@ -35,4 +35,3 @@
_TVWrongSideText::
text "Oops, wrong side."
done
-
--- a/text/maps/rock_tunnel_b1f.asm
+++ b/text/maps/rock_tunnel_b1f.asm
@@ -113,4 +113,3 @@
line "CERULEAN CITY -"
cont "LAVENDER TOWN"
done
-
--- a/text/maps/rock_tunnel_b2f_1.asm
+++ b/text/maps/rock_tunnel_b2f_1.asm
@@ -106,4 +106,3 @@
text "Fired"
line "away!"
prompt
-
--- a/text/maps/rock_tunnel_b2f_2.asm
+++ b/text/maps/rock_tunnel_b2f_2.asm
@@ -18,4 +18,3 @@
text "I'm an artist,"
line "not a fighter."
done
-
--- a/text/maps/rocket_hideout_b1f.asm
+++ b/text/maps/rocket_hideout_b1f.asm
@@ -71,4 +71,3 @@
text "Uh-oh, that fight"
line "opened the door!"
done
-
--- a/text/maps/rocket_hideout_b2f.asm
+++ b/text/maps/rocket_hideout_b2f.asm
@@ -15,4 +15,3 @@
cont "floors. Can you"
cont "reach the BOSS?"
done
-
--- a/text/maps/rocket_hideout_b3f.asm
+++ b/text/maps/rocket_hideout_b3f.asm
@@ -33,4 +33,3 @@
cont "LIFT KEY to run"
cont "the elevator!"
done
-
--- a/text/maps/rocket_hideout_b4f.asm
+++ b/text/maps/rocket_hideout_b4f.asm
@@ -72,4 +72,3 @@
text "Oh no! I dropped"
line "the LIFT KEY!"
done
-
--- a/text/maps/rocket_hideout_elevator.asm
+++ b/text/maps/rocket_hideout_elevator.asm
@@ -1,4 +1,3 @@
_RocketElevatorText_4578b::
text "It appears to"
line "need a key.@@"
-
--- a/text/maps/route_1.asm
+++ b/text/maps/route_1.asm
@@ -47,4 +47,3 @@
line "PALLET TOWN -"
cont "VIRIDIAN CITY"
done
-
--- a/text/maps/route_10.asm
+++ b/text/maps/route_10.asm
@@ -107,4 +107,3 @@
_Route10Text10::
text "POWER PLANT"
done
-
--- a/text/maps/route_11_1.asm
+++ b/text/maps/route_11_1.asm
@@ -131,5 +131,3 @@
text "Watch out for"
line "live wires!"
done
-
-
--- a/text/maps/route_11_2.asm
+++ b/text/maps/route_11_2.asm
@@ -26,4 +26,3 @@
_Route11Text11::
text "DIGLETT's CAVE"
done
-
--- a/text/maps/route_11_gate.asm
+++ b/text/maps/route_11_gate.asm
@@ -12,4 +12,3 @@
para "He'll help you"
line "rename them too!"
done
-
--- a/text/maps/route_11_gate_upstairs.asm
+++ b/text/maps/route_11_gate_upstairs.asm
@@ -38,4 +38,3 @@
cont "is by way of the"
cont "ROCK TUNNEL."
done
-
--- a/text/maps/route_12.asm
+++ b/text/maps/route_12.asm
@@ -137,4 +137,3 @@
_Route12Text12::
text "SPORT FISHING AREA"
done
-
--- a/text/maps/route_12_gate.asm
+++ b/text/maps/route_12_gate.asm
@@ -2,4 +2,3 @@
text "There's a lookout"
line "spot upstairs."
done
-
--- a/text/maps/route_12_gate_upstairs.asm
+++ b/text/maps/route_12_gate_upstairs.asm
@@ -40,4 +40,3 @@
para "It's #MON TOWER!"
done
-
--- a/text/maps/route_12_house.asm
+++ b/text/maps/route_12_house.asm
@@ -58,4 +58,3 @@
line "you, but you have"
cont "no room for it!"
done
-
--- a/text/maps/route_13.asm
+++ b/text/maps/route_13.asm
@@ -177,4 +177,3 @@
line "North to SILENCE"
cont "BRIDGE"
done
-
--- a/text/maps/route_14.asm
+++ b/text/maps/route_14.asm
@@ -171,4 +171,3 @@
line "West to FUCHSIA"
cont "CITY"
done
-
--- a/text/maps/route_15.asm
+++ b/text/maps/route_15.asm
@@ -169,4 +169,3 @@
line "West to FUCHSIA"
cont "CITY"
done
-
--- a/text/maps/route_15_gate.asm
+++ b/text/maps/route_15_gate.asm
@@ -5,4 +5,3 @@
para "PROF.OAK's AIDE"
line "came by here."
done
-
--- a/text/maps/route_15_gate_upstairs.asm
+++ b/text/maps/route_15_gate_upstairs.asm
@@ -22,4 +22,3 @@
para "It looks like a"
line "small island!"
done
-
--- a/text/maps/route_16.asm
+++ b/text/maps/route_16.asm
@@ -118,4 +118,3 @@
line "CELADON CITY -"
cont "FUCHSIA CITY"
done
-
--- a/text/maps/route_16_gate.asm
+++ b/text/maps/route_16_gate.asm
@@ -20,4 +20,3 @@
text "How'd you get in?"
line "Good effort!"
done
-
--- a/text/maps/route_16_gate_upstairs.asm
+++ b/text/maps/route_16_gate_upstairs.asm
@@ -24,4 +24,3 @@
para "There's a long"
line "path over water!"
done
-
--- a/text/maps/route_16_house.asm
+++ b/text/maps/route_16_house.asm
@@ -29,4 +29,3 @@
_Route16HouseText_1e652::
text "FEAROW: Kyueen!"
done
-
--- a/text/maps/route_17.asm
+++ b/text/maps/route_17.asm
@@ -193,4 +193,3 @@
text "CYCLING ROAD"
line "Slope ends here!"
done
-
--- a/text/maps/route_18.asm
+++ b/text/maps/route_18.asm
@@ -56,4 +56,3 @@
line "No pedestrians"
cont "permitted!"
done
-
--- a/text/maps/route_18_gate.asm
+++ b/text/maps/route_18_gate.asm
@@ -12,4 +12,3 @@
_Route18GateText_49932::
text "Excuse me!"
done
-
--- a/text/maps/route_18_gate_upstairs.asm
+++ b/text/maps/route_18_gate_upstairs.asm
@@ -13,5 +13,3 @@
para "There are people"
line "swimming!"
done
-
-
--- a/text/maps/route_19.asm
+++ b/text/maps/route_19.asm
@@ -155,4 +155,3 @@
line "FUCHSIA CITY -"
cont "SEAFOAM ISLANDS"
done
-
--- a/text/maps/route_2.asm
+++ b/text/maps/route_2.asm
@@ -7,4 +7,3 @@
_Route2Text4::
text "DIGLETT's CAVE"
done
-
--- a/text/maps/route_20.asm
+++ b/text/maps/route_20.asm
@@ -154,4 +154,3 @@
_Route20Text11::
text "SEAFOAM ISLANDS"
done
-
--- a/text/maps/route_21.asm
+++ b/text/maps/route_21.asm
@@ -135,4 +135,3 @@
text "Oh wait! I got a"
line "bite! Yeah!"
done
-
--- a/text/maps/route_22.asm
+++ b/text/maps/route_22.asm
@@ -102,4 +102,3 @@
text "#MON LEAGUE"
line "Front Gate"
done
-
--- a/text/maps/route_23.asm
+++ b/text/maps/route_23.asm
@@ -36,4 +36,3 @@
text "VICTORY ROAD GATE"
line "- #MON LEAGUE"
done
-
--- a/text/maps/route_24_1.asm
+++ b/text/maps/route_24_1.asm
@@ -62,4 +62,3 @@
text "I saw your feat"
line "from the grass!"
done
-
--- a/text/maps/route_24_2.asm
+++ b/text/maps/route_24_2.asm
@@ -88,4 +88,3 @@
text "I did my best, I"
line "have no regrets!"
done
-
--- a/text/maps/route_25.asm
+++ b/text/maps/route_25.asm
@@ -154,4 +154,3 @@
text "SEA COTTAGE"
line "BILL lives here!"
done
-
--- a/text/maps/route_2_gate.asm
+++ b/text/maps/route_2_gate.asm
@@ -10,4 +10,3 @@
cont "can get through"
cont "ROCK TUNNEL."
done
-
--- a/text/maps/route_2_house.asm
+++ b/text/maps/route_2_house.asm
@@ -4,4 +4,3 @@
cont "it can still use "
cont "moves like CUT!"
done
-
--- a/text/maps/route_3.asm
+++ b/text/maps/route_3.asm
@@ -143,4 +143,3 @@
text "ROUTE 3"
line "MT.MOON AHEAD"
done
-
--- a/text/maps/route_4.asm
+++ b/text/maps/route_4.asm
@@ -33,4 +33,3 @@
line "MT.MOON -"
cont "CERULEAN CITY"
done
-
--- a/text/maps/route_5.asm
+++ b/text/maps/route_5.asm
@@ -3,4 +3,3 @@
line "CERULEAN CITY -"
cont "VERMILION CITY"
done
-
--- a/text/maps/route_6.asm
+++ b/text/maps/route_6.asm
@@ -95,4 +95,3 @@
line "CERULEAN CITY -"
cont "VERMILION CITY"
done
-
--- a/text/maps/route_7.asm
+++ b/text/maps/route_7.asm
@@ -3,4 +3,3 @@
line "CELADON CITY -"
cont "LAVENDER TOWN"
done
-
--- a/text/maps/route_8.asm
+++ b/text/maps/route_8.asm
@@ -152,4 +152,3 @@
line "CELADON CITY -"
cont "LAVENDER TOWN"
done
-
--- a/text/maps/route_9.asm
+++ b/text/maps/route_9.asm
@@ -155,4 +155,3 @@
line "CERULEAN CITY-"
cont "ROCK TUNNEL"
done
-
--- a/text/maps/safari_zone_center.asm
+++ b/text/maps/safari_zone_center.asm
@@ -9,4 +9,3 @@
line "Button to check"
cont "remaining time!"
done
-
--- a/text/maps/safari_zone_east.asm
+++ b/text/maps/safari_zone_east.asm
@@ -14,4 +14,3 @@
text "CENTER AREA"
line "NORTH: AREA 2"
done
-
--- a/text/maps/safari_zone_entrance.asm
+++ b/text/maps/safari_zone_entrance.asm
@@ -91,50 +91,3 @@
text "Sorry, you're a"
line "regular here!"
done
-
-IF DEF(_OPTION_LOWCOST_SAFARI)
-_SafariZoneLowCostText1::
- db 0
- para "Oh, all right, pay"
- line "me what you have."
- prompt
-
-_SafariZoneLowCostText2::
- text "But, I can't give"
- line "you all 30 BALLs."
- done
-
-_SafariZoneLowCostText3::
- db 0
- para "You're persistent,"
- line "aren't you?"
-
- para "OK, you can go in"
- line "for free, but"
- cont "just this once!@@"
-
-_SafariZoneLowCostText4::
- db 0
- done
-
-_SafariZoneLowCostText5::
- text "I'm sorry, but you"
- line "have to pay to"
- cont "enter."
- done
-
-_SafariZoneLowCostText6::
- text "You can't enter"
- line "without paying!"
- done
-
-_SafariZoneLowCostText7::
- text "I said, no money,"
- line "no entry!"
- done
-
-_SafariZoneLowCostText8::
- text "Read my lips, NO!"
- line "Get it?"
- done
-ENDC
--- a/text/maps/safari_zone_north.asm
+++ b/text/maps/safari_zone_north.asm
@@ -31,4 +31,3 @@
line "finding the"
cont "SECRET HOUSE!"
done
-
--- a/text/maps/safari_zone_rest_house_1.asm
+++ b/text/maps/safari_zone_rest_house_1.asm
@@ -9,4 +9,3 @@
line "#MON to take"
cont "home as gifts!"
done
-
--- a/text/maps/safari_zone_rest_house_2.asm
+++ b/text/maps/safari_zone_rest_house_2.asm
@@ -17,4 +17,3 @@
line "I didn't see any"
cont "#MON I wanted."
done
-
--- a/text/maps/safari_zone_rest_house_3.asm
+++ b/text/maps/safari_zone_rest_house_3.asm
@@ -16,4 +16,3 @@
text "Whew! I'm tired"
line "from all the fun!"
done
-
--- a/text/maps/safari_zone_rest_house_4.asm
+++ b/text/maps/safari_zone_rest_house_4.asm
@@ -25,4 +25,3 @@
cont "a VAPOREON!"
cont "I wonder why?"
done
-
--- a/text/maps/safari_zone_secret_house.asm
+++ b/text/maps/safari_zone_secret_house.asm
@@ -42,4 +42,3 @@
line "room for this"
cont "fabulous prize!"
done
-
--- a/text/maps/safari_zone_west.asm
+++ b/text/maps/safari_zone_west.asm
@@ -29,4 +29,3 @@
text "AREA 3"
line "EAST: CENTER AREA"
done
-
--- a/text/maps/saffron_city.asm
+++ b/text/maps/saffron_city.asm
@@ -149,4 +149,3 @@
para "Release to be"
line "determined..."
done
-
--- a/text/maps/saffron_gates.asm
+++ b/text/maps/saffron_gates.asm
@@ -34,4 +34,3 @@
text "Hi, thanks for"
line "the cool drinks!"
done
-
--- a/text/maps/saffron_gym.asm
+++ b/text/maps/saffron_gym.asm
@@ -234,4 +234,3 @@
line "used telepathy to"
cont "read your mind!"
done
-
--- a/text/maps/saffron_house.asm
+++ b/text/maps/saffron_house.asm
@@ -24,4 +24,3 @@
line "increasing the PP"
cont "of techniques!"
done
-
--- a/text/maps/seafoam_islands_1f.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/seafoam_islands_b1f.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/seafoam_islands_b2f.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/seafoam_islands_b3f.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/seafoam_islands_b4f.asm
+++ b/text/maps/seafoam_islands_b4f.asm
@@ -11,4 +11,3 @@
text "DANGER"
line "Fast current!"
done
-
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/silph_co_11f.asm
@@ -132,4 +132,3 @@
text "The monitor has"
line "#MON on it!"
done
-
--- a/text/maps/silph_co_1f.asm
+++ b/text/maps/silph_co_1f.asm
@@ -5,4 +5,3 @@
line "in the boardroom"
cont "on 11F!"
done
-
--- a/text/maps/silph_co_2f.asm
+++ b/text/maps/silph_co_2f.asm
@@ -94,4 +94,3 @@
line "be merged with"
cont "TEAM ROCKET!"
done
-
--- a/text/maps/silph_co_3f.asm
+++ b/text/maps/silph_co_3f.asm
@@ -44,4 +44,3 @@
cont "them, they'd let"
cont "me study #MON!"
done
-
--- a/text/maps/silph_co_4f.asm
+++ b/text/maps/silph_co_4f.asm
@@ -54,4 +54,3 @@
text "I better tell the"
line "BOSS on 11F!"
done
-
--- a/text/maps/silph_co_5f_2.asm
+++ b/text/maps/silph_co_5f_2.asm
@@ -53,4 +53,3 @@
line "only when traded"
cont "by link-cable."
done
-
--- a/text/maps/silph_co_6f.asm
+++ b/text/maps/silph_co_6f.asm
@@ -105,4 +105,3 @@
line "justice, you"
cont "betray evil!"
done
-
--- a/text/maps/silph_co_7f.asm
+++ b/text/maps/silph_co_7f.asm
@@ -207,4 +207,3 @@
cont "Don't sweat it!"
cont "Smell ya!"
done
-
--- a/text/maps/silph_co_8f.asm
+++ b/text/maps/silph_co_8f.asm
@@ -54,4 +54,3 @@
text "I'll leave you up"
line "to my brothers!"
done
-
--- a/text/maps/silph_co_9f.asm
+++ b/text/maps/silph_co_9f.asm
@@ -60,4 +60,3 @@
text "My brothers will"
line "avenge me!"
done
-
--- a/text/maps/ss_anne_1.asm
+++ b/text/maps/ss_anne_1.asm
@@ -19,4 +19,3 @@
line "challenged by the"
cont "more bored ones!"
done
-
--- a/text/maps/ss_anne_10.asm
+++ b/text/maps/ss_anne_10.asm
@@ -110,4 +110,3 @@
line "STRENGTH to move"
cont "big rocks!"
done
-
--- a/text/maps/ss_anne_2.asm
+++ b/text/maps/ss_anne_2.asm
@@ -61,4 +61,3 @@
para "You should go see"
line "him! Smell ya!"
done
-
--- a/text/maps/ss_anne_3.asm
+++ b/text/maps/ss_anne_3.asm
@@ -5,4 +5,3 @@
para "He even teaches"
line "CUT to #MON!"
done
-
--- a/text/maps/ss_anne_4.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/ss_anne_5.asm
+++ b/text/maps/ss_anne_5.asm
@@ -50,4 +50,3 @@
cont "#MON. I think"
cont "there are more."
done
-
--- a/text/maps/ss_anne_6.asm
+++ b/text/maps/ss_anne_6.asm
@@ -67,4 +67,3 @@
para "But, have I enough"
line "fillets du beef?"
done
-
--- a/text/maps/ss_anne_7.asm
+++ b/text/maps/ss_anne_7.asm
@@ -60,4 +60,3 @@
cont "The CAPTAIN's"
cont "reading this!"
done
-
--- a/text/maps/ss_anne_8.asm
+++ b/text/maps/ss_anne_8.asm
@@ -102,4 +102,3 @@
para "I'm on the trail"
line "of TEAM ROCKET!"
done
-
--- a/text/maps/ss_anne_9.asm
+++ b/text/maps/ss_anne_9.asm
@@ -111,4 +111,3 @@
text "Oh, I adore your"
line "strong #MON!"
done
-
--- a/text/maps/underground_path_route_5_entrance.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/underground_path_route_6_entrance.asm
+++ b/text/maps/underground_path_route_6_entrance.asm
@@ -3,4 +3,3 @@
line "things in that"
cont "UNDERGROUND PATH."
done
-
--- a/text/maps/underground_path_route_7_entrance.asm
+++ b/text/maps/underground_path_route_7_entrance.asm
@@ -3,4 +3,3 @@
line "#MON appeared"
cont "near CELADON CITY."
done
-
--- a/text/maps/underground_path_route_7_entrance_unused.asm
+++ b/text/maps/underground_path_route_7_entrance_unused.asm
@@ -33,4 +33,3 @@
cont "to the building"
cont "across the road."
done
-
--- a/text/maps/underground_path_route_8_entrance.asm
+++ b/text/maps/underground_path_route_8_entrance.asm
@@ -3,4 +3,3 @@
line "in CELADON has a"
cont "great selection!"
done
-
--- a/text/maps/unknown_dungeon_1f.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/unknown_dungeon_2f.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
--- a/text/maps/unknown_dungeon_b1f.asm
+++ b/text/maps/unknown_dungeon_b1f.asm
@@ -1,3 +1,2 @@
_MewtwoBattleText::
text "Mew!@@"
-
--- a/text/maps/vermilion_city.asm
+++ b/text/maps/vermilion_city.asm
@@ -124,4 +124,3 @@
_VermilionCityText13::
text "VERMILION HARBOR"
done
-
--- a/text/maps/vermilion_dock.asm
+++ b/text/maps/vermilion_dock.asm
@@ -1,4 +1,3 @@
_VermilionDockText1::
text ""
done
-
--- a/text/maps/vermilion_fishing_house.asm
+++ b/text/maps/vermilion_fishing_house.asm
@@ -51,4 +51,3 @@
para "You have no room"
line "for my gift!"
done
-
--- a/text/maps/vermilion_gym_2.asm
+++ b/text/maps/vermilion_gym_2.asm
@@ -141,4 +141,3 @@
text "Whew! That match"
line "was electric!"
done
-
--- a/text/maps/vermilion_house.asm
+++ b/text/maps/vermilion_house.asm
@@ -19,4 +19,3 @@
para "VERMILION appears"
line "to be safe."
done
-
--- a/text/maps/victory_road_1f.asm
+++ b/text/maps/victory_road_1f.asm
@@ -29,4 +29,3 @@
text "I concede, you're"
line "better than me!"
done
-
--- a/text/maps/victory_road_2f.asm
+++ b/text/maps/victory_road_2f.asm
@@ -83,4 +83,3 @@
line "up the challenge"
cont "here."
done
-
--- a/text/maps/victory_road_3f.asm
+++ b/text/maps/victory_road_3f.asm
@@ -61,4 +61,3 @@
line "battles, you get"
cont "stronger!"
done
-
--- a/text/maps/viridian_city.asm
+++ b/text/maps/viridian_city.asm
@@ -178,4 +178,3 @@
text "The GYM's doors"
line "are locked..."
done
-
--- a/text/maps/viridian_forest.asm
+++ b/text/maps/viridian_forest.asm
@@ -121,4 +121,3 @@
line "VIRIDIAN FOREST"
cont "PEWTER CITY AHEAD"
done
-
--- a/text/maps/viridian_forest_exit.asm
+++ b/text/maps/viridian_forest_exit.asm
@@ -17,4 +17,3 @@
line "down by a special"
cont "#MON move."
done
-
--- a/text/maps/viridian_gym.asm
+++ b/text/maps/viridian_gym.asm
@@ -234,4 +234,3 @@
line "GIOVANNI was the"
cont "GYM LEADER here?"
done
-
--- a/text/maps/viridian_house.asm
+++ b/text/maps/viridian_house.asm
@@ -21,4 +21,3 @@
text "SPEAROW"
line "Name: SPEARY"
done
-
--- a/text/maps/wardens_house.asm
+++ b/text/maps/wardens_house.asm
@@ -81,4 +81,3 @@
text "Old #MON"
line "merchandise."
done
-