summaryrefslogtreecommitdiff
path: root/data/maps/PokemonTower_5F
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-09 14:46:14 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-09 14:46:14 -0500
commit94fbc3ac489e529176533a1fad7deac7e1014b9d (patch)
tree601565077b265a1f4dbe7d9272f3c7a13797e5e1 /data/maps/PokemonTower_5F
parent0f5e3174d0d4b910beb273de772772d257692c94 (diff)
Sync temp vars
Diffstat (limited to 'data/maps/PokemonTower_5F')
-rw-r--r--data/maps/PokemonTower_5F/map.json34
-rw-r--r--data/maps/PokemonTower_5F/scripts.inc4
2 files changed, 19 insertions, 19 deletions
diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json
index bd64e246e..37b0653e6 100644
--- a/data/maps/PokemonTower_5F/map.json
+++ b/data/maps/PokemonTower_5F/map.json
@@ -127,7 +127,7 @@
"x": 10,
"y": 8,
"elevation": 3,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
},
@@ -136,7 +136,7 @@
"x": 11,
"y": 8,
"elevation": 3,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
},
@@ -145,7 +145,7 @@
"x": 12,
"y": 8,
"elevation": 3,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
},
@@ -154,7 +154,7 @@
"x": 10,
"y": 9,
"elevation": 3,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
},
@@ -163,7 +163,7 @@
"x": 9,
"y": 8,
"elevation": 3,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
},
@@ -172,7 +172,7 @@
"x": 12,
"y": 9,
"elevation": 3,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
},
@@ -181,7 +181,7 @@
"x": 10,
"y": 10,
"elevation": 3,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
},
@@ -190,7 +190,7 @@
"x": 11,
"y": 10,
"elevation": 3,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
},
@@ -199,7 +199,7 @@
"x": 12,
"y": 10,
"elevation": 0,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 0,
"script": "PokemonTower_5F_EventScript_16343C"
},
@@ -208,7 +208,7 @@
"x": 9,
"y": 9,
"elevation": 3,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
},
@@ -217,7 +217,7 @@
"x": 9,
"y": 10,
"elevation": 3,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
},
@@ -226,7 +226,7 @@
"x": 10,
"y": 11,
"elevation": 3,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
},
@@ -235,7 +235,7 @@
"x": 11,
"y": 11,
"elevation": 3,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
},
@@ -244,7 +244,7 @@
"x": 12,
"y": 11,
"elevation": 0,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
},
@@ -253,7 +253,7 @@
"x": 13,
"y": 8,
"elevation": 0,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
},
@@ -262,7 +262,7 @@
"x": 13,
"y": 9,
"elevation": 0,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
},
@@ -271,7 +271,7 @@
"x": 13,
"y": 10,
"elevation": 0,
- "var": "VAR_0x4001",
+ "var": "VAR_TEMP_1",
"var_value": 1,
"script": "PokemonTower_5F_EventScript_163453"
}
diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc
index 85517e241..18dc1aedd 100644
--- a/data/maps/PokemonTower_5F/scripts.inc
+++ b/data/maps/PokemonTower_5F/scripts.inc
@@ -11,13 +11,13 @@ PokemonTower_5F_EventScript_16343C:: @ 816343C
special sp000_heal_pokemon
fadescreen 2
msgbox gUnknown_817A1FA
- setvar VAR_0x4001, 1
+ setvar VAR_TEMP_1, 1
releaseall
end
PokemonTower_5F_EventScript_163453:: @ 8163453
lockall
- setvar VAR_0x4001, 0
+ setvar VAR_TEMP_1, 0
releaseall
end