Merge pull request #499 from camthesaxman/fix_nonmatching

fix some nonmatching functions

1 files changed, 77 insertions, 204 deletions

diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index 164d71cb5..0f409bfe1 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -24,6 +24,9 @@
 #include "task.h"
 #include "ewram.h"
 
+extern void sub_80C4674();
+extern void sub_80C4698(u8 *, u8);
+
 #define CONTEST_ENTRY_PIC_LEFT 10
 #define CONTEST_ENTRY_PIC_TOP 3
 
@@ -47,7 +50,8 @@ extern u32 gUnknown_03005D28;
 extern u8 gUnknown_02038694;
 extern u8 gUnknown_0203856C;
 extern u8 gContestFinalStandings[];
-extern u16 gUnknown_02038678[];
+extern s16 gUnknown_02038670[];
+extern s16 gUnknown_02038678[];
 
 void sub_80C4BF0(void)
 {
@@ -128,7 +132,7 @@ void sub_80C4CF8(void)
 {
     if(!gContestFinalStandings[gContestPlayerMonIndex]
     && gSpecialVar_ContestRank == 3
-    && (s16)gUnknown_02038678[gContestPlayerMonIndex] >= 800)
+    && gUnknown_02038678[gContestPlayerMonIndex] >= 800)
     {
         gSpecialVar_0x8004 = 1;
     }
@@ -150,209 +154,78 @@ u8 sub_80C4D50(void)
     return retVar;
 }
 
-// nope. too hard
-__attribute__((naked))
 void sub_80C4D80(void)
 {
-    asm(".syntax 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, 0x8\n\
-    ldr r0, _080C4EA0 @ =gUnknown_02038670\n\
-    mov r12, r0\n\
-    ldr r1, _080C4EA4 @ =gSpecialVar_0x8006\n\
-    mov r8, r1\n\
-    ldr r2, _080C4EA8 @ =gStringVar1\n\
-    mov r9, r2\n\
-    mov r2, r12\n\
-    mov r1, sp\n\
-    movs r6, 0x3\n\
-_080C4D9E:\n\
-    ldrh r0, [r2]\n\
-    strh r0, [r1]\n\
-    adds r2, 0x2\n\
-    adds r1, 0x2\n\
-    subs r6, 0x1\n\
-    cmp r6, 0\n\
-    bge _080C4D9E\n\
-    movs r6, 0\n\
-_080C4DAE:\n\
-    movs r1, 0x3\n\
-    cmp r1, r6\n\
-    ble _080C4DD8\n\
-_080C4DB4:\n\
-    subs r4, r1, 0x1\n\
-    lsls r0, r4, 1\n\
-    mov r5, sp\n\
-    adds r3, r5, r0\n\
-    lsls r0, r1, 1\n\
-    adds r2, r5, r0\n\
-    ldrh r5, [r3]\n\
-    movs r7, 0\n\
-    ldrsh r1, [r3, r7]\n\
-    movs r7, 0\n\
-    ldrsh r0, [r2, r7]\n\
-    cmp r1, r0\n\
-    bge _080C4DD2\n\
-    strh r5, [r2]\n\
-    strh r0, [r3]\n\
-_080C4DD2:\n\
-    adds r1, r4, 0\n\
-    cmp r1, r6\n\
-    bgt _080C4DB4\n\
-_080C4DD8:\n\
-    adds r6, 0x1\n\
-    cmp r6, 0x2\n\
-    ble _080C4DAE\n\
-    mov r2, r8\n\
-    ldrh r0, [r2]\n\
-    lsls r0, 1\n\
-    add r0, sp\n\
-    ldrh r0, [r0]\n\
-    movs r2, 0\n\
-    movs r7, 0\n\
-    movs r6, 0\n\
-    lsls r0, 16\n\
-    asrs r4, r0, 16\n\
-    adds r3, r0, 0\n\
-    mov r1, sp\n\
-_080C4DF6:\n\
-    movs r5, 0\n\
-    ldrsh r0, [r1, r5]\n\
-    cmp r0, r4\n\
-    bne _080C4E12\n\
-    lsls r0, r2, 24\n\
-    movs r2, 0x80\n\
-    lsls r2, 17\n\
-    adds r0, r2\n\
-    lsrs r2, r0, 24\n\
-    mov r5, r8\n\
-    ldrh r5, [r5]\n\
-    cmp r6, r5\n\
-    bne _080C4E12\n\
-    adds r7, r2, 0\n\
-_080C4E12:\n\
-    adds r1, 0x2\n\
-    adds r6, 0x1\n\
-    cmp r6, 0x3\n\
-    ble _080C4DF6\n\
-    movs r6, 0\n\
-    mov r0, sp\n\
-    movs r1, 0\n\
-    ldrsh r0, [r0, r1]\n\
-    asrs r1, r3, 16\n\
-    lsls r2, 24\n\
-    mov r10, r2\n\
-    cmp r0, r1\n\
-    beq _080C4E40\n\
-    adds r2, r1, 0\n\
-    mov r1, sp\n\
-_080C4E30:\n\
-    adds r1, 0x2\n\
-    adds r6, 0x1\n\
-    cmp r6, 0x3\n\
-    bgt _080C4E40\n\
-    movs r4, 0\n\
-    ldrsh r0, [r1, r4]\n\
-    cmp r0, r2\n\
-    bne _080C4E30\n\
-_080C4E40:\n\
-    lsls r0, r6, 24\n\
-    lsrs r4, r0, 24\n\
-    adds r2, r7, 0\n\
-    movs r6, 0\n\
-    asrs r5, r3, 16\n\
-    mov r8, r5\n\
-    mov r1, r12\n\
-    movs r5, 0\n\
-    ldrsh r0, [r1, r5]\n\
-    cmp r8, r0\n\
-    bne _080C4E60\n\
-    cmp r7, 0x1\n\
-    beq _080C4E78\n\
-_080C4E5A:\n\
-    subs r0, r2, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r2, r0, 24\n\
-_080C4E60:\n\
-    adds r6, 0x1\n\
-    cmp r6, 0x3\n\
-    bgt _080C4E78\n\
-    lsls r0, r6, 1\n\
-    add r0, r12\n\
-    asrs r1, r3, 16\n\
-    movs r5, 0\n\
-    ldrsh r0, [r0, r5]\n\
-    cmp r1, r0\n\
-    bne _080C4E60\n\
-    cmp r2, 0x1\n\
-    bne _080C4E5A\n\
-_080C4E78:\n\
-    lsls r1, r6, 24\n\
-    lsrs r1, 24\n\
-    mov r0, r9\n\
-    bl sub_80C4698\n\
-    ldr r0, _080C4EAC @ =gIsLinkContest\n\
-    ldrb r1, [r0]\n\
-    movs r0, 0x1\n\
-    ands r0, r1\n\
-    cmp r0, 0\n\
-    beq _080C4EB8\n\
-    ldr r0, _080C4EB0 @ =gStringVar2\n\
-    lsls r1, r6, 3\n\
-    subs r1, r6\n\
-    lsls r1, 2\n\
-    ldr r2, _080C4EB4 @ =gLinkPlayers + 0x8\n\
-    adds r1, r2\n\
-    bl sub_80C4674\n\
-    b _080C4EC4\n\
-    .align 2, 0\n\
-_080C4EA0: .4byte gUnknown_02038670\n\
-_080C4EA4: .4byte gSpecialVar_0x8006\n\
-_080C4EA8: .4byte gStringVar1\n\
-_080C4EAC: .4byte gIsLinkContest\n\
-_080C4EB0: .4byte gStringVar2\n\
-_080C4EB4: .4byte gLinkPlayers + 0x8\n\
-_080C4EB8:\n\
-    ldr r0, _080C4ED8 @ =gStringVar2\n\
-    lsls r1, r6, 6\n\
-    ldr r2, _080C4EDC @ =gUnknown_0203857D\n\
-    adds r1, r2\n\
-    bl sub_80C4674\n\
-_080C4EC4:\n\
-    mov r1, r10\n\
-    asrs r0, r1, 24\n\
-    cmp r0, 0x1\n\
-    beq _080C4ED0\n\
-    cmp r7, r0\n\
-    bne _080C4EE4\n\
-_080C4ED0:\n\
-    ldr r0, _080C4EE0 @ =gSpecialVar_0x8006\n\
-    strh r4, [r0]\n\
-    b _080C4EEA\n\
-    .align 2, 0\n\
-_080C4ED8: .4byte gStringVar2\n\
-_080C4EDC: .4byte gUnknown_0203857D\n\
-_080C4EE0: .4byte gSpecialVar_0x8006\n\
-_080C4EE4:\n\
-    ldr r1, _080C4EFC @ =gSpecialVar_0x8006\n\
-    adds r0, r4, 0x4\n\
-    strh r0, [r1]\n\
-_080C4EEA:\n\
-    add sp, 0x8\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\n\
-    .align 2, 0\n\
-_080C4EFC: .4byte gSpecialVar_0x8006\n\
-    .syntax divided");
+    s16 sp0[4];
+    s32 i;
+    s32 j;
+    s16 r4;
+    u8 r2;
+    u8 r7;
+    s8 r10;
+    u8 r4_;
+
+    for (i = 0; i < 4; i++)
+        sp0[i] = gUnknown_02038670[i];
+
+    for (i = 0; i < 3; i++)
+    {
+        for (j = 3; j > i; j--)
+        {
+            if (sp0[j - 1] < sp0[j])
+            {
+                s32 temp = sp0[j];
+
+                sp0[j] = sp0[j - 1];
+                sp0[j - 1] = temp;
+            }
+        }
+    }
+
+    r4 = sp0[gSpecialVar_0x8006];
+    r10 = 0;
+    r7 = 0;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (sp0[i] == r4)
+        {
+            r10++;
+            if (i == gSpecialVar_0x8006)
+                r7 = r10;
+        }
+    }
+
+    for (i = 0; i < 4; i++)
+    {
+        if (sp0[i] == r4)
+            break;
+    }
+
+    r4_ = i;
+    r2 = r7;
+
+    for (i = 0; i < 4; i++)
+    {
+        if (r4 == gUnknown_02038670[i])
+        {
+            if (r2 == 1)
+                break;
+            r2--;
+        }
+    }
+
+    sub_80C4698(gStringVar1, i);
+
+    if (gIsLinkContest & 1)
+        sub_80C4674(gStringVar2, gLinkPlayers[i].name);
+    else
+        sub_80C4674(gStringVar2, gContestMons[i].trainerName);
+
+    if (r10 == 1 || r7 == r10)
+        gSpecialVar_0x8006 = r4_;
+    else
+        gSpecialVar_0x8006 = r4_ + 4;
 }
 
 void ShowContestWinnerCleanup(void)
@@ -389,7 +262,7 @@ bool8 GiveMonArtistRibbon(void)
     if(ribbon == FALSE
     && gContestFinalStandings[gContestPlayerMonIndex] == 0
     && gSpecialVar_ContestRank == 3
-    && (s16)gUnknown_02038678[gContestPlayerMonIndex] >= 800)
+    && gUnknown_02038678[gContestPlayerMonIndex] >= 800)
     {
         ribbon = TRUE;
         SetMonData(&gPlayerParty[gUnknown_02038694], MON_DATA_ARTIST_RIBBON, &ribbon);