diff --git a/asm/non_matchings/unknown_07AF10/func_8007A310.s b/asm/non_matchings/unknown_07AF10/func_8007A310.s
index 01b7a56a..da0544af 100644
--- a/asm/non_matchings/unknown_07AF10/func_8007A310.s
+++ b/asm/non_matchings/unknown_07AF10/func_8007A310.s
@@ -1,3 +1,14 @@
+.late_rodata
+glabel D_800E7AFC
+.float 1.21212125
+glabel D_800E7B00
+.float 1.1
+glabel D_800E7B04
+.float 1.33333333
+glabel D_800E7B08
+.float 1.33333333
+
+.text
 glabel func_8007A310
 /* 07AF10 8007A310 3C028000 */  lui   $v0, %hi(osTvType) # $v0, 0x8000
 /* 07AF14 8007A314 8C420300 */  lw    $v0, %lo(osTvType)($v0)
diff --git a/asm/non_matchings/unknown_07AF10/func_8007A550.s b/asm/non_matchings/unknown_07AF10/func_8007A550.s
index 35120eb0..3aefb1b6 100644
--- a/asm/non_matchings/unknown_07AF10/func_8007A550.s
+++ b/asm/non_matchings/unknown_07AF10/func_8007A550.s
@@ -1,3 +1,8 @@
+.late_rodata
+glabel jpt_800E7B0C
+.word L8007A5AC, L8007A5D0, L8007A658, L8007A6C0, L8007A728, L8007A750, L8007A778, L8007A7A0
+
+.text
 glabel func_8007A550
 /* 07B150 8007A550 3C028000 */  lui   $v0, %hi(osTvType) # $v0, 0x8000
 /* 07B154 8007A554 8C420300 */  lw    $v0, %lo(osTvType)($v0)
@@ -16,14 +21,15 @@ glabel func_8007A550
 .L8007A584:
 /* 07B184 8007A584 3C0E8012 */  lui   $t6, %hi(D_801262CC) # $t6, 0x8012
 /* 07B188 8007A588 8DCE62CC */  lw    $t6, %lo(D_801262CC)($t6)
-/* 07B18C 8007A58C 3C01800E */  lui   $at, %hi(D_800E7B0C) # $at, 0x800e
+/* 07B18C 8007A58C 3C01800E */  lui   $at, %hi(jpt_800E7B0C) # $at, 0x800e
 /* 07B190 8007A590 31CF0007 */  andi  $t7, $t6, 7
 /* 07B194 8007A594 000F7880 */  sll   $t7, $t7, 2
 /* 07B198 8007A598 002F0821 */  addu  $at, $at, $t7
-/* 07B19C 8007A59C 8C2F7B0C */  lw    $t7, %lo(D_800E7B0C)($at)
+/* 07B19C 8007A59C 8C2F7B0C */  lw    $t7, %lo(jpt_800E7B0C)($at)
 /* 07B1A0 8007A5A0 00000000 */  nop   
 /* 07B1A4 8007A5A4 01E00008 */  jr    $t7
 /* 07B1A8 8007A5A8 00000000 */   nop   
+glabel L8007A5AC
 /* 07B1AC 8007A5AC 0003C080 */  sll   $t8, $v1, 2
 /* 07B1B0 8007A5B0 0303C021 */  addu  $t8, $t8, $v1
 /* 07B1B4 8007A5B4 3C19800E */  lui   $t9, %hi(D_800E3900) # $t9, 0x800e
@@ -33,6 +39,7 @@ glabel func_8007A550
 /* 07B1C4 8007A5C4 03192021 */   addu  $a0, $t8, $t9
 /* 07B1C8 8007A5C8 1000007D */  b     .L8007A7C0
 /* 07B1CC 8007A5CC 00000000 */   nop   
+glabel L8007A5D0
 /* 07B1D0 8007A5D0 3C04800E */  lui   $a0, %hi(D_800E4620) # $a0, 0x800e
 /* 07B1D4 8007A5D4 14400004 */  bnez  $v0, .L8007A5E8
 /* 07B1D8 8007A5D8 24844620 */   addiu $a0, %lo(D_800E4620) # addiu $a0, $a0, 0x4620
@@ -70,6 +77,7 @@ glabel func_8007A550
 /* 07B24C 8007A64C 00A02025 */   move  $a0, $a1
 /* 07B250 8007A650 1000005B */  b     .L8007A7C0
 /* 07B254 8007A654 00000000 */   nop   
+glabel L8007A658
 /* 07B258 8007A658 3C04800E */  lui   $a0, %hi(D_800E4620) # $a0, 0x800e
 /* 07B25C 8007A65C 14400004 */  bnez  $v0, .L8007A670
 /* 07B260 8007A660 24844620 */   addiu $a0, %lo(D_800E4620) # addiu $a0, $a0, 0x4620
@@ -98,6 +106,7 @@ glabel func_8007A550
 /* 07B2B4 8007A6B4 AC82003C */   sw    $v0, 0x3c($a0)
 /* 07B2B8 8007A6B8 10000041 */  b     .L8007A7C0
 /* 07B2BC 8007A6BC 00000000 */   nop   
+glabel L8007A6C0
 /* 07B2C0 8007A6C0 3C04800E */  lui   $a0, %hi(D_800E4710) # $a0, 0x800e
 /* 07B2C4 8007A6C4 14400004 */  bnez  $v0, .L8007A6D8
 /* 07B2C8 8007A6C8 24844710 */   addiu $a0, %lo(D_800E4710) # addiu $a0, $a0, 0x4710
@@ -126,6 +135,7 @@ glabel func_8007A550
 /* 07B31C 8007A71C AC82003C */   sw    $v0, 0x3c($a0)
 /* 07B320 8007A720 10000027 */  b     .L8007A7C0
 /* 07B324 8007A724 00000000 */   nop   
+glabel L8007A728
 /* 07B328 8007A728 00035880 */  sll   $t3, $v1, 2
 /* 07B32C 8007A72C 01635821 */  addu  $t3, $t3, $v1
 /* 07B330 8007A730 000B5900 */  sll   $t3, $t3, 4
@@ -136,6 +146,7 @@ glabel func_8007A550
 /* 07B344 8007A744 018D2021 */   addu  $a0, $t4, $t5
 /* 07B348 8007A748 1000001D */  b     .L8007A7C0
 /* 07B34C 8007A74C 00000000 */   nop   
+glabel L8007A750
 /* 07B350 8007A750 00037080 */  sll   $t6, $v1, 2
 /* 07B354 8007A754 01C37021 */  addu  $t6, $t6, $v1
 /* 07B358 8007A758 000E7100 */  sll   $t6, $t6, 4
@@ -146,6 +157,7 @@ glabel func_8007A550
 /* 07B36C 8007A76C 01F82021 */   addu  $a0, $t7, $t8
 /* 07B370 8007A770 10000013 */  b     .L8007A7C0
 /* 07B374 8007A774 00000000 */   nop   
+glabel L8007A778
 /* 07B378 8007A778 0003C880 */  sll   $t9, $v1, 2
 /* 07B37C 8007A77C 0323C821 */  addu  $t9, $t9, $v1
 /* 07B380 8007A780 0019C900 */  sll   $t9, $t9, 4
@@ -156,6 +168,7 @@ glabel func_8007A550
 /* 07B394 8007A794 01092021 */   addu  $a0, $t0, $t1
 /* 07B398 8007A798 10000009 */  b     .L8007A7C0
 /* 07B39C 8007A79C 00000000 */   nop   
+glabel L8007A7A0
 /* 07B3A0 8007A7A0 00035080 */  sll   $t2, $v1, 2
 /* 07B3A4 8007A7A4 01435021 */  addu  $t2, $t2, $v1
 /* 07B3A8 8007A7A8 000A5100 */  sll   $t2, $t2, 4
diff --git a/src/unknown_07AF10.c b/src/unknown_07AF10.c
index 3a109177..0e7ba2df 100644
--- a/src/unknown_07AF10.c
+++ b/src/unknown_07AF10.c
@@ -43,17 +43,6 @@ const char D_800E7A68[] = "640 by 480 Anti-aliased, Interlaced.\n";
 const char D_800E7A90[] = "640 by 480 Point sampled, Interlaced, De-flickered.\n";
 const char D_800E7AC8[] = "640 by 480 Anti-aliased, Interlaced, De-flickered.\n";
 
-const FloatLiteral D_800E7AFC = { 1.21212125f };
-const FloatLiteral D_800E7B00 = { 1.1f };
-const FloatLiteral D_800E7B04 = { 1.33333333f };
-const FloatLiteral D_800E7B08 = { 1.33333333f };
-
-// Jump table in func_8007A550
-const u32 D_800E7B0C[] = {
-    0x8007A5AC, 0x8007A5D0, 0x8007A658, 0x8007A6C0, 
-    0x8007A728, 0x8007A750, 0x8007A778, 0x8007A7A0
-};
-
 /*********************************/
 
 /************ .bss ************/