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

9
data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
View File

@@ -87,8 +87,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Attendant::
message BattleFrontier_BattleTowerMultiPartnerRoom_Text_QuitLookingForPartner
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_QuitChallenge
goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_QuitChallenge
msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner2, MSGBOX_DEFAULT
release
end
@@ -183,10 +182,8 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner::
waitmessage
waitbuttonpress
closemessage
compare VAR_FACING, DIR_SOUTH
call_if_ne BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExit
compare VAR_FACING, DIR_SOUTH
call_if_eq BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExitSouth
call_if_ne VAR_FACING, DIR_SOUTH, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExit
call_if_eq VAR_FACING, DIR_SOUTH, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExitSouth
removeobject VAR_LAST_TALKED
setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER
warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 10, 3