Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR
2019-12-11 01:09:06 -05:00
committed by GitHub
63 changed files with 2120 additions and 2142 deletions

View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_25D7ED",
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_NPC",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_25D88D",
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_StatusMon",
"flag": "0"
}
],
@@ -59,7 +59,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": "0",
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082"
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom"
},
{
"type": "trigger",
@@ -68,7 +68,7 @@
"elevation": 3,
"var": "VAR_TEMP_3",
"var_value": "1",
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D"
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack"
},
{
"type": "trigger",
@@ -77,7 +77,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": "0",
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082"
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom"
},
{
"type": "trigger",
@@ -86,7 +86,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": "0",
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082"
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom"
},
{
"type": "trigger",
@@ -95,7 +95,7 @@
"elevation": 3,
"var": "VAR_TEMP_3",
"var_value": "1",
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D"
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack"
},
{
"type": "trigger",
@@ -104,7 +104,7 @@
"elevation": 3,
"var": "VAR_TEMP_3",
"var_value": "1",
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D"
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack"
}
],
"bg_events": []