summaryrefslogtreecommitdiff
path: root/data/maps/MossdeepCity_StevensHouse/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/MossdeepCity_StevensHouse/scripts.inc')
-rw-r--r--data/maps/MossdeepCity_StevensHouse/scripts.inc18
1 files changed, 6 insertions, 12 deletions
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index a5a3d0980..aac12ec2a 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -16,8 +16,7 @@ MossdeepCity_StevensHouse_EventScript_HideStevensNote::
return
MossdeepCity_StevensHouse_OnTransition:
- compare VAR_STEVENS_HOUSE_STATE, 2
- call_if_eq MossdeepCity_StevensHouse_EventScript_SetStevenPos
+ call_if_eq VAR_STEVENS_HOUSE_STATE, 2, MossdeepCity_StevensHouse_EventScript_SetStevenPos
end
MossdeepCity_StevensHouse_EventScript_SetStevenPos::
@@ -76,8 +75,7 @@ MossdeepCity_StevensHouse_Movement_StevenReturn:
MossdeepCity_StevensHouse_EventScript_BeldumPokeball::
lockall
msgbox MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum, MSGBOX_YESNO
- compare VAR_RESULT, NO
- goto_if_eq MossdeepCity_StevensHouse_EventScript_LeaveBeldum
+ goto_if_eq VAR_RESULT, NO, MossdeepCity_StevensHouse_EventScript_LeaveBeldum
goto MossdeepCity_StevensHouse_EventScript_GiveBeldum
end
@@ -89,18 +87,15 @@ MossdeepCity_StevensHouse_EventScript_LeaveBeldum::
MossdeepCity_StevensHouse_EventScript_GiveBeldum::
setvar VAR_TEMP_1, SPECIES_BELDUM
givemon SPECIES_BELDUM, 5, ITEM_NONE
- compare VAR_RESULT, 0
- goto_if_eq MossdeepCity_StevensHouse_EventScript_SendBeldumParty
- compare VAR_RESULT, 1
- goto_if_eq MossdeepCity_StevensHouse_EventScript_SendBeldumPC
+ goto_if_eq VAR_RESULT, 0, MossdeepCity_StevensHouse_EventScript_SendBeldumParty
+ goto_if_eq VAR_RESULT, 1, MossdeepCity_StevensHouse_EventScript_SendBeldumPC
goto Common_EventScript_NoMoreRoomForPokemon
end
MossdeepCity_StevensHouse_EventScript_SendBeldumParty::
call MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
- compare VAR_RESULT, NO
- goto_if_eq MossdeepCity_StevensHouse_EventScript_ReceivedBeldum
+ goto_if_eq VAR_RESULT, NO, MossdeepCity_StevensHouse_EventScript_ReceivedBeldum
call Common_EventScript_GetGiftMonPartySlot
call Common_EventScript_NameReceivedPartyMon
goto MossdeepCity_StevensHouse_EventScript_ReceivedBeldum
@@ -109,8 +104,7 @@ MossdeepCity_StevensHouse_EventScript_SendBeldumParty::
MossdeepCity_StevensHouse_EventScript_SendBeldumPC::
call MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
- compare VAR_RESULT, NO
- goto_if_eq MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC
+ goto_if_eq VAR_RESULT, NO, MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC
call Common_EventScript_NameReceivedBoxMon
goto MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC
end