Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR
2019-12-06 02:34:54 -05:00
committed by GitHub
106 changed files with 1965 additions and 1418 deletions

View File

@@ -12,8 +12,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8
waitmovement 0
lockall
setvar VAR_0x8004, 3
special CallBattlePalaceFunction
palace_getcomment
compare VAR_RESULT, 0
call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F58B
compare VAR_RESULT, 1