diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-15 20:44:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-15 20:44:57 -0500 |
| commit | a4cd331634d1fcc5f7cb217c51c328c5769a9616 (patch) | |
| tree | 7b610171c3d893d1cace513cf61e0b74014dbad2 /data/maps/Route2_House/scripts.inc | |
| parent | 34deceb13695e7b13a27ecb94666fc95d2ced550 (diff) | |
| parent | fee980decd6dfd5dc98c15ba13c9ea8f7b597934 (diff) | |
Merge branch 'master' into doc-ttower
Diffstat (limited to 'data/maps/Route2_House/scripts.inc')
| -rw-r--r-- | data/maps/Route2_House/scripts.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 2cdc2d8ec..6c442958c 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -1,43 +1,43 @@ Route2_House_MapScripts:: @ 816F5F8 .byte 0 -Route2_House_EventScript_16F5F9:: @ 816F5F9 - msgbox gUnknown_819D5E7, MSGBOX_NPC +Route2_House_EventScript_Scientist:: @ 816F5F9 + msgbox Route2_House_Text_FaintedMonsCanUseFieldMoves, MSGBOX_NPC end -Route2_House_EventScript_16F602:: @ 816F602 +Route2_House_EventScript_Reyley:: @ 816F602 lock faceplayer setvar VAR_0x8008, INGAME_TRADE_MR_MIME call EventScript_GetInGameTradeSpeciesInfo - goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674 + goto_if_set FLAG_DID_MIMIEN_TRADE, Route2_House_EventScript_AlreadyTraded msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16F65C + goto_if_eq Route2_House_EventScript_DeclineTrade call EventScript_ChooseMonForInGameTrade compare VAR_0x8004, PARTY_SIZE - goto_if_ge EventScript_16F65C + goto_if_ge Route2_House_EventScript_DeclineTrade call EventScript_GetInGameTradeSpecies compare VAR_RESULT, VAR_0x8009 - goto_if_ne EventScript_16F666 + goto_if_ne Route2_House_EventScript_NotRequestedMon call EventScript_DoInGameTrade msgbox Trade_Text_HeyThanks setflag FLAG_DID_MIMIEN_TRADE release end -EventScript_16F65C:: @ 816F65C +Route2_House_EventScript_DeclineTrade:: @ 816F65C msgbox Trade_Text_AwwOhWell release end -EventScript_16F666:: @ 816F666 +Route2_House_EventScript_NotRequestedMon:: @ 816F666 getspeciesname 0, VAR_0x8009 msgbox Trade_Text_WhatThatsNoMon release end -EventScript_16F674:: @ 816F674 +Route2_House_EventScript_AlreadyTraded:: @ 816F674 msgbox Trade_Text_IsntMyOldMonGreat release end |