dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows

Browse Source
This commit is contained in:
GriffinR
2023-02-01 14:59:45 -05:00
parent c91b13a12b 603d870ea0
commit 4328ed8b19
259 changed files with 4375 additions and 5702 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/berry_blender.c
+6 -6
View File
@@ -966,7 +966,7 @@ static bool8 LoadBerryBlenderGfx(void)
case 1:
CopyToBgTilemapBuffer(2, sBlenderCenter_Tilemap, 0x400, 0);
CopyBgTilemapBufferToVram(2);
LoadPalette(sBlenderCenter_Pal, 0, 0x100);
LoadPalette(sBlenderCenter_Pal, BG_PLTT_ID(0), 8 * PLTT_SIZE_4BPP);
sBerryBlender->loadGfxState++;
break;
case 2:
@@ -991,7 +991,7 @@ static bool8 LoadBerryBlenderGfx(void)
sBerryBlender->loadGfxState++;
break;
case 7:
LoadPalette(sBlenderOuter_Pal, 0x80, 0x20);
LoadPalette(sBlenderOuter_Pal, BG_PLTT_ID(8), PLTT_SIZE_4BPP);
sBerryBlender->loadGfxState++;
break;
case 8:
@@ -1072,8 +1072,8 @@ static void CB2_LoadBerryBlender(void)
InitBgsFromTemplates(1, sBgTemplates, ARRAY_COUNT(sBgTemplates));
SetBgTilemapBuffer(1, sBerryBlender->tilemapBuffers[0]);
SetBgTilemapBuffer(2, sBerryBlender->tilemapBuffers[1]);
LoadUserWindowBorderGfx(0, 1, 0xD0);
LoadMessageBoxGfx(0, 0x14, 0xF0);
LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(13));
LoadMessageBoxGfx(0, 0x14, BG_PLTT_ID(15));
InitBerryBlenderWindows();
sBerryBlender->mainState++;
@@ -1509,8 +1509,8 @@ static void InitBlenderBgs(void)
SetBgTilemapBuffer(1, sBerryBlender->tilemapBuffers[0]);
SetBgTilemapBuffer(2, sBerryBlender->tilemapBuffers[1]);
LoadUserWindowBorderGfx(0, 1, 0xD0);
LoadMessageBoxGfx(0, 0x14, 0xF0);
LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(13));
LoadMessageBoxGfx(0, 0x14, BG_PLTT_ID(15));
InitBerryBlenderWindows();
sBerryBlender->unk0 = 0;