diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-13 23:04:56 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-13 23:04:56 -0500 |
| commit | 9e8a841bfa0271a603b5e4895be3067cfa26f8ab (patch) | |
| tree | 52279a2b052583ccfc4a0d6a592cf8a384227a93 /data/scripts | |
| parent | d979ac3bf3924051de8bb4154e8398083535eabb (diff) | |
| parent | efc54948345235bdc7d2961d547498612ea8426c (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into main-menu-state-machine
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/pokeblocks.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 05b468e23..c2a580a61 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -264,7 +264,7 @@ EventScript_Pblock1_No: @ 8293C70 EventScript_Pblock1_NoBerries: @ 8293C7A msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_293C92 goto LilycoveCity_ContestLobby_EventScript_293C9C end @@ -551,7 +551,7 @@ LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8 specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 goto_if_eq LilycoveCity_ContestLobby_EventScript_294028 - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_294028 goto LilycoveCity_ContestLobby_EventScript_294032 end |