Merge branch 'master' into multiplayer-stuff

2019-02-18 01:19:16 -05:00
parent 5695617d64 367c7b5f89
commit 0a7b97ee06
450 changed files with 6010 additions and 5999 deletions
@@ -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"
    }
  ],