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

48
data/maps/LavaridgeTown/scripts.inc
View File

@@ -12,10 +12,8 @@ LavaridgeTown_OnTransition:
call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_ShowMtChimneyTrainers
call Common_EventScript_SetupRivalGfxId
call Common_EventScript_SetupRivalOnBikeGfxId
compare VAR_LAVARIDGE_TOWN_STATE, 1
call_if_eq LavaridgeTown_EventScript_CheckSetRivalPos
compare VAR_LAVARIDGE_TOWN_STATE, 1
call_if_eq LavaridgeTown_EventScript_HideMapNamePopup
call_if_eq VAR_LAVARIDGE_TOWN_STATE, 1, LavaridgeTown_EventScript_CheckSetRivalPos
call_if_eq VAR_LAVARIDGE_TOWN_STATE, 1, LavaridgeTown_EventScript_HideMapNamePopup
end
LavaridgeTown_EventScript_ClearLavaridgeWhiteOut::
@@ -24,8 +22,7 @@ LavaridgeTown_EventScript_ClearLavaridgeWhiteOut::
LavaridgeTown_EventScript_CheckSetRivalPos::
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 9
goto_if_eq LavaridgeTown_EventScript_SetRivalPos
goto_if_eq VAR_0x8004, 9, LavaridgeTown_EventScript_SetRivalPos
return
LavaridgeTown_EventScript_SetRivalPos::
@@ -50,25 +47,17 @@ LavaridgeTown_OnFrame:
LavaridgeTown_EventScript_RivalGiveGoGoggles::
lockall
getplayerxy VAR_0x8008, VAR_0x8009
compare VAR_0x8008, 9
call_if_eq LavaridgeTown_EventScript_RivalNoticePlayer
compare VAR_0x8008, 9
call_if_ne LavaridgeTown_EventScript_RivalExitHerbShop
call_if_eq VAR_0x8008, 9, LavaridgeTown_EventScript_RivalNoticePlayer
call_if_ne VAR_0x8008, 9, LavaridgeTown_EventScript_RivalExitHerbShop
delay 20
checkplayergender
compare VAR_RESULT, MALE
call_if_eq LavaridgeTown_EventScript_PlayMayMusic
compare VAR_RESULT, FEMALE
call_if_eq LavaridgeTown_EventScript_PlayBrendanMusic
compare VAR_0x8008, 9
call_if_eq LavaridgeTown_EventScript_RivalApproachPlayer1
compare VAR_0x8008, 9
call_if_ne LavaridgeTown_EventScript_RivalApproachPlayer2
call_if_eq VAR_RESULT, MALE, LavaridgeTown_EventScript_PlayMayMusic
call_if_eq VAR_RESULT, FEMALE, LavaridgeTown_EventScript_PlayBrendanMusic
call_if_eq VAR_0x8008, 9, LavaridgeTown_EventScript_RivalApproachPlayer1
call_if_ne VAR_0x8008, 9, LavaridgeTown_EventScript_RivalApproachPlayer2
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq LavaridgeTown_EventScript_MayGiveGoGoggles
compare VAR_RESULT, FEMALE
goto_if_eq LavaridgeTown_EventScript_BrendanGiveGoGoggles
goto_if_eq VAR_RESULT, MALE, LavaridgeTown_EventScript_MayGiveGoGoggles
goto_if_eq VAR_RESULT, FEMALE, LavaridgeTown_EventScript_BrendanGiveGoGoggles
end
LavaridgeTown_EventScript_MayGiveGoGoggles::
@@ -92,10 +81,8 @@ LavaridgeTown_EventScript_RivalExit::
removeobject LOCALID_RIVAL
addobject LOCALID_RIVAL_ON_BIKE
delay 30
compare VAR_0x8008, 9
call_if_eq LavaridgeTown_EventScript_RivalExit1
compare VAR_0x8008, 9
call_if_ne LavaridgeTown_EventScript_RivalExit2
call_if_eq VAR_0x8008, 9, LavaridgeTown_EventScript_RivalExit1
call_if_ne VAR_0x8008, 9, LavaridgeTown_EventScript_RivalExit2
removeobject LOCALID_RIVAL_ON_BIKE
setvar VAR_LAVARIDGE_TOWN_STATE, 2
clearflag FLAG_HIDE_MAP_NAME_POPUP
@@ -214,8 +201,7 @@ LavaridgeTown_Movement_RivalExitHerbShop:
LavaridgeTown_EventScript_HotSpringsTrigger::
specialvar VAR_RESULT, GetPlayerFacingDirection
compare VAR_RESULT, DIR_SOUTH
goto_if_eq LavaridgeTown_EventScript_EnteredHotSprings
goto_if_eq VAR_RESULT, DIR_SOUTH, LavaridgeTown_EventScript_EnteredHotSprings
end
LavaridgeTown_EventScript_EnteredHotSprings::
@@ -251,11 +237,9 @@ LavaridgeTown_EventScript_EggWoman::
faceplayer
goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_ReceivedEgg
msgbox LavaridgeTown_Text_HaveEggWillYouTakeIt, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq LavaridgeTown_EventScript_DeclineEgg
goto_if_eq VAR_RESULT, NO, LavaridgeTown_EventScript_DeclineEgg
getpartysize
compare VAR_RESULT, PARTY_SIZE
goto_if_eq LavaridgeTown_EventScript_NoRoomForEgg
goto_if_eq VAR_RESULT, PARTY_SIZE, LavaridgeTown_EventScript_NoRoomForEgg
msgbox LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_LAVARIDGE_EGG
playfanfare MUS_OBTAIN_ITEM