From 5dfaf22fb37104fb21a740b77fb353263fc178ca Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 1 Feb 2019 11:39:24 +0100
Subject: [PATCH 1/4] Fix pokemon icon asm

---
 src/pokemon_icon.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index bcbb60e21..ecb8f4950 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1238,7 +1238,6 @@ const u16* GetValidMonIconPalettePtr(u16 species)
     return gMonIconPaletteTable[gMonIconPaletteIndices[species]].data;
 }
 
-// TODO: try to find a way to avoid using asm statement
 u8 UpdateMonIconFrame(struct Sprite *sprite)
 {
     u8 result = 0;
@@ -1262,10 +1261,7 @@ u8 UpdateMonIconFrame(struct Sprite *sprite)
                 (u8 *)sprite->images + (sSpriteImageSizes[sprite->oam.shape][sprite->oam.size] * frame),
                 (u8 *)(OBJ_VRAM0 + sprite->oam.tileNum * TILE_SIZE_4BPP),
                 sSpriteImageSizes[sprite->oam.shape][sprite->oam.size]);
-            {
-                register u8 duration asm("r0") = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration;
-                sprite->animDelayCounter = duration;
-            }
+            sprite->animDelayCounter = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration & 0xFF;
             sprite->animCmdIndex++;
             result = sprite->animCmdIndex;
             break;

From 7c8fb66acf964ba4cf6b5dd5af16b70b596c477b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 1 Feb 2019 11:50:45 +0100
Subject: [PATCH 2/4] Fix field player avatar fakmatch

---
 src/field_player_avatar.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 7423216a4..b1291f0ce 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -90,7 +90,7 @@ static bool8 sub_808B618(void);
 static bool8 PlayerIsAnimActive(void);
 static bool8 PlayerCheckIfAnimFinishedOrInactive(void);
 
-static void PlayerRun(u8); 
+static void PlayerRun(u8);
 static void PlayerNotOnBikeCollide(u8);
 static void PlayerNotOnBikeCollideWithFarawayIslandMew(u8);
 
@@ -343,7 +343,7 @@ static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventO
         u8 r5 = direction;
         register u8 r6 asm("r6") = direction;
     #endif
-    //a very bad HACK 
+    //a very bad HACK
 
     if (EventObjectIsMovementOverridden(playerEventObj)
      && !EventObjectClearHeldMovementIfFinished(playerEventObj))
@@ -821,24 +821,14 @@ void SetPlayerAvatarTransitionFlags(u16 transitionFlags)
 static void DoPlayerAvatarTransition(void)
 {
     u8 i;
-    u32 flags = gPlayerAvatar.unk1;
+    u8 flags = gPlayerAvatar.unk1;
 
     if (flags != 0)
     {
         for (i = 0; i < 8; i++, flags >>= 1)
         {
-#ifdef NONMATCHING
             if (flags & 1)
-            {
                 gUnknown_084974B8[i](&gEventObjects[gPlayerAvatar.eventObjectId]);
-            }
-#else
-            if (flags & 1)
-            {
-                register void (*const *funcs)(struct EventObject *) asm("r0") = gUnknown_084974B8;
-                funcs[i](&gEventObjects[gPlayerAvatar.eventObjectId]);
-            }
-#endif
         }
         gPlayerAvatar.unk1 = 0;
     }
@@ -1151,7 +1141,7 @@ void PlayerGetDestCoords(s16 *x, s16 *y)
 u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y)
 {
     struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId];
-    
+
     if (object->heldMovementActive && !object->heldMovementFinished && !gSprites[object->spriteId].data[2])
     {
         *x = object->currentCoords.x;
@@ -1765,7 +1755,7 @@ static bool8 Fishing2(struct Task *task)
 static bool8 Fishing3(struct Task *task)
 {
     AlignFishingAnimationFrames();
-    
+
     // Wait one second
     task->tFrameCounter++;
     if (task->tFrameCounter >= 60)

From e3bec4b4809201d5007f0ae8e9e997235344ee03 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 1 Feb 2019 11:56:02 +0100
Subject: [PATCH 3/4] fix nonmatch in mauville old man

---
 src/mauville_old_man.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 930f1f35b..1b4a25217 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -572,9 +572,6 @@ static void Task_BardSong(u8 taskId)
             struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard;
             u8 *str = gStringVar4 + task->tCharIndex;
             u16 wordLen = 0;
-            // Can't get it to match without hacking
-            u32 temp;
-            register s16 zero asm("r1");
 
             while (*str != CHAR_SPACE
                    && *str != CHAR_NEWLINE
@@ -588,17 +585,22 @@ static void Task_BardSong(u8 taskId)
                 sUnknownBardRelated = MACRO2(bard->songLyrics[task->tCurrWord]);
             else
                 sUnknownBardRelated = MACRO2(bard->temporaryLyrics[task->tCurrWord]);
-            temp = gBardSong.length / wordLen;
-            zero = 0;
-            gBardSong.length = temp;
+
+            gBardSong.length /= wordLen;
             if (gBardSong.length <= 0)
                 gBardSong.length = 1;
             task->tCurrWord++;
+
             if (task->data[2] == 0)
+            {
                 task->tState = 3;
+                task->data[1] = 0;
+            }
             else
+            {
                 task->tState = 5;
-            task->data[1] = zero;
+                task->data[1] = 0;
+            }
         }
             break;
         case 5:

From c0db31163732e976ebe64d0d65da309847986367 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 1 Feb 2019 12:26:40 +0100
Subject: [PATCH 4/4] some more fakematch fix

---
 src/ice.c     | 303 +++++++++++++++++++++++++-------------------------
 src/palette.c |   6 +-
 2 files changed, 155 insertions(+), 154 deletions(-)

diff --git a/src/ice.c b/src/ice.c
index 77b3700ef..d354fce7e 100644
--- a/src/ice.c
+++ b/src/ice.c
@@ -530,7 +530,7 @@ static void sub_810B6C4(struct Sprite *sprite)
 {
     s16 targetX, targetY, attackerX, attackerY;
     s16 i;
-    
+
     sprite->oam.tileNum += 7;
     targetX = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
     targetY = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
@@ -811,7 +811,7 @@ void AnimIceBeamParticle(struct Sprite *sprite)
     sprite->callback = StartAnimLinearTranslation;
 }
 
-// Animates the ice crystals at the end of Ice Punch, Ice Beam, Tri Attack, 
+// Animates the ice crystals at the end of Ice Punch, Ice Beam, Tri Attack,
 // Weather Ball (Hail), Blizzard, and Powder Snow.
 // arg 0: target x offset
 // arg 1: target y offset
@@ -917,7 +917,7 @@ void AnimSwirlingSnowball_Step2(struct Sprite *sprite)
     sprite->pos2.x = 0;
     sprite->data[0] = 128;
 
-    tempVar = GetBattlerSide(gBattleAnimAttacker) != 0 ? 20 : -20;
+    tempVar = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 20 : -20;
 
     sprite->data[3] = Sin(sprite->data[0], tempVar);
     sprite->data[4] = Cos(sprite->data[0], 0xF);
@@ -1069,7 +1069,7 @@ void AnimWaveFromCenterOfTarget(struct Sprite *sprite)
             sprite->pos1.y += gBattleAnimArgs[1];
         }
 
-        sprite->data[0]++; 
+        sprite->data[0]++;
     }
     else
     {
@@ -1099,9 +1099,9 @@ void InitSwirlingFogAnim(struct Sprite *sprite)
         else
         {
             SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
-            if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) 
+            if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
                 sprite->pos1.x -= gBattleAnimArgs[0];
-            else 
+            else
                 sprite->pos1.x += gBattleAnimArgs[0];
 
             sprite->pos1.y += gBattleAnimArgs[1];
@@ -1109,18 +1109,18 @@ void InitSwirlingFogAnim(struct Sprite *sprite)
 
         battler = gBattleAnimAttacker;
     }
-    else 
+    else
     {
         if (gBattleAnimArgs[5] == 0)
         {
             InitSpritePosToAnimTarget(sprite, FALSE);
         }
-        else 
+        else
         {
             SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
             if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER)
                 sprite->pos1.x -= gBattleAnimArgs[0];
-            else 
+            else
                 sprite->pos1.x += gBattleAnimArgs[0];
 
             sprite->pos1.y += gBattleAnimArgs[1];
@@ -1130,7 +1130,7 @@ void InitSwirlingFogAnim(struct Sprite *sprite)
     }
 
     sprite->data[7] = battler;
-    if (gBattleAnimArgs[5] == 0 || !IsDoubleBattle()) 
+    if (gBattleAnimArgs[5] == 0 || !IsDoubleBattle())
         tempVar = 0x20;
     else
         tempVar = 0x40;
@@ -1161,7 +1161,7 @@ void AnimSwirlingFogAnim(struct Sprite *sprite)
         sprite->pos2.y += Cos(sprite->data[5], -6);
 
         if ((u16)(sprite->data[5] - 64) <= 0x7F)
-            sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]); 
+            sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]);
         else
             sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]) + 1;
 
@@ -1195,7 +1195,7 @@ void AnimTask_Haze1(u8 taskId)
     LoadBgTiles(subStruct.bgId, gWeatherFog1Tiles, 0x800, subStruct.tilesOffset);
     sub_80A6D60(&subStruct, gBattleAnimFogTilemap, 0);
     LoadPalette(&gUnknown_083970E8, subStruct.unk8 * 16, 32);
-    
+
     gTasks[taskId].func = AnimTask_Haze2;
 }
 
@@ -1208,62 +1208,63 @@ void AnimTask_Haze2(u8 taskId)
 
     switch (gTasks[taskId].data[12])
     {
-        case 0:
-            if (++gTasks[taskId].data[10] == 4)
-            {
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[9]++;
-                gTasks[taskId].data[11] = gUnknown_08595C5C[gTasks[taskId].data[9]];
+    case 0:
+        if (++gTasks[taskId].data[10] == 4)
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[9]++;
+            gTasks[taskId].data[11] = gUnknown_08595C5C[gTasks[taskId].data[9]];
 
-                SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11]));
-                if (gTasks[taskId].data[11] == 9)
-                {
-                    gTasks[taskId].data[12]++;
-                    gTasks[taskId].data[11] = 0;
-                }
-            }
-            break;
-        case 1:
-            if (++gTasks[taskId].data[11] == 0x51)
+            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11]));
+            if (gTasks[taskId].data[11] == 9)
             {
-                gTasks[taskId].data[11] = 9;
                 gTasks[taskId].data[12]++;
+                gTasks[taskId].data[11] = 0;
             }
-            break;
-        case 2:
-            if (++gTasks[taskId].data[10] == 4)
-            {
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[11]--;
-
-                SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11]));
-                if (gTasks[taskId].data[11] == 0)
-                {
-                    gTasks[taskId].data[12]++;
-                    gTasks[taskId].data[11] = 0;
-                }
-            }
-            break;
-        case 3:
-            sub_80A6B30(&subStruct);
-            sub_80A6C68(1);
-            sub_80A6C68(2);
-            
+        }
+        break;
+    case 1:
+        if (++gTasks[taskId].data[11] == 0x51)
+        {
+            gTasks[taskId].data[11] = 9;
             gTasks[taskId].data[12]++;
-            
-            // fall through
-        case 4:
-            if (!IsContest())
-                SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0);
+        }
+        break;
+    case 2:
+        if (++gTasks[taskId].data[10] == 4)
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[11]--;
 
-            gBattle_BG1_X = 0;
-            gBattle_BG1_Y = 0;
-            SetGpuReg(REG_OFFSET_BLDCNT, 0);
-            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0));
-            SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
-            DestroyAnimVisualTask(taskId);
+            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11]));
+            if (gTasks[taskId].data[11] == 0)
+            {
+                gTasks[taskId].data[12]++;
+                gTasks[taskId].data[11] = 0;
+            }
+        }
+        break;
+    case 3:
+        sub_80A6B30(&subStruct);
+        sub_80A6C68(1);
+        sub_80A6C68(2);
+
+        gTasks[taskId].data[12]++;
+
+        // fall through
+    case 4:
+        if (!IsContest())
+            SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0);
+
+        gBattle_BG1_X = 0;
+        gBattle_BG1_Y = 0;
+        SetGpuReg(REG_OFFSET_BLDCNT, 0);
+        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0));
+        SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
+        DestroyAnimVisualTask(taskId);
+        break;
     }
-} 
+}
 
 // Throws the ball in Mist Ball.
 // arg 0: initial x pixel offset
@@ -1301,7 +1302,7 @@ void AnimTask_LoadMistTiles(u8 taskId)
     LoadBgTiles(subStruct.bgId, gWeatherFog1Tiles, 0x800, subStruct.tilesOffset);
     sub_80A6D60(&subStruct, gBattleAnimFogTilemap, 0);
     LoadPalette(&gUnknown_083970E8, subStruct.unk8 * 16, 32);
-    
+
     gTasks[taskId].data[15] = -1;
     gTasks[taskId].func = AnimTask_OverlayFogTiles;
 }
@@ -1315,54 +1316,55 @@ void AnimTask_OverlayFogTiles(u8 taskId)
 
     switch (gTasks[taskId].data[12])
     {
-        case 0:
-            gTasks[taskId].data[9] += 1;
-            gTasks[taskId].data[11] = gUnknown_08595C88[gTasks[taskId].data[9]];
-            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 17 - gTasks[taskId].data[11]));
-            if (gTasks[taskId].data[11] == 5)
+    case 0:
+        gTasks[taskId].data[9] += 1;
+        gTasks[taskId].data[11] = gUnknown_08595C88[gTasks[taskId].data[9]];
+        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 17 - gTasks[taskId].data[11]));
+        if (gTasks[taskId].data[11] == 5)
+        {
+            gTasks[taskId].data[12]++;
+            gTasks[taskId].data[11] = 0;
+        }
+        break;
+    case 1:
+        if (++gTasks[taskId].data[11] == 0x51)
+        {
+            gTasks[taskId].data[11] = 5;
+            gTasks[taskId].data[12]++;
+        }
+        break;
+    case 2:
+        if (++gTasks[taskId].data[10] == 4)
+        {
+            gTasks[taskId].data[10] = 0;
+            gTasks[taskId].data[11] -= 1;
+            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11]));
+            if (gTasks[taskId].data[11] == 0)
             {
                 gTasks[taskId].data[12]++;
                 gTasks[taskId].data[11] = 0;
             }
-            break;
-        case 1:
-            if (++gTasks[taskId].data[11] == 0x51)
-            {
-                gTasks[taskId].data[11] = 5;
-                gTasks[taskId].data[12]++;
-            }
-            break;
-        case 2:
-            if (++gTasks[taskId].data[10] == 4)
-            {
-                gTasks[taskId].data[10] = 0;
-                gTasks[taskId].data[11] -= 1;
-                SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[11], 16 - gTasks[taskId].data[11]));
-                if (gTasks[taskId].data[11] == 0)
-                {
-                    gTasks[taskId].data[12]++;
-                    gTasks[taskId].data[11] = 0;
-                }
-            }
-            break;
-        case 3:
-            sub_80A6B30(&subStruct);
-            sub_80A6C68(1);
-            sub_80A6C68(2);
-            
-            gTasks[taskId].data[12]++;
-            
-            // fall through
-        case 4:
-            if (!IsContest())
-                SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0);
+        }
+        break;
+    case 3:
+        sub_80A6B30(&subStruct);
+        sub_80A6C68(1);
+        sub_80A6C68(2);
 
-            gBattle_BG1_X = 0;
-            gBattle_BG1_Y = 0;
-            SetGpuReg(REG_OFFSET_BLDCNT, 0);
-            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0));
-            SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
-            DestroyAnimVisualTask(taskId);
+        gTasks[taskId].data[12]++;
+
+        // fall through
+    case 4:
+        if (!IsContest())
+            SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0);
+
+        gBattle_BG1_X = 0;
+        gBattle_BG1_Y = 0;
+        SetGpuReg(REG_OFFSET_BLDCNT, 0);
+        SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0));
+        SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
+        DestroyAnimVisualTask(taskId);
+        break;
     }
 }
 
@@ -1390,7 +1392,7 @@ void InitPoisonGasCloudAnim(struct Sprite *sprite)
         if ((sprite->data[7] & 0x8000) && !(gBattlerPositions[gBattleAnimAttacker] & 1))
             sprite->subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority + 1;
 
-        sprite->data[6] = 1; 
+        sprite->data[6] = 1;
     }
 
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
@@ -1410,7 +1412,7 @@ void InitPoisonGasCloudAnim(struct Sprite *sprite)
         sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2];
         sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[4];
         sprite->data[7] |= GetBattlerSpriteBGPriority(gBattleAnimTarget) << 8;
-    } 
+    }
 
     if (IsContest())
     {
@@ -1425,8 +1427,6 @@ void InitPoisonGasCloudAnim(struct Sprite *sprite)
 void MovePoisonGasCloud(struct Sprite *sprite)
 {
     int value;
-    register s16 value2 asm("r5");
-    int unused;
 
     switch (sprite->data[7] & 0xFF)
     {
@@ -1441,8 +1441,7 @@ void MovePoisonGasCloud(struct Sprite *sprite)
 
         if (sprite->data[0] <= 0)
         {
-            value2 = 80;
-            sprite->data[0] = value2;
+            sprite->data[0] = 80;
             sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
             sprite->data[1] = sprite->pos1.x;
             sprite->data[2] = sprite->pos1.x;
@@ -1450,10 +1449,12 @@ void MovePoisonGasCloud(struct Sprite *sprite)
             sprite->data[3] = sprite->pos1.y;
             sprite->data[4] = sprite->pos1.y + 29;
             sprite->data[7]++;
-            if (!IsContest() && gBattlerPositions[gBattleAnimTarget] & 1)
+            if (IsContest())
+                sprite->data[5] = 80;
+            else if (GET_BATTLER_SIDE2(gBattleAnimTarget) != B_SIDE_PLAYER)
                 sprite->data[5] = 204;
             else
-                sprite->data[5] = value2;
+                sprite->data[5] = 80;
 
             sprite->pos2.y = 0;
             value = gSineTable[sprite->data[5]];
@@ -1490,13 +1491,13 @@ void MovePoisonGasCloud(struct Sprite *sprite)
 
         if (sprite->data[0] <= 0)
         {
-            asm("mov r5, #0"); // unused local variable?
-            unused = 0;
             sprite->data[0] = 0x300;
             sprite->data[1] = sprite->pos1.x += sprite->pos2.x;
             sprite->data[3] = sprite->pos1.y += sprite->pos2.y;
             sprite->data[4] = sprite->pos1.y + 4;
-            if (!IsContest() && gBattlerPositions[gBattleAnimTarget] & 1)
+            if (IsContest())
+                sprite->data[2] = -0x10;
+            else if (GET_BATTLER_SIDE2(gBattleAnimTarget) != B_SIDE_PLAYER)
                 sprite->data[2] = 0x100;
             else
                 sprite->data[2] = -0x10;
@@ -1535,43 +1536,43 @@ void AnimTask_Hail2(u8 taskId)
     struct Task *task = &gTasks[taskId];
     switch (task->data[0])
     {
-        case 0:
-            if (++task->data[4] > 2)
-            {
-                task->data[4] = 0;
-                task->data[5] = 0;
-                task->data[2] = 0;
-                task->data[0]++;
-            }
-            break;
-        case 1:
-            if (task->data[5] == 0)
-            {
-                if (GenerateHailParticle(task->data[3], task->data[2], taskId, 1))
-                    task->data[1]++;
-                
-                if (++task->data[2] == 3)
-                {
-                    if (++task->data[3] == 10)
-                        task->data[0]++;
-                    else
-                        task->data[0]--;
-                }
-                else
-                {
-                    task->data[5] = 1;
-                }
+    case 0:
+        if (++task->data[4] > 2)
+        {
+            task->data[4] = 0;
+            task->data[5] = 0;
+            task->data[2] = 0;
+            task->data[0]++;
+        }
+        break;
+    case 1:
+        if (task->data[5] == 0)
+        {
+            if (GenerateHailParticle(task->data[3], task->data[2], taskId, 1))
+                task->data[1]++;
 
+            if (++task->data[2] == 3)
+            {
+                if (++task->data[3] == 10)
+                    task->data[0]++;
+                else
+                    task->data[0]--;
             }
             else
             {
-                task->data[5]--;
+                task->data[5] = 1;
             }
-            break;
-        case 2:
-            if (task->data[1] == 0)
-                DestroyAnimVisualTask(taskId);
-            break;
+
+        }
+        else
+        {
+            task->data[5]--;
+        }
+        break;
+    case 2:
+        if (task->data[1] == 0)
+            DestroyAnimVisualTask(taskId);
+        break;
     }
 }
 
@@ -1587,7 +1588,7 @@ bool8 GenerateHailParticle(u8 a, u8 b, u8 taskId, u8 c)
     u8 spriteId;
     // struct Sprite *sprite;
     s16 spriteX;
-    
+
     if (unk != 2)
     {
         battler = GetBattlerAtPosition(hailData->unk2);
@@ -1820,7 +1821,7 @@ void AnimHailBegin(struct Sprite *sprite)
 
     if (sprite->data[0] == 1 && sprite->data[5] == 0)
     {
-        spriteId = CreateSprite(&gUnknown_08595B68, 
+        spriteId = CreateSprite(&gUnknown_08595B68,
                                 sprite->data[3], sprite->data[4], sprite->subpriority);
 
         sprite->data[0] = spriteId;
@@ -1935,6 +1936,6 @@ void AnimTask_GetRolloutCounter(u8 taskId)
 {
     u8 arg = gBattleAnimArgs[0];
 
-    gBattleAnimArgs[arg] = gAnimDisableStructPtr->rolloutTimerStartValue - gAnimDisableStructPtr->rolloutTimer - 1;    
+    gBattleAnimArgs[arg] = gAnimDisableStructPtr->rolloutTimerStartValue - gAnimDisableStructPtr->rolloutTimer - 1;
     DestroyAnimVisualTask(taskId);
 }
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;