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

81
data/scripts/players_house.inc
View File

@@ -11,10 +11,8 @@ PlayersHouse_1F_EventScript_EnterHouseMovingIn::
msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT
applymovement VAR_0x8004, Common_Movement_FacePlayer
waitmovement 0
compare VAR_0x8005, MALE
call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale
compare VAR_0x8005, FEMALE
call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale
call_if_eq VAR_0x8005, MALE, PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale
call_if_eq VAR_0x8005, FEMALE, PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale
msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT
closemessage
setvar VAR_LITTLEROOT_INTRO_STATE, 4
@@ -69,10 +67,8 @@ PlayersHouse_2F_EventScript_WallClock::
setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1
setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
checkplayergender
compare VAR_RESULT, MALE
call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsMale
compare VAR_RESULT, FEMALE
call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsFemale
call_if_eq VAR_RESULT, MALE, PlayersHouse_2F_EventScript_MomComesUpstairsMale
call_if_eq VAR_RESULT, FEMALE, PlayersHouse_2F_EventScript_MomComesUpstairsFemale
playse SE_EXIT
removeobject VAR_0x8008
releaseall
@@ -310,16 +306,12 @@ PlayersHouse_1F_Movement_MomReturnToSeatFemale:
PlayersHouse_1F_EventScript_Mom::
lock
faceplayer
compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4
goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard
compare VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4
goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard
goto_if_eq VAR_LITTLEROOT_HOUSES_STATE_MAY, 4, PlayersHouse_1F_EventScript_DontPushYourselfTooHard
goto_if_eq VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4, PlayersHouse_1F_EventScript_DontPushYourselfTooHard
goto_if_set FLAG_HAS_MATCH_CALL, PlayersHouse_1F_EventScript_TryRegisterMom
goto_if_set FLAG_RESCUED_BIRCH, PlayersHouse_1F_EventScript_MomHealsParty
compare VAR_TEMP_1, 1
goto_if_eq PlayersHouse_1F_EventScript_SeeYouHoney
compare VAR_LITTLEROOT_INTRO_STATE, 7
goto_if_eq PlayersHouse_1F_EventScript_DidYouMeetProfBirch
goto_if_eq VAR_TEMP_1, 1, PlayersHouse_1F_EventScript_SeeYouHoney
goto_if_eq VAR_LITTLEROOT_INTRO_STATE, 7, PlayersHouse_1F_EventScript_DidYouMeetProfBirch
msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT
release
end
@@ -351,8 +343,7 @@ PlayersHouse_1F_EventScript_TryGiveAmuletCoin::
goto_if_set FLAG_RECEIVED_AMULET_COIN, PlayersHouse_1F_EventScript_MomHealsParty
msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT
giveitem ITEM_AMULET_COIN
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_AMULET_COIN
release
@@ -432,14 +423,10 @@ PlayersHouse_1F_Movement_MovePlayerAwayFromDoor:
PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV::
lockall
checkplayergender
compare VAR_RESULT, MALE
call_if_eq PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale
compare VAR_RESULT, FEMALE
call_if_eq PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale
compare VAR_0x8008, MALE
call_if_eq PlayersHouse_1F_EventScript_PlayerEnterRoomMale
compare VAR_0x8008, FEMALE
call_if_eq PlayersHouse_1F_EventScript_PlayerEnterRoomFemale
call_if_eq VAR_RESULT, MALE, PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale
call_if_eq VAR_RESULT, FEMALE, PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale
call_if_eq VAR_0x8008, MALE, PlayersHouse_1F_EventScript_PlayerEnterRoomMale
call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_PlayerEnterRoomFemale
applymovement VAR_0x8009, Common_Movement_FacePlayer
waitmovement 0
playse SE_PIN
@@ -448,58 +435,44 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV::
applymovement VAR_0x8009, Common_Movement_Delay48
waitmovement 0
delay 20
compare VAR_0x8008, MALE
call_if_eq PlayersHouse_1F_EventScript_DadApproachPlayerMale
compare VAR_0x8008, FEMALE
call_if_eq PlayersHouse_1F_EventScript_DadApproachPlayerFemale
call_if_eq VAR_0x8008, MALE, PlayersHouse_1F_EventScript_DadApproachPlayerMale
call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_DadApproachPlayerFemale
msgbox PlayersHouse_1F_Text_TicketFromBrineyCameForYou, MSGBOX_DEFAULT
giveitem ITEM_SS_TICKET
msgbox PlayersHouse_1F_Text_PortsInSlateportLilycove, MSGBOX_DEFAULT
closemessage
delay 20
compare VAR_0x8008, MALE
call_if_eq PlayersHouse_1F_EventScript_MomApproachDadMale
compare VAR_0x8008, FEMALE
call_if_eq PlayersHouse_1F_EventScript_MomApproachDadFemale
call_if_eq VAR_0x8008, MALE, PlayersHouse_1F_EventScript_MomApproachDadMale
call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_MomApproachDadFemale
msgbox PlayersHouse_1F_Text_BetterGetBackToGym, MSGBOX_DEFAULT
closemessage
compare VAR_0x8008, MALE
call_if_eq PlayersHouse_1F_EventScript_DadExitsMale
compare VAR_0x8008, FEMALE
call_if_eq PlayersHouse_1F_EventScript_DadExitsFemale
call_if_eq VAR_0x8008, MALE, PlayersHouse_1F_EventScript_DadExitsMale
call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_DadExitsFemale
playse SE_DOOR
removeobject VAR_0x8009
setflag FLAG_RECEIVED_SS_TICKET
delay 30
compare VAR_0x8008, MALE
call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerMale
compare VAR_0x8008, FEMALE
call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerFemale
call_if_eq VAR_0x8008, MALE, PlayersHouse_1F_EventScript_MomApproachPlayerMale
call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_MomApproachPlayerFemale
delay 20
msgbox PlayersHouse_1F_Text_DadShouldStayLonger, MSGBOX_DEFAULT
closemessage
setflag FLAG_SYS_TV_LATIAS_LATIOS
special TurnOnTVScreen
delay 60
compare VAR_0x8008, MALE
call_if_eq PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastMale
compare VAR_0x8008, FEMALE
call_if_eq PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale
call_if_eq VAR_0x8008, MALE, PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastMale
call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale
msgbox PlayersHouse_1F_Text_IsThatABreakingStory, MSGBOX_DEFAULT
closemessage
compare VAR_0x8008, MALE
call_if_eq PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale
compare VAR_0x8008, FEMALE
call_if_eq PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale
call_if_eq VAR_0x8008, MALE, PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale
call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale
msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT
closemessage
clearflag FLAG_SYS_TV_LATIAS_LATIOS
setflag FLAG_LATIOS_OR_LATIAS_ROAMING
special TurnOffTVScreen
compare VAR_0x8008, MALE
call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale
compare VAR_0x8008, FEMALE
call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale
call_if_eq VAR_0x8008, MALE, PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale
call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale
msgbox PlayersHouse_1F_Text_WhatColorDidTheySay, MSGBOX_DEFAULT
multichoice 22, 8, MULTI_TV_LATI, TRUE
copyvar VAR_0x8004, VAR_RESULT