summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/anim/evasion.c2
-rw-r--r--src/battle/anim/flash.c2
-rw-r--r--src/battle/anim/scan.c2
-rw-r--r--src/battle/battle_2.c6
-rw-r--r--src/battle/battle_4.c6
-rw-r--r--src/battle/battle_7.c8
-rw-r--r--src/battle/battle_controller_player.c8
-rw-r--r--src/battle/battle_controller_safari.c2
-rw-r--r--src/battle/battle_controller_wally.c2
-rw-r--r--src/battle/battle_party_menu.c6
-rw-r--r--src/battle/battle_transition.c18
11 files changed, 31 insertions, 31 deletions
diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c
index e7387a52a..c60618a49 100644
--- a/src/battle/anim/evasion.c
+++ b/src/battle/anim/evasion.c
@@ -32,7 +32,7 @@ void sub_80CE7E0(u8 taskId)
gPlttBufferUnfaded[r3 + i] = gPlttBufferUnfaded[r4 + i];
}
- BlendPalette(r3, 16, 11, 0);
+ BlendPalette(r3, 16, 11, RGB(0, 0, 0));
task->data[3] = 0;
i = 0;
while (i <= 1 && (obj = duplicate_obj_of_side_rel2move_in_transparent_mode(0)) >= 0)
diff --git a/src/battle/anim/flash.c b/src/battle/anim/flash.c
index eaa38e5b7..2799046c8 100644
--- a/src/battle/anim/flash.c
+++ b/src/battle/anim/flash.c
@@ -39,7 +39,7 @@ void sub_80CE3EC(u8 taskId)
sub_8079BF4(&gTasks[taskId].data[14], &gTasks[taskId].data[15], (void*)c);
b = b | (0x10000 << IndexOfSpritePaletteTag(0x27D2));
d = IndexOfSpritePaletteTag(0x27D3);
- BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 0x10, 32699);
+ BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 16, RGB(27, 29, 31));
gTasks[taskId].func = sub_80CE4D4;
sub_80CE4D4(taskId);
}
diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c
index 05859d31c..9f427a9c4 100644
--- a/src/battle/anim/scan.c
+++ b/src/battle/anim/scan.c
@@ -159,7 +159,7 @@ static void sub_80CD5A8(struct Sprite* sprite)
sprite->data[1] = 0;
}
- BlendPalettes(sub_80791A8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], 0x7FFF);
+ BlendPalettes(sub_80791A8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB(31, 31, 31));
if (sprite->data[1] == 16)
{
int pal;
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index da566628d..728a1bdf7 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -1346,7 +1346,7 @@ void c2_081284E0(void)
gBattleCommunication[1]--;
if (gBattleCommunication[1] == 0)
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gBattleCommunication[0]++;
}
break;
@@ -3280,7 +3280,7 @@ void oac_poke_opponent(struct Sprite *sprite)
{
sprite->callback = sub_8010278;
StartSpriteAnimIfDifferent(sprite, 0);
- BeginNormalPaletteFade(0x00020000, 0, 10, 10, 0x3DEF);
+ BeginNormalPaletteFade(0x00020000, 0, 10, 10, RGB(15, 15, 15));
}
void sub_8010278(struct Sprite *sprite)
@@ -3304,7 +3304,7 @@ void sub_80102AC(struct Sprite *sprite)
sub_8043DFC(gHealthboxIDs[sprite->data[0]]);
sprite->callback = nullsub_37;
StartSpriteAnimIfDifferent(sprite, 0);
- BeginNormalPaletteFade(0x00020000, 0, 10, 0, 0x3DEF);
+ BeginNormalPaletteFade(0x00020000, 0, 10, 0, RGB(15, 15, 15));
}
}
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 9dc9d62ec..bb36c3520 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -9766,7 +9766,7 @@ static void atk5A_yesnoboxlearnmove(void)
if (gBattleCommunication[1] == 0)
{
sub_8023AD8();
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gBattleStruct->atk5A_StateTracker++;
return;
}
@@ -15845,7 +15845,7 @@ static void atkF2_displaydexinfo(void)
switch (gBattleCommunication[0])
{
case 0:
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gBattleCommunication[0]++;
break;
case 1:
@@ -15863,7 +15863,7 @@ static void atkF2_displaydexinfo(void)
LoadCompressedPalette(gBattleTerrainPalette_BattleTower, 0x20, 0x60);
REG_BG3CNT = 0x5a0b;
gBattle_BG3_X = 0x100;
- BeginNormalPaletteFade(0xfffc, 0, 0x10, 0, 0);
+ BeginNormalPaletteFade(0xFFFC, 0, 16, 0, RGB(0, 0, 0));
gBattleCommunication[0]++;
}
break;
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index dc5df71f2..75afc2739 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -334,7 +334,7 @@ void BattleLoadOpponentMonSprite(struct Pokemon *pkmn, u8 b)
}
if (ewram17800[b].transformedSpecies != 0)
{
- BlendPalette(paletteOffset, 16, 6, 0x7FFF);
+ BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31));
CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
}
}
@@ -386,7 +386,7 @@ void BattleLoadPlayerMonSprite(struct Pokemon *pkmn, u8 b)
}
if (ewram17800[b].transformedSpecies != 0)
{
- BlendPalette(paletteOffset, 16, 6, 0x7FFF);
+ BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31));
CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
}
}
@@ -646,7 +646,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
gBattleMonForms[a] = ewram17840.unk0;
if (ewram17800[a].transformedSpecies != 0)
{
- BlendPalette(paletteOffset, 16, 6, 0x7FFF);
+ BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31));
CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
}
gSprites[gBankSpriteIds[a]].pos1.y = sub_8077F68(a);
@@ -714,7 +714,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
LZDecompressWram(lzPaletteData, paletteSrc);
LoadPalette(paletteSrc + gBattleMonForms[b] * 16, paletteOffset, 32);
}
- BlendPalette(paletteOffset, 16, 6, 0x7FFF);
+ BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31));
CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
if (!IsContest())
{
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 004963b70..d1dcf8bf4 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -2655,7 +2655,7 @@ void PlayerHandlecmd10(void)
void PlayerHandlecmd11(void)
{
- BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB(0, 0, 0));
PlayerBufferExecCompleted();
}
@@ -2835,7 +2835,7 @@ void PlayerHandleOpenBag(void)
{
s32 i;
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gBattleBankFunc[gActiveBattler] = sub_802E004;
gBankInMenu = gActiveBattler;
for (i = 0; i < 3; i++)
@@ -2853,7 +2853,7 @@ void PlayerHandlecmd22(void)
ewram160C0 = gBattleBufferA[gActiveBattler][3];
for (i = 0; i < 3; i++)
gUnknown_02038470[i] = gBattleBufferA[gActiveBattler][4 + i];
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gBattleBankFunc[gActiveBattler] = sub_802DF30;
gBankInMenu = gActiveBattler;
}
@@ -2861,7 +2861,7 @@ void PlayerHandlecmd22(void)
void PlayerHandlecmd23(void)
{
BattleStopLowHpSound();
- BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB(0, 0, 0));
PlayerBufferExecCompleted();
}
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index 53c4d71d7..6bc56c19b 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
@@ -514,7 +514,7 @@ void SafariHandlecmd20(void)
void SafariHandleOpenBag(void)
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gBattleBankFunc[gActiveBattler] = sub_812B724;
gBankInMenu = gActiveBattler;
}
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 451e02b40..3f88d4c72 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -1312,7 +1312,7 @@ void WallyHandlecmd20(void)
void WallyHandleOpenBag(void)
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gBattleBankFunc[gActiveBattler] = sub_81374C4;
gBankInMenu = gActiveBattler;
}
diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c
index 923cf05a4..e758b7957 100644
--- a/src/battle/battle_party_menu.c
+++ b/src/battle/battle_party_menu.c
@@ -515,7 +515,7 @@ void HandleBattlePartyMenu(u8 taskId)
static void Task_809527C(u8 taskId)
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = Task_80952B4;
}
@@ -535,7 +535,7 @@ static void Task_80952E4(u8 taskId)
Task_809527C(taskId);
else
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = Task_8095330;
}
}
@@ -633,7 +633,7 @@ static void Task_BattlePartyMenuSummary(u8 taskId)
{
sub_806CA38(taskId); //an unused variable was probably set with this.
gTasks[taskId].func = Task_ShowSummaryScreen;
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
}
static void Task_BattlePartyMenuShift(u8 taskId)
diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c
index d5035a862..a0c94f713 100644
--- a/src/battle/battle_transition.c
+++ b/src/battle/battle_transition.c
@@ -643,7 +643,7 @@ static bool8 Phase2_Transition_Blur_Func2(struct Task* task)
{
task->data[1] = 4;
if (++task->data[2] == 10)
- BeginNormalPaletteFade(-1, -1, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB(0, 0, 0));
REG_MOSAIC = (task->data[2] & 15) * 17;
if (task->data[2] > 14)
task->tState++;
@@ -672,7 +672,7 @@ static bool8 Phase2_Transition_Swirl_Func1(struct Task* task)
sub_811D658();
ScanlineEffect_Clear();
- BeginNormalPaletteFade(-1, 4, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 16, RGB(0, 0, 0));
sub_811D6E8(gScanlineEffectRegBuffers[1], TRANSITION_STRUCT.field_14, 0, 2, 0, 160);
SetVBlankCallback(VBlankCB_Phase2_Transition_Swirl);
@@ -733,7 +733,7 @@ static bool8 Phase2_Transition_Shuffle_Func1(struct Task* task)
sub_811D658();
ScanlineEffect_Clear();
- BeginNormalPaletteFade(-1, 4, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 16, RGB(0, 0, 0));
memset(gScanlineEffectRegBuffers[1], TRANSITION_STRUCT.field_16, 0x140);
SetVBlankCallback(VBlankCB_Phase2_Transition_Shuffle);
@@ -1314,7 +1314,7 @@ static bool8 Phase2_Transition_Ripple_Func2(struct Task* task)
if (++task->data[3] == 81)
{
task->data[4]++;
- BeginNormalPaletteFade(-1, -2, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB(0, 0, 0));
}
if (task->data[4] != 0 && !gPaletteFade.active)
@@ -1664,7 +1664,7 @@ static bool8 Phase2_Mugshot_Func7(struct Task* task)
static bool8 Phase2_Mugshot_Func8(struct Task* task)
{
TRANSITION_STRUCT.VBlank_DMA = 0;
- BlendPalettes(-1, 0x10, 0x7FFF);
+ BlendPalettes(0xFFFFFFFF, 16, RGB(31, 31, 31));
TRANSITION_STRUCT.BLDCNT = 0xFF;
task->data[3] = 0;
@@ -1993,7 +1993,7 @@ static bool8 Phase2_Transition_WhiteFade_Func3(struct Task* task)
TRANSITION_STRUCT.VBlank_DMA = 0;
if (TRANSITION_STRUCT.field_20 > 7)
{
- BlendPalettes(-1, 0x10, 0x7FFF);
+ BlendPalettes(0xFFFFFFFF, 16, RGB(31, 31, 31));
task->tState++;
}
return FALSE;
@@ -2302,7 +2302,7 @@ static bool8 Phase1_TransitionAll_Func1(struct Task* task)
task->data[7] += task->data[4];
if (task->data[7] > 16)
task->data[7] = 16;
- BlendPalettes(-1, task->data[7], 0x2D6B);
+ BlendPalettes(0xFFFFFFFF, task->data[7], RGB(11, 11, 11));
}
if (task->data[7] > 15)
{
@@ -2320,7 +2320,7 @@ static bool8 Phase1_TransitionAll_Func2(struct Task* task)
task->data[7] -= task->data[5];
if (task->data[7] < 0)
task->data[7] = 0;
- BlendPalettes(-1, task->data[7], 0x2D6B);
+ BlendPalettes(0xFFFFFFFF, task->data[7], RGB(11, 11, 11));
}
if (task->data[7] == 0)
{
@@ -2379,7 +2379,7 @@ static void sub_811D6A8(u16** a0, u16** a1)
static void sub_811D6D4(void)
{
- BlendPalettes(-1, 0x10, 0);
+ BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0));
}
static void sub_811D6E8(s16* array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize)
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-10 20:01:13 +0000