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

138
data/scripts/berry_blender.inc
View File

@@ -249,8 +249,7 @@ BerryBlender_EventScript_BerryBlender1::
applymovement LOCALID_EXPERT_M, BerryBlender_Movement_BlendLeaderWalkInPlace
waitmovement 0
msgbox BerryBlender_Text_WantToMakePokeblocks, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq BerryBlender_EventScript_TryUseBerryBlender1
goto_if_eq VAR_RESULT, YES, BerryBlender_EventScript_TryUseBerryBlender1
goto BerryBlender_EventScript_DeclineBlender1
end
@@ -280,8 +279,7 @@ BerryBlender_EventScript_Blender1GiveSpareBerry:
BerryBlender_EventScript_UseBerryBlender1:
msgbox BerryBlender_Text_KnowHowToMakePokeblocks, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq BerryBlender_EventScript_StartBlender1
goto_if_eq VAR_RESULT, YES, BerryBlender_EventScript_StartBlender1
goto BerryBlender_EventScript_ExplainBlending1
end
@@ -297,14 +295,11 @@ BerryBlender_EventScript_ExplainBlending1:
BerryBlender_EventScript_TryUseBerryBlender1:
checkitem ITEM_POKEBLOCK_CASE
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_Blender1NoCase
goto_if_eq VAR_RESULT, FALSE, BerryBlender_EventScript_Blender1NoCase
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if_eq BerryBlender_EventScript_Blender1CaseFull
goto_if_eq VAR_RESULT, 65535, BerryBlender_EventScript_Blender1CaseFull
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_Blender1NoBerries
goto_if_eq VAR_RESULT, FALSE, BerryBlender_EventScript_Blender1NoBerries
msgbox BerryBlender_Text_Excellent, MSGBOX_DEFAULT
goto BerryBlender_EventScript_UseBerryBlender1
end
@@ -334,8 +329,7 @@ BerryBlender_EventScript_BerryBlender2::
applymovement LOCALID_MAN, BerryBlender_Movement_BlendLeaderWalkInPlace
waitmovement 0
msgbox BerryBlender_Text_WantToBlendPokeblocksWithUs, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq BerryBlender_EventScript_TryUseBerryBlender2
goto_if_eq VAR_RESULT, YES, BerryBlender_EventScript_TryUseBerryBlender2
goto BerryBlender_EventScript_DeclineBlender2
end
@@ -351,8 +345,7 @@ BerryBlender_EventScript_Blender2NoBerries:
BerryBlender_EventScript_UseBerryBlender2:
msgbox BerryBlender_Text_KnowHowToMakePokeblocks2, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq BerryBlender_EventScript_StartBlender2
goto_if_eq VAR_RESULT, YES, BerryBlender_EventScript_StartBlender2
goto BerryBlender_EventScript_ExplainBlending2
end
@@ -368,17 +361,13 @@ BerryBlender_EventScript_ExplainBlending2:
BerryBlender_EventScript_TryUseBerryBlender2:
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_Blender2NoBerries
goto_if_eq VAR_RESULT, FALSE, BerryBlender_EventScript_Blender2NoBerries
checkitem ITEM_POKEBLOCK_CASE
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_Blender2NoCase
goto_if_eq VAR_RESULT, FALSE, BerryBlender_EventScript_Blender2NoCase
msgbox BerryBlender_Text_Okay, MSGBOX_DEFAULT
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if_ne BerryBlender_EventScript_UseBerryBlender2
compare VAR_RESULT, 65535
goto_if_eq BerryBlender_EventScript_Blender2CaseFull
goto_if_ne VAR_RESULT, 65535, BerryBlender_EventScript_UseBerryBlender2
goto_if_eq VAR_RESULT, 65535, BerryBlender_EventScript_Blender2CaseFull
end
BerryBlender_EventScript_Blender2CaseFull:
@@ -400,8 +389,7 @@ BerryBlender_EventScript_BerryBlender3::
applymovement VAR_0x8008, BerryBlender_Movement_BlendLeaderWalkInPlace
waitmovement 0
msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq BerryBlender_EventScript_TryUseBlender3
goto_if_eq VAR_RESULT, YES, BerryBlender_EventScript_TryUseBlender3
goto BerryBlender_EventScript_DeclineBlender3
end
@@ -417,8 +405,7 @@ BerryBlender_EventScript_Blender3NoBerries:
BerryBlender_EventScript_UseBerryBlender3:
msgbox BerryBlender_Text_KnowHowToMakePokeblocks3, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq BerryBlender_EventScript_StartBlender3
goto_if_eq VAR_RESULT, YES, BerryBlender_EventScript_StartBlender3
goto BerryBlender_EventScript_ExplainBlending3
end
@@ -434,17 +421,13 @@ BerryBlender_EventScript_ExplainBlending3:
BerryBlender_EventScript_TryUseBlender3:
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_Blender3NoBerries
goto_if_eq VAR_RESULT, FALSE, BerryBlender_EventScript_Blender3NoBerries
checkitem ITEM_POKEBLOCK_CASE
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_Blender3NoCase
goto_if_eq VAR_RESULT, FALSE, BerryBlender_EventScript_Blender3NoCase
msgbox BerryBlender_Text_OhDear, MSGBOX_DEFAULT
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if_ne BerryBlender_EventScript_UseBerryBlender3
compare VAR_RESULT, 65535
goto_if_eq BerryBlender_EventScript_Blender3CaseFull
goto_if_ne VAR_RESULT, 65535, BerryBlender_EventScript_UseBerryBlender3
goto_if_eq VAR_RESULT, 65535, BerryBlender_EventScript_Blender3CaseFull
end
BerryBlender_EventScript_Blender3CaseFull:
@@ -461,8 +444,7 @@ BerryBlender_EventScript_BlendMasterPresent:
lockall
setvar NUM_OPPONENTS, 1
msgbox BerryBlender_Text_SeeMyMasteryInAction, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq BerryBlender_EventScript_TryBlendWithBlendMaster
goto_if_eq VAR_RESULT, YES, BerryBlender_EventScript_TryBlendWithBlendMaster
msgbox BerryBlender_Text_TooBusyNowIsee, MSGBOX_DEFAULT
releaseall
end
@@ -474,22 +456,17 @@ BerryBlender_EventScript_BlendMasterNoBerries:
BerryBlender_EventScript_TryBlendWithBlendMaster:
checkitem ITEM_POKEBLOCK_CASE
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_BlendMasterNoCase
goto_if_eq VAR_RESULT, FALSE, BerryBlender_EventScript_BlendMasterNoCase
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_BlendMasterNoBerries
goto_if_eq VAR_RESULT, FALSE, BerryBlender_EventScript_BlendMasterNoBerries
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if_ne BerryBlender_EventScript_BlendWithBlendMaster
compare VAR_RESULT, 65535
goto_if_eq BerryBlender_EventScript_BlendMasterCaseFull
goto_if_ne VAR_RESULT, 65535, BerryBlender_EventScript_BlendWithBlendMaster
goto_if_eq VAR_RESULT, 65535, BerryBlender_EventScript_BlendMasterCaseFull
end
BerryBlender_EventScript_BlendWithBlendMaster:
msgbox BerryBlender_Text_BlendMasterKnowHowToMakePokeblocks, MSGBOX_YESNO
compare VAR_RESULT, NO
call_if_eq BerryBlender_EventScript_BlendMasterExplainBlending
call_if_eq VAR_RESULT, NO, BerryBlender_EventScript_BlendMasterExplainBlending
msgbox BerryBlender_Text_BlendMasterLetsBerryBlender, MSGBOX_DEFAULT
goto BerryBlender_EventScript_DoBerryBlending
end
@@ -530,10 +507,8 @@ BerryBlender_EventScript_ExpertMCheckGiveBerry:
faceplayer
msgbox BerryBlender_Text_LoveMakingPokeblocks, MSGBOX_DEFAULT
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, TRUE
goto_if_eq BerryBlender_EventScript_ExpertMPlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_ExpertMNoBerries
goto_if_eq VAR_RESULT, TRUE, BerryBlender_EventScript_ExpertMPlayerHasBerries
goto_if_eq VAR_RESULT, FALSE, BerryBlender_EventScript_ExpertMNoBerries
end
BerryBlender_EventScript_ExpertMPlayerHasBerries:
@@ -543,11 +518,9 @@ BerryBlender_EventScript_ExpertMPlayerHasBerries:
BerryBlender_EventScript_ExpertMNoBerries:
checkitem ITEM_POKEBLOCK_CASE
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries
goto_if_eq VAR_RESULT, FALSE, BerryBlender_EventScript_ExpertMNoSpareBerries
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries
goto_if_eq VAR_RESULT, 65535, BerryBlender_EventScript_ExpertMNoSpareBerries
dotimebasedevents
goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, BerryBlender_EventScript_ExpertMNoSpareBerries
goto BerryBlender_EventScript_ExpertMGiveBerry
@@ -573,24 +546,18 @@ BerryBlender_Movement_BlendLeaderWalkInPlace:
BerryBlender_EventScript_BerryBlenderLink::
lockall
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_LinkBlenderNoBerries
goto_if_eq VAR_RESULT, FALSE, BerryBlender_EventScript_LinkBlenderNoBerries
checkitem ITEM_POKEBLOCK_CASE
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_LinkBlenderNoCase
goto_if_eq VAR_RESULT, FALSE, BerryBlender_EventScript_LinkBlenderNoCase
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if_ne BerryBlender_EventScript_LinkBlenderSaveGame
compare VAR_RESULT, 65535
goto_if_eq BerryBlender_EventScript_LinkBlenderCaseFull
goto_if_ne VAR_RESULT, 65535, BerryBlender_EventScript_LinkBlenderSaveGame
goto_if_eq VAR_RESULT, 65535, BerryBlender_EventScript_LinkBlenderCaseFull
end
BerryBlender_EventScript_LinkBlenderSaveGame:
msgbox BerryBlender_Text_SaveGameBeforeBerryBlenderLink, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq BerryBlender_EventScript_TryDoLinkBlender
compare VAR_RESULT, NO
goto_if_eq BerryBlender_EventScript_CancelLinkBlender
goto_if_eq VAR_RESULT, YES, BerryBlender_EventScript_TryDoLinkBlender
goto_if_eq VAR_RESULT, NO, BerryBlender_EventScript_CancelLinkBlender
end
BerryBlender_EventScript_LinkBlenderNoBerries:
@@ -600,25 +567,18 @@ BerryBlender_EventScript_LinkBlenderNoBerries:
BerryBlender_EventScript_TryDoLinkBlender:
call Common_EventScript_SaveGame
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_CancelLinkBlender
goto_if_eq VAR_RESULT, FALSE, BerryBlender_EventScript_CancelLinkBlender
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, TRUE
goto_if_eq BerryBlender_EventScript_StartDecideLinkLeader
goto_if_eq VAR_RESULT, TRUE, BerryBlender_EventScript_StartDecideLinkLeader
message BerryBlender_Text_SearchingForFriends
waitmessage
special TryBerryBlenderLinkup
waitstate
compare VAR_RESULT, LINKUP_SUCCESS
goto_if_eq BerryBlender_EventScript_SpawnLinkPartners
compare VAR_RESULT, LINKUP_SOMEONE_NOT_READY
goto_if_eq BerryBlender_EventScript_CloseLinkNotReady
compare VAR_RESULT, LINKUP_DIFF_SELECTIONS
goto_if_eq BerryBlender_EventScript_CloseLinkDifferentSelections
compare VAR_RESULT, LINKUP_FAILED
goto_if_eq BerryBlender_EventScript_CloseLink
compare VAR_RESULT, LINKUP_CONNECTION_ERROR
goto_if_eq BerryBlender_EventScript_LinkError
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, BerryBlender_EventScript_SpawnLinkPartners
goto_if_eq VAR_RESULT, LINKUP_SOMEONE_NOT_READY, BerryBlender_EventScript_CloseLinkNotReady
goto_if_eq VAR_RESULT, LINKUP_DIFF_SELECTIONS, BerryBlender_EventScript_CloseLinkDifferentSelections
goto_if_eq VAR_RESULT, LINKUP_FAILED, BerryBlender_EventScript_CloseLink
goto_if_eq VAR_RESULT, LINKUP_CONNECTION_ERROR, BerryBlender_EventScript_LinkError
end
BerryBlender_EventScript_TwoPlayerLink:
@@ -721,23 +681,17 @@ BerryBlender_EventScript_DecideLinkLeader:
BerryBlender_EventScript_TryLeadGroup:
call BerryBlender_EventScript_TryBecomeLinkLeader
compare VAR_RESULT, LINKUP_SUCCESS
goto_if_eq BerryBlender_EventScript_LinkLeaderDecided
compare VAR_RESULT, LINKUP_FAILED
goto_if_eq BerryBlender_EventScript_DecideLinkLeader
compare VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN
goto_if_eq BerryBlender_EventScript_TryLeadGroup
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, BerryBlender_EventScript_LinkLeaderDecided
goto_if_eq VAR_RESULT, LINKUP_FAILED, BerryBlender_EventScript_DecideLinkLeader
goto_if_eq VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN, BerryBlender_EventScript_TryLeadGroup
release
end
BerryBlender_EventScript_TryJoinGroup:
call BerryBlender_EventScript_TryJoinLinkGroup
compare VAR_RESULT, LINKUP_SUCCESS
goto_if_eq BerryBlender_EventScript_LinkLeaderDecided
compare VAR_RESULT, LINKUP_FAILED
goto_if_eq BerryBlender_EventScript_DecideLinkLeader
compare VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN
goto_if_eq BerryBlender_EventScript_TryJoinGroup
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, BerryBlender_EventScript_LinkLeaderDecided
goto_if_eq VAR_RESULT, LINKUP_FAILED, BerryBlender_EventScript_DecideLinkLeader
goto_if_eq VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN, BerryBlender_EventScript_TryJoinGroup
release
end