Use 'goto_if_eq VAR, value, Script' syntax

This commit is contained in:
GriffinR
2022-08-09 20:40:03 -04:00
parent 60fc8c5e22
commit f113da30ad
171 changed files with 1992 additions and 3453 deletions
@@ -12,10 +12,8 @@ FiveIsland_ResortGorgeous_House_EventScript_Selphy::
lock
faceplayer
goto_if_set SHOWN_REQUESTED_MON, FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest
compare VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF
goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong
compare VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE
goto_if_ne FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon
goto_if_eq VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF, FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong
goto_if_ne VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE, FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon
msgbox FiveIsland_ResortGorgeous_House_Text_PleaseHearMyWish
goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon
end
@@ -34,8 +32,7 @@ FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong::
FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon::
copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON
specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
compare VAR_RESULT, TRUE
goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon
goto_if_eq VAR_RESULT, TRUE, FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon
goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon
end
@@ -54,19 +51,14 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
textcolor NPC_TEXT_COLOR_MALE
msgbox FiveIsland_ResortGorgeous_House_Text_ButlerIShallDoAsYouBid
closemessage
compare VAR_FACING, DIR_NORTH
call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth
compare VAR_FACING, DIR_SOUTH
call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth
compare VAR_FACING, DIR_EAST
call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast
compare VAR_FACING, DIR_WEST
call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest
call_if_eq VAR_FACING, DIR_NORTH, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth
call_if_eq VAR_FACING, DIR_SOUTH, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth
call_if_eq VAR_FACING, DIR_EAST, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast
call_if_eq VAR_FACING, DIR_WEST, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest
copyobjectxytoperm LOCALID_BUTLER
msgbox FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks
giveitem VAR_RESORT_GORGEOUS_REWARD
compare VAR_RESULT, FALSE
goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward
goto_if_eq VAR_RESULT, FALSE, FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward
setflag SHOWN_REQUESTED_MON
setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE
release