Rename map scene vars and partially document Oak's lab

2 files changed, 15 insertions, 15 deletions

diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json
index 635f1a356..9c111147d 100644
--- a/data/maps/ThreeIsland/map.json
+++ b/data/maps/ThreeIsland/map.json
@@ -264,7 +264,7 @@
       "x": 7,
       "y": 27,
       "elevation": 3,
-      "var": "VAR_0x407B",
+      "var": "VAR_MAP_SCENE_THREE_ISLAND",
       "var_value": 2,
       "script": "ThreeIsland_EventScript_1679B5"
     },
@@ -273,7 +273,7 @@
       "x": 8,
       "y": 27,
       "elevation": 3,
-      "var": "VAR_0x407B",
+      "var": "VAR_MAP_SCENE_THREE_ISLAND",
       "var_value": 2,
       "script": "ThreeIsland_EventScript_1679B5"
     },
@@ -282,7 +282,7 @@
       "x": 9,
       "y": 27,
       "elevation": 3,
-      "var": "VAR_0x407B",
+      "var": "VAR_MAP_SCENE_THREE_ISLAND",
       "var_value": 2,
       "script": "ThreeIsland_EventScript_1679B5"
     },
@@ -291,7 +291,7 @@
       "x": 10,
       "y": 27,
       "elevation": 3,
-      "var": "VAR_0x407B",
+      "var": "VAR_MAP_SCENE_THREE_ISLAND",
       "var_value": 2,
       "script": "ThreeIsland_EventScript_1679B5"
     },
@@ -300,7 +300,7 @@
       "x": 7,
       "y": 26,
       "elevation": 3,
-      "var": "VAR_0x407B",
+      "var": "VAR_MAP_SCENE_THREE_ISLAND",
       "var_value": 3,
       "script": "ThreeIsland_EventScript_167A1D"
     },
@@ -309,7 +309,7 @@
       "x": 8,
       "y": 26,
       "elevation": 3,
-      "var": "VAR_0x407B",
+      "var": "VAR_MAP_SCENE_THREE_ISLAND",
       "var_value": 3,
       "script": "ThreeIsland_EventScript_167A29"
     },
@@ -318,7 +318,7 @@
       "x": 9,
       "y": 26,
       "elevation": 3,
-      "var": "VAR_0x407B",
+      "var": "VAR_MAP_SCENE_THREE_ISLAND",
       "var_value": 3,
       "script": "ThreeIsland_EventScript_167A35"
     },
@@ -327,7 +327,7 @@
       "x": 11,
       "y": 27,
       "elevation": 3,
-      "var": "VAR_0x407B",
+      "var": "VAR_MAP_SCENE_THREE_ISLAND",
       "var_value": 2,
       "script": "ThreeIsland_EventScript_1679B5"
     },
@@ -336,7 +336,7 @@
       "x": 10,
       "y": 26,
       "elevation": 3,
-      "var": "VAR_0x407B",
+      "var": "VAR_MAP_SCENE_THREE_ISLAND",
       "var_value": 3,
       "script": "ThreeIsland_EventScript_167A41"
     },
@@ -345,7 +345,7 @@
       "x": 11,
       "y": 26,
       "elevation": 3,
-      "var": "VAR_0x407B",
+      "var": "VAR_MAP_SCENE_THREE_ISLAND",
       "var_value": 3,
       "script": "ThreeIsland_EventScript_167A4D"
     }
diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc
index 346d5b6a2..78d532795 100644
--- a/data/maps/ThreeIsland/scripts.inc
+++ b/data/maps/ThreeIsland/scripts.inc
@@ -6,7 +6,7 @@ ThreeIsland_MapScript1_1677B3:: @ 81677B3
 	setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND
 	checkflag FLAG_0x2A3
 	call_if 1, EventScript_1677CB
-	compare_var_to_value VAR_0x407B, 4
+	compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4
 	call_if 1, EventScript_1677CF
 	end
 
@@ -30,7 +30,7 @@ ThreeIsland_EventScript_1677E5:: @ 81677E5
 	lock
 	checkflag FLAG_0x2FC
 	goto_if_eq EventScript_167806
-	compare_var_to_value VAR_0x407B, 4
+	compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4
 	goto_if_eq EventScript_16781A
 	setvar VAR_0x4001, 0
 	call EventScript_16786F
@@ -136,7 +136,7 @@ EventScript_167973:: @ 8167973
 
 ThreeIsland_EventScript_167989:: @ 8167989
 	lock
-	compare_var_to_value VAR_0x407B, 4
+	compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4
 	goto_if_eq EventScript_1679A1
 	setvar VAR_0x4001, 1
 	call EventScript_16786F
@@ -168,7 +168,7 @@ ThreeIsland_EventScript_1679B5:: @ 81679B5
 	applymovement 1, Movement_167A1B
 	waitmovement 0
 	msgbox gUnknown_81823C7
-	setvar VAR_0x407B, 3
+	setvar VAR_MAP_SCENE_THREE_ISLAND, 3
 	releaseall
 	end
 
@@ -281,7 +281,7 @@ EventScript_167A59:: @ 8167A59
 	removeobject 8
 	removeobject 14
 	fadescreen 0
-	setvar VAR_0x407B, 4
+	setvar VAR_MAP_SCENE_THREE_ISLAND, 4
 	releaseall
 	end