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
@@ -18,11 +18,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
applymovement 1, Common_Movement_Delay48
waitmovement 0
delay 20
compare VAR_FACING, 3
compare VAR_FACING, DIR_WEST
call_if_eq SeafloorCavern_Entrance_EventScript_23452E
compare VAR_FACING, 4
compare VAR_FACING, DIR_EAST
call_if_eq SeafloorCavern_Entrance_EventScript_234523
compare VAR_FACING, 2
compare VAR_FACING, DIR_NORTH
call_if_eq SeafloorCavern_Entrance_EventScript_234539
delay 30
setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
@@ -35,11 +35,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
end
SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED
compare VAR_FACING, 3
compare VAR_FACING, DIR_WEST
call_if_eq SeafloorCavern_Entrance_EventScript_23452E
compare VAR_FACING, 4
compare VAR_FACING, DIR_EAST
call_if_eq SeafloorCavern_Entrance_EventScript_234523
compare VAR_FACING, 2
compare VAR_FACING, DIR_NORTH
call_if_eq SeafloorCavern_Entrance_EventScript_234539
msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT
closemessage