summaryrefslogtreecommitdiff
path: root/data/maps/OldaleTown
diff options
context:
space:
mode:
authorGriffinR <25753467+GriffinRichards@users.noreply.github.com>2019-08-05 11:23:45 -0400
committerGitHub <noreply@github.com>2019-08-05 11:23:45 -0400
commitc2bf668fdd63b246a04e3e833e2eaef963cfb17b (patch)
tree024bc1804b5799d36b67fd8c89085c9af48e4ade /data/maps/OldaleTown
parent0f5d96e5f57801137bae8d3cdf3825d0fcd007f1 (diff)
rename town/city vars
Diffstat (limited to 'data/maps/OldaleTown')
-rw-r--r--data/maps/OldaleTown/map.json10
-rw-r--r--data/maps/OldaleTown/scripts.inc4
2 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json
index 37b6105f2..5f91e81ed 100644
--- a/data/maps/OldaleTown/map.json
+++ b/data/maps/OldaleTown/map.json
@@ -119,7 +119,7 @@
"x": 0,
"y": 10,
"elevation": 3,
- "var": "VAR_ROUTE102_ACCESSIBLE",
+ "var": "VAR_OLDALE_TOWN_STATE",
"var_value": "0",
"script": "OldaleTown_EventScript_1E903F"
},
@@ -128,7 +128,7 @@
"x": 8,
"y": 19,
"elevation": 3,
- "var": "VAR_OLDALE_STATE",
+ "var": "VAR_OLDALE_RIVAL_STATE",
"var_value": "1",
"script": "OldaleTown_EventScript_1E9086"
},
@@ -137,7 +137,7 @@
"x": 9,
"y": 19,
"elevation": 3,
- "var": "VAR_OLDALE_STATE",
+ "var": "VAR_OLDALE_RIVAL_STATE",
"var_value": "1",
"script": "OldaleTown_EventScript_1E90A6"
},
@@ -146,7 +146,7 @@
"x": 10,
"y": 19,
"elevation": 3,
- "var": "VAR_OLDALE_STATE",
+ "var": "VAR_OLDALE_RIVAL_STATE",
"var_value": "1",
"script": "OldaleTown_EventScript_1E90C6"
}
@@ -193,4 +193,4 @@
"script": "Common_EventScript_ShowPokemartSign"
}
]
-} \ No newline at end of file
+}
diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
index 3a8b8046b..71b930b83 100644
--- a/data/maps/OldaleTown/scripts.inc
+++ b/data/maps/OldaleTown/scripts.inc
@@ -11,7 +11,7 @@ OldaleTown_OnTransition: @ 81E8EA8
end
OldaleTown_EventScript_1E8ECC:: @ 81E8ECC
- setvar VAR_ROUTE102_ACCESSIBLE, 1
+ setvar VAR_OLDALE_TOWN_STATE, 1
return
OldaleTown_EventScript_1E8ED2:: @ 81E8ED2
@@ -280,7 +280,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A
applymovement 4, OldaleTown_Movement_1E9177
waitmovement 0
removeobject 4
- setvar VAR_OLDALE_STATE, 2
+ setvar VAR_OLDALE_RIVAL_STATE, 2
setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
releaseall
end