through (nonmatching) sub_80C3024

3 files changed, 158 insertions, 225 deletions

diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s
index 32a57289c..3892e5384 100644
--- a/asm/contest_link_80C2020.s
+++ b/asm/contest_link_80C2020.s
@@ -5,231 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80C2F28
-sub_80C2F28: @ 80C2F28
-	push {r4,r5,lr}
-	ldr r2, _080C2F5C @ =gBattle_BG3_X
-	ldrh r3, [r2]
-	adds r0, r3, 0x2
-	strh r0, [r2]
-	ldr r4, _080C2F60 @ =gBattle_BG3_Y
-	ldrh r5, [r4]
-	adds r1, r5, 0x1
-	strh r1, [r4]
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0xFF
-	bls _080C2F48
-	adds r0, r3, 0
-	subs r0, 0xFD
-	strh r0, [r2]
-_080C2F48:
-	lsls r0, r1, 16
-	lsrs r0, 16
-	cmp r0, 0xFF
-	bls _080C2F56
-	adds r0, r5, 0
-	subs r0, 0xFE
-	strh r0, [r4]
-_080C2F56:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080C2F5C: .4byte gBattle_BG3_X
-_080C2F60: .4byte gBattle_BG3_Y
-	thumb_func_end sub_80C2F28
-
-	thumb_func_start sub_80C2F64
-sub_80C2F64: @ 80C2F64
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, _080C2F94 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r2, r0, r1
-	ldrh r0, [r2, 0x8]
-	adds r0, 0x1
-	strh r0, [r2, 0x8]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x2
-	bne _080C2FE6
-	movs r0, 0
-	strh r0, [r2, 0x8]
-	movs r3, 0xC
-	ldrsh r0, [r2, r3]
-	cmp r0, 0
-	bne _080C2F98
-	ldrh r0, [r2, 0xA]
-	adds r0, 0x1
-	b _080C2F9C
-	.align 2, 0
-_080C2F94: .4byte gTasks
-_080C2F98:
-	ldrh r0, [r2, 0xA]
-	subs r0, 0x1
-_080C2F9C:
-	strh r0, [r2, 0xA]
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r1, r0, r1
-	movs r2, 0xA
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x10
-	bne _080C2FB2
-	movs r0, 0x1
-	b _080C2FB6
-_080C2FB2:
-	cmp r0, 0
-	bne _080C2FB8
-_080C2FB6:
-	strh r0, [r1, 0xC]
-_080C2FB8:
-	ldr r0, _080C3000 @ =gTasks
-	lsls r4, r5, 2
-	adds r4, r5
-	lsls r4, 3
-	adds r4, r0
-	ldrb r2, [r4, 0xA]
-	ldr r3, _080C3004 @ =0x00002ede
-	movs r0, 0x6B
-	movs r1, 0x1
-	bl BlendPalette
-	ldrb r2, [r4, 0xA]
-	ldr r3, _080C3008 @ =0x00007fff
-	movs r0, 0x68
-	movs r1, 0x1
-	bl BlendPalette
-	ldrb r2, [r4, 0xA]
-	ldr r3, _080C300C @ =0x000077be
-	movs r0, 0x6E
-	movs r1, 0x1
-	bl BlendPalette
-_080C2FE6:
-	ldr r1, _080C3000 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r1
-	movs r3, 0xA
-	ldrsh r4, [r0, r3]
-	cmp r4, 0
-	bne _080C3014
-	ldr r0, _080C3010 @ =gSharedMem + 0x18000
-	strb r4, [r0, 0xA]
-	b _080C301A
-	.align 2, 0
-_080C3000: .4byte gTasks
-_080C3004: .4byte 0x00002ede
-_080C3008: .4byte 0x00007fff
-_080C300C: .4byte 0x000077be
-_080C3010: .4byte gSharedMem + 0x18000
-_080C3014:
-	ldr r1, _080C3020 @ =gSharedMem + 0x18000
-	movs r0, 0x1
-	strb r0, [r1, 0xA]
-_080C301A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080C3020: .4byte gSharedMem + 0x18000
-	thumb_func_end sub_80C2F64
-
-	thumb_func_start sub_80C3024
-sub_80C3024: @ 80C3024
-	push {r4-r6,lr}
-	ldr r6, [sp, 0x10]
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r1, 24
-	lsrs r4, r1, 24
-	lsls r2, 24
-	lsrs r5, r2, 24
-	lsls r3, 24
-	cmp r3, 0
-	beq _080C30B0
-	adds r1, r6, 0
-	bl GetMonIconPtr
-	lsls r1, r5, 9
-	adds r0, r1
-	adds r0, 0x80
-	lsls r1, r4, 9
-	ldr r2, _080C30A0 @ =0x06004000
-	adds r1, r2
-	ldr r2, _080C30A4 @ =0x040000d4
-	str r0, [r2]
-	str r1, [r2, 0x4]
-	ldr r0, _080C30A8 @ =0x84000060
-	str r0, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	adds r1, r4, 0
-	adds r1, 0xA
-	lsls r1, 28
-	lsls r0, r4, 20
-	movs r2, 0x80
-	lsls r2, 18
-	adds r0, r2
-	orrs r0, r1
-	lsrs r1, r0, 16
-	lsls r0, r4, 1
-	adds r0, r4
-	lsls r0, 21
-	movs r2, 0x83
-	lsls r2, 16
-	adds r0, r2
-	lsrs r5, r0, 16
-	movs r2, 0
-	ldr r6, _080C30AC @ =0x0600c000
-_080C307C:
-	lsls r0, r2, 5
-	adds r4, r2, 0x1
-	adds r0, r5
-	movs r3, 0x3
-	lsls r0, 1
-	adds r2, r0, r6
-_080C3088:
-	strh r1, [r2]
-	adds r0, r1, 0x1
-	lsls r0, 16
-	lsrs r1, r0, 16
-	adds r2, 0x2
-	subs r3, 0x1
-	cmp r3, 0
-	bge _080C3088
-	adds r2, r4, 0
-	cmp r2, 0x2
-	ble _080C307C
-	b _080C30CA
-	.align 2, 0
-_080C30A0: .4byte 0x06004000
-_080C30A4: .4byte 0x040000d4
-_080C30A8: .4byte 0x84000060
-_080C30AC: .4byte 0x0600c000
-_080C30B0:
-	adds r1, r6, 0
-	bl GetMonIconPtr
-	lsls r1, r5, 9
-	adds r0, r1
-	adds r0, 0x80
-	lsls r1, r4, 9
-	ldr r2, _080C30D0 @ =0x06004000
-	adds r1, r2
-	movs r2, 0xC0
-	lsls r2, 1
-	bl RequestSpriteCopy
-_080C30CA:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080C30D0: .4byte 0x06004000
-	thumb_func_end sub_80C3024
-
 	thumb_func_start sub_80C30D4
 sub_80C30D4: @ 80C30D4
 	push {r4-r7,lr}
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index 7e26c1c9b..20f82f882 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -12,5 +12,6 @@ void sub_809D580(u16);
 void sub_809D608(u16);
 void sub_809D62C(struct Sprite *sprite);
 void sub_809D824(struct Sprite *sprite, u8 animNum);
+const u8 *GetMonIconPtr(u16 species, u32 personality);
 
 #endif // GUARD_POKEMON_ICON_H
diff --git a/src/battle/contest_link_80C2020.c b/src/battle/contest_link_80C2020.c
index 376ad1720..c1d684739 100644
--- a/src/battle/contest_link_80C2020.c
+++ b/src/battle/contest_link_80C2020.c
@@ -8,6 +8,7 @@
 #include "scanline_effect.h"
 #include "decompress.h"
 #include "palette.h"
+#include "blend_palette.h"
 #include "graphics.h"
 #include "strings2.h"
 #include "text.h"
@@ -15,6 +16,7 @@
 #include "menu.h"
 #include "sound.h"
 #include "pokedex.h"
+#include "pokemon_icon.h"
 #include "tv.h"
 #include "battle.h"
 #include "contest.h"
@@ -728,3 +730,158 @@ void sub_80C2EA0(u8 taskId)
         }
     }
 }
+
+void sub_80C2F28(u8 taskId)
+{
+    gBattle_BG3_X += 2;
+    gBattle_BG3_Y++;
+    if (gBattle_BG3_X > 0xff)
+        gBattle_BG3_X -= 0xff;
+    if (gBattle_BG3_Y > 0xff)
+        gBattle_BG3_Y -= 0xff;
+}
+
+void sub_80C2F64(u8 taskId)
+{
+    if (++gTasks[taskId].data[0] == 2)
+    {
+        gTasks[taskId].data[0] = 0;
+        if (gTasks[taskId].data[2] == 0)
+            gTasks[taskId].data[1]++;
+        else
+            gTasks[taskId].data[1]--;
+        if (gTasks[taskId].data[1] == 16)
+            gTasks[taskId].data[2] = 1;
+        else if (gTasks[taskId].data[1] == 0)
+            gTasks[taskId].data[2] = 0;
+        BlendPalette(0x6b, 0x01, gTasks[taskId].data[1], RGB(30, 22, 11));
+        BlendPalette(0x68, 0x01, gTasks[taskId].data[1], RGB(31, 31, 31));
+        BlendPalette(0x6e, 0x01, gTasks[taskId].data[1], RGB(30, 29, 29));
+    }
+    if (gTasks[taskId].data[1] == 0)
+        eContestLink80C2020Struct2018000.unk_0a = 0;
+    else
+        eContestLink80C2020Struct2018000.unk_0a = 1;
+}
+
+#ifdef NONMATCHING
+void sub_80C3024(u16 species, u8 destOffset, u8 srcOffset, bool8 useDmaNow, u32 personality)
+{
+    int i;
+    int j;
+    u16 tile;
+    u16 offset;
+    int vOffset;
+
+    if (useDmaNow)
+    {
+        DmaCopy32Defvars(3, GetMonIconPtr(species, personality) + (srcOffset << 9) + 0x80, BG_CHAR_ADDR(1) + (destOffset << 9), 0x180);
+        tile = ((destOffset + 10) << 12);
+        tile |= (destOffset * 16 + 0x200);
+        offset = destOffset * 0x60 + 0x83;
+        for (i = 0; i < 3; i++)
+        {
+            vOffset = (i << 5) + offset;
+            for (j = 0; j < 4; j++)
+            {
+                ((u16 *)BG_CHAR_ADDR(3))[vOffset + j] = tile;
+                tile++;
+            }
+        }
+    }
+    else
+    {
+        RequestSpriteCopy(GetMonIconPtr(species, personality) + (srcOffset << 9) + 0x80, BG_CHAR_ADDR(1) + (destOffset << 9), 0x180);
+    }
+}
+#else
+__attribute__((naked)) void sub_80C3024(u16 species, u8 destOffset, u8 srcOffset, bool8 useDmaNow, u32 personality)
+{
+    asm_unified("\tpush {r4-r6,lr}\n"
+                    "\tldr r6, [sp, 0x10]\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tlsls r1, 24\n"
+                    "\tlsrs r4, r1, 24\n"
+                    "\tlsls r2, 24\n"
+                    "\tlsrs r5, r2, 24\n"
+                    "\tlsls r3, 24\n"
+                    "\tcmp r3, 0\n"
+                    "\tbeq _080C30B0\n"
+                    "\tadds r1, r6, 0\n"
+                    "\tbl GetMonIconPtr\n"
+                    "\tlsls r1, r5, 9\n"
+                    "\tadds r0, r1\n"
+                    "\tadds r0, 0x80\n"
+                    "\tlsls r1, r4, 9\n"
+                    "\tldr r2, _080C30A0 @ =0x06004000\n"
+                    "\tadds r1, r2\n"
+                    "\tldr r2, _080C30A4 @ =0x040000d4\n"
+                    "\tstr r0, [r2]\n"
+                    "\tstr r1, [r2, 0x4]\n"
+                    "\tldr r0, _080C30A8 @ =0x84000060\n"
+                    "\tstr r0, [r2, 0x8]\n"
+                    "\tldr r0, [r2, 0x8]\n"
+                    "\tadds r1, r4, 0\n"
+                    "\tadds r1, 0xA\n"
+                    "\tlsls r1, 28\n"
+                    "\tlsls r0, r4, 20\n"
+                    "\tmovs r2, 0x80\n"
+                    "\tlsls r2, 18\n"
+                    "\tadds r0, r2\n"
+                    "\torrs r0, r1\n"
+                    "\tlsrs r1, r0, 16\n"
+                    "\tlsls r0, r4, 1\n"
+                    "\tadds r0, r4\n"
+                    "\tlsls r0, 21\n"
+                    "\tmovs r2, 0x83\n"
+                    "\tlsls r2, 16\n"
+                    "\tadds r0, r2\n"
+                    "\tlsrs r5, r0, 16\n"
+                    "\tmovs r2, 0\n"
+                    "\tldr r6, _080C30AC @ =0x0600c000\n"
+                    "_080C307C:\n"
+                    "\tlsls r0, r2, 5\n"
+                    "\tadds r4, r2, 0x1\n"
+                    "\tadds r0, r5\n"
+                    "\tmovs r3, 0x3\n"
+                    "\tlsls r0, 1\n"
+                    "\tadds r2, r0, r6\n"
+                    "_080C3088:\n"
+                    "\tstrh r1, [r2]\n"
+                    "\tadds r0, r1, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r1, r0, 16\n"
+                    "\tadds r2, 0x2\n"
+                    "\tsubs r3, 0x1\n"
+                    "\tcmp r3, 0\n"
+                    "\tbge _080C3088\n"
+                    "\tadds r2, r4, 0\n"
+                    "\tcmp r2, 0x2\n"
+                    "\tble _080C307C\n"
+                    "\tb _080C30CA\n"
+                    "\t.align 2, 0\n"
+                    "_080C30A0: .4byte 0x06004000\n"
+                    "_080C30A4: .4byte 0x040000d4\n"
+                    "_080C30A8: .4byte 0x84000060\n"
+                    "_080C30AC: .4byte 0x0600c000\n"
+                    "_080C30B0:\n"
+                    "\tadds r1, r6, 0\n"
+                    "\tbl GetMonIconPtr\n"
+                    "\tlsls r1, r5, 9\n"
+                    "\tadds r0, r1\n"
+                    "\tadds r0, 0x80\n"
+                    "\tlsls r1, r4, 9\n"
+                    "\tldr r2, _080C30D0 @ =0x06004000\n"
+                    "\tadds r1, r2\n"
+                    "\tmovs r2, 0xC0\n"
+                    "\tlsls r2, 1\n"
+                    "\tbl RequestSpriteCopy\n"
+                    "_080C30CA:\n"
+                    "\tpop {r4-r6}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0\n"
+                    "\t.align 2, 0\n"
+                    "_080C30D0: .4byte 0x06004000");
+}
+#endif