Document Petalburg City scripts

3 files changed, 166 insertions, 166 deletions

diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json
index 44402aff5..721234bd5 100644
--- a/data/maps/PetalburgCity/map.json
+++ b/data/maps/PetalburgCity/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PetalburgCity_EventScript_1DC3FD",
+      "script": "PetalburgCity_EventScript_WallyAunt",
       "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PetalburgCity_EventScript_1DC3E6",
+      "script": "PetalburgCity_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PetalburgCity_EventScript_1DC488",
+      "script": "PetalburgCity_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PetalburgCity_EventScript_1DC82E",
+      "script": "PetalburgCity_EventScript_Boy2",
       "flag": "0"
     },
     {
@@ -195,7 +195,7 @@
       "elevation": 3,
       "var": "VAR_PETALBURG_CITY_STATE",
       "var_value": "0",
-      "script": "PetalburgCity_EventScript_1DC49A"
+      "script": "PetalburgCity_EventScript_ShowGymToPlayer0"
     },
     {
       "type": "trigger",
@@ -204,7 +204,7 @@
       "elevation": 3,
       "var": "VAR_PETALBURG_CITY_STATE",
       "var_value": "0",
-      "script": "PetalburgCity_EventScript_1DC4A6"
+      "script": "PetalburgCity_EventScript_ShowGymToPlayer1"
     },
     {
       "type": "trigger",
@@ -213,7 +213,7 @@
       "elevation": 3,
       "var": "VAR_PETALBURG_CITY_STATE",
       "var_value": "0",
-      "script": "PetalburgCity_EventScript_1DC4B2"
+      "script": "PetalburgCity_EventScript_ShowGymToPlayer2"
     },
     {
       "type": "trigger",
@@ -222,7 +222,7 @@
       "elevation": 3,
       "var": "VAR_PETALBURG_CITY_STATE",
       "var_value": "0",
-      "script": "PetalburgCity_EventScript_1DC4BE"
+      "script": "PetalburgCity_EventScript_ShowGymToPlayer3"
     },
     {
       "type": "trigger",
@@ -231,7 +231,7 @@
       "elevation": 3,
       "var": "VAR_SCOTT_PETALBURG_ENCOUNTER",
       "var_value": "0",
-      "script": "PetalburgCity_EventScript_1DC691"
+      "script": "PetalburgCity_EventScript_Scott0"
     },
     {
       "type": "trigger",
@@ -240,7 +240,7 @@
       "elevation": 3,
       "var": "VAR_SCOTT_PETALBURG_ENCOUNTER",
       "var_value": "0",
-      "script": "PetalburgCity_EventScript_1DC6A7"
+      "script": "PetalburgCity_EventScript_Scott1"
     },
     {
       "type": "trigger",
@@ -249,7 +249,7 @@
       "elevation": 3,
       "var": "VAR_SCOTT_PETALBURG_ENCOUNTER",
       "var_value": "0",
-      "script": "PetalburgCity_EventScript_1DC6BD"
+      "script": "PetalburgCity_EventScript_Scott2"
     },
     {
       "type": "trigger",
@@ -258,7 +258,7 @@
       "elevation": 3,
       "var": "VAR_SCOTT_PETALBURG_ENCOUNTER",
       "var_value": "0",
-      "script": "PetalburgCity_EventScript_1DC6D3"
+      "script": "PetalburgCity_EventScript_Scott3"
     }
   ],
   "bg_events": [
@@ -268,7 +268,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "PetalburgCity_EventScript_1DC476"
+      "script": "PetalburgCity_EventScript_GymSign"
     },
     {
       "type": "sign",
@@ -292,7 +292,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "PetalburgCity_EventScript_1DC47F"
+      "script": "PetalburgCity_EventScript_CitySign"
     },
     {
       "type": "sign",
@@ -316,7 +316,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "PetalburgCity_EventScript_1DC491"
+      "script": "PetalburgCity_EventScript_WallyHouseSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
index d16430069..5d3bbf1ef 100644
--- a/data/maps/PetalburgCity/scripts.inc
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -1,52 +1,52 @@
 PetalburgCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_MapScript2_1DC31C
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_OnFrame
 	.byte 0
 
 PetalburgCity_OnTransition: @ 81DC2D7
 	setflag FLAG_VISITED_PETALBURG_CITY
 	compare VAR_PETALBURG_CITY_STATE, 0
-	call_if_eq PetalburgCity_EventScript_1DC307
+	call_if_eq PetalburgCity_EventScript_MoveBoyToWestEntrance
 	compare VAR_PETALBURG_CITY_STATE, 2
-	call_if_eq PetalburgCity_EventScript_1DC30F
+	call_if_eq PetalburgCity_EventScript_DisableMapNameAndMusic
 	compare VAR_PETALBURG_CITY_STATE, 4
-	call_if_eq PetalburgCity_EventScript_1DC30F
+	call_if_eq PetalburgCity_EventScript_DisableMapNameAndMusic
 	compare VAR_PETALBURG_GYM_STATE, 8
-	call_if_eq PetalburgCity_EventScript_1DC316
+	call_if_eq PetalburgCity_EventScript_SetGymDoorsUnlocked
 	end
 
-PetalburgCity_EventScript_1DC307:: @ 81DC307
+PetalburgCity_EventScript_MoveBoyToWestEntrance:: @ 81DC307
 	setobjectxyperm 8, 5, 11
 	return
 
-PetalburgCity_EventScript_1DC30F:: @ 81DC30F
+PetalburgCity_EventScript_DisableMapNameAndMusic:: @ 81DC30F
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	savebgm MUS_TSURETEK
 	return
 
-PetalburgCity_EventScript_1DC316:: @ 81DC316
+PetalburgCity_EventScript_SetGymDoorsUnlocked:: @ 81DC316
 	setvar VAR_PETALBURG_GYM_STATE, 7
 	return
 
-PetalburgCity_MapScript2_1DC31C: @ 81DC31C
-	map_script_2 VAR_PETALBURG_CITY_STATE, 2, PetalburgCity_EventScript_1DC32E
-	map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_EventScript_1DC390
+PetalburgCity_OnFrame: @ 81DC31C
+	map_script_2 VAR_PETALBURG_CITY_STATE, 2, PetalburgCity_EventScript_WallyTutorial
+	map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_EventScript_WalkToWallyHouse
 	.2byte 0
 
-PetalburgCity_EventScript_1DC32E:: @ 81DC32E
+PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E
 	lockall
 	special SavePlayerParty
 	special PutZigzagoonInPlayerParty
-	applymovement 2, PetalburgCity_Movement_1DC451
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC430
+	applymovement 2, PetalburgCity_Movement_WallyTutorialWally
+	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer
 	waitmovement 0
-	msgbox PetalburgCity_Text_1EC1F8, MSGBOX_DEFAULT
+	msgbox Route102_Text_WatchMeCatchPokemon, MSGBOX_DEFAULT
 	special StartWallyTutorialBattle
 	waitstate
-	msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT
+	msgbox Route102_Text_WallyIDidIt, MSGBOX_DEFAULT
 	applymovement 2, Common_Movement_WalkInPlaceFastestLeft, MAP_PETALBURG_CITY
 	waitmovement 2, MAP_PETALBURG_CITY
-	msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT
+	msgbox Route102_Text_LetsGoBack, MSGBOX_DEFAULT
 	closemessage
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_PETALBURG_CITY_STATE, 3
@@ -59,18 +59,18 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
 	releaseall
 	end
 
-PetalburgCity_EventScript_1DC390:: @ 81DC390
+PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390
 	lockall
 	setflag FLAG_HIDE_MAP_NAME_POPUP
-	applymovement 5, PetalburgCity_Movement_1DC41B
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC406
+	applymovement 5, PetalburgCity_Movement_WalkToWallyHouseUncle
+	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer
 	waitmovement 0
 	setvar VAR_0x8004, 7
 	setvar VAR_0x8005, 5
 	opendoor VAR_0x8004, VAR_0x8005
 	waitdooranim
-	applymovement 5, PetalburgCity_Movement_1DC42D
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC418
+	applymovement 5, PetalburgCity_Movement_WalkInsideHouseUncle
+	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer
 	waitmovement 0
 	setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
@@ -84,21 +84,21 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390
 	releaseall
 	end
 
-PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6
+PetalburgCity_EventScript_Boy1:: @ 81DC3E6
 	lock
 	faceplayer
-	msgbox PetalburgCity_Text_1DC985, MSGBOX_DEFAULT
+	msgbox PetalburgCity_Text_WaterReflection, MSGBOX_DEFAULT
 	closemessage
 	applymovement 3, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD
-	msgbox PetalburgCity_Text_1DC837, MSGBOX_NPC
+PetalburgCity_EventScript_WallyAunt:: @ 81DC3FD
+	msgbox PetalburgCity_Text_WhereIsWally, MSGBOX_NPC
 	end
 
-PetalburgCity_Movement_1DC406: @ 81DC406
+PetalburgCity_Movement_WalkToWallyHousePlayer: @ 81DC406
 	delay_8
 	walk_down
 	walk_down
@@ -118,12 +118,12 @@ PetalburgCity_Movement_1DC406: @ 81DC406
 	walk_up
 	step_end
 
-PetalburgCity_Movement_1DC418: @ 81DC418
+PetalburgCity_Movement_WalkInsideHousePlayer: @ 81DC418
 	walk_up
 	walk_up
 	step_end
 
-PetalburgCity_Movement_1DC41B: @ 81DC41B
+PetalburgCity_Movement_WalkToWallyHouseUncle: @ 81DC41B
 	delay_8
 	walk_down
 	walk_down
@@ -143,12 +143,12 @@ PetalburgCity_Movement_1DC41B: @ 81DC41B
 	walk_up
 	step_end
 
-PetalburgCity_Movement_1DC42D: @ 81DC42D
+PetalburgCity_Movement_WalkInsideHouseUncle: @ 81DC42D
 	walk_up
 	set_invisible
 	step_end
 
-PetalburgCity_Movement_1DC430: @ 81DC430
+PetalburgCity_Movement_WallyTutorialPlayer: @ 81DC430
 	delay_8
 	walk_down
 	walk_down
@@ -183,7 +183,7 @@ PetalburgCity_Movement_1DC430: @ 81DC430
 	walk_in_place_fastest_right
 	step_end
 
-PetalburgCity_Movement_1DC451: @ 81DC451
+PetalburgCity_Movement_WallyTutorialWally: @ 81DC451
 	delay_8
 	walk_down
 	walk_down
@@ -222,47 +222,47 @@ PetalburgCity_Movement_1DC451: @ 81DC451
 	walk_in_place_fastest_right
 	step_end
 
-PetalburgCity_EventScript_1DC476:: @ 81DC476
-	msgbox PetalburgCity_Text_1DCAAA, MSGBOX_SIGN
+PetalburgCity_EventScript_GymSign:: @ 81DC476
+	msgbox PetalburgCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-PetalburgCity_EventScript_1DC47F:: @ 81DC47F
-	msgbox PetalburgCity_Text_1DCAF1, MSGBOX_SIGN
+PetalburgCity_EventScript_CitySign:: @ 81DC47F
+	msgbox PetalburgCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-PetalburgCity_EventScript_1DC488:: @ 81DC488
-	msgbox PetalburgCity_Text_1DCA30, MSGBOX_NPC
+PetalburgCity_EventScript_Gentleman:: @ 81DC488
+	msgbox PetalburgCity_Text_FullPartyExplanation, MSGBOX_NPC
 	end
 
-PetalburgCity_EventScript_1DC491:: @ 81DC491
-	msgbox PetalburgCity_Text_1DCB23, MSGBOX_SIGN
+PetalburgCity_EventScript_WallyHouseSign:: @ 81DC491
+	msgbox PetalburgCity_Text_WallyHouseSign, MSGBOX_SIGN
 	end
 
-PetalburgCity_EventScript_1DC49A:: @ 81DC49A
+PetalburgCity_EventScript_ShowGymToPlayer0:: @ 81DC49A
 	lockall
 	setvar VAR_0x8008, 0
-	goto PetalburgCity_EventScript_1DC4CA
+	goto PetalburgCity_EventScript_ShowGymToPlayer
 	end
 
-PetalburgCity_EventScript_1DC4A6:: @ 81DC4A6
+PetalburgCity_EventScript_ShowGymToPlayer1:: @ 81DC4A6
 	lockall
 	setvar VAR_0x8008, 1
-	goto PetalburgCity_EventScript_1DC4CA
+	goto PetalburgCity_EventScript_ShowGymToPlayer
 	end
 
-PetalburgCity_EventScript_1DC4B2:: @ 81DC4B2
+PetalburgCity_EventScript_ShowGymToPlayer2:: @ 81DC4B2
 	lockall
 	setvar VAR_0x8008, 2
-	goto PetalburgCity_EventScript_1DC4CA
+	goto PetalburgCity_EventScript_ShowGymToPlayer
 	end
 
-PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE
+PetalburgCity_EventScript_ShowGymToPlayer3:: @ 81DC4BE
 	lockall
 	setvar VAR_0x8008, 3
-	goto PetalburgCity_EventScript_1DC4CA
+	goto PetalburgCity_EventScript_ShowGymToPlayer
 	end
 
-PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA
+PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA
 	applymovement 8, Common_Movement_FacePlayer
 	waitmovement 0
 	playbgm MUS_TSURETEK, 0
@@ -272,82 +272,82 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA
 	applymovement 8, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_0x8008, 0
-	call_if_eq PetalburgCity_EventScript_1DC57F
+	call_if_eq PetalburgCity_EventScript_BoyApproachPlayer0
 	compare VAR_0x8008, 1
-	call_if_eq PetalburgCity_EventScript_1DC594
+	call_if_eq PetalburgCity_EventScript_BoyApproachPlayer1
 	compare VAR_0x8008, 2
-	call_if_eq PetalburgCity_EventScript_1DC59F
+	call_if_eq PetalburgCity_EventScript_BoyApproachPlayer2
 	compare VAR_0x8008, 3
-	call_if_eq PetalburgCity_EventScript_1DC5B4
-	msgbox PetalburgCity_Text_1DC881, MSGBOX_DEFAULT
+	call_if_eq PetalburgCity_EventScript_BoyApproachPlayer3
+	msgbox PetalburgCity_Text_AreYouRookieTrainer, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
-	call_if_eq PetalburgCity_EventScript_1DC5C9
+	call_if_eq PetalburgCity_EventScript_LeadPlayerToGym0
 	compare VAR_0x8008, 1
-	call_if_eq PetalburgCity_EventScript_1DC5DB
+	call_if_eq PetalburgCity_EventScript_LeadPlayerToGym1
 	compare VAR_0x8008, 2
-	call_if_eq PetalburgCity_EventScript_1DC5ED
+	call_if_eq PetalburgCity_EventScript_LeadPlayerToGym2
 	compare VAR_0x8008, 3
-	call_if_eq PetalburgCity_EventScript_1DC5FF
-	msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT
+	call_if_eq PetalburgCity_EventScript_LeadPlayerToGym3
+	msgbox PetalburgCity_Text_ThisIsPetalburgGym, MSGBOX_DEFAULT
 	applymovement 8, Common_Movement_WalkInPlaceFastestRight
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT
+	msgbox PetalburgCity_Text_ThisIsGymSign, MSGBOX_DEFAULT
 	closemessage
-	applymovement 8, PetalburgCity_Movement_1DC658
+	applymovement 8, PetalburgCity_Movement_BoyWalkAway
 	waitmovement 0
 	fadedefaultbgm
 	releaseall
 	end
 
-PetalburgCity_EventScript_1DC57F:: @ 81DC57F
-	applymovement 8, PetalburgCity_Movement_1DC615
+PetalburgCity_EventScript_BoyApproachPlayer0:: @ 81DC57F
+	applymovement 8, PetalburgCity_Movement_BoyApproachPlayer0
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_1DC594:: @ 81DC594
-	applymovement 8, PetalburgCity_Movement_1DC61A
+PetalburgCity_EventScript_BoyApproachPlayer1:: @ 81DC594
+	applymovement 8, PetalburgCity_Movement_BoyApproachPlayer1
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_1DC59F:: @ 81DC59F
-	applymovement 8, PetalburgCity_Movement_1DC61D
+PetalburgCity_EventScript_BoyApproachPlayer2:: @ 81DC59F
+	applymovement 8, PetalburgCity_Movement_BoyApproachPlayer2
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4
-	applymovement 8, PetalburgCity_Movement_1DC622
+PetalburgCity_EventScript_BoyApproachPlayer3:: @ 81DC5B4
+	applymovement 8, PetalburgCity_Movement_BoyApproachPlayer3
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_1DC5C9:: @ 81DC5C9
-	applymovement 8, PetalburgCity_Movement_1DC628
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC665
+PetalburgCity_EventScript_LeadPlayerToGym0:: @ 81DC5C9
+	applymovement 8, PetalburgCity_Movement_BoyWalkToGym0
+	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym0
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_1DC5DB:: @ 81DC5DB
-	applymovement 8, PetalburgCity_Movement_1DC633
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC66F
+PetalburgCity_EventScript_LeadPlayerToGym1:: @ 81DC5DB
+	applymovement 8, PetalburgCity_Movement_BoyWalkToGym1
+	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym1
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_1DC5ED:: @ 81DC5ED
-	applymovement 8, PetalburgCity_Movement_1DC641
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC67C
+PetalburgCity_EventScript_LeadPlayerToGym2:: @ 81DC5ED
+	applymovement 8, PetalburgCity_Movement_BoyWalkToGym2
+	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym2
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF
-	applymovement 8, PetalburgCity_Movement_1DC64C
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC686
+PetalburgCity_EventScript_LeadPlayerToGym3:: @ 81DC5FF
+	applymovement 8, PetalburgCity_Movement_BoyWalkToGym3
+	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym3
 	waitmovement 0
 	return
 
@@ -357,26 +357,26 @@ PetalburgCity_Movement_1DC611:: @ 81DC611
 	delay_16
 	step_end
 
-PetalburgCity_Movement_1DC615: @ 81DC615
+PetalburgCity_Movement_BoyApproachPlayer0: @ 81DC615
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgCity_Movement_1DC61A: @ 81DC61A
+PetalburgCity_Movement_BoyApproachPlayer1: @ 81DC61A
 	walk_right
 	walk_right
 	step_end
 
-PetalburgCity_Movement_1DC61D: @ 81DC61D
+PetalburgCity_Movement_BoyApproachPlayer2: @ 81DC61D
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-PetalburgCity_Movement_1DC622: @ 81DC622
+PetalburgCity_Movement_BoyApproachPlayer3: @ 81DC622
 	walk_down
 	walk_right
 	walk_right
@@ -384,7 +384,7 @@ PetalburgCity_Movement_1DC622: @ 81DC622
 	walk_in_place_fastest_down
 	step_end
 
-PetalburgCity_Movement_1DC628: @ 81DC628
+PetalburgCity_Movement_BoyWalkToGym0: @ 81DC628
 	walk_right
 	walk_right
 	walk_right
@@ -397,7 +397,7 @@ PetalburgCity_Movement_1DC628: @ 81DC628
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgCity_Movement_1DC633: @ 81DC633
+PetalburgCity_Movement_BoyWalkToGym1: @ 81DC633
 	walk_down
 	walk_right
 	walk_right
@@ -413,7 +413,7 @@ PetalburgCity_Movement_1DC633: @ 81DC633
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgCity_Movement_1DC641: @ 81DC641
+PetalburgCity_Movement_BoyWalkToGym2: @ 81DC641
 	walk_right
 	walk_right
 	walk_right
@@ -426,7 +426,7 @@ PetalburgCity_Movement_1DC641: @ 81DC641
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgCity_Movement_1DC64C: @ 81DC64C
+PetalburgCity_Movement_BoyWalkToGym3: @ 81DC64C
 	walk_right
 	walk_right
 	walk_right
@@ -440,7 +440,7 @@ PetalburgCity_Movement_1DC64C: @ 81DC64C
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgCity_Movement_1DC658: @ 81DC658
+PetalburgCity_Movement_BoyWalkAway: @ 81DC658
 	walk_down
 	walk_left
 	walk_left
@@ -455,7 +455,7 @@ PetalburgCity_Movement_1DC658: @ 81DC658
 	walk_left
 	step_end
 
-PetalburgCity_Movement_1DC665: @ 81DC665
+PetalburgCity_Movement_PlayerWalkToGym0: @ 81DC665
 	walk_down
 	walk_right
 	walk_right
@@ -467,7 +467,7 @@ PetalburgCity_Movement_1DC665: @ 81DC665
 	walk_up
 	step_end
 
-PetalburgCity_Movement_1DC66F: @ 81DC66F
+PetalburgCity_Movement_PlayerWalkToGym1: @ 81DC66F
 	delay_16
 	delay_16
 	walk_down
@@ -482,7 +482,7 @@ PetalburgCity_Movement_1DC66F: @ 81DC66F
 	walk_up
 	step_end
 
-PetalburgCity_Movement_1DC67C: @ 81DC67C
+PetalburgCity_Movement_PlayerWalkToGym2: @ 81DC67C
 	walk_up
 	walk_right
 	walk_right
@@ -494,7 +494,7 @@ PetalburgCity_Movement_1DC67C: @ 81DC67C
 	walk_up
 	step_end
 
-PetalburgCity_Movement_1DC686: @ 81DC686
+PetalburgCity_Movement_PlayerWalkToGym3: @ 81DC686
 	walk_up
 	walk_right
 	walk_right
@@ -507,115 +507,115 @@ PetalburgCity_Movement_1DC686: @ 81DC686
 	walk_up
 	step_end
 
-PetalburgCity_EventScript_1DC691:: @ 81DC691
+PetalburgCity_EventScript_Scott0:: @ 81DC691
 	lockall
 	addobject 9
 	setvar VAR_0x8008, 0
 	setobjectxy 9, 13, 10
-	goto PetalburgCity_EventScript_1DC6E9
+	goto PetalburgCity_EventScript_Scott
 	end
 
-PetalburgCity_EventScript_1DC6A7:: @ 81DC6A7
+PetalburgCity_EventScript_Scott1:: @ 81DC6A7
 	lockall
 	addobject 9
 	setvar VAR_0x8008, 1
 	setobjectxy 9, 13, 11
-	goto PetalburgCity_EventScript_1DC6E9
+	goto PetalburgCity_EventScript_Scott
 	end
 
-PetalburgCity_EventScript_1DC6BD:: @ 81DC6BD
+PetalburgCity_EventScript_Scott2:: @ 81DC6BD
 	lockall
 	addobject 9
 	setvar VAR_0x8008, 2
 	setobjectxy 9, 13, 12
-	goto PetalburgCity_EventScript_1DC6E9
+	goto PetalburgCity_EventScript_Scott
 	end
 
-PetalburgCity_EventScript_1DC6D3:: @ 81DC6D3
+PetalburgCity_EventScript_Scott3:: @ 81DC6D3
 	lockall
 	addobject 9
 	setvar VAR_0x8008, 3
 	setobjectxy 9, 13, 13
-	goto PetalburgCity_EventScript_1DC6E9
+	goto PetalburgCity_EventScript_Scott
 	end
 
-PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9
-	applymovement 9, PetalburgCity_Movement_1DC7D6
+PetalburgCity_EventScript_Scott:: @ 81DC6E9
+	applymovement 9, PetalburgCity_Movement_ScottStartWalkLeft
 	waitmovement 0
 	playse SE_PIN
 	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 9, PetalburgCity_Movement_1DC7DB
+	applymovement 9, PetalburgCity_Movement_ScottApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	setvar VAR_SCOTT_STATE, 1
-	msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT
+	msgbox PetalburgCity_Text_AreYouATrainer, MSGBOX_DEFAULT
 	closemessage
 	applymovement 9, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 30
-	msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT
+	msgbox PetalburgCity_Text_WellMaybeNot, MSGBOX_DEFAULT
 	closemessage
 	applymovement 9, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	delay 30
-	msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT
+	msgbox PetalburgCity_Text_ImLookingForTalentedTrainers, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
-	call_if_eq PetalburgCity_EventScript_1DC78E
+	call_if_eq PetalburgCity_EventScript_ScottExit0
 	compare VAR_0x8008, 1
-	call_if_eq PetalburgCity_EventScript_1DC7A0
+	call_if_eq PetalburgCity_EventScript_ScottExit1
 	compare VAR_0x8008, 2
-	call_if_eq PetalburgCity_EventScript_1DC7B2
+	call_if_eq PetalburgCity_EventScript_ScottExit2
 	compare VAR_0x8008, 3
-	call_if_eq PetalburgCity_EventScript_1DC7C4
+	call_if_eq PetalburgCity_EventScript_ScottExit3
 	setvar VAR_SCOTT_PETALBURG_ENCOUNTER, 1
 	removeobject 9
 	releaseall
 	end
 
-PetalburgCity_EventScript_1DC78E:: @ 81DC78E
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC7EE
-	applymovement 9, PetalburgCity_Movement_1DC7E0
+PetalburgCity_EventScript_ScottExit0:: @ 81DC78E
+	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit0
+	applymovement 9, PetalburgCity_Movement_ScottExit0
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_1DC7A0:: @ 81DC7A0
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC802
-	applymovement 9, PetalburgCity_Movement_1DC7F5
+PetalburgCity_EventScript_ScottExit1:: @ 81DC7A0
+	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit1
+	applymovement 9, PetalburgCity_Movement_ScottExit1
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_1DC7B2:: @ 81DC7B2
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC815
-	applymovement 9, PetalburgCity_Movement_1DC808
+PetalburgCity_EventScript_ScottExit2:: @ 81DC7B2
+	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit2
+	applymovement 9, PetalburgCity_Movement_ScottExit2
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4
-	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC828
-	applymovement 9, PetalburgCity_Movement_1DC81B
+PetalburgCity_EventScript_ScottExit3:: @ 81DC7C4
+	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit3
+	applymovement 9, PetalburgCity_Movement_ScottExit3
 	waitmovement 0
 	return
 
-PetalburgCity_Movement_1DC7D6: @ 81DC7D6
+PetalburgCity_Movement_ScottStartWalkLeft: @ 81DC7D6
 	walk_left
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-PetalburgCity_Movement_1DC7DB: @ 81DC7DB
+PetalburgCity_Movement_ScottApproachPlayer: @ 81DC7DB
 	walk_left
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-PetalburgCity_Movement_1DC7E0: @ 81DC7E0
+PetalburgCity_Movement_ScottExit0: @ 81DC7E0
 	walk_down
 	walk_down
 	walk_left
@@ -631,7 +631,7 @@ PetalburgCity_Movement_1DC7E0: @ 81DC7E0
 	walk_left
 	step_end
 
-PetalburgCity_Movement_1DC7EE: @ 81DC7EE
+PetalburgCity_Movement_PlayerWatchScottExit0: @ 81DC7EE
 	delay_16
 	walk_in_place_fastest_down
 	delay_16
@@ -640,7 +640,7 @@ PetalburgCity_Movement_1DC7EE: @ 81DC7EE
 	walk_in_place_fastest_left
 	step_end
 
-PetalburgCity_Movement_1DC7F5: @ 81DC7F5
+PetalburgCity_Movement_ScottExit1: @ 81DC7F5
 	walk_down
 	walk_left
 	walk_left
@@ -655,7 +655,7 @@ PetalburgCity_Movement_1DC7F5: @ 81DC7F5
 	walk_left
 	step_end
 
-PetalburgCity_Movement_1DC802: @ 81DC802
+PetalburgCity_Movement_PlayerWatchScottExit1: @ 81DC802
 	delay_16
 	walk_in_place_fastest_down
 	delay_16
@@ -663,7 +663,7 @@ PetalburgCity_Movement_1DC802: @ 81DC802
 	walk_in_place_fastest_left
 	step_end
 
-PetalburgCity_Movement_1DC808: @ 81DC808
+PetalburgCity_Movement_ScottExit2: @ 81DC808
 	walk_down
 	walk_left
 	walk_left
@@ -678,7 +678,7 @@ PetalburgCity_Movement_1DC808: @ 81DC808
 	walk_left
 	step_end
 
-PetalburgCity_Movement_1DC815: @ 81DC815
+PetalburgCity_Movement_PlayerWatchScottExit2: @ 81DC815
 	delay_16
 	walk_in_place_fastest_down
 	delay_16
@@ -686,7 +686,7 @@ PetalburgCity_Movement_1DC815: @ 81DC815
 	walk_in_place_fastest_left
 	step_end
 
-PetalburgCity_Movement_1DC81B: @ 81DC81B
+PetalburgCity_Movement_ScottExit3: @ 81DC81B
 	walk_up
 	walk_left
 	walk_left
@@ -701,7 +701,7 @@ PetalburgCity_Movement_1DC81B: @ 81DC81B
 	walk_left
 	step_end
 
-PetalburgCity_Movement_1DC828: @ 81DC828
+PetalburgCity_Movement_PlayerWatchScottExit3: @ 81DC828
 	delay_16
 	walk_in_place_fastest_up
 	delay_16
@@ -709,16 +709,16 @@ PetalburgCity_Movement_1DC828: @ 81DC828
 	walk_in_place_fastest_left
 	step_end
 
-PetalburgCity_EventScript_1DC82E:: @ 81DC82E
-	msgbox PetalburgCity_Text_1DC881, MSGBOX_NPC
+PetalburgCity_EventScript_Boy2:: @ 81DC82E
+	msgbox PetalburgCity_Text_AreYouRookieTrainer, MSGBOX_NPC
 	end
 
-PetalburgCity_Text_1DC837: @ 81DC837
+PetalburgCity_Text_WhereIsWally: @ 81DC837
 	.string "Where has our WALLY gone?\p"
 	.string "We have to leave for VERDANTURF TOWN\n"
 	.string "very soon…$"
 
-PetalburgCity_Text_1DC881: @ 81DC881
+PetalburgCity_Text_AreYouRookieTrainer: @ 81DC881
 	.string "Hiya! Are you maybe…\n"
 	.string "A rookie TRAINER?\p"
 	.string "Do you know what POKéMON TRAINERS\n"
@@ -726,51 +726,51 @@ PetalburgCity_Text_1DC881: @ 81DC881
 	.string "They first check what kind of GYM\n"
 	.string "is in the town.$"
 
-PetalburgCity_Text_1DC91B: @ 81DC91B
+PetalburgCity_Text_ThisIsPetalburgGym: @ 81DC91B
 	.string "See? This is PETALBURG CITY's GYM.$"
 
-PetalburgCity_Text_1DC93E: @ 81DC93E
+PetalburgCity_Text_ThisIsGymSign: @ 81DC93E
 	.string "This is the GYM's sign. Look for it\n"
 	.string "whenever you're looking for a GYM.$"
 
-PetalburgCity_Text_1DC985: @ 81DC985
+PetalburgCity_Text_WaterReflection: @ 81DC985
 	.string "My face is reflected in the water.\p"
 	.string "It's a shining grin full of hope…\p"
 	.string "Or it could be a look of somber silence\n"
 	.string "struggling with fear…\p"
 	.string "What do you see reflected in your face?$"
 
-PetalburgCity_Text_1DCA30: @ 81DCA30
+PetalburgCity_Text_FullPartyExplanation: @ 81DCA30
 	.string "Let's say you have six POKéMON.\n"
 	.string "If you catch another one…\p"
 	.string "It is automatically sent to a STORAGE\n"
 	.string "BOX over a PC connection.$"
 
-PetalburgCity_Text_1DCAAA: @ 81DCAAA
+PetalburgCity_Text_GymSign: @ 81DCAAA
 	.string "PETALBURG CITY POKéMON GYM\n"
 	.string "LEADER: NORMAN\l"
 	.string "“A man in pursuit of power!”$"
 
-PetalburgCity_Text_1DCAF1: @ 81DCAF1
+PetalburgCity_Text_CitySign: @ 81DCAF1
 	.string "PETALBURG CITY\n"
 	.string "“Where people mingle with nature.”$"
 
-PetalburgCity_Text_1DCB23: @ 81DCB23
+PetalburgCity_Text_WallyHouseSign: @ 81DCB23
 	.string "WALLY'S HOUSE$"
 
-PetalburgCity_Text_1DCB31: @ 81DCB31
+PetalburgCity_Text_AreYouATrainer: @ 81DCB31
 	.string "Excuse me!\p"
 	.string "Let me guess, from the way you're\n"
 	.string "dressed, are you a POKéMON TRAINER?$"
 
-PetalburgCity_Text_1DCB82: @ 81DCB82
+PetalburgCity_Text_WellMaybeNot: @ 81DCB82
 	.string "… … … … … …\p"
 	.string "Well, maybe not.\n"
 	.string "Your clothes aren't all that dirty.\p"
 	.string "You're either a rookie TRAINER,\n"
 	.string "or maybe you're just an ordinary kid.$"
 
-PetalburgCity_Text_1DCC09: @ 81DCC09
+PetalburgCity_Text_ImLookingForTalentedTrainers: @ 81DCC09
 	.string "I'm roaming the land in search of\n"
 	.string "talented TRAINERS.\p"
 	.string "I'm sorry to have taken your time.$"
diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc
index 58adf4456..5e7f48c93 100644
--- a/data/maps/Route102/scripts.inc
+++ b/data/maps/Route102/scripts.inc
@@ -75,7 +75,7 @@ Route102_EventScript_1EC1E1:: @ 81EC1E1
 	msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE
 	end
 
-PetalburgCity_Text_1EC1F8: @ 81EC1F8
+Route102_Text_WatchMeCatchPokemon: @ 81EC1F8
 	.string "WALLY: {PLAYER}…\n"
 	.string "POKéMON hide in tall grass like this,\l"
 	.string "don't they?\p"
@@ -83,11 +83,11 @@ PetalburgCity_Text_1EC1F8: @ 81EC1F8
 	.string "catch one properly.\p"
 	.string "…Whoa!$"
 
-PetalburgCity_Text_1EC271: @ 81EC271
+Route102_Text_WallyIDidIt: @ 81EC271
 	.string "WALLY: I did it… It's my…\n"
 	.string "My POKéMON!$"
 
-PetalburgCity_Text_1EC297: @ 81EC297
+Route102_Text_LetsGoBack: @ 81EC297
 	.string "{PLAYER}, thank you!\n"
 	.string "Let's go back to the GYM!$"