dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Using RGB color constants where appropiate

Browse Source
This commit is contained in:
Eduardo Quezada committed 2023-07-31 15:33:14 -04:00
1 parent 39192725f2
commit f8c0f91c66
11 files changed
+35 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/battle_anim_throw.c
+5 -5
View File
@@ -384,7 +384,7 @@ const u16 gBallOpenFadeColors[] =
[BALL_PREMIER] = RGB(31, 9, 10),
// Garbage data
RGB(0, 0, 0),
RGB_BLACK,
RGB(1, 16, 0),
RGB(3, 0, 1),
RGB(1, 8, 0),
@@ -1309,12 +1309,12 @@ static void SpriteCB_Ball_Capture_Step(struct Sprite *sprite)
if (sprite->sTimer == 40)
{
PlaySE(SE_RG_BALL_CLICK);
BlendPalettes(0x10000 << sprite->oam.paletteNum, 6, RGB(0, 0, 0));
BlendPalettes(0x10000 << sprite->oam.paletteNum, 6, RGB_BLACK);
MakeCaptureStars(sprite);
}
else if (sprite->sTimer == 60)
{
BeginNormalPaletteFade(0x10000 << sprite->oam.paletteNum, 2, 6, 0, RGB(0, 0, 0));
BeginNormalPaletteFade(0x10000 << sprite->oam.paletteNum, 2, 6, 0, RGB_BLACK);
}
else if (sprite->sTimer == 95)
{
@@ -1352,7 +1352,7 @@ static void SpriteCB_Ball_FadeOut(struct Sprite *sprite)
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0));
paletteIndex = IndexOfSpritePaletteTag(sprite->template->paletteTag);
BeginNormalPaletteFade(1 << (paletteIndex + 0x10), 0, 0, 16, RGB(31, 31, 31));
BeginNormalPaletteFade(1 << (paletteIndex + 0x10), 0, 0, 16, RGB_WHITE);
sprite->sState++;
break;
case 1:
@@ -2041,7 +2041,7 @@ u8 LaunchBallFadeMonTask(bool8 unfadeLater, u8 spritePalNum, u32 selectedPalette
gTasks[taskId].func = Task_FadeMon_ToNormal;
}
BeginNormalPaletteFade(selectedPalettes, 0, 0, 16, RGB(31, 31, 31));
BeginNormalPaletteFade(selectedPalettes, 0, 0, 16, RGB_WHITE);
return taskId;
}