Close a gap in tv.s,tv.c

3 files changed, 21 insertions, 50 deletions

diff --git a/asm/tv.s b/asm/tv.s
index 03867f465..1b6a42d94 100755
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -7,53 +7,6 @@
 
 	.text
 
-	thumb_func_start sub_80BDD18
-sub_80BDD18: @ 80BDD18
-	push {lr}
-	ldr r0, _080BDD30 @ =gSaveBlock1
-	ldr r1, _080BDD34 @ =0x00002b1b
-	adds r0, r1
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _080BDD38
-	movs r0, 0x1
-	b _080BDD5E
-	.align 2, 0
-_080BDD30: .4byte gSaveBlock1
-_080BDD34: .4byte 0x00002b1b
-_080BDD38:
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _080BDD44
-	movs r0, 0x2
-	b _080BDD5E
-_080BDD44:
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _080BDD50
-	movs r0, 0x3
-	b _080BDD5E
-_080BDD50:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	bne _080BDD5C
-	movs r0, 0
-	b _080BDD5E
-_080BDD5C:
-	movs r0, 0x4
-_080BDD5E:
-	pop {r1}
-	bx r1
-	.align 2, 0
-	thumb_func_end sub_80BDD18
-
-    .section .text_80BE8EC
-
 	thumb_func_start sub_80C04A0
 sub_80C04A0: @ 80C04A0
 	push {r4,r5,lr}
diff --git a/ld_script.txt b/ld_script.txt
index b67fdfc73..205881133 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -175,8 +175,6 @@ SECTIONS {
         asm/secret_base.o(.text_80BC1D0);
 		src/tv.o(.text);
         asm/tv.o(.text);
-        src/tv.o(.text_a);
-        asm/tv.o(.text_80BE8EC);
         src/tv.o(.dotvshow);
         asm/tv.o(.dotvshow);
         src/tv.o(.text_c);
diff --git a/src/tv.c b/src/tv.c
index d1ac9126a..80fd628e2 100755
--- a/src/tv.c
+++ b/src/tv.c
@@ -492,7 +492,27 @@ bool8 GabbyAndTyGetLastQuote(void)
     return TRUE;
 }
 
-asm(".section .text_a");
+u8 sub_80BDD18(void)
+{
+    if (!gSaveBlock1.gabbyAndTyData.valB_0)
+    {
+        return 1;
+    }
+    if (gSaveBlock1.gabbyAndTyData.valB_3)
+    {
+        return 2;
+    }
+    if (gSaveBlock1.gabbyAndTyData.valB_2)
+    {
+        return 3;
+    }
+    if (gSaveBlock1.gabbyAndTyData.valB_1)
+    {
+        return 4;
+    }
+    return 0;
+}
+
 s8 sub_80BF74C(TVShow tvShow[]);
 
 void sub_80BF55C(TVShow tvShow[], u8 showidx);