Merge branch 'master' into multiplayer-stuff

data/maps/SingleBattleColosseum/map.json

@@ -22,8 +22,8 @@
       "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
       "movement_range_x": 0,
       "movement_range_y": 0,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
       "script": "SingleBattleColosseum_EventScript_2774A6",
       "flag": "0"
     }
@@ -51,7 +51,7 @@
       "y": 5,
       "elevation": 3,
       "var": "VAR_TEMP_0",
-      "var_value": 0,
+      "var_value": "0",
       "script": "EventScript_SingleBattleColosseum_PlayerSpot0"
     },
     {
@@ -60,7 +60,7 @@
       "y": 5,
       "elevation": 3,
       "var": "VAR_TEMP_0",
-      "var_value": 0,
+      "var_value": "0",
       "script": "EventScript_SingleBattleColosseum_PlayerSpot1"
     }
   ],