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/Route111 | |
| 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/Route111')
| -rw-r--r-- | data/maps/Route111/scripts.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index b80ef6b84..5971dc7f9 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -48,8 +48,7 @@ Route111_OnTransition: @ 81F0D87 call_if_eq Route111_EventScript_SetMirageTowerGone call Route111_EventScript_CheckSetSandstorm call GabbyAndTy_EventScript_UpdateLocation - checktrainerflag TRAINER_VICKY - goto_if_lt Route111_EventScript_SetWinstratesNotDefeated + goto_if_not_defeated TRAINER_VICKY, Route111_EventScript_SetWinstratesNotDefeated end Route111_EventScript_SetFallingPlayerGfx:: @ 81F0DC2 @@ -162,7 +161,7 @@ Route111_EventScript_Girl:: @ 81F0EB9 dotimebasedevents goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_ReceivedBerry msgbox Route111_Text_WateredPlantsEveryDayTakeBerry, MSGBOX_DEFAULT - giveitem_std ITEM_RAZZ_BERRY + giveitem ITEM_RAZZ_BERRY compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY |