Merge branch 'master' into doc-inc

This commit is contained in:
GriffinR
2019-10-07 17:37:04 -04:00
committed by GitHub
44 changed files with 313 additions and 320 deletions

View File

@@ -172,13 +172,13 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
msgbox BattleFrontier_ScottsHouse_Text_263A3F, MSGBOX_DEFAULT
closemessage
delay 30
compare VAR_FACING, 2
compare VAR_FACING, DIR_NORTH
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A13
compare VAR_FACING, 1
compare VAR_FACING, DIR_SOUTH
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A1E
compare VAR_FACING, 4
compare VAR_FACING, DIR_EAST
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A29
compare VAR_FACING, 3
compare VAR_FACING, DIR_WEST
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34
msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT
applymovement 1, Common_Movement_FacePlayer