dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat compare + goto_if/call_if to single statements

Browse Source
This commit is contained in:
GriffinR
2021-11-18 23:06:30 -05:00
parent c57efdba5d
commit e66ea0cb99
293 changed files with 2990 additions and 5978 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SeafloorCavern_Entrance/scripts.inc
+7 -14
View File
@@ -11,8 +11,7 @@ SeafloorCavern_Entrance_OnResume:
SeafloorCavern_Entrance_EventScript_Grunt::
lockall
compare VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
goto_if_eq SeafloorCavern_Entrance_EventScript_GruntSpeechShort
goto_if_eq VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1, SeafloorCavern_Entrance_EventScript_GruntSpeechShort
waitse
playse SE_PIN
applymovement LOCALID_GRUNT, Common_Movement_ExclamationMark
@@ -20,12 +19,9 @@ SeafloorCavern_Entrance_EventScript_Grunt::
applymovement LOCALID_GRUNT, Common_Movement_Delay48
waitmovement 0
delay 20
compare VAR_FACING, DIR_WEST
call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest
compare VAR_FACING, DIR_EAST
call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast
compare VAR_FACING, DIR_NORTH
call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth
call_if_eq VAR_FACING, DIR_WEST, SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest
call_if_eq VAR_FACING, DIR_EAST, SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast
call_if_eq VAR_FACING, DIR_NORTH, SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth
delay 30
setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
copyobjectxytoperm LOCALID_GRUNT
@@ -37,12 +33,9 @@ SeafloorCavern_Entrance_EventScript_Grunt::
end
SeafloorCavern_Entrance_EventScript_GruntSpeechShort::
compare VAR_FACING, DIR_WEST
call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest
compare VAR_FACING, DIR_EAST
call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast
compare VAR_FACING, DIR_NORTH
call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth
call_if_eq VAR_FACING, DIR_WEST, SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest
call_if_eq VAR_FACING, DIR_EAST, SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast
call_if_eq VAR_FACING, DIR_NORTH, SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth
msgbox SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterUp