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
@@ -51,7 +51,7 @@
      "y": 4,
      "elevation": 3,
      "var": "VAR_TEMP_0",
-      "var_value": 0,
+      "var_value": "0",
      "script": "EventScript_DoubleBattleColosseum_PlayerSpot0"
    },
    {
@@ -60,7 +60,7 @@
      "y": 6,
      "elevation": 3,
      "var": "VAR_TEMP_0",
-      "var_value": 0,
+      "var_value": "0",
      "script": "EventScript_DoubleBattleColosseum_PlayerSpot2"
    },
    {
@@ -69,7 +69,7 @@
      "y": 4,
      "elevation": 3,
      "var": "VAR_TEMP_0",
-      "var_value": 0,
+      "var_value": "0",
      "script": "EventScript_DoubleBattleColosseum_PlayerSpot1"
    },
    {
@@ -78,7 +78,7 @@
      "y": 6,
      "elevation": 3,
      "var": "VAR_TEMP_0",
-      "var_value": 0,
+      "var_value": "0",
      "script": "EventScript_DoubleBattleColosseum_PlayerSpot3"
    }
  ],