sub_80BF974, sub_80BF9B4

2 files changed, 20 insertions, 70 deletions

diff --git a/asm/tv.s b/asm/tv.s
index 851d9752d..9a34fb0ef 100644
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -3121,76 +3121,6 @@ _080BF4F0: .4byte gSaveBlock1 + 0x2738
 
 .section .text_80BF544
 
-	thumb_func_start sub_80BF974
-sub_80BF974: @ 80BF974
-	push {r4,lr}
-	movs r1, 0
-	ldr r4, _080BF994 @ =gSaveBlock1
-	ldr r0, _080BF998 @ =gSpecialVar_0x8004
-	ldrh r2, [r0]
-	ldr r3, _080BF99C @ =0x00002738
-_080BF980:
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	adds r0, r3
-	ldrb r0, [r0]
-	cmp r0, r2
-	bne _080BF9A0
-	movs r0, 0x1
-	b _080BF9AC
-	.align 2, 0
-_080BF994: .4byte gSaveBlock1
-_080BF998: .4byte gSpecialVar_0x8004
-_080BF99C: .4byte 0x00002738
-_080BF9A0:
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x4
-	bls _080BF980
-	movs r0, 0
-_080BF9AC:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80BF974
-
-	thumb_func_start sub_80BF9B4
-sub_80BF9B4: @ 80BF9B4
-	push {r4,lr}
-	ldr r0, _080BF9E0 @ =gSpecialVar_0x8004
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _080BF9E4 @ =gPlayerParty
-	adds r0, r1
-	ldr r4, _080BF9E8 @ =gStringVar1
-	movs r1, 0x2
-	adds r2, r4, 0
-	bl GetMonData
-	ldr r0, _080BF9EC @ =gStringVar3
-	adds r1, r4, 0
-	bl StringCompareWithoutExtCtrlCodes
-	cmp r0, 0
-	beq _080BF9F0
-	bl sub_80BE478
-	movs r0, 0x1
-	b _080BF9F2
-	.align 2, 0
-_080BF9E0: .4byte gSpecialVar_0x8004
-_080BF9E4: .4byte gPlayerParty
-_080BF9E8: .4byte gStringVar1
-_080BF9EC: .4byte gStringVar3
-_080BF9F0:
-	movs r0, 0
-_080BF9F2:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80BF9B4
-
 	thumb_func_start sub_80BF9F8
 sub_80BF9F8: @ 80BF9F8
 	push {r4-r6,lr}
diff --git a/src/tv.c b/src/tv.c
index 960d70ca6..2b39c7a7c 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -513,6 +513,26 @@ void sub_80BF820(u8 arg0, u8 arg1, u8 arg2, u16 arg3, u16 arg4, struct TVShowNam
     StringCopy(gUnknown_083D1464[arg0], flags);
 }
 
+bool8 sub_80BF974(void)
+{
+    u8 i;
+    for (i=0; i<5; i++)
+    {
+        if (gSaveBlock1.tvShows[i].common.var00 == gSpecialVar_0x8004)
+            return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 sub_80BF9B4(void)
+{
+    GetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_NICKNAME, &gStringVar1);
+    if (!StringCompareWithoutExtCtrlCodes(gStringVar3, gStringVar1))
+        return FALSE;
+    sub_80BE478();
+    return TRUE;
+}
+
 asm(".section .text_c");
 
 void DoTVShowPokemonNewsMassOutbreak(void)