Document Viridian City scripts and adjacent routes

3 files changed, 27 insertions, 25 deletions

diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json
index 2367b0b91..e966962c6 100644
--- a/data/maps/Route2_EastBuilding/map.json
+++ b/data/maps/Route2_EastBuilding/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_EastBuilding_EventScript_16F67F",
+      "script": "Route2_EastBuilding_EventScript_Aide",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_EastBuilding_EventScript_16F714",
+      "script": "Route2_EastBuilding_EventScript_Rocker",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc
index cba95dc0b..a94d72fd7 100644
--- a/data/maps/Route2_EastBuilding/scripts.inc
+++ b/data/maps/Route2_EastBuilding/scripts.inc
@@ -1,40 +1,42 @@
+.equ REQUIRED_SEEN_MONS, 10
+
 Route2_EastBuilding_MapScripts:: @ 816F67E
 	.byte 0
 
-Route2_EastBuilding_EventScript_16F67F:: @ 816F67F
+Route2_EastBuilding_EventScript_Aide:: @ 816F67F
 	lock
 	faceplayer
-	call EventScript_16F70B
-	goto_if_set FLAG_GOT_HM05, EventScript_16F701
-	msgbox gUnknown_819D64F, MSGBOX_YESNO
+	call Route2_EastBuilding_EventScript_GetAideRequestInfo
+	goto_if_set FLAG_GOT_HM05, Route2_EastBuilding_EventScript_AlreadyGotHM05
+	msgbox Route2_EastBuilding_Text_GiveHM05IfSeen10Mons, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A7AD1
+	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, Special_GetPokedexCount
 	getnumberstring 2, VAR_0x8006
-	call EventScript_16F70B
-	compare VAR_0x8006, 10
-	goto_if_lt EventScript_1A7ABD
-	msgbox gUnknown_819D74E
+	call Route2_EastBuilding_EventScript_GetAideRequestInfo
+	compare VAR_0x8006, REQUIRED_SEEN_MONS
+	goto_if_lt Aide_EventScript_HaventCaughtEnough
+	msgbox Route2_EastBuilding_Text_GreatHereYouGo
 	checkitemspace ITEM_HM05, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A7AC7
-	giveitem_msg gUnknown_819D7A1, ITEM_HM05
+	goto_if_eq Aide_EventScript_NoRoomForItem
+	giveitem_msg Route2_EastBuilding_Text_ReceivedHM05FromAide, ITEM_HM05
 	setflag FLAG_GOT_HM05
-	msgbox gUnknown_819D7C1
+	msgbox Route2_EastBuilding_Text_ExplainHM05
 	release
 	end
 
-EventScript_16F701:: @ 816F701
-	msgbox gUnknown_819D7C1
+Route2_EastBuilding_EventScript_AlreadyGotHM05:: @ 816F701
+	msgbox Route2_EastBuilding_Text_ExplainHM05
 	release
 	end
 
-EventScript_16F70B:: @ 816F70B
-	getnumberstring 0, 10
+Route2_EastBuilding_EventScript_GetAideRequestInfo:: @ 816F70B
+	getnumberstring 0, REQUIRED_SEEN_MONS
 	getitemname 1, ITEM_HM05
 	return
 
-Route2_EastBuilding_EventScript_16F714:: @ 816F714
-	msgbox gUnknown_819D81E, MSGBOX_NPC
+Route2_EastBuilding_EventScript_Rocker:: @ 816F714
+	msgbox Route2_EastBuilding_Text_CanGetThroughRockTunnel, MSGBOX_NPC
 	end
diff --git a/data/maps/Route2_EastBuilding/text.inc b/data/maps/Route2_EastBuilding/text.inc
index 228cf3c4d..1de4b8fc7 100644
--- a/data/maps/Route2_EastBuilding/text.inc
+++ b/data/maps/Route2_EastBuilding/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819D64F:: @ 819D64F
+Route2_EastBuilding_Text_GiveHM05IfSeen10Mons:: @ 819D64F
     .string "Hi! Remember me?\n"
     .string "I'm one of PROF. OAK's AIDES.\p"
     .string "If your POKéDEX has complete data\n"
@@ -10,23 +10,23 @@ gUnknown_819D64F:: @ 819D64F
     .string "Have you gathered data on at least\n"
     .string "ten kinds of POKéMON?$"
 
-gUnknown_819D74E:: @ 819D74E
+Route2_EastBuilding_Text_GreatHereYouGo:: @ 819D74E
     .string "Great! You have caught or owned\n"
     .string "{STR_VAR_3} kinds of POKéMON!\p"
     .string "Congratulations!\n"
     .string "Here you go!$"
 
-gUnknown_819D7A1:: @ 819D7A1
+Route2_EastBuilding_Text_ReceivedHM05FromAide:: @ 819D7A1
     .string "{PLAYER} received HM05\n"
     .string "from the AIDE.$"
 
-gUnknown_819D7C1:: @ 819D7C1
+Route2_EastBuilding_Text_ExplainHM05:: @ 819D7C1
     .string "HM05 contains the hidden move\n"
     .string "FLASH.\p"
     .string "FLASH lights up even the darkest\n"
     .string "of caves and dungeons.$"
 
-gUnknown_819D81E:: @ 819D81E
+Route2_EastBuilding_Text_CanGetThroughRockTunnel:: @ 819D81E
     .string "Once a POKéMON learns FLASH, you\n"
     .string "can get through ROCK TUNNEL.$"