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/Route111 | |
| parent | 655910a16fcb7b62cf43b83bb00b21a9c3e55e82 (diff) | |
| parent | 736f3bbbe0d1685474364a68038554f024bff62e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
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 2db95f0ce..89002883c 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 |