diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2019-02-01 12:26:40 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2019-02-01 12:26:40 +0100 |
commit | c0db31163732e976ebe64d0d65da309847986367 (patch) | |
tree | 35e50c4858867d92d667434c8dc86ed8aab22b4e /src/palette.c | |
parent | e3bec4b4809201d5007f0ae8e9e997235344ee03 (diff) |
some more fakematch fix
Diffstat (limited to 'src/palette.c')
-rw-r--r-- | src/palette.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/palette.c b/src/palette.c index deb07b066..be5143876 100644 --- a/src/palette.c +++ b/src/palette.c @@ -154,7 +154,7 @@ void ReadPlttIntoBuffers(void) bool8 BeginNormalPaletteFade(u32 selectedPalettes, s8 delay, u8 startY, u8 targetY, u16 blendColor) { u8 temp; - register u32 _blendColor asm("r8") = blendColor; + u16 color = blendColor; if (gPaletteFade.active) { @@ -175,7 +175,7 @@ bool8 BeginNormalPaletteFade(u32 selectedPalettes, s8 delay, u8 startY, u8 targe gPaletteFade_delay = delay; gPaletteFade.y = startY; gPaletteFade.targetY = targetY; - gPaletteFade.blendColor = _blendColor; + gPaletteFade.blendColor = color; gPaletteFade.active = 1; gPaletteFade.mode = NORMAL_FADE; @@ -881,7 +881,7 @@ void TintPalette_SepiaTone(u16 *palette, u16 count) { s32 r, g, b, i; u32 gray; - + for (i = 0; i < count; i++) { r = (*palette >> 0) & 0x1F; |