Merge branch 'master' into main-menu-state-machine

2019-02-21 22:24:25 -05:00
parent 9e8a841bfa b105d20d1e
commit 399d646e3f
498 changed files with 11313 additions and 14336 deletions
--- a/src/clear_save_data_screen.c
+++ b/src/clear_save_data_screen.c
@@ -153,7 +153,7 @@ static bool8 SetupClearSaveDataScreen(void)
            ((u16 *)(VRAM + 0x20))[i] = 0x1111;

        for (i = 0; i < 0x400; i++)
-            ((u16 *)(VRAM + 0xF000))[i] = 0x0001;
+            ((u16 *)(BG_SCREEN_ADDR(30)))[i] = 0x0001;
        ResetTasks();
        ResetSpriteData();
        ResetBgsAndClearDma3BusyFlags(0);