summaryrefslogtreecommitdiff
path: root/src/scene/berry_blender.c
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-17 19:31:23 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-17 19:31:23 -0500
commit2869160d630f569110ca895ff924070d626fd54b (patch)
tree3599a6c1a5de390a852828d6f918f643e2befa8b /src/scene/berry_blender.c
parent093422f3065ed47db9a475b0c9d67e9c5bc2c364 (diff)
use Defvars instead of some Dma macros and hopefully last while(1)s
Diffstat (limited to 'src/scene/berry_blender.c')
-rw-r--r--src/scene/berry_blender.c35
1 files changed, 8 insertions, 27 deletions
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index 6b6469634..7567899ae 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -832,14 +832,9 @@ static bool8 sub_804E2EC(void)
gBerryBlenderData->field_1++;
break;
case 1:
- {
- const void* offsetRead = sBlenderCenterMap;
- void* offsetWrite = (void*)(VRAM + 0x4000);
-
- DmaCopy16(3, offsetRead, offsetWrite, 0x400);
- LoadPalette(sBlenderCenterPal, 0, 0x100);
- gBerryBlenderData->field_1++;
- }
+ DmaCopy16Defvars(3, sBlenderCenterMap, (void *)(VRAM + 0x4000), 0x400);
+ LoadPalette(sBlenderCenterPal, 0, 0x100);
+ gBerryBlenderData->field_1++;
break;
case 2:
DmaCopyLarge16(3, ewram10000, (void *)(VRAM + 0x0), 0x2000, 0x1000);
@@ -854,37 +849,23 @@ static bool8 sub_804E2EC(void)
gBerryBlenderData->field_1++;
break;
case 5:
- {
- void* offsetRead = ewram10000;
- void* offsetWrite = (void*)(VRAM + 0xE000);
-
- DmaCopy16(3, offsetRead, offsetWrite, 0x1000);
- gBerryBlenderData->field_1++;
- }
+ DmaCopy16Defvars(3, ewram10000, (void *)(VRAM + 0xE000), 0x1000);
+ gBerryBlenderData->field_1++;
break;
case 6:
- {
- void* offsetRead = ewram11000;
- void* offsetWrite = (void*)(VRAM + 0xF000);
-
- DmaCopy16(3, offsetRead, offsetWrite, 0x1000);
- gBerryBlenderData->field_1++;
- }
+ DmaCopy16Defvars(3, ewram11000, (void *)(VRAM + 0xF000), 0x1000);
+ gBerryBlenderData->field_1++;
break;
case 7:
{
u16 i;
u16* palStore = (u16*)(ewram13000);
- void* offsetRead;
- void* offsetWrite;
for (i = 0; i < 640; i++)
{
*(palStore + i) |= 0x100;
}
- offsetRead = ewram13000;
- offsetWrite = (void*)(VRAM + 0x6000);
- DmaCopy16(3, offsetRead, offsetWrite, 0x500);
+ DmaCopy16Defvars(3, ewram13000, (void *)(VRAM + 0x6000), 0x500);
LoadPalette(sBlenderOuterPal, 0x80, 0x20);
gBerryBlenderData->field_1++;
}