summaryrefslogtreecommitdiff
path: root/src/scene
diff options
context:
space:
mode:
Diffstat (limited to 'src/scene')
-rw-r--r--src/scene/berry_blender.c59
-rw-r--r--src/scene/contest_painting.c17
-rw-r--r--src/scene/egg_hatch.c34
-rw-r--r--src/scene/evolution_scene.c4
-rw-r--r--src/scene/hall_of_fame.c41
-rw-r--r--src/scene/intro.c4
-rw-r--r--src/scene/intro_credits_graphics.c7
7 files changed, 29 insertions, 137 deletions
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index b59d02939..7567899ae 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -832,34 +832,13 @@ 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:
- {
- 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);
@@ -870,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++;
}
@@ -2567,9 +2532,9 @@ static void sub_8050954(void)
if (Blender_PrintBlendingResults())
{
if (gInGameOpponentsNo == 0)
- IncrementGameStat(34);
+ IncrementGameStat(GAME_STAT_POKEBLOCKS_WITH_FRIENDS);
else
- IncrementGameStat(33);
+ IncrementGameStat(GAME_STAT_POKEBLOCKS);
gBerryBlenderData->field_6F++;
}
break;
diff --git a/src/scene/contest_painting.c b/src/scene/contest_painting.c
index 3aa898b03..0aa02312f 100644
--- a/src/scene/contest_painting.c
+++ b/src/scene/contest_painting.c
@@ -156,23 +156,8 @@ static void ShowContestPainting(void)
break;
case 1:
{
- u8 *addr;
- size_t size;
-
ResetPaletteFade();
- addr = (void *)VRAM;
- size = 0x18000;
- while (1)
- {
- DmaFill32(3, 0, addr, 0x1000);
- addr += 0x1000;
- size -= 0x1000;
- if (size <= 0x1000)
- {
- DmaFill32(3, 0, addr, size);
- break;
- }
- }
+ DmaFill32Large(3, 0, (void *)(VRAM + 0x0), 0x18000, 0x1000);
ResetSpriteData();
gMain.state++;
break;
diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c
index e0b798aea..282ad31fb 100644
--- a/src/scene/egg_hatch.c
+++ b/src/scene/egg_hatch.c
@@ -504,35 +504,11 @@ static void CB2_EggHatch_0(void)
gMain.state++;
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;
- }
- }
-
- offsetRead2 = (u32)(&gUnknown_0820F798);
- offsetWrite2 = (u32)(VRAM + 0x6000);
- DmaCopy16(3, offsetRead2, (void*)(offsetWrite2), 0x1000);
- gMain.state++;
- }
+ REG_BG2CNT = 0x4C06;
+ LoadPalette(gUnknown_0820C9F8, 0x10, 0xA0);
+ DmaCopyLarge16(3, gUnknown_0820CA98, (void *)(VRAM + 0x4000), 0x1300, 0x1000);
+ DmaCopy16Defvars(3, gUnknown_0820F798, (void *)(VRAM + 0x6000), 0x1000);
+ gMain.state++;
break;
case 8:
REG_BG1CNT = 0x501;
diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c
index 931ec0d4d..3ba325574 100644
--- a/src/scene/evolution_scene.c
+++ b/src/scene/evolution_scene.c
@@ -649,7 +649,7 @@ static void Task_EvolutionScene(u8 taskID)
EvolutionRenameMon(mon, gTasks[taskID].tPreEvoSpecies, gTasks[taskID].tPostEvoSpecies);
GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 2);
GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 3);
- IncrementGameStat(14);
+ IncrementGameStat(GAME_STAT_EVOLVED_POKEMON);
}
break;
case 14: // check if it wants to learn a new move
@@ -991,7 +991,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
EvolutionRenameMon(mon, gTasks[taskID].tPreEvoSpecies, gTasks[taskID].tPostEvoSpecies);
GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 2);
GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 3);
- IncrementGameStat(14);
+ IncrementGameStat(GAME_STAT_EVOLVED_POKEMON);
}
break;
case 13:
diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c
index a9532fd09..e486c65a3 100644
--- a/src/scene/hall_of_fame.c
+++ b/src/scene/hall_of_fame.c
@@ -1199,8 +1199,6 @@ static void HallOfFame_PrintPlayerInfo(u8 a0, u8 a1)
static void sub_81433E0(void)
{
- u32 offsetWrite, offsetWrite2, offsetWrite3, offsetWrite4;
- u32 size, size2, size3, size4;
u16 i;
REG_DISPCNT = 0;
@@ -1221,27 +1219,9 @@ 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;
- }
- }
-
- offsetWrite2 = OAM;
- size2 = OAM_SIZE;
- DmaFill32(3, 0, offsetWrite2, size2);
-
- offsetWrite3 = PLTT;
- size3 = PLTT_SIZE;
- DmaFill16(3, 0, offsetWrite3, size3);
+ DmaFill16Large(3, 0, VRAM, 0x18000, 0x1000);
+ DmaFill32Defvars(3, 0, OAM, OAM_SIZE);
+ DmaFill16Defvars(3, 0, PLTT, PLTT_SIZE);
LZ77UnCompVram(gHallOfFame_Gfx, (void*)(VRAM));
@@ -1258,20 +1238,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);
}
diff --git a/src/scene/intro.c b/src/scene/intro.c
index f7e196133..4da341744 100644
--- a/src/scene/intro.c
+++ b/src/scene/intro.c
@@ -1217,7 +1217,6 @@ static void Task_IntroWaitToSetupPart3DoubleFight(u8 taskId)
static void Task_IntroLoadPart3Streaks(u8 taskId)
{
u16 i;
- void *vram;
intro_reset_and_hide_bgs();
for (i = 0; i < 32; i++)
@@ -1226,8 +1225,7 @@ static void Task_IntroLoadPart3Streaks(u8 taskId)
ewram0arr[1][i] = 17;
ewram0arr[2][i] = 34;
}
- vram = (void *)VRAM;
- DmaCopy16(3, gSharedMem, vram, 0x60);
+ DmaCopy16Defvars(3, gSharedMem, (void *)(VRAM + 0x0), 0x60);
for (i = 0; i < 0x280; i++)
((u16 *)(VRAM + 0x3000))[i] = 0xF001;
for (i = 0; i < 0x80; i++)
diff --git a/src/scene/intro_credits_graphics.c b/src/scene/intro_credits_graphics.c
index f0f1264a0..7f6765ef6 100644
--- a/src/scene/intro_credits_graphics.c
+++ b/src/scene/intro_credits_graphics.c
@@ -301,9 +301,10 @@ const struct CompressedSpriteSheet gUnknown_08416E34[] = {
};
-extern u16 gUnknown_02039358;
-extern s16 gUnknown_0203935A;
-extern s16 gUnknown_0203935C;
+EWRAM_DATA u16 gUnknown_02039358 = 0;
+EWRAM_DATA s16 gUnknown_0203935A = 0;
+EWRAM_DATA s16 gUnknown_0203935C = 0;
+
extern u8 gReservedSpritePaletteCount;
void sub_8149248();
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 10:49:52 +0000