summaryrefslogtreecommitdiff
path: root/data/maps/Route18_EastEntrance_2F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route18_EastEntrance_2F/scripts.inc')
-rw-r--r--data/maps/Route18_EastEntrance_2F/scripts.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc
index 83c79b9ae..483aba832 100644
--- a/data/maps/Route18_EastEntrance_2F/scripts.inc
+++ b/data/maps/Route18_EastEntrance_2F/scripts.inc
@@ -12,19 +12,19 @@ Route18_EastEntrance_2F_EventScript_170475:: @ 8170475
Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E
lock
faceplayer
- setvar VAR_0x8008, 5
- call EventScript_1A8CAD
+ setvar VAR_0x8008, INGAME_TRADE_LICKITUNG
+ call EventScript_GetInGameTradeSpeciesInfo
goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0
msgbox gUnknown_81A597B, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1704D8
- call EventScript_1A8CBD
- compare VAR_0x8004, 6
+ call EventScript_ChooseMonForInGameTrade
+ compare VAR_0x8004, PARTY_SIZE
goto_if_ge EventScript_1704D8
- call EventScript_1A8CC9
+ call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009
goto_if_ne EventScript_1704E2
- call EventScript_1A8CD9
+ call EventScript_DoInGameTrade
msgbox gUnknown_81A59DA
setflag FLAG_DID_MARC_TRADE
release