Merge branch 'master' of github.com:pret/pokeemerald into main-menu-state-machine

2019-02-13 23:04:56 -05:00
parent d979ac3bf3 efc5494834
commit 9e8a841bfa
33 changed files with 294 additions and 218 deletions
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -690,7 +690,7 @@ bool8 ScrCmd_initclock(struct ScriptContext *ctx)
    return FALSE;
 }

-bool8 ScrCmd_dodailyevents(struct ScriptContext *ctx)
+bool8 ScrCmd_dotimebasedevents(struct ScriptContext *ctx)
 {
    DoTimeBasedEvents();
    return FALSE;