Document Victory Road scripts

3 files changed, 59 insertions, 55 deletions

diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json
index bb44ea7d0..33024c025 100644
--- a/data/maps/VictoryRoad_2F/map.json
+++ b/data/maps/VictoryRoad_2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "VictoryRoad_2F_EventScript_161037",
+      "script": "VictoryRoad_2F_EventScript_Dawson",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "VictoryRoad_2F_EventScript_16104E",
+      "script": "VictoryRoad_2F_EventScript_Daisuke",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "VictoryRoad_2F_EventScript_161065",
+      "script": "VictoryRoad_2F_EventScript_Nelson",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 4,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "VictoryRoad_2F_EventScript_161093",
+      "script": "VictoryRoad_2F_EventScript_Vincent",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "VictoryRoad_2F_EventScript_16107C",
+      "script": "VictoryRoad_2F_EventScript_Gregory",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1",
       "var_value": 99,
-      "script": "VictoryRoad_2F_EventScript_160FD5"
+      "script": "VictoryRoad_2F_EventScript_FloorSwitch1"
     },
     {
       "type": "trigger",
@@ -265,7 +265,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2",
       "var_value": 99,
-      "script": "VictoryRoad_2F_EventScript_161006"
+      "script": "VictoryRoad_2F_EventScript_FloorSwitch2"
     }
   ],
   "bg_events": []
diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc
index 49d21b7de..1dfd658ae 100644
--- a/data/maps/VictoryRoad_2F/scripts.inc
+++ b/data/maps/VictoryRoad_2F/scripts.inc
@@ -4,27 +4,27 @@ VictoryRoad_2F_MapScripts:: @ 8160F92
 
 VictoryRoad_2F_OnLoad:: @ 8160F98
 	compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100
-	call_if_ne EventScript_160FAF
+	call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier1
 	compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100
-	call_if_ne EventScript_160FC2
+	call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier2
 	end
 
-EventScript_160FAF:: @ 8160FAF
-	setmetatile 13, 10, 775, 1
-	setmetatile 13, 11, 791, 1
+VictoryRoad_2F_EventScript_SetRockBarrier1:: @ 8160FAF
+	setmetatile 13, 10, METATILE_Cave_RockBarrier_Top, 1
+	setmetatile 13, 11, METATILE_Cave_RockBarrier_Bottom, 1
 	return
 
-EventScript_160FC2:: @ 8160FC2
-	setmetatile 33, 16, 775, 1
-	setmetatile 33, 17, 791, 1
+VictoryRoad_2F_EventScript_SetRockBarrier2:: @ 8160FC2
+	setmetatile 33, 16, METATILE_Cave_RockBarrier_Top, 1
+	setmetatile 33, 17, METATILE_Cave_RockBarrier_Bottom, 1
 	return
 
-VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5
+VictoryRoad_2F_EventScript_FloorSwitch1:: @ 8160FD5
 	lockall
 	compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100
-	goto_if_eq EventScript_161004
-	setmetatile 13, 10, 721, 0
-	setmetatile 13, 11, 737, 0
+	goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed
+	setmetatile 13, 10, METATILE_Cave_Floor_Ledge_Top, 0
+	setmetatile 13, 11, METATILE_Cave_Floor_Ledge_Bottom, 0
 	playse SE_RU_GASYAN
 	special DrawWholeMapView
 	waitse
@@ -33,16 +33,16 @@ VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5
 	releaseall
 	end
 
-EventScript_161004:: @ 8161004
+VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed:: @ 8161004
 	releaseall
 	end
 
-VictoryRoad_2F_EventScript_161006:: @ 8161006
+VictoryRoad_2F_EventScript_FloorSwitch2:: @ 8161006
 	lockall
 	compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100
-	goto_if_eq EventScript_161035
-	setmetatile 33, 16, 721, 0
-	setmetatile 33, 17, 737, 0
+	goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed
+	setmetatile 33, 16, METATILE_Cave_Floor_Ledge_Top, 0
+	setmetatile 33, 17, METATILE_Cave_Floor_Ledge_Bottom, 0
 	playse SE_RU_GASYAN
 	special DrawWholeMapView
 	waitse
@@ -51,31 +51,31 @@ VictoryRoad_2F_EventScript_161006:: @ 8161006
 	releaseall
 	end
 
-EventScript_161035:: @ 8161035
+VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed:: @ 8161035
 	releaseall
 	end
 
-VictoryRoad_2F_EventScript_161037:: @ 8161037
-	trainerbattle_single TRAINER_POKEMANIAC_DAWSON, Text_1747EF, Text_17482C
-	msgbox gUnknown_817483E, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Dawson:: @ 8161037
+	trainerbattle_single TRAINER_POKEMANIAC_DAWSON, VictoryRoad_2F_Text_DawsonIntro, VictoryRoad_2F_Text_DawsonDefeat
+	msgbox VictoryRoad_2F_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_2F_EventScript_16104E:: @ 816104E
-	trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, Text_174877, Text_1748B4
-	msgbox gUnknown_81748BB, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Daisuke:: @ 816104E
+	trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, VictoryRoad_2F_Text_DaisukeIntro, VictoryRoad_2F_Text_DaisukeDefeat
+	msgbox VictoryRoad_2F_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_2F_EventScript_161065:: @ 8161065
-	trainerbattle_single TRAINER_JUGGLER_NELSON, Text_1748EE, Text_17491B
-	msgbox gUnknown_8174927, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Nelson:: @ 8161065
+	trainerbattle_single TRAINER_JUGGLER_NELSON, VictoryRoad_2F_Text_NelsonIntro, VictoryRoad_2F_Text_NelsonDefeat
+	msgbox VictoryRoad_2F_Text_NelsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_2F_EventScript_16107C:: @ 816107C
-	trainerbattle_single TRAINER_JUGGLER_GREGORY, Text_174995, Text_1749B0
-	msgbox gUnknown_81749BB, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Gregory:: @ 816107C
+	trainerbattle_single TRAINER_JUGGLER_GREGORY, VictoryRoad_2F_Text_GregoryIntro, VictoryRoad_2F_Text_GregoryDefeat
+	msgbox VictoryRoad_2F_Text_GregoryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_2F_EventScript_161093:: @ 8161093
-	trainerbattle_single TRAINER_TAMER_VINCENT, Text_174942, Text_17495A
-	msgbox gUnknown_8174969, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Vincent:: @ 8161093
+	trainerbattle_single TRAINER_TAMER_VINCENT, VictoryRoad_2F_Text_VincentIntro, VictoryRoad_2F_Text_VincentDefeat
+	msgbox VictoryRoad_2F_Text_VincentPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/VictoryRoad_2F/text.inc b/data/maps/VictoryRoad_2F/text.inc
index d125ef160..301a5f22b 100644
--- a/data/maps/VictoryRoad_2F/text.inc
+++ b/data/maps/VictoryRoad_2F/text.inc
@@ -1,54 +1,58 @@
-Text_1747EF:: @ 81747EF
+VictoryRoad_2F_Text_DawsonIntro:: @ 81747EF
     .string "If you can get through here,\n"
     .string "you can go meet the ELITE FOUR.$"
 
-Text_17482C:: @ 817482C
+VictoryRoad_2F_Text_DawsonDefeat:: @ 817482C
     .string "No!\n"
     .string "Unbelievable!$"
 
-gUnknown_817483E:: @ 817483E
+VictoryRoad_2F_Text_DawsonPostBattle:: @ 817483E
     .string "I can beat you when it comes to\n"
     .string "knowledge about POKéMON!$"
 
-Text_174877:: @ 8174877
+VictoryRoad_2F_Text_DaisukeIntro:: @ 8174877
     .string "This here is VICTORY ROAD.\n"
     .string "It's the final test for TRAINERS!$"
 
-Text_1748B4:: @ 81748B4
+VictoryRoad_2F_Text_DaisukeDefeat:: @ 81748B4
     .string "Atcho!$"
 
-gUnknown_81748BB:: @ 81748BB
+VictoryRoad_2F_Text_DaisukePostBattle:: @ 81748BB
     .string "If you get stuck, try moving some\n"
     .string "boulders around.$"
 
-Text_1748EE:: @ 81748EE
+VictoryRoad_2F_Text_NelsonIntro:: @ 81748EE
     .string "Ah, so you wish to challenge the\n"
     .string "ELITE FOUR?$"
 
-Text_17491B:: @ 817491B
+VictoryRoad_2F_Text_NelsonDefeat:: @ 817491B
     .string "You got me!$"
 
-gUnknown_8174927:: @ 8174927
+VictoryRoad_2F_Text_NelsonPostBattle:: @ 8174927
     .string "{RIVAL} also came through here.$"
 
-Text_174942:: @ 8174942
+VictoryRoad_2F_Text_VincentIntro:: @ 8174942
     .string "Come on!\n"
     .string "I'll whip you!$"
 
-Text_17495A:: @ 817495A
+VictoryRoad_2F_Text_VincentDefeat:: @ 817495A
     .string "I got whipped!$"
 
-gUnknown_8174969:: @ 8174969
+VictoryRoad_2F_Text_VincentPostBattle:: @ 8174969
     .string "You earned the right to be on\n"
     .string "VICTORY ROAD…$"
 
-Text_174995:: @ 8174995
+VictoryRoad_2F_Text_GregoryIntro:: @ 8174995
     .string "Is VICTORY ROAD too tough?$"
 
-Text_1749B0:: @ 81749B0
+VictoryRoad_2F_Text_GregoryDefeat:: @ 81749B0
     .string "Well done!$"
 
-gUnknown_81749BB:: @ 81749BB
+VictoryRoad_2F_Text_GregoryPostBattle:: @ 81749BB
     .string "Many TRAINERS give up their\n"
     .string "challenge here and go home.$"
 
+@ Unused, old text for Moltres
+VictoryRoad_2F_Text_Gyaoo:: @ 81749F3
+    .string "ギヤーオ！$"
+