From 4158f07dee7f49d0eda4cc1eebaf424a07c8aa6c Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 12 Mar 2021 19:24:03 -0600 Subject: [PATCH] move bgBuffers back to unk138 --- src/berry_crush.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/berry_crush.c b/src/berry_crush.c index 3aa13cd65..8001cfd45 100755 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -137,6 +137,7 @@ struct BerryCrushGame_138 u8 filler81; u8 unk82; u8 unk83[5]; + u16 bgBuffers[4][0x800]; }; struct BerryCrushGame @@ -181,10 +182,6 @@ struct BerryCrushGame struct BerryCrushGame_68 unk68; struct BerryCrushGame_Player unk98[5]; struct BerryCrushGame_138 unk138; - u8 bg1Buffer[0x1000]; - u8 unk11C0[0x1000]; - u8 bg2Buffer[0x1000]; - u8 bg3Buffer[0x1000]; }; static void VBlankCB(void); @@ -1037,9 +1034,9 @@ s32 InitBerryCrushDisplay(void) case 3: ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, gUnknown_082F32C8, ARRAY_COUNT(gUnknown_082F32C8)); - SetBgTilemapBuffer(1, game->bg1Buffer); - SetBgTilemapBuffer(2, game->bg2Buffer); - SetBgTilemapBuffer(3, game->bg3Buffer); + SetBgTilemapBuffer(1, game->unk138.bgBuffers[0]); + SetBgTilemapBuffer(2, game->unk138.bgBuffers[2]); + SetBgTilemapBuffer(3, game->unk138.bgBuffers[3]); ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); ChangeBgX(2, 0, 0);