summaryrefslogtreecommitdiff
path: root/data/maps/JaggedPass
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-02-27 20:25:09 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-02-27 20:25:09 -0500
commite77e7844ea6b6cdba1a6386f144aa712aea1807b (patch)
tree9d4b545bf8ca949e55b662cd2f6f536ee78136cd /data/maps/JaggedPass
parent648fc3d4f33b0df553b0fd3737843a1495351993 (diff)
Name several vars, document some related events
Diffstat (limited to 'data/maps/JaggedPass')
-rw-r--r--data/maps/JaggedPass/map.json10
-rw-r--r--data/maps/JaggedPass/scripts.inc8
2 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json
index 1b9c5471d..3ec89fce6 100644
--- a/data/maps/JaggedPass/map.json
+++ b/data/maps/JaggedPass/map.json
@@ -184,7 +184,7 @@
"x": 21,
"y": 15,
"elevation": 3,
- "var": "VAR_0x40C8",
+ "var": "VAR_JAGGED_PASS_STATE",
"var_value": "1",
"script": "JaggedPass_EventScript_2306BB"
},
@@ -193,7 +193,7 @@
"x": 22,
"y": 20,
"elevation": 3,
- "var": "VAR_0x40C8",
+ "var": "VAR_JAGGED_PASS_STATE",
"var_value": "1",
"script": "JaggedPass_EventScript_2306BB"
},
@@ -202,7 +202,7 @@
"x": 21,
"y": 20,
"elevation": 3,
- "var": "VAR_0x40C8",
+ "var": "VAR_JAGGED_PASS_STATE",
"var_value": "1",
"script": "JaggedPass_EventScript_2306BB"
},
@@ -211,7 +211,7 @@
"x": 14,
"y": 15,
"elevation": 3,
- "var": "VAR_0x40C8",
+ "var": "VAR_JAGGED_PASS_STATE",
"var_value": "1",
"script": "JaggedPass_EventScript_2306BB"
},
@@ -220,7 +220,7 @@
"x": 13,
"y": 15,
"elevation": 3,
- "var": "VAR_0x40C8",
+ "var": "VAR_JAGGED_PASS_STATE",
"var_value": "1",
"script": "JaggedPass_EventScript_2306BB"
}
diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc
index 3df62fc7d..c51a5ec26 100644
--- a/data/maps/JaggedPass/scripts.inc
+++ b/data/maps/JaggedPass/scripts.inc
@@ -6,7 +6,7 @@ JaggedPass_MapScripts:: @ 8230656
JaggedPass_MapScript1_230666: @ 8230666
setstepcallback 1
- compare VAR_0x40C8, 0
+ compare VAR_JAGGED_PASS_STATE, 0
call_if_eq JaggedPass_EventScript_230674
end
@@ -17,7 +17,7 @@ JaggedPass_EventScript_230674:: @ 8230674
return
JaggedPass_EventScript_230685:: @ 8230685
- setvar VAR_0x40C8, 1
+ setvar VAR_JAGGED_PASS_STATE, 1
return
JaggedPass_MapScript1_23068B: @ 823068B
@@ -31,7 +31,7 @@ JaggedPass_EventScript_230697:: @ 8230697
return
JaggedPass_MapScript1_23069C: @ 823069C
- compare VAR_0x40C8, 1
+ compare VAR_JAGGED_PASS_STATE, 1
goto_if_le JaggedPass_EventScript_2306A8
end
@@ -61,7 +61,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB
setmetatile 16, 18, 606, 0
special DrawWholeMapView
delay 30
- setvar VAR_0x40C8, 2
+ setvar VAR_JAGGED_PASS_STATE, 2
waitse
releaseall
end