diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-21 08:50:36 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-05-21 09:02:30 -0700 |
| commit | 4ee671c9bf6e4ba920f58cd8d4a6facc8bed431d (patch) | |
| tree | c27468d8581731d2b035372fcc8a534f552549a0 /src/battle/battle_7.c | |
| parent | bfdd1d2cebd1d4f4469afce5b10b99090df17f45 (diff) | |
Standardize args to palette blend functions
Diffstat (limited to 'src/battle/battle_7.c')
| -rw-r--r-- | src/battle/battle_7.c | 8 |
1 files changed, 4 insertions, 4 deletions
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()) { |