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

@@ -63,13 +63,13 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB
goto_if_eq Route116_EventScript_1F2D39
msgbox Route116_Text_1F3521, MSGBOX_DEFAULT
closemessage
compare VAR_FACING, 2
compare VAR_FACING, DIR_NORTH
call_if_eq Route116_EventScript_1F2D15
compare VAR_FACING, 1
compare VAR_FACING, DIR_SOUTH
call_if_eq Route116_EventScript_1F2D15
compare VAR_FACING, 3
compare VAR_FACING, DIR_WEST
call_if_eq Route116_EventScript_1F2D15
compare VAR_FACING, 4
compare VAR_FACING, DIR_EAST
call_if_eq Route116_EventScript_1F2D20
removeobject VAR_LAST_TALKED
clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
@@ -196,13 +196,13 @@ Route116_EventScript_1F2E1B:: @ 81F2E1B
Route116_EventScript_1F2E2A:: @ 81F2E2A
delay 20
compare VAR_FACING, 2
compare VAR_FACING, DIR_NORTH
call_if_eq Route116_EventScript_1F2E5E
compare VAR_FACING, 1
compare VAR_FACING, DIR_SOUTH
call_if_eq Route116_EventScript_1F2E5E
compare VAR_FACING, 3
compare VAR_FACING, DIR_WEST
call_if_eq Route116_EventScript_1F2E5E
compare VAR_FACING, 4
compare VAR_FACING, DIR_EAST
call_if_eq Route116_EventScript_1F2E69
removeobject VAR_LAST_TALKED
release