sub_80BFD20

3 files changed, 8 insertions, 18 deletions

diff --git a/asm/tv.s b/asm/tv.s
index 5af0fb284..54bbe2e6b 100644
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -3121,24 +3121,6 @@ _080BF4F0: .4byte gSaveBlock1 + 0x2738
 
 .section .text_80BF544
 
-	thumb_func_start sub_80BFD20
-sub_80BFD20: @ 80BFD20
-	push {lr}
-	ldr r0, _080BFD3C @ =0x000040bc
-	movs r1, 0
-	bl VarSet
-	ldr r0, _080BFD40 @ =gSaveBlock1
-	ldrb r1, [r0, 0x5]
-	ldrb r2, [r0, 0x4]
-	movs r0, 0x5
-	bl RemoveFieldObjectByLocalIdAndMap
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080BFD3C: .4byte 0x000040bc
-_080BFD40: .4byte gSaveBlock1
-	thumb_func_end sub_80BFD20
-
 	thumb_func_start sub_80BFD44
 sub_80BFD44: @ 80BFD44
 	push {r4-r7,lr}
diff --git a/include/vars.h b/include/vars.h
index 0322e38d3..cb5bb3296 100644
--- a/include/vars.h
+++ b/include/vars.h
@@ -35,4 +35,6 @@
 
 #define VAR_PORTHOLE               0x40B4
 
+#define VAR_0x40BC                 0x40BC
+
 #endif // GUARD_VARS_H
diff --git a/src/tv.c b/src/tv.c
index 3d01b3ddb..ec253c37d 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -771,6 +771,12 @@ _080BFD1C: .4byte gOtherText_Dad\n\
 }
 #endif
 
+void sub_80BFD20(void)
+{
+    VarSet(VAR_0x40BC, 0);
+    RemoveFieldObjectByLocalIdAndMap(5, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+}
+
 asm(".section .text_c");
 
 void DoTVShowPokemonNewsMassOutbreak(void)