sub_815B0CC and rollback of failed attempt to make it compilable

3 files changed, 13 insertions, 54 deletions

diff --git a/asm/item_menu.s b/asm/item_menu.s
index 3a665b61e..c81730a55 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -6342,11 +6342,11 @@ sub_810B108: @ 810B108
 	beq _0810B160
 	cmp r4, 0x8
 	beq _0810B16C
-	ldr r2, _0810B15C @ =CB2_ReturnToTeachyTV
+	ldr r2, _0810B15C @ =sub_815ABFC
 	adds r0, r4, 0
 	b _0810B170
 	.align 2, 0
-_0810B15C: .4byte CB2_ReturnToTeachyTV
+_0810B15C: .4byte sub_815ABFC
 _0810B160:
 	ldr r2, _0810B168 @ =sub_8030AEC
 	movs r0, 0x7
@@ -6386,7 +6386,7 @@ _0810B19C:
 	bl sub_815AC20
 	ldr r0, _0810B1C4 @ =gUnknown_203AD10
 	ldr r1, [r0]
-	ldr r0, _0810B1C8 @ =CB2_ReturnToTeachyTV
+	ldr r0, _0810B1C8 @ =sub_815ABFC
 	str r0, [r1]
 	ldr r1, _0810B1CC @ =gTasks
 	lsls r0, r4, 2
@@ -6402,7 +6402,7 @@ _0810B1BC:
 	bx r1
 	.align 2, 0
 _0810B1C4: .4byte gUnknown_203AD10
-_0810B1C8: .4byte CB2_ReturnToTeachyTV
+_0810B1C8: .4byte sub_815ABFC
 _0810B1CC: .4byte gTasks
 _0810B1D0: .4byte sub_810B070
 	thumb_func_end sub_810B180
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 13ca24a2f..eab7c9455 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -4879,12 +4879,12 @@ sub_8120FB0: @ 8120FB0
 	bl FreeRestoreBattleData
 	bl LoadPlayerParty
 	bl sub_815AC20
-	ldr r0, _08120FC8 @ =CB2_ReturnToTeachyTV
+	ldr r0, _08120FC8 @ =sub_815ABFC
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08120FC8: .4byte CB2_ReturnToTeachyTV
+_08120FC8: .4byte sub_815ABFC
 	thumb_func_end sub_8120FB0
 
 	thumb_func_start sub_8120FCC
diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s
index cd74baad3..46824b53b 100644
--- a/asm/teachy_tv.s
+++ b/asm/teachy_tv.s
@@ -5,49 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_815B0CC
-sub_815B0CC: @ 815B0CC
-	push {r4-r7,lr}
-	movs r0, 0x2
-	bl GetBgTilemapBuffer
-	adds r7, r0, 0
-	movs r0, 0x1
-_0815B0D8:
-	movs r4, 0x2
-	lsls r5, r0, 5
-	adds r6, r0, 0x1
-_0815B0DE:
-	bl Random
-	adds r2, r5, r4
-	lsls r2, 1
-	adds r2, r7
-	movs r1, 0x3
-	ands r1, r0
-	lsls r1, 10
-	ldr r3, _0815B114 @ =0x0000301f
-	adds r0, r3, 0
-	adds r1, r0
-	strh r1, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x1B
-	bls _0815B0DE
-	lsls r0, r6, 24
-	lsrs r0, 24
-	cmp r0, 0xC
-	bls _0815B0D8
-	movs r0, 0x2
-	bl schedule_bg_copy_tilemap_to_vram
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815B114: .4byte 0x0000301f
-	thumb_func_end sub_815B0CC
-
-	thumb_func_start TeachyTvConfigRboxAndObj
-TeachyTvConfigRboxAndObj: @ 815B118
+	thumb_func_start TeachyTvSetupPostBattleWindowAndObj
+TeachyTvSetupPostBattleWindowAndObj: @ 815B118
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -134,7 +93,7 @@ _0815B1B8:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end TeachyTvConfigRboxAndObj
+	thumb_func_end TeachyTvSetupPostBattleWindowAndObj
 
 	thumb_func_start sub_815B1DC
 sub_815B1DC: @ 815B1DC
@@ -265,7 +224,7 @@ sub_815B2C0: @ 815B2C0
 	lsls r0, 3
 	ldr r1, _0815B31C @ =gTasks+0x8
 	adds r6, r0, r1
-	bl sub_815B0CC
+	bl TeachyTvBg2AnimController
 	ldr r0, _0815B320 @ =gPaletteFade
 	ldrb r1, [r0, 0x7]
 	movs r0, 0x80
@@ -358,7 +317,7 @@ sub_815B38C: @ 815B38C
 	lsls r1, 3
 	ldr r0, _0815B3F8 @ =gTasks+0x8
 	adds r4, r1, r0
-	bl sub_815B0CC
+	bl TeachyTvBg2AnimController
 	ldrh r0, [r4, 0x4]
 	adds r0, 0x1
 	strh r0, [r4, 0x4]
@@ -1103,7 +1062,7 @@ sub_815B92C: @ 815B92C
 	lsls r0, 1
 	bl PlayNewMapMusic
 _0815B94C:
-	bl sub_815B0CC
+	bl TeachyTvBg2AnimController
 	ldrh r0, [r5, 0x4]
 	adds r0, 0x1
 	strh r0, [r5, 0x4]
@@ -1630,7 +1589,7 @@ _0815BD70:
 	lsls r0, 1
 	bl PlayNewMapMusic
 _0815BD78:
-	bl CB2_ReturnToTeachyTV
+	bl sub_815ABFC
 	pop {r0}
 	bx r0
 	thumb_func_end sub_815BD58