Merge master into ObjEvent rename

This commit is contained in:
GriffinR
2019-11-25 20:00:04 -05:00
144 changed files with 8322 additions and 8521 deletions

View File

@@ -9,10 +9,8 @@ BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104
BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E
delay 16
setvar VAR_TEMP_0, 1
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1
setvar VAR_0x8005, 1
special CallFrontierUtilFunc
compare VAR_RESULT, 1
frontier_get FRONTIER_DATA_LVL_MODE
compare VAR_RESULT, FRONTIER_LVL_OPEN
goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1A1
@@ -37,7 +35,6 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161
waitmovement 0
closedoor 37, 3
waitdooranim
BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F
waitmovement 0
setvar VAR_0x8006, 0