dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2020-01-13 20:41:57 -05:00
parent 655910a16f 736f3bbbe0
commit e92cc7752b
118 changed files with 605 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/maps/Route111/scripts.inc
View File

@@ -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