From 3172daa2ea208e74c23f8e2d29403fc774d9823e Mon Sep 17 00:00:00 2001
From: MegaMech <MegaMech@users.noreply.github.com>
Date: Tue, 6 Dec 2022 19:25:16 -0700
Subject: [PATCH] Matches in external and some namings in ceremony (#281)

* Matches in external and some namings in ceremony
---
 .../audio/external/func_800C8EAC.s            |  20 --
 .../audio/external/func_800C8EF8.s            |  20 --
 .../audio/external/func_800C8F44.s            |  16 --
 .../audio/external/func_800C9EF4.s            |  43 ---
 .../audio/external/func_800C9F90.s            |  33 ---
 .../audio/external/func_800CA008.s            |  41 ---
 .../audio/external/func_800CA0E4.s            |  14 -
 .../audio/external/func_800CA24C.s            |  10 -
 .../audio/external/func_800CA288.s            |  13 -
 .../audio/external/func_800CA2B8.s            |  12 -
 .../audio/external/func_800CA330.s            |  23 --
 .../audio/external/func_800CA388.s            |  36 ---
 .../audio/external/func_800CA414.s            |  36 ---
 .../audio/external/func_800CA49C.s            |  69 -----
 .../audio/external/func_800CAACC.s            |  34 ---
 .../audio/external/play_sound2.s              |  43 ---
 src/audio/external.c                          | 251 +++++-------------
 src/audio/external.h                          |  14 +-
 src/camera_junk.c                             |   2 +-
 src/ceremony_and_credits.c                    | 137 +++++-----
 src/ceremony_and_credits.h                    |   2 +-
 src/code_8001F980.c                           |   2 +-
 src/code_80280000.c                           |   4 +-
 src/code_80281C40.c                           |   2 +-
 src/spawn_players.c                           |   2 +-
 25 files changed, 151 insertions(+), 728 deletions(-)
 delete mode 100644 asm/non_matchings/audio/external/func_800C8EAC.s
 delete mode 100644 asm/non_matchings/audio/external/func_800C8EF8.s
 delete mode 100644 asm/non_matchings/audio/external/func_800C8F44.s
 delete mode 100644 asm/non_matchings/audio/external/func_800C9EF4.s
 delete mode 100644 asm/non_matchings/audio/external/func_800C9F90.s
 delete mode 100644 asm/non_matchings/audio/external/func_800CA008.s
 delete mode 100644 asm/non_matchings/audio/external/func_800CA0E4.s
 delete mode 100644 asm/non_matchings/audio/external/func_800CA24C.s
 delete mode 100644 asm/non_matchings/audio/external/func_800CA288.s
 delete mode 100644 asm/non_matchings/audio/external/func_800CA2B8.s
 delete mode 100644 asm/non_matchings/audio/external/func_800CA330.s
 delete mode 100644 asm/non_matchings/audio/external/func_800CA388.s
 delete mode 100644 asm/non_matchings/audio/external/func_800CA414.s
 delete mode 100644 asm/non_matchings/audio/external/func_800CA49C.s
 delete mode 100644 asm/non_matchings/audio/external/func_800CAACC.s
 delete mode 100644 asm/non_matchings/audio/external/play_sound2.s

diff --git a/asm/non_matchings/audio/external/func_800C8EAC.s b/asm/non_matchings/audio/external/func_800C8EAC.s
deleted file mode 100644
index 304e42cca..000000000
--- a/asm/non_matchings/audio/external/func_800C8EAC.s
+++ /dev/null
@@ -1,20 +0,0 @@
-glabel func_800C8EAC
-/* 0C9AAC 800C8EAC 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 0C9AB0 800C8EB0 AFA40030 */  sw    $a0, 0x30($sp)
-/* 0C9AB4 800C8EB4 97A40032 */  lhu   $a0, 0x32($sp)
-/* 0C9AB8 800C8EB8 3C010001 */  lui   $at, 1
-/* 0C9ABC 800C8EBC AFBF002C */  sw    $ra, 0x2c($sp)
-/* 0C9AC0 800C8EC0 AFBE0028 */  sw    $fp, 0x28($sp)
-/* 0C9AC4 800C8EC4 00817025 */  or    $t6, $a0, $at
-/* 0C9AC8 800C8EC8 03A0F025 */  move  $fp, $sp
-/* 0C9ACC 800C8ECC 0C030D12 */  jal   func_800C3448
-/* 0C9AD0 800C8ED0 01C02025 */   move  $a0, $t6
-/* 0C9AD4 800C8ED4 97CF0032 */  lhu   $t7, 0x32($fp)
-/* 0C9AD8 800C8ED8 3C01800F */  lui   $at, %hi(D_800EA15C) # $at, 0x800f
-/* 0C9ADC 800C8EDC 03C0E825 */  move  $sp, $fp
-/* 0C9AE0 800C8EE0 A42FA15C */  sh    $t7, %lo(D_800EA15C)($at)
-/* 0C9AE4 800C8EE4 8FDF002C */  lw    $ra, 0x2c($fp)
-/* 0C9AE8 800C8EE8 8FDE0028 */  lw    $fp, 0x28($fp)
-/* 0C9AEC 800C8EEC 27BD0030 */  addiu $sp, $sp, 0x30
-/* 0C9AF0 800C8EF0 03E00008 */  jr    $ra
-/* 0C9AF4 800C8EF4 00000000 */   nop   
diff --git a/asm/non_matchings/audio/external/func_800C8EF8.s b/asm/non_matchings/audio/external/func_800C8EF8.s
deleted file mode 100644
index 07386eb1b..000000000
--- a/asm/non_matchings/audio/external/func_800C8EF8.s
+++ /dev/null
@@ -1,20 +0,0 @@
-glabel func_800C8EF8
-/* 0C9AF8 800C8EF8 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 0C9AFC 800C8EFC AFA40030 */  sw    $a0, 0x30($sp)
-/* 0C9B00 800C8F00 97A40032 */  lhu   $a0, 0x32($sp)
-/* 0C9B04 800C8F04 3C010101 */  lui   $at, 0x101
-/* 0C9B08 800C8F08 AFBF002C */  sw    $ra, 0x2c($sp)
-/* 0C9B0C 800C8F0C AFBE0028 */  sw    $fp, 0x28($sp)
-/* 0C9B10 800C8F10 00817025 */  or    $t6, $a0, $at
-/* 0C9B14 800C8F14 03A0F025 */  move  $fp, $sp
-/* 0C9B18 800C8F18 0C030D12 */  jal   func_800C3448
-/* 0C9B1C 800C8F1C 01C02025 */   move  $a0, $t6
-/* 0C9B20 800C8F20 97CF0032 */  lhu   $t7, 0x32($fp)
-/* 0C9B24 800C8F24 3C01800F */  lui   $at, %hi(D_800EA160) # $at, 0x800f
-/* 0C9B28 800C8F28 03C0E825 */  move  $sp, $fp
-/* 0C9B2C 800C8F2C A42FA160 */  sh    $t7, %lo(D_800EA160)($at)
-/* 0C9B30 800C8F30 8FDF002C */  lw    $ra, 0x2c($fp)
-/* 0C9B34 800C8F34 8FDE0028 */  lw    $fp, 0x28($fp)
-/* 0C9B38 800C8F38 27BD0030 */  addiu $sp, $sp, 0x30
-/* 0C9B3C 800C8F3C 03E00008 */  jr    $ra
-/* 0C9B40 800C8F40 00000000 */   nop   
diff --git a/asm/non_matchings/audio/external/func_800C8F44.s b/asm/non_matchings/audio/external/func_800C8F44.s
deleted file mode 100644
index 367be9cd4..000000000
--- a/asm/non_matchings/audio/external/func_800C8F44.s
+++ /dev/null
@@ -1,16 +0,0 @@
-glabel func_800C8F44
-/* 0C9B44 800C8F44 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 0C9B48 800C8F48 AFBF002C */  sw    $ra, 0x2c($sp)
-/* 0C9B4C 800C8F4C AFBE0028 */  sw    $fp, 0x28($sp)
-/* 0C9B50 800C8F50 AFA40030 */  sw    $a0, 0x30($sp)
-/* 0C9B54 800C8F54 308600FF */  andi  $a2, $a0, 0xff
-/* 0C9B58 800C8F58 03A0F025 */  move  $fp, $sp
-/* 0C9B5C 800C8F5C 00002025 */  move  $a0, $zero
-/* 0C9B60 800C8F60 00002825 */  move  $a1, $zero
-/* 0C9B64 800C8F64 0C030DB1 */  jal   func_800C36C4
-/* 0C9B68 800C8F68 24070001 */   li    $a3, 1
-/* 0C9B6C 800C8F6C 8FDF002C */  lw    $ra, 0x2c($fp)
-/* 0C9B70 800C8F70 03C0E825 */  move  $sp, $fp
-/* 0C9B74 800C8F74 8FDE0028 */  lw    $fp, 0x28($fp)
-/* 0C9B78 800C8F78 03E00008 */  jr    $ra
-/* 0C9B7C 800C8F7C 27BD0030 */   addiu $sp, $sp, 0x30
diff --git a/asm/non_matchings/audio/external/func_800C9EF4.s b/asm/non_matchings/audio/external/func_800C9EF4.s
deleted file mode 100644
index 845e6fc11..000000000
--- a/asm/non_matchings/audio/external/func_800C9EF4.s
+++ /dev/null
@@ -1,43 +0,0 @@
-glabel func_800C9EF4
-/* 0CAAF4 800C9EF4 27BDFFC0 */  addiu $sp, $sp, -0x40
-/* 0CAAF8 800C9EF8 AFB30034 */  sw    $s3, 0x34($sp)
-/* 0CAAFC 800C9EFC 3C13800F */  lui   $s3, %hi(D_800EA1C0) # $s3, 0x800f
-/* 0CAB00 800C9F00 2673A1C0 */  addiu $s3, %lo(D_800EA1C0) # addiu $s3, $s3, -0x5e40
-/* 0CAB04 800C9F04 926E0000 */  lbu   $t6, ($s3)
-/* 0CAB08 800C9F08 AFBE0038 */  sw    $fp, 0x38($sp)
-/* 0CAB0C 800C9F0C AFB20030 */  sw    $s2, 0x30($sp)
-/* 0CAB10 800C9F10 AFB1002C */  sw    $s1, 0x2c($sp)
-/* 0CAB14 800C9F14 AFB00028 */  sw    $s0, 0x28($sp)
-/* 0CAB18 800C9F18 25CF0001 */  addiu $t7, $t6, 1
-/* 0CAB1C 800C9F1C 00A08825 */  move  $s1, $a1
-/* 0CAB20 800C9F20 00809025 */  move  $s2, $a0
-/* 0CAB24 800C9F24 03A0F025 */  move  $fp, $sp
-/* 0CAB28 800C9F28 AFBF003C */  sw    $ra, 0x3c($sp)
-/* 0CAB2C 800C9F2C 19E0000F */  blez  $t7, .L800C9F6C
-/* 0CAB30 800C9F30 00008025 */   move  $s0, $zero
-.L800C9F34:
-/* 0CAB34 800C9F34 02402025 */  move  $a0, $s2
-/* 0CAB38 800C9F38 0C03087A */  jal   func_800C21E8
-/* 0CAB3C 800C9F3C 02202825 */   move  $a1, $s1
-/* 0CAB40 800C9F40 10400003 */  beqz  $v0, .L800C9F50
-/* 0CAB44 800C9F44 00402025 */   move  $a0, $v0
-/* 0CAB48 800C9F48 0C03155E */  jal   func_800C5578
-/* 0CAB4C 800C9F4C 02202825 */   move  $a1, $s1
-.L800C9F50:
-/* 0CAB50 800C9F50 92790000 */  lbu   $t9, ($s3)
-/* 0CAB54 800C9F54 26100001 */  addiu $s0, $s0, 1
-/* 0CAB58 800C9F58 321800FF */  andi  $t8, $s0, 0xff
-/* 0CAB5C 800C9F5C 27280001 */  addiu $t0, $t9, 1
-/* 0CAB60 800C9F60 0308082A */  slt   $at, $t8, $t0
-/* 0CAB64 800C9F64 1420FFF3 */  bnez  $at, .L800C9F34
-/* 0CAB68 800C9F68 03008025 */   move  $s0, $t8
-.L800C9F6C:
-/* 0CAB6C 800C9F6C 8FDF003C */  lw    $ra, 0x3c($fp)
-/* 0CAB70 800C9F70 03C0E825 */  move  $sp, $fp
-/* 0CAB74 800C9F74 8FD00028 */  lw    $s0, 0x28($fp)
-/* 0CAB78 800C9F78 8FD1002C */  lw    $s1, 0x2c($fp)
-/* 0CAB7C 800C9F7C 8FD20030 */  lw    $s2, 0x30($fp)
-/* 0CAB80 800C9F80 8FD30034 */  lw    $s3, 0x34($fp)
-/* 0CAB84 800C9F84 8FDE0038 */  lw    $fp, 0x38($fp)
-/* 0CAB88 800C9F88 03E00008 */  jr    $ra
-/* 0CAB8C 800C9F8C 27BD0040 */   addiu $sp, $sp, 0x40
diff --git a/asm/non_matchings/audio/external/func_800C9F90.s b/asm/non_matchings/audio/external/func_800C9F90.s
deleted file mode 100644
index e46d98729..000000000
--- a/asm/non_matchings/audio/external/func_800C9F90.s
+++ /dev/null
@@ -1,33 +0,0 @@
-glabel func_800C9F90
-/* 0CAB90 800C9F90 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 0CAB94 800C9F94 AFBE0028 */  sw    $fp, 0x28($sp)
-/* 0CAB98 800C9F98 308E00FF */  andi  $t6, $a0, 0xff
-/* 0CAB9C 800C9F9C 03A0F025 */  move  $fp, $sp
-/* 0CABA0 800C9FA0 AFBF002C */  sw    $ra, 0x2c($sp)
-/* 0CABA4 800C9FA4 11C0000B */  beqz  $t6, .L800C9FD4
-/* 0CABA8 800C9FA8 AFA40030 */   sw    $a0, 0x30($sp)
-/* 0CABAC 800C9FAC 3C044900 */  lui   $a0, (0x49008005 >> 16) # lui $a0, 0x4900
-/* 0CABB0 800C9FB0 0C032384 */  jal   play_sound2
-/* 0CABB4 800C9FB4 34848005 */   ori   $a0, (0x49008005 & 0xFFFF) # ori $a0, $a0, 0x8005
-/* 0CABB8 800C9FB8 3C04F100 */  lui   $a0, 0xf100
-/* 0CABBC 800C9FBC 0C032EEE */  jal   func_800CBBB8
-/* 0CABC0 800C9FC0 00002825 */   move  $a1, $zero
-/* 0CABC4 800C9FC4 240F0001 */  li    $t7, 1
-/* 0CABC8 800C9FC8 3C01800F */  lui   $at, %hi(D_800EA16C) # $at, 0x800f
-/* 0CABCC 800C9FCC 10000009 */  b     .L800C9FF4
-/* 0CABD0 800C9FD0 A02FA16C */   sb    $t7, %lo(D_800EA16C)($at)
-.L800C9FD4:
-/* 0CABD4 800C9FD4 3C044900 */  lui   $a0, (0x49008006 >> 16) # lui $a0, 0x4900
-/* 0CABD8 800C9FD8 0C032384 */  jal   play_sound2
-/* 0CABDC 800C9FDC 34848006 */   ori   $a0, (0x49008006 & 0xFFFF) # ori $a0, $a0, 0x8006
-/* 0CABE0 800C9FE0 3C04F200 */  lui   $a0, 0xf200
-/* 0CABE4 800C9FE4 0C032EEE */  jal   func_800CBBB8
-/* 0CABE8 800C9FE8 00002825 */   move  $a1, $zero
-/* 0CABEC 800C9FEC 3C01800F */  lui   $at, %hi(D_800EA16C) # $at, 0x800f
-/* 0CABF0 800C9FF0 A020A16C */  sb    $zero, %lo(D_800EA16C)($at)
-.L800C9FF4:
-/* 0CABF4 800C9FF4 8FDF002C */  lw    $ra, 0x2c($fp)
-/* 0CABF8 800C9FF8 03C0E825 */  move  $sp, $fp
-/* 0CABFC 800C9FFC 8FDE0028 */  lw    $fp, 0x28($fp)
-/* 0CAC00 800CA000 03E00008 */  jr    $ra
-/* 0CAC04 800CA004 27BD0030 */   addiu $sp, $sp, 0x30
diff --git a/asm/non_matchings/audio/external/func_800CA008.s b/asm/non_matchings/audio/external/func_800CA008.s
deleted file mode 100644
index d5eee6e41..000000000
--- a/asm/non_matchings/audio/external/func_800CA008.s
+++ /dev/null
@@ -1,41 +0,0 @@
-glabel func_800CA008
-/* 0CAC08 800CA008 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 0CAC0C 800CA00C AFBF002C */  sw    $ra, 0x2c($sp)
-/* 0CAC10 800CA010 AFBE0028 */  sw    $fp, 0x28($sp)
-/* 0CAC14 800CA014 AFA40030 */  sw    $a0, 0x30($sp)
-/* 0CAC18 800CA018 AFA50034 */  sw    $a1, 0x34($sp)
-/* 0CAC1C 800CA01C 03A0F025 */  move  $fp, $sp
-/* 0CAC20 800CA020 00002825 */  move  $a1, $zero
-/* 0CAC24 800CA024 00002025 */  move  $a0, $zero
-/* 0CAC28 800CA028 2406007F */  li    $a2, 127
-/* 0CAC2C 800CA02C 0C030DB1 */  jal   func_800C36C4
-/* 0CAC30 800CA030 24070001 */   li    $a3, 1
-/* 0CAC34 800CA034 24040001 */  li    $a0, 1
-/* 0CAC38 800CA038 00002825 */  move  $a1, $zero
-/* 0CAC3C 800CA03C 2406007F */  li    $a2, 127
-/* 0CAC40 800CA040 0C030DB1 */  jal   func_800C36C4
-/* 0CAC44 800CA044 24070001 */   li    $a3, 1
-/* 0CAC48 800CA048 93C20037 */  lbu   $v0, 0x37($fp)
-/* 0CAC4C 800CA04C 28410004 */  slti  $at, $v0, 4
-/* 0CAC50 800CA050 14200008 */  bnez  $at, .L800CA074
-/* 0CAC54 800CA054 2401000C */   li    $at, 12
-/* 0CAC58 800CA058 10410003 */  beq   $v0, $at, .L800CA068
-/* 0CAC5C 800CA05C 24010004 */   li    $at, 4
-/* 0CAC60 800CA060 54410004 */  bnel  $v0, $at, .L800CA074
-/* 0CAC64 800CA064 24020004 */   li    $v0, 4
-.L800CA068:
-/* 0CAC68 800CA068 10000002 */  b     .L800CA074
-/* 0CAC6C 800CA06C 24020005 */   li    $v0, 5
-/* 0CAC70 800CA070 24020004 */  li    $v0, 4
-.L800CA074:
-/* 0CAC74 800CA074 93CE0033 */  lbu   $t6, 0x33($fp)
-/* 0CAC78 800CA078 3C01F000 */  lui   $at, 0xf000
-/* 0CAC7C 800CA07C 000E7A00 */  sll   $t7, $t6, 8
-/* 0CAC80 800CA080 01E1C025 */  or    $t8, $t7, $at
-/* 0CAC84 800CA084 0C030D12 */  jal   func_800C3448
-/* 0CAC88 800CA088 03022025 */   or    $a0, $t8, $v0
-/* 0CAC8C 800CA08C 8FDF002C */  lw    $ra, 0x2c($fp)
-/* 0CAC90 800CA090 03C0E825 */  move  $sp, $fp
-/* 0CAC94 800CA094 8FDE0028 */  lw    $fp, 0x28($fp)
-/* 0CAC98 800CA098 03E00008 */  jr    $ra
-/* 0CAC9C 800CA09C 27BD0030 */   addiu $sp, $sp, 0x30
diff --git a/asm/non_matchings/audio/external/func_800CA0E4.s b/asm/non_matchings/audio/external/func_800CA0E4.s
deleted file mode 100644
index fb02f509e..000000000
--- a/asm/non_matchings/audio/external/func_800CA0E4.s
+++ /dev/null
@@ -1,14 +0,0 @@
-glabel func_800CA0E4
-/* 0CACE4 800CA0E4 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 0CACE8 800CA0E8 AFBF002C */  sw    $ra, 0x2c($sp)
-/* 0CACEC 800CA0EC AFBE0028 */  sw    $fp, 0x28($sp)
-/* 0CACF0 800CA0F0 03A0F025 */  move  $fp, $sp
-/* 0CACF4 800CA0F4 0C03149E */  jal   func_800C5278
-/* 0CACF8 800CA0F8 24040003 */   li    $a0, 3
-/* 0CACFC 800CA0FC 0C03149E */  jal   func_800C5278
-/* 0CAD00 800CA100 24040005 */   li    $a0, 5
-/* 0CAD04 800CA104 8FDF002C */  lw    $ra, 0x2c($fp)
-/* 0CAD08 800CA108 03C0E825 */  move  $sp, $fp
-/* 0CAD0C 800CA10C 8FDE0028 */  lw    $fp, 0x28($fp)
-/* 0CAD10 800CA110 03E00008 */  jr    $ra
-/* 0CAD14 800CA114 27BD0030 */   addiu $sp, $sp, 0x30
diff --git a/asm/non_matchings/audio/external/func_800CA24C.s b/asm/non_matchings/audio/external/func_800CA24C.s
deleted file mode 100644
index f871adadd..000000000
--- a/asm/non_matchings/audio/external/func_800CA24C.s
+++ /dev/null
@@ -1,10 +0,0 @@
-glabel func_800CA24C
-/* 0CAE4C 800CA24C 27BDFFF0 */  addiu $sp, $sp, -0x10
-/* 0CAE50 800CA250 308E00FF */  andi  $t6, $a0, 0xff
-/* 0CAE54 800CA254 3C01800F */  lui   $at, %hi(D_800EA0EC)
-/* 0CAE58 800CA258 AFA40010 */  sw    $a0, 0x10($sp)
-/* 0CAE5C 800CA25C 002E0821 */  addu  $at, $at, $t6
-/* 0CAE60 800CA260 240F0002 */  li    $t7, 2
-/* 0CAE64 800CA264 A02FA0EC */  sb    $t7, %lo(D_800EA0EC)($at)
-/* 0CAE68 800CA268 03E00008 */  jr    $ra
-/* 0CAE6C 800CA26C 27BD0010 */   addiu $sp, $sp, 0x10
diff --git a/asm/non_matchings/audio/external/func_800CA288.s b/asm/non_matchings/audio/external/func_800CA288.s
deleted file mode 100644
index c279d16ca..000000000
--- a/asm/non_matchings/audio/external/func_800CA288.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_800CA288
-/* 0CAE88 800CA288 308E00FF */  andi  $t6, $a0, 0xff
-/* 0CAE8C 800CA28C 000EC900 */  sll   $t9, $t6, 4
-/* 0CAE90 800CA290 27BDFFF0 */  addiu $sp, $sp, -0x10
-/* 0CAE94 800CA294 032EC823 */  subu  $t9, $t9, $t6
-/* 0CAE98 800CA298 0019C880 */  sll   $t9, $t9, 2
-/* 0CAE9C 800CA29C 3C01800F */  lui   $at, %hi(D_800E9F90)
-/* 0CAEA0 800CA2A0 AFA40010 */  sw    $a0, 0x10($sp)
-/* 0CAEA4 800CA2A4 AFA50014 */  sw    $a1, 0x14($sp)
-/* 0CAEA8 800CA2A8 00390821 */  addu  $at, $at, $t9
-/* 0CAEAC 800CA2AC A0259F90 */  sb    $a1, %lo(D_800E9F90)($at)
-/* 0CAEB0 800CA2B0 03E00008 */  jr    $ra
-/* 0CAEB4 800CA2B4 27BD0010 */   addiu $sp, $sp, 0x10
diff --git a/asm/non_matchings/audio/external/func_800CA2B8.s b/asm/non_matchings/audio/external/func_800CA2B8.s
deleted file mode 100644
index 254aae2b8..000000000
--- a/asm/non_matchings/audio/external/func_800CA2B8.s
+++ /dev/null
@@ -1,12 +0,0 @@
-glabel func_800CA2B8
-/* 0CAEB8 800CA2B8 308E00FF */  andi  $t6, $a0, 0xff
-/* 0CAEBC 800CA2BC 000E7900 */  sll   $t7, $t6, 4
-/* 0CAEC0 800CA2C0 01EE7823 */  subu  $t7, $t7, $t6
-/* 0CAEC4 800CA2C4 27BDFFF0 */  addiu $sp, $sp, -0x10
-/* 0CAEC8 800CA2C8 000F7880 */  sll   $t7, $t7, 2
-/* 0CAECC 800CA2CC 3C01800F */  lui   $at, %hi(D_800E9F90)
-/* 0CAED0 800CA2D0 AFA40010 */  sw    $a0, 0x10($sp)
-/* 0CAED4 800CA2D4 002F0821 */  addu  $at, $at, $t7
-/* 0CAED8 800CA2D8 A0209F90 */  sb    $zero, %lo(D_800E9F90)($at)
-/* 0CAEDC 800CA2DC 03E00008 */  jr    $ra
-/* 0CAEE0 800CA2E0 27BD0010 */   addiu $sp, $sp, 0x10
diff --git a/asm/non_matchings/audio/external/func_800CA330.s b/asm/non_matchings/audio/external/func_800CA330.s
deleted file mode 100644
index 3ae5e30f4..000000000
--- a/asm/non_matchings/audio/external/func_800CA330.s
+++ /dev/null
@@ -1,23 +0,0 @@
-glabel func_800CA330
-/* 0CAF30 800CA330 27BDFFC8 */  addiu $sp, $sp, -0x38
-/* 0CAF34 800CA334 308500FF */  andi  $a1, $a0, 0xff
-/* 0CAF38 800CA338 3C011000 */  lui   $at, (0x100000FF >> 16) # lui $at, 0x1000
-/* 0CAF3C 800CA33C AFBF002C */  sw    $ra, 0x2c($sp)
-/* 0CAF40 800CA340 AFBE0028 */  sw    $fp, 0x28($sp)
-/* 0CAF44 800CA344 AFA40038 */  sw    $a0, 0x38($sp)
-/* 0CAF48 800CA348 342100FF */  ori   $at, (0x100000FF & 0xFFFF) # ori $at, $at, 0xff
-/* 0CAF4C 800CA34C 00051400 */  sll   $v0, $a1, 0x10
-/* 0CAF50 800CA350 03A0F025 */  move  $fp, $sp
-/* 0CAF54 800CA354 00412025 */  or    $a0, $v0, $at
-/* 0CAF58 800CA358 0C030D12 */  jal   func_800C3448
-/* 0CAF5C 800CA35C AFA20034 */   sw    $v0, 0x34($sp)
-/* 0CAF60 800CA360 8FC20034 */  lw    $v0, 0x34($fp)
-/* 0CAF64 800CA364 3C011100 */  lui   $at, (0x110000FF >> 16) # lui $at, 0x1100
-/* 0CAF68 800CA368 342100FF */  ori   $at, (0x110000FF & 0xFFFF) # ori $at, $at, 0xff
-/* 0CAF6C 800CA36C 0C030D12 */  jal   func_800C3448
-/* 0CAF70 800CA370 00412025 */   or    $a0, $v0, $at
-/* 0CAF74 800CA374 8FDF002C */  lw    $ra, 0x2c($fp)
-/* 0CAF78 800CA378 03C0E825 */  move  $sp, $fp
-/* 0CAF7C 800CA37C 8FDE0028 */  lw    $fp, 0x28($fp)
-/* 0CAF80 800CA380 03E00008 */  jr    $ra
-/* 0CAF84 800CA384 27BD0038 */   addiu $sp, $sp, 0x38
diff --git a/asm/non_matchings/audio/external/func_800CA388.s b/asm/non_matchings/audio/external/func_800CA388.s
deleted file mode 100644
index 53f22c8f1..000000000
--- a/asm/non_matchings/audio/external/func_800CA388.s
+++ /dev/null
@@ -1,36 +0,0 @@
-glabel func_800CA388
-/* 0CAF88 800CA388 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 0CAF8C 800CA38C AFB00024 */  sw    $s0, 0x24($sp)
-/* 0CAF90 800CA390 00808025 */  move  $s0, $a0
-/* 0CAF94 800CA394 00107040 */  sll   $t6, $s0, 1
-/* 0CAF98 800CA398 AFBF002C */  sw    $ra, 0x2c($sp)
-/* 0CAF9C 800CA39C AFBE0028 */  sw    $fp, 0x28($sp)
-/* 0CAFA0 800CA3A0 AFA40030 */  sw    $a0, 0x30($sp)
-/* 0CAFA4 800CA3A4 31D000FF */  andi  $s0, $t6, 0xff
-/* 0CAFA8 800CA3A8 03A0F025 */  move  $fp, $sp
-/* 0CAFAC 800CA3AC 3206FFFF */  andi  $a2, $s0, 0xffff
-/* 0CAFB0 800CA3B0 00002025 */  move  $a0, $zero
-/* 0CAFB4 800CA3B4 0C03162E */  jal   func_800C58B8
-/* 0CAFB8 800CA3B8 00002825 */   move  $a1, $zero
-/* 0CAFBC 800CA3BC 24040001 */  li    $a0, 1
-/* 0CAFC0 800CA3C0 00002825 */  move  $a1, $zero
-/* 0CAFC4 800CA3C4 0C03162E */  jal   func_800C58B8
-/* 0CAFC8 800CA3C8 3206FFFF */   andi  $a2, $s0, 0xffff
-/* 0CAFCC 800CA3CC 24040002 */  li    $a0, 2
-/* 0CAFD0 800CA3D0 00002825 */  move  $a1, $zero
-/* 0CAFD4 800CA3D4 0C03162E */  jal   func_800C58B8
-/* 0CAFD8 800CA3D8 3206FFFF */   andi  $a2, $s0, 0xffff
-/* 0CAFDC 800CA3DC 24040003 */  li    $a0, 3
-/* 0CAFE0 800CA3E0 00002825 */  move  $a1, $zero
-/* 0CAFE4 800CA3E4 0C03162E */  jal   func_800C58B8
-/* 0CAFE8 800CA3E8 3206FFFF */   andi  $a2, $s0, 0xffff
-/* 0CAFEC 800CA3EC 24040005 */  li    $a0, 5
-/* 0CAFF0 800CA3F0 00002825 */  move  $a1, $zero
-/* 0CAFF4 800CA3F4 0C03162E */  jal   func_800C58B8
-/* 0CAFF8 800CA3F8 3206FFFF */   andi  $a2, $s0, 0xffff
-/* 0CAFFC 800CA3FC 8FDF002C */  lw    $ra, 0x2c($fp)
-/* 0CB000 800CA400 03C0E825 */  move  $sp, $fp
-/* 0CB004 800CA404 8FD00024 */  lw    $s0, 0x24($fp)
-/* 0CB008 800CA408 8FDE0028 */  lw    $fp, 0x28($fp)
-/* 0CB00C 800CA40C 03E00008 */  jr    $ra
-/* 0CB010 800CA410 27BD0030 */   addiu $sp, $sp, 0x30
diff --git a/asm/non_matchings/audio/external/func_800CA414.s b/asm/non_matchings/audio/external/func_800CA414.s
deleted file mode 100644
index 5d045def4..000000000
--- a/asm/non_matchings/audio/external/func_800CA414.s
+++ /dev/null
@@ -1,36 +0,0 @@
-glabel func_800CA414
-/* 0CB014 800CA414 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 0CB018 800CA418 3C0E800F */  lui   $t6, %hi(D_800EA104) # $t6, 0x800f
-/* 0CB01C 800CA41C 91CEA104 */  lbu   $t6, %lo(D_800EA104)($t6)
-/* 0CB020 800CA420 AFBE0028 */  sw    $fp, 0x28($sp)
-/* 0CB024 800CA424 03A0F025 */  move  $fp, $sp
-/* 0CB028 800CA428 AFBF002C */  sw    $ra, 0x2c($sp)
-/* 0CB02C 800CA42C AFA40030 */  sw    $a0, 0x30($sp)
-/* 0CB030 800CA430 15C00012 */  bnez  $t6, .L800CA47C
-/* 0CB034 800CA434 AFA50034 */   sw    $a1, 0x34($sp)
-/* 0CB038 800CA438 0C030D42 */  jal   func_800C3508
-/* 0CB03C 800CA43C 00002025 */   move  $a0, $zero
-/* 0CB040 800CA440 3C013000 */  lui   $at, 0x3000
-/* 0CB044 800CA444 0C030D12 */  jal   func_800C3448
-/* 0CB048 800CA448 00412025 */   or    $a0, $v0, $at
-/* 0CB04C 800CA44C 0C030D7A */  jal   func_800C35E8
-/* 0CB050 800CA450 00002025 */   move  $a0, $zero
-/* 0CB054 800CA454 97C40036 */  lhu   $a0, 0x36($fp)
-/* 0CB058 800CA458 3C01C151 */  lui   $at, 0xc151
-/* 0CB05C 800CA45C 00817825 */  or    $t7, $a0, $at
-/* 0CB060 800CA460 0C030D12 */  jal   func_800C3448
-/* 0CB064 800CA464 01E02025 */   move  $a0, $t7
-/* 0CB068 800CA468 97C40032 */  lhu   $a0, 0x32($fp)
-/* 0CB06C 800CA46C 3C010100 */  lui   $at, 0x100
-/* 0CB070 800CA470 0081C025 */  or    $t8, $a0, $at
-/* 0CB074 800CA474 0C030D12 */  jal   func_800C3448
-/* 0CB078 800CA478 03002025 */   move  $a0, $t8
-.L800CA47C:
-/* 0CB07C 800CA47C 24190001 */  li    $t9, 1
-/* 0CB080 800CA480 3C01800F */  lui   $at, %hi(D_800EA104) # $at, 0x800f
-/* 0CB084 800CA484 A039A104 */  sb    $t9, %lo(D_800EA104)($at)
-/* 0CB088 800CA488 8FDF002C */  lw    $ra, 0x2c($fp)
-/* 0CB08C 800CA48C 03C0E825 */  move  $sp, $fp
-/* 0CB090 800CA490 8FDE0028 */  lw    $fp, 0x28($fp)
-/* 0CB094 800CA494 03E00008 */  jr    $ra
-/* 0CB098 800CA498 27BD0030 */   addiu $sp, $sp, 0x30
diff --git a/asm/non_matchings/audio/external/func_800CA49C.s b/asm/non_matchings/audio/external/func_800CA49C.s
deleted file mode 100644
index 59acdd184..000000000
--- a/asm/non_matchings/audio/external/func_800CA49C.s
+++ /dev/null
@@ -1,69 +0,0 @@
-glabel func_800CA49C
-/* 0CB09C 800CA49C 3C0F800F */  lui   $t7, %hi(D_800EA108) # $t7, 0x800f
-/* 0CB0A0 800CA4A0 91EFA108 */  lbu   $t7, %lo(D_800EA108)($t7)
-/* 0CB0A4 800CA4A4 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 0CB0A8 800CA4A8 AFBE0028 */  sw    $fp, 0x28($sp)
-/* 0CB0AC 800CA4AC AFA40030 */  sw    $a0, 0x30($sp)
-/* 0CB0B0 800CA4B0 308E00FF */  andi  $t6, $a0, 0xff
-/* 0CB0B4 800CA4B4 01C02025 */  move  $a0, $t6
-/* 0CB0B8 800CA4B8 03A0F025 */  move  $fp, $sp
-/* 0CB0BC 800CA4BC 15E00032 */  bnez  $t7, .L800CA588
-/* 0CB0C0 800CA4C0 AFBF002C */   sw    $ra, 0x2c($sp)
-/* 0CB0C4 800CA4C4 3C18800F */  lui   $t8, %hi(D_800EA1C0) # $t8, 0x800f
-/* 0CB0C8 800CA4C8 9318A1C0 */  lbu   $t8, %lo(D_800EA1C0)($t8)
-/* 0CB0CC 800CA4CC 3C051900 */  lui   $a1, (0x1900FF3A >> 16) # lui $a1, 0x1900
-/* 0CB0D0 800CA4D0 3C19800F */  lui   $t9, %hi(D_800EA164) # $t9, 0x800f
-/* 0CB0D4 800CA4D4 2B010002 */  slti  $at, $t8, 2
-/* 0CB0D8 800CA4D8 14200005 */  bnez  $at, .L800CA4F0
-/* 0CB0DC 800CA4DC 00000000 */   nop   
-/* 0CB0E0 800CA4E0 0C032418 */  jal   func_800C9060
-/* 0CB0E4 800CA4E4 34A5FF3A */   ori   $a1, (0x1900FF3A & 0xFFFF) # ori $a1, $a1, 0xff3a
-/* 0CB0E8 800CA4E8 10000022 */  b     .L800CA574
-/* 0CB0EC 800CA4EC 00000000 */   nop   
-.L800CA4F0:
-/* 0CB0F0 800CA4F0 9339A164 */  lbu   $t9, %lo(D_800EA164)($t9)
-/* 0CB0F4 800CA4F4 3C041001 */  lui   $a0, 0x1001
-/* 0CB0F8 800CA4F8 1320000E */  beqz  $t9, .L800CA534
-/* 0CB0FC 800CA4FC 00000000 */   nop   
-/* 0CB100 800CA500 3C041001 */  lui   $a0, (0x100100FF >> 16) # lui $a0, 0x1001
-/* 0CB104 800CA504 0C030D12 */  jal   func_800C3448
-/* 0CB108 800CA508 348400FF */   ori   $a0, (0x100100FF & 0xFFFF) # ori $a0, $a0, 0xff
-/* 0CB10C 800CA50C 3C041101 */  lui   $a0, (0x110100FF >> 16) # lui $a0, 0x1101
-/* 0CB110 800CA510 0C030D12 */  jal   func_800C3448
-/* 0CB114 800CA514 348400FF */   ori   $a0, (0x110100FF & 0xFFFF) # ori $a0, $a0, 0xff
-/* 0CB118 800CA518 0C0323BE */  jal   func_800C8EF8
-/* 0CB11C 800CA51C 2404000C */   li    $a0, 12
-/* 0CB120 800CA520 3C04C151 */  lui   $a0, (0xC15100FF >> 16) # lui $a0, 0xc151
-/* 0CB124 800CA524 0C030D12 */  jal   func_800C3448
-/* 0CB128 800CA528 34840011 */   ori   $a0, (0xC1510011 & 0xFFFF) # ori $a0, $a0, 0x11
-/* 0CB12C 800CA52C 10000011 */  b     .L800CA574
-/* 0CB130 800CA530 00000000 */   nop   
-.L800CA534:
-/* 0CB134 800CA534 0C030D12 */  jal   func_800C3448
-/* 0CB138 800CA538 348400FF */   ori   $a0, (0xC15100FF & 0xFFFF) # ori $a0, $a0, 0xff
-/* 0CB13C 800CA53C 3C041101 */  lui   $a0, (0x110100FF >> 16) # lui $a0, 0x1101
-/* 0CB140 800CA540 0C030D12 */  jal   func_800C3448
-/* 0CB144 800CA544 348400FF */   ori   $a0, (0x110100FF & 0xFFFF) # ori $a0, $a0, 0xff
-/* 0CB148 800CA548 0C0323BE */  jal   func_800C8EF8
-/* 0CB14C 800CA54C 2404000C */   li    $a0, 12
-/* 0CB150 800CA550 3C04800F */  lui   $a0, %hi(D_800EA15C) # $a0, 0x800f
-/* 0CB154 800CA554 9484A15C */  lhu   $a0, %lo(D_800EA15C)($a0)
-/* 0CB158 800CA558 3C01C150 */  lui   $at, 0xc150
-/* 0CB15C 800CA55C 00814025 */  or    $t0, $a0, $at
-/* 0CB160 800CA560 0C030D12 */  jal   func_800C3448
-/* 0CB164 800CA564 01002025 */   move  $a0, $t0
-/* 0CB168 800CA568 3C04C130 */  lui   $a0, (0xC130017D >> 16) # lui $a0, 0xc130
-/* 0CB16C 800CA56C 0C030D12 */  jal   func_800C3448
-/* 0CB170 800CA570 3484017D */   ori   $a0, (0xC130017D & 0xFFFF) # ori $a0, $a0, 0x17d
-.L800CA574:
-/* 0CB174 800CA574 3C028019 */  lui   $v0, %hi(D_8018FC08) # $v0, 0x8019
-/* 0CB178 800CA578 2442FC08 */  addiu $v0, %lo(D_8018FC08) # addiu $v0, $v0, -0x3f8
-/* 0CB17C 800CA57C 90490000 */  lbu   $t1, ($v0)
-/* 0CB180 800CA580 252A0001 */  addiu $t2, $t1, 1
-/* 0CB184 800CA584 A04A0000 */  sb    $t2, ($v0)
-.L800CA588:
-/* 0CB188 800CA588 8FDF002C */  lw    $ra, 0x2c($fp)
-/* 0CB18C 800CA58C 03C0E825 */  move  $sp, $fp
-/* 0CB190 800CA590 8FDE0028 */  lw    $fp, 0x28($fp)
-/* 0CB194 800CA594 03E00008 */  jr    $ra
-/* 0CB198 800CA598 27BD0030 */   addiu $sp, $sp, 0x30
diff --git a/asm/non_matchings/audio/external/func_800CAACC.s b/asm/non_matchings/audio/external/func_800CAACC.s
deleted file mode 100644
index d1e73fe37..000000000
--- a/asm/non_matchings/audio/external/func_800CAACC.s
+++ /dev/null
@@ -1,34 +0,0 @@
-glabel func_800CAACC
-/* 0CB6CC 800CAACC 3C0E800F */  lui   $t6, %hi(D_800EA108) # $t6, 0x800f
-/* 0CB6D0 800CAAD0 91CEA108 */  lbu   $t6, %lo(D_800EA108)($t6)
-/* 0CB6D4 800CAAD4 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 0CB6D8 800CAAD8 AFBE0028 */  sw    $fp, 0x28($sp)
-/* 0CB6DC 800CAADC 03A0F025 */  move  $fp, $sp
-/* 0CB6E0 800CAAE0 AFBF002C */  sw    $ra, 0x2c($sp)
-/* 0CB6E4 800CAAE4 AFA40030 */  sw    $a0, 0x30($sp)
-/* 0CB6E8 800CAAE8 15C00013 */  bnez  $t6, .L800CAB38
-/* 0CB6EC 800CAAEC 308600FF */   andi  $a2, $a0, 0xff
-/* 0CB6F0 800CAAF0 000678C0 */  sll   $t7, $a2, 3
-/* 0CB6F4 800CAAF4 01E67823 */  subu  $t7, $t7, $a2
-/* 0CB6F8 800CAAF8 000F7900 */  sll   $t7, $t7, 4
-/* 0CB6FC 800CAAFC 01E67823 */  subu  $t7, $t7, $a2
-/* 0CB700 800CAB00 000F7880 */  sll   $t7, $t7, 2
-/* 0CB704 800CAB04 01E67823 */  subu  $t7, $t7, $a2
-/* 0CB708 800CAB08 000F78C0 */  sll   $t7, $t7, 3
-/* 0CB70C 800CAB0C 3C19800F */  lui   $t9, %hi(gPlayers) # $t9, 0x800f
-/* 0CB710 800CAB10 27396990 */  addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990
-/* 0CB714 800CAB14 25F80014 */  addiu $t8, $t7, 0x14
-/* 0CB718 800CAB18 3C053102 */  lui   $a1, (0x31029008 >> 16) # lui $a1, 0x3102
-/* 0CB71C 800CAB1C 34A59008 */  ori   $a1, (0x31029008 & 0xFFFF) # ori $a1, $a1, 0x9008
-/* 0CB720 800CAB20 0C03087A */  jal   func_800C21E8
-/* 0CB724 800CAB24 03192021 */   addu  $a0, $t8, $t9
-/* 0CB728 800CAB28 3C053102 */  lui   $a1, (0x31029008 >> 16) # lui $a1, 0x3102
-/* 0CB72C 800CAB2C 34A59008 */  ori   $a1, (0x31029008 & 0xFFFF) # ori $a1, $a1, 0x9008
-/* 0CB730 800CAB30 0C03155E */  jal   func_800C5578
-/* 0CB734 800CAB34 00402025 */   move  $a0, $v0
-.L800CAB38:
-/* 0CB738 800CAB38 8FDF002C */  lw    $ra, 0x2c($fp)
-/* 0CB73C 800CAB3C 03C0E825 */  move  $sp, $fp
-/* 0CB740 800CAB40 8FDE0028 */  lw    $fp, 0x28($fp)
-/* 0CB744 800CAB44 03E00008 */  jr    $ra
-/* 0CB748 800CAB48 27BD0030 */   addiu $sp, $sp, 0x30
diff --git a/asm/non_matchings/audio/external/play_sound2.s b/asm/non_matchings/audio/external/play_sound2.s
deleted file mode 100644
index e33834fbf..000000000
--- a/asm/non_matchings/audio/external/play_sound2.s
+++ /dev/null
@@ -1,43 +0,0 @@
-glabel play_sound2
-/* 0C9A10 800C8E10 27BDFFC8 */  addiu $sp, $sp, -0x38
-/* 0C9A14 800C8E14 3C014900 */  lui   $at, (0x49008018 >> 16) # lui $at, 0x4900
-/* 0C9A18 800C8E18 AFBE0030 */  sw    $fp, 0x30($sp)
-/* 0C9A1C 800C8E1C 34218018 */  ori   $at, (0x49008018 & 0xFFFF) # ori $at, $at, 0x8018
-/* 0C9A20 800C8E20 03A0F025 */  move  $fp, $sp
-/* 0C9A24 800C8E24 14810008 */  bne   $a0, $at, .L800C8E48
-/* 0C9A28 800C8E28 AFBF0034 */   sw    $ra, 0x34($sp)
-/* 0C9A2C 800C8E2C 3C0E800E */  lui   $t6, %hi(gCurrentCourseId) # $t6, 0x800e
-/* 0C9A30 800C8E30 85CEC5A0 */  lh    $t6, %lo(gCurrentCourseId)($t6)
-/* 0C9A34 800C8E34 24010012 */  li    $at, 18
-/* 0C9A38 800C8E38 55C10004 */  bnel  $t6, $at, .L800C8E4C
-/* 0C9A3C 800C8E3C 3C014900 */   lui   $at, 0x4900
-/* 0C9A40 800C8E40 3C044900 */  lui   $a0, (0x49008027 >> 16) # lui $a0, 0x4900
-/* 0C9A44 800C8E44 34848027 */  ori   $a0, (0x49008027 & 0xFFFF) # ori $a0, $a0, 0x8027
-.L800C8E48:
-/* 0C9A48 800C8E48 3C014900 */  lui   $at, (0x49008019 >> 16) # lui $at, 0x4900
-.L800C8E4C:
-/* 0C9A4C 800C8E4C 34218019 */  ori   $at, (0x49008019 & 0xFFFF) # ori $at, $at, 0x8019
-/* 0C9A50 800C8E50 14810008 */  bne   $a0, $at, .L800C8E74
-/* 0C9A54 800C8E54 3C07800F */   lui   $a3, %hi(D_800EA1D4) # $a3, 0x800f
-/* 0C9A58 800C8E58 3C0F800E */  lui   $t7, %hi(gCurrentCourseId) # $t7, 0x800e
-/* 0C9A5C 800C8E5C 85EFC5A0 */  lh    $t7, %lo(gCurrentCourseId)($t7)
-/* 0C9A60 800C8E60 24010012 */  li    $at, 18
-/* 0C9A64 800C8E64 15E10003 */  bne   $t7, $at, .L800C8E74
-/* 0C9A68 800C8E68 00000000 */   nop   
-/* 0C9A6C 800C8E6C 3C044900 */  lui   $a0, (0x49008028 >> 16) # lui $a0, 0x4900
-/* 0C9A70 800C8E70 34848028 */  ori   $a0, (0x49008028 & 0xFFFF) # ori $a0, $a0, 0x8028
-.L800C8E74:
-/* 0C9A74 800C8E74 3C18800F */  lui   $t8, %hi(D_800EA1DC) # $t8, 0x800f
-/* 0C9A78 800C8E78 24E7A1D4 */  addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c
-/* 0C9A7C 800C8E7C 2718A1DC */  addiu $t8, %lo(D_800EA1DC) # addiu $t8, $t8, -0x5e24
-/* 0C9A80 800C8E80 3C05800F */  lui   $a1, %hi(D_800EA1C8) # $a1, 0x800f
-/* 0C9A84 800C8E84 24A5A1C8 */  addiu $a1, %lo(D_800EA1C8) # addiu $a1, $a1, -0x5e38
-/* 0C9A88 800C8E88 AFB80014 */  sw    $t8, 0x14($sp)
-/* 0C9A8C 800C8E8C AFA70010 */  sw    $a3, 0x10($sp)
-/* 0C9A90 800C8E90 0C031052 */  jal   play_sound
-/* 0C9A94 800C8E94 24060004 */   li    $a2, 4
-/* 0C9A98 800C8E98 8FDF0034 */  lw    $ra, 0x34($fp)
-/* 0C9A9C 800C8E9C 03C0E825 */  move  $sp, $fp
-/* 0C9AA0 800C8EA0 8FDE0030 */  lw    $fp, 0x30($fp)
-/* 0C9AA4 800C8EA4 03E00008 */  jr    $ra
-/* 0C9AA8 800C8EA8 27BD0038 */   addiu $sp, $sp, 0x38
diff --git a/src/audio/external.c b/src/audio/external.c
index a52059873..b8bc92f80 100644
--- a/src/audio/external.c
+++ b/src/audio/external.c
@@ -9,7 +9,7 @@
 #include "audio/data.h"
 #include <sounds.h>
 
-// REQUIRES void in the argument list to match properly
+// Requires void in the argument list to match properly.
 void func_800C13F0(void) {
 }
 
@@ -1250,7 +1250,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C3608.s")
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 extern ? D_801930D0;
 
-void func_800C36C4(s32 arg0, s32 arg1, s8 arg2, s8 arg3) {
+void func_800C36C4(s32 arg0, s32 arg1, u8 arg2, s8 arg3) {
     void *temp_v0;
 
     temp_v0 = ((arg0 & 0xFF) * 0x24C) + &D_801930D0;
@@ -4228,67 +4228,42 @@ void func_800C8CCC(void) {
 GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8CCC.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void play_sound(s32, ? *, ?, ? *, ? *, ? *); // extern
-extern ? D_800EA1C8;
-extern ? D_800EA1D4;
-extern ? D_800EA1DC;
+extern u8 D_800EA1D4;
 
-void play_sound2(s32 arg0) {
-    s32 phi_a0;
-    s32 phi_a0_2;
+void play_sound2(s32 soundBits) {
 
-    phi_a0 = arg0;
-    if ((arg0 == SOUND_ACTION_REV_ENGINE) && (gCurrentCourseId == 0x12)) {
-        phi_a0 = 0x49008027;
+    if ((soundBits == SOUND_ACTION_REV_ENGINE) && (gCurrentCourseId == 0x12)) {
+        soundBits = 0x49008027;
     }
-    phi_a0_2 = phi_a0;
-    if ((phi_a0 == SOUND_ACTION_REV_ENGINE_2) && (gCurrentCourseId == 0x12)) {
-        phi_a0_2 = 0x49008028;
+
+    if ((soundBits == SOUND_ACTION_REV_ENGINE_2) && (gCurrentCourseId == 0x12)) {
+        soundBits = 0x49008028;
     }
-    play_sound(phi_a0_2, &D_800EA1C8, 4, &D_800EA1D4, &D_800EA1D4, &D_800EA1DC);
+    play_sound(soundBits, &D_800EA1C8, 4, &D_800EA1D4, &D_800EA1D4, &D_800EA1DC);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/play_sound2.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_800C3448(s32); // extern
+void func_800C3448(s32);
 extern u16 D_800EA15C;
 
 void func_800C8EAC(u16 arg0) {
     func_800C3448(arg0 | 0x10000);
     D_800EA15C = arg0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8EAC.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_800C3448(s32); // extern
+void func_800C3448(s32);
 extern u16 D_800EA160;
 
 void func_800C8EF8(u16 arg0) {
     func_800C3448(arg0 | 0x1010000);
     D_800EA160 = arg0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8EF8.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_800C36C4(?, ?, s32, ?); // extern
 
-void func_800C8F44(s32 arg0) {
-    func_800C36C4(0, 0, arg0 & 0xFF, 1);
+void func_800C36C4(s32 arg0, s32 arg1, u8 arg2, s8 arg3);
+
+void func_800C8F44(u8 arg0) {
+    func_800C36C4(0, 0, arg0, 1);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8F44.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -4814,77 +4789,49 @@ void func_800C9D80(Vec3f position, Vec3f velocity, u32 soundBits) {
 GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9D80.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-s32 func_800C21E8(s32, ?); // extern
-void func_800C5578(s32, ?); // extern
-extern u8 D_800EA1C0;
 
-void func_800C9EF4(s32 arg0, ? arg1) {
-    s32 temp_t8;
-    s32 temp_v0;
-    s32 phi_s0;
+f32 *func_800C21E8(s32, s32);
+void func_800C5578(s32, s32);
 
-    phi_s0 = 0;
-    if ((D_800EA1C0 + 1) > 0) {
-        do {
-            temp_v0 = func_800C21E8(arg0, arg1);
-            if (temp_v0 != 0) {
-                func_800C5578(temp_v0, arg1);
-            }
-            temp_t8 = (phi_s0 + 1) & 0xFF;
-            phi_s0 = temp_t8;
-        } while (temp_t8 < (D_800EA1C0 + 1));
+void func_800C9EF4(s32 arg0, s32 arg1) {
+    f32 *temp;
+    u8 i;
+
+    for (i = 0; i < D_800EA1C0 + 1; i++) {
+        temp = func_800C21E8(arg0, arg1); 
+        if (temp != 0) {
+            func_800C5578(temp, arg1);
+        }
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9EF4.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_800CBBB8(?, ?); // extern
-void play_sound2(?); // extern
-extern s8 D_800EA16C;
-
-void func_800C9F90(s32 arg0) {
-    if ((arg0 & 0xFF) != 0) {
+void func_800C9F90(u8 arg0) {
+    if ((arg0) != 0) {
         play_sound2(SOUND_ACTION_GO_BACK_2);
         func_800CBBB8(0xF1000000, 0);
         D_800EA16C = 1;
-        return;
+    } else {
+        play_sound2(SOUND_ACTION_UNKNOWN_CONFIRMATION);
+        func_800CBBB8(0xF2000000, 0);
+        D_800EA16C = 0;
     }
-    play_sound2(SOUND_ACTION_UNKNOWN_CONFIRMATION);
-    func_800CBBB8(0xF2000000, 0);
-    D_800EA16C = 0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9F90.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_800C3448(s32); // extern
-void func_800C36C4(?, ?, ?, ?); // extern
 
 void func_800CA008(u8 arg0, u8 arg1) {
-    u8 phi_v0;
+   // u8 phi_v0;
 
     func_800C36C4(0, 0, 0x7F, 1);
     func_800C36C4(1, 0, 0x7F, 1);
-    phi_v0 = arg1;
+    //phi_v0 = arg1;
     if (arg1 >= 4) {
         if ((arg1 == 0xC) || (arg1 == 4)) {
-            phi_v0 = 5;
+            arg1 = 5;
         } else {
-            phi_v0 = 4;
+            arg1 = 4;
         }
     }
-    func_800C3448((arg0 << 8) | 0xF0000000 | phi_v0);
+    func_800C3448((arg0 << 8) | 0xF0000000 | arg1);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA008.s")
-#endif
 
 // With -framepointer active, you CANNOT put void
 // in the argument list, causes a minor stack difference
@@ -4900,17 +4847,10 @@ void func_800CA0CC() {
     D_800EA108 = 1;
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_800C5278(?); // extern
-
 void func_800CA0E4(void) {
     func_800C5278(3);
     func_800C5278(5);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA0E4.s")
-#endif
 
 #ifdef MIPS_TO_C
     switch(D_800EA1C0) {
@@ -4990,42 +4930,27 @@ void func_800CA118(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA118.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_800EA0EC;
+extern u8 D_800EA0EC[];
 
-void func_800CA24C(s32 arg0) {
-    *(&D_800EA0EC + (arg0 & 0xFF)) = 2;
+void func_800CA24C(u8 arg0) {
+    D_800EA0EC[arg0] = 2;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA24C.s")
-#endif
 
 void func_800CA270() {
     D_800EA0F4 = 1;
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_800E9F90;
+extern u8 D_800E9F90[];
 
-void func_800CA288(s32 arg0, s8 arg1) {
-    *(&D_800E9F90 + ((arg0 & 0xFF) * 0x3C)) = arg1;
+// appears to write u8 in list of f32s?
+// However, 0x3C is 0.0f which could likely get confused with `u8 = 0`;
+void func_800CA288(u8 arg0, s8 arg1) {
+    D_800E9F90[arg0 * 0x3C] = arg1; // * 0x3C
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA288.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_800E9F90;
-
-void func_800CA2B8(s32 arg0) {
-    *(&D_800E9F90 + ((arg0 & 0xFF) * 0x3C)) = 0;
+void func_800CA2B8(u8 arg0) {
+    D_800E9F90[arg0 * 0x3C] = 0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA2B8.s")
-#endif
 
 void func_800CA2E4(u8 arg0, s8 arg1) {
     D_800EA06C[arg0].unk0C = arg1;
@@ -5035,48 +4960,23 @@ void func_800CA30C(u8 arg0) {
     D_800EA06C[arg0].unk0C = 0;
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_800C3448(s32, s32); // extern
-
-void func_800CA330(s32 arg0) {
-    s32 sp34;
-    s32 temp_a1;
-    s32 temp_v0;
-
-    temp_a1 = arg0 & 0xFF;
-    temp_v0 = temp_a1 << 0x10;
-    sp34 = temp_v0;
-    func_800C3448(temp_v0 | 0x100000FF, temp_a1);
-    func_800C3448(temp_v0 | 0x110000FF);
+void func_800CA330(u8 arg0) {
+    func_800C3448(arg0 << 0x10 | 0x100000FF);
+    func_800C3448(arg0 << 0x10 | 0x110000FF);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA330.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_800C58B8(?, ?, s32); // extern
+void func_800C58B8(u8, u8, u16); // extern
 
-void func_800CA388(s32 arg0) {
-    s32 temp_s0;
-
-    temp_s0 = (arg0 * 2) & 0xFF;
-    func_800C58B8(0, 0, temp_s0 & 0xFFFF);
-    func_800C58B8(1, 0, temp_s0 & 0xFFFF);
-    func_800C58B8(2, 0, temp_s0 & 0xFFFF);
-    func_800C58B8(3, 0, temp_s0 & 0xFFFF);
-    func_800C58B8(5, 0, temp_s0 & 0xFFFF);
+void func_800CA388(u8 arg0) {
+    arg0 *= 2;
+    func_800C58B8(0, 0, arg0);
+    func_800C58B8(1, 0, arg0);
+    func_800C58B8(2, 0, arg0);
+    func_800C58B8(3, 0, arg0);
+    func_800C58B8(5, 0, arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA388.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_800C3448(s32); // extern
-s32 func_800C3508(?); // extern
-void func_800C35E8(?); // extern
+void func_800C3448(s32);
 extern u8 D_800EA104;
 
 void func_800CA414(u16 arg0, u16 arg1) {
@@ -5088,32 +4988,24 @@ void func_800CA414(u16 arg0, u16 arg1) {
     }
     D_800EA104 = 1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA414.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_800C3448(s32, ?); // extern
-void func_800C8EF8(?); // extern
-void func_800C9060(s32, ?); // extern
 extern u8 D_800EA108;
 extern u16 D_800EA15C;
 extern u8 D_800EA164;
 extern u8 D_800EA1C0;
 extern u8 D_8018FC08;
 
-void func_800CA49C(s32 arg0) {
+void func_800CA49C(u8 arg0) {
     if (D_800EA108 == 0) {
         if (D_800EA1C0 >= 2) {
-            func_800C9060(arg0 & 0xFF, 0x1900FF3A);
+            func_800C9060(arg0, 0x1900FF3A);
         } else if (D_800EA164 != 0) {
-            func_800C3448(0x100100FF, 0x19000000);
+            func_800C3448(0x100100FF); // 0x19000000
             func_800C3448(0x110100FF);
             func_800C8EF8(0xC);
             func_800C3448(0xC1510011);
         } else {
-            func_800C3448(0x100100FF, 0x19000000);
+            func_800C3448(0x100100FF); //0x19000000
             func_800C3448(0x110100FF);
             func_800C8EF8(0xC);
             func_800C3448(D_800EA15C | 0xC1500000);
@@ -5122,9 +5014,6 @@ void func_800CA49C(s32 arg0) {
         D_8018FC08 = D_8018FC08 + 1;
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA49C.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -5286,19 +5175,11 @@ void func_800CA984(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA984.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c
-? func_800C5578(f32 *, ?);                          /* extern */
-s8 D_800EA108 = 0;                                  /* const */
-
-void func_800CAACC(s32 playerId) {
+void func_800CAACC(u8 playerId) {
     if ((u8) D_800EA108 == 0) {
-        func_800C5578(func_800C21E8(((playerId & 0xFF) * 0xDD8) + 0x14 + gPlayers, 0x31029008U), 0x31029008);
+        func_800C5578(func_800C21E8(gPlayers[playerId].pos, 0x31029008U), 0x31029008);
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAACC.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
diff --git a/src/audio/external.h b/src/audio/external.h
index b6de6ca09..bed5980a0 100644
--- a/src/audio/external.h
+++ b/src/audio/external.h
@@ -96,7 +96,7 @@ struct Unk_8018EFD8 *func_800C1C88(u8, Vec3f, Vec3f, f32*, u8, u32);
 void func_800C1DA4(Camera*, Vec3s, struct Unk_8018EFD8*);
 void func_800C1E2C(Camera*, Vec3f, struct Unk_8018EFD8*);
 void func_800C1F8C();
-f32 *func_800C21E8(f32*, u32);
+f32 *func_800C21E8(s32, s32);
 void func_800C4084(u16);
 void play_sound(u32, f32*, u8, f32*, f32*, u8*);
 void func_800C41CC(u8, struct Unk_80191420*);
@@ -108,7 +108,7 @@ void func_800C8770(u8);
 void func_800C89E4();
 void play_sound2(s32);
 void func_800C8EAC(u16);
-void func_800C8EF8();
+void func_800C8EF8(u16);
 void func_800C9060(u8, u32);
 void func_800C90F4(u8, uintptr_t);
 void func_800CA008(u8, u8);
@@ -119,11 +119,9 @@ void func_800CA118();
 void func_800CA270();
 void func_800CA2E4(u8, s8);
 void func_800CA30C(u8);
-void func_800CA330();
-void func_800CA330(s32);
-void func_800CA388();
-void func_800CA388(s32);
-void func_800CA49C();
+void func_800CA330(u8);
+void func_800CA388(u8);
+void func_800CA49C(u8);
 void func_800CB134();
 void func_800CB2C4(void);
 
@@ -171,4 +169,6 @@ extern Vec3f D_800EA1C8;// = {0.0f, 0.0f, 0.0f}
 extern u8 D_800EA1DC;// = 0;
 extern u8 D_800EA244;
 
+extern s8 D_800EA16C;
+
 #endif
diff --git a/src/camera_junk.c b/src/camera_junk.c
index aa2500f73..0a3021ed2 100644
--- a/src/camera_junk.c
+++ b/src/camera_junk.c
@@ -37,5 +37,5 @@ void func_802816B8(void) {
     D_80150148 = 1.33333333f;
     D_80150150 = 3.0f;
     D_8015014C = 6800.0f;
-    func_80283430();
+    init_cinematic_camera();
 }
diff --git a/src/ceremony_and_credits.c b/src/ceremony_and_credits.c
index 04fedfd88..b0e176128 100644
--- a/src/ceremony_and_credits.c
+++ b/src/ceremony_and_credits.c
@@ -465,7 +465,7 @@ void func_80283240(s16 arg0) {
 }
 
 /**
- * Call the event while `start` <= gCutsceneTimer <= `end`
+ * Call the event while `start` <= gCutsceneShotTimer <= `end`
  * If `end` is -1, call for the rest of the shot.
  */
 s32 cutscene_event(CameraEvent event, struct CinematicCamera *camera, s16 start, s16 end) {
@@ -520,46 +520,47 @@ s32 func_80283428(void) {
     return 0;
 }
 
-void func_80283430(void) {
+void init_cinematic_camera(void) {
     s32 i;
-    struct CinematicCamera *new_var = &D_802876E0;
+    struct CinematicCamera *camera = &D_802876E0;
 
     D_802876D8 = 0;
-    new_var->cutscene = 0;
+    camera->cutscene = 0;
     D_802856C4 = (s32) D_800DC5E4;
-    vec3f_clear(new_var->lookAt);
-    vec3f_set_dupe(new_var->pos, 0.0f, 0.0f, 500.0f);
-    vec3f_clear(new_var->unk30);
-    vec3f_set_dupe(new_var->unk24, 0.0f, 0.0f, 500.0f);
-    vec3f_set_dupe(new_var->unk3C, 0.0f, 1.0f, 0.0f);
-    new_var->unk18 = 0.0f;
-    vec3s_clear(new_var->unk48);
-    vec3s_clear(new_var->unk4E);
-    vec3s_clear(new_var->unk54);
-    vec3s_clear(new_var->unk5A);
-    new_var->unk60 = 0;
-    new_var->unk64 = 0.0f;
-    new_var->unk68 = 0.0f;
-    new_var->unk6C = 0;
-    new_var->unk6E = 0;
-    new_var->unk20 = D_80150130[0];
+    vec3f_clear(camera->lookAt);
+    vec3f_set_dupe(camera->pos, 0.0f, 0.0f, 500.0f);
+    vec3f_clear(camera->unk30);
+    vec3f_set_dupe(camera->unk24, 0.0f, 0.0f, 500.0f);
+    vec3f_set_dupe(camera->unk3C, 0.0f, 1.0f, 0.0f);
+    camera->unk18 = 0.0f;
+    vec3s_clear(camera->unk48);
+    vec3s_clear(camera->unk4E);
+    vec3s_clear(camera->unk54);
+    vec3s_clear(camera->unk5A);
+    camera->unk60 = 0;
+    camera->unk64 = 0.0f;
+    camera->unk68 = 0.0f;
+    camera->unk6C = 0;
+    camera->unk6E = 0;
+    camera->unk20 = D_80150130[0];
     sCutsceneShot = 0;
     gCutsceneShotTimer = 0;
     D_802876D4 = 0;
     reset_spline();
-    for (i = 0; i < 32; i++)
-    {
+
+    for (i = 0; i < 32; i++) {
         D_80287818[i].unk0 = -1;
         D_80287998[i].unk0 = -1;
     }
 
-    for (i = 0; i < 10; i++)
-    {
+    for (i = 0; i < 10; i++) {
         vec3f_clear(D_80287750[i].unk0);
         vec3s_clear(D_80287750[i].unkC);
     }
+
     D_802856C0 = 0.0f;
-    if (gGamestate == 5) {
+
+    if (gGamestate == ENDING_SEQUENCE) {
         D_802856B0 = 120.0f;
         D_802856B4 = 12.0f;
         D_802856B8 = 120.0f;
@@ -617,7 +618,7 @@ s32 func_80283648(Camera *camera) {
         camera->up[2] = -sins(var_f2) * sins(sp6C);
         vec3f_copy_dupe(camera->pos, new_var->lookAt);
         vec3f_copy_dupe(camera->lookAt, new_var->pos);
-        if ((gGamestate == 9) && (gIsMirrorMode != 0)) {
+        if ((gGamestate == CREDITS_SEQUENCE) && (gIsMirrorMode != 0)) {
             camera->pos[0] = -camera->pos[0];
             camera->lookAt[0] = -camera->lookAt[0];
         }
@@ -1505,49 +1506,44 @@ u16 D_80286B34[] = {
 };
 
 void func_802847CC(struct CinematicCamera *camera) {
-   u16 sp2E;
-  u16 sp2C;
-  // D_802856B4 cast to u32 triggers cfc1.
-  sp2E = D_80286A04[D_800DC5E4].unkC - (10 - (-(((u16)(u32) D_802856B4))));
+    u16 sp2E;
+    u16 sp2C;
+    // D_802856B4 cast to u32 triggers cfc1.
+    sp2E = D_80286A04[D_800DC5E4].unkC - (10 - (-(((u16)(u32) D_802856B4))));
     sp2C = D_80286A04[D_800DC5E4].unkC;
-    //sp2E = 
-  cutscene_event(func_80283CD0, camera, 0, 0);
-  cutscene_event(play_sound_welcome, camera, 8, 8);
-  cutscene_event(func_80283C78, camera, 149, 149);
-  cutscene_event(func_80282434, camera, 0, 0);
-  switch (D_80286A04[D_800DC5E4].unk0)
-  {
-    case 1:
-      cutscene_event(func_802839CC, camera, 0, -1);
-      cutscene_event(func_802839E0, camera, sp2E - 0x14, sp2E - 0x14);
-      break;
 
-    case 2:
-      cutscene_event(func_802839B4, camera, 0, 0);
-      cutscene_event(play_sound_farewell, camera, 247, 247);
-      func_80282D90(camera, D_80286A04[D_800DC5E4].unk4, D_80286A04[D_800DC5E4].unk8, 0);
-      break;
+    cutscene_event(func_80283CD0, camera, 0, 0);
+    cutscene_event(play_sound_welcome, camera, 8, 8);
+    cutscene_event(func_80283C78, camera, 149, 149);
+    cutscene_event(func_80282434, camera, 0, 0);
+    switch (D_80286A04[D_800DC5E4].unk0) {
+        case 1:
+            cutscene_event(func_802839CC, camera, 0, -1);
+            cutscene_event(func_802839E0, camera, sp2E - 0x14, sp2E - 0x14);
+            break;
 
-    default:
-      cutscene_event(func_802839B4, camera, 0, 0);
-      cutscene_event(func_802839CC, camera, sp2E, sp2E);
-      cutscene_event(func_802839E0, camera, sp2E - 0x14, sp2E - 0x14);
-      func_80282D90(camera, D_80286A04[D_800DC5E4].unk4, D_80286A04[D_800DC5E4].unk8, 0);
-      break;
-
-  }
-
-  if (gCCSelection == 3)
-  {
-    sp2C = D_80286B34[D_800DC5E4];
-  }
-  if (gCutsceneShotTimer == sp2C)
-  {
-    if (D_80286A04[D_800DC5E4].unk0 != 2)
-    {
-      func_80280268(D_80286A04[D_800DC5E4 + 1].unk1);
+        case 2:
+            cutscene_event(func_802839B4, camera, 0, 0);
+            cutscene_event(play_sound_farewell, camera, 247, 247);
+            func_80282D90(camera, D_80286A04[D_800DC5E4].unk4, D_80286A04[D_800DC5E4].unk8, 0);
+            break;
+        default:
+            cutscene_event(func_802839B4, camera, 0, 0);
+            cutscene_event(func_802839CC, camera, sp2E, sp2E);
+            cutscene_event(func_802839E0, camera, sp2E - 0x14, sp2E - 0x14);
+            func_80282D90(camera, D_80286A04[D_800DC5E4].unk4, D_80286A04[D_800DC5E4].unk8, 0);
+            break;
+    }
+
+    if (gCCSelection == 3) {
+        sp2C = D_80286B34[D_800DC5E4];
+    }
+
+    if (gCutsceneShotTimer == sp2C) {    
+        if (D_80286A04[D_800DC5E4].unk0 != 2) {
+            func_80280268(D_80286A04[D_800DC5E4 + 1].unk1);
+        }
     }
-  }
 }
 
 // Start of credits cutscene?
@@ -1560,6 +1556,9 @@ struct struct_80284AE8 {
     u8 unk1C;
 };
 
+/**
+ * Play the current cutscene until either gCutsceneShotTimer reaches the max time, or c->cutscene is set to 0
+ */
 void play_cutscene(struct CinematicCamera *camera) {
     s32 pad[3];
     s16 cutsceneDuration;
@@ -1610,7 +1609,13 @@ void play_cutscene(struct CinematicCamera *camera) {
     
 }
 
-void func_80284CC0(void) {
+/**
+ * Scene transition
+ * 
+ * Sliding black borders that open horizontally to display scene.
+ * Used at the beginning of award ceremony and throughout credits.
+ */
+void transition_sliding_borders(void) {
     f32 temp_f0;
     f32 temp_f14;
 
diff --git a/src/ceremony_and_credits.h b/src/ceremony_and_credits.h
index 48841436f..c79bd8940 100644
--- a/src/ceremony_and_credits.h
+++ b/src/ceremony_and_credits.h
@@ -197,7 +197,7 @@ void func_802846B4(struct CinematicCamera*);
 void func_802846E4(struct CinematicCamera*);
 void func_802847CC(struct CinematicCamera*);
 void play_cutscene(struct CinematicCamera*);
-void func_80284CC0();
+void transition_sliding_borders();
 
 /* This is where I'd put my static data, if I had any */
 
diff --git a/src/code_8001F980.c b/src/code_8001F980.c
index 85382bb02..5b47dbef0 100644
--- a/src/code_8001F980.c
+++ b/src/code_8001F980.c
@@ -667,7 +667,7 @@ void func_80021B0C(void) {
         func_8006E7CC(gPlayerSeven, 6, 0);
         func_8006E7CC(gPlayerEight, 7, 0);
     }
-    if (gGamestate == 5) {
+    if (gGamestate == ENDING_SEQUENCE) {
         if (gPlayerOne->unk_044 & 0x2000) {
             func_80024374(gPlayerOne, 0, 0);
         }
diff --git a/src/code_80280000.c b/src/code_80280000.c
index 80194bcdc..78488f691 100644
--- a/src/code_80280000.c
+++ b/src/code_80280000.c
@@ -45,7 +45,7 @@ void func_80280038(void) {
     func_802A3008(D_800DC5EC);
     func_80058090(0);
     func_80058538(0);
-    func_80284CC0();
+    transition_sliding_borders();
     func_80281C40();
     init_rdp();
     func_80093F10();
@@ -140,7 +140,7 @@ void load_credits(void) {
     camera->up[0] = 0.0f;
     camera->up[1] = 1.0f;
     camera->up[2] = 0.0f;
-    func_80283430();
+    init_cinematic_camera();
     func_80003040();
     func_8006E9C0();
     func_80093E60();
diff --git a/src/code_80281C40.c b/src/code_80281C40.c
index 0e9434959..481086a40 100644
--- a/src/code_80281C40.c
+++ b/src/code_80281C40.c
@@ -63,7 +63,7 @@ void func_80281D00(void) {
     func_80021B0C();
     gSPDisplayList(gDisplayListHead++, &D_00284EE0);
     func_80093F10();
-    func_80284CC0();
+    transition_sliding_borders();
     func_80281C40();
     init_rdp();
 }
diff --git a/src/spawn_players.c b/src/spawn_players.c
index d06a477a0..a66443c48 100644
--- a/src/spawn_players.c
+++ b/src/spawn_players.c
@@ -1038,7 +1038,7 @@ void func_8003D080(void) {
     Player* ptr = &gPlayers[0];
 
     func_8005D290();
-    if (gGamestate == 5) {
+    if (gGamestate == ENDING_SEQUENCE) {
         func_8003CD78();
     } else {
         func_8003C0F0();