Merge branch 'master' into doc-littleroot

2019-11-08 03:07:50 -05:00
parent e19b9c9d46 030784dece
commit 9140594b23
130 changed files with 2292 additions and 2302 deletions
@@ -568,7 +568,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
        }
        if (ShouldDoWallyCall() == TRUE)
        {
-            ScriptContext1_SetupScript(MauvilleCity_EventScript_1DF7BA);
+            ScriptContext1_SetupScript(MauvilleCity_EventScript_RegisterWallyCall);
            return TRUE;
        }
        if (ShouldDoWinonaCall() == TRUE)