Merge remote-tracking branch 'upstream/master' into port_matchings

2021-03-19 14:34:58 -04:00
parent 0643255c85 ed16a7409a
commit c94e5e9ab0
96 changed files with 2976 additions and 2878 deletions
@@ -375,7 +375,7 @@ bool32 HandleMysteryGiftOrEReaderSetup(s32 mg_or_ereader)
        ScanlineEffect_Stop();
        ResetBgsAndClearDma3BusyFlags(1);

-        InitBgsFromTemplates(0, sBGTemplates, ARRAY_COUNT(sBGTemplates));
+        InitBgsFromTemplates(0, sBGTemplates, NELEMS(sBGTemplates));
        ChangeBgX(0, 0, 0);
        ChangeBgY(0, 0, 0);
        ChangeBgX(1, 0, 0);