diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-02-01 10:04:42 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-01 10:04:42 -0600 |
| commit | b26c24ffeecdc82da84cb6fb2bdea37cd9de9df9 (patch) | |
| tree | af7d4ab5c4a49b3eefbabfcf331eb8c6e1d35cea /src/palette.c | |
| parent | b4f83b4f0fcce8c06a6a5a5fd541fb76b1fe9f4c (diff) | |
| parent | c0db31163732e976ebe64d0d65da309847986367 (diff) | |
Merge pull request #532 from DizzyEggg/bored
Fix some fakematches
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; |