summaryrefslogtreecommitdiff
path: root/data/maps/RustboroCity_House1
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/RustboroCity_House1')
-rw-r--r--data/maps/RustboroCity_House1/scripts.inc9
1 files changed, 3 insertions, 6 deletions
diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc
index 20e93506b..88a33786c 100644
--- a/data/maps/RustboroCity_House1/scripts.inc
+++ b/data/maps/RustboroCity_House1/scripts.inc
@@ -10,18 +10,15 @@ RustboroCity_House1_EventScript_Trader::
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox RustboroCity_House1_Text_IllTradeIfYouWant, MSGBOX_YESNO
- compare VAR_RESULT, NO
- goto_if_eq RustboroCity_House1_EventScript_DeclineTrade
+ goto_if_eq VAR_RESULT, NO, RustboroCity_House1_EventScript_DeclineTrade
special ChoosePartyMon
waitstate
copyvar VAR_0x800A, VAR_0x8004
- compare VAR_0x8004, PARTY_NOTHING_CHOSEN
- goto_if_eq RustboroCity_House1_EventScript_DeclineTrade
+ goto_if_eq VAR_0x8004, PARTY_NOTHING_CHOSEN, RustboroCity_House1_EventScript_DeclineTrade
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
- compare VAR_RESULT, VAR_0x8009
- goto_if_ne RustboroCity_House1_EventScript_NotRequestedMon
+ goto_if_ne VAR_RESULT, VAR_0x8009, RustboroCity_House1_EventScript_NotRequestedMon
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special CreateInGameTradePokemon