diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-18 01:12:47 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-18 01:12:47 -0500 |
| commit | 5695617d64335474ead8a7e25c539daebcc55fa5 (patch) | |
| tree | 0e9791a86b6aff83ab99aa9dd9878558f89fb824 /data/scripts/pokeblocks.inc | |
| parent | 08579edbcd596c9659fe25490480c6f96e2b4288 (diff) | |
| parent | e95140270be790b03e693f539770abfd6473916e (diff) | |
Merge branch 'master' into multiplayer-stuff
Diffstat (limited to 'data/scripts/pokeblocks.inc')
| -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 |