Merge branch 'master' into multiplayer-stuff

This commit is contained in:
Phlosioneer
2019-02-18 01:19:16 -05:00
committed by GitHub
450 changed files with 6010 additions and 5999 deletions

View File

@@ -22,8 +22,8 @@
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"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": "RecordCorner_EventScript_2774C6",
"flag": "0"
}
@@ -65,7 +65,7 @@
"y": 4,
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"var_value": "0",
"script": "EventScript_RecordCenter_Spot0"
},
{
@@ -74,7 +74,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"var_value": "0",
"script": "EventScript_RecordCenter_Spot2"
},
{
@@ -83,7 +83,7 @@
"y": 4,
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"var_value": "0",
"script": "EventScript_RecordCenter_Spot1"
},
{
@@ -92,7 +92,7 @@
"y": 6,
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
"var_value": "0",
"script": "EventScript_RecordCenter_Spot3"
}
],