Copy and paste through sub_80FD7AC from Emerald

2 files changed, 144 insertions, 460 deletions

diff --git a/asm/contest_painting_effects.s b/asm/contest_painting_effects.s
index 0c403c093..249fbf6e4 100644
--- a/asm/contest_painting_effects.s
+++ b/asm/contest_painting_effects.s
@@ -5,466 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80FD568
-sub_80FD568: @ 80FD568
-	push {r4-r7,lr}
-	sub sp, 0x14
-	adds r7, r1, 0
-	ldrh r4, [r0]
-	ldrh r5, [r7]
-	lsls r6, r4, 16
-	lsls r0, r5, 16
-	mov r12, r0
-	cmp r4, r5
-	beq _080FD5DA
-	mov r2, sp
-	movs r3, 0x1F
-	movs r1, 0x1F
-	adds r0, r1, 0
-	ands r0, r4
-	strh r0, [r2]
-	lsrs r0, r6, 21
-	ands r0, r3
-	strh r0, [r2, 0x2]
-	lsrs r0, r6, 26
-	ands r0, r3
-	strh r0, [r2, 0x4]
-	mov r0, sp
-	ands r1, r5
-	strh r1, [r0, 0x6]
-	mov r1, sp
-	mov r2, r12
-	lsrs r0, r2, 21
-	ands r0, r3
-	strh r0, [r1, 0x8]
-	lsrs r0, r2, 26
-	ands r0, r3
-	strh r0, [r1, 0xA]
-	mov r0, sp
-	ldrh r0, [r0]
-	cmp r0, 0x19
-	bls _080FD5C2
-	mov r0, sp
-	ldrh r0, [r0, 0x2]
-	cmp r0, 0x19
-	bls _080FD5C2
-	mov r0, sp
-	ldrh r0, [r0, 0x4]
-	cmp r0, 0x19
-	bhi _080FD5DA
-_080FD5C2:
-	mov r0, sp
-	ldrh r0, [r0, 0x6]
-	cmp r0, 0x19
-	bls _080FD5DE
-	mov r0, sp
-	ldrh r0, [r0, 0x8]
-	cmp r0, 0x19
-	bls _080FD5DE
-	mov r0, sp
-	ldrh r0, [r0, 0xA]
-	cmp r0, 0x19
-	bls _080FD5DE
-_080FD5DA:
-	ldrh r0, [r7]
-	b _080FD684
-_080FD5DE:
-	movs r4, 0
-	add r6, sp, 0xC
-	mov r7, sp
-	adds r7, 0x6
-	adds r5, r6, 0
-_080FD5E8:
-	lsls r2, r4, 1
-	mov r1, sp
-	adds r0, r1, r2
-	adds r1, r7, r2
-	ldrh r3, [r0]
-	ldrh r0, [r1]
-	cmp r3, r0
-	bls _080FD5FE
-	adds r1, r5, r2
-	subs r0, r3, r0
-	b _080FD602
-_080FD5FE:
-	adds r1, r5, r2
-	subs r0, r3
-_080FD602:
-	strh r0, [r1]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x2
-	bls _080FD5E8
-	adds r1, r6, 0
-	ldrh r0, [r1, 0x2]
-	ldrh r3, [r1]
-	cmp r3, r0
-	bcc _080FD628
-	ldrh r2, [r1, 0x4]
-	cmp r3, r2
-	bcc _080FD622
-	adds r2, r3, 0
-	b _080FD63C
-_080FD622:
-	cmp r0, r2
-	bcs _080FD62E
-	b _080FD636
-_080FD628:
-	ldrh r2, [r1, 0x4]
-	cmp r0, r2
-	bcc _080FD632
-_080FD62E:
-	ldrh r2, [r1, 0x2]
-	b _080FD63C
-_080FD632:
-	cmp r2, r3
-	bcc _080FD63A
-_080FD636:
-	ldrh r2, [r1, 0x4]
-	b _080FD63C
-_080FD63A:
-	ldrh r2, [r6]
-_080FD63C:
-	mov r0, sp
-	ldrh r1, [r0, 0x6]
-	lsrs r0, r2, 1
-	movs r6, 0x1F
-	subs r6, r0
-	adds r0, r1, 0
-	muls r0, r6
-	movs r1, 0x1F
-	bl __divsi3
-	adds r5, r0, 0
-	lsls r5, 16
-	lsrs r5, 16
-	mov r0, sp
-	ldrh r0, [r0, 0x8]
-	muls r0, r6
-	movs r1, 0x1F
-	bl __divsi3
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	mov r0, sp
-	ldrh r0, [r0, 0xA]
-	muls r0, r6
-	movs r1, 0x1F
-	bl __divsi3
-	lsls r0, 16
-	lsrs r0, 6
-	lsls r4, 5
-	orrs r0, r4
-	orrs r5, r0
-	lsls r5, 16
-	lsrs r5, 16
-	adds r0, r5, 0
-_080FD684:
-	add sp, 0x14
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80FD568
-
-	thumb_func_start sub_80FD68C
-sub_80FD68C: @ 80FD68C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	adds r3, r0, 0
-	mov r10, r1
-	str r2, [sp]
-	ldrh r1, [r3]
-	mov r0, r10
-	ldrh r0, [r0]
-	cmp r1, r0
-	bne _080FD6B4
-	ldrh r0, [r2]
-	cmp r0, r1
-	bne _080FD6B4
-	mov r1, r10
-	ldrh r0, [r1]
-	b _080FD79C
-_080FD6B4:
-	mov r2, r10
-	ldrh r0, [r2]
-	movs r1, 0x1F
-	mov r9, r1
-	movs r4, 0x1F
-	adds r5, r4, 0
-	ands r5, r0
-	lsls r0, 16
-	lsrs r2, r0, 21
-	mov r1, r9
-	ands r1, r2
-	mov r8, r1
-	lsrs r0, 26
-	mov r2, r9
-	ands r2, r0
-	str r2, [sp, 0x4]
-	ldrh r2, [r3]
-	adds r0, r4, 0
-	ands r0, r2
-	lsls r2, 16
-	lsrs r1, r2, 21
-	mov r3, r9
-	ands r1, r3
-	adds r0, r1
-	lsrs r2, 26
-	ands r2, r3
-	adds r0, r2
-	movs r1, 0x3
-	bl __divsi3
-	lsls r0, 16
-	lsrs r7, r0, 16
-	mov r1, r8
-	adds r0, r5, r1
-	ldr r2, [sp, 0x4]
-	adds r0, r2
-	movs r1, 0x3
-	bl __divsi3
-	lsls r0, 16
-	lsrs r6, r0, 16
-	ldr r3, [sp]
-	ldrh r1, [r3]
-	ands r4, r1
-	lsls r1, 16
-	lsrs r0, r1, 21
-	mov r2, r9
-	ands r0, r2
-	adds r4, r0
-	lsrs r1, 26
-	ands r1, r2
-	adds r4, r1
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl __divsi3
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r7, r6
-	bne _080FD736
-	cmp r1, r6
-	bne _080FD736
-	mov r3, r10
-	ldrh r0, [r3]
-	b _080FD79C
-_080FD736:
-	cmp r7, r6
-	bls _080FD73E
-	subs r0, r7, r6
-	b _080FD740
-_080FD73E:
-	subs r0, r6, r7
-_080FD740:
-	lsls r0, 16
-	lsrs r2, r0, 16
-	cmp r1, r6
-	bls _080FD74C
-	subs r0, r1, r6
-	b _080FD74E
-_080FD74C:
-	subs r0, r6, r1
-_080FD74E:
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r2, r0
-	bcc _080FD758
-	adds r0, r2, 0
-_080FD758:
-	lsrs r0, 1
-	movs r4, 0x1F
-	subs r4, r0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r5, 0
-	muls r0, r4
-	movs r1, 0x1F
-	bl __divsi3
-	lsls r0, 16
-	lsrs r5, r0, 16
-	mov r0, r8
-	muls r0, r4
-	movs r1, 0x1F
-	bl __divsi3
-	lsls r0, 16
-	lsrs r0, 16
-	mov r8, r0
-	ldr r1, [sp, 0x4]
-	adds r0, r1, 0
-	muls r0, r4
-	movs r1, 0x1F
-	bl __divsi3
-	lsls r0, 16
-	lsrs r0, 6
-	mov r2, r8
-	lsls r1, r2, 5
-	orrs r0, r1
-	orrs r5, r0
-	lsls r0, r5, 16
-	lsrs r0, 16
-_080FD79C:
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80FD68C
-
-	thumb_func_start sub_80FD7AC
-sub_80FD7AC: @ 80FD7AC
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	adds r3, r0, 0
-	mov r10, r1
-	str r2, [sp]
-	ldrh r1, [r3]
-	mov r0, r10
-	ldrh r0, [r0]
-	cmp r1, r0
-	bne _080FD7D4
-	ldrh r0, [r2]
-	cmp r0, r1
-	bne _080FD7D4
-	mov r1, r10
-	ldrh r0, [r1]
-	b _080FD8BA
-_080FD7D4:
-	mov r2, r10
-	ldrh r0, [r2]
-	movs r1, 0x1F
-	mov r9, r1
-	movs r4, 0x1F
-	adds r5, r4, 0
-	ands r5, r0
-	lsls r0, 16
-	lsrs r2, r0, 21
-	mov r1, r9
-	ands r1, r2
-	mov r8, r1
-	lsrs r0, 26
-	mov r2, r9
-	ands r2, r0
-	str r2, [sp, 0x4]
-	ldrh r2, [r3]
-	adds r0, r4, 0
-	ands r0, r2
-	lsls r2, 16
-	lsrs r1, r2, 21
-	mov r3, r9
-	ands r1, r3
-	adds r0, r1
-	lsrs r2, 26
-	ands r2, r3
-	adds r0, r2
-	movs r1, 0x3
-	bl __divsi3
-	lsls r0, 16
-	lsrs r7, r0, 16
-	mov r1, r8
-	adds r0, r5, r1
-	ldr r2, [sp, 0x4]
-	adds r0, r2
-	movs r1, 0x3
-	bl __divsi3
-	lsls r0, 16
-	lsrs r6, r0, 16
-	ldr r3, [sp]
-	ldrh r1, [r3]
-	ands r4, r1
-	lsls r1, 16
-	lsrs r0, r1, 21
-	mov r2, r9
-	ands r0, r2
-	adds r4, r0
-	lsrs r1, 26
-	ands r1, r2
-	adds r4, r1
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl __divsi3
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r7, r6
-	bne _080FD856
-	cmp r1, r6
-	bne _080FD856
-	mov r3, r10
-	ldrh r0, [r3]
-	b _080FD8BA
-_080FD856:
-	cmp r7, r6
-	bls _080FD85E
-	subs r0, r7, r6
-	b _080FD860
-_080FD85E:
-	subs r0, r6, r7
-_080FD860:
-	lsls r0, 16
-	lsrs r2, r0, 16
-	cmp r1, r6
-	bls _080FD86C
-	subs r0, r1, r6
-	b _080FD86E
-_080FD86C:
-	subs r0, r6, r1
-_080FD86E:
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r2, r0
-	bcc _080FD878
-	adds r0, r2, 0
-_080FD878:
-	movs r4, 0x1F
-	subs r4, r0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r5, 0
-	muls r0, r4
-	movs r1, 0x1F
-	bl __divsi3
-	lsls r0, 16
-	lsrs r5, r0, 16
-	mov r0, r8
-	muls r0, r4
-	movs r1, 0x1F
-	bl __divsi3
-	lsls r0, 16
-	lsrs r0, 16
-	mov r8, r0
-	ldr r1, [sp, 0x4]
-	adds r0, r1, 0
-	muls r0, r4
-	movs r1, 0x1F
-	bl __divsi3
-	lsls r0, 16
-	lsrs r0, 6
-	mov r2, r8
-	lsls r1, r2, 5
-	orrs r0, r1
-	orrs r5, r0
-	lsls r0, r5, 16
-	lsrs r0, 16
-_080FD8BA:
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80FD7AC
-
 	thumb_func_start sub_80FD8CC
 sub_80FD8CC: @ 80FD8CC
 	push {r4-r7,lr}
diff --git a/src/contest_painting_effects.c b/src/contest_painting_effects.c
index ae89df88e..66e33437f 100644
--- a/src/contest_painting_effects.c
+++ b/src/contest_painting_effects.c
@@ -751,3 +751,147 @@ u16 InvertColor(u16 *color)
 
     return RGB2(red, green, blue);
 }
+
+u16 sub_80FD568(u16 *a0, u16 *a1)
+{
+    u16 sp0[2][3];
+    u16 spC[3];
+    u8 r4;
+    u16 r2;
+    u16 r, g, b;
+
+    if (*a0 == *a1)
+        return *a1;
+
+    sp0[0][0] = (*a0 >> 0) & 0x1F;
+    sp0[0][1] = (*a0 >> 5) & 0x1F;
+    sp0[0][2] = (*a0 >> 10) & 0x1F;
+    sp0[1][0] = (*a1 >> 0) & 0x1F;
+    sp0[1][1] = (*a1 >> 5) & 0x1F;
+    sp0[1][2] = (*a1 >> 10) & 0x1F;
+
+    if (sp0[0][0] > 25 && sp0[0][1] > 25 && sp0[0][2] > 25)
+        return *a1;
+    if (sp0[1][0] > 25 && sp0[1][1] > 25 && sp0[1][2] > 25)
+        return *a1;
+
+    for (r4 = 0; r4 < 3; r4++)
+    {
+        if (sp0[0][r4] > sp0[1][r4])
+            spC[r4] = sp0[0][r4] - sp0[1][r4];
+        else
+            spC[r4] = sp0[1][r4] - sp0[0][r4];
+    }
+
+    if (spC[0] >= spC[1])
+    {
+        if (spC[0] >= spC[2])
+            r2 = spC[0];
+        else if (spC[1] >= spC[2])
+            r2 = spC[1];
+        else
+            r2 = spC[2];
+    }
+    else
+    {
+        if (spC[1] >= spC[2])
+            r2 = spC[1];
+        else if (spC[2] >= spC[0])
+            r2 = spC[2];
+        else
+            r2 = spC[0];
+    }
+
+    r = (sp0[1][0] * (31 - r2 / 2)) / 31;
+    g = (sp0[1][1] * (31 - r2 / 2)) / 31;
+    b = (sp0[1][2] * (31 - r2 / 2)) / 31;
+    return RGB2(r, g, b);
+}
+
+u16 sub_80FD68C(u16 * a0, u16 * a1, u16 * a2)
+{
+    u16 red, green, blue;
+    u16 avg0, avg1, avg2;
+    u16 diff1, diff2;
+    u32 minimum;
+    u16 factor;
+
+    if (*a0 == *a1 && *a2 == *a1)
+        return *a1;
+
+    red = (*a1 >> 0) & 0x1F;
+    green = (*a1 >> 5) & 0x1F;
+    blue = (*a1 >> 10) & 0x1F;
+
+    avg0 = (((*a0 >> 0) & 0x1F) + ((*a0 >> 5) & 0x1F) + ((*a0 >> 10) & 0x1F)) / 3;
+    avg1 = (((*a1 >> 0) & 0x1F) + ((*a1 >> 5) & 0x1F) + ((*a1 >> 10) & 0x1F)) / 3;
+    avg2 = (((*a2 >> 0) & 0x1F) + ((*a2 >> 5) & 0x1F) + ((*a2 >> 10) & 0x1F)) / 3;
+
+    if (avg0 == avg1 && avg2 == avg1)
+        return *a1;
+
+    if (avg0 > avg1)
+        diff1 = avg0 - avg1;
+    else
+        diff1 = avg1 - avg0;
+
+    if (avg2 > avg1)
+        diff2 = avg2 - avg1;
+    else
+        diff2 = avg1 - avg2;
+
+    if (diff1 >= diff2)
+        minimum = diff1;
+    else
+        minimum = diff2;
+
+    factor = 31 - minimum / 2;
+    red = red * factor / 31;
+    green = green * factor / 31;
+    blue = blue * factor / 31;
+    return RGB2(red, green, blue);
+}
+
+u16 sub_80FD7AC(u16 *a0, u16 *a1, u16 *a2)
+{
+    u16 red, green, blue;
+    u16 avg0, avg1, avg2;
+    u16 diff1, diff2;
+    u32 minimum;
+    u16 factor;
+
+    if (*a0 == *a1 && *a2 == *a1)
+        return *a1;
+
+    red = (*a1 >> 0) & 0x1F;
+    green = (*a1 >> 5) & 0x1F;
+    blue = (*a1 >> 10) & 0x1F;
+
+    avg0 = (((*a0 >> 0) & 0x1F) + ((*a0 >> 5) & 0x1F) + ((*a0 >> 10) & 0x1F)) / 3;
+    avg1 = (((*a1 >> 0) & 0x1F) + ((*a1 >> 5) & 0x1F) + ((*a1 >> 10) & 0x1F)) / 3;
+    avg2 = (((*a2 >> 0) & 0x1F) + ((*a2 >> 5) & 0x1F) + ((*a2 >> 10) & 0x1F)) / 3;
+
+    if (avg0 == avg1 && avg2 == avg1)
+        return *a1;
+
+    if (avg0 > avg1)
+        diff1 = avg0 - avg1;
+    else
+        diff1 = avg1 - avg0;
+
+    if (avg2 > avg1)
+        diff2 = avg2 - avg1;
+    else
+        diff2 = avg1 - avg2;
+
+    if (diff1 >= diff2)
+        minimum = diff1;
+    else
+        minimum = diff2;
+
+    factor = 31 - minimum;
+    red = red * factor / 31;
+    green = green * factor / 31;
+    blue = blue * factor / 31;
+    return RGB2(red, green, blue);
+}