diff options
Diffstat (limited to 'src/scene')
-rw-r--r-- | src/scene/berry_blender.c | 20 | ||||
-rw-r--r-- | src/scene/egg_hatch.c | 19 | ||||
-rw-r--r-- | src/scene/hall_of_fame.c | 33 |
3 files changed, 7 insertions, 65 deletions
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); } |