some more fakematch fix

2019-02-01 12:26:40 +01:00
parent e3bec4b480
commit c0db311637
2 changed files with 155 additions and 154 deletions
@@ -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;