diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-11 12:02:58 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-11 14:12:31 -0500 |
| commit | f2e7b1507e564ba3b6b027a17aeeec2f89fba8c8 (patch) | |
| tree | 3095eac19802846050824f93c8f81035f57f3f2f /data/maps/Route111 | |
| parent | 8b1595ebc36a623240fa8dd509864f5400eed1f9 (diff) | |
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..e905508de 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_undefeated 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 |