Improve some map script labels.

maps/BlackthornCity.asm

@@ -6,7 +6,7 @@ const_value set 2
 	const BLACKTHORNCITY_BLACK_BELT
 	const BLACKTHORNCITY_COOLTRAINER_F1
 	const BLACKTHORNCITY_YOUNGSTER1
-	const BLACKTHORNCITY_YOUNGSTER2
+	const BLACKTHORNCITY_SANTOS
 	const BLACKTHORNCITY_COOLTRAINER_F2
 
 BlackthornCity_MapScriptHeader:
@@ -27,11 +27,11 @@ BlackthornCity_MapScriptHeader:
 .Santos
 	checkcode VAR_WEEKDAY
 	if_equal SATURDAY, .SantosAppears
-	disappear BLACKTHORNCITY_YOUNGSTER2
+	disappear BLACKTHORNCITY_SANTOS
 	return
 
 .SantosAppears
-	appear BLACKTHORNCITY_YOUNGSTER2
+	appear BLACKTHORNCITY_SANTOS
 	return
 
 BlackthornSuperNerdScript:

maps/CeladonDeptStoreElevator.asm

@@ -1,4 +1,3 @@
-
 CeladonDeptStoreElevator_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonMansion2F.asm

@@ -1,4 +1,3 @@
-
 CeladonMansion2F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeladonPokeCenter2FBeta.asm

@@ -1,4 +1,3 @@
-
 CeladonPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CeruleanPokeCenter2FBeta.asm

@@ -1,4 +1,3 @@
-
 CeruleanPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/CinnabarPokeCenter2FBeta.asm

@@ -1,4 +1,3 @@
-
 CinnabarPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/DragonsDen1F.asm

@@ -1,4 +1,3 @@
-
 DragonsDen1F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/FuchsiaPokeCenter2FBeta.asm

@@ -1,4 +1,3 @@
-
 FuchsiaPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/GoldenrodDeptStoreElevator.asm

@@ -1,4 +1,3 @@
-
 GoldenrodDeptStoreElevator_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/GoldenrodFlowerShop.asm

@@ -1,6 +1,6 @@
 const_value set 2
 	const GOLDENRODFLOWERSHOP_TEACHER
-	const GOLDENRODFLOWERSHOP_LASS
+	const GOLDENRODFLOWERSHOP_FLORIA
 
 GoldenrodFlowerShop_MapScriptHeader:
 .MapTriggers:

maps/LakeofRage.asm

@@ -8,7 +8,7 @@ const_value set 2
 	const LAKEOFRAGE_COOLTRAINER_M
 	const LAKEOFRAGE_COOLTRAINER_F2
 	const LAKEOFRAGE_GYARADOS
-	const LAKEOFRAGE_SUPER_NERD2
+	const LAKEOFRAGE_WESLEY
 	const LAKEOFRAGE_POKE_BALL1
 	const LAKEOFRAGE_POKE_BALL2
 
@@ -41,11 +41,11 @@ LakeofRage_MapScriptHeader:
 .Wesley
 	checkcode VAR_WEEKDAY
 	if_equal WEDNESDAY, .WesleyAppears
-	disappear LAKEOFRAGE_SUPER_NERD2
+	disappear LAKEOFRAGE_WESLEY
 	return
 
 .WesleyAppears
-	appear LAKEOFRAGE_SUPER_NERD2
+	appear LAKEOFRAGE_WESLEY
 	return
 
 LanceScript_0x70022:

maps/LavenderPokeCenter2FBeta.asm

@@ -1,4 +1,3 @@
-
 LavenderPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/MobileBattleRoom.asm

@@ -1,4 +1,3 @@
-
 MobileBattleRoom_MapScriptHeader:
 .MapTriggers:
 	db 2

maps/MobileTradeRoomMobile.asm

@@ -1,4 +1,3 @@
-
 MobileTradeRoomMobile_MapScriptHeader:
 .MapTriggers:
 	db 2

maps/MountMoonSquare.asm

@@ -30,7 +30,7 @@ UnknownScript_0x77097:
 	disappear MOUNTMOONSQUARE_ROCK
 	return
 
-UnknownScript_0x7709a:
+ClefairyDance:
 	checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY
 	iftrue .NoDancing
 	checkcode VAR_WEEKDAY
@@ -84,8 +84,8 @@ MountMoonSquareHiddenMoonStone:
 	dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE
 	
 
-MapMountMoonSquareSignpost1Script:
+DontLitterSign:
-	jumptext UnknownText_0x7713b
+	jumptext DontLitterSignText
 
 MtMoonSquareRock:
 	jumpstd smashrock
@@ -134,7 +134,7 @@ MovementData_0x77134:
 	step_right
 	step_end
 
-UnknownText_0x7713b:
+DontLitterSignText:
 	text "MT.MOON SQUARE"
 	line "DON'T LITTER"
 	done
@@ -151,12 +151,12 @@ MountMoonSquare_MapEventHeader:
 
 .XYTriggers:
 	db 1
-	xy_trigger 0, $b, $7, $0, UnknownScript_0x7709a, $0, $0
+	xy_trigger 0, $b, $7, $0, ClefairyDance, $0, $0
 
 .Signposts:
 	db 2
 	signpost 7, 7, SIGNPOST_ITEM, MountMoonSquareHiddenMoonStone
-	signpost 7, 17, SIGNPOST_READ, MapMountMoonSquareSignpost1Script
+	signpost 7, 17, SIGNPOST_READ, DontLitterSign
 
 .PersonEvents:
 	db 3

maps/NewBarkTown.asm

@@ -131,7 +131,7 @@ NewBarkTownSilverScript:
 	applymovement NEWBARKTOWN_SILVER, Movement_SilverReturnsToTheShadows_NBT
 	end
 
-MapNewBarkTownSignpost0Script:
+NewBarkTownSign:
 	jumptext NewBarkTownSignText
 
 MapNewBarkTownSignpost1Script:
@@ -303,7 +303,7 @@ NewBarkTown_MapEventHeader:
 
 .Signposts:
 	db 4
-	signpost 8, 8, SIGNPOST_READ, MapNewBarkTownSignpost0Script
+	signpost 8, 8, SIGNPOST_READ, NewBarkTownSign
 	signpost 5, 11, SIGNPOST_READ, MapNewBarkTownSignpost1Script
 	signpost 3, 3, SIGNPOST_READ, MapNewBarkTownSignpost2Script
 	signpost 13, 9, SIGNPOST_READ, MapNewBarkTownSignpost3Script

maps/PewterPokeCEnter2FBeta.asm

@@ -1,4 +1,3 @@
-
 PewterPokeCEnter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/RedsHouse2F.asm

@@ -1,4 +1,3 @@
-
 RedsHouse2F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/Route1.asm

@@ -32,8 +32,8 @@ CooltrainerfQuinnScript:
 	closetext
 	end
 
-MapRoute1Signpost0Script:
+Route1Sign:
-	jumptext UnknownText_0x1ac675
+	jumptext Route1SignText
 
 FruitTreeScript_0x1ac581:
 	fruittree FRUITTREE_ROUTE_1
@@ -73,7 +73,7 @@ UnknownText_0x1ac640:
 	line "have trained hard."
 	done
 
-UnknownText_0x1ac675:
+Route1SignText:
 	text "ROUTE 1"
 
 	para "PALLET TOWN -"
@@ -92,7 +92,7 @@ Route1_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 27, 7, SIGNPOST_READ, MapRoute1Signpost0Script
+	signpost 27, 7, SIGNPOST_READ, Route1Sign
 
 .PersonEvents:
 	db 3

maps/Route10North.asm

@@ -1,4 +1,3 @@
-
 Route10North_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/Route10PokeCenter2FBeta.asm

@@ -1,4 +1,3 @@
-
 Route10PokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/Route10South.asm

@@ -31,8 +31,8 @@ PokefanmRobertScript:
 	closetext
 	end
 
-MapRoute10SouthSignpost0Script:
+Route10Sign:
-	jumptext UnknownText_0x1ae4dc
+	jumptext Route10SignText
 
 HikerJimSeenText:
 	text "Hahahah!"
@@ -68,7 +68,7 @@ UnknownText_0x1ae4a9:
 	line "this…"
 	done
 
-UnknownText_0x1ae4dc:
+Route10SignText:
 	text "ROUTE 10"
 
 	para "CERULEAN CITY -"
@@ -88,7 +88,7 @@ Route10South_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 3, 5, SIGNPOST_READ, MapRoute10SouthSignpost0Script
+	signpost 3, 5, SIGNPOST_READ, Route10Sign
 
 .PersonEvents:
 	db 2

maps/Route11.asm

@@ -56,8 +56,8 @@ PsychicFidelScript:
 	closetext
 	end
 
-MapRoute11Signpost0Script:
+Route11Sign:
-	jumptext UnknownText_0x68238
+	jumptext Route11SignText
 
 FruitTreeScript_0x68055:
 	fruittree FRUITTREE_ROUTE_11
@@ -142,7 +142,7 @@ UnknownText_0x681ec:
 	cont "in your #MON."
 	done
 
-UnknownText_0x68238:
+Route11SignText:
 	text "ROUTE 11"
 	done
 
@@ -158,7 +158,7 @@ Route11_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 7, 3, SIGNPOST_READ, MapRoute11Signpost0Script
+	signpost 7, 3, SIGNPOST_READ, Route11Sign
 	signpost 5, 32, SIGNPOST_ITEM, Route11HiddenRevive
 
 .PersonEvents:

maps/Route12.asm

@@ -57,11 +57,11 @@ FisherBarneyScript:
 	closetext
 	end
 
-MapRoute12Signpost0Script:
+Route12Sign:
-	jumptext UnknownText_0x1a72a0
+	jumptext Route12SignText
 
-MapRoute12Signpost1Script:
+FishingSpotSign:
-	jumptext UnknownText_0x1a72c1
+	jumptext FishingSpotSignText
 
 Route12Calcium:
 	itemball CALCIUM
@@ -156,14 +156,14 @@ UnknownText_0x1a7238:
 	cont "an angler like me."
 	done
 
-UnknownText_0x1a72a0:
+Route12SignText:
 	text "ROUTE 12"
 
 	para "NORTH TO LAVENDER"
 	line "TOWN"
 	done
 
-UnknownText_0x1a72c1:
+FishingSpotSignText:
 	text "FISHING SPOT"
 	done
 
@@ -180,8 +180,8 @@ Route12_MapEventHeader:
 
 .Signposts:
 	db 3
-	signpost 27, 11, SIGNPOST_READ, MapRoute12Signpost0Script
+	signpost 27, 11, SIGNPOST_READ, Route12Sign
-	signpost 9, 13, SIGNPOST_READ, MapRoute12Signpost1Script
+	signpost 9, 13, SIGNPOST_READ, FishingSpotSign
 	signpost 13, 14, SIGNPOST_ITEM, Route12HiddenElixer
 
 .PersonEvents:

maps/Route13.asm

@@ -67,14 +67,14 @@ HikerKennyScript:
 	closetext
 	end
 
-MapRoute13Signpost0Script:
+Route13TrainerTips:
-	jumptext UnknownText_0x1a271c
+	jumptext Route13TrainerTipsText
 
-MapRoute13Signpost1Script:
+Route13Sign:
-	jumptext UnknownText_0x1a275b
+	jumptext Route13SignText
 
-MapRoute13Signpost2Script:
+Route13DirectionsSign:
-	jumptext UnknownText_0x1a277d
+	jumptext Route13DirectionsSignText
 
 Route13HiddenCalcium:
 	dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM
@@ -169,7 +169,7 @@ UnknownText_0x1a26c2:
 	cont "little."
 	done
 
-UnknownText_0x1a271c:
+Route13TrainerTipsText:
 	text "TRAINER TIPS"
 
 	para "Look! Right there,"
@@ -177,14 +177,14 @@ UnknownText_0x1a271c:
 	cont "of the post."
 	done
 
-UnknownText_0x1a275b:
+Route13SignText:
 	text "ROUTE 13"
 
 	para "NORTH TO SILENCE"
 	line "BRIDGE"
 	done
 
-UnknownText_0x1a277d:
+Route13DirectionsSignText:
 	text "NORTH TO LAVENDER"
 	line "TOWN"
 
@@ -204,9 +204,9 @@ Route13_MapEventHeader:
 
 .Signposts:
 	db 4
-	signpost 13, 29, SIGNPOST_READ, MapRoute13Signpost0Script
+	signpost 13, 29, SIGNPOST_READ, Route13TrainerTips
-	signpost 11, 41, SIGNPOST_READ, MapRoute13Signpost1Script
+	signpost 11, 41, SIGNPOST_READ, Route13Sign
-	signpost 13, 17, SIGNPOST_READ, MapRoute13Signpost2Script
+	signpost 13, 17, SIGNPOST_READ, Route13DirectionsSign
 	signpost 13, 30, SIGNPOST_ITEM, Route13HiddenCalcium
 
 .PersonEvents:

maps/Route15.asm

@@ -80,8 +80,8 @@ SchoolboyBillyScript:
 	closetext
 	end
 
-MapRoute15Signpost0Script:
+Route15Sign:
-	jumptext UnknownText_0x1aa8e3
+	jumptext Route15SignText
 
 Route15PPUp:
 	itemball PP_UP
@@ -194,7 +194,7 @@ UnknownText_0x1aa8b0:
 	cont "I'd be the best!"
 	done
 
-UnknownText_0x1aa8e3:
+Route15SignText:
 	text "ROUTE 15"
 
 	para "FUCHSIA CITY -"
@@ -215,7 +215,7 @@ Route15_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 9, 19, SIGNPOST_READ, MapRoute15Signpost0Script
+	signpost 9, 19, SIGNPOST_READ, Route15Sign
 
 .PersonEvents:
 	db 7

maps/Route16.asm

@@ -1,4 +1,3 @@
-
 Route16_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -22,10 +21,10 @@ UnknownScript_0x1ad328:
 	clearflag ENGINE_ALWAYS_ON_BIKE
 	return
 
-MapRoute16Signpost0Script:
+CyclingRoadSign:
-	jumptext UnknownText_0x1ad32f
+	jumptext CyclingRoadSignText
 
-UnknownText_0x1ad32f:
+CyclingRoadSignText:
 	text "CYCLING ROAD"
 
 	para "DOWNHILL COASTING"
@@ -49,7 +48,7 @@ Route16_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 5, 5, SIGNPOST_READ, MapRoute16Signpost0Script
+	signpost 5, 5, SIGNPOST_READ, CyclingRoadSign
 
 .PersonEvents:
 	db 0

maps/Route18.asm

@@ -31,8 +31,8 @@ Bird_keeperBobScript:
 	closetext
 	end
 
-MapRoute18Signpost0Script:
+Route18Sign:
-	jumptext UnknownText_0x1ad051
+	jumptext Route18SignText
 
 Bird_keeperBorisSeenText:
 	text "If you're looking"
@@ -70,7 +70,7 @@ UnknownText_0x1ad00d:
 	line "the shortcut."
 	done
 
-UnknownText_0x1ad051:
+Route18SignText:
 	text "ROUTE 18"
 
 	para "CELADON CITY -"
@@ -91,7 +91,7 @@ Route18_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 5, 9, SIGNPOST_READ, MapRoute18Signpost0Script
+	signpost 5, 9, SIGNPOST_READ, Route18Sign
 
 .PersonEvents:
 	db 2

maps/Route19.asm

@@ -93,23 +93,23 @@ FisherScript_0x19ea61:
 	faceplayer
 	opentext
 	checkevent EVENT_CINNABAR_ROCKS_CLEARED
-	iftrue UnknownScript_0x19ea6f
+	iftrue .RocksCleared
-	writetext UnknownText_0x19ed45
+	writetext Route19FisherText1
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x19ea6f:
+.RocksCleared
-	writetext UnknownText_0x19ed7d
+	writetext Route19FisherText2
 	waitbutton
 	closetext
 	end
 
-MapRoute19Signpost0Script:
+Route19Sign:
-	jumptext UnknownText_0x19edbc
+	jumptext Route19SignText
 
-MapRoute19Signpost1Script:
+CarefulSwimmingSign:
-	jumptext UnknownText_0x19ede5
+	jumptext CarefulSwimmingSignText
 
 SwimmermHaroldSeenText:
 	text "Have you ever gone"
@@ -207,13 +207,13 @@ UnknownText_0x19ed24:
 	line "Time for a swim!"
 	done
 
-UnknownText_0x19ed45:
+Route19FisherText1:
 	text "Who knows how long"
 	line "it would take to"
 	cont "move this boulder…"
 	done
 
-UnknownText_0x19ed7d:
+Route19FisherText2:
 	text "The roadwork is"
 	line "finally finished."
 
@@ -221,14 +221,14 @@ UnknownText_0x19ed7d:
 	line "fishing again."
 	done
 
-UnknownText_0x19edbc:
+Route19SignText:
 	text "ROUTE 19"
 
 	para "FUCHSIA CITY -"
 	line "SEAFOAM ISLANDS"
 	done
 
-UnknownText_0x19ede5:
+CarefulSwimmingSignText:
 	text "Please be careful"
 	line "if you are swim-"
 	cont "ming to SEAFOAM"
@@ -250,8 +250,8 @@ Route19_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 13, 11, SIGNPOST_READ, MapRoute19Signpost0Script
+	signpost 13, 11, SIGNPOST_READ, Route19Sign
-	signpost 1, 11, SIGNPOST_READ, MapRoute19Signpost1Script
+	signpost 1, 11, SIGNPOST_READ, CarefulSwimmingSign
 
 .PersonEvents:
 	db 6

maps/Route2.asm

@@ -48,8 +48,8 @@ Bug_catcherDougScript:
 	closetext
 	end
 
-MapRoute2Signpost0Script:
+Route2Sign:
-	jumptext UnknownText_0x1ac47a
+	jumptext Route2SignText
 
 MapRoute2Signpost1Script:
 	jumptext UnknownText_0x1ac49f
@@ -135,7 +135,7 @@ UnknownText_0x1ac423:
 	line "feel!"
 	done
 
-UnknownText_0x1ac47a:
+Route2SignText:
 	text "ROUTE 2"
 
 	para "VIRIDIAN CITY -"
@@ -163,7 +163,7 @@ Route2_MapEventHeader:
 
 .Signposts:
 	db 6
-	signpost 51, 7, SIGNPOST_READ, MapRoute2Signpost0Script
+	signpost 51, 7, SIGNPOST_READ, Route2Sign
 	signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script
 	signpost 23, 7, SIGNPOST_ITEM, Route2HiddenMaxEther
 	signpost 14, 4, SIGNPOST_ITEM, Route2HiddenFullHeal

maps/Route20.asm

@@ -51,8 +51,8 @@ SwimmermCameronScript:
 	closetext
 	end
 
-MapRoute20Signpost0Script:
+CinnabarGymSign:
-	jumptext UnknownText_0x1acec2
+	jumptext CinnabarGymSignText
 
 SwimmerfNicoleSeenText:
 	text "I feel so much"
@@ -107,7 +107,7 @@ UnknownText_0x1ace8b:
 	cont "ponds and rivers."
 	done
 
-UnknownText_0x1acec2:
+CinnabarGymSignText:
 	text "What does this"
 	line "sign say?"
 
@@ -128,7 +128,7 @@ Route20_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 11, 37, SIGNPOST_READ, MapRoute20Signpost0Script
+	signpost 11, 37, SIGNPOST_READ, CinnabarGymSign
 
 .PersonEvents:
 	db 3

maps/Route22.asm

@@ -1,4 +1,3 @@
-
 Route22_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -6,10 +5,10 @@ Route22_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-MapRoute22Signpost0Script:
+VictoryRoadEntranceSign:
-	jumptext UnknownText_0x7c005
+	jumptext VictoryRoadEntranceSignText
 
-UnknownText_0x7c005:
+VictoryRoadEntranceSignText:
 	text "#MON LEAGUE"
 
 	para "VICTORY ROAD"
@@ -29,7 +28,7 @@ Route22_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 7, 15, SIGNPOST_READ, MapRoute22Signpost0Script
+	signpost 7, 15, SIGNPOST_READ, VictoryRoadEntranceSign
 
 .PersonEvents:
 	db 0

maps/Route23.asm

@@ -1,4 +1,3 @@
-
 Route23_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/Route25.asm

@@ -186,8 +186,8 @@ UnknownScript_0x19efde:
 	closetext
 	end
 
-MapRoute25Signpost0Script:
+BillsHouseSign:
-	jumptext UnknownText_0x19f567
+	jumptext BillsHouseSignText
 
 Route25Protein:
 	itemball PROTEIN
@@ -423,12 +423,12 @@ UnknownText_0x19f520:
 	cont "standing!"
 	done
 
-UnknownText_0x19f567:
+BillsHouseSignText:
 	text "SEA COTTAGE"
 	line "BILL'S HOUSE"
 	done
 
-UnknownText_0x19f581:
+; unused
 	text "BILL'S HOUSE"
 	done
 
@@ -447,7 +447,7 @@ Route25_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 5, 45, SIGNPOST_READ, MapRoute25Signpost0Script
+	signpost 5, 45, SIGNPOST_READ, BillsHouseSign
 	signpost 5, 4, SIGNPOST_ITEM, Route25HiddenPotion
 
 .PersonEvents:

maps/Route26.asm

@@ -245,8 +245,8 @@ FisherScottScript:
 	closetext
 	end
 
-MapRoute26Signpost0Script:
+Route26Sign:
-	jumptext UnknownText_0x1a5364
+	jumptext Route26SignText
 
 FruitTreeScript_0x1a4ec2:
 	fruittree FRUITTREE_ROUTE_26
@@ -405,7 +405,7 @@ UnknownText_0x1a5326:
 	line "give up."
 	done
 
-UnknownText_0x1a5364:
+Route26SignText:
 	text "ROUTE 26"
 
 	para "#MON LEAGUE"
@@ -427,7 +427,7 @@ Route26_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 6, 8, SIGNPOST_READ, MapRoute26Signpost0Script
+	signpost 6, 8, SIGNPOST_READ, Route26Sign
 
 .PersonEvents:
 	db 8

maps/Route27.asm

@@ -300,8 +300,8 @@ CooltrainerfMeganScript:
 	closetext
 	end
 
-MapRoute27Signpost0Script:
+TohjoFallsSign:
-	jumptext UnknownText_0x1a0e7f
+	jumptext TohjoFallsSignText
 
 Route27TMSolarbeam:
 	itemball TM_SOLARBEAM
@@ -462,7 +462,7 @@ UnknownText_0x1a0e42:
 	line "mand #MON."
 	done
 
-UnknownText_0x1a0e7f:
+TohjoFallsSignText:
 	text "TOHJO FALLS"
 
 	para "THE LINK BETWEEN"
@@ -486,7 +486,7 @@ Route27_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 7, 25, SIGNPOST_READ, MapRoute27Signpost0Script
+	signpost 7, 25, SIGNPOST_READ, TohjoFallsSign
 
 .PersonEvents:
 	db 9

maps/Route28.asm

@@ -1,4 +1,3 @@
-
 Route28_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -6,14 +5,14 @@ Route28_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-MapRoute28Signpost0Script:
+Route28Sign:
-	jumptext UnknownText_0x1a5413
+	jumptext Route28SignText
 
 Route28HiddenRareCandy:
 	dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY
 	
 
-UnknownText_0x1a5413:
+Route28SignText:
 	text "ROUTE 28"
 	done
 
@@ -31,7 +30,7 @@ Route28_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 5, 31, SIGNPOST_READ, MapRoute28Signpost0Script
+	signpost 5, 31, SIGNPOST_READ, Route28Sign
 	signpost 2, 25, SIGNPOST_ITEM, Route28HiddenRareCandy
 
 .PersonEvents:

maps/Route29.asm

@@ -5,7 +5,7 @@ const_value set 2
 	const ROUTE29_FRUIT_TREE
 	const ROUTE29_FISHER
 	const ROUTE29_COOLTRAINER_M2
-	const ROUTE29_TEACHER2
+	const ROUTE29_TUSCANY
 	const ROUTE29_POKE_BALL
 
 Route29_MapScriptHeader:
@@ -34,13 +34,13 @@ Route29_MapScriptHeader:
 	iftrue .DoesTuscanyAppear
 
 .TuscanyDisappears
-	disappear ROUTE29_TEACHER2
+	disappear ROUTE29_TUSCANY
 	return
 
 .DoesTuscanyAppear
 	checkcode VAR_WEEKDAY
 	if_not_equal TUESDAY, .TuscanyDisappears
-	appear ROUTE29_TEACHER2
+	appear ROUTE29_TUSCANY
 	return
 
 Route29Tutorial1:
@@ -207,11 +207,11 @@ TuscanyNotTuesdayScript:
 	closetext
 	end
 
-MapRoute29Signpost0Script:
+Route29Sign1:
-	jumptext Route29SignText1
+	jumptext Route29Sign1Text
 
-MapRoute29Signpost1Script:
+Route29Sign2:
-	jumptext Route29SignText2
+	jumptext Route29Sign2Text
 
 Route29FruitTree:
 	fruittree FRUITTREE_ROUTE_29
@@ -406,14 +406,14 @@ TuscanyNotTuesdayText:
 	cont "is unfortunate…"
 	done
 
-Route29SignText1:
+Route29Sign1Text:
 	text "ROUTE 29"
 
 	para "CHERRYGROVE CITY -"
 	line "NEW BARK TOWN"
 	done
 
-Route29SignText2:
+Route29Sign2Text:
 	text "ROUTE 29"
 
 	para "CHERRYGROVE CITY -"
@@ -435,8 +435,8 @@ Route29_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 7, 51, SIGNPOST_READ, MapRoute29Signpost0Script
+	signpost 7, 51, SIGNPOST_READ, Route29Sign1
-	signpost 5, 3, SIGNPOST_READ, MapRoute29Signpost1Script
+	signpost 5, 3, SIGNPOST_READ, Route29Sign2
 
 .PersonEvents:
 	db 8

maps/Route30.asm

@@ -226,17 +226,17 @@ Route30YoungsterScript:
 Route30CooltrainerFScript:
 	jumptextfaceplayer Route30CooltrainerFText
 
-MapRoute30Signpost0Script:
+Route30Sign:
-	jumptext Route30MapSignText
+	jumptext Route30SignText
 
-MapRoute30Signpost1Script:
+MrPokemonsHouseDirectionsSign:
-	jumptext Route30DirectionsToMrPokemonsHouseSignText
+	jumptext MrPokemonsHouseDirectionsSignText
 
-MapRoute30Signpost2Script:
+MrPokemonsHouseSign:
-	jumptext Route30MrPokemonsHouseSignText
+	jumptext MrPokemonsHouseSignText
 
-MapRoute30Signpost3Script:
+Route30TrainerTips:
-	jumptext Route30TrainerTipsSignText
+	jumptext Route30TrainerTipsText
 
 Route30Antidote:
 	itemball ANTIDOTE
@@ -365,23 +365,23 @@ Route30CooltrainerFText:
 	cont "prepare to battle."
 	done
 
-Route30MapSignText:
+Route30SignText:
 	text "ROUTE 30"
 
 	para "VIOLET CITY -"
 	line "CHERRYGROVE CITY"
 	done
 
-Route30DirectionsToMrPokemonsHouseSignText:
+MrPokemonsHouseDirectionsSignText:
 	text "MR.#MON'S HOUSE"
 	line "STRAIGHT AHEAD!"
 	done
 
-Route30MrPokemonsHouseSignText:
+MrPokemonsHouseSignText:
 	text "MR.#MON'S HOUSE"
 	done
 
-Route30TrainerTipsSignText:
+Route30TrainerTipsText:
 	text "TRAINER TIPS"
 
 	para "No stealing other"
@@ -421,10 +421,10 @@ Route30_MapEventHeader:
 
 .Signposts:
 	db 5
-	signpost 43, 9, SIGNPOST_READ, MapRoute30Signpost0Script
+	signpost 43, 9, SIGNPOST_READ, Route30Sign
-	signpost 29, 13, SIGNPOST_READ, MapRoute30Signpost1Script
+	signpost 29, 13, SIGNPOST_READ, MrPokemonsHouseDirectionsSign
-	signpost 5, 15, SIGNPOST_READ, MapRoute30Signpost2Script
+	signpost 5, 15, SIGNPOST_READ, MrPokemonsHouseSign
-	signpost 21, 3, SIGNPOST_READ, MapRoute30Signpost3Script
+	signpost 21, 3, SIGNPOST_READ, Route30TrainerTips
 	signpost 9, 14, SIGNPOST_ITEM, Route30HiddenPotion
 
 .PersonEvents:

maps/Route31.asm

@@ -251,11 +251,11 @@ ReceivedSpearowMailText:
 Route31YoungsterScript:
 	jumptextfaceplayer Route31YoungsterText
 
-MapRoute31Signpost0Script:
+Route31Sign:
-	jumptext Route31Signpost0Text
+	jumptext Route31SignText
 
-MapRoute31Signpost1Script:
+DarkCaveSign:
-	jumptext Route31Signpost1Text
+	jumptext DarkCaveSignText
 
 Route31CooltrainerMScript:
 	jumptextfaceplayer Route31CooltrainerMText
@@ -408,14 +408,14 @@ Route31YoungsterText:
 	line "VIOLET CITY's GYM."
 	done
 
-Route31Signpost0Text:
+Route31SignText:
 	text "ROUTE 31"
 
 	para "VIOLET CITY -"
 	line "CHERRYGROVE CITY"
 	done
 
-Route31Signpost1Text:
+DarkCaveSignText:
 	text "DARK CAVE"
 	done
 
@@ -434,8 +434,8 @@ Route31_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 5, 7, SIGNPOST_READ, MapRoute31Signpost0Script
+	signpost 5, 7, SIGNPOST_READ, Route31Sign
-	signpost 5, 31, SIGNPOST_READ, MapRoute31Signpost1Script
+	signpost 5, 31, SIGNPOST_READ, DarkCaveSign
 
 .PersonEvents:
 	db 7

maps/Route32.asm

@@ -11,7 +11,7 @@ const_value set 2
 	const ROUTE32_FISHER4
 	const ROUTE32_POKE_BALL1
 	const ROUTE32_FISHER5
-	const ROUTE32_LASS2
+	const ROUTE32_FRIEDA
 	const ROUTE32_POKE_BALL2
 
 Route32_MapScriptHeader:
@@ -42,11 +42,11 @@ Route32_MapScriptHeader:
 .Frieda:
 	checkcode VAR_WEEKDAY
 	if_equal FRIDAY, .FriedaAppears
-	disappear ROUTE32_LASS2
+	disappear ROUTE32_FRIEDA
 	return
 
 .FriedaAppears
-	appear ROUTE32_LASS2
+	appear ROUTE32_FRIEDA
 	return
 
 Route32CooltrainerMScript:

maps/Route33.asm

@@ -138,8 +138,8 @@ TrainerHikerAnthony:
 	jumpstd rematchm
 	end
 
-MapRoute33Signpost0Script:
+Route33Sign:
-	jumptext Route33RouteSignText
+	jumptext Route33SignText
 
 Route33FruitTreeScript:
 	fruittree FRUITTREE_ROUTE_33
@@ -190,7 +190,7 @@ Route33LassText:
 	line "outside."
 	done
 
-Route33RouteSignText:
+Route33SignText:
 	text "ROUTE 33"
 	done
 
@@ -207,7 +207,7 @@ Route33_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 11, 11, SIGNPOST_READ, MapRoute33Signpost0Script
+	signpost 11, 11, SIGNPOST_READ, Route33Sign
 
 .PersonEvents:
 	db 3

maps/Route34.asm

@@ -475,17 +475,17 @@ TrainerCooltrainerfKate:
 	closetext
 	end
 
-MapRoute34UnusedSignpostScript:
+; unused
 	jumptext MapRoute34UnusedSignpostText
 
-MapRoute34Signpost0Script:
+Route34Sign:
-	jumptext MapRoute34Signpost0Text
+	jumptext Route34SignText
 
-MapRoute34Signpost1Script:
+Route34TrainerTips:
-	jumptext MapRoute34Signpost1Text
+	jumptext Route34TrainerTipsText
 
-MapRoute34Signpost2Script:
+DayCareSign:
-	jumptext MapRoute34Signpost2Text
+	jumptext DayCareSignText
 
 Route34Nugget:
 	itemball NUGGET
@@ -736,7 +736,7 @@ MapRoute34UnusedSignpostText:
 	line "THROUGH THE GATE"
 	done
 
-MapRoute34Signpost0Text:
+Route34SignText:
 	text "ROUTE 34"
 
 	para "GOLDENROD CITY -"
@@ -746,7 +746,7 @@ MapRoute34Signpost0Text:
 	line "SOMEWHERE BETWEEN"
 	done
 
-MapRoute34Signpost1Text:
+Route34TrainerTipsText:
 	text "TRAINER TIPS"
 
 	para "BERRY trees grow"
@@ -758,7 +758,7 @@ MapRoute34Signpost1Text:
 	cont "which BERRIES."
 	done
 
-MapRoute34Signpost2Text:
+DayCareSignText:
 	text "DAY-CARE"
 
 	para "LET US RAISE YOUR"
@@ -782,9 +782,9 @@ Route34_MapEventHeader:
 
 .Signposts:
 	db 5
-	signpost 6, 12, SIGNPOST_READ, MapRoute34Signpost0Script
+	signpost 6, 12, SIGNPOST_READ, Route34Sign
-	signpost 33, 13, SIGNPOST_READ, MapRoute34Signpost1Script
+	signpost 33, 13, SIGNPOST_READ, Route34TrainerTips
-	signpost 13, 10, SIGNPOST_READ, MapRoute34Signpost2Script
+	signpost 13, 10, SIGNPOST_READ, DayCareSign
 	signpost 32, 8, SIGNPOST_ITEM, Route34HiddenRareCandy
 	signpost 19, 17, SIGNPOST_ITEM, Route34HiddenSuperPotion
 

maps/Route35.asm

@@ -267,8 +267,8 @@ UnknownScript_0x19ca73:
 	closetext
 	end
 
-MapRoute35Signpost1Script:
+Route35Sign:
-	jumptext UnknownText_0x19cf94
+	jumptext Route35SignText
 
 Route35TMRollout:
 	itemball TM_ROLLOUT
@@ -458,7 +458,7 @@ UnknownText_0x19cf56:
 	line "where safely."
 	done
 
-UnknownText_0x19cf94:
+Route35SignText:
 	text "ROUTE 35"
 	done
 
@@ -477,8 +477,8 @@ Route35_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 7, 1, SIGNPOST_READ, MapRoute35Signpost1Script
+	signpost 7, 1, SIGNPOST_READ, Route35Sign
-	signpost 31, 11, SIGNPOST_READ, MapRoute35Signpost1Script
+	signpost 31, 11, SIGNPOST_READ, Route35Sign
 
 .PersonEvents:
 	db 11

maps/Route36.asm

@@ -5,8 +5,8 @@ const_value set 2
 	const ROUTE36_LASS1
 	const ROUTE36_FISHER
 	const ROUTE36_FRUIT_TREE
-	const ROUTE36_YOUNGSTER3
+	const ROUTE36_ARTHUR
-	const ROUTE36_LASS2
+	const ROUTE36_FLORIA
 	const ROUTE36_SUICUNE
 
 Route36_MapScriptHeader:
@@ -33,14 +33,14 @@ UnknownScript_0x19400e:
 ArthurCallback:
 	checkcode VAR_WEEKDAY
 	if_equal THURSDAY, .ArthurAppears
-	disappear ROUTE36_YOUNGSTER3
+	disappear ROUTE36_ARTHUR
 	return
 
 .ArthurAppears
-	appear ROUTE36_YOUNGSTER3
+	appear ROUTE36_ARTHUR
 	return
 
-UnknownScript_0x19401b:
+Route36SuicuneScript:
 	showemote EMOTE_SHOCK, PLAYER, 15
 	pause 15
 	playsound SFX_WARP_FROM
@@ -54,32 +54,33 @@ UnknownScript_0x19401b:
 	domaptrigger CIANWOOD_CITY, $1
 	end
 
-WeirdTreeScript_0x19403c:
+SudowoodoScript:
 	checkitem SQUIRTBOTTLE
-	iftrue UnknownScript_0x19404a
+	iftrue .Fight
+
 	waitsfx
 	playsound SFX_SANDSTORM
-	applymovement ROUTE36_WEIRD_TREE, MovementData_0x194249
+	applymovement ROUTE36_WEIRD_TREE, SudowoodoShakeMovement
 	end
 
-UnknownScript_0x19404a:
+.Fight
 	opentext
-	writetext UnknownText_0x19426b
+	writetext UseSquirtbottleText
 	yesorno
-	iffalse UnknownScript_0x194079
+	iffalse DidntUseSquirtbottleScript
 	closetext
 	; fallthrough
 
-WateredWeirdTreeScript::
+WateredWeirdTreeScript:: ; export (for when you use Squirtbottle from pack)
 	opentext
-	writetext UnknownText_0x194290
+	writetext UsedSquirtbottleText
 	waitbutton
 	closetext
 	waitsfx
 	playsound SFX_SANDSTORM
-	applymovement ROUTE36_WEIRD_TREE, MovementData_0x194249
+	applymovement ROUTE36_WEIRD_TREE, SudowoodoShakeMovement
 	opentext
-	writetext UnknownText_0x1942aa
+	writetext SudowoodoAttackedText
 	waitbutton
 	closetext
 	loadwildmon SUDOWOODO, 20
@@ -91,7 +92,7 @@ WateredWeirdTreeScript::
 	reloadmapafterbattle
 	end
 
-UnknownScript_0x194079:
+DidntUseSquirtbottleScript:
 	closetext
 	end
 
@@ -104,29 +105,29 @@ UnknownScript_0x19407b:
 	special RefreshSprites
 	end
 
-LassScript_0x19408c:
+Route36FloriaScript:
 	faceplayer
 	opentext
 	checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
-	iftrue UnknownScript_0x1940b3
+	iftrue .SecondTimeTalking
 	setevent EVENT_MET_FLORIA
-	writetext UnknownText_0x1942f1
+	writetext FloriaText1
 	waitbutton
 	closetext
 	clearevent EVENT_FLORIA_AT_FLOWER_SHOP
 	checkcode VAR_FACING
-	if_equal UP, UnknownScript_0x1940ac
+	if_equal UP, .Up
-	applymovement ROUTE36_LASS2, MovementData_0x19424e
+	applymovement ROUTE36_FLORIA, FloriaMovement1
-	disappear ROUTE36_LASS2
+	disappear ROUTE36_FLORIA
 	end
 
-UnknownScript_0x1940ac:
+.Up
-	applymovement ROUTE36_LASS2, MovementData_0x194258
+	applymovement ROUTE36_FLORIA, FloriaMovement2
-	disappear ROUTE36_LASS2
+	disappear ROUTE36_FLORIA
 	end
 
-UnknownScript_0x1940b3:
+.SecondTimeTalking
-	writetext UnknownText_0x1943ed
+	writetext FloriaText2
 	waitbutton
 	closetext
 	end
@@ -357,23 +358,23 @@ ArthurNotThursdayScript:
 	closetext
 	end
 
-MapRoute36Signpost2Script:
+Route36Sign:
-	jumptext UnknownText_0x194924
+	jumptext Route36SignText
 
-MapRoute36Signpost1Script:
+RuinsOfAlphNorthSign:
-	jumptext UnknownText_0x19492e
+	jumptext RuinsOfAlphNorthSignText
 
-MapRoute36Signpost3Script:
+Route36TrainerTips1:
-	jumptext UnknownText_0x19494c
+	jumptext Route36TrainerTips1Text
 
-MapRoute36Signpost0Script:
+Route36TrainerTips2:
-	jumptext UnknownText_0x1949ee
+	jumptext Route36TrainerTips2Text
 
 FruitTreeScript_0x194247:
 	fruittree FRUITTREE_ROUTE_36
 
-MovementData_0x194249:
+SudowoodoShakeMovement:
-	db $56 ; movement
+	db $56 ; shake
 	step_end
 
 MovementData_0x19424b:
@@ -381,7 +382,7 @@ MovementData_0x19424b:
 	fast_jump_step_up
 	step_end
 
-MovementData_0x19424e:
+FloriaMovement1:
 	step_down
 	step_down
 	step_down
@@ -393,7 +394,7 @@ MovementData_0x19424e:
 	step_left
 	step_end
 
-MovementData_0x194258:
+FloriaMovement2:
 	step_left
 	step_down
 	step_down
@@ -416,17 +417,17 @@ MovementData_0x194262:
 	db $38 ; movement
 	step_end
 
-UnknownText_0x19426b:
+UseSquirtbottleText:
 	text "It's a weird tree."
 	line "Use SQUIRTBOTTLE?"
 	done
 
-UnknownText_0x194290:
+UsedSquirtbottleText:
 	text "<PLAYER> used the"
 	line "SQUIRTBOTTLE."
 	done
 
-UnknownText_0x1942aa:
+SudowoodoAttackedText:
 	text "The weird tree"
 	line "doesn't like the"
 	cont "SQUIRTBOTTLE!"
@@ -435,7 +436,7 @@ UnknownText_0x1942aa:
 	line "attacked!"
 	done
 
-UnknownText_0x1942f1:
+FloriaText1:
 	text "I'm the FLOWER"
 	line "SHOP's FLORIA!"
 
@@ -461,7 +462,7 @@ UnknownText_0x1942f1:
 	cont "her water bottle!"
 	done
 
-UnknownText_0x1943ed:
+FloriaText2:
 	text "When I told my sis"
 	line "about the jiggly"
 
@@ -625,16 +626,16 @@ ArthurNotThursdayText:
 	cont "disappointing."
 	done
 
-UnknownText_0x194924:
+Route36SignText:
 	text "ROUTE 36"
 	done
 
-UnknownText_0x19492e:
+RuinsOfAlphNorthSignText:
 	text "RUINS OF ALPH"
 	line "NORTH ENTRANCE"
 	done
 
-UnknownText_0x19494c:
+Route36TrainerTips1Text:
 	text "TRAINER TIPS"
 
 	para "#MON stats"
@@ -651,7 +652,7 @@ UnknownText_0x19494c:
 	line "#MON grow."
 	done
 
-UnknownText_0x1949ee:
+Route36TrainerTips2Text:
 	text "TRAINER TIPS"
 
 	para "Use DIG to return"
@@ -678,24 +679,24 @@ Route36_MapEventHeader:
 
 .XYTriggers:
 	db 2
-	xy_trigger 1, $7, $14, $0, UnknownScript_0x19401b, $0, $0
+	xy_trigger 1, $7, $14, $0, Route36SuicuneScript, $0, $0
-	xy_trigger 1, $7, $16, $0, UnknownScript_0x19401b, $0, $0
+	xy_trigger 1, $7, $16, $0, Route36SuicuneScript, $0, $0
 
 .Signposts:
 	db 4
-	signpost 1, 29, SIGNPOST_READ, MapRoute36Signpost0Script
+	signpost 1, 29, SIGNPOST_READ, Route36TrainerTips2
-	signpost 11, 45, SIGNPOST_READ, MapRoute36Signpost1Script
+	signpost 11, 45, SIGNPOST_READ, RuinsOfAlphNorthSign
-	signpost 7, 55, SIGNPOST_READ, MapRoute36Signpost2Script
+	signpost 7, 55, SIGNPOST_READ, Route36Sign
-	signpost 7, 21, SIGNPOST_READ, MapRoute36Signpost3Script
+	signpost 7, 21, SIGNPOST_READ, Route36TrainerTips1
 
 .PersonEvents:
 	db 9
 	person_event SPRITE_YOUNGSTER, 13, 20, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicMark, -1
 	person_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
-	person_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WeirdTreeScript_0x19403c, EVENT_ROUTE_36_SUDOWOODO
+	person_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
 	person_event SPRITE_LASS, 8, 51, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1940e0, -1
 	person_event SPRITE_FISHER, 9, 44, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x1940b9, -1
 	person_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x194247, -1
 	person_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
-	person_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO
+	person_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO
 	person_event SPRITE_SUICUNE, 6, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36

maps/Route37.asm

@@ -3,7 +3,7 @@ const_value set 2
 	const ROUTE37_WEIRD_TREE2
 	const ROUTE37_YOUNGSTER
 	const ROUTE37_FRUIT_TREE1
-	const ROUTE37_BUG_CATCHER
+	const ROUTE37_SUNNY
 	const ROUTE37_FRUIT_TREE2
 	const ROUTE37_FRUIT_TREE3
 
@@ -21,11 +21,11 @@ Route37_MapScriptHeader:
 SunnyCallback:
 	checkcode VAR_WEEKDAY
 	if_equal SUNDAY, .SunnyAppears
-	disappear ROUTE37_BUG_CATCHER
+	disappear ROUTE37_SUNNY
 	return
 
 .SunnyAppears
-	appear ROUTE37_BUG_CATCHER
+	appear ROUTE37_SUNNY
 	return
 
 TrainerTwinsAnnandanne1:
@@ -104,8 +104,8 @@ SunnyNotSundayScript:
 	closetext
 	end
 
-MapRoute37Signpost0Script:
+Route37Sign:
-	jumptext UnknownText_0x1a9197
+	jumptext Route37SignText
 
 FruitTreeScript_0x1a8e09:
 	fruittree FRUITTREE_ROUTE_37_1
@@ -237,7 +237,7 @@ SunnyNotSundayText:
 	cont "Um… I forgot!"
 	done
 
-UnknownText_0x1a9197:
+Route37SignText:
 	text "ROUTE 37"
 	done
 
@@ -253,7 +253,7 @@ Route37_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 3, 5, SIGNPOST_READ, MapRoute37Signpost0Script
+	signpost 3, 5, SIGNPOST_READ, Route37Sign
 	signpost 2, 4, SIGNPOST_ITEM, Route37HiddenEther
 
 .PersonEvents:

maps/Route38.asm

@@ -313,11 +313,11 @@ TrainerBeautyOlivia:
 	closetext
 	end
 
-MapRoute38Signpost0Script:
+Route38Sign:
-	jumptext UnknownText_0x1a22fd
+	jumptext Route38SignText
 
-MapRoute38Signpost1Script:
+Route38TrainerTips:
-	jumptext UnknownText_0x1a2324
+	jumptext Route38TrainerTipsText
 
 FruitTreeScript_0x1a1f33:
 	fruittree FRUITTREE_ROUTE_38
@@ -449,14 +449,14 @@ UnknownText_0x1a229a:
 	line "bottle at a time."
 	done
 
-UnknownText_0x1a22fd:
+Route38SignText:
 	text "ROUTE 38"
 
 	para "OLIVINE CITY -"
 	line "ECRUTEAK CITY"
 	done
 
-UnknownText_0x1a2324:
+Route38TrainerTipsText:
 	text "TRAINER TIPS"
 
 	para "If a #MON is"
@@ -486,8 +486,8 @@ Route38_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 7, 33, SIGNPOST_READ, MapRoute38Signpost0Script
+	signpost 7, 33, SIGNPOST_READ, Route38Sign
-	signpost 13, 5, SIGNPOST_READ, MapRoute38Signpost1Script
+	signpost 13, 5, SIGNPOST_READ, Route38TrainerTips
 
 .PersonEvents:
 	db 7

maps/Route39.asm

@@ -17,9 +17,9 @@ Route39_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-TaurosScript_0x1a5af5:
+Route39Miltank:
 	opentext
-	writetext UnknownText_0x1a5bf9
+	writetext Route39MiltankText
 	cry MILTANK
 	waitbutton
 	closetext
@@ -167,14 +167,14 @@ UnknownScript_0x1a5be5:
 	closetext
 	end
 
-MapRoute39Signpost2Script:
+Route39Sign:
-	jumptext UnknownText_0x1a5fe3
+	jumptext Route39SignText
 
-MapRoute39Signpost1Script:
+MoomooFarmSign:
-	jumptext UnknownText_0x1a600a
+	jumptext MoomooFarmSignText
 
-MapRoute39Signpost0Script:
+Route39TrainerTips:
-	jumptext UnknownText_0x1a6036
+	jumptext Route39TrainerTipsText
 
 FruitTreeScript_0x1a5bf4:
 	fruittree FRUITTREE_ROUTE_39
@@ -183,7 +183,7 @@ Route39HiddenNugget:
 	dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET
 	
 
-UnknownText_0x1a5bf9:
+Route39MiltankText:
 	text "MILTANK: Mooo!"
 	done
 
@@ -315,21 +315,21 @@ UnknownText_0x1a5f31:
 	line "anywhere else."
 	done
 
-UnknownText_0x1a5fe3:
+Route39SignText:
 	text "ROUTE 39"
 
 	para "OLIVINE CITY -"
 	line "ECRUTEAK CITY"
 	done
 
-UnknownText_0x1a600a:
+MoomooFarmSignText:
 	text "MOOMOO FARM"
 
 	para "Enjoy Our Fresh"
 	line "and Tasty Milk"
 	done
 
-UnknownText_0x1a6036:
+Route39TrainerTipsText:
 	text "TRAINER TIPS"
 
 	para "Use HEADBUTT on"
@@ -358,9 +358,9 @@ Route39_MapEventHeader:
 
 .Signposts:
 	db 4
-	signpost 31, 5, SIGNPOST_READ, MapRoute39Signpost0Script
+	signpost 31, 5, SIGNPOST_READ, Route39TrainerTips
-	signpost 5, 9, SIGNPOST_READ, MapRoute39Signpost1Script
+	signpost 5, 9, SIGNPOST_READ, MoomooFarmSign
-	signpost 7, 15, SIGNPOST_READ, MapRoute39Signpost2Script
+	signpost 7, 15, SIGNPOST_READ, Route39Sign
 	signpost 13, 5, SIGNPOST_ITEM, Route39HiddenNugget
 
 .PersonEvents:
@@ -368,10 +368,10 @@ Route39_MapEventHeader:
 	person_event SPRITE_SAILOR, 29, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSailorEugene, -1
 	person_event SPRITE_POKEFAN_M, 22, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1
 	person_event SPRITE_POKEFAN_F, 19, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanfRuth, -1
-	person_event SPRITE_TAUROS, 12, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TaurosScript_0x1a5af5, -1
+	person_event SPRITE_TAUROS, 12, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1
-	person_event SPRITE_TAUROS, 11, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TaurosScript_0x1a5af5, -1
+	person_event SPRITE_TAUROS, 11, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1
-	person_event SPRITE_TAUROS, 15, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TaurosScript_0x1a5af5, -1
+	person_event SPRITE_TAUROS, 15, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1
-	person_event SPRITE_TAUROS, 13, 8, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TaurosScript_0x1a5af5, -1
+	person_event SPRITE_TAUROS, 13, 8, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1
 	person_event SPRITE_STANDING_YOUNGSTER, 7, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicNorman, -1
 	person_event SPRITE_FRUIT_TREE, 3, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1
 	person_event SPRITE_POKEFAN_F, 22, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1

maps/Route4.asm

@@ -44,8 +44,8 @@ PicnickerSharonScript:
 	closetext
 	end
 
-MapRoute4Signpost0Script:
+MtMoonSquareSign:
-	jumptext UnknownText_0x1ae384
+	jumptext MtMoonSquareSignText
 
 Route4HPUp:
 	itemball HP_UP
@@ -114,7 +114,7 @@ UnknownText_0x1ae369:
 	line "some more…"
 	done
 
-UnknownText_0x1ae384:
+MtMoonSquareSignText:
 	text "MT.MOON SQUARE"
 
 	para "Just go up the"
@@ -134,7 +134,7 @@ Route4_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 7, 3, SIGNPOST_READ, MapRoute4Signpost0Script
+	signpost 7, 3, SIGNPOST_READ, MtMoonSquareSign
 	signpost 3, 10, SIGNPOST_ITEM, Route4HiddenUltraBall
 
 .PersonEvents:

maps/Route40.asm

@@ -7,7 +7,7 @@ const_value set 2
 	const ROUTE40_ROCK2
 	const ROUTE40_ROCK3
 	const ROUTE40_LASS1
-	const ROUTE40_BUENA
+	const ROUTE40_MONICA
 	const ROUTE40_POKEFAN_M
 	const ROUTE40_LASS2
 	const ROUTE40_STANDING_YOUNGSTER
@@ -27,11 +27,11 @@ MonicaCallback:
 	clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
 	checkcode VAR_WEEKDAY
 	if_equal MONDAY, .MonicaAppears
-	disappear ROUTE40_BUENA
+	disappear ROUTE40_MONICA
 	return
 
 .MonicaAppears
-	appear ROUTE40_BUENA
+	appear ROUTE40_MONICA
 	return
 
 TrainerSwimmerfElaine:
@@ -131,8 +131,8 @@ MonicaNotMondayScript:
 	closetext
 	end
 
-MapRoute40Signpost0Script:
+Route40Sign:
-	jumptext UnknownText_0x1a6767
+	jumptext Route40SignText
 
 Route40Rock:
 	jumpstd smashrock
@@ -333,7 +333,7 @@ MonicaNotMondayText:
 	cont "Monday. How sad…"
 	done
 
-UnknownText_0x1a6767:
+Route40SignText:
 	text "ROUTE 40"
 
 	para "CIANWOOD CITY -"
@@ -353,7 +353,7 @@ Route40_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 10, 14, SIGNPOST_READ, MapRoute40Signpost0Script
+	signpost 10, 14, SIGNPOST_READ, Route40Sign
 	signpost 8, 7, SIGNPOST_ITEM, Route40HiddenHyperPotion
 
 .PersonEvents:

maps/Route42.asm

@@ -26,7 +26,7 @@ UnknownScript_0x1a9216:
 UnknownScript_0x1a9217:
 	end
 
-UnknownScript_0x1a9218:
+Route42SuicuneScript:
 	showemote EMOTE_SHOCK, PLAYER, 15
 	pause 15
 	playsound SFX_WARP_FROM
@@ -186,17 +186,17 @@ HikerBenjaminScript:
 	closetext
 	end
 
-MapRoute42Signpost0Script:
+Route42Sign1:
-	jumptext UnknownText_0x1a9537
+	jumptext Route42Sign1Text
 
-MapRoute42Signpost1Script:
+MtMortarSign1:
-	jumptext UnknownText_0x1a955f
+	jumptext MtMortarSign1Text
 
-MapRoute42Signpost2Script:
+MtMortarSign2:
-	jumptext UnknownText_0x1a9580
+	jumptext MtMortarSign2Text
 
-MapRoute42Signpost3Script:
+Route42Sign2:
-	jumptext UnknownText_0x1a95a1
+	jumptext Route42Sign2Text
 
 Route42UltraBall:
 	itemball ULTRA_BALL
@@ -293,28 +293,28 @@ UnknownText_0x1a94d6:
 	line "it. Please?"
 	done
 
-UnknownText_0x1a9537:
+Route42Sign1Text:
 	text "ROUTE 42"
 
 	para "ECRUTEAK CITY -"
 	line "MAHOGANY TOWN"
 	done
 
-UnknownText_0x1a955f:
+MtMortarSign1Text:
 	text "MT.MORTAR"
 
 	para "WATERFALL CAVE"
 	line "INSIDE"
 	done
 
-UnknownText_0x1a9580:
+MtMortarSign2Text:
 	text "MT.MORTAR"
 
 	para "WATERFALL CAVE"
 	line "INSIDE"
 	done
 
-UnknownText_0x1a95a1:
+Route42Sign2Text:
 	text "ROUTE 42"
 
 	para "ECRUTEAK CITY -"
@@ -335,14 +335,14 @@ Route42_MapEventHeader:
 
 .XYTriggers:
 	db 1
-	xy_trigger 1, $e, $18, $0, UnknownScript_0x1a9218, $0, $0
+	xy_trigger 1, $e, $18, $0, Route42SuicuneScript, $0, $0
 
 .Signposts:
 	db 5
-	signpost 10, 4, SIGNPOST_READ, MapRoute42Signpost0Script
+	signpost 10, 4, SIGNPOST_READ, Route42Sign1
-	signpost 5, 7, SIGNPOST_READ, MapRoute42Signpost1Script
+	signpost 5, 7, SIGNPOST_READ, MtMortarSign1
-	signpost 9, 45, SIGNPOST_READ, MapRoute42Signpost2Script
+	signpost 9, 45, SIGNPOST_READ, MtMortarSign2
-	signpost 8, 54, SIGNPOST_READ, MapRoute42Signpost3Script
+	signpost 8, 54, SIGNPOST_READ, Route42Sign2
 	signpost 11, 16, SIGNPOST_ITEM, Route42HiddenMaxPotion
 
 .PersonEvents:

maps/Route43.asm

@@ -312,14 +312,14 @@ UnknownScript_0x19d259:
 	jumpstd packfullf
 	end
 
-MapRoute43Signpost0Script:
+Route43Sign1:
-	jumptext UnknownText_0x19d67b
+	jumptext Route43Sign1Text
 
-MapRoute43Signpost1Script:
+Route43Sign2:
-	jumptext UnknownText_0x19d6a2
+	jumptext Route43Sign2Text
 
-MapRoute43Signpost2Script:
+Route43TrainerTips:
-	jumptext UnknownText_0x19d6c9
+	jumptext Route43TrainerTipsText
 
 FruitTreeScript_0x19d266:
 	fruittree FRUITTREE_ROUTE_43
@@ -467,21 +467,21 @@ UnknownText_0x19d64b:
 	cont "adorable thing?"
 	done
 
-UnknownText_0x19d67b:
+Route43Sign1Text:
 	text "ROUTE 43"
 
 	para "LAKE OF RAGE -"
 	line "MAHOGANY TOWN"
 	done
 
-UnknownText_0x19d6a2:
+Route43Sign2Text:
 	text "ROUTE 43"
 
 	para "LAKE OF RAGE -"
 	line "MAHOGANY TOWN"
 	done
 
-UnknownText_0x19d6c9:
+Route43TrainerTipsText:
 	text "TRAINER TIPS"
 
 	para "All #MON have"
@@ -520,9 +520,9 @@ Route43_MapEventHeader:
 
 .Signposts:
 	db 3
-	signpost 3, 13, SIGNPOST_READ, MapRoute43Signpost0Script
+	signpost 3, 13, SIGNPOST_READ, Route43Sign1
-	signpost 49, 11, SIGNPOST_READ, MapRoute43Signpost1Script
+	signpost 49, 11, SIGNPOST_READ, Route43Sign2
-	signpost 38, 16, SIGNPOST_READ, MapRoute43Signpost2Script
+	signpost 38, 16, SIGNPOST_READ, Route43TrainerTips
 
 .PersonEvents:
 	db 8

maps/Route44.asm

@@ -299,11 +299,11 @@ CooltrainermAllenScript:
 	closetext
 	end
 
-MapRoute44Signpost0Script:
+Route44Sign1:
-	jumptext UnknownText_0x19dfb3
+	jumptext Route44Sign1Text
 
-MapRoute44Signpost1Script:
+Route44Sign2:
-	jumptext UnknownText_0x19dfcc
+	jumptext Route44Sign2Text
 
 FruitTreeScript_0x19da40:
 	fruittree FRUITTREE_ROUTE_44
@@ -495,12 +495,12 @@ UnknownText_0x19df4d:
 	cont "today--an elite."
 	done
 
-UnknownText_0x19dfb3:
+Route44Sign1Text:
 	text "ROUTE 44"
 	line "ICE PATH AHEAD"
 	done
 
-UnknownText_0x19dfcc:
+Route44Sign2Text:
 	text "ROUTE 44"
 
 	para "MAHOGANY TOWN -"
@@ -520,8 +520,8 @@ Route44_MapEventHeader:
 
 .Signposts:
 	db 3
-	signpost 7, 53, SIGNPOST_READ, MapRoute44Signpost0Script
+	signpost 7, 53, SIGNPOST_READ, Route44Sign1
-	signpost 10, 6, SIGNPOST_READ, MapRoute44Signpost1Script
+	signpost 10, 6, SIGNPOST_READ, Route44Sign2
 	signpost 9, 32, SIGNPOST_ITEM, Route44HiddenElixer
 
 .PersonEvents:

maps/Route45.asm

@@ -293,8 +293,8 @@ UnknownScript_0x19e28b:
 	closetext
 	end
 
-MapRoute45Signpost0Script:
+Route45Sign:
-	jumptext UnknownText_0x19e8fe
+	jumptext Route45SignText
 
 FruitTreeScript_0x19e294:
 	fruittree FRUITTREE_ROUTE_45
@@ -527,7 +527,7 @@ UnknownText_0x19e8bb:
 	line "there, but…"
 	done
 
-UnknownText_0x19e8fe:
+Route45SignText:
 	text "ROUTE 45"
 	line "MOUNTAIN RD. AHEAD"
 	done
@@ -545,7 +545,7 @@ Route45_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 4, 10, SIGNPOST_READ, MapRoute45Signpost0Script
+	signpost 4, 10, SIGNPOST_READ, Route45Sign
 	signpost 80, 13, SIGNPOST_ITEM, Route45HiddenPpUp
 
 .PersonEvents:

maps/Route46.asm

@@ -158,8 +158,8 @@ HikerBaileyScript:
 	closetext
 	end
 
-MapRoute46Signpost0Script:
+Route46Sign:
-	jumptext UnknownText_0x1a99be
+	jumptext Route46SignText
 
 Route46XSpeed:
 	itemball X_SPEED
@@ -245,7 +245,7 @@ UnknownText_0x1a9927:
 	cont "the other time."
 	done
 
-UnknownText_0x1a99be:
+Route46SignText:
 	text "ROUTE 46"
 	line "MOUNTAIN RD. AHEAD"
 	done
@@ -265,7 +265,7 @@ Route46_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 27, 9, SIGNPOST_READ, MapRoute46Signpost0Script
+	signpost 27, 9, SIGNPOST_READ, Route46Sign
 
 .PersonEvents:
 	db 6

maps/Route5.asm

@@ -11,11 +11,11 @@ Route5_MapScriptHeader:
 PokefanMScript_0x1adb19:
 	jumptextfaceplayer UnknownText_0x1adb22
 
-MapRoute5Signpost0Script:
+Route5UndergroundPathSign:
-	jumptext UnknownText_0x1adb66
+	jumptext Route5UndergroundPathSignText
 
-MapRoute5Signpost1Script:
+HouseForSaleSign:
-	jumptext UnknownText_0x1adb97
+	jumptext HouseForSaleSignText
 
 UnknownText_0x1adb22:
 	text "The road is closed"
@@ -25,14 +25,14 @@ UnknownText_0x1adb22:
 	line "is solved."
 	done
 
-UnknownText_0x1adb66:
+Route5UndergroundPathSignText:
 	text "UNDERGROUND PATH"
 
 	para "CERULEAN CITY -"
 	line "VERMILION CITY"
 	done
 
-UnknownText_0x1adb97:
+HouseForSaleSignText:
 	text "What's this?"
 
 	para "House for Sale…"
@@ -55,8 +55,8 @@ Route5_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 17, 17, SIGNPOST_READ, MapRoute5Signpost0Script
+	signpost 17, 17, SIGNPOST_READ, Route5UndergroundPathSign
-	signpost 11, 10, SIGNPOST_READ, MapRoute5Signpost1Script
+	signpost 11, 10, SIGNPOST_READ, HouseForSaleSign
 
 .PersonEvents:
 	db 1

maps/Route6.asm

@@ -35,8 +35,8 @@ PokefanmAllanScript:
 PokefanMScript_0x1ad951:
 	jumptextfaceplayer UnknownText_0x1ad957
 
-MapRoute6Signpost0Script:
+Route6UndergroundPathSign:
-	jumptext UnknownText_0x1ad99b
+	jumptext Route6UndergroundPathSignText
 
 UnknownText_0x1ad957:
 	text "The road is closed"
@@ -46,7 +46,7 @@ UnknownText_0x1ad957:
 	line "is solved."
 	done
 
-UnknownText_0x1ad99b:
+Route6UndergroundPathSignText:
 	text "UNDERGROUND PATH"
 
 	para "CERULEAN CITY -"
@@ -105,7 +105,7 @@ Route6_MapEventHeader:
 
 .Signposts:
 	db 1
-	signpost 5, 19, SIGNPOST_READ, MapRoute6Signpost0Script
+	signpost 5, 19, SIGNPOST_READ, Route6UndergroundPathSign
 
 .PersonEvents:
 	db 3

maps/Route6UndergroundEntrance.asm

@@ -1,4 +1,3 @@
-
 Route6UndergroundEntrance_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/Route7.asm

@@ -1,4 +1,3 @@
-
 Route7_MapScriptHeader:
 .MapTriggers:
 	db 0
@@ -6,13 +5,13 @@ Route7_MapScriptHeader:
 .MapCallbacks:
 	db 0
 
-MapRoute7Signpost0Script:
+Route7UndergroundPathSign:
-	jumptext UnknownText_0x1ad388
+	jumptext Route7UndergroundPathSignText
 
-MapRoute7Signpost1Script:
+Route7LockedDoor:
-	jumptext UnknownText_0x1ad456
+	jumptext Route7LockedDoorText
 
-UnknownText_0x1ad388:
+Route7UndergroundPathSignText:
 	text "What's this flyer?"
 
 	para "… Uncouth trainers"
@@ -31,7 +30,7 @@ UnknownText_0x1ad388:
 	para "CELADON POLICE"
 	done
 
-UnknownText_0x1ad456:
+Route7LockedDoorText:
 	text "It's locked…"
 	done
 
@@ -49,8 +48,8 @@ Route7_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 11, 5, SIGNPOST_READ, MapRoute7Signpost0Script
+	signpost 11, 5, SIGNPOST_READ, Route7UndergroundPathSign
-	signpost 9, 6, SIGNPOST_READ, MapRoute7Signpost1Script
+	signpost 9, 6, SIGNPOST_READ, Route7LockedDoor
 
 .PersonEvents:
 	db 0

maps/Route8.asm

@@ -68,11 +68,11 @@ SupernerdTomScript:
 	closetext
 	end
 
-MapRoute8Signpost1Script:
+Route8LockedDoor:
-	jumptext UnknownText_0x6c2aa
+	jumptext Route8LockedDoorText
 
-MapRoute8Signpost0Script:
+Route8UndergroundPathSign:
-	jumptext UnknownText_0x6c2b7
+	jumptext Route8UndergroundPathSignText
 
 FruitTreeScript_0x6c06c:
 	fruittree FRUITTREE_ROUTE_8
@@ -161,11 +161,11 @@ UnknownText_0x6c27e:
 	cont "battles."
 	done
 
-UnknownText_0x6c2aa:
+Route8LockedDoorText:
 	text "It's locked…"
 	done
 
-UnknownText_0x6c2b7:
+Route8UndergroundPathSignText:
 	text "The flyer's torn."
 
 	para "It's impossible to"
@@ -186,8 +186,8 @@ Route8_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 7, 11, SIGNPOST_READ, MapRoute8Signpost0Script
+	signpost 7, 11, SIGNPOST_READ, Route8UndergroundPathSign
-	signpost 5, 10, SIGNPOST_READ, MapRoute8Signpost1Script
+	signpost 5, 10, SIGNPOST_READ, Route8LockedDoor
 
 .PersonEvents:
 	db 6

maps/Route9.asm

@@ -79,8 +79,8 @@ HikerSidneyScript:
 	closetext
 	end
 
-MapRoute9Signpost0Script:
+Route9Sign:
-	jumptext UnknownText_0x1ab2a2
+	jumptext Route9SignText
 
 Route9HiddenEther:
 	dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER
@@ -199,7 +199,7 @@ UnknownText_0x1ab278:
 	cont "river."
 	done
 
-UnknownText_0x1ab2a2:
+Route9SignText:
 	text "ROUTE 9"
 
 	para "CERULEAN CITY -"
@@ -219,7 +219,7 @@ Route9_MapEventHeader:
 
 .Signposts:
 	db 2
-	signpost 7, 15, SIGNPOST_READ, MapRoute9Signpost0Script
+	signpost 7, 15, SIGNPOST_READ, Route9Sign
 	signpost 15, 41, SIGNPOST_ITEM, Route9HiddenEther
 
 .PersonEvents:

maps/RuinsofAlphAerodactylChamber.asm

@@ -1,4 +1,3 @@
-
 RuinsofAlphAerodactylChamber_MapScriptHeader:
 .MapTriggers:
 	db 2

maps/RuinsofAlphAerodactylWordRoom.asm

@@ -1,4 +1,3 @@
-
 RuinsofAlphAerodactylWordRoom_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/RuinsofAlphHoOhChamber.asm

@@ -1,4 +1,3 @@
-
 RuinsofAlphHoOhChamber_MapScriptHeader:
 .MapTriggers:
 	db 2

maps/RuinsofAlphHoOhWordRoom.asm

@@ -1,4 +1,3 @@
-
 RuinsofAlphHoOhWordRoom_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/RuinsofAlphKabutoWordRoom.asm

@@ -1,4 +1,3 @@
-
 RuinsofAlphKabutoWordRoom_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/RuinsofAlphOmanyteChamber.asm

@@ -1,4 +1,3 @@
-
 RuinsofAlphOmanyteChamber_MapScriptHeader:
 .MapTriggers:
 	db 2

maps/RuinsofAlphOmanyteWordRoom.asm

@@ -1,4 +1,3 @@
-
 RuinsofAlphOmanyteWordRoom_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/SafariZoneBeta.asm

@@ -1,4 +1,3 @@
-
 SafariZoneBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/SafariZoneFuchsiaGateBeta.asm

@@ -1,4 +1,3 @@
-
 SafariZoneFuchsiaGateBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/SafariZoneMainOffice.asm

@@ -1,4 +1,3 @@
-
 SafariZoneMainOffice_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/SaffronPokeCenter2FBeta.asm

@@ -1,4 +1,3 @@
-
 SaffronPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/SilverCaveOutside.asm

@@ -1,4 +1,3 @@
-
 SilverCaveOutside_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/TinTower2F.asm

@@ -1,4 +1,3 @@
-
 TinTower2F_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/Underground.asm

@@ -1,4 +1,3 @@
-
 Underground_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/VermilionPokeCenter2FBeta.asm

@@ -1,4 +1,3 @@
-
 VermilionPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/VioletCity.asm

@@ -1,5 +1,5 @@
 const_value set 2
-	const VIOLETCITY_FISHER
+	const VIOLETCITY_EARL
 	const VIOLETCITY_LASS
 	const VIOLETCITY_SUPER_NERD
 	const VIOLETCITY_GRAMPS
@@ -23,7 +23,7 @@ VioletCity_MapScriptHeader:
 	return
 
 VioletCityEarlScript:
-	applymovement VIOLETCITY_FISHER, VioletCitySpinningEarl_MovementData
+	applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData
 	faceplayer
 	opentext
 	writetext Text_EarlAsksIfYouBeatFalkner
@@ -42,20 +42,20 @@ VioletCityEarlScript:
 	waitbutton
 	closetext
 	playmusic MUSIC_SHOW_ME_AROUND
-	follow VIOLETCITY_FISHER, PLAYER
+	follow VIOLETCITY_EARL, PLAYER
-	applymovement VIOLETCITY_FISHER, VioletCityFollowEarl_MovementData
+	applymovement VIOLETCITY_EARL, VioletCityFollowEarl_MovementData
 	spriteface PLAYER, UP
-	applymovement VIOLETCITY_FISHER, VioletCitySpinningEarl_MovementData
+	applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData
 	stopfollow
 	special RestartMapMusic
 	opentext
 	writetext Text_HereTeacherIAm
 	waitbutton
 	closetext
-	applymovement VIOLETCITY_FISHER, VioletCitySpinningEarl_MovementData
+	applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData
-	applymovement VIOLETCITY_FISHER, VioletCityFinishFollowEarl_MovementData
+	applymovement VIOLETCITY_EARL, VioletCityFinishFollowEarl_MovementData
 	playsound SFX_ENTER_DOOR
-	disappear VIOLETCITY_FISHER
+	disappear VIOLETCITY_EARL
 	clearevent EVENT_EARLS_ACADEMY_EARL
 	waitsfx
 	end

maps/ViridianPokeCenter2FBeta.asm

@@ -1,4 +1,3 @@
-
 ViridianPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/WhirlIslandCave.asm

@@ -1,4 +1,3 @@
-
 WhirlIslandCave_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/WhirlIslandNW.asm

@@ -1,4 +1,3 @@
-
 WhirlIslandNW_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/WhirlIslandSE.asm

@@ -1,4 +1,3 @@
-
 WhirlIslandSE_MapScriptHeader:
 .MapTriggers:
 	db 0

maps/map_headers.asm

@@ -1,4 +1,3 @@
-
 MapGroupPointers::
 ; pointers to the first map header of each map group
 	dw MapGroup1

maps/second_map_headers.asm

@@ -1,4 +1,3 @@
-
 	map_header_2 NewBarkTown, NEW_BARK_TOWN, $5, WEST | EAST
 	connection west, ROUTE_29, Route29, 0, 0, 9, NEW_BARK_TOWN
 	connection east, ROUTE_27, Route27, 0, 0, 9, NEW_BARK_TOWN