summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/naming_screen.c27
-rw-r--r--src/engine/option_menu.c17
-rw-r--r--src/engine/palette.c4
-rw-r--r--src/engine/reset_rtc_screen.c20
-rw-r--r--src/engine/save.c4
-rw-r--r--src/engine/trade.c33
-rw-r--r--src/engine/trainer_card.c46
7 files changed, 17 insertions, 134 deletions
diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c
index eddfdeda5..97819322c 100644
--- a/src/engine/naming_screen.c
+++ b/src/engine/naming_screen.c
@@ -258,20 +258,7 @@ static void NamingScreen_InitDisplayMode(void)
static void NamingScreen_ClearVram(void)
{
- u8 *addr = (void *)VRAM;
- u32 size = 0x10000;
-
- while (1)
- {
- DmaFill16(3, 0, addr, 0x1000);
- addr += 0x1000;
- size -= 0x1000;
- if (size <= 0x1000)
- {
- DmaFill16(3, 0, addr, size);
- break;
- }
- }
+ DmaFill16Large(3, 0, (void *)VRAM, 0x10000, 0x1000);
}
static void NamingScreen_ClearOam(void)
@@ -1629,16 +1616,8 @@ static void sub_80B7558(void)
static void sub_80B7568(void)
{
- const void *src;
- void *dst;
-
- src = gNamingScreenMenu_Gfx;
- dst = (void *)(VRAM + gMenuMessageBoxContentTileOffset * 32);
- DmaCopy16(3, src, dst, 0x800);
-
- src = gNamingScreenMenu_Gfx;
- dst = (void *)(VRAM + 0x8000 + gMenuMessageBoxContentTileOffset * 32);
- DmaCopy16(3, src, dst, 0x800);
+ DmaCopy16Defvars(3, gNamingScreenMenu_Gfx, (void *)(VRAM + gMenuMessageBoxContentTileOffset * 32), 0x800);
+ DmaCopy16Defvars(3, gNamingScreenMenu_Gfx, (void *)(VRAM + 0x8000 + gMenuMessageBoxContentTileOffset * 32), 0x800);
}
static void sub_80B75B0(void)
diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c
index 1fc78efaa..d4e921a0e 100644
--- a/src/engine/option_menu.c
+++ b/src/engine/option_menu.c
@@ -76,9 +76,6 @@ void CB2_InitOptionMenu(void)
default:
case 0:
{
- u8 *addr;
- u32 size;
-
SetVBlankCallback(NULL);
REG_DISPCNT = 0;
REG_BG2CNT = 0;
@@ -90,19 +87,7 @@ void CB2_InitOptionMenu(void)
REG_BG1VOFS = 0;
REG_BG0HOFS = 0;
REG_BG0VOFS = 0;
- addr = (u8 *)VRAM;
- size = 0x18000;
- while (1)
- {
- DmaFill16(3, 0, addr, 0x1000);
- addr += 0x1000;
- size -= 0x1000;
- if (size <= 0x1000)
- {
- DmaFill16(3, 0, addr, size);
- break;
- }
- }
+ DmaFill16Large(3, 0, (u8 *)VRAM, 0x18000, 0x1000);
DmaClear32(3, OAM, OAM_SIZE);
DmaClear16(3, PLTT, PLTT_SIZE);
gMain.state++;
diff --git a/src/engine/palette.c b/src/engine/palette.c
index 17e9ca178..2a6602503 100644
--- a/src/engine/palette.c
+++ b/src/engine/palette.c
@@ -827,8 +827,6 @@ void BlendPalettes(u32 selectedPalettes, u8 coeff, u16 color)
void BlendPalettesUnfaded(u32 selectedPalettes, u8 coeff, u16 color)
{
- void *src = gPlttBufferUnfaded;
- void *dest = gPlttBufferFaded;
- DmaCopy32(3, src, dest, PLTT_SIZE);
+ DmaCopy32Defvars(3, gPlttBufferUnfaded, gPlttBufferFaded, PLTT_SIZE);
BlendPalettes(selectedPalettes, coeff, color);
}
diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c
index c7d45e929..ce4afe922 100644
--- a/src/engine/reset_rtc_screen.c
+++ b/src/engine/reset_rtc_screen.c
@@ -414,28 +414,10 @@ void Task_ResetRtc_0(u8 taskId)
void CB2_InitResetRtcScreen(void)
{
- u8 *addr;
- u32 size;
-
REG_DISPCNT = 0;
SetVBlankCallback(NULL);
-
DmaClear16(3, PLTT, PLTT_SIZE);
-
- addr = (u8 *)VRAM;
- size = 0x18000;
- while (1)
- {
- DmaFill16(3, 0, addr, 0x1000);
- addr += 0x1000;
- size -= 0x1000;
- if (size <= 0x1000)
- {
- DmaFill16(3, 0, addr, size);
- break;
- }
- }
-
+ DmaFill16Large(3, 0, (u8 *)VRAM, 0x18000, 0x1000);
ResetOamRange(0, 128);
LoadOam();
ScanlineEffect_Stop();
diff --git a/src/engine/save.c b/src/engine/save.c
index be907edcc..250b29a87 100644
--- a/src/engine/save.c
+++ b/src/engine/save.c
@@ -674,8 +674,8 @@ u8 Save_WriteDataInternal(u8 saveType)
EraseFlashSector(i);
// fall through
case SAVE_HALL_OF_FAME: // hall of fame.
- if (GetGameStat(10) < 999)
- IncrementGameStat(10);
+ if (GetGameStat(GAME_STAT_ENTERED_HOF) < 999)
+ IncrementGameStat(GAME_STAT_ENTERED_HOF);
for (i = 0; i < NUM_HALL_OF_FAME_SECTORS; i++)
HandleWriteSectorNBytes(HALL_OF_FAME_SECTOR + i, sHallOfFameChunks[i].data, sHallOfFameChunks[i].size);
SaveSerializedGame();
diff --git a/src/engine/trade.c b/src/engine/trade.c
index e49cde6cd..4dc27ea6f 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -1455,9 +1455,7 @@ static void sub_8048AB4(void)
static void sub_8048B0C(u8 a0)
{
int i;
- u16 *dest;
- const u16 *src;
- u32 size;
+
switch (a0)
{
case 0:
@@ -1466,30 +1464,13 @@ static void sub_8048B0C(u8 a0)
gPlttBufferUnfaded[i] = *(gUnknown_08EA02C8 + i);
gPlttBufferFaded[i] = *(gUnknown_08EA02C8 + i);
}
- src = gUnknown_08EA0348;
- dest = (u16 *)BG_VRAM;
- size = 0x1280;
- while (1)
- {
- DmaCopy16(3, src, dest, BLOCKSIZE * sizeof(u16));
- src += BLOCKSIZE;
- dest += BLOCKSIZE;
- size -= BLOCKSIZE * sizeof(u16);
- if (size <= BLOCKSIZE * sizeof(u16))
- {
- DmaCopy16(3, src, dest, size);
- break;
- }
- }
+ DmaCopyLarge16(3, gUnknown_08EA0348, (void *)BG_VRAM, 0x1280, 0x1000);
for (i = 0; i < 0x400; i ++)
gUnknown_03004824->unk_00c8.unk_12[i] = gUnknown_08EA15C8[i];
- dest = BG_SCREEN_ADDR(6);
- DmaCopy16(3, gTradeStripesBG2Tilemap, dest, 0x800);
+ DmaCopy16Defvars(3, gTradeStripesBG2Tilemap, BG_SCREEN_ADDR(6), 0x800);
break;
case 1:
- src = gTradeStripesBG3Tilemap;
- dest = BG_SCREEN_ADDR(7);
- DmaCopy16(3, src, dest, 0x800);
+ DmaCopy16Defvars(3, gTradeStripesBG3Tilemap, BG_SCREEN_ADDR(7), 0x800);
sub_804A6DC(0);
sub_804A6DC(1);
sub_804A938(&gUnknown_03004824->unk_00c8);
@@ -5703,13 +5684,9 @@ static void sub_804E1DC(void)
void sub_804E22C(void)
{
- const u16 *src;
- u16 *dest;
LZDecompressVram(gUnknown_08D00000, (void *)VRAM);
CpuCopy16(gUnknown_08D00524, gSharedMem, 0x1000);
- src = (const u16 *)gSharedMem;
- dest = BG_SCREEN_ADDR(5);
- DmaCopy16(3, src, dest, 0x500)
+ DmaCopy16Defvars(3, gSharedMem, BG_SCREEN_ADDR(5), 0x500);
LoadCompressedPalette(gUnknown_08D004E0, 0, 32);
REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(5);
}
diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c
index 9d09575c8..b49628bfa 100644
--- a/src/engine/trainer_card.c
+++ b/src/engine/trainer_card.c
@@ -441,27 +441,12 @@ static void sub_8093550(void)
void sub_8093598(void)
{
- u8 *addr = (void *)VRAM;
- u32 size = 0x10000;
-
- while (1)
- {
- DmaFill16(3, 0, addr, 0x1000);
- addr += 0x1000;
- size -= 0x1000;
- if (size <= 0x1000)
- {
- DmaFill16(3, 0, addr, size);
- break;
- }
- }
+ DmaFill16Large(3, 0, (void *)VRAM, 0x10000, 0x1000);
}
void sub_80935EC(void)
{
- void *addr = (void *)OAM;
-
- DmaFill16(3, 0, addr, 0x400);
+ DmaFill16Defvars(3, 0, (void *)OAM, 0x400);
}
void sub_8093610(void)
@@ -1163,33 +1148,10 @@ static void TrainerCard_ResetOffsetRegisters(void)
static void TrainerCard_CopyGraphics(void)
{
- const u8 *src;
- u8 *dst;
- u32 size;
-
TrainerCard_LoadPalettes();
LoadPalette(gUnknown_083B5F6C, 0xE0, 32);
- src = gMenuTrainerCard_Gfx;
- dst = (void *)VRAM;
- size = 0x1480;
- while (1)
- {
- DmaCopy16(3, src, dst, 0x1000);
- src += 0x1000;
- dst += 0x1000;
- size -= 0x1000;
- if (size <= 0x1000)
- {
- DmaCopy16(3, src, dst, size);
- break;
- }
- }
- {
- const void *src = gBadgesTiles;
- void *dst = (void *)(VRAM + 0x1480);
-
- DmaCopy16(3, src, dst, 0x400);
- }
+ DmaCopyLarge16(3, gMenuTrainerCard_Gfx, (void *)VRAM, 0x1480, 0x1000);
+ DmaCopy16Defvars(3, gBadgesTiles, (void *)(VRAM + 0x1480), 0x400);
}
extern const u16 *const gTrainerCardPalettes[];
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 11:09:58 +0000