summaryrefslogtreecommitdiff
path: root/data/maps/Route104_MrBrineysHouse
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-18 23:06:30 -0500
committerGriffinR <griffin.g.richards@gmail.com>2021-11-18 23:06:51 -0500
commite66ea0cb996c70093fe3f250cafb7f1f87e84d4d (patch)
tree162e07afa059e7683e4aa991a1a82205c16b3025 /data/maps/Route104_MrBrineysHouse
parentc57efdba5d3cc475f75c5909c31f96bbce6190b8 (diff)
Reformat compare + goto_if/call_if to single statements
Diffstat (limited to 'data/maps/Route104_MrBrineysHouse')
-rw-r--r--data/maps/Route104_MrBrineysHouse/scripts.inc12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
index ed2a5d717..4c693cb4f 100644
--- a/data/maps/Route104_MrBrineysHouse/scripts.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
@@ -7,8 +7,7 @@ Route104_MrBrineysHouse_MapScripts::
Route104_MrBrineysHouse_OnTransition:
setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
- compare VAR_BRINEY_HOUSE_STATE, 1
- call_if_eq Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos
+ call_if_eq VAR_BRINEY_HOUSE_STATE, 1, Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos
call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_HideRustboroRival
end
@@ -36,8 +35,7 @@ Route104_MrBrineysHouse_EventScript_SailingIntro::
setflag FLAG_MR_BRINEY_SAILING_INTRO
msgbox Route104_MrBrineysHouse_Text_WaitUpPeeko, MSGBOX_DEFAULT
msgbox Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford, MSGBOX_YESNO
- compare VAR_RESULT, NO
- goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
+ goto_if_eq VAR_RESULT, NO, Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
goto Route104_MrBrineysHouse_EventScript_SailToDewford
end
@@ -53,15 +51,13 @@ Route104_MrBrineysHouse_EventScript_WhereAreWeBound::
Route104_MrBrineysHouse_EventScript_SailBothDeliveries::
msgbox Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford, MSGBOX_YESNO
- compare VAR_RESULT, NO
- goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
+ goto_if_eq VAR_RESULT, NO, Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
goto Route104_MrBrineysHouse_EventScript_SailToDewford
end
Route104_MrBrineysHouse_EventScript_SailDeliverPackage::
msgbox Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford, MSGBOX_YESNO
- compare VAR_RESULT, NO
- goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
+ goto_if_eq VAR_RESULT, NO, Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
goto Route104_MrBrineysHouse_EventScript_SailToDewford
end