Document Sevii Island caves

3 files changed, 55 insertions, 53 deletions

diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
index b768509fb..6c16bf0c0 100644
--- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
@@ -122,7 +122,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1"
     },
     {
       "type": "trigger",
@@ -131,7 +131,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_7",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7"
     },
     {
       "type": "trigger",
@@ -140,7 +140,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_6",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6"
     },
     {
       "type": "trigger",
@@ -149,7 +149,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_5",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5"
     },
     {
       "type": "trigger",
@@ -158,7 +158,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4"
     },
     {
       "type": "trigger",
@@ -167,7 +167,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3"
     },
     {
       "type": "trigger",
@@ -176,7 +176,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2"
     }
   ],
   "bg_events": []
diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc
index 8758f8517..70ef487b8 100644
--- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc
+++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc
@@ -1,10 +1,12 @@
+.equ NUM_SWITCHES_PRESSED, VAR_TEMP_8
+
 SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC
 	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_SevaultCanyon_TanobyKey_OnTransition
 	.byte 0
 
 SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2
 	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY
-	call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_164E07
+	call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	setvar VAR_TEMP_3, 0
@@ -12,10 +14,10 @@ SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2
 	setvar VAR_TEMP_5, 0
 	setvar VAR_TEMP_6, 0
 	setvar VAR_TEMP_7, 0
-	setvar VAR_TEMP_8, 0
+	setvar NUM_SWITCHES_PRESSED, 0
 	end
 
-EventScript_164E07:: @ 8164E07
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos:: @ 8164E07
 	setobjectxyperm 1, 7, 2
 	setobjectxyperm 2, 4, 4
 	setobjectxyperm 3, 10, 4
@@ -25,85 +27,85 @@ EventScript_164E07:: @ 8164E07
 	setobjectxyperm 7, 9, 8
 	return
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1:: @ 8164E39
 	lockall
 	compare VAR_TEMP_1, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_1, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2:: @ 8164E5C
 	lockall
 	compare VAR_TEMP_2, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_2, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3:: @ 8164E7F
 	lockall
 	compare VAR_TEMP_3, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_3, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4:: @ 8164EA2
 	lockall
 	compare VAR_TEMP_4, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_4, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5:: @ 8164EC5
 	lockall
 	compare VAR_TEMP_5, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_5, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6:: @ 8164EE8
 	lockall
 	compare VAR_TEMP_6, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_6, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7:: @ 8164F0B
 	lockall
 	compare VAR_TEMP_7, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_7, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-EventScript_164F2E:: @ 8164F2E
-	addvar VAR_TEMP_8, 1
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E
+	addvar NUM_SWITCHES_PRESSED, 1
 	playse SE_TRACK_MOVE
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
@@ -113,7 +115,7 @@ EventScript_164F2E:: @ 8164F2E
 	delay 60
 	return
 
-EventScript_164F51:: @ 8164F51
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164F51
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 10
@@ -130,13 +132,13 @@ EventScript_164F51:: @ 8164F51
 	waitse
 	return
 
-EventScript_164F8A:: @ 8164F8A
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed:: @ 8164F8A
 	releaseall
 	end
 
-EventScript_164F8C:: @ 8164F8C
-	call EventScript_164F51
-	msgbox gUnknown_817D31B
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved:: @ 8164F8C
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen
+	msgbox SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway
 	setflag FLAG_SYS_UNLOCKED_TANOBY_RUINS
 	releaseall
 	end
diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc
index c6f137869..f86669ce4 100644
--- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc
+++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc
@@ -1,4 +1,4 @@
-gUnknown_817D31B:: @ 817D31B
+SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway:: @ 817D31B
     .string "A mysterious rumble echoed\n"
     .string "somewhere far away.$"