summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/field/slot_machine.c19
-rw-r--r--src/pokemon/mon_markings.c3
-rw-r--r--src/pokemon/pokemon_summary_screen.c22
-rw-r--r--src/scene/berry_blender.c20
-rw-r--r--src/scene/egg_hatch.c19
-rw-r--r--src/scene/hall_of_fame.c33
6 files changed, 14 insertions, 102 deletions
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index 9ff3a037c..21bf29e91 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -3901,26 +3901,9 @@ static void sub_8106404(void)
}
static void sub_8106448(void) {
- u32 offsetRead, offsetWrite;
- u32 size;
-
LZDecompressWram(gSlotMachine_Gfx, eSlotMachineGfxBuffer);
- offsetRead = (u32)eSlotMachineGfxBuffer;
- offsetWrite = BG_VRAM;
- size = SLOTMACHINE_GFX_TILES * 32;
- while (TRUE)
- {
- DmaCopy16(3, offsetRead, (void *) (offsetWrite), 0x1000);
- offsetRead += 0x1000;
- offsetWrite += 0x1000;
- size -= 0x1000;
- if (size <= 0x1000)
- {
- DmaCopy16(3, offsetRead, (void *) (offsetWrite), size);
- break;
- }
- }
+ DmaCopyLarge16(3, eSlotMachineGfxBuffer, BG_VRAM, SLOTMACHINE_GFX_TILES * 32, 0x1000);
LoadPalette(gUnknown_08E95A18, 0, 160);
LoadPalette(gPalette_83EDE24, 208, 32);
diff --git a/src/pokemon/mon_markings.c b/src/pokemon/mon_markings.c
index 3734856b8..66c82a706 100644
--- a/src/pokemon/mon_markings.c
+++ b/src/pokemon/mon_markings.c
@@ -631,6 +631,5 @@ struct Sprite *sub_80F7960(u16 tileTag, u16 paletteTag, const u16 *palette, u16
void sub_80F7A10(u8 markings, void *dest)
{
- const void *src = gUnknown_083E4A14 + markings * 0x80;
- DmaCopy16(3, src, dest, 0x80);
+ DmaCopy16Defvars(3, gUnknown_083E4A14 + markings * 0x80, dest, 0x80);
}
diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c
index bf8306fc0..eab6fb4ee 100644
--- a/src/pokemon/pokemon_summary_screen.c
+++ b/src/pokemon/pokemon_summary_screen.c
@@ -690,9 +690,6 @@ void sub_809DA1C(void)
bool8 sub_809DA84(void)
{
- const u16 *src;
- void *dest;
-
switch (gMain.state)
{
case 0:
@@ -709,8 +706,7 @@ bool8 sub_809DA84(void)
gMain.state++;
break;
case 3:
- dest = (void *)VRAM;
- DmaClearLarge(3, dest, 0x10000, 0x1000, 32);
+ DmaClearLarge(3, (void *)(VRAM + 0x0), 0x10000, 0x1000, 32);
gMain.state++;
break;
case 4:
@@ -736,14 +732,8 @@ bool8 sub_809DA84(void)
gMain.state++;
break;
case 9:
- src = gSummaryScreenTextTiles;
- dest = (void *)VRAM + 0xD000;
- DmaCopy16(3, src, dest, 320);
-
- src = sSummaryScreenButtonTiles;
- dest = (void *)VRAM + 0xD140;
- DmaCopy16(3, src, dest, 256);
-
+ DmaCopy16Defvars(3, gSummaryScreenTextTiles, (void *)(VRAM + 0xD000), 320);
+ DmaCopy16Defvars(3, sSummaryScreenButtonTiles, (void *)(VRAM + 0xD140), 256);
pssData.loadGfxState = 0;
gMain.state++;
break;
@@ -3622,16 +3612,14 @@ static void DrawSummaryScreenNavigationDots(void)
}
}
- dest = (void *)(VRAM + 0xE016);
- DmaCopy16(3, arr, dest, 16);
+ DmaCopy16Defvars(3, arr, (void *)(VRAM + 0xE016), 16);
for (i = 0; i < 8; i++)
{
arr[i] += 0x10;
}
- dest = (void *)(VRAM + 0xE056);
- DmaCopy16(3, arr, dest, 16);
+ DmaCopy16Defvars(3, arr, (void *)(VRAM + 0xE056), 16);
}
#else
__attribute__((naked))
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index 0a7e14e4e..6b6469634 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -842,24 +842,8 @@ static bool8 sub_804E2EC(void)
}
break;
case 2:
- {
- void* offsetRead = ewram10000;
- void* offsetWrite = (void*)(VRAM);
- u32 size = 0x2000;
- while (TRUE)
- {
- DmaCopy16(3, offsetRead, offsetWrite, 0x1000);
- offsetRead += 0x1000;
- offsetWrite += 0x1000;
- size -= 0x1000;
- if (size <= 0x1000)
- {
- DmaCopy16(3, offsetRead, offsetWrite, size);
- break;
- }
- }
- gBerryBlenderData->field_1++;
- }
+ DmaCopyLarge16(3, ewram10000, (void *)(VRAM + 0x0), 0x2000, 0x1000);
+ gBerryBlenderData->field_1++;
break;
case 3:
LZDecompressWram(gUnknown_08E6C920, ewram10000);
diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c
index e0b798aea..8c585e067 100644
--- a/src/scene/egg_hatch.c
+++ b/src/scene/egg_hatch.c
@@ -505,28 +505,11 @@ static void CB2_EggHatch_0(void)
break;
case 7:
{
- u32 offsetRead, offsetWrite;
u32 offsetRead2, offsetWrite2;
- u32 size;
REG_BG2CNT = 0x4C06;
LoadPalette(gUnknown_0820C9F8, 0x10, 0xA0);
-
- offsetRead = (u32)(&gUnknown_0820CA98);
- offsetWrite = (VRAM + 0x4000);
- size = 0x1300;
- while (TRUE)
- {
- DmaCopy16(3, offsetRead, (void *) (offsetWrite), 0x1000);
- offsetRead += 0x1000;
- offsetWrite += 0x1000;
- size -= 0x1000;
- if (size <= 0x1000)
- {
- DmaCopy16(3, offsetRead, (void *) (offsetWrite), size);
- break;
- }
- }
+ DmaCopyLarge16(3, gUnknown_0820CA98, (void *)(VRAM + 0x4000), 0x1300, 0x1000);
offsetRead2 = (u32)(&gUnknown_0820F798);
offsetWrite2 = (u32)(VRAM + 0x6000);
diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c
index a9532fd09..f7f7fb1cc 100644
--- a/src/scene/hall_of_fame.c
+++ b/src/scene/hall_of_fame.c
@@ -1199,8 +1199,8 @@ static void HallOfFame_PrintPlayerInfo(u8 a0, u8 a1)
static void sub_81433E0(void)
{
- u32 offsetWrite, offsetWrite2, offsetWrite3, offsetWrite4;
- u32 size, size2, size3, size4;
+ u32 offsetWrite2, offsetWrite3;
+ u32 size2, size3;
u16 i;
REG_DISPCNT = 0;
@@ -1221,19 +1221,7 @@ static void sub_81433E0(void)
REG_BG3HOFS = 0;
REG_BG3VOFS = 0;
- offsetWrite = (VRAM);
- size = 0x18000;
- while (TRUE)
- {
- DmaFill16(3, 0, offsetWrite, 0x1000);
- offsetWrite += 0x1000;
- size -= 0x1000;
- if (size <= 0x1000)
- {
- DmaFill16(3, 0, offsetWrite, size);
- break;
- }
- }
+ DmaFill16Large(3, 0, VRAM, 0x18000, 0x1000);
offsetWrite2 = OAM;
size2 = OAM_SIZE;
@@ -1258,20 +1246,7 @@ static void sub_81433E0(void)
*((u16*)(VRAM + 0x3000) + i) = 2;
}
- offsetWrite4 = ewram0_6;
- size4 = 0x4000;
- while (TRUE)
- {
- DmaFill16(3, 0, offsetWrite4, 0x1000);
- offsetWrite4 += 0x1000;
- size4 -= 0x1000;
- if (size4 <= 0x1000)
- {
- DmaFill16(3, 0, offsetWrite4, size4);
- break;
- }
- }
-
+ DmaFill16Large(3, 0, ewram0_6, 0x4000, 0x1000);
ResetPaletteFade();
LoadPalette(gHallOfFame_Pal, 0, 0x20);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 23:00:26 +0000