summaryrefslogtreecommitdiff
path: root/data/maps/Route22
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-10-18 12:49:59 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-10-18 12:49:59 -0400
commit4f15cb02d29707bc30a57db725cbea09aec43eb8 (patch)
tree00cf809c83a39ae20e08395e7be79c538f85df90 /data/maps/Route22
parent9903f7a77a1836c269119dcf2766df5ab09df765 (diff)
Rename map scene vars and partially document Oak's lab
Diffstat (limited to 'data/maps/Route22')
-rw-r--r--data/maps/Route22/map.json12
-rw-r--r--data/maps/Route22/scripts.inc4
2 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json
index c03b8068d..5a5969bb3 100644
--- a/data/maps/Route22/map.json
+++ b/data/maps/Route22/map.json
@@ -60,7 +60,7 @@
"x": 33,
"y": 4,
"elevation": 3,
- "var": "VAR_0x4054",
+ "var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 1,
"script": "Route22_EventScript_16828C"
},
@@ -69,7 +69,7 @@
"x": 33,
"y": 5,
"elevation": 3,
- "var": "VAR_0x4054",
+ "var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 1,
"script": "Route22_EventScript_168298"
},
@@ -78,7 +78,7 @@
"x": 33,
"y": 6,
"elevation": 0,
- "var": "VAR_0x4054",
+ "var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 1,
"script": "Route22_EventScript_1682AB"
},
@@ -87,7 +87,7 @@
"x": 33,
"y": 4,
"elevation": 3,
- "var": "VAR_0x4054",
+ "var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 3,
"script": "Route22_EventScript_1683ED"
},
@@ -96,7 +96,7 @@
"x": 33,
"y": 5,
"elevation": 3,
- "var": "VAR_0x4054",
+ "var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 3,
"script": "Route22_EventScript_1683F9"
},
@@ -105,7 +105,7 @@
"x": 33,
"y": 6,
"elevation": 0,
- "var": "VAR_0x4054",
+ "var": "VAR_MAP_SCENE_ROUTE22",
"var_value": 3,
"script": "Route22_EventScript_16840C"
}
diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc
index d7855e45e..930665e21 100644
--- a/data/maps/Route22/scripts.inc
+++ b/data/maps/Route22/scripts.inc
@@ -57,7 +57,7 @@ EventScript_1682BE:: @ 81682BE
call_if 1, EventScript_1683A5
fadedefaultbgm
removeobject 1
- setvar VAR_0x4054, 2
+ setvar VAR_MAP_SCENE_ROUTE22, 2
releaseall
end
@@ -219,7 +219,7 @@ EventScript_16841F:: @ 816841F
waitmovement 0
fadedefaultbgm
removeobject 1
- setvar VAR_0x4054, 4
+ setvar VAR_MAP_SCENE_ROUTE22, 4
releaseall
end