diff options
| author | huderlem <huderlem@gmail.com> | 2020-01-13 19:33:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 19:33:47 -0600 |
| commit | 6d6c57f3832c14aadd07b9d39c658c838fcd42cf (patch) | |
| tree | eb87fc3634991f5ce401b25dfca9968ee5c36f69 /data/maps/Route114 | |
| parent | fa5816915d2a089549bfae3851c36336eae35d43 (diff) | |
| parent | 96720db08319d8f69d7864e186722d13dc9ceb05 (diff) | |
Merge pull request #953 from GriffinRichards/sync-script
Port some macro/script fixes from pokefirered
Diffstat (limited to 'data/maps/Route114')
| -rw-r--r-- | data/maps/Route114/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 5e0e564b1..dda7f270d 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -33,7 +33,7 @@ Route114_EventScript_Man:: @ 81F2582 random NUM_ROUTE_114_MAN_BERRIES addvar VAR_RESULT, NUM_ROUTE_114_MAN_BERRIES_SKIPPED addvar VAR_RESULT, FIRST_BERRY_INDEX - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY @@ -51,7 +51,7 @@ Route114_EventScript_RoarGentleman:: @ 81F25D1 faceplayer goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_ReceivedRoar msgbox Route114_Text_AllMyMonDoesIsRoarTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_TM05 + giveitem ITEM_TM05 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM05 |