Merge pull request #759 from DizzyEggg/fix_funcs

Some nonmatchings and fakematches

3 files changed, 198 insertions, 787 deletions

diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 15b73a1e0..b3a67a509 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -5315,21 +5315,19 @@ static void sub_8102D8C(s16 a, s16 b, s16* c, s16* d, s8 e)
 
 static void sub_8102DE4(struct Sprite* sprite)
 {
-    int b;
-    s16 a;
-    int c;
+    s16 y, yDelta;
     u8 index;
+
     sprite->data[0]++;
-    b = sprite->data[0] * 5 - ((sprite->data[0] * 5 / 256) << 8);
+    yDelta = sprite->data[0] * 5 - ((sprite->data[0] * 5 / 256) << 8);
     sprite->data[4] += sprite->data[6];
     sprite->data[5] += sprite->data[7];
     sprite->pos1.x = sprite->data[4] >> 4;
     sprite->pos1.y = sprite->data[5] >> 4;
-    sprite->pos2.y = Sin(b, 15);
-    a = (u16)sprite->pos1.y;
-    c = (u16)sprite->pos1.x;
+    sprite->pos2.y = Sin(yDelta, 15);
 
-    if ((u32)((c + 16) << 16) > (0x110) << 16 || a < -16 || a > 0x80)
+    y = sprite->pos1.y;
+    if (sprite->pos1.x < -16 || sprite->pos1.x > 256 || y < -16 || y > 128)
     {
         DestroySpriteAndMatrix(sprite);
     }
@@ -5350,12 +5348,8 @@ static void sub_8102DE4(struct Sprite* sprite)
 
 void sub_8102EB0(struct Sprite* sprite)
 {
-    int a;
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
-    {
-        a = gBattleAnimArgs[1];
-        *(u16 *)&gBattleAnimArgs[1] = -a;
-    }
+        gBattleAnimArgs[1] *= -1;
 
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
     sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
@@ -5541,8 +5535,8 @@ static void sub_8103300(struct Sprite* sprite)
 
 static void sub_8103320(struct Sprite* sprite)
 {
-    s16 temp;
-    s16 temp2;
+    s16 x1, x2;
+
     sprite->data[1] += 4;
     if (sprite->data[1] > 254)
     {
@@ -5564,20 +5558,21 @@ static void sub_8103320(struct Sprite* sprite)
     if (sprite->data[1] > 0x9F)
         sprite->subpriority = sprite->data[2];
 
-    temp = gSineTable[sprite->data[1]];
-    sprite->pos2.x = (temp2 = temp >> 3) + (temp2 >> 1);
+    x1 = gSineTable[sprite->data[1]];
+    x2 = x1 >> 3;
+    sprite->pos2.x = (x1 >> 3) + (x2 >> 1);
 }
 
 void sub_8103390(struct Sprite* sprite)
 {
-    u8 bank;
+    u8 battler;
     if (gBattleAnimArgs[0] == 0)
-        bank = gBattleAnimAttacker;
+        battler = gBattleAnimAttacker;
     else
-        bank = gBattleAnimTarget;
+        battler = gBattleAnimTarget;
 
-    sub_810310C(bank, sprite);
-    if (GetBattlerSide(bank) == B_SIDE_PLAYER)
+    sub_810310C(battler, sprite);
+    if (GetBattlerSide(battler) == B_SIDE_PLAYER)
     {
         StartSpriteAnim(sprite, 0);
         sprite->data[0] = 2;
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index ab765b8c1..5d79a9e6b 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -2504,13 +2504,10 @@ void sub_815BE04(struct Sprite *sprite)
 
 static void sub_815BF44(struct Sprite *sprite)
 {
-    int var0;
-    s8 var1;
-
-    var0 = (u16)sprite->data[2] + (u16)sprite->data[3];
-    var1 = var0 >> 8;
-    sprite->pos2.y -= var1;
-    sprite->data[3] = var0 & 0xFF;
+    s16 delta = sprite->data[3] + sprite->data[2];
+    sprite->pos2.y -= delta >> 8;
+    sprite->data[3] += sprite->data[2];
+    sprite->data[3] &= 0xFF;
     if (sprite->data[4] == 0 && sprite->pos2.y < -8)
     {
         gSprites[sprite->data[6]].invisible = 0;
@@ -2543,19 +2540,12 @@ static void sub_815BFF4(struct Sprite *sprite)
 
 static void sub_815C050(struct Sprite *sprite)
 {
-    u16 d2;
-    register u16 d3 asm("r1");
-    int var0;
-    s8 var1;
-
     if (!sprite->invisible)
     {
-        d2 = sprite->data[2];
-        d3 = sprite->data[3];
-        var0 = d2 + d3;
-        var1 = var0 >> 8;
-        sprite->pos2.y -= var1;
-        sprite->data[3] = var0 & 0xFF;
+        s16 delta = sprite->data[3] + sprite->data[2];
+        sprite->pos2.y -= delta >> 8;
+        sprite->data[3] += sprite->data[2];
+        sprite->data[3] &= 0xFF;
         if (--sprite->data[1] == -1)
         {
             sprite->invisible = 1;
@@ -4322,7 +4312,7 @@ static void AnimSmellingSaltExclamationStep(struct Sprite *sprite)
 
 // Claps a hand several times.
 // arg 0: which hand
-// arg 1: 
+// arg 1:
 void AnimHelpingHandClap(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c
index bae7859b5..a0a29f0ad 100644
--- a/src/contest_link_80F57C4.c
+++ b/src/contest_link_80F57C4.c
@@ -71,15 +71,10 @@ struct ContestLinkUnk14
     u8 unk12;
 };
 
-struct ContestLinkUnk4
-{
-    struct ContestLinkUnk14 unk0[4];
-};
-
 struct ContestLink80F57C4
 {
     struct ContestLinkUnk0 *unk0;
-    struct ContestLinkUnk4 *unk4;
+    struct ContestLinkUnk14 (*unk4)[4];
     u8 *unk8;
     u8 *unkC[4];
     u8 *unk1C;
@@ -205,9 +200,7 @@ void sub_80F57C4(void)
 void sub_80F591C(void)
 {
     int i, j;
-    s8 var0;
-    s8 var1;
-    int var2;
+    s8 var0, var1;
     u16 tile1, tile2;
 
     LZDecompressVram(gUnknown_08C19588, (void *)BG_CHAR_ADDR(0));
@@ -228,11 +221,7 @@ void sub_80F591C(void)
             if (j < var0)
                 tile1 += 2;
 
-            var2 = var1;
-            if (var1 < 0)
-                var2 = -var2;
-
-            if (j < var2)
+            if (j < abs(var1))
             {
                 tile2 = 0x60A4;
                 if (var1 < 0)
@@ -719,7 +708,7 @@ static void sub_80F6404(u8 taskId)
             if (top > 80)
                 top = 80;
 
-            gBattle_WIN0V = (top << 8) | (160 - top);;
+            gBattle_WIN0V = (top << 8) | (160 - top);
             if (top == 80)
                 gTasks[taskId].data[0]++;
         }
@@ -737,8 +726,7 @@ static void sub_80F6404(u8 taskId)
 
 static void sub_80F66B4(u8 taskId)
 {
-    int i;
-    u16 nationalDexNum;
+    int i, nationalDexNum;
 
     if (gMain.newKeys & A_BUTTON)
     {
@@ -859,13 +847,13 @@ static void sub_80F68F0(u8 taskId)
 
 void sub_80F69B8(u16 species, u8 monIndex, u8 srcOffset, u8 useDmaNow, u32 personality)
 {
-    u8 frameNum;
     const u8 *iconPtr;
-    u16 var0;
-    u16 var1;
+    u16 var0, var1, frameNum;
 
-    u8 *contestPlayerMonIndex = &gContestPlayerMonIndex; // fake match
-    frameNum = (monIndex == *contestPlayerMonIndex) ? 1 : 0;
+    if (monIndex == gContestPlayerMonIndex)
+        frameNum = 1;
+    else
+        frameNum = 0;
 
     iconPtr = GetMonIconPtr(species, personality, frameNum);
     iconPtr += srcOffset * 0x200 + 0x80;
@@ -892,13 +880,12 @@ static void LoadAllContestMonIcons(u8 srcOffset, u8 useDmaNow)
 
 static void sub_80F6A9C(void)
 {
-    int i;
-    register u16 species asm("r0");
+    int i, species;
 
     for (i = 0; i < 4; i++)
     {
-        species = GetIconSpecies(gContestMons[i].species, 0);
-        LoadPalette(gMonIconPalettes[gMonIconPaletteIndices[species]], i * 0x10 + 0xA0, 0x20);
+        species = gContestMons[i].species;
+        LoadPalette(gMonIconPalettes[gMonIconPaletteIndices[GetIconSpecies(species, 0)]], i * 0x10 + 0xA0, 0x20);
     }
 }
 
@@ -1335,11 +1322,11 @@ static void sub_80F6F40(struct Sprite *sprite)
 static void sub_80F6F68(struct Sprite *sprite)
 {
     int i;
-    s16 var0;
 
-    var0 = (u16)sprite->data[7] + (u16)sprite->data[6];
-    sprite->pos1.x -= var0 >> 8;
-    sprite->data[7] = (sprite->data[6] + sprite->data[7]) & 0xFF;
+    s16 delta = sprite->data[7] + sprite->data[6];
+    sprite->pos1.x -= delta >> 8;
+    sprite->data[7] += sprite->data[6];
+    sprite->data[7] &= 0xFF;
     if (sprite->pos1.x < sprite->data[4])
         sprite->pos1.x = sprite->data[4];
 
@@ -1366,11 +1353,12 @@ static void sub_80F6FDC(struct Sprite *sprite)
 static void sub_80F7014(struct Sprite *sprite)
 {
     int i;
-    s16 var0;
+    s16 delta;
 
-    var0 = (u16)sprite->data[7] + (u16)sprite->data[6];
-    sprite->pos1.x -= var0 >> 8;
-    sprite->data[7] = (sprite->data[6] + sprite->data[7]) & 0xFF;
+    delta = sprite->data[7] + sprite->data[6];
+    sprite->pos1.x -= delta >> 8;
+    sprite->data[7] += sprite->data[6];
+    sprite->data[7] &= 0xFF;
     for (i = 0; i < 3; i++)
     {
         struct Sprite *sprite2 = &gSprites[sprite->data[i]];
@@ -1487,14 +1475,11 @@ static void sub_80F71C8(void)
     CopyToBgTilemapBufferRect_ChangePalette(2, gUnknown_0203A034->unkC[2], 0, 0, 32, 4, palette);
 }
 
-// fakematching?
 u8 sub_80F7310(u8 monIndex, u8 arg1)
 {
-    u32 var0;
-    u32 var1;
+    u32 var0 = gContestMonConditions[monIndex] << 16;
+    u32 var1 = var0 / 0x3F;
 
-    var0 = gContestMonConditions[monIndex] << 16;
-    var1 = var0 / 0x3F;
     if (var1 & 0xFFFF)
         var1 += 0x10000;
 
@@ -1510,8 +1495,7 @@ u8 sub_80F7310(u8 monIndex, u8 arg1)
 
 s8 sub_80F7364(u8 arg0, u8 arg1)
 {
-    u32 r4;
-    u32 r2;
+    u32 r4, r2;
     s16 val;
     s8 ret;
 
@@ -1607,9 +1591,10 @@ static void sub_80F75A8(struct Sprite *sprite)
     }
     else
     {
-        s16 delta = (u16)sprite->data[1] + 0x600;
+        s16 delta = sprite->data[1] + 0x600;
         sprite->pos1.x -= delta >> 8;
-        sprite->data[1] = (sprite->data[1] + 0x600) & 0xFF;
+        sprite->data[1] += 0x600;
+        sprite->data[1] &= 0xFF;
         if (sprite->pos1.x < 120)
             sprite->pos1.x = 120;
 
@@ -1624,9 +1609,10 @@ static void sub_80F75A8(struct Sprite *sprite)
 
 static void sub_80F7620(struct Sprite *sprite)
 {
-    s16 delta = (u16)sprite->data[1] + 0x600;
+    s16 delta = sprite->data[1] + 0x600;
     sprite->pos1.x -= delta >> 8;
-    sprite->data[1] = (sprite->data[1] + 0x600) & 0xFF;
+    sprite->data[1] += + 0x600;
+    sprite->data[1] &= 0xFF;
     if (sprite->pos1.x < -32)
     {
         sprite->callback = SpriteCallbackDummy;
@@ -1657,14 +1643,15 @@ static void sub_80F7670(u8 taskId)
 
 void sub_80F7768(struct Sprite *sprite)
 {
-    register s16 var0 asm("r1");
+    s16 delta;
 
     sprite->data[3] += sprite->data[0];
     sprite->pos2.x = Sin(sprite->data[3] >> 8, sprite->data[1]);
-    var0 = sprite->data[4] + sprite->data[2];
-    sprite->pos1.x += var0 >> 8;
-    var0 = var0 & 0xFF;
-    sprite->data[4] = var0;
+    delta = sprite->data[4] + sprite->data[2];
+    sprite->pos1.x += delta >> 8;
+    sprite->data[4] += sprite->data[2];
+    sprite->data[4] &= 0xff;
+
     sprite->pos1.y++;
     if (gUnknown_0203A034->unk0->unk9)
         sprite->invisible = 1;
@@ -1695,705 +1682,145 @@ static void sub_80F7824(u8 taskId)
     }
 }
 
-// static void sub_80F7880(void)
-// {
-//     int i;
-//     int var0;
-//     int var1;
-//     int var2;
-//     int var3;
-//     u32 var4;
-//     int var5;
-//     int var6;
-//     s16 var7;
-//     s16 var8;
-//     s16 r2;
-
-//     r2 = gUnknown_02039F08[0];
-//     for (i = 1; i < 4; i++)
-//     {
-//         if (r2 < gUnknown_02039F08[i])
-//             r2 = gUnknown_02039F08[i];
-//     }
-
-//     if (r2 < 0)
-//     {
-//         r2 = gUnknown_02039F08[0];
-//         for (i = 1; i < 4; i++)
-//         {
-//             if (r2 > gUnknown_02039F08[i])
-//                 r2 = gUnknown_02039F08[i];
-//         }
-//     }
-
-//     // _080F78E4
-//     for (i = 0; i < 4; i++)
-//     {
-//         var0 = gContestMonConditions[i] * 1000;
-//         var1 = r2;
-//         if (r2 < 0)
-//             var1 = -var1;
-
-//         var2 = var0 / var1;
-//         if (var2 % 10 > 4)
-//             var2 += 10;
-
-//         gUnknown_0203A034->unk4->unk0[i].unk0 = var2 / 10;
-//         var3 = gUnknown_02039F18[i];
-//         if (var3 < 0)
-//             var3 = -var3;
-
-//         var0 = var3 * 1000;
-//         var1 = r2;
-//         if (r2 < 0)
-//             var1 = -var1;
-
-//         var2 = var0 / var1;
-//         if (var2 % 10 > 4)
-//             var2 += 10;
-
-//         // _080F7966
-//         gUnknown_0203A034->unk4->unk0[i].unk4 = var2 / 10;
-//         if (gUnknown_02039F18[i] < 0)
-//             gUnknown_0203A034->unk4->unk0[i].unk10 = 1;
-
-//         var4 = gUnknown_0203A034->unk4->unk0[i].unk0 * 22528 / 100;
-//         if ((var4 & 0xFF) > 0x7F)
-//             var4 += 0x100;
-
-//         gUnknown_0203A034->unk4->unk0[i].unk8 = var4 >> 8;
-//         var4 = gUnknown_0203A034->unk4->unk0[i].unk4 * 22528 / 100;
-//         if ((var4 & 0xFF) > 0x7F)
-//             var4 += 0x100;
-
-//         gUnknown_0203A034->unk4->unk0[i].unkC = var4 >> 8;
-//         gUnknown_0203A034->unk4->unk0[i].unk11 = sub_80F7310(i, 1);
-//         var5 = sub_80F7364(i, 1);
-//         if (var5 < 0)
-//             var5 = -var5;
-
-//         gUnknown_0203A034->unk4->unk0[i].unk12 = var5;
-//         if (gContestFinalStandings[i])
-//         {
-//             var7 = gUnknown_0203A034->unk4->unk0[i].unk8;
-//             var8 = gUnknown_0203A034->unk4->unk0[i].unkC;
-//             if (gUnknown_0203A034->unk4->unk0[i].unk10)
-//                 var8 = -var8;
-
-//             if (var7 + var8 == 88)
-//             {
-//                 if (var8 > 0)
-//                     gUnknown_0203A034->unk4->unk0[i].unkC--;
-//                 else if (var7 > 0)
-//                     gUnknown_0203A034->unk4->unk0[i].unk8--;
-//             }
-//         }
-//     }
-// }
-
-NAKED
 static void sub_80F7880(void)
 {
-    asm_unified("\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0x4\n\
-    ldr r0, =gUnknown_02039F08\n\
-    ldrh r2, [r0]\n\
-    adds r4, r0, 0\n\
-    adds r3, r4, 0x2\n\
-    movs r0, 0x2\n\
-    mov r8, r0\n\
-_080F7898:\n\
-    lsls r0, r2, 16\n\
-    asrs r0, 16\n\
-    movs r5, 0\n\
-    ldrsh r1, [r3, r5]\n\
-    cmp r0, r1\n\
-    bge _080F78A6\n\
-    ldrh r2, [r3]\n\
-_080F78A6:\n\
-    adds r3, 0x2\n\
-    movs r0, 0x1\n\
-    negs r0, r0\n\
-    add r8, r0\n\
-    mov r1, r8\n\
-    cmp r1, 0\n\
-    bge _080F7898\n\
-    lsls r0, r2, 16\n\
-    str r0, [sp]\n\
-    cmp r0, 0\n\
-    bge _080F78E4\n\
-    ldrh r2, [r4]\n\
-    adds r3, r4, 0x2\n\
-    movs r4, 0x2\n\
-    mov r8, r4\n\
-_080F78C4:\n\
-    lsls r0, r2, 16\n\
-    asrs r0, 16\n\
-    movs r5, 0\n\
-    ldrsh r1, [r3, r5]\n\
-    cmp r0, r1\n\
-    ble _080F78D2\n\
-    ldrh r2, [r3]\n\
-_080F78D2:\n\
-    adds r3, 0x2\n\
-    movs r0, 0x1\n\
-    negs r0, r0\n\
-    add r8, r0\n\
-    lsls r1, r2, 16\n\
-    str r1, [sp]\n\
-    mov r4, r8\n\
-    cmp r4, 0\n\
-    bge _080F78C4\n\
-_080F78E4:\n\
-    movs r5, 0\n\
-    mov r8, r5\n\
-    mov r10, r5\n\
-_080F78EA:\n\
-    ldr r0, =gContestMonConditions\n\
-    mov r1, r8\n\
-    lsls r7, r1, 1\n\
-    adds r0, r7, r0\n\
-    movs r2, 0\n\
-    ldrsh r1, [r0, r2]\n\
-    lsls r0, r1, 5\n\
-    subs r0, r1\n\
-    lsls r0, 2\n\
-    adds r0, r1\n\
-    lsls r0, 3\n\
-    ldr r4, [sp]\n\
-    asrs r5, r4, 16\n\
-    adds r1, r5, 0\n\
-    cmp r5, 0\n\
-    bge _080F790C\n\
-    negs r1, r5\n\
-_080F790C:\n\
-    bl __divsi3\n\
-    adds r4, r0, 0\n\
-    movs r1, 0xA\n\
-    bl __modsi3\n\
-    cmp r0, 0x4\n\
-    ble _080F791E\n\
-    adds r4, 0xA\n\
-_080F791E:\n\
-    ldr r0, =gUnknown_0203A034\n\
-    mov r9, r0\n\
-    ldr r0, [r0]\n\
-    ldr r0, [r0, 0x4]\n\
-    mov r1, r10\n\
-    adds r6, r1, r0\n\
-    adds r0, r4, 0\n\
-    movs r1, 0xA\n\
-    bl __divsi3\n\
-    str r0, [r6]\n\
-    ldr r0, =gUnknown_02039F18\n\
-    adds r7, r0\n\
-    movs r2, 0\n\
-    ldrsh r1, [r7, r2]\n\
-    cmp r1, 0\n\
-    bge _080F7942\n\
-    negs r1, r1\n\
-_080F7942:\n\
-    lsls r0, r1, 5\n\
-    subs r0, r1\n\
-    lsls r0, 2\n\
-    adds r0, r1\n\
-    lsls r0, 3\n\
-    adds r1, r5, 0\n\
-    cmp r1, 0\n\
-    bge _080F7954\n\
-    negs r1, r1\n\
-_080F7954:\n\
-    bl __divsi3\n\
-    adds r4, r0, 0\n\
-    movs r1, 0xA\n\
-    bl __modsi3\n\
-    cmp r0, 0x4\n\
-    ble _080F7966\n\
-    adds r4, 0xA\n\
-_080F7966:\n\
-    adds r0, r4, 0\n\
-    movs r1, 0xA\n\
-    bl __divsi3\n\
-    str r0, [r6, 0x4]\n\
-    movs r4, 0\n\
-    ldrsh r0, [r7, r4]\n\
-    cmp r0, 0\n\
-    bge _080F797C\n\
-    movs r0, 0x1\n\
-    strb r0, [r6, 0x10]\n\
-_080F797C:\n\
-    mov r5, r9\n\
-    ldr r0, [r5]\n\
-    ldr r0, [r0, 0x4]\n\
-    mov r1, r10\n\
-    adds r4, r1, r0\n\
-    ldr r1, [r4]\n\
-    lsls r0, r1, 1\n\
-    adds r0, r1\n\
-    lsls r0, 2\n\
-    subs r0, r1\n\
-    lsls r0, 11\n\
-    movs r1, 0x64\n\
-    bl __divsi3\n\
-    adds r1, r0, 0\n\
-    movs r5, 0xFF\n\
-    ands r0, r5\n\
-    cmp r0, 0x7F\n\
-    bls _080F79A8\n\
-    movs r2, 0x80\n\
-    lsls r2, 1\n\
-    adds r1, r2\n\
-_080F79A8:\n\
-    lsrs r0, r1, 8\n\
-    str r0, [r4, 0x8]\n\
-    ldr r1, [r4, 0x4]\n\
-    lsls r0, r1, 1\n\
-    adds r0, r1\n\
-    lsls r0, 2\n\
-    subs r0, r1\n\
-    lsls r0, 11\n\
-    movs r1, 0x64\n\
-    bl __divsi3\n\
-    adds r1, r0, 0\n\
-    ands r0, r5\n\
-    cmp r0, 0x7F\n\
-    bls _080F79CC\n\
-    movs r5, 0x80\n\
-    lsls r5, 1\n\
-    adds r1, r5\n\
-_080F79CC:\n\
-    lsrs r0, r1, 8\n\
-    str r0, [r4, 0xC]\n\
-    mov r0, r8\n\
-    lsls r4, r0, 24\n\
-    lsrs r4, 24\n\
-    adds r0, r4, 0\n\
-    movs r1, 0x1\n\
-    bl sub_80F7310\n\
-    mov r2, r9\n\
-    ldr r1, [r2]\n\
-    ldr r1, [r1, 0x4]\n\
-    add r1, r10\n\
-    strb r0, [r1, 0x11]\n\
-    adds r0, r4, 0\n\
-    movs r1, 0x1\n\
-    bl sub_80F7364\n\
-    mov r4, r9\n\
-    ldr r1, [r4]\n\
-    ldr r1, [r1, 0x4]\n\
-    add r1, r10\n\
-    lsls r0, 24\n\
-    asrs r0, 24\n\
-    cmp r0, 0\n\
-    bge _080F7A02\n\
-    negs r0, r0\n\
-_080F7A02:\n\
-    strb r0, [r1, 0x12]\n\
-    ldr r0, =gContestFinalStandings\n\
-    add r0, r8\n\
-    ldrb r0, [r0]\n\
-    cmp r0, 0\n\
-    beq _080F7A60\n\
-    mov r5, r9\n\
-    ldr r0, [r5]\n\
-    ldr r0, [r0, 0x4]\n\
-    mov r2, r10\n\
-    adds r1, r2, r0\n\
-    ldr r5, [r1, 0x8]\n\
-    ldrh r3, [r1, 0x8]\n\
-    ldr r4, [r1, 0xC]\n\
-    ldrh r2, [r1, 0xC]\n\
-    ldrb r0, [r1, 0x10]\n\
-    cmp r0, 0\n\
-    beq _080F7A2C\n\
-    lsls r0, r2, 16\n\
-    negs r0, r0\n\
-    lsrs r2, r0, 16\n\
-_080F7A2C:\n\
-    lsls r0, r3, 16\n\
-    asrs r3, r0, 16\n\
-    lsls r0, r2, 16\n\
-    asrs r2, r0, 16\n\
-    adds r0, r3, r2\n\
-    cmp r0, 0x58\n\
-    bne _080F7A60\n\
-    cmp r2, 0\n\
-    ble _080F7A58\n\
-    subs r0, r4, 0x1\n\
-    str r0, [r1, 0xC]\n\
-    b _080F7A60\n\
-    .pool\n\
-_080F7A58:\n\
-    cmp r3, 0\n\
-    ble _080F7A60\n\
-    subs r0, r5, 0x1\n\
-    str r0, [r1, 0x8]\n\
-_080F7A60:\n\
-    movs r4, 0x14\n\
-    add r10, r4\n\
-    movs r5, 0x1\n\
-    add r8, r5\n\
-    mov r0, r8\n\
-    cmp r0, 0x3\n\
-    bgt _080F7A70\n\
-    b _080F78EA\n\
-_080F7A70:\n\
-    add sp, 0x4\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0");
-}
-
-// static void sub_80F7A80(u8 arg0, u8 arg1)
-// {
-//     int i;
-//     u8 taskId;
-//     u8 sp8, spC;
-
-//     sp8 = 0;
-//     spC = 0;
-//     if (!arg0)
-//     {
-//         u32 var0;
-//         for (i = 0; i < 4; i++)
-//         {
-//             int var1 = gUnknown_0203A034->unk4->unk0[i].unk11;
-//             if (arg1 < var1)
-//             {
-//                 int x = var1 + 19;
-//                 x -= arg1;
-//                 x--;
-//                 FillBgTilemapBufferRect_Palette0(1, 0x60B3, x, i * 3 + 5, 1, 1);
-//                 taskId = CreateTask(sub_80F7CA8, 10);
-//                 var0 = ((gUnknown_0203A034->unk4->unk0[i].unk8 << 16) / gUnknown_0203A034->unk4->unk0[i].unk11) * (arg1 + 1);
-//                 var0 &= 0xFFFF;
-//                 if (var0 > 0x7FFF)
-//                     var0 += 0x10000;
-
-//                 gTasks[taskId].data[0] = i;
-//                 gTasks[taskId].data[1] = var0 >> 16;
-//                 gUnknown_0203A034->unk0->unk14++;
-//                 sp8++;
-//             }
-//         }
-//     }
-//     else
-//     {
-//         u32 var0;
-//         for (i = 0; i < 4; i++)
-//         {
-//             int tile;
-//             s8 var1 = gUnknown_0203A034->unk4->unk0[i].unk12;
-//             tile = gUnknown_0203A034->unk4->unk0[i].unk10 ? 0x60A5 : 0x60A3;
-//             if (arg1 < var1)
-//             {
-//                 int thing = ((s8)arg1 - 19);
-//                 int x = var1 - thing;
-//                 x--;
-//                 FillBgTilemapBufferRect_Palette0(1, tile, x, i * 3 + 6, 1, 1);
-//                 taskId = CreateTask(sub_80F7CA8, 10);
-//                 var0 = ((gUnknown_0203A034->unk4->unk0[i].unkC << 16) / gUnknown_0203A034->unk4->unk0[i].unk12) * (arg1 + 1);
-//                 var0 &= 0xFFFF;
-//                 if (var0 > 0x7FFF)
-//                     var0 += 0x10000;
-
-//                 gTasks[taskId].data[0] = i;
-//                 if (gUnknown_0203A034->unk4->unk0[i].unk10)
-//                 {
-//                     gTasks[taskId].data[2] = 1;
-//                     spC++;
-//                 }
-//                 else
-//                 {
-//                     sp8++;
-//                 }
-
-//                 if (gUnknown_0203A034->unk4->unk0[i].unk10)
-//                     gTasks[taskId].data[1] = gUnknown_0203A034->unk4->unk0[i].unk8 - (var0 >> 16);
-//                 else
-//                     gTasks[taskId].data[1] = gUnknown_0203A034->unk4->unk0[i].unk8 + (var0 >> 16);
-
-//                 gUnknown_0203A034->unk0->unk14++;
-//             }
-//         }
-//     }
-
-//     if (spC)
-//         PlaySE(SE_PIN);
-
-//     if (sp8)
-//         PlaySE(SE_BAN);
-// }
+    int i, r4;
+    u32 r1;
+    s16 r2;
+    s8 var;
+
+    r2 = gUnknown_02039F08[0];
+    for (i = 1; i < 4; i++)
+    {
+        if (r2 < gUnknown_02039F08[i])
+            r2 = gUnknown_02039F08[i];
+    }
+
+    if (r2 < 0)
+    {
+        r2 = gUnknown_02039F08[0];
+        for (i = 1; i < 4; i++)
+        {
+            if (r2 > gUnknown_02039F08[i])
+                r2 = gUnknown_02039F08[i];
+        }
+    }
+
+    for (i = 0; i < 4; i++)
+    {
+        r4 = (gContestMonConditions[i] * 1000) / abs(r2);
+        if (r4 % 10 > 4)
+            r4 += 10;
+        (*gUnknown_0203A034->unk4)[i].unk0 = r4 / 10;
+
+        r4 = (abs(gUnknown_02039F18[i]) * 1000) / abs(r2);
+        if (r4 % 10 > 4)
+            r4 += 10;
+        (*gUnknown_0203A034->unk4)[i].unk4 = r4 / 10;
+
+        if (gUnknown_02039F18[i] < 0)
+            (*gUnknown_0203A034->unk4)[i].unk10 = 1;
+
+        r1 = ((*gUnknown_0203A034->unk4)[i].unk0 * 22528) / 100;
+        if ((r1 & 0xFF) > 0x7F)
+            r1 += 0x100;
+        (*gUnknown_0203A034->unk4)[i].unk8 = r1 >> 8;
+
+        r1 = ((*gUnknown_0203A034->unk4)[i].unk4 * 22528) / 100;
+        if ((r1 & 0xFF) > 0x7F)
+            r1 += 0x100;
+        (*gUnknown_0203A034->unk4)[i].unkC = r1 >> 8;
+
+        (*gUnknown_0203A034->unk4)[i].unk11 = sub_80F7310(i, 1);
+        var = sub_80F7364(i, 1);
+        (*gUnknown_0203A034->unk4)[i].unk12 = abs(var);
+
+        if (gContestFinalStandings[i])
+        {
+            s16 var1 = (*gUnknown_0203A034->unk4)[i].unk8;
+            s16 var2 = (*gUnknown_0203A034->unk4)[i].unkC;
+
+            if ((*gUnknown_0203A034->unk4)[i].unk10)
+                var2 *= -1;
+
+            if (var1 + var2 == 88)
+            {
+                if (var2 > 0)
+                    (*gUnknown_0203A034->unk4)[i].unkC--;
+                else if (var1 > 0)
+                    (*gUnknown_0203A034->unk4)[i].unk8--;
+            }
+        }
+    }
+}
 
-NAKED
 static void sub_80F7A80(u8 arg0, u8 arg1)
 {
-    asm_unified("\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0x14\n\
-    lsls r0, 24\n\
-    lsls r1, 24\n\
-    lsrs r1, 24\n\
-    mov r8, r1\n\
-    movs r1, 0\n\
-    str r1, [sp, 0x8]\n\
-    movs r3, 0\n\
-    str r3, [sp, 0xC]\n\
-    cmp r0, 0\n\
-    bne _080F7B5C\n\
-    mov r9, r3\n\
-    ldr r4, =gUnknown_0203A034\n\
-    mov r10, r4\n\
-    movs r7, 0xA0\n\
-    lsls r7, 19\n\
-    movs r6, 0\n\
-_080F7AAC:\n\
-    mov r1, r10\n\
-    ldr r0, [r1]\n\
-    ldr r0, [r0, 0x4]\n\
-    adds r0, r6, r0\n\
-    ldrb r2, [r0, 0x11]\n\
-    cmp r8, r2\n\
-    bcs _080F7B2E\n\
-    adds r2, 0x13\n\
-    mov r3, r8\n\
-    subs r2, r3\n\
-    subs r2, 0x1\n\
-    lsls r2, 24\n\
-    lsrs r2, 24\n\
-    lsrs r3, r7, 24\n\
-    movs r0, 0x1\n\
-    str r0, [sp]\n\
-    str r0, [sp, 0x4]\n\
-    ldr r1, =0x000060b3\n\
-    bl FillBgTilemapBufferRect_Palette0\n\
-    ldr r0, =sub_80F7CA8\n\
-    movs r1, 0xA\n\
-    bl CreateTask\n\
-    lsls r0, 24\n\
-    lsrs r5, r0, 24\n\
-    mov r0, r10\n\
-    ldr r4, [r0]\n\
-    ldr r1, [r4, 0x4]\n\
-    adds r1, r6, r1\n\
-    ldr r0, [r1, 0x8]\n\
-    lsls r0, 16\n\
-    ldrb r1, [r1, 0x11]\n\
-    bl __udivsi3\n\
-    mov r1, r8\n\
-    adds r1, 0x1\n\
-    adds r3, r0, 0\n\
-    muls r3, r1\n\
-    ldr r0, =0x0000ffff\n\
-    ands r0, r3\n\
-    ldr r1, =0x00007fff\n\
-    cmp r0, r1\n\
-    bls _080F7B0A\n\
-    movs r1, 0x80\n\
-    lsls r1, 9\n\
-    adds r3, r1\n\
-_080F7B0A:\n\
-    ldr r1, =gTasks\n\
-    lsls r0, r5, 2\n\
-    adds r0, r5\n\
-    lsls r0, 3\n\
-    adds r0, r1\n\
-    mov r1, r9\n\
-    strh r1, [r0, 0x8]\n\
-    lsrs r1, r3, 16\n\
-    strh r1, [r0, 0xA]\n\
-    ldr r1, [r4]\n\
-    ldrb r0, [r1, 0x14]\n\
-    adds r0, 0x1\n\
-    strb r0, [r1, 0x14]\n\
-    ldr r0, [sp, 0x8]\n\
-    adds r0, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    str r0, [sp, 0x8]\n\
-_080F7B2E:\n\
-    movs r3, 0xC0\n\
-    lsls r3, 18\n\
-    adds r7, r3\n\
-    adds r6, 0x14\n\
-    movs r4, 0x1\n\
-    add r9, r4\n\
-    mov r0, r9\n\
-    cmp r0, 0x3\n\
-    ble _080F7AAC\n\
-    b _080F7C7E\n\
-    .pool\n\
-_080F7B5C:\n\
-    movs r1, 0\n\
-    mov r9, r1\n\
-    mov r10, r1\n\
-    movs r3, 0xC0\n\
-    lsls r3, 19\n\
-    str r3, [sp, 0x10]\n\
-_080F7B68:\n\
-    ldr r4, =gUnknown_0203A034\n\
-    ldr r0, [r4]\n\
-    ldr r0, [r0, 0x4]\n\
-    add r0, r10\n\
-    ldrb r2, [r0, 0x12]\n\
-    ldrb r0, [r0, 0x10]\n\
-    ldr r1, =0x000060a3\n\
-    cmp r0, 0\n\
-    beq _080F7B7C\n\
-    adds r1, 0x2\n\
-_080F7B7C:\n\
-    lsls r0, r2, 24\n\
-    asrs r0, 24\n\
-    cmp r8, r0\n\
-    bge _080F7C64\n\
-    mov r3, r8\n\
-    lsls r2, r3, 24\n\
-    asrs r2, 24\n\
-    subs r2, 0x13\n\
-    subs r2, r0, r2\n\
-    subs r2, 0x1\n\
-    lsls r2, 24\n\
-    lsrs r2, 24\n\
-    ldr r4, [sp, 0x10]\n\
-    lsrs r3, r4, 24\n\
-    movs r7, 0x1\n\
-    str r7, [sp]\n\
-    str r7, [sp, 0x4]\n\
-    movs r0, 0x1\n\
-    bl FillBgTilemapBufferRect_Palette0\n\
-    ldr r0, =sub_80F7CA8\n\
-    movs r1, 0xA\n\
-    bl CreateTask\n\
-    lsls r0, 24\n\
-    lsrs r5, r0, 24\n\
-    ldr r0, =gUnknown_0203A034\n\
-    ldr r6, [r0]\n\
-    ldr r1, [r6, 0x4]\n\
-    add r1, r10\n\
-    ldr r0, [r1, 0xC]\n\
-    lsls r0, 16\n\
-    ldrb r1, [r1, 0x12]\n\
-    bl __udivsi3\n\
-    mov r1, r8\n\
-    adds r1, 0x1\n\
-    adds r3, r0, 0\n\
-    muls r3, r1\n\
-    ldr r0, =0x0000ffff\n\
-    ands r0, r3\n\
-    ldr r1, =0x00007fff\n\
-    cmp r0, r1\n\
-    bls _080F7BDA\n\
-    movs r1, 0x80\n\
-    lsls r1, 9\n\
-    adds r3, r1\n\
-_080F7BDA:\n\
-    ldr r1, =gTasks\n\
-    lsls r2, r5, 2\n\
-    adds r0, r2, r5\n\
-    lsls r0, 3\n\
-    adds r4, r0, r1\n\
-    mov r0, r9\n\
-    strh r0, [r4, 0x8]\n\
-    ldr r0, [r6, 0x4]\n\
-    add r0, r10\n\
-    ldrb r0, [r0, 0x10]\n\
-    adds r6, r1, 0\n\
-    cmp r0, 0\n\
-    beq _080F7C1C\n\
-    strh r7, [r4, 0xC]\n\
-    ldr r0, [sp, 0xC]\n\
-    adds r0, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    str r0, [sp, 0xC]\n\
-    b _080F7C26\n\
-    .pool\n\
-_080F7C1C:\n\
-    ldr r0, [sp, 0x8]\n\
-    adds r0, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    str r0, [sp, 0x8]\n\
-_080F7C26:\n\
-    ldr r1, =gUnknown_0203A034\n\
-    ldr r0, [r1]\n\
-    ldr r0, [r0, 0x4]\n\
-    mov r4, r10\n\
-    adds r1, r4, r0\n\
-    ldrb r0, [r1, 0x10]\n\
-    ldr r4, =gUnknown_0203A034\n\
-    cmp r0, 0\n\
-    beq _080F7C4C\n\
-    adds r0, r2, r5\n\
-    lsls r0, 3\n\
-    adds r0, r6\n\
-    lsrs r2, r3, 16\n\
-    ldr r1, [r1, 0x8]\n\
-    subs r1, r2\n\
-    b _080F7C58\n\
-    .pool\n\
-_080F7C4C:\n\
-    adds r0, r2, r5\n\
-    lsls r0, 3\n\
-    adds r0, r6\n\
-    lsrs r2, r3, 16\n\
-    ldr r1, [r1, 0x8]\n\
-    adds r1, r2\n\
-_080F7C58:\n\
-    strh r1, [r0, 0xA]\n\
-    ldr r0, [r4]\n\
-    ldr r1, [r0]\n\
-    ldrb r0, [r1, 0x14]\n\
-    adds r0, 0x1\n\
-    strb r0, [r1, 0x14]\n\
-_080F7C64:\n\
-    movs r0, 0x14\n\
-    add r10, r0\n\
-    ldr r1, [sp, 0x10]\n\
-    movs r3, 0xC0\n\
-    lsls r3, 18\n\
-    adds r1, r3\n\
-    str r1, [sp, 0x10]\n\
-    movs r4, 0x1\n\
-    add r9, r4\n\
-    mov r0, r9\n\
-    cmp r0, 0x3\n\
-    bgt _080F7C7E\n\
-    b _080F7B68\n\
-_080F7C7E:\n\
-    ldr r1, [sp, 0xC]\n\
-    cmp r1, 0\n\
-    beq _080F7C8A\n\
-    movs r0, 0x16\n\
-    bl PlaySE\n\
-_080F7C8A:\n\
-    ldr r3, [sp, 0x8]\n\
-    cmp r3, 0\n\
-    beq _080F7C96\n\
-    movs r0, 0x15\n\
-    bl PlaySE\n\
-_080F7C96:\n\
-    add sp, 0x14\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0");
+    int i, taskId;
+    u32 var0;
+    u8 sp8 = 0, spC = 0;
+
+    if (!arg0)
+    {
+        for (i = 0; i < 4; i++)
+        {
+            u8 unk = (*gUnknown_0203A034->unk4)[i].unk11;
+            if (arg1 < unk)
+            {
+                FillBgTilemapBufferRect_Palette0(1, 0x60B3, ((19 + unk) - arg1) - 1, i * 3 + 5, 1, 1);
+                taskId = CreateTask(sub_80F7CA8, 10);
+
+                var0 = (((*gUnknown_0203A034->unk4)[i].unk8 << 16) / (*gUnknown_0203A034->unk4)[i].unk11) * (arg1 + 1);
+                if ((var0 & 0xFFFF) > 0x7FFF)
+                    var0 += 0x10000;
+
+                gTasks[taskId].data[0] = i;
+                gTasks[taskId].data[1] = var0 >> 16;
+                gUnknown_0203A034->unk0->unk14++;
+                sp8++;
+            }
+        }
+    }
+    else
+    {
+        for (i = 0; i < 4; i++)
+        {
+            s8 unk = (*gUnknown_0203A034->unk4)[i].unk12;
+            u32 tile = (*gUnknown_0203A034->unk4)[i].unk10 ? 0x60A5 : 0x60A3;
+            if (arg1 < unk)
+            {
+                FillBgTilemapBufferRect_Palette0(1, tile, ((19 + unk) - arg1) - 1, i * 3 + 6, 1, 1);
+                taskId = CreateTask(sub_80F7CA8, 10);
+
+                var0 = (((*gUnknown_0203A034->unk4)[i].unkC << 16) / (*gUnknown_0203A034->unk4)[i].unk12) * (arg1 + 1);
+                if ((var0 & 0xFFFF) > 0x7FFF)
+                    var0 += 0x10000;
+
+                gTasks[taskId].data[0] = i;
+                if ((*gUnknown_0203A034->unk4)[i].unk10)
+                {
+                    gTasks[taskId].data[2] = 1;
+                    spC++;
+                }
+                else
+                {
+                    sp8++;
+                }
+
+                if ((*gUnknown_0203A034->unk4)[i].unk10)
+                    gTasks[taskId].data[1] = -(var0 >> 16) + (*gUnknown_0203A034->unk4)[i].unk8 ;
+                else
+                    gTasks[taskId].data[1] = (var0 >> 16) + (*gUnknown_0203A034->unk4)[i].unk8;
+
+                gUnknown_0203A034->unk0->unk14++;
+            }
+        }
+    }
+
+    if (spC)
+        PlaySE(SE_BOO);
+    if (sp8)
+        PlaySE(SE_PIN);
 }
 
 void sub_80F7CA8(u8 taskId)
@@ -2624,8 +2051,7 @@ void sub_80F8290(void)
 
 void sub_80F82B4(void)
 {
-    u8 i;
-    u8 count;
+    u8 i, count;
 
     for (i = 0, count = 0; i < 4; i++)
     {