diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-23 18:24:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 18:24:30 -0500 |
| commit | de2fe2cbbae599d9b336cb6762e3a03445cd5027 (patch) | |
| tree | d8cea366e68eca40bac0a6c0edf0c85a27eda520 /src/pc_screen_effect.c | |
| parent | 294d223dd0218c64267b6b6851575150e36593fb (diff) | |
| parent | 22e6e3532900b2470d0134f1347981d77828b22c (diff) | |
Merge pull request #616 from huderlem/misc
Misc labeling
Diffstat (limited to 'src/pc_screen_effect.c')
| -rw-r--r-- | src/pc_screen_effect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pc_screen_effect.c b/src/pc_screen_effect.c index 0e417b5f4..1bd87ea24 100644 --- a/src/pc_screen_effect.c +++ b/src/pc_screen_effect.c @@ -84,7 +84,7 @@ bool8 sub_80C5DCC(void) { if (gUnknown_020387EC->unk08 == 0) { - BlendPalettes(gUnknown_020387EC->selectedPalettes, 0x10, 0xFFFF); + BlendPalettes(gUnknown_020387EC->selectedPalettes, 16, FADE_COLOR_WHITE); HBlankIntrOn(sub_80C603C); gUnknown_020387EC->unk08++; } @@ -180,7 +180,7 @@ bool8 sub_80C5F98(void) gUnknown_020387EC->unk0C -= gUnknown_020387EC->unk06; if (gUnknown_020387EC->unk0C < 2) { - BlendPalettes(gUnknown_020387EC->selectedPalettes, 0x10, 0xFFFF); + BlendPalettes(gUnknown_020387EC->selectedPalettes, 16, FADE_COLOR_WHITE); SetHBlankCallback(sub_80C603C); gUnknown_020387EC->unk0C = 1; gUnknown_020387EC->unk08++; @@ -189,7 +189,7 @@ bool8 sub_80C5F98(void) case 1: if (gUnknown_020387EC->unk0A == 8) { - BlendPalettes(0xFFFFFFFF, 16, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); gUnknown_020387EC->unk08++; } break; @@ -236,7 +236,7 @@ static void sub_80C60CC(struct Sprite *sprite) { FreeSpriteTilesByTag(gUnknown_020387EC->tileTag); FreeSpritePaletteByTag(gUnknown_020387EC->paletteTag); - BlendPalettes(gUnknown_020387EC->selectedPalettes, 0, 0xffff); + BlendPalettes(gUnknown_020387EC->selectedPalettes, 0, FADE_COLOR_WHITE); SetHBlankCallback(sub_80C6078); } } |