sub_80BEF10

3 files changed, 28 insertions, 74 deletions

diff --git a/asm/tv.s b/asm/tv.s
index 1dae19326..f16959815 100644
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -2145,79 +2145,6 @@ _080BEF08: .4byte 0x00000804
 _080BEF0C: .4byte 0x00002abe
 	thumb_func_end sub_80BEE84
 
-	thumb_func_start sub_80BEF10
-sub_80BEF10: @ 80BEF10
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	adds r2, r1, 0
-	cmp r1, 0x1
-	beq _080BEF50
-	cmp r1, 0x1
-	bgt _080BEF2A
-	cmp r1, 0
-	beq _080BEF34
-	b _080BEF98
-_080BEF2A:
-	cmp r2, 0x2
-	beq _080BEF6C
-	cmp r2, 0x3
-	beq _080BEF88
-	b _080BEF98
-_080BEF34:
-	ldr r1, _080BEF48 @ =gUnknown_083D1464
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, _080BEF4C @ =gUnknown_083CE048
-	ldr r1, [r1, 0x14]
-	bl StringCopy
-	b _080BEF98
-	.align 2, 0
-_080BEF48: .4byte gUnknown_083D1464
-_080BEF4C: .4byte gUnknown_083CE048
-_080BEF50:
-	ldr r1, _080BEF64 @ =gUnknown_083D1464
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, _080BEF68 @ =gUnknown_083CE048
-	ldr r1, [r1, 0x18]
-	bl StringCopy
-	b _080BEF98
-	.align 2, 0
-_080BEF64: .4byte gUnknown_083D1464
-_080BEF68: .4byte gUnknown_083CE048
-_080BEF6C:
-	ldr r1, _080BEF80 @ =gUnknown_083D1464
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, _080BEF84 @ =gUnknown_083CE048
-	ldr r1, [r1, 0x1C]
-	bl StringCopy
-	b _080BEF98
-	.align 2, 0
-_080BEF80: .4byte gUnknown_083D1464
-_080BEF84: .4byte gUnknown_083CE048
-_080BEF88:
-	ldr r1, _080BEF9C @ =gUnknown_083D1464
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, _080BEFA0 @ =gUnknown_083CE048
-	ldr r1, [r1, 0x20]
-	bl StringCopy
-_080BEF98:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080BEF9C: .4byte gUnknown_083D1464
-_080BEFA0: .4byte gUnknown_083CE048
-	thumb_func_end sub_80BEF10
-
 .section .text_80BF544
 
 	thumb_func_start sub_80BFF68
diff --git a/include/contest_painting.h b/include/contest_painting.h
index 896aa299b..a67748d02 100644
--- a/include/contest_painting.h
+++ b/include/contest_painting.h
@@ -8,6 +8,14 @@
 
 enum
 {
+	NORMAL_RANK,
+	SUPER_RANK,
+	HYPER_RANK,
+	MASTER_RANK,
+};
+
+enum
+{
     CONTEST_COOL,
     CONTEST_BEAUTY,
     CONTEST_CUTE,
diff --git a/src/tv.c b/src/tv.c
index 558cedc9e..7c22d737e 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -56,7 +56,7 @@ extern void sub_80BEBF4(void);
 
 extern u16 gUnknown_020387E0;
 extern u16 gUnknown_020387E2;
-extern const u8 *gUnknown_083CE048[5];
+extern const u8 *gUnknown_083CE048[];;
 
 u32 GetPlayerTrainerId(void);
 
@@ -461,6 +461,25 @@ asm(".section .text_b");
 void sub_80BF6D8(void);
 void sub_80BF588(TVShow tvShows[]);
 
+void sub_80BEF10(u8 strvaridx, u8 rank)
+{
+    switch (rank)
+    {
+        case NORMAL_RANK:
+            StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[NORMAL_RANK + 5]);
+            break;
+        case SUPER_RANK:
+            StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[SUPER_RANK + 5]);
+            break;
+        case HYPER_RANK:
+            StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[HYPER_RANK + 5]);
+            break;
+        case MASTER_RANK:
+            StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[MASTER_RANK + 5]);
+            break;
+    }
+}
+
 void CopyContestCategoryToStringVar(u8 strvaridx, u8 category)
 {
     switch (category)