summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2019-02-16 16:46:26 -0500
committerhuderlem <huderlem@gmail.com>2019-02-16 16:15:19 -0600
commitb8253e39067214072048737cb428cc47e3163621 (patch)
tree576ebf68c54c5137a5caa04c91a788f21953abac
parentfef1f0c11af596f9a740bbab82836dcef6978bab (diff)
use strings for map json coord_event var_value
-rw-r--r--data/maps/AquaHideout_B2F/map.json4
-rw-r--r--data/maps/CaveOfOrigin_1F/map.json6
-rw-r--r--data/maps/CaveOfOrigin_B1F/map.json6
-rw-r--r--data/maps/CaveOfOrigin_B2F/map.json6
-rw-r--r--data/maps/CaveOfOrigin_B3F/map.json6
-rw-r--r--data/maps/CaveOfOrigin_B4F/map.json6
-rw-r--r--data/maps/DoubleBattleColosseum/map.json8
-rw-r--r--data/maps/EverGrandeCity/map.json22
-rw-r--r--data/maps/InsideOfTruck/map.json6
-rw-r--r--data/maps/LavaridgeTown/map.json2
-rw-r--r--data/maps/LilycoveCity_CoveLilyMotel_1F/map.json2
-rw-r--r--data/maps/LittlerootTown/map.json18
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_1F/map.json2
-rw-r--r--data/maps/LittlerootTown_MaysHouse_1F/map.json2
-rw-r--r--data/maps/MagmaHideout_B2F/map.json8
-rw-r--r--data/maps/MauvilleCity_Gym/map.json6
-rw-r--r--data/maps/MeteorFalls_1F_1R/map.json2
-rw-r--r--data/maps/MossdeepCity/map.json8
-rw-r--r--data/maps/MossdeepCity_Gym/map.json2
-rw-r--r--data/maps/MtPyre_Exterior/map.json10
-rw-r--r--data/maps/MtPyre_Summit/map.json12
-rw-r--r--data/maps/NewMauville_Entrance/map.json2
-rw-r--r--data/maps/NewMauville_Inside/map.json20
-rw-r--r--data/maps/OldaleTown/map.json8
-rw-r--r--data/maps/PetalburgCity/map.json8
-rw-r--r--data/maps/PetalburgWoods/map.json4
-rw-r--r--data/maps/RecordCorner/map.json8
-rw-r--r--data/maps/Route101/map.json18
-rw-r--r--data/maps/Route110/map.json10
-rw-r--r--data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json4
-rw-r--r--data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json4
-rw-r--r--data/maps/Route110_TrickHouseEnd/map.json2
-rw-r--r--data/maps/Route110_TrickHouseEntrance/map.json8
-rw-r--r--data/maps/Route110_TrickHousePuzzle2/map.json8
-rw-r--r--data/maps/Route110_TrickHousePuzzle3/map.json14
-rw-r--r--data/maps/Route110_TrickHousePuzzle5/map.json28
-rw-r--r--data/maps/Route110_TrickHousePuzzle7/map.json2
-rw-r--r--data/maps/Route111/map.json68
-rw-r--r--data/maps/Route116/map.json2
-rw-r--r--data/maps/Route118/map.json6
-rw-r--r--data/maps/Route119/map.json4
-rw-r--r--data/maps/Route121/map.json8
-rw-r--r--data/maps/Route121_SafariZoneEntrance/map.json2
-rw-r--r--data/maps/RustboroCity/map.json26
-rw-r--r--data/maps/RusturfTunnel/map.json10
-rw-r--r--data/maps/SeafloorCavern_Room9/map.json2
-rw-r--r--data/maps/SingleBattleColosseum/map.json4
-rw-r--r--data/maps/SlateportCity_Harbor/map.json8
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_1F/map.json4
-rw-r--r--data/maps/SootopolisCity/map.json2
-rw-r--r--data/maps/TradeCenter/map.json4
-rw-r--r--data/maps/VictoryRoad_1F/map.json6
-rwxr-xr-xtools/mapjson/mapjson.cpp2
53 files changed, 225 insertions, 225 deletions
diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json
index 261ddef1a..26a7a8f18 100644
--- a/data/maps/AquaHideout_B2F/map.json
+++ b/data/maps/AquaHideout_B2F/map.json
@@ -156,7 +156,7 @@
"y": 17,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "AquaHideout_B2F_EventScript_15D8BD"
},
{
@@ -165,7 +165,7 @@
"y": 16,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "AquaHideout_B2F_EventScript_15D8BD"
}
],
diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json
index 0f6ce5425..1c5957605 100644
--- a/data/maps/CaveOfOrigin_1F/map.json
+++ b/data/maps/CaveOfOrigin_1F/map.json
@@ -34,7 +34,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_1F_EventScript_1A04AF"
},
{
@@ -43,7 +43,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_1F_EventScript_1A04AF"
},
{
@@ -52,7 +52,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_1F_EventScript_1A04AF"
}
],
diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json
index 0e4472d9b..d0c378768 100644
--- a/data/maps/CaveOfOrigin_B1F/map.json
+++ b/data/maps/CaveOfOrigin_B1F/map.json
@@ -34,7 +34,7 @@
"y": 15,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_B1F_EventScript_1A04AF"
},
{
@@ -43,7 +43,7 @@
"y": 16,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_B1F_EventScript_1A04AF"
},
{
@@ -52,7 +52,7 @@
"y": 17,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_B1F_EventScript_1A04AF"
}
],
diff --git a/data/maps/CaveOfOrigin_B2F/map.json b/data/maps/CaveOfOrigin_B2F/map.json
index 22aafca95..793424743 100644
--- a/data/maps/CaveOfOrigin_B2F/map.json
+++ b/data/maps/CaveOfOrigin_B2F/map.json
@@ -34,7 +34,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_B2F_EventScript_1A04AF"
},
{
@@ -43,7 +43,7 @@
"y": 5,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_B2F_EventScript_1A04AF"
},
{
@@ -52,7 +52,7 @@
"y": 13,
"elevation": 3,
"var": "VAR_TEMP_2",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_B2F_EventScript_1A04BB"
}
],
diff --git a/data/maps/CaveOfOrigin_B3F/map.json b/data/maps/CaveOfOrigin_B3F/map.json
index c76f3ddb9..3facbfc11 100644
--- a/data/maps/CaveOfOrigin_B3F/map.json
+++ b/data/maps/CaveOfOrigin_B3F/map.json
@@ -48,7 +48,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_B3F_EventScript_1A04AF"
},
{
@@ -57,7 +57,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_TEMP_2",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_B3F_EventScript_1A04BB"
},
{
@@ -66,7 +66,7 @@
"y": 5,
"elevation": 3,
"var": "VAR_TEMP_2",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_B3F_EventScript_1A04BB"
}
],
diff --git a/data/maps/CaveOfOrigin_B4F/map.json b/data/maps/CaveOfOrigin_B4F/map.json
index 5e37dd68f..256532918 100644
--- a/data/maps/CaveOfOrigin_B4F/map.json
+++ b/data/maps/CaveOfOrigin_B4F/map.json
@@ -41,7 +41,7 @@
"y": 13,
"elevation": 3,
"var": "VAR_CAVE_OF_ORIGIN_B4F_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_B4F_EventScript_15DDD7"
},
{
@@ -50,7 +50,7 @@
"y": 9,
"elevation": 3,
"var": "VAR_TEMP_5",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_B4F_EventScript_1A04A0"
},
{
@@ -59,7 +59,7 @@
"y": 9,
"elevation": 3,
"var": "VAR_TEMP_5",
- "var_value": 0,
+ "var_value": "0",
"script": "CaveOfOrigin_B4F_EventScript_1A04A0"
}
],
diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json
index 0be0abca0..b7c3bad8f 100644
--- a/data/maps/DoubleBattleColosseum/map.json
+++ b/data/maps/DoubleBattleColosseum/map.json
@@ -48,7 +48,7 @@
"y": 4,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "DoubleBattleColosseum_EventScript_1A4383"
},
{
@@ -57,7 +57,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "DoubleBattleColosseum_EventScript_1A43B9"
},
{
@@ -66,7 +66,7 @@
"y": 4,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "DoubleBattleColosseum_EventScript_1A439E"
},
{
@@ -75,7 +75,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "DoubleBattleColosseum_EventScript_1A43D4"
}
],
diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json
index 302d83583..5b45d25af 100644
--- a/data/maps/EverGrandeCity/map.json
+++ b/data/maps/EverGrandeCity/map.json
@@ -54,7 +54,7 @@
"y": 58,
"elevation": 1,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "EverGrandeCity_EventScript_14D500"
},
{
@@ -63,7 +63,7 @@
"y": 58,
"elevation": 1,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "EverGrandeCity_EventScript_14D500"
},
{
@@ -72,7 +72,7 @@
"y": 58,
"elevation": 1,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "EverGrandeCity_EventScript_14D500"
},
{
@@ -81,7 +81,7 @@
"y": 58,
"elevation": 1,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "EverGrandeCity_EventScript_14D500"
},
{
@@ -90,7 +90,7 @@
"y": 58,
"elevation": 1,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "EverGrandeCity_EventScript_14D500"
},
{
@@ -99,7 +99,7 @@
"y": 58,
"elevation": 1,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "EverGrandeCity_EventScript_14D500"
},
{
@@ -108,7 +108,7 @@
"y": 58,
"elevation": 1,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "EverGrandeCity_EventScript_14D500"
},
{
@@ -117,7 +117,7 @@
"y": 58,
"elevation": 1,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "EverGrandeCity_EventScript_14D500"
},
{
@@ -126,7 +126,7 @@
"y": 58,
"elevation": 1,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "EverGrandeCity_EventScript_14D500"
},
{
@@ -135,7 +135,7 @@
"y": 58,
"elevation": 1,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "EverGrandeCity_EventScript_14D500"
},
{
@@ -144,7 +144,7 @@
"y": 58,
"elevation": 1,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "EverGrandeCity_EventScript_14D500"
}
],
diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json
index dc8820bc3..50d05a347 100644
--- a/data/maps/InsideOfTruck/map.json
+++ b/data/maps/InsideOfTruck/map.json
@@ -81,7 +81,7 @@
"y": 1,
"elevation": 3,
"var": "VAR_LITTLEROOT_INTRO_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "InsideOfTruck_EventScript_15FC29"
},
{
@@ -90,7 +90,7 @@
"y": 2,
"elevation": 3,
"var": "VAR_LITTLEROOT_INTRO_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "InsideOfTruck_EventScript_15FC29"
},
{
@@ -99,7 +99,7 @@
"y": 3,
"elevation": 3,
"var": "VAR_LITTLEROOT_INTRO_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "InsideOfTruck_EventScript_15FC29"
}
],
diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json
index 53f5ceee1..bc7d5ac89 100644
--- a/data/maps/LavaridgeTown/map.json
+++ b/data/maps/LavaridgeTown/map.json
@@ -186,7 +186,7 @@
"y": 3,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "LavaridgeTown_EventScript_14E710"
}
],
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
index 0134bb7be..709e2d5f8 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
@@ -55,7 +55,7 @@
"y": 2,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "LilycoveCity_CoveLilyMotel_1F_EventScript_15834D"
}
],
diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json
index 70bbd124d..877427643 100644
--- a/data/maps/LittlerootTown/map.json
+++ b/data/maps/LittlerootTown/map.json
@@ -126,7 +126,7 @@
"y": 1,
"elevation": 3,
"var": "VAR_LITTLEROOT_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "LittlerootTown_EventScript_14D739"
},
{
@@ -135,7 +135,7 @@
"y": 1,
"elevation": 3,
"var": "VAR_LITTLEROOT_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "LittlerootTown_EventScript_14D797"
},
{
@@ -144,7 +144,7 @@
"y": 1,
"elevation": 3,
"var": "VAR_LITTLEROOT_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "LittlerootTown_EventScript_14D7C7"
},
{
@@ -153,7 +153,7 @@
"y": 9,
"elevation": 3,
"var": "VAR_LITTLEROOT_STATE",
- "var_value": 3,
+ "var_value": "3",
"script": "LittlerootTown_EventScript_14D89E"
},
{
@@ -162,7 +162,7 @@
"y": 9,
"elevation": 3,
"var": "VAR_LITTLEROOT_STATE",
- "var_value": 3,
+ "var_value": "3",
"script": "LittlerootTown_EventScript_14D8AA"
},
{
@@ -171,7 +171,7 @@
"y": 9,
"elevation": 3,
"var": "VAR_LITTLEROOT_STATE",
- "var_value": 3,
+ "var_value": "3",
"script": "LittlerootTown_EventScript_14D886"
},
{
@@ -180,7 +180,7 @@
"y": 9,
"elevation": 3,
"var": "VAR_LITTLEROOT_STATE",
- "var_value": 3,
+ "var_value": "3",
"script": "LittlerootTown_EventScript_14D892"
},
{
@@ -189,7 +189,7 @@
"y": 2,
"elevation": 3,
"var": "VAR_LITTLEROOT_STATE",
- "var_value": 3,
+ "var_value": "3",
"script": "LittlerootTown_EventScript_14D860"
},
{
@@ -198,7 +198,7 @@
"y": 2,
"elevation": 3,
"var": "VAR_LITTLEROOT_STATE",
- "var_value": 3,
+ "var_value": "3",
"script": "LittlerootTown_EventScript_14D873"
}
],
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json
index adf8e708a..ecea59c61 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json
@@ -107,7 +107,7 @@
"y": 8,
"elevation": 0,
"var": "VAR_LITTLEROOT_INTRO_STATE",
- "var_value": 4,
+ "var_value": "4",
"script": "LittlerootTown_BrendansHouse_1F_EventScript_152789"
}
],
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json
index 118408491..b9816d7a9 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/map.json
+++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json
@@ -107,7 +107,7 @@
"y": 8,
"elevation": 0,
"var": "VAR_LITTLEROOT_INTRO_STATE",
- "var_value": 4,
+ "var_value": "4",
"script": "LittlerootTown_MaysHouse_1F_EventScript_152A35"
}
],
diff --git a/data/maps/MagmaHideout_B2F/map.json b/data/maps/MagmaHideout_B2F/map.json
index cef72bb71..43f5635ae 100644
--- a/data/maps/MagmaHideout_B2F/map.json
+++ b/data/maps/MagmaHideout_B2F/map.json
@@ -142,7 +142,7 @@
"y": 16,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "MagmaHideout_B2F_EventScript_15D8BD"
},
{
@@ -151,7 +151,7 @@
"y": 16,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "MagmaHideout_B2F_EventScript_15D8BD"
},
{
@@ -160,7 +160,7 @@
"y": 16,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "MagmaHideout_B2F_EventScript_15D8BD"
},
{
@@ -169,7 +169,7 @@
"y": 16,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "MagmaHideout_B2F_EventScript_15D8BD"
}
],
diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json
index 96a98f68d..9e645ac0f 100644
--- a/data/maps/MauvilleCity_Gym/map.json
+++ b/data/maps/MauvilleCity_Gym/map.json
@@ -113,7 +113,7 @@
"y": 9,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "MauvilleCity_Gym_EventScript_15664B"
},
{
@@ -122,7 +122,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "MauvilleCity_Gym_EventScript_156670"
},
{
@@ -131,7 +131,7 @@
"y": 15,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "MauvilleCity_Gym_EventScript_156695"
}
],
diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json
index afe2a0b02..20ea50203 100644
--- a/data/maps/MeteorFalls_1F_1R/map.json
+++ b/data/maps/MeteorFalls_1F_1R/map.json
@@ -186,7 +186,7 @@
"y": 18,
"elevation": 4,
"var": "VAR_METEOR_FALLS_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "MeteorFalls_1F_1R_EventScript_15C49C"
}
],
diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json
index ea70834d8..043102b11 100644
--- a/data/maps/MossdeepCity/map.json
+++ b/data/maps/MossdeepCity/map.json
@@ -224,7 +224,7 @@
"y": 25,
"elevation": 0,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "MossdeepCity_EventScript_14D008"
},
{
@@ -233,7 +233,7 @@
"y": 25,
"elevation": 0,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "MossdeepCity_EventScript_14D008"
},
{
@@ -242,7 +242,7 @@
"y": 27,
"elevation": 0,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "MossdeepCity_EventScript_14D008"
},
{
@@ -251,7 +251,7 @@
"y": 27,
"elevation": 0,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "MossdeepCity_EventScript_14D008"
}
],
diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json
index 5a2b7ede2..efbeb7c11 100644
--- a/data/maps/MossdeepCity_Gym/map.json
+++ b/data/maps/MossdeepCity_Gym/map.json
@@ -152,7 +152,7 @@
"y": 3,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "MossdeepCity_Gym_EventScript_15A742"
}
],
diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json
index 33ddc049c..f39b1f43d 100644
--- a/data/maps/MtPyre_Exterior/map.json
+++ b/data/maps/MtPyre_Exterior/map.json
@@ -68,7 +68,7 @@
"y": 21,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "MtPyre_Exterior_EventScript_15D4A7"
},
{
@@ -77,7 +77,7 @@
"y": 21,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "MtPyre_Exterior_EventScript_15D4A7"
},
{
@@ -86,7 +86,7 @@
"y": 27,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "MtPyre_Exterior_EventScript_15D4AC"
},
{
@@ -95,7 +95,7 @@
"y": 28,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "MtPyre_Exterior_EventScript_15D4AC"
},
{
@@ -104,7 +104,7 @@
"y": 21,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "MtPyre_Exterior_EventScript_15D4A7"
}
],
diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json
index 90fe628b9..63d64d361 100644
--- a/data/maps/MtPyre_Summit/map.json
+++ b/data/maps/MtPyre_Summit/map.json
@@ -120,7 +120,7 @@
"y": 7,
"elevation": 3,
"var": "VAR_MT_PYRE_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "MtPyre_Summit_EventScript_15D4BD"
},
{
@@ -129,7 +129,7 @@
"y": 7,
"elevation": 3,
"var": "VAR_MT_PYRE_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "MtPyre_Summit_EventScript_15D4C9"
},
{
@@ -138,7 +138,7 @@
"y": 7,
"elevation": 3,
"var": "VAR_MT_PYRE_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "MtPyre_Summit_EventScript_15D4D5"
},
{
@@ -147,7 +147,7 @@
"y": 7,
"elevation": 3,
"var": "VAR_MT_PYRE_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "MtPyre_Summit_EventScript_15D6CE"
},
{
@@ -156,7 +156,7 @@
"y": 7,
"elevation": 3,
"var": "VAR_MT_PYRE_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "MtPyre_Summit_EventScript_15D6DA"
},
{
@@ -165,7 +165,7 @@
"y": 7,
"elevation": 3,
"var": "VAR_MT_PYRE_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "MtPyre_Summit_EventScript_15D6E6"
}
],
diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json
index f1b36e8b2..0d519bcd0 100644
--- a/data/maps/NewMauville_Entrance/map.json
+++ b/data/maps/NewMauville_Entrance/map.json
@@ -34,7 +34,7 @@
"y": 2,
"elevation": 3,
"var": "VAR_NEW_MAUVILLE_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "NewMauville_Entrance_EventScript_15E4DC"
}
],
diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json
index 7fff8dddc..436a6a8ac 100644
--- a/data/maps/NewMauville_Inside/map.json
+++ b/data/maps/NewMauville_Inside/map.json
@@ -132,7 +132,7 @@
"y": 38,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "NewMauville_Inside_EventScript_15E5AA"
},
{
@@ -141,7 +141,7 @@
"y": 36,
"elevation": 3,
"var": "VAR_TEMP_2",
- "var_value": 0,
+ "var_value": "0",
"script": "NewMauville_Inside_EventScript_15E5C2"
},
{
@@ -150,7 +150,7 @@
"y": 26,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "NewMauville_Inside_EventScript_15E5AA"
},
{
@@ -159,7 +159,7 @@
"y": 22,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "NewMauville_Inside_EventScript_15E5AA"
},
{
@@ -168,7 +168,7 @@
"y": 18,
"elevation": 3,
"var": "VAR_TEMP_2",
- "var_value": 0,
+ "var_value": "0",
"script": "NewMauville_Inside_EventScript_15E5C2"
},
{
@@ -177,7 +177,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_TEMP_2",
- "var_value": 0,
+ "var_value": "0",
"script": "NewMauville_Inside_EventScript_15E5C2"
},
{
@@ -186,7 +186,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "NewMauville_Inside_EventScript_15E5AA"
},
{
@@ -195,7 +195,7 @@
"y": 10,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "NewMauville_Inside_EventScript_15E5AA"
},
{
@@ -204,7 +204,7 @@
"y": 10,
"elevation": 3,
"var": "VAR_TEMP_2",
- "var_value": 0,
+ "var_value": "0",
"script": "NewMauville_Inside_EventScript_15E5C2"
},
{
@@ -213,7 +213,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_NEW_MAUVILLE_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "NewMauville_Inside_EventScript_15E876"
}
],
diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json
index f2a13dfe3..8ff4d7a5c 100644
--- a/data/maps/OldaleTown/map.json
+++ b/data/maps/OldaleTown/map.json
@@ -117,7 +117,7 @@
"y": 10,
"elevation": 3,
"var": "VAR_ROUTE102_ACCESSIBLE",
- "var_value": 0,
+ "var_value": "0",
"script": "OldaleTown_EventScript_14DEFF"
},
{
@@ -126,7 +126,7 @@
"y": 19,
"elevation": 3,
"var": "VAR_OLDALE_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "OldaleTown_EventScript_14DF41"
},
{
@@ -135,7 +135,7 @@
"y": 19,
"elevation": 3,
"var": "VAR_OLDALE_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "OldaleTown_EventScript_14DF5C"
},
{
@@ -144,7 +144,7 @@
"y": 19,
"elevation": 3,
"var": "VAR_OLDALE_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "OldaleTown_EventScript_14DF77"
}
],
diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json
index 845831ed9..2f2df4e67 100644
--- a/data/maps/PetalburgCity/map.json
+++ b/data/maps/PetalburgCity/map.json
@@ -191,7 +191,7 @@
"y": 10,
"elevation": 3,
"var": "VAR_PETALBURG_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "PetalburgCity_EventScript_14B836"
},
{
@@ -200,7 +200,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_PETALBURG_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "PetalburgCity_EventScript_14B842"
},
{
@@ -209,7 +209,7 @@
"y": 12,
"elevation": 3,
"var": "VAR_PETALBURG_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "PetalburgCity_EventScript_14B84E"
},
{
@@ -218,7 +218,7 @@
"y": 13,
"elevation": 3,
"var": "VAR_PETALBURG_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "PetalburgCity_EventScript_14B85A"
}
],
diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json
index e7b10754a..eb97316d8 100644
--- a/data/maps/PetalburgWoods/map.json
+++ b/data/maps/PetalburgWoods/map.json
@@ -232,7 +232,7 @@
"y": 23,
"elevation": 3,
"var": "VAR_PETALBURG_WOODS_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "PetalburgWoods_EventScript_15CCA8"
},
{
@@ -241,7 +241,7 @@
"y": 23,
"elevation": 3,
"var": "VAR_PETALBURG_WOODS_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "PetalburgWoods_EventScript_15CD42"
}
],
diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json
index 6604025b5..52b082f7a 100644
--- a/data/maps/RecordCorner/map.json
+++ b/data/maps/RecordCorner/map.json
@@ -62,7 +62,7 @@
"y": 4,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "RecordCorner_EventScript_1A4418"
},
{
@@ -71,7 +71,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "RecordCorner_EventScript_1A4442"
},
{
@@ -80,7 +80,7 @@
"y": 4,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "RecordCorner_EventScript_1A442D"
},
{
@@ -89,7 +89,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "RecordCorner_EventScript_1A4457"
}
],
diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json
index 64f9b4f16..7f5d01f58 100644
--- a/data/maps/Route101/map.json
+++ b/data/maps/Route101/map.json
@@ -109,7 +109,7 @@
"y": 19,
"elevation": 3,
"var": "VAR_ROUTE101_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "Route101_EventScript_14E948"
},
{
@@ -118,7 +118,7 @@
"y": 19,
"elevation": 3,
"var": "VAR_ROUTE101_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "Route101_EventScript_14E948"
},
{
@@ -127,7 +127,7 @@
"y": 18,
"elevation": 3,
"var": "VAR_ROUTE101_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "Route101_EventScript_14E9B8"
},
{
@@ -136,7 +136,7 @@
"y": 18,
"elevation": 3,
"var": "VAR_ROUTE101_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "Route101_EventScript_14E9B8"
},
{
@@ -145,7 +145,7 @@
"y": 16,
"elevation": 3,
"var": "VAR_ROUTE101_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "Route101_EventScript_14E9CE"
},
{
@@ -154,7 +154,7 @@
"y": 15,
"elevation": 3,
"var": "VAR_ROUTE101_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "Route101_EventScript_14E9CE"
},
{
@@ -163,7 +163,7 @@
"y": 17,
"elevation": 3,
"var": "VAR_ROUTE101_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "Route101_EventScript_14E9CE"
},
{
@@ -172,7 +172,7 @@
"y": 18,
"elevation": 3,
"var": "VAR_ROUTE101_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "Route101_EventScript_14E9CE"
},
{
@@ -181,7 +181,7 @@
"y": 13,
"elevation": 3,
"var": "VAR_ROUTE101_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "Route101_EventScript_14E9E4"
}
],
diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json
index adf997ac5..ce32d2fb5 100644
--- a/data/maps/Route110/map.json
+++ b/data/maps/Route110/map.json
@@ -482,7 +482,7 @@
"y": 92,
"elevation": 3,
"var": "VAR_CYCLING_CHALLENGE_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "Route110_EventScript_14FC27"
},
{
@@ -491,7 +491,7 @@
"y": 92,
"elevation": 3,
"var": "VAR_CYCLING_CHALLENGE_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "Route110_EventScript_14FC27"
},
{
@@ -500,7 +500,7 @@
"y": 56,
"elevation": 3,
"var": "VAR_ROUTE110_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_EventScript_14FD13"
},
{
@@ -509,7 +509,7 @@
"y": 56,
"elevation": 3,
"var": "VAR_ROUTE110_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_EventScript_14FD1E"
},
{
@@ -518,7 +518,7 @@
"y": 56,
"elevation": 3,
"var": "VAR_ROUTE110_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_EventScript_14FD29"
}
],
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
index c3d8041fc..fdcb69b16 100644
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
@@ -62,7 +62,7 @@
"y": 4,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7"
},
{
@@ -71,7 +71,7 @@
"y": 4,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 1,
+ "var_value": "1",
"script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A"
}
],
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
index 78a17e232..e2e7cd557 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
@@ -62,7 +62,7 @@
"y": 4,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B"
},
{
@@ -71,7 +71,7 @@
"y": 4,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 1,
+ "var_value": "1",
"script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD"
}
],
diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json
index 001bffb0e..f0df06841 100644
--- a/data/maps/Route110_TrickHouseEnd/map.json
+++ b/data/maps/Route110_TrickHouseEnd/map.json
@@ -48,7 +48,7 @@
"y": 2,
"elevation": 3,
"var": "VAR_TEMP_2",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHouseEnd_EventScript_161CA0"
}
],
diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json
index c91fb4894..9520376a1 100644
--- a/data/maps/Route110_TrickHouseEntrance/map.json
+++ b/data/maps/Route110_TrickHouseEntrance/map.json
@@ -55,7 +55,7 @@
"y": 7,
"elevation": 3,
"var": "VAR_TRICK_HOUSE_ENTRANCE_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHouseEntrance_EventScript_1618B0"
},
{
@@ -64,7 +64,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_TRICK_HOUSE_ENTRANCE_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHouseEntrance_EventScript_1618B0"
},
{
@@ -73,7 +73,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_TRICK_HOUSE_ENTRANCE_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHouseEntrance_EventScript_1618B0"
},
{
@@ -82,7 +82,7 @@
"y": 7,
"elevation": 3,
"var": "VAR_TRICK_HOUSE_ENTRANCE_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHouseEntrance_EventScript_1618B0"
}
],
diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json
index 9034f2385..b003f6537 100644
--- a/data/maps/Route110_TrickHousePuzzle2/map.json
+++ b/data/maps/Route110_TrickHousePuzzle2/map.json
@@ -107,7 +107,7 @@
"y": 21,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle2_EventScript_161DE0"
},
{
@@ -116,7 +116,7 @@
"y": 17,
"elevation": 3,
"var": "VAR_TEMP_2",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle2_EventScript_161DF3"
},
{
@@ -125,7 +125,7 @@
"y": 10,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle2_EventScript_161E06"
},
{
@@ -134,7 +134,7 @@
"y": 2,
"elevation": 0,
"var": "VAR_TEMP_4",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle2_EventScript_161E19"
}
],
diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json
index a9b9ec163..ebb5824c6 100644
--- a/data/maps/Route110_TrickHousePuzzle3/map.json
+++ b/data/maps/Route110_TrickHousePuzzle3/map.json
@@ -185,7 +185,7 @@
"y": 20,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_1625AB"
},
{
@@ -194,7 +194,7 @@
"y": 12,
"elevation": 3,
"var": "VAR_TEMP_2",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_1625B7"
},
{
@@ -203,7 +203,7 @@
"y": 10,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_1625C3"
},
{
@@ -212,7 +212,7 @@
"y": 8,
"elevation": 3,
"var": "VAR_TEMP_4",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_1625CF"
},
{
@@ -221,7 +221,7 @@
"y": 7,
"elevation": 3,
"var": "VAR_TEMP_5",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_1625DB"
},
{
@@ -230,7 +230,7 @@
"y": 3,
"elevation": 3,
"var": "VAR_TEMP_6",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_1625E7"
},
{
@@ -239,7 +239,7 @@
"y": 2,
"elevation": 3,
"var": "VAR_TEMP_7",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_1625F3"
}
],
diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json
index 599ee1c49..bcd6b0baa 100644
--- a/data/maps/Route110_TrickHousePuzzle5/map.json
+++ b/data/maps/Route110_TrickHousePuzzle5/map.json
@@ -107,7 +107,7 @@
"y": 19,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_162897"
},
{
@@ -116,7 +116,7 @@
"y": 19,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_1628A3"
},
{
@@ -125,7 +125,7 @@
"y": 19,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_1628AF"
},
{
@@ -134,7 +134,7 @@
"y": 19,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_1628BB"
},
{
@@ -143,7 +143,7 @@
"y": 14,
"elevation": 3,
"var": "VAR_TEMP_2",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_1628C7"
},
{
@@ -152,7 +152,7 @@
"y": 14,
"elevation": 3,
"var": "VAR_TEMP_2",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_1628D3"
},
{
@@ -161,7 +161,7 @@
"y": 10,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_1628DF"
},
{
@@ -170,7 +170,7 @@
"y": 10,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_1628EB"
},
{
@@ -179,7 +179,7 @@
"y": 10,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_1628F7"
},
{
@@ -188,7 +188,7 @@
"y": 5,
"elevation": 3,
"var": "VAR_TEMP_4",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_162903"
},
{
@@ -197,7 +197,7 @@
"y": 5,
"elevation": 3,
"var": "VAR_TEMP_4",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_16290F"
},
{
@@ -206,7 +206,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_TEMP_5",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_16291B"
},
{
@@ -215,7 +215,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_TEMP_5",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_162927"
},
{
@@ -224,7 +224,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_TEMP_5",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle5_EventScript_162933"
}
],
diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json
index 415b8e247..b6d436eb6 100644
--- a/data/maps/Route110_TrickHousePuzzle7/map.json
+++ b/data/maps/Route110_TrickHousePuzzle7/map.json
@@ -94,7 +94,7 @@
"y": 2,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "Route110_TrickHousePuzzle7_EventScript_1632A8"
}
],
diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json
index 6f8c591ea..f047670ed 100644
--- a/data/maps/Route111/map.json
+++ b/data/maps/Route111/map.json
@@ -526,7 +526,7 @@
"y": 62,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501C9"
},
{
@@ -535,7 +535,7 @@
"y": 61,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_150116"
},
{
@@ -544,7 +544,7 @@
"y": 61,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_150116"
},
{
@@ -553,7 +553,7 @@
"y": 61,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_150116"
},
{
@@ -562,7 +562,7 @@
"y": 63,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501BC"
},
{
@@ -571,7 +571,7 @@
"y": 44,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_150122"
},
{
@@ -580,7 +580,7 @@
"y": 43,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_150122"
},
{
@@ -589,7 +589,7 @@
"y": 42,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_150122"
},
{
@@ -598,7 +598,7 @@
"y": 40,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_150122"
},
{
@@ -607,7 +607,7 @@
"y": 61,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_150116"
},
{
@@ -616,7 +616,7 @@
"y": 32,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501BC"
},
{
@@ -625,7 +625,7 @@
"y": 31,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501BC"
},
{
@@ -634,7 +634,7 @@
"y": 37,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501BC"
},
{
@@ -643,7 +643,7 @@
"y": 36,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501BC"
},
{
@@ -652,7 +652,7 @@
"y": 39,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_150122"
},
{
@@ -661,7 +661,7 @@
"y": 38,
"elevation": 3,
"var": "VAR_TEMP_3",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_150122"
},
{
@@ -670,7 +670,7 @@
"y": 64,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501BC"
},
{
@@ -679,7 +679,7 @@
"y": 65,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501BC"
},
{
@@ -688,7 +688,7 @@
"y": 65,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501BC"
},
{
@@ -697,7 +697,7 @@
"y": 66,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501BC"
},
{
@@ -706,7 +706,7 @@
"y": 67,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501BC"
},
{
@@ -715,7 +715,7 @@
"y": 68,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501BC"
},
{
@@ -724,7 +724,7 @@
"y": 69,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501BC"
},
{
@@ -733,7 +733,7 @@
"y": 61,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501C9"
},
{
@@ -742,7 +742,7 @@
"y": 62,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501C9"
},
{
@@ -751,7 +751,7 @@
"y": 62,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501C9"
},
{
@@ -760,7 +760,7 @@
"y": 62,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501C9"
},
{
@@ -769,7 +769,7 @@
"y": 38,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501C9"
},
{
@@ -778,7 +778,7 @@
"y": 39,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501C9"
},
{
@@ -787,7 +787,7 @@
"y": 40,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501C9"
},
{
@@ -796,7 +796,7 @@
"y": 41,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501C9"
},
{
@@ -805,7 +805,7 @@
"y": 42,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501C9"
},
{
@@ -814,7 +814,7 @@
"y": 43,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501C9"
},
{
@@ -823,7 +823,7 @@
"y": 44,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "Route111_EventScript_1501C9"
}
],
diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json
index 5337eafe2..5bec18b66 100644
--- a/data/maps/Route116/map.json
+++ b/data/maps/Route116/map.json
@@ -339,7 +339,7 @@
"y": 9,
"elevation": 3,
"var": "VAR_ROUTE116_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "Route116_EventScript_150B6E"
}
],
diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json
index eaa72da2a..fff9da750 100644
--- a/data/maps/Route118/map.json
+++ b/data/maps/Route118/map.json
@@ -296,7 +296,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_ROUTE118_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route118_EventScript_150FAE"
},
{
@@ -305,7 +305,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_ROUTE118_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route118_EventScript_150FCE"
},
{
@@ -314,7 +314,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_ROUTE118_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route118_EventScript_150FE4"
}
],
diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json
index ffe0a95c6..13afa9ed4 100644
--- a/data/maps/Route119/map.json
+++ b/data/maps/Route119/map.json
@@ -527,7 +527,7 @@
"y": 31,
"elevation": 0,
"var": "VAR_ROUTE119_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route119_EventScript_1511C5"
},
{
@@ -536,7 +536,7 @@
"y": 31,
"elevation": 0,
"var": "VAR_ROUTE119_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route119_EventScript_1511D0"
},
{
diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json
index 0452df9a9..7b594e21c 100644
--- a/data/maps/Route121/map.json
+++ b/data/maps/Route121/map.json
@@ -330,7 +330,7 @@
"y": 5,
"elevation": 3,
"var": "VAR_ROUTE121_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route121_EventScript_151B25"
},
{
@@ -339,7 +339,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_ROUTE121_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route121_EventScript_151B25"
},
{
@@ -348,7 +348,7 @@
"y": 7,
"elevation": 3,
"var": "VAR_ROUTE121_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route121_EventScript_151B25"
},
{
@@ -357,7 +357,7 @@
"y": 8,
"elevation": 3,
"var": "VAR_ROUTE121_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "Route121_EventScript_151B25"
}
],
diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json
index 4f7a1aa84..7bab2acc5 100644
--- a/data/maps/Route121_SafariZoneEntrance/map.json
+++ b/data/maps/Route121_SafariZoneEntrance/map.json
@@ -88,7 +88,7 @@
"y": 4,
"elevation": 3,
"var": "VAR_TEMP_1",
- "var_value": 0,
+ "var_value": "0",
"script": "Route121_SafariZoneEntrance_EventScript_15C383"
}
],
diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json
index 84a68f558..fd5bfaf41 100644
--- a/data/maps/RustboroCity/map.json
+++ b/data/maps/RustboroCity/map.json
@@ -303,7 +303,7 @@
"y": 20,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "RustboroCity_EventScript_14C481"
},
{
@@ -312,7 +312,7 @@
"y": 21,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "RustboroCity_EventScript_14C498"
},
{
@@ -321,7 +321,7 @@
"y": 22,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "RustboroCity_EventScript_14C4AF"
},
{
@@ -330,7 +330,7 @@
"y": 23,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "RustboroCity_EventScript_14C4C6"
},
{
@@ -339,7 +339,7 @@
"y": 24,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "RustboroCity_EventScript_14C4DD"
},
{
@@ -348,7 +348,7 @@
"y": 9,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "RustboroCity_EventScript_14C620"
},
{
@@ -357,7 +357,7 @@
"y": 10,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "RustboroCity_EventScript_14C62C"
},
{
@@ -366,7 +366,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "RustboroCity_EventScript_14C638"
},
{
@@ -375,7 +375,7 @@
"y": 12,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "RustboroCity_EventScript_14C644"
},
{
@@ -384,7 +384,7 @@
"y": 9,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
- "var_value": 4,
+ "var_value": "4",
"script": "RustboroCity_EventScript_14C74D"
},
{
@@ -393,7 +393,7 @@
"y": 10,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
- "var_value": 4,
+ "var_value": "4",
"script": "RustboroCity_EventScript_14C759"
},
{
@@ -402,7 +402,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
- "var_value": 4,
+ "var_value": "4",
"script": "RustboroCity_EventScript_14C765"
},
{
@@ -411,7 +411,7 @@
"y": 12,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
- "var_value": 4,
+ "var_value": "4",
"script": "RustboroCity_EventScript_14C771"
}
],
diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json
index 38236365f..4adb1ae7f 100644
--- a/data/maps/RusturfTunnel/map.json
+++ b/data/maps/RusturfTunnel/map.json
@@ -172,7 +172,7 @@
"y": 4,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "RusturfTunnel_EventScript_15C999"
},
{
@@ -181,7 +181,7 @@
"y": 4,
"elevation": 3,
"var": "VAR_RUSTURF_TUNNEL_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "RusturfTunnel_EventScript_15C9AB"
},
{
@@ -190,7 +190,7 @@
"y": 5,
"elevation": 3,
"var": "VAR_RUSTURF_TUNNEL_STATE",
- "var_value": 2,
+ "var_value": "2",
"script": "RusturfTunnel_EventScript_15C9AB"
},
{
@@ -199,7 +199,7 @@
"y": 4,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "RusturfTunnel_EventScript_15C99F"
},
{
@@ -208,7 +208,7 @@
"y": 5,
"elevation": 3,
"var": "0",
- "var_value": 0,
+ "var_value": "0",
"script": "RusturfTunnel_EventScript_15C9A5"
}
],
diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json
index e9caea46e..0f40129cd 100644
--- a/data/maps/SeafloorCavern_Room9/map.json
+++ b/data/maps/SeafloorCavern_Room9/map.json
@@ -119,7 +119,7 @@
"y": 42,
"elevation": 3,
"var": "VAR_SEAFLOOR_CAVERN_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "SeafloorCavern_Room9_EventScript_15DAFA"
}
],
diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json
index 9020180aa..b22abfe92 100644
--- a/data/maps/SingleBattleColosseum/map.json
+++ b/data/maps/SingleBattleColosseum/map.json
@@ -48,7 +48,7 @@
"y": 5,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "SingleBattleColosseum_EventScript_1A436F"
},
{
@@ -57,7 +57,7 @@
"y": 5,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "SingleBattleColosseum_EventScript_1A4379"
}
],
diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json
index 48388f0bc..e2c3c6b15 100644
--- a/data/maps/SlateportCity_Harbor/map.json
+++ b/data/maps/SlateportCity_Harbor/map.json
@@ -153,7 +153,7 @@
"y": 11,
"elevation": 3,
"var": "VAR_SLATEPORT_HARBOR_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "SlateportCity_Harbor_EventScript_155F9B"
},
{
@@ -162,7 +162,7 @@
"y": 12,
"elevation": 3,
"var": "VAR_SLATEPORT_HARBOR_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "SlateportCity_Harbor_EventScript_155FA7"
},
{
@@ -171,7 +171,7 @@
"y": 13,
"elevation": 3,
"var": "VAR_SLATEPORT_HARBOR_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "SlateportCity_Harbor_EventScript_155FB3"
},
{
@@ -180,7 +180,7 @@
"y": 14,
"elevation": 3,
"var": "VAR_SLATEPORT_HARBOR_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "SlateportCity_Harbor_EventScript_155FBF"
}
],
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json
index 5c6cdf9f0..5e753835c 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json
@@ -224,7 +224,7 @@
"y": 7,
"elevation": 3,
"var": "VAR_SLATEPORT_MUSEUM_1F_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "SlateportCity_OceanicMuseum_1F_EventScript_155AE4"
},
{
@@ -233,7 +233,7 @@
"y": 7,
"elevation": 3,
"var": "VAR_SLATEPORT_MUSEUM_1F_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "SlateportCity_OceanicMuseum_1F_EventScript_155AF5"
}
],
diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json
index e61fa6068..8fac81c25 100644
--- a/data/maps/SootopolisCity/map.json
+++ b/data/maps/SootopolisCity/map.json
@@ -248,7 +248,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_SOOTOPOLIS_STATE",
- "var_value": 1,
+ "var_value": "1",
"script": "SootopolisCity_EventScript_14D308"
}
],
diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json
index b939138a8..aa01cfdbb 100644
--- a/data/maps/TradeCenter/map.json
+++ b/data/maps/TradeCenter/map.json
@@ -48,7 +48,7 @@
"y": 5,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "TradeCenter_EventScript_1A43F0"
},
{
@@ -57,7 +57,7 @@
"y": 5,
"elevation": 3,
"var": "VAR_TEMP_0",
- "var_value": 0,
+ "var_value": "0",
"script": "TradeCenter_EventScript_1A43FA"
}
],
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
index 16b822ef3..f9cf2523a 100644
--- a/data/maps/VictoryRoad_1F/map.json
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -147,7 +147,7 @@
"y": 3,
"elevation": 3,
"var": "VAR_VICTORY_ROAD_1F_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "VictoryRoad_1F_EventScript_15DE97"
},
{
@@ -156,7 +156,7 @@
"y": 4,
"elevation": 3,
"var": "VAR_VICTORY_ROAD_1F_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "VictoryRoad_1F_EventScript_15DEAB"
},
{
@@ -165,7 +165,7 @@
"y": 5,
"elevation": 3,
"var": "VAR_VICTORY_ROAD_1F_STATE",
- "var_value": 0,
+ "var_value": "0",
"script": "VictoryRoad_1F_EventScript_15DEBF"
}
],
diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp
index 2dd6e5b31..d2b9b6802 100755
--- a/tools/mapjson/mapjson.cpp
+++ b/tools/mapjson/mapjson.cpp
@@ -197,7 +197,7 @@ string generate_map_events_text(Json map_data) {
<< coord_event["y"].int_value() << ", "
<< coord_event["elevation"].int_value() << ", "
<< coord_event["var"].string_value() << ", "
- << coord_event["var_value"].int_value() << ", "
+ << coord_event["var_value"].string_value() << ", "
<< coord_event["script"].string_value() << "\n";
}
else if (coord_event["type"] == "weather") {