summaryrefslogtreecommitdiff
path: root/data/maps/MossdeepCity
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/MossdeepCity
parent0f5d96e5f57801137bae8d3cdf3825d0fcd007f1 (diff)
rename town/city vars
Diffstat (limited to 'data/maps/MossdeepCity')
-rw-r--r--data/maps/MossdeepCity/map.json14
-rw-r--r--data/maps/MossdeepCity/scripts.inc2
2 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json
index 533183a35..db24a9b3b 100644
--- a/data/maps/MossdeepCity/map.json
+++ b/data/maps/MossdeepCity/map.json
@@ -366,7 +366,7 @@
"x": 42,
"y": 21,
"elevation": 5,
- "var": "VAR_MOSSDEEP_STATE",
+ "var": "VAR_MOSSDEEP_CITY_STATE",
"var_value": "1",
"script": "MossdeepCity_EventScript_1E4B41"
},
@@ -375,7 +375,7 @@
"x": 41,
"y": 22,
"elevation": 5,
- "var": "VAR_MOSSDEEP_STATE",
+ "var": "VAR_MOSSDEEP_CITY_STATE",
"var_value": "1",
"script": "MossdeepCity_EventScript_1E4B41"
},
@@ -384,7 +384,7 @@
"x": 41,
"y": 23,
"elevation": 5,
- "var": "VAR_MOSSDEEP_STATE",
+ "var": "VAR_MOSSDEEP_CITY_STATE",
"var_value": "1",
"script": "MossdeepCity_EventScript_1E4B41"
},
@@ -393,7 +393,7 @@
"x": 41,
"y": 24,
"elevation": 5,
- "var": "VAR_MOSSDEEP_STATE",
+ "var": "VAR_MOSSDEEP_CITY_STATE",
"var_value": "1",
"script": "MossdeepCity_EventScript_1E4B41"
},
@@ -402,7 +402,7 @@
"x": 40,
"y": 25,
"elevation": 5,
- "var": "VAR_MOSSDEEP_STATE",
+ "var": "VAR_MOSSDEEP_CITY_STATE",
"var_value": "1",
"script": "MossdeepCity_EventScript_1E4B41"
},
@@ -411,7 +411,7 @@
"x": 40,
"y": 26,
"elevation": 5,
- "var": "VAR_MOSSDEEP_STATE",
+ "var": "VAR_MOSSDEEP_CITY_STATE",
"var_value": "1",
"script": "MossdeepCity_EventScript_1E4B41"
}
@@ -482,4 +482,4 @@
"script": "MossdeepCity_EventScript_1E4B14"
}
]
-} \ No newline at end of file
+}
diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc
index 2da9f1f19..646b1d908 100644
--- a/data/maps/MossdeepCity/scripts.inc
+++ b/data/maps/MossdeepCity/scripts.inc
@@ -94,7 +94,7 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41
removeobject 12
removeobject 13
delay 30
- setvar VAR_MOSSDEEP_STATE, 2
+ setvar VAR_MOSSDEEP_CITY_STATE, 2
setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
releaseall
end