diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-13 20:41:57 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-13 20:41:57 -0500 |
| commit | e92cc7752b5934d7501c5027057a6b7c52601bd7 (patch) | |
| tree | 85150713e1d8561415a54a45221c5b1975c91428 /data/maps/Route120 | |
| parent | 655910a16fcb7b62cf43b83bb00b21a9c3e55e82 (diff) | |
| parent | 736f3bbbe0d1685474364a68038554f024bff62e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
Diffstat (limited to 'data/maps/Route120')
| -rw-r--r-- | data/maps/Route120/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 4b7799510..a8aff3f76 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -145,7 +145,7 @@ Route120_EventScript_GiveIapapaBerry:: @ 81F55F6 end Route120_EventScript_GiveBerry:: @ 81F5601 - giveitem_std VAR_0x8004 + giveitem VAR_0x8004 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_120_RECEIVED_BERRY @@ -237,7 +237,7 @@ Route120_EventScript_StevenGiveDeconScope:: @ 81F572C applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route120_Text_StevenGiveDevonScope, MSGBOX_DEFAULT - giveitem_std ITEM_DEVON_SCOPE + giveitem ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_StevenGoodbye, MSGBOX_DEFAULT closemessage |