From 5c6e190868d3caf789635ea3d7418091d0d2769e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Wed, 17 May 2017 10:26:07 -0400
Subject: sub_80BF638

---
 asm/tv.s | 31 -------------------------------
 src/tv.c |  9 ++++++++-
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/asm/tv.s b/asm/tv.s
index f4b4a1444..18ab85d34 100644
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -3121,37 +3121,6 @@ _080BF4F0: .4byte gSaveBlock1 + 0x2738
 
 .section .text_80BF544
 
-	thumb_func_start sub_80BF638
-sub_80BF638: @ 80BF638
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r0, r1, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r0, 16
-	lsrs r0, 16
-	bl sub_80BF674
-	adds r5, r0, 0
-	lsls r5, 16
-	lsrs r5, 16
-	ldr r0, _080BF66C @ =gUnknown_083D1464
-	lsls r4, 2
-	adds r4, r0
-	ldr r0, [r4]
-	movs r1, 0xB
-	muls r1, r5
-	ldr r2, _080BF670 @ =gSpeciesNames
-	adds r1, r2
-	bl StringCopy
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080BF66C: .4byte gUnknown_083D1464
-_080BF670: .4byte gSpeciesNames
-	thumb_func_end sub_80BF638
-
 	thumb_func_start sub_80BF674
 sub_80BF674: @ 80BF674
 	push {r4-r6,lr}
diff --git a/src/tv.c b/src/tv.c
index 8958a003c..49c75004e 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -29,6 +29,8 @@ struct OutbreakPokemon
     /*0x0B*/ u8 location;
 };
 
+extern u8 *gUnknown_083D1464[3];
+
 extern u16 gSpecialVar_0x8004;
 extern u8 gSpecialVar_0x8007;
 extern u16 gScriptResult;
@@ -367,9 +369,14 @@ void sub_80BF588(TVShow tvShow[])
             }
         }
     }
-    
 }
 
+u16 sub_80BF638(u8 arg0, u16 arg1)
+{
+    u16 retval = sub_80BF674(arg1);
+    StringCopy(gUnknown_083D1464[arg0], gSpeciesNames[retval]);
+    return retval;
+}
 
 asm(".section .text_c");
 
-- 
cgit v1.2.3