summaryrefslogtreecommitdiff
path: root/src/berry_blender.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-06-30 16:49:31 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-06-30 16:49:31 -0400
commitd7018c11494561eecd94c93b98a7980a063d7bf8 (patch)
tree9e9590ee66d6f82f015e0ffb7d3fcbc95ed63d67 /src/berry_blender.c
parent628a4e6bf8290a8c29c0b1f9dc67797e30ccbfbf (diff)
Tidy up ewram.h; yeet some more redundant definitions
Diffstat (limited to 'src/berry_blender.c')
-rw-r--r--src/berry_blender.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 504e094de..35c5a473d 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -802,7 +802,7 @@ static bool8 sub_804E2EC(void)
switch (gBerryBlenderData->field_1)
{
case 0:
- LZDecompressWram(gUnknown_08E6C100, ewram10000);
+ LZDecompressWram(gUnknown_08E6C100, eBerryBlenderGfxBuffer);
gBerryBlenderData->field_1++;
break;
case 1:
@@ -811,35 +811,35 @@ static bool8 sub_804E2EC(void)
gBerryBlenderData->field_1++;
break;
case 2:
- DmaCopyLarge16(3, ewram10000, (void *)(VRAM + 0x0), 0x2000, 0x1000);
+ DmaCopyLarge16(3, eBerryBlenderGfxBuffer, (void *)(VRAM + 0x0), 0x2000, 0x1000);
gBerryBlenderData->field_1++;
break;
case 3:
- LZDecompressWram(gUnknown_08E6C920, ewram10000);
+ LZDecompressWram(gUnknown_08E6C920, eBerryBlenderGfxBuffer);
gBerryBlenderData->field_1++;
break;
case 4:
- LZDecompressWram(gUnknown_08E6D354, ewram13000);
+ LZDecompressWram(gUnknown_08E6D354, eBerryBlenderGfxBuffer + 0x3000);
gBerryBlenderData->field_1++;
break;
case 5:
- DmaCopy16Defvars(3, ewram10000, (void *)(VRAM + 0xE000), 0x1000);
+ DmaCopy16Defvars(3, eBerryBlenderGfxBuffer + 0x0000, (void *)(VRAM + 0xE000), 0x1000);
gBerryBlenderData->field_1++;
break;
case 6:
- DmaCopy16Defvars(3, ewram11000, (void *)(VRAM + 0xF000), 0x1000);
+ DmaCopy16Defvars(3, eBerryBlenderGfxBuffer + 0x1000, (void *)(VRAM + 0xF000), 0x1000);
gBerryBlenderData->field_1++;
break;
case 7:
{
u16 i;
- u16* palStore = (u16*)(ewram13000);
+ u16* palStore = (u16*)(eBerryBlenderGfxBuffer + 0x3000);
for (i = 0; i < 640; i++)
{
*(palStore + i) |= 0x100;
}
- DmaCopy16Defvars(3, ewram13000, (void *)(VRAM + 0x6000), 0x500);
+ DmaCopy16Defvars(3, eBerryBlenderGfxBuffer + 0x3000, (void *)(VRAM + 0x6000), 0x500);
LoadPalette(sBlenderOuterPal, 0x80, 0x20);
gBerryBlenderData->field_1++;
}