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/credits.c
+++ b/src/credits.c
@@ -1343,7 +1343,7 @@ static void sub_81758E4(u8 taskIdA)
        FreeAllSpritePalettes();
        gReservedSpritePaletteCount = 8;
        LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM);
-        LZ77UnCompVram(gBirchGrassTilemap, (void *)(VRAM + 0x3800));
+        LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7)));
        LoadPalette(gBirchBagGrassPal[0] + 1, 1, 31 * 2);

        for (i = 0; i < 0x800; i++)