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
@@ -16,21 +16,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8
applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5
waitmovement 0
compare VAR_FACING, 1
compare VAR_FACING, DIR_SOUTH
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92
compare VAR_FACING, 4
compare VAR_FACING, DIR_EAST
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92
msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, MSGBOX_DEFAULT
compare VAR_FACING, 4
compare VAR_FACING, DIR_EAST
call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_20BC9D
msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, MSGBOX_DEFAULT
msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, MSGBOX_DEFAULT
closemessage
applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2
waitmovement 0
compare VAR_FACING, 1
compare VAR_FACING, DIR_SOUTH
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCA8
compare VAR_FACING, 3
compare VAR_FACING, DIR_WEST
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCB3
trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2
msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT