Sync somewhat with pokeyellow.

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 @@ BikeShopText1: ; 1d745 (7:5745)
 .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 @@ BikeShopText3: ; 1d848 (7:5848)
 	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 "@"

text.asm

@@ -174,7 +174,6 @@ INCLUDE "text/maps/mt_moon_b2f.asm"
 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_secret_house.asm"
 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 @@ INCLUDE "text/maps/rock_tunnel_b2f_1.asm"
 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 @@ INCLUDE "text/maps/daycare_1.asm"
 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"

text/maps/agatha.asm

@@ -42,4 +42,3 @@ _AgathaDontRunAwayText::
 	text "Someone's voice:"
 	line "Don't run away!"
 	done
-

text/maps/bike_shop.asm

@@ -68,4 +68,3 @@ _BikeShopText_1d861::
 	text "Wow. Your BIKE is"
 	line "really cool!"
 	done
-

text/maps/bills_house.asm

@@ -85,4 +85,3 @@ _BillsHouseText_1e8da::
 	cont "some of my rare"
 	cont "#MON on my PC!"
 	done
-

text/maps/blues_house.asm

@@ -39,4 +39,3 @@ _BluesHouseText3::
 	text "It's a big map!"
 	line "This is useful!"
 	done
-

text/maps/bruno.asm

@@ -35,4 +35,3 @@ _BrunoDontRunAwayText::
 	text "Someone's voice:"
 	line "Don't run away!"
 	done
-

text/maps/celadon_city.asm

@@ -150,4 +150,3 @@ _CeladonCityText18::
 	line "The playground"
 	cont "for grown-ups!"
 	done
-

text/maps/celadon_diner.asm

@@ -57,4 +57,3 @@ _CeladonDinerText_491b7::
 	line "I was going to"
 	cont "win it back..."
 	done
-

text/maps/celadon_game_corner.asm

@@ -184,4 +184,3 @@ _CeladonGameCornerText_48f19::
 	text "Oops! Forgot the"
 	line "COIN CASE!"
 	done
-

text/maps/celadon_gym.asm

@@ -216,4 +216,3 @@ _CeladonGymAfterBattleText8::
 	para "Wait 'til next"
 	line "time!"
 	done
-

text/maps/celadon_hotel.asm

@@ -19,4 +19,3 @@ _CeladonHotelText3::
 	text "Why did she bring"
 	line "her brother?"
 	done
-

text/maps/celadon_house.asm

@@ -20,4 +20,3 @@ _CeladonHouseText3::
 	para "There's no secret"
 	line "switch behind it!"
 	done
-

text/maps/celadon_mansion_1f.asm

@@ -21,4 +21,3 @@ _CeladonMansion1Text5::
 	text "CELADON MANSION"
 	line "Manager's Suite"
 	done
-

text/maps/celadon_mansion_2f.asm

@@ -2,4 +2,3 @@ _CeladonMansion2Text1::
 	text "GAME FREAK"
 	line "Meeting Room"
 	done
-

text/maps/celadon_mansion_3f.asm

@@ -64,4 +64,3 @@ _CeladonMansion3Text8::
 	text "GAME FREAK"
 	line "Development Room"
 	done
-

text/maps/celadon_mansion_4f_inside.asm

@@ -8,4 +8,3 @@ _CeladonMansion5Text1::
 	line "your friends and"
 	cont "trade #MON!"
 	done
-

text/maps/celadon_mansion_4f_outside.asm

@@ -1,4 +1,3 @@
 _CeladonMansion4Text1::
 	text "I KNOW EVERYTHING!"
 	done
-

text/maps/celadon_prize_room.asm

@@ -10,4 +10,3 @@ _CeladonPrizeRoomText2::
 	text "I had a major"
 	line "haul today!"
 	done
-

text/maps/cerulean_badge_house.asm

@@ -95,4 +95,3 @@ _CeruleanHouse2Text_74eb9::
 	text "All #MON will"
 	line "obey you!"
 	prompt
-

text/maps/cerulean_city.asm

@@ -230,4 +230,3 @@ _CeruleanCityText17::
 	para "The Tomboyish"
 	line "Mermaid!"
 	done
-

text/maps/cerulean_gym.asm

@@ -129,4 +129,3 @@ _CeruleanGymText_5c82f::
 	line "we make a pretty"
 	cont "darn good team!"
 	done
-

text/maps/cerulean_trashed_house.asm

@@ -34,4 +34,3 @@ _CeruleanHouseTrashedText3::
 	text "TEAM ROCKET left"
 	line "a way out!"
 	done
-

text/maps/champion.asm

@@ -144,4 +144,3 @@ _GaryText_7612a::
 	para $52, "!"
 	line "Come with me!"
 	done
-

text/maps/cinnabar_gym.asm

@@ -207,4 +207,3 @@ _CinnabarGymText_75ac7::
 	text $52, "! You beat"
 	line "that fire brand!"
 	done
-

text/maps/cinnabar_island.asm

@@ -35,4 +35,3 @@ _CinnabarIslandText7::
 	para "The Hot-Headed"
 	line "Quiz Master!"
 	done
-

text/maps/cinnabar_lab.asm

@@ -27,4 +27,3 @@ _Lab1Text5::
 	text "#MON LAB"
 	line "Testing Room"
 	done
-

text/maps/cinnabar_lab_fossil_room.asm

@@ -76,4 +76,3 @@ _Lab4Text_610bd::
 	text "Aiyah! You come"
 	line "again!"
 	done
-

text/maps/cinnabar_lab_metronome_room.asm

@@ -61,4 +61,3 @@ _Lab3Text3::
 _Lab3Text5::
 	text "An amber pipe!"
 	done
-

text/maps/cinnabar_lab_trade_room.asm

@@ -7,4 +7,3 @@ _Lab2Text1::
 	line "rare, prehistoric"
 	cont "#MON!"
 	done
-

text/maps/copycats_house_2f.asm

@@ -94,4 +94,3 @@ _CopycatsHouse2FText_5cd17::
 _CopycatsHouse2FText_5cd1c::
 	text "Huh? Can't see!"
 	done
-

text/maps/daycare_1.asm

@@ -60,4 +60,3 @@ _DayCareMonNeedsMoreTimeText::
 	cont "needs some more"
 	cont "time with me."
 	prompt
-

text/maps/daycare_2.asm

@@ -31,4 +31,3 @@ _DayCareNotEnoughMoneyText::
 	text "Hey, you don't"
 	line "have enough ¥!"
 	done
-

text/maps/digletts_cave_route_11_entrance.asm

@@ -6,4 +6,3 @@ _DiglettsCaveEntRoute11Text1::
 	para "It goes right to"
 	line "VIRIDIAN CITY!"
 	done
-

text/maps/digletts_cave_route_2_entrance.asm

@@ -7,4 +7,3 @@ _DiglettsCaveRoute2Text1::
 	line "FLASH could light"
 	cont "it up..."
 	done
-

text/maps/fan_club.asm

@@ -141,4 +141,3 @@ _FanClubText8::
 	text "If someone brags,"
 	line "brag right back!"
 	done
-

text/maps/fighting_dojo.asm

@@ -128,4 +128,3 @@ _OtherHitmonText::
 	text "Better not get"
 	line "greedy..."
 	done
-

text/maps/fuchsia_city.asm

@@ -117,4 +117,3 @@ _FuchsiaCityKabutoText::
 _FuchsiaCityText_19b2a::
 	text "..."
 	done
-

text/maps/fuchsia_fishing_house.asm

@@ -41,4 +41,3 @@ _FuchsiaHouse3Text_5621c::
 	para "You have no room"
 	line "for my gift!"
 	done
-

text/maps/fuchsia_gym_1.asm

@@ -24,4 +24,3 @@ _KogaAfterBattleText::
 	para "Here! Take the"
 	line "SOULBADGE!"
 	prompt
-

text/maps/fuchsia_gym_2.asm

@@ -191,4 +191,3 @@ _FuchsiaGymText_75653::
 	line "ninja can terrify"
 	cont "even now!"
 	done
-

text/maps/fuchsia_house.asm

@@ -25,4 +25,3 @@ _FuchsiaHouse1Text3::
 
 	para "Did he show you?"
 	done
-

text/maps/fuchsia_meeting_room.asm

@@ -24,4 +24,3 @@ _FuchsiaMeetingRoomText3::
 	para "I think he's got"
 	line "a speech problem!"
 	done
-

text/maps/fujis_house.asm

@@ -83,4 +83,3 @@ _LavenderHouse1Text6::
 	para "Gone! It's been"
 	line "clipped out!"
 	done
-

text/maps/hall_of_fame.asm

@@ -26,4 +26,3 @@ _HallofFameRoomText1::
 	cont "your #MON are"
 	cont "HALL OF FAMERs!"
 	done
-

text/maps/lance.asm

@@ -61,4 +61,3 @@ _LanceAfterBattleText::
 	para "He is the real"
 	line "#MON LEAGUE"
 	cont "champion!@@"
-

text/maps/lavender_house.asm

@@ -22,4 +22,3 @@ _LavenderHouse2Text_1d9e1::
 	line "soothed its"
 	cont "restless soul!"
 	done
-

text/maps/lavender_town.asm

@@ -62,4 +62,3 @@ _LavenderTownText9::
 	line "#MON Rest Easy"
 	cont "#MON TOWER"
 	done
-

text/maps/lorelei.asm

@@ -40,4 +40,3 @@ _LoreleiDontRunAwayText::
 	text "Someone's voice:"
 	line "Don't run away!"
 	done
-

text/maps/mansion_1f.asm

@@ -27,4 +27,3 @@ _MansionSwitchPressedText::
 _MansionSwitchNotPressedText::
 	text "Not quite yet!"
 	done
-

text/maps/mansion_2f.asm

@@ -45,4 +45,3 @@ _Mansion2Text_520c7::
 _Mansion2Text_520cc::
 	text "Not quite yet!"
 	done
-

text/maps/mansion_3f.asm

@@ -35,4 +35,3 @@ _Mansion3Text5::
 	para "We named the"
 	line "newborn MEWTWO."
 	done
-

text/maps/mansion_b1f.asm

@@ -37,4 +37,3 @@ _Mansion4Text7::
 	line "curb its vicious"
 	cont "tendencies..."
 	done
-

text/maps/mr_psychics_house.asm

@@ -23,4 +23,3 @@ _TM29NoRoomText::
 	text "Where do you plan"
 	line "to put this?"
 	done
-

text/maps/mt_moon_b1f.asm

@@ -1,4 +1,3 @@
 _MtMoonText1::
 	db $0
 	done
-

text/maps/museum_1f.asm

@@ -105,4 +105,3 @@ _Museum1FText_5c2bc::
 	text "The AMBER is"
 	line "clear and gold!"
 	done
-

text/maps/name_rater.asm

@@ -58,4 +58,3 @@ _NameRaterText_1dad1::
 	TX_RAM wcd6d
 	text "!"
 	done
-

text/maps/oaks_lab.asm

@@ -475,4 +475,3 @@ _OaksLabText_4424c::
 	line "entirely complete!"
 	cont "Congratulations!"
 	done
-

text/maps/pallet_town.asm

@@ -53,4 +53,3 @@ _PalletTownText6::
 _PalletTownText7::
 	text $53,"'s house "
 	done
-

text/maps/pewter_city.asm

@@ -115,4 +115,3 @@ _PewterCityText12::
 	line "A Stone Gray"
 	cont "City"
 	done
-

text/maps/pewter_gym_1.asm

@@ -16,4 +16,3 @@ _PewterGymText_5c49e::
 	cont "Fine then! Show"
 	cont "me your best!"
 	done
-

text/maps/pewter_house_1.asm

@@ -22,4 +22,3 @@ _PewterHouse1Text3::
 	para "If only we had"
 	line "some BADGEs..."
 	done
-

text/maps/pewter_house_2.asm

@@ -17,4 +17,3 @@ _PewterHouse2Text2::
 	para "But, it's not a"
 	line "sure thing!"
 	done
-

text/maps/pokemon_league_gate.asm

@@ -17,4 +17,3 @@ _Route22GateText_1e71a::
 	text "Oh! That is the"
 	line "BOULDERBADGE!"
 	cont "Go right ahead!@@"
-

text/maps/pokemon_tower_1f.asm

@@ -29,4 +29,3 @@ _PokemonTower1Text5::
 	line "There are spirits"
 	cont "up to mischief!"
 	done
-

text/maps/pokemon_tower_2f.asm

@@ -55,4 +55,3 @@ _PokemonTower2Text2::
 	line "might be able to"
 	cont "unmask them."
 	done
-

text/maps/pokemon_tower_3f.asm

@@ -43,4 +43,3 @@ _PokemonTower3AfterBattleText3::
 	text "My friends were"
 	line "possessed too!"
 	done
-

text/maps/pokemon_tower_4f.asm

@@ -43,4 +43,3 @@ _PokemonTower4AfterBattleText3::
 	line "souls of #MON"
 	cont "rest in peace..."
 	done
-

text/maps/pokemon_tower_5f.asm

@@ -69,4 +69,3 @@ _PokemonTower5Text7::
 	para $52, "'s #MON"
 	line "are fully healed!"
 	done
-

text/maps/pokemon_tower_6f.asm

@@ -59,4 +59,3 @@ _PokemonTower6Text6::
 	text "Be gone..."
 	line "Intruders..."
 	done
-

text/maps/power_plant.asm

@@ -4,4 +4,3 @@ _VoltorbBattleText::
 
 _ZapdosBattleText::
 	text "Gyaoo!@@"
-

text/maps/reds_house_1f.asm

@@ -35,4 +35,3 @@ _StandByMeText::
 _TVWrongSideText::
 	text "Oops, wrong side."
 	done
-

text/maps/rock_tunnel_b1f.asm

@@ -113,4 +113,3 @@ _RockTunnel1Text8::
 	line "CERULEAN CITY -"
 	cont "LAVENDER TOWN"
 	done
-

text/maps/rock_tunnel_b2f_1.asm

@@ -106,4 +106,3 @@ _RockTunnel2EndBattleText8::
 	text "Fired"
 	line "away!"
 	prompt
-

text/maps/rock_tunnel_b2f_2.asm

@@ -18,4 +18,3 @@ _RockTunnel2AfterBattleText9::
 	text "I'm an artist,"
 	line "not a fighter."
 	done
-

text/maps/rocket_hideout_b1f.asm

@@ -71,4 +71,3 @@ _RocketHideout1AfterBattleTxt6::
 	text "Uh-oh, that fight"
 	line "opened the door!"
 	done
-

text/maps/rocket_hideout_b2f.asm

@@ -15,4 +15,3 @@ _RocketHideout2AfterBattleTxt2::
 	cont "floors. Can you"
 	cont "reach the BOSS?"
 	done
-

text/maps/rocket_hideout_b3f.asm

@@ -33,4 +33,3 @@ _RocketHide3AfterBattleText3::
 	cont "LIFT KEY to run"
 	cont "the elevator!"
 	done
-

text/maps/rocket_hideout_b4f.asm

@@ -72,4 +72,3 @@ _RocketHideout4Text_455ec::
 	text "Oh no! I dropped"
 	line "the LIFT KEY!"
 	done
-

text/maps/rocket_hideout_elevator.asm

@@ -1,4 +1,3 @@
 _RocketElevatorText_4578b::
 	text "It appears to"
 	line "need a key.@@"
-

text/maps/route_1.asm

@@ -47,4 +47,3 @@ _Route1Text3::
 	line "PALLET TOWN -"
 	cont "VIRIDIAN CITY"
 	done
-

text/maps/route_10.asm

@@ -107,4 +107,3 @@ _Route10Text7::
 _Route10Text10::
 	text "POWER PLANT"
 	done
-

text/maps/route_11_1.asm

@@ -131,5 +131,3 @@ _Route11BattleText9::
 	text "Watch out for"
 	line "live wires!"
 	done
-
-

text/maps/route_11_2.asm

@@ -26,4 +26,3 @@ _Route11AfterBattleText10::
 _Route11Text11::
 	text "DIGLETT's CAVE"
 	done
-

text/maps/route_11_gate.asm

@@ -12,4 +12,3 @@ _Route11GateText1::
 	para "He'll help you"
 	line "rename them too!"
 	done
-

text/maps/route_11_gate_upstairs.asm

@@ -38,4 +38,3 @@ _Route11GateUpstairsText_494d5::
 	cont "is by way of the"
 	cont "ROCK TUNNEL."
 	done
-

text/maps/route_12.asm

@@ -137,4 +137,3 @@ _Route12Text11::
 _Route12Text12::
 	text "SPORT FISHING AREA"
 	done
-

text/maps/route_12_gate.asm

@@ -2,4 +2,3 @@ _Route12GateText1::
 	text "There's a lookout"
 	line "spot upstairs."
 	done
-

text/maps/route_12_gate_upstairs.asm

@@ -40,4 +40,3 @@ _Route12GateUpstairsText_495c4::
 
 	para "It's #MON TOWER!"
 	done
-

text/maps/route_12_house.asm

@@ -58,4 +58,3 @@ _Route12HouseText_564d9::
 	line "you, but you have"
 	cont "no room for it!"
 	done
-

text/maps/route_13.asm

@@ -177,4 +177,3 @@ _Route13Text13::
 	line "North to SILENCE"
 	cont "BRIDGE"
 	done
-

text/maps/route_14.asm

@@ -171,4 +171,3 @@ _Route14Text11::
 	line "West to FUCHSIA"
 	cont "CITY"
 	done
-

text/maps/route_15.asm

@@ -169,4 +169,3 @@ _Route15Text12::
 	line "West to FUCHSIA"
 	cont "CITY"
 	done
-

text/maps/route_15_gate.asm

@@ -5,4 +5,3 @@ _Route15GateText1::
 	para "PROF.OAK's AIDE"
 	line "came by here."
 	done
-

text/maps/route_15_gate_upstairs.asm

@@ -22,4 +22,3 @@ _Route15GateUpstairsText_49698::
 	para "It looks like a"
 	line "small island!"
 	done
-

text/maps/route_16.asm

@@ -118,4 +118,3 @@ _Route16Text9::
 	line "CELADON CITY -"
 	cont "FUCHSIA CITY"
 	done
-

text/maps/route_16_gate.asm

@@ -20,4 +20,3 @@ _Route16GateText2::
 	text "How'd you get in?"
 	line "Good effort!"
 	done
-

text/maps/route_16_gate_upstairs.asm

@@ -24,4 +24,3 @@ _Route16GateUpstairsText_49847::
 	para "There's a long"
 	line "path over water!"
 	done
-

text/maps/route_16_house.asm

@@ -29,4 +29,3 @@ _HM02NoRoomText::
 _Route16HouseText_1e652::
 	text "FEAROW: Kyueen!"
 	done
-

text/maps/route_17.asm

@@ -193,4 +193,3 @@ _Route17Text16::
 	text "CYCLING ROAD"
 	line "Slope ends here!"
 	done
-