diff options
53 files changed, 229 insertions, 229 deletions
diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index ae15e81b1..5a1d822a3 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -52,7 +52,7 @@ "y": 5, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "BattleColosseum_2P_EventScript_PlayerSpot0" }, { @@ -61,7 +61,7 @@ "y": 5, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "BattleColosseum_2P_EventScript_PlayerSpot1" } ], diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json index c36a5beca..600a7a2c9 100644 --- a/data/maps/BattleColosseum_4P/map.json +++ b/data/maps/BattleColosseum_4P/map.json @@ -52,7 +52,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "BattleColosseum_4P_EventScript_PlayerSpot0" }, { @@ -61,7 +61,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "BattleColosseum_4P_EventScript_PlayerSpot2" }, { @@ -70,7 +70,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "BattleColosseum_4P_EventScript_PlayerSpot1" }, { @@ -79,7 +79,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "BattleColosseum_4P_EventScript_PlayerSpot3" } ], diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index fbf6c87f9..e9a12048b 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -301,7 +301,7 @@ "y": 6, "elevation": 3, "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL", - "var_value": 0, + "var_value": "0", "script": "CeruleanCity_EventScript_RivalTriggerLeft" }, { @@ -310,7 +310,7 @@ "y": 6, "elevation": 3, "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL", - "var_value": 0, + "var_value": "0", "script": "CeruleanCity_EventScript_RivalTriggerMid" }, { @@ -319,7 +319,7 @@ "y": 6, "elevation": 3, "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL", - "var_value": 0, + "var_value": "0", "script": "CeruleanCity_EventScript_RivalTriggerRight" }, { @@ -328,7 +328,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET", - "var_value": 0, + "var_value": "0", "script": "CeruleanCity_EventScript_GruntTriggerTop" }, { @@ -337,7 +337,7 @@ "y": 7, "elevation": 3, "var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET", - "var_value": 0, + "var_value": "0", "script": "CeruleanCity_EventScript_GruntTriggerBottom" } ], diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 6ac481cc1..1bc8c58ab 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -123,7 +123,7 @@ "y": 5, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "CinnabarIsland_EventScript_GymDoorLocked" } ], diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 47889c708..0a6529732 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -162,7 +162,7 @@ "y": 11, "elevation": 3, "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", - "var_value": 0, + "var_value": "0", "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger" }, { @@ -171,7 +171,7 @@ "y": 11, "elevation": 3, "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", - "var_value": 0, + "var_value": "0", "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger" }, { @@ -180,7 +180,7 @@ "y": 11, "elevation": 3, "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", - "var_value": 0, + "var_value": "0", "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger" } ], diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index bf0e86af0..0e9171bdc 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -84,7 +84,7 @@ "y": 18, "elevation": 3, "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", - "var_value": 0, + "var_value": "0", "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene" }, { @@ -93,7 +93,7 @@ "y": 18, "elevation": 3, "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", - "var_value": 0, + "var_value": "0", "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene" }, { @@ -102,7 +102,7 @@ "y": 18, "elevation": 3, "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", - "var_value": 0, + "var_value": "0", "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene" } ], diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index ead8396c7..9ccb25f2b 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -79,7 +79,7 @@ "y": 3, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerMid" }, { @@ -88,7 +88,7 @@ "y": 3, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerRight" }, { @@ -97,7 +97,7 @@ "y": 3, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerLeft" } ], diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index e1c0d0205..7499f0047 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -327,7 +327,7 @@ "y": 43, "elevation": 0, "var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR", - "var_value": 1, + "var_value": "1", "script": "MtEmber_Exterior_EventScript_RocketPasswordScene" }, { @@ -336,7 +336,7 @@ "y": 43, "elevation": 0, "var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR", - "var_value": 1, + "var_value": "1", "script": "MtEmber_Exterior_EventScript_RocketPasswordScene" }, { @@ -345,7 +345,7 @@ "y": 43, "elevation": 0, "var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR", - "var_value": 1, + "var_value": "1", "script": "MtEmber_Exterior_EventScript_RocketPasswordScene" } ], diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 2cc98a2fe..dd162b7d2 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -196,7 +196,7 @@ "y": 11, "elevation": 3, "var": "VAR_MAP_SCENE_MT_MOON_B2F", - "var_value": 0, + "var_value": "0", "script": "MtMoon_B2F_EventScript_MiguelTrigger" } ], diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 22426a854..8defa69a8 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -45,7 +45,7 @@ "y": 12, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "NavelRock_Summit_EventScript_HoOh" } ], diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 3087759c2..20859bfd2 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -110,7 +110,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "OneIsland_KindleRoad_EmberSpa_EventScript_SpaHeal" } ], diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 11272eff8..f998ac3bc 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -117,7 +117,7 @@ "y": 6, "elevation": 3, "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", - "var_value": 2, + "var_value": "2", "script": "OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerTop" }, { @@ -126,7 +126,7 @@ "y": 7, "elevation": 3, "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", - "var_value": 2, + "var_value": "2", "script": "OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidTop" }, { @@ -135,7 +135,7 @@ "y": 8, "elevation": 3, "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", - "var_value": 2, + "var_value": "2", "script": "OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidBottom" }, { @@ -144,7 +144,7 @@ "y": 9, "elevation": 3, "var": "VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F", - "var_value": 2, + "var_value": "2", "script": "OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerBottom" } ], diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index f27ffa0e3..dc591cce3 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -96,7 +96,7 @@ "y": 1, "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_OAK", - "var_value": 0, + "var_value": "0", "script": "PalletTown_EventScript_OakTriggerLeft" }, { @@ -105,7 +105,7 @@ "y": 1, "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_OAK", - "var_value": 0, + "var_value": "0", "script": "PalletTown_EventScript_OakTriggerRight" }, { @@ -114,7 +114,7 @@ "y": 2, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 1, + "var_value": "1", "script": "PalletTown_EventScript_SignLadyTrigger" } ], diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index beab5e0ad..dceeaaa81 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -176,7 +176,7 @@ "y": 8, "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", - "var_value": 2, + "var_value": "2", "script": "PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger" }, { @@ -185,7 +185,7 @@ "y": 8, "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", - "var_value": 2, + "var_value": "2", "script": "PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger" }, { @@ -194,7 +194,7 @@ "y": 8, "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", - "var_value": 2, + "var_value": "2", "script": "PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger" }, { @@ -203,7 +203,7 @@ "y": 8, "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", - "var_value": 3, + "var_value": "3", "script": "PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerLeft" }, { @@ -212,7 +212,7 @@ "y": 8, "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", - "var_value": 3, + "var_value": "3", "script": "PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerMid" }, { @@ -221,7 +221,7 @@ "y": 8, "elevation": 3, "var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB", - "var_value": 3, + "var_value": "3", "script": "PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight" } ], diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 862f77c79..444adf15f 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -176,7 +176,7 @@ "y": 21, "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", - "var_value": 0, + "var_value": "0", "script": "PewterCity_EventScript_GymGuideTriggerTop" }, { @@ -185,7 +185,7 @@ "y": 22, "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", - "var_value": 0, + "var_value": "0", "script": "PewterCity_EventScript_GymGuideTriggerMid" }, { @@ -194,7 +194,7 @@ "y": 23, "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", - "var_value": 0, + "var_value": "0", "script": "PewterCity_EventScript_GymGuideTriggerBottom" }, { @@ -203,7 +203,7 @@ "y": 23, "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", - "var_value": 0, + "var_value": "0", "script": "PewterCity_EventScript_GymGuideTriggerRight" }, { @@ -212,7 +212,7 @@ "y": 21, "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", - "var_value": 1, + "var_value": "1", "script": "PewterCity_EventScript_RunningShoesAideTriggerTop" }, { @@ -221,7 +221,7 @@ "y": 22, "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", - "var_value": 1, + "var_value": "1", "script": "PewterCity_EventScript_RunningShoesAideTriggerMid" }, { @@ -230,7 +230,7 @@ "y": 23, "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY", - "var_value": 1, + "var_value": "1", "script": "PewterCity_EventScript_RunningShoesAideTriggerBottom" } ], diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index b90b8594d..e9cd2560b 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -145,7 +145,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F", - "var_value": 0, + "var_value": "0", "script": "PewterCity_Museum_1F_EventScript_EntranceTriggerLeft" }, { @@ -154,7 +154,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F", - "var_value": 0, + "var_value": "0", "script": "PewterCity_Museum_1F_EventScript_EntranceTriggerMid" }, { @@ -163,7 +163,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F", - "var_value": 0, + "var_value": "0", "script": "PewterCity_Museum_1F_EventScript_EntranceTriggerRight" } ], diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 471c66285..9e32cc0d3 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -65,7 +65,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_POKEMON_TOWER_2F", - "var_value": 0, + "var_value": "0", "script": "PokemonTower_2F_EventScript_RivalTriggerRight" }, { @@ -74,7 +74,7 @@ "y": 6, "elevation": 3, "var": "VAR_MAP_SCENE_POKEMON_TOWER_2F", - "var_value": 0, + "var_value": "0", "script": "PokemonTower_2F_EventScript_RivalTriggerDown" } ], diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index efa229149..ede57a424 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -130,7 +130,7 @@ "y": 8, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "PokemonTower_5F_EventScript_PurifiedZone" }, { @@ -139,7 +139,7 @@ "y": 8, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "PokemonTower_5F_EventScript_PurifiedZone" }, { @@ -148,7 +148,7 @@ "y": 8, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "PokemonTower_5F_EventScript_PurifiedZone" }, { @@ -157,7 +157,7 @@ "y": 9, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "PokemonTower_5F_EventScript_PurifiedZone" }, { @@ -166,7 +166,7 @@ "y": 8, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 1, + "var_value": "1", "script": "PokemonTower_5F_EventScript_ExitPurifiedZone" }, { @@ -175,7 +175,7 @@ "y": 9, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "PokemonTower_5F_EventScript_PurifiedZone" }, { @@ -184,7 +184,7 @@ "y": 10, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "PokemonTower_5F_EventScript_PurifiedZone" }, { @@ -193,7 +193,7 @@ "y": 10, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "PokemonTower_5F_EventScript_PurifiedZone" }, { @@ -202,7 +202,7 @@ "y": 10, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "PokemonTower_5F_EventScript_PurifiedZone" }, { @@ -211,7 +211,7 @@ "y": 9, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 1, + "var_value": "1", "script": "PokemonTower_5F_EventScript_ExitPurifiedZone" }, { @@ -220,7 +220,7 @@ "y": 10, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 1, + "var_value": "1", "script": "PokemonTower_5F_EventScript_ExitPurifiedZone" }, { @@ -229,7 +229,7 @@ "y": 11, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 1, + "var_value": "1", "script": "PokemonTower_5F_EventScript_ExitPurifiedZone" }, { @@ -238,7 +238,7 @@ "y": 11, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 1, + "var_value": "1", "script": "PokemonTower_5F_EventScript_ExitPurifiedZone" }, { @@ -247,7 +247,7 @@ "y": 11, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 1, + "var_value": "1", "script": "PokemonTower_5F_EventScript_ExitPurifiedZone" }, { @@ -256,7 +256,7 @@ "y": 8, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 1, + "var_value": "1", "script": "PokemonTower_5F_EventScript_ExitPurifiedZone" }, { @@ -265,7 +265,7 @@ "y": 9, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 1, + "var_value": "1", "script": "PokemonTower_5F_EventScript_ExitPurifiedZone" }, { @@ -274,7 +274,7 @@ "y": 10, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 1, + "var_value": "1", "script": "PokemonTower_5F_EventScript_ExitPurifiedZone" } ], diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index 58a293965..c3e1a37c4 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -104,7 +104,7 @@ "y": 15, "elevation": 3, "var": "VAR_MAP_SCENE_POKEMON_TOWER_6F", - "var_value": 0, + "var_value": "0", "script": "PokemonTower_6F_EventScript_MarowakGhost" }, { @@ -113,7 +113,7 @@ "y": 16, "elevation": 3, "var": "VAR_MAP_SCENE_POKEMON_TOWER_6F", - "var_value": 0, + "var_value": "0", "script": "PokemonTower_6F_EventScript_MarowakGhost" } ], diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json index 83ba4d486..b72381cd6 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -66,7 +66,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "RecordCenter_EventScript_Spot" }, { @@ -75,7 +75,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "RecordCenter_EventScript_Spot" }, { @@ -84,7 +84,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "RecordCenter_EventScript_Spot" }, { @@ -93,7 +93,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "RecordCenter_EventScript_Spot" } ], diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 8c0170ebf..b0dd97f28 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -86,7 +86,7 @@ "y": 12, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", - "var_value": 1, + "var_value": "1", "script": "EventScript_SetExitingCyclingRoad" }, { @@ -95,7 +95,7 @@ "y": 12, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", - "var_value": 0, + "var_value": "0", "script": "EventScript_SetEnteringCyclingRoad" }, { @@ -104,7 +104,7 @@ "y": 10, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerTop" }, { @@ -113,7 +113,7 @@ "y": 11, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidTop" }, { @@ -122,7 +122,7 @@ "y": 13, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", - "var_value": 0, + "var_value": "0", "script": "EventScript_SetEnteringCyclingRoad" }, { @@ -131,7 +131,7 @@ "y": 11, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", - "var_value": 0, + "var_value": "0", "script": "EventScript_SetEnteringCyclingRoad" }, { @@ -140,7 +140,7 @@ "y": 11, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", - "var_value": 1, + "var_value": "1", "script": "EventScript_SetExitingCyclingRoad" }, { @@ -149,7 +149,7 @@ "y": 13, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", - "var_value": 1, + "var_value": "1", "script": "EventScript_SetExitingCyclingRoad" }, { @@ -158,7 +158,7 @@ "y": 12, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMid" }, { @@ -167,7 +167,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidBottom" }, { @@ -176,7 +176,7 @@ "y": 14, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerBottom" } ], diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 896b9de1f..a2f0d44a4 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -59,7 +59,7 @@ "y": 6, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", - "var_value": 0, + "var_value": "0", "script": "EventScript_SetEnteringCyclingRoad" }, { @@ -68,7 +68,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerTop" }, { @@ -77,7 +77,7 @@ "y": 5, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidTop" }, { @@ -86,7 +86,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMid" }, { @@ -95,7 +95,7 @@ "y": 7, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidBottom" }, { @@ -104,7 +104,7 @@ "y": 8, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerBottom" }, { @@ -113,7 +113,7 @@ "y": 6, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", - "var_value": 1, + "var_value": "1", "script": "EventScript_SetExitingCyclingRoad" }, { @@ -122,7 +122,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", - "var_value": 1, + "var_value": "1", "script": "EventScript_SetExitingCyclingRoad" }, { @@ -131,7 +131,7 @@ "y": 7, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", - "var_value": 1, + "var_value": "1", "script": "EventScript_SetExitingCyclingRoad" }, { @@ -140,7 +140,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", - "var_value": 0, + "var_value": "0", "script": "EventScript_SetEnteringCyclingRoad" }, { @@ -149,7 +149,7 @@ "y": 7, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE16", - "var_value": 0, + "var_value": "0", "script": "EventScript_SetEnteringCyclingRoad" } ], diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index f0afc2bfa..73a0f5e54 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -63,7 +63,7 @@ "y": 4, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE22", - "var_value": 1, + "var_value": "1", "script": "Route22_EventScript_EarlyRivalTriggerTop" }, { @@ -72,7 +72,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE22", - "var_value": 1, + "var_value": "1", "script": "Route22_EventScript_EarlyRivalTriggerMid" }, { @@ -81,7 +81,7 @@ "y": 6, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE22", - "var_value": 1, + "var_value": "1", "script": "Route22_EventScript_EarlyRivalTriggerBottom" }, { @@ -90,7 +90,7 @@ "y": 4, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE22", - "var_value": 3, + "var_value": "3", "script": "Route22_EventScript_LateRivalTriggerTop" }, { @@ -99,7 +99,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE22", - "var_value": 3, + "var_value": "3", "script": "Route22_EventScript_LateRivalTriggerMid" }, { @@ -108,7 +108,7 @@ "y": 6, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE22", - "var_value": 3, + "var_value": "3", "script": "Route22_EventScript_LateRivalTriggerBottom" } ], diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 64e92e450..108f1eec6 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -66,7 +66,7 @@ "y": 2, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 0, + "var_value": "0", "script": "Route22_NorthEntrance_EventScript_BoulderBadgeGuardTrigger" } ], diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 43892e0ce..0a02e5b52 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -155,7 +155,7 @@ "y": 149, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 1, + "var_value": "1", "script": "Route23_EventScript_CascadeBadgeGuardTrigger" }, { @@ -164,7 +164,7 @@ "y": 140, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 2, + "var_value": "2", "script": "Route23_EventScript_ThunderBadgeGuardTrigger" }, { @@ -173,7 +173,7 @@ "y": 123, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 3, + "var_value": "3", "script": "Route23_EventScript_RainbowBadgeGuardTrigger" }, { @@ -182,7 +182,7 @@ "y": 111, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 4, + "var_value": "4", "script": "Route23_EventScript_SoulBadgeGuardTrigger" }, { @@ -191,7 +191,7 @@ "y": 94, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 5, + "var_value": "5", "script": "Route23_EventScript_MarshBadgeGuardTrigger" }, { @@ -200,7 +200,7 @@ "y": 61, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 6, + "var_value": "6", "script": "Route23_EventScript_VolcanoBadgeGuardTrigger" }, { @@ -209,7 +209,7 @@ "y": 35, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 7, + "var_value": "7", "script": "Route23_EventScript_EarthBadgeGuardTrigger" }, { @@ -218,7 +218,7 @@ "y": 34, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 7, + "var_value": "7", "script": "Route23_EventScript_EarthBadgeGuardTrigger" }, { @@ -227,7 +227,7 @@ "y": 32, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 7, + "var_value": "7", "script": "Route23_EventScript_EarthBadgeGuardTrigger" }, { @@ -236,7 +236,7 @@ "y": 33, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 7, + "var_value": "7", "script": "Route23_EventScript_EarthBadgeGuardTrigger" }, { @@ -245,7 +245,7 @@ "y": 31, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 7, + "var_value": "7", "script": "Route23_EventScript_EarthBadgeGuardTrigger" }, { @@ -254,7 +254,7 @@ "y": 36, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 7, + "var_value": "7", "script": "Route23_EventScript_EarthBadgeGuardTrigger" }, { @@ -263,7 +263,7 @@ "y": 35, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 7, + "var_value": "7", "script": "Route23_EventScript_EarthBadgeGuardTrigger" }, { @@ -272,7 +272,7 @@ "y": 35, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 7, + "var_value": "7", "script": "Route23_EventScript_EarthBadgeGuardTrigger" }, { @@ -281,7 +281,7 @@ "y": 60, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 6, + "var_value": "6", "script": "Route23_EventScript_VolcanoBadgeGuardTrigger" }, { @@ -290,7 +290,7 @@ "y": 61, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 6, + "var_value": "6", "script": "Route23_EventScript_VolcanoBadgeGuardTrigger" }, { @@ -299,7 +299,7 @@ "y": 60, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 6, + "var_value": "6", "script": "Route23_EventScript_VolcanoBadgeGuardTrigger" }, { @@ -308,7 +308,7 @@ "y": 94, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 5, + "var_value": "5", "script": "Route23_EventScript_MarshBadgeGuardTrigger" }, { @@ -317,7 +317,7 @@ "y": 92, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 5, + "var_value": "5", "script": "Route23_EventScript_MarshBadgeGuardTrigger" }, { @@ -326,7 +326,7 @@ "y": 94, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 5, + "var_value": "5", "script": "Route23_EventScript_MarshBadgeGuardTrigger" }, { @@ -335,7 +335,7 @@ "y": 92, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 5, + "var_value": "5", "script": "Route23_EventScript_MarshBadgeGuardTrigger" }, { @@ -344,7 +344,7 @@ "y": 92, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 5, + "var_value": "5", "script": "Route23_EventScript_MarshBadgeGuardTrigger" }, { @@ -353,7 +353,7 @@ "y": 92, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 5, + "var_value": "5", "script": "Route23_EventScript_MarshBadgeGuardTrigger" }, { @@ -362,7 +362,7 @@ "y": 139, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 2, + "var_value": "2", "script": "Route23_EventScript_ThunderBadgeGuardTrigger" }, { @@ -371,7 +371,7 @@ "y": 139, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 2, + "var_value": "2", "script": "Route23_EventScript_ThunderBadgeGuardTrigger" }, { @@ -380,7 +380,7 @@ "y": 140, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 2, + "var_value": "2", "script": "Route23_EventScript_ThunderBadgeGuardTrigger" }, { @@ -389,7 +389,7 @@ "y": 122, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 3, + "var_value": "3", "script": "Route23_EventScript_RainbowBadgeGuardTrigger" }, { @@ -398,7 +398,7 @@ "y": 122, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 3, + "var_value": "3", "script": "Route23_EventScript_RainbowBadgeGuardTrigger" }, { @@ -407,7 +407,7 @@ "y": 123, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 3, + "var_value": "3", "script": "Route23_EventScript_RainbowBadgeGuardTrigger" }, { @@ -416,7 +416,7 @@ "y": 109, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 4, + "var_value": "4", "script": "Route23_EventScript_SoulBadgeGuardTrigger" }, { @@ -425,7 +425,7 @@ "y": 109, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 4, + "var_value": "4", "script": "Route23_EventScript_SoulBadgeGuardTrigger" }, { @@ -434,7 +434,7 @@ "y": 109, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 4, + "var_value": "4", "script": "Route23_EventScript_SoulBadgeGuardTrigger" }, { @@ -443,7 +443,7 @@ "y": 109, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 4, + "var_value": "4", "script": "Route23_EventScript_SoulBadgeGuardTrigger" }, { @@ -452,7 +452,7 @@ "y": 109, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 4, + "var_value": "4", "script": "Route23_EventScript_SoulBadgeGuardTrigger" }, { @@ -461,7 +461,7 @@ "y": 111, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 4, + "var_value": "4", "script": "Route23_EventScript_SoulBadgeGuardTrigger" }, { @@ -470,7 +470,7 @@ "y": 112, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 4, + "var_value": "4", "script": "Route23_EventScript_SoulBadgeGuardTrigger" }, { @@ -479,7 +479,7 @@ "y": 112, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 4, + "var_value": "4", "script": "Route23_EventScript_SoulBadgeGuardTrigger" }, { @@ -488,7 +488,7 @@ "y": 112, "elevation": 1, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 4, + "var_value": "4", "script": "Route23_EventScript_SoulBadgeGuardTrigger" }, { @@ -497,7 +497,7 @@ "y": 148, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 1, + "var_value": "1", "script": "Route23_EventScript_CascadeBadgeGuardTrigger" }, { @@ -506,7 +506,7 @@ "y": 148, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 1, + "var_value": "1", "script": "Route23_EventScript_CascadeBadgeGuardTrigger" }, { @@ -515,7 +515,7 @@ "y": 149, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 1, + "var_value": "1", "script": "Route23_EventScript_CascadeBadgeGuardTrigger" }, { @@ -524,7 +524,7 @@ "y": 148, "elevation": 0, "var": "VAR_MAP_SCENE_ROUTE23", - "var_value": 1, + "var_value": "1", "script": "Route23_EventScript_CascadeBadgeGuardTrigger" } ], diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index fe7cf5420..c79eeae5f 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -139,7 +139,7 @@ "y": 15, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE24", - "var_value": 0, + "var_value": "0", "script": "Route24_EventScript_RocketTriggerLeft" }, { @@ -148,7 +148,7 @@ "y": 15, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE24", - "var_value": 0, + "var_value": "0", "script": "Route24_EventScript_RocketTriggerRight" } ], diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 8bce8a804..4c7a1a581 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -66,7 +66,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", - "var_value": 0, + "var_value": "0", "script": "Route5_SouthEntrance_EventScript_GuardTriggerLeft" }, { @@ -75,7 +75,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", - "var_value": 0, + "var_value": "0", "script": "Route5_SouthEntrance_EventScript_GuardTriggerMid" }, { @@ -84,7 +84,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", - "var_value": 0, + "var_value": "0", "script": "Route5_SouthEntrance_EventScript_GuardTriggerRight" } ], diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index d01fd2d3a..fdb4a29b5 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -66,7 +66,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", - "var_value": 0, + "var_value": "0", "script": "Route6_NorthEntrance_EventScript_GuardTriggerLeft" }, { @@ -75,7 +75,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", - "var_value": 0, + "var_value": "0", "script": "Route6_NorthEntrance_EventScript_GuardTriggerMid" }, { @@ -84,7 +84,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", - "var_value": 0, + "var_value": "0", "script": "Route6_NorthEntrance_EventScript_GuardTriggerRight" } ], diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 345379f0d..bcdd3b049 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -66,7 +66,7 @@ "y": 4, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", - "var_value": 0, + "var_value": "0", "script": "Route7_EastEntrance_EventScript_GuardTriggerTop" }, { @@ -75,7 +75,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", - "var_value": 0, + "var_value": "0", "script": "Route7_EastEntrance_EventScript_GuardTriggerMid" }, { @@ -84,7 +84,7 @@ "y": 6, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", - "var_value": 0, + "var_value": "0", "script": "Route7_EastEntrance_EventScript_GuardTriggerBottom" } ], diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 8c4738622..b0c6afe07 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -66,7 +66,7 @@ "y": 4, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", - "var_value": 0, + "var_value": "0", "script": "Route8_WestEntrance_EventScript_GuardTriggerTop" }, { @@ -75,7 +75,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", - "var_value": 0, + "var_value": "0", "script": "Route8_WestEntrance_EventScript_GuardTriggerMid" }, { @@ -84,7 +84,7 @@ "y": 6, "elevation": 3, "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", - "var_value": 0, + "var_value": "0", "script": "Route8_WestEntrance_EventScript_GuardTriggerBottom" } ], diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 4e639a107..a54f7108d 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -114,7 +114,7 @@ "y": 6, "elevation": 3, "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR", - "var_value": 0, + "var_value": "0", "script": "SSAnne_2F_Corridor_EventScript_RivalTriggerLeft" }, { @@ -123,7 +123,7 @@ "y": 6, "elevation": 3, "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR", - "var_value": 0, + "var_value": "0", "script": "SSAnne_2F_Corridor_EventScript_RivalTriggerMid" }, { @@ -132,7 +132,7 @@ "y": 6, "elevation": 3, "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR", - "var_value": 0, + "var_value": "0", "script": "SSAnne_2F_Corridor_EventScript_RivalTriggerRight" } ], diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index b87b3a18c..c944d6e75 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -137,7 +137,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO", - "var_value": 0, + "var_value": "0", "script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft" }, { @@ -146,7 +146,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO", - "var_value": 0, + "var_value": "0", "script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleRight" } ], diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 6b0e735d6..4375e5fad 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -105,7 +105,7 @@ "y": 19, "elevation": 1, "var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F", - "var_value": 0, + "var_value": "0", "script": "SeafoamIslands_B4F_EventScript_UpwardCurrent" }, { @@ -114,7 +114,7 @@ "y": 19, "elevation": 1, "var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F", - "var_value": 0, + "var_value": "0", "script": "SeafoamIslands_B4F_EventScript_UpwardCurrent" }, { @@ -123,7 +123,7 @@ "y": 19, "elevation": 1, "var": "VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F", - "var_value": 0, + "var_value": "0", "script": "SeafoamIslands_B4F_EventScript_UpwardCurrent" } ], diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index 3ec1f56ef..cbcc15d02 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -123,7 +123,7 @@ "y": 2, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 99, + "var_value": "99", "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1" }, { @@ -132,7 +132,7 @@ "y": 8, "elevation": 3, "var": "VAR_TEMP_7", - "var_value": 99, + "var_value": "99", "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7" }, { @@ -141,7 +141,7 @@ "y": 8, "elevation": 3, "var": "VAR_TEMP_6", - "var_value": 99, + "var_value": "99", "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6" }, { @@ -150,7 +150,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_5", - "var_value": 99, + "var_value": "99", "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5" }, { @@ -159,7 +159,7 @@ "y": 6, "elevation": 3, "var": "VAR_TEMP_4", - "var_value": 99, + "var_value": "99", "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4" }, { @@ -168,7 +168,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_3", - "var_value": 99, + "var_value": "99", "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3" }, { @@ -177,7 +177,7 @@ "y": 4, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 99, + "var_value": "99", "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2" } ], diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 85760ae8b..1f31045d0 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -124,7 +124,7 @@ "y": 15, "elevation": 3, "var": "VAR_MAP_SCENE_SILPH_CO_11F", - "var_value": 0, + "var_value": "0", "script": "SilphCo_11F_EventScript_GiovanniTriggerLeft" }, { @@ -133,7 +133,7 @@ "y": 15, "elevation": 3, "var": "VAR_MAP_SCENE_SILPH_CO_11F", - "var_value": 0, + "var_value": "0", "script": "SilphCo_11F_EventScript_GiovanniTriggerRight" } ], diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 08672e426..4e3b277f1 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -210,7 +210,7 @@ "y": 4, "elevation": 3, "var": "VAR_MAP_SCENE_SILPH_CO_7F", - "var_value": 0, + "var_value": "0", "script": "SilphCo_7F_EventScript_RivalTriggerTop" }, { @@ -219,7 +219,7 @@ "y": 5, "elevation": 3, "var": "VAR_MAP_SCENE_SILPH_CO_7F", - "var_value": 0, + "var_value": "0", "script": "SilphCo_7F_EventScript_RivalTriggerBottom" } ], diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 28c6b01f4..4bf9714f9 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -267,7 +267,7 @@ "y": 27, "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", - "var_value": 2, + "var_value": "2", "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { @@ -276,7 +276,7 @@ "y": 27, "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", - "var_value": 2, + "var_value": "2", "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { @@ -285,7 +285,7 @@ "y": 27, "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", - "var_value": 2, + "var_value": "2", "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { @@ -294,7 +294,7 @@ "y": 27, "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", - "var_value": 2, + "var_value": "2", "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { @@ -303,7 +303,7 @@ "y": 26, "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", - "var_value": 3, + "var_value": "3", "script": "ThreeIsland_EventScript_BattleBikersTriggerLeft" }, { @@ -312,7 +312,7 @@ "y": 26, "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", - "var_value": 3, + "var_value": "3", "script": "ThreeIsland_EventScript_BattleBikersTriggerMidLeft" }, { @@ -321,7 +321,7 @@ "y": 26, "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", - "var_value": 3, + "var_value": "3", "script": "ThreeIsland_EventScript_BattleBikersTriggerMid" }, { @@ -330,7 +330,7 @@ "y": 27, "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", - "var_value": 2, + "var_value": "2", "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { @@ -339,7 +339,7 @@ "y": 26, "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", - "var_value": 3, + "var_value": "3", "script": "ThreeIsland_EventScript_BattleBikersTriggerMidRight" }, { @@ -348,7 +348,7 @@ "y": 26, "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", - "var_value": 3, + "var_value": "3", "script": "ThreeIsland_EventScript_BattleBikersTriggerRight" } ], diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 9da3f804e..7c8034bff 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -52,7 +52,7 @@ "y": 5, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "TradeCenter_EventScript_Chair0" }, { @@ -61,7 +61,7 @@ "y": 5, "elevation": 3, "var": "VAR_TEMP_0", - "var_value": 0, + "var_value": "0", "script": "TradeCenter_EventScript_Chair1" } ], diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index 124df6631..203cbbc56 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -104,7 +104,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_E", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_SingleBattleTrigger" }, { @@ -113,7 +113,7 @@ "y": 12, "elevation": 0, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" }, { @@ -122,7 +122,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" } ], diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index 938a51abf..c565d8131 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -111,7 +111,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_E", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_SingleBattleTrigger" }, { @@ -120,7 +120,7 @@ "y": 12, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" }, { @@ -129,7 +129,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" } ], diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index 29f2dcc9a..048f60fe2 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -111,7 +111,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_E", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_SingleBattleTrigger" }, { @@ -120,7 +120,7 @@ "y": 12, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" }, { @@ -129,7 +129,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" } ], diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index 5860e3c7a..c1f537f5a 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -111,7 +111,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_E", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_SingleBattleTrigger" }, { @@ -120,7 +120,7 @@ "y": 12, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" }, { @@ -129,7 +129,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" } ], diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index d45bbc281..19c69a492 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -111,7 +111,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_E", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_SingleBattleTrigger" }, { @@ -120,7 +120,7 @@ "y": 12, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" }, { @@ -129,7 +129,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" } ], diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index 3030b3c88..efb5409c4 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -111,7 +111,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_E", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_SingleBattleTrigger" }, { @@ -120,7 +120,7 @@ "y": 12, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" }, { @@ -129,7 +129,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" } ], diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index 5a255fc39..d6d857e9b 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -111,7 +111,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_E", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_SingleBattleTrigger" }, { @@ -120,7 +120,7 @@ "y": 12, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" }, { @@ -129,7 +129,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" } ], diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index c87a420cb..1ee44a5fe 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -111,7 +111,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_E", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_SingleBattleTrigger" }, { @@ -120,7 +120,7 @@ "y": 12, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerTop" }, { @@ -129,7 +129,7 @@ "y": 13, "elevation": 3, "var": "VAR_TEMP_F", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom" } ], diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index 1d20449e8..b968a3215 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -111,7 +111,7 @@ "y": 7, "elevation": 3, "var": "VAR_MAP_SCENE_TRAINER_TOWER", - "var_value": 0, + "var_value": "0", "script": "TrainerTower_Lobby_EventScript_EntryTrigger" } ], diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 8c5f5794d..4f2af3a64 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -210,7 +210,7 @@ "y": 33, "elevation": 0, "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER", - "var_value": 0, + "var_value": "0", "script": "VermilionCity_EventScript_CheckTicketLeft" }, { @@ -219,7 +219,7 @@ "y": 33, "elevation": 0, "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER", - "var_value": 0, + "var_value": "0", "script": "VermilionCity_EventScript_CheckTicketRight" }, { @@ -228,7 +228,7 @@ "y": 32, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "VermilionCity_EventScript_ExitedTicketCheck" }, { @@ -237,7 +237,7 @@ "y": 32, "elevation": 0, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "VermilionCity_EventScript_ExitedTicketCheck" } ], diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index c92d6eece..75a812a17 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -130,7 +130,7 @@ "y": 16, "elevation": 3, "var": "VAR_MAP_SCENE_VICTORY_ROAD_1F", - "var_value": 99, + "var_value": "99", "script": "VictoryRoad_1F_EventScript_FloorSwitch" } ], diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 8b6045e92..20ce486e2 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -257,7 +257,7 @@ "y": 19, "elevation": 3, "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1", - "var_value": 99, + "var_value": "99", "script": "VictoryRoad_2F_EventScript_FloorSwitch1" }, { @@ -266,7 +266,7 @@ "y": 19, "elevation": 3, "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2", - "var_value": 99, + "var_value": "99", "script": "VictoryRoad_2F_EventScript_FloorSwitch2" } ], diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index ead0befc7..cf2d28b45 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -216,7 +216,7 @@ "y": 7, "elevation": 3, "var": "VAR_MAP_SCENE_VICTORY_ROAD_3F", - "var_value": 99, + "var_value": "99", "script": "VictoryRoad_3F_EventScript_FloorSwitch" } ], diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index b027a6576..f18b447e3 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -193,7 +193,7 @@ "y": 11, "elevation": 3, "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN", - "var_value": 0, + "var_value": "0", "script": "ViridianCity_EventScript_RoadBlocked" }, { @@ -202,7 +202,7 @@ "y": 11, "elevation": 3, "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR", - "var_value": 0, + "var_value": "0", "script": "ViridianCity_EventScript_GymDoorLocked" }, { @@ -211,7 +211,7 @@ "y": 8, "elevation": 3, "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN", - "var_value": 1, + "var_value": "1", "script": "ViridianCity_EventScript_TutorialTriggerLeft" }, { @@ -220,7 +220,7 @@ "y": 8, "elevation": 3, "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN", - "var_value": 1, + "var_value": "1", "script": "ViridianCity_EventScript_TutorialTriggerRight" } ], diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 41d8b01f8..0302ee61a 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -317,7 +317,7 @@ string generate_firered_map_events_text(Json map_data) { << coord_event["y"].int_value() << ", " << coord_event["elevation"].int_value() << ", 0, " << coord_event["var"].string_value() << ", " - << coord_event["var_value"].int_value() << ", 0, " + << coord_event["var_value"].string_value() << ", 0, " << coord_event["script"].string_value() << "\n"; } else if (coord_event["type"] == "weather") { |