From 42b81c1979fd27448c6ca3d9c4b3d99650b14ded Mon Sep 17 00:00:00 2001
From: MegaMech <MegaMech@users.noreply.github.com>
Date: Sat, 9 Jul 2022 03:37:17 -0600
Subject: [PATCH] Decomp various small funcs (#240)

---
 .../code_80005FD0/func_800148C4.s             |  19 --
 .../code_80005FD0/func_8001490C.s             |  11 -
 .../code_80005FD0/func_80014A18.s             |  19 --
 .../code_80005FD0/func_80014A60.s             |  11 -
 .../code_80005FD0/func_80014B6C.s             |  19 --
 .../code_80005FD0/func_80014BB4.s             |  11 -
 .../code_80005FD0/func_80014CC0.s             |  19 --
 .../code_80005FD0/func_80014D08.s             |  11 -
 .../code_8001F980/func_80022598.s             |  14 --
 .../code_800431B0/func_8005327C.s             |  11 -
 .../code_800431B0/func_80056160.s             |  11 -
 .../code_80057C60/func_8005C64C.s             |  13 --
 .../code_80071F00/func_80077B14.s             |  11 -
 .../code_80071F00/func_80079054.s             |  13 --
 .../code_80071F00/func_80079084.s             |  13 --
 .../code_80071F00/func_800790B4.s             |  13 --
 .../code_80071F00/func_800790E4.s             |  13 --
 .../code_80071F00/func_8007D8AC.s             |  11 -
 .../code_80071F00/func_8007DA4C.s             |  11 -
 .../code_80071F00/func_80085080.s             |  13 --
 .../code_80086E70/func_80086E70.s             |  16 --
 .../code_80086E70/func_80086EAC.s             |  18 --
 .../code_80086E70/func_80086F10.s             |  21 --
 .../code_80086E70/func_80086F60.s             |  18 --
 .../code_80086E70/func_80086FA4.s             |  14 --
 .../code_80086E70/func_80086FD4.s             |  19 --
 .../code_80086E70/func_8008701C.s             |  18 --
 .../code_80086E70/func_8008781C.s             |  11 -
 .../code_80086E70/func_80087844.s             |  24 --
 .../code_80086E70/func_80088150.s             |  11 -
 .../code_80086E70/func_80088FF0.s             |  14 --
 .../code_80086E70/func_8008B44C.s             |  12 -
 .../code_80091750/func_80093A30.s             |  12 -
 .../code_80091750/func_80094660.s             |  86 --------
 .../code_80091750/func_800959A0.s             |  12 -
 .../code_80091750/func_800959CC.s             |  12 -
 asm/non_matchings/memory/func_802A7CF0.s      |  12 -
 include/common_structs.h                      |   9 +-
 src/code_80005FD0.c                           | 116 +++-------
 src/code_800431B0.c                           |  14 --
 src/code_80057C60.c                           |  19 +-
 src/code_80071F00.c                           |  81 +------
 src/code_80086E70.c                           | 208 ++++++------------
 src/code_80091750.c                           |  34 +--
 44 files changed, 133 insertions(+), 945 deletions(-)
 delete mode 100644 asm/non_matchings/code_80005FD0/func_800148C4.s
 delete mode 100644 asm/non_matchings/code_80005FD0/func_8001490C.s
 delete mode 100644 asm/non_matchings/code_80005FD0/func_80014A18.s
 delete mode 100644 asm/non_matchings/code_80005FD0/func_80014A60.s
 delete mode 100644 asm/non_matchings/code_80005FD0/func_80014B6C.s
 delete mode 100644 asm/non_matchings/code_80005FD0/func_80014BB4.s
 delete mode 100644 asm/non_matchings/code_80005FD0/func_80014CC0.s
 delete mode 100644 asm/non_matchings/code_80005FD0/func_80014D08.s
 delete mode 100644 asm/non_matchings/code_8001F980/func_80022598.s
 delete mode 100644 asm/non_matchings/code_800431B0/func_8005327C.s
 delete mode 100644 asm/non_matchings/code_800431B0/func_80056160.s
 delete mode 100644 asm/non_matchings/code_80057C60/func_8005C64C.s
 delete mode 100644 asm/non_matchings/code_80071F00/func_80077B14.s
 delete mode 100644 asm/non_matchings/code_80071F00/func_80079054.s
 delete mode 100644 asm/non_matchings/code_80071F00/func_80079084.s
 delete mode 100644 asm/non_matchings/code_80071F00/func_800790B4.s
 delete mode 100644 asm/non_matchings/code_80071F00/func_800790E4.s
 delete mode 100644 asm/non_matchings/code_80071F00/func_8007D8AC.s
 delete mode 100644 asm/non_matchings/code_80071F00/func_8007DA4C.s
 delete mode 100644 asm/non_matchings/code_80071F00/func_80085080.s
 delete mode 100644 asm/non_matchings/code_80086E70/func_80086E70.s
 delete mode 100644 asm/non_matchings/code_80086E70/func_80086EAC.s
 delete mode 100644 asm/non_matchings/code_80086E70/func_80086F10.s
 delete mode 100644 asm/non_matchings/code_80086E70/func_80086F60.s
 delete mode 100644 asm/non_matchings/code_80086E70/func_80086FA4.s
 delete mode 100644 asm/non_matchings/code_80086E70/func_80086FD4.s
 delete mode 100644 asm/non_matchings/code_80086E70/func_8008701C.s
 delete mode 100644 asm/non_matchings/code_80086E70/func_8008781C.s
 delete mode 100644 asm/non_matchings/code_80086E70/func_80087844.s
 delete mode 100644 asm/non_matchings/code_80086E70/func_80088150.s
 delete mode 100644 asm/non_matchings/code_80086E70/func_80088FF0.s
 delete mode 100644 asm/non_matchings/code_80086E70/func_8008B44C.s
 delete mode 100644 asm/non_matchings/code_80091750/func_80093A30.s
 delete mode 100644 asm/non_matchings/code_80091750/func_80094660.s
 delete mode 100644 asm/non_matchings/code_80091750/func_800959A0.s
 delete mode 100644 asm/non_matchings/code_80091750/func_800959CC.s
 delete mode 100644 asm/non_matchings/memory/func_802A7CF0.s

diff --git a/asm/non_matchings/code_80005FD0/func_800148C4.s b/asm/non_matchings/code_80005FD0/func_800148C4.s
deleted file mode 100644
index ec7f504de..000000000
--- a/asm/non_matchings/code_80005FD0/func_800148C4.s
+++ /dev/null
@@ -1,19 +0,0 @@
-glabel func_800148C4
-/* 0154C4 800148C4 27BDFFD8 */  addiu $sp, $sp, -0x28
-/* 0154C8 800148C8 3C014148 */  li    $at, 0x41480000 # 12.500000
-/* 0154CC 800148CC 44812000 */  mtc1  $at, $f4
-/* 0154D0 800148D0 3C0F5101 */  lui   $t7, (0x51018003 >> 16) # lui $t7, 0x5101
-/* 0154D4 800148D4 AFBF0024 */  sw    $ra, 0x24($sp)
-/* 0154D8 800148D8 35EF8003 */  ori   $t7, (0x51018003 & 0xFFFF) # ori $t7, $t7, 0x8003
-/* 0154DC 800148DC 3C068016 */  lui   $a2, %hi(D_80163818) # $a2, 0x8016
-/* 0154E0 800148E0 240E0007 */  li    $t6, 7
-/* 0154E4 800148E4 AFAE0014 */  sw    $t6, 0x14($sp)
-/* 0154E8 800148E8 24C63818 */  addiu $a2, %lo(D_80163818) # addiu $a2, $a2, 0x3818
-/* 0154EC 800148EC AFAF0018 */  sw    $t7, 0x18($sp)
-/* 0154F0 800148F0 3C07425C */  lui   $a3, 0x425c
-/* 0154F4 800148F4 0C004FDF */  jal   func_80013F7C
-/* 0154F8 800148F8 E7A40010 */   swc1  $f4, 0x10($sp)
-/* 0154FC 800148FC 8FBF0024 */  lw    $ra, 0x24($sp)
-/* 015500 80014900 27BD0028 */  addiu $sp, $sp, 0x28
-/* 015504 80014904 03E00008 */  jr    $ra
-/* 015508 80014908 00000000 */   nop   
diff --git a/asm/non_matchings/code_80005FD0/func_8001490C.s b/asm/non_matchings/code_80005FD0/func_8001490C.s
deleted file mode 100644
index 0565d140b..000000000
--- a/asm/non_matchings/code_80005FD0/func_8001490C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_8001490C
-/* 01550C 8001490C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 015510 80014910 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 015514 80014914 3C068016 */  lui   $a2, %hi(D_80163818) # $a2, 0x8016
-/* 015518 80014918 24C63818 */  addiu $a2, %lo(D_80163818) # addiu $a2, $a2, 0x3818
-/* 01551C 8001491C 0C0051AE */  jal   func_800146B8
-/* 015520 80014920 24050007 */   li    $a1, 7
-/* 015524 80014924 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 015528 80014928 27BD0018 */  addiu $sp, $sp, 0x18
-/* 01552C 8001492C 03E00008 */  jr    $ra
-/* 015530 80014930 00000000 */   nop   
diff --git a/asm/non_matchings/code_80005FD0/func_80014A18.s b/asm/non_matchings/code_80005FD0/func_80014A18.s
deleted file mode 100644
index f9b5e190e..000000000
--- a/asm/non_matchings/code_80005FD0/func_80014A18.s
+++ /dev/null
@@ -1,19 +0,0 @@
-glabel func_80014A18
-/* 015618 80014A18 27BDFFD8 */  addiu $sp, $sp, -0x28
-/* 01561C 80014A1C 3C014148 */  li    $at, 0x41480000 # 12.500000
-/* 015620 80014A20 44812000 */  mtc1  $at, $f4
-/* 015624 80014A24 3C0F5101 */  lui   $t7, (0x51018002 >> 16) # lui $t7, 0x5101
-/* 015628 80014A28 AFBF0024 */  sw    $ra, 0x24($sp)
-/* 01562C 80014A2C 35EF8002 */  ori   $t7, (0x51018002 & 0xFFFF) # ori $t7, $t7, 0x8002
-/* 015630 80014A30 3C068016 */  lui   $a2, %hi(D_80163988) # $a2, 0x8016
-/* 015634 80014A34 240E0007 */  li    $t6, 7
-/* 015638 80014A38 AFAE0014 */  sw    $t6, 0x14($sp)
-/* 01563C 80014A3C 24C63988 */  addiu $a2, %lo(D_80163988) # addiu $a2, $a2, 0x3988
-/* 015640 80014A40 AFAF0018 */  sw    $t7, 0x18($sp)
-/* 015644 80014A44 3C07428C */  lui   $a3, 0x428c
-/* 015648 80014A48 0C004FDF */  jal   func_80013F7C
-/* 01564C 80014A4C E7A40010 */   swc1  $f4, 0x10($sp)
-/* 015650 80014A50 8FBF0024 */  lw    $ra, 0x24($sp)
-/* 015654 80014A54 27BD0028 */  addiu $sp, $sp, 0x28
-/* 015658 80014A58 03E00008 */  jr    $ra
-/* 01565C 80014A5C 00000000 */   nop   
diff --git a/asm/non_matchings/code_80005FD0/func_80014A60.s b/asm/non_matchings/code_80005FD0/func_80014A60.s
deleted file mode 100644
index 918ef633b..000000000
--- a/asm/non_matchings/code_80005FD0/func_80014A60.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80014A60
-/* 015660 80014A60 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 015664 80014A64 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 015668 80014A68 3C068016 */  lui   $a2, %hi(D_80163988) # $a2, 0x8016
-/* 01566C 80014A6C 24C63988 */  addiu $a2, %lo(D_80163988) # addiu $a2, $a2, 0x3988
-/* 015670 80014A70 0C0051AE */  jal   func_800146B8
-/* 015674 80014A74 24050007 */   li    $a1, 7
-/* 015678 80014A78 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 01567C 80014A7C 27BD0018 */  addiu $sp, $sp, 0x18
-/* 015680 80014A80 03E00008 */  jr    $ra
-/* 015684 80014A84 00000000 */   nop   
diff --git a/asm/non_matchings/code_80005FD0/func_80014B6C.s b/asm/non_matchings/code_80005FD0/func_80014B6C.s
deleted file mode 100644
index 7d4e2e3d6..000000000
--- a/asm/non_matchings/code_80005FD0/func_80014B6C.s
+++ /dev/null
@@ -1,19 +0,0 @@
-glabel func_80014B6C
-/* 01576C 80014B6C 27BDFFD8 */  addiu $sp, $sp, -0x28
-/* 015770 80014B70 3C014148 */  li    $at, 0x41480000 # 12.500000
-/* 015774 80014B74 44812000 */  mtc1  $at, $f4
-/* 015778 80014B78 3C0F5101 */  lui   $t7, (0x51018004 >> 16) # lui $t7, 0x5101
-/* 01577C 80014B7C AFBF0024 */  sw    $ra, 0x24($sp)
-/* 015780 80014B80 35EF8004 */  ori   $t7, (0x51018004 & 0xFFFF) # ori $t7, $t7, 0x8004
-/* 015784 80014B84 3C068016 */  lui   $a2, %hi(D_80163AF8) # $a2, 0x8016
-/* 015788 80014B88 240E0007 */  li    $t6, 7
-/* 01578C 80014B8C AFAE0014 */  sw    $t6, 0x14($sp)
-/* 015790 80014B90 24C63AF8 */  addiu $a2, %lo(D_80163AF8) # addiu $a2, $a2, 0x3af8
-/* 015794 80014B94 AFAF0018 */  sw    $t7, 0x18($sp)
-/* 015798 80014B98 3C07425C */  lui   $a3, 0x425c
-/* 01579C 80014B9C 0C004FDF */  jal   func_80013F7C
-/* 0157A0 80014BA0 E7A40010 */   swc1  $f4, 0x10($sp)
-/* 0157A4 80014BA4 8FBF0024 */  lw    $ra, 0x24($sp)
-/* 0157A8 80014BA8 27BD0028 */  addiu $sp, $sp, 0x28
-/* 0157AC 80014BAC 03E00008 */  jr    $ra
-/* 0157B0 80014BB0 00000000 */   nop   
diff --git a/asm/non_matchings/code_80005FD0/func_80014BB4.s b/asm/non_matchings/code_80005FD0/func_80014BB4.s
deleted file mode 100644
index 356b6793d..000000000
--- a/asm/non_matchings/code_80005FD0/func_80014BB4.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80014BB4
-/* 0157B4 80014BB4 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 0157B8 80014BB8 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 0157BC 80014BBC 3C068016 */  lui   $a2, %hi(D_80163AF8) # $a2, 0x8016
-/* 0157C0 80014BC0 24C63AF8 */  addiu $a2, %lo(D_80163AF8) # addiu $a2, $a2, 0x3af8
-/* 0157C4 80014BC4 0C0051AE */  jal   func_800146B8
-/* 0157C8 80014BC8 24050007 */   li    $a1, 7
-/* 0157CC 80014BCC 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 0157D0 80014BD0 27BD0018 */  addiu $sp, $sp, 0x18
-/* 0157D4 80014BD4 03E00008 */  jr    $ra
-/* 0157D8 80014BD8 00000000 */   nop   
diff --git a/asm/non_matchings/code_80005FD0/func_80014CC0.s b/asm/non_matchings/code_80005FD0/func_80014CC0.s
deleted file mode 100644
index 9260237e5..000000000
--- a/asm/non_matchings/code_80005FD0/func_80014CC0.s
+++ /dev/null
@@ -1,19 +0,0 @@
-glabel func_80014CC0
-/* 0158C0 80014CC0 27BDFFD8 */  addiu $sp, $sp, -0x28
-/* 0158C4 80014CC4 3C014108 */  li    $at, 0x41080000 # 8.500000
-/* 0158C8 80014CC8 44812000 */  mtc1  $at, $f4
-/* 0158CC 80014CCC 3C0F5101 */  lui   $t7, (0x51018005 >> 16) # lui $t7, 0x5101
-/* 0158D0 80014CD0 AFBF0024 */  sw    $ra, 0x24($sp)
-/* 0158D4 80014CD4 35EF8005 */  ori   $t7, (0x51018005 & 0xFFFF) # ori $t7, $t7, 0x8005
-/* 0158D8 80014CD8 3C068016 */  lui   $a2, %hi(D_80163C68) # $a2, 0x8016
-/* 0158DC 80014CDC 240E0007 */  li    $t6, 7
-/* 0158E0 80014CE0 AFAE0014 */  sw    $t6, 0x14($sp)
-/* 0158E4 80014CE4 24C63C68 */  addiu $a2, %lo(D_80163C68) # addiu $a2, $a2, 0x3c68
-/* 0158E8 80014CE8 AFAF0018 */  sw    $t7, 0x18($sp)
-/* 0158EC 80014CEC 3C074138 */  lui   $a3, 0x4138
-/* 0158F0 80014CF0 0C004FDF */  jal   func_80013F7C
-/* 0158F4 80014CF4 E7A40010 */   swc1  $f4, 0x10($sp)
-/* 0158F8 80014CF8 8FBF0024 */  lw    $ra, 0x24($sp)
-/* 0158FC 80014CFC 27BD0028 */  addiu $sp, $sp, 0x28
-/* 015900 80014D00 03E00008 */  jr    $ra
-/* 015904 80014D04 00000000 */   nop   
diff --git a/asm/non_matchings/code_80005FD0/func_80014D08.s b/asm/non_matchings/code_80005FD0/func_80014D08.s
deleted file mode 100644
index 9d09c419f..000000000
--- a/asm/non_matchings/code_80005FD0/func_80014D08.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80014D08
-/* 015908 80014D08 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 01590C 80014D0C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 015910 80014D10 3C068016 */  lui   $a2, %hi(D_80163C68) # $a2, 0x8016
-/* 015914 80014D14 24C63C68 */  addiu $a2, %lo(D_80163C68) # addiu $a2, $a2, 0x3c68
-/* 015918 80014D18 0C0051AE */  jal   func_800146B8
-/* 01591C 80014D1C 24050007 */   li    $a1, 7
-/* 015920 80014D20 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 015924 80014D24 27BD0018 */  addiu $sp, $sp, 0x18
-/* 015928 80014D28 03E00008 */  jr    $ra
-/* 01592C 80014D2C 00000000 */   nop   
diff --git a/asm/non_matchings/code_8001F980/func_80022598.s b/asm/non_matchings/code_8001F980/func_80022598.s
deleted file mode 100644
index b0f01f44d..000000000
--- a/asm/non_matchings/code_8001F980/func_80022598.s
+++ /dev/null
@@ -1,14 +0,0 @@
-glabel move_s32_towards
-/* 023198 80022598 8C820000 */  lw    $v0, ($a0)
-/* 02319C 8002259C 44866000 */  mtc1  $a2, $f12
-/* 0231A0 800225A0 00457023 */  subu  $t6, $v0, $a1
-/* 0231A4 800225A4 448E4000 */  mtc1  $t6, $f8
-/* 0231A8 800225A8 44822000 */  mtc1  $v0, $f4
-/* 0231AC 800225AC 468042A0 */  cvt.s.w $f10, $f8
-/* 0231B0 800225B0 468021A0 */  cvt.s.w $f6, $f4
-/* 0231B4 800225B4 460C5402 */  mul.s $f16, $f10, $f12
-/* 0231B8 800225B8 46103481 */  sub.s $f18, $f6, $f16
-/* 0231BC 800225BC 4600910D */  trunc.w.s $f4, $f18
-/* 0231C0 800225C0 44182000 */  mfc1  $t8, $f4
-/* 0231C4 800225C4 03E00008 */  jr    $ra
-/* 0231C8 800225C8 AC980000 */   sw    $t8, ($a0)
diff --git a/asm/non_matchings/code_800431B0/func_8005327C.s b/asm/non_matchings/code_800431B0/func_8005327C.s
deleted file mode 100644
index 8727129c4..000000000
--- a/asm/non_matchings/code_800431B0/func_8005327C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_8005327C
-/* 053E7C 8005327C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 053E80 80053280 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 053E84 80053284 0C014C27 */  jal   func_8005309C
-/* 053E88 80053288 AFA40018 */   sw    $a0, 0x18($sp)
-/* 053E8C 8005328C 0C014BC8 */  jal   func_80052F20
-/* 053E90 80053290 8FA40018 */   lw    $a0, 0x18($sp)
-/* 053E94 80053294 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 053E98 80053298 27BD0018 */  addiu $sp, $sp, 0x18
-/* 053E9C 8005329C 03E00008 */  jr    $ra
-/* 053EA0 800532A0 00000000 */   nop   
diff --git a/asm/non_matchings/code_800431B0/func_80056160.s b/asm/non_matchings/code_800431B0/func_80056160.s
deleted file mode 100644
index ad60957de..000000000
--- a/asm/non_matchings/code_800431B0/func_80056160.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80056160
-/* 056D60 80056160 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 056D64 80056164 00802825 */  move  $a1, $a0
-/* 056D68 80056168 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 056D6C 8005616C 3C048018 */  lui   $a0, %hi(D_80183EAC) # $a0, 0x8018
-/* 056D70 80056170 0C0157E8 */  jal   func_80055FA0
-/* 056D74 80056174 8C843EAC */   lw    $a0, %lo(D_80183EAC)($a0)
-/* 056D78 80056178 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 056D7C 8005617C 27BD0018 */  addiu $sp, $sp, 0x18
-/* 056D80 80056180 03E00008 */  jr    $ra
-/* 056D84 80056184 00000000 */   nop   
diff --git a/asm/non_matchings/code_80057C60/func_8005C64C.s b/asm/non_matchings/code_80057C60/func_8005C64C.s
deleted file mode 100644
index 44974fe32..000000000
--- a/asm/non_matchings/code_80057C60/func_8005C64C.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_8005C64C
-/* 05D24C 8005C64C 03E00008 */  jr    $ra
-/* 05D250 8005C650 AFA40000 */   sw    $a0, ($sp)
-
-/* 05D254 8005C654 03E00008 */  jr    $ra
-/* 05D258 8005C658 AC800000 */   sw    $zero, ($a0)
-
-/* 05D25C 8005C65C 00047880 */  sll   $t7, $a0, 2
-/* 05D260 8005C660 3C018019 */  lui   $at, %hi(D_8018D2C8)
-/* 05D264 8005C664 002F0821 */  addu  $at, $at, $t7
-/* 05D268 8005C668 240E0001 */  li    $t6, 1
-/* 05D26C 8005C66C 03E00008 */  jr    $ra
-/* 05D270 8005C670 AC2ED2C8 */   sw    $t6, %lo(D_8018D2C8)($at)
diff --git a/asm/non_matchings/code_80071F00/func_80077B14.s b/asm/non_matchings/code_80071F00/func_80077B14.s
deleted file mode 100644
index a67ac2839..000000000
--- a/asm/non_matchings/code_80071F00/func_80077B14.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80077B14
-/* 078714 80077B14 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 078718 80077B18 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 07871C 80077B1C 0C01C922 */  jal   func_80072488
-/* 078720 80077B20 AFA40018 */   sw    $a0, 0x18($sp)
-/* 078724 80077B24 0C021B9C */  jal   func_80086E70
-/* 078728 80077B28 8FA40018 */   lw    $a0, 0x18($sp)
-/* 07872C 80077B2C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 078730 80077B30 27BD0018 */  addiu $sp, $sp, 0x18
-/* 078734 80077B34 03E00008 */  jr    $ra
-/* 078738 80077B38 00000000 */   nop   
diff --git a/asm/non_matchings/code_80071F00/func_80079054.s b/asm/non_matchings/code_80071F00/func_80079054.s
deleted file mode 100644
index 3214106f3..000000000
--- a/asm/non_matchings/code_80071F00/func_80079054.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_80079054
-/* 079C54 80079054 00047080 */  sll   $t6, $a0, 2
-/* 079C58 80079058 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 079C5C 8007905C 3C048018 */  lui   $a0, %hi(D_80183DB8) # 0x8018
-/* 079C60 80079060 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 079C64 80079064 008E2021 */  addu  $a0, $a0, $t6
-/* 079C68 80079068 8C843DB8 */  lw    $a0, %lo(D_80183DB8)($a0) # 0x3db8($a0)
-/* 079C6C 8007906C 0C01C8E9 */  jal   func_800723A4
-/* 079C70 80079070 24050002 */   li    $a1, 2
-/* 079C74 80079074 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 079C78 80079078 27BD0018 */  addiu $sp, $sp, 0x18
-/* 079C7C 8007907C 03E00008 */  jr    $ra
-/* 079C80 80079080 00000000 */   nop   
diff --git a/asm/non_matchings/code_80071F00/func_80079084.s b/asm/non_matchings/code_80071F00/func_80079084.s
deleted file mode 100644
index 14dfa41c4..000000000
--- a/asm/non_matchings/code_80071F00/func_80079084.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_80079084
-/* 079C84 80079084 00047080 */  sll   $t6, $a0, 2
-/* 079C88 80079088 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 079C8C 8007908C 3C048018 */  lui   $a0, %hi(D_80183DB8) # 0x8018
-/* 079C90 80079090 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 079C94 80079094 008E2021 */  addu  $a0, $a0, $t6
-/* 079C98 80079098 8C843DB8 */  lw    $a0, %lo(D_80183DB8)($a0) # 0x3db8($a0)
-/* 079C9C 8007909C 0C01C8E9 */  jal   func_800723A4
-/* 079CA0 800790A0 24050004 */   li    $a1, 4
-/* 079CA4 800790A4 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 079CA8 800790A8 27BD0018 */  addiu $sp, $sp, 0x18
-/* 079CAC 800790AC 03E00008 */  jr    $ra
-/* 079CB0 800790B0 00000000 */   nop   
diff --git a/asm/non_matchings/code_80071F00/func_800790B4.s b/asm/non_matchings/code_80071F00/func_800790B4.s
deleted file mode 100644
index 1c9be8662..000000000
--- a/asm/non_matchings/code_80071F00/func_800790B4.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_800790B4
-/* 079CB4 800790B4 00047080 */  sll   $t6, $a0, 2
-/* 079CB8 800790B8 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 079CBC 800790BC 3C048018 */  lui   $a0, %hi(D_80183DB8) # 0x8018
-/* 079CC0 800790C0 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 079CC4 800790C4 008E2021 */  addu  $a0, $a0, $t6
-/* 079CC8 800790C8 8C843DB8 */  lw    $a0, %lo(D_80183DB8)($a0) # 0x3db8($a0)
-/* 079CCC 800790CC 0C01C8E9 */  jal   func_800723A4
-/* 079CD0 800790D0 24050005 */   li    $a1, 5
-/* 079CD4 800790D4 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 079CD8 800790D8 27BD0018 */  addiu $sp, $sp, 0x18
-/* 079CDC 800790DC 03E00008 */  jr    $ra
-/* 079CE0 800790E0 00000000 */   nop   
diff --git a/asm/non_matchings/code_80071F00/func_800790E4.s b/asm/non_matchings/code_80071F00/func_800790E4.s
deleted file mode 100644
index b31fee6f3..000000000
--- a/asm/non_matchings/code_80071F00/func_800790E4.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_800790E4
-/* 079CE4 800790E4 00047080 */  sll   $t6, $a0, 2
-/* 079CE8 800790E8 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 079CEC 800790EC 3C048018 */  lui   $a0, %hi(D_80183DB8) # 0x8018
-/* 079CF0 800790F0 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 079CF4 800790F4 008E2021 */  addu  $a0, $a0, $t6
-/* 079CF8 800790F8 8C843DB8 */  lw    $a0, %lo(D_80183DB8)($a0) # 0x3db8($a0)
-/* 079CFC 800790FC 0C01C8E9 */  jal   func_800723A4
-/* 079D00 80079100 24050006 */   li    $a1, 6
-/* 079D04 80079104 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 079D08 80079108 27BD0018 */  addiu $sp, $sp, 0x18
-/* 079D0C 8007910C 03E00008 */  jr    $ra
-/* 079D10 80079110 00000000 */   nop   
diff --git a/asm/non_matchings/code_80071F00/func_8007D8AC.s b/asm/non_matchings/code_80071F00/func_8007D8AC.s
deleted file mode 100644
index 9dda93574..000000000
--- a/asm/non_matchings/code_80071F00/func_8007D8AC.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_8007D8AC
-/* 07E4AC 8007D8AC 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 07E4B0 8007D8B0 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 07E4B4 8007D8B4 0C01C922 */  jal   func_80072488
-/* 07E4B8 8007D8B8 AFA40018 */   sw    $a0, 0x18($sp)
-/* 07E4BC 8007D8BC 0C021B9C */  jal   func_80086E70
-/* 07E4C0 8007D8C0 8FA40018 */   lw    $a0, 0x18($sp)
-/* 07E4C4 8007D8C4 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 07E4C8 8007D8C8 27BD0018 */  addiu $sp, $sp, 0x18
-/* 07E4CC 8007D8CC 03E00008 */  jr    $ra
-/* 07E4D0 8007D8D0 00000000 */   nop   
diff --git a/asm/non_matchings/code_80071F00/func_8007DA4C.s b/asm/non_matchings/code_80071F00/func_8007DA4C.s
deleted file mode 100644
index d47894a0e..000000000
--- a/asm/non_matchings/code_80071F00/func_8007DA4C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_8007DA4C
-/* 07E64C 8007DA4C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 07E650 8007DA50 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 07E654 8007DA54 0C021E07 */  jal   func_8008781C
-/* 07E658 8007DA58 AFA40018 */   sw    $a0, 0x18($sp)
-/* 07E65C 8007DA5C 0C022FC6 */  jal   func_8008BF18
-/* 07E660 8007DA60 8FA40018 */   lw    $a0, 0x18($sp)
-/* 07E664 8007DA64 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 07E668 8007DA68 27BD0018 */  addiu $sp, $sp, 0x18
-/* 07E66C 8007DA6C 03E00008 */  jr    $ra
-/* 07E670 8007DA70 00000000 */   nop   
diff --git a/asm/non_matchings/code_80071F00/func_80085080.s b/asm/non_matchings/code_80071F00/func_80085080.s
deleted file mode 100644
index 1223cadbe..000000000
--- a/asm/non_matchings/code_80071F00/func_80085080.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_80085080
-/* 085C80 80085080 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 085C84 80085084 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 085C88 80085088 0C022DE3 */  jal   func_8008B78C
-/* 085C8C 8008508C AFA40018 */   sw    $a0, 0x18($sp)
-/* 085C90 80085090 0C022FC6 */  jal   func_8008BF18
-/* 085C94 80085094 8FA40018 */   lw    $a0, 0x18($sp)
-/* 085C98 80085098 0C021CFD */  jal   func_800873F4
-/* 085C9C 8008509C 8FA40018 */   lw    $a0, 0x18($sp)
-/* 085CA0 800850A0 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 085CA4 800850A4 27BD0018 */  addiu $sp, $sp, 0x18
-/* 085CA8 800850A8 03E00008 */  jr    $ra
-/* 085CAC 800850AC 00000000 */   nop   
diff --git a/asm/non_matchings/code_80086E70/func_80086E70.s b/asm/non_matchings/code_80086E70/func_80086E70.s
deleted file mode 100644
index 2fdabfb00..000000000
--- a/asm/non_matchings/code_80086E70/func_80086E70.s
+++ /dev/null
@@ -1,16 +0,0 @@
-glabel func_80086E70
-/* 087A70 80086E70 000478C0 */  sll   $t7, $a0, 3
-/* 087A74 80086E74 01E47823 */  subu  $t7, $t7, $a0
-/* 087A78 80086E78 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 087A7C 80086E7C 000F7940 */  sll   $t7, $t7, 5
-/* 087A80 80086E80 3C018016 */  lui   $at, %hi(D_80165CC6) # 0x8016
-/* 087A84 80086E84 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 087A88 80086E88 002F0821 */  addu  $at, $at, $t7
-/* 087A8C 80086E8C 240E0001 */  li    $t6, 1
-/* 087A90 80086E90 A42E5CC6 */  sh    $t6, %lo(D_80165CC6)($at) # 0x5cc6($at)
-/* 087A94 80086E94 0C01C87A */  jal   func_800721E8
-/* 087A98 80086E98 24050008 */   li    $a1, 8
-/* 087A9C 80086E9C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 087AA0 80086EA0 27BD0018 */  addiu $sp, $sp, 0x18
-/* 087AA4 80086EA4 03E00008 */  jr    $ra
-/* 087AA8 80086EA8 00000000 */   nop   
diff --git a/asm/non_matchings/code_80086E70/func_80086EAC.s b/asm/non_matchings/code_80086E70/func_80086EAC.s
deleted file mode 100644
index 59aa82666..000000000
--- a/asm/non_matchings/code_80086E70/func_80086EAC.s
+++ /dev/null
@@ -1,18 +0,0 @@
-glabel func_80086EAC
-/* 087AAC 80086EAC 0004C0C0 */  sll   $t8, $a0, 3
-/* 087AB0 80086EB0 0304C023 */  subu  $t8, $t8, $a0
-/* 087AB4 80086EB4 3C198016 */  lui   $t9, %hi(D_80165C18) # $t9, 0x8016
-/* 087AB8 80086EB8 27395C18 */  addiu $t9, %lo(D_80165C18) # addiu $t9, $t9, 0x5c18
-/* 087ABC 80086EBC 0018C140 */  sll   $t8, $t8, 5
-/* 087AC0 80086EC0 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 087AC4 80086EC4 03191021 */  addu  $v0, $t8, $t9
-/* 087AC8 80086EC8 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 087ACC 80086ECC A04500DD */  sb    $a1, 0xdd($v0)
-/* 087AD0 80086ED0 AFA60020 */  sw    $a2, 0x20($sp)
-/* 087AD4 80086ED4 A44600AE */  sh    $a2, 0xae($v0)
-/* 087AD8 80086ED8 0C01C87A */  jal   func_800721E8
-/* 087ADC 80086EDC 24050008 */   li    $a1, 8
-/* 087AE0 80086EE0 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 087AE4 80086EE4 27BD0018 */  addiu $sp, $sp, 0x18
-/* 087AE8 80086EE8 03E00008 */  jr    $ra
-/* 087AEC 80086EEC 00000000 */   nop   
diff --git a/asm/non_matchings/code_80086E70/func_80086F10.s b/asm/non_matchings/code_80086E70/func_80086F10.s
deleted file mode 100644
index 6d473beb4..000000000
--- a/asm/non_matchings/code_80086E70/func_80086F10.s
+++ /dev/null
@@ -1,21 +0,0 @@
-glabel func_80086F10
-/* 087B10 80086F10 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 087B14 80086F14 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 087B18 80086F18 AFA40018 */  sw    $a0, 0x18($sp)
-/* 087B1C 80086F1C AFA5001C */  sw    $a1, 0x1c($sp)
-/* 087B20 80086F20 0C021B9C */  jal   func_80086E70
-/* 087B24 80086F24 AFA60020 */   sw    $a2, 0x20($sp)
-/* 087B28 80086F28 8FAE0018 */  lw    $t6, 0x18($sp)
-/* 087B2C 80086F2C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 087B30 80086F30 3C188016 */  lui   $t8, %hi(D_80165C18) # $t8, 0x8016
-/* 087B34 80086F34 000E78C0 */  sll   $t7, $t6, 3
-/* 087B38 80086F38 01EE7823 */  subu  $t7, $t7, $t6
-/* 087B3C 80086F3C 8FB9001C */  lw    $t9, 0x1c($sp)
-/* 087B40 80086F40 8FA80020 */  lw    $t0, 0x20($sp)
-/* 087B44 80086F44 000F7940 */  sll   $t7, $t7, 5
-/* 087B48 80086F48 27185C18 */  addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18
-/* 087B4C 80086F4C 01F81021 */  addu  $v0, $t7, $t8
-/* 087B50 80086F50 27BD0018 */  addiu $sp, $sp, 0x18
-/* 087B54 80086F54 A05900DE */  sb    $t9, 0xde($v0)
-/* 087B58 80086F58 03E00008 */  jr    $ra
-/* 087B5C 80086F5C AC480080 */   sw    $t0, 0x80($v0)
diff --git a/asm/non_matchings/code_80086E70/func_80086F60.s b/asm/non_matchings/code_80086E70/func_80086F60.s
deleted file mode 100644
index 9862f4c66..000000000
--- a/asm/non_matchings/code_80086E70/func_80086F60.s
+++ /dev/null
@@ -1,18 +0,0 @@
-glabel func_80086F60
-/* 087B60 80086F60 000470C0 */  sll   $t6, $a0, 3
-/* 087B64 80086F64 01C47023 */  subu  $t6, $t6, $a0
-/* 087B68 80086F68 3C0F8016 */  lui   $t7, %hi(D_80165C18) # $t7, 0x8016
-/* 087B6C 80086F6C 25EF5C18 */  addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18
-/* 087B70 80086F70 000E7140 */  sll   $t6, $t6, 5
-/* 087B74 80086F74 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 087B78 80086F78 01CF1021 */  addu  $v0, $t6, $t7
-/* 087B7C 80086F7C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 087B80 80086F80 A44000AE */  sh    $zero, 0xae($v0)
-/* 087B84 80086F84 A04000DD */  sb    $zero, 0xdd($v0)
-/* 087B88 80086F88 A04000DE */  sb    $zero, 0xde($v0)
-/* 087B8C 80086F8C 0C01C87A */  jal   func_800721E8
-/* 087B90 80086F90 24050008 */   li    $a1, 8
-/* 087B94 80086F94 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 087B98 80086F98 27BD0018 */  addiu $sp, $sp, 0x18
-/* 087B9C 80086F9C 03E00008 */  jr    $ra
-/* 087BA0 80086FA0 00000000 */   nop   
diff --git a/asm/non_matchings/code_80086E70/func_80086FA4.s b/asm/non_matchings/code_80086E70/func_80086FA4.s
deleted file mode 100644
index 7b7755730..000000000
--- a/asm/non_matchings/code_80086E70/func_80086FA4.s
+++ /dev/null
@@ -1,14 +0,0 @@
-glabel func_80086FA4
-/* 087BA4 80086FA4 000470C0 */  sll   $t6, $a0, 3
-/* 087BA8 80086FA8 01C47023 */  subu  $t6, $t6, $a0
-/* 087BAC 80086FAC 000E7140 */  sll   $t6, $t6, 5
-/* 087BB0 80086FB0 3C0F8016 */  lui   $t7, %hi(D_80165CC6) # 0x8016
-/* 087BB4 80086FB4 01EE7821 */  addu  $t7, $t7, $t6
-/* 087BB8 80086FB8 85EF5CC6 */  lh    $t7, %lo(D_80165CC6)($t7) # 0x5cc6($t7)
-/* 087BBC 80086FBC 00001825 */  move  $v1, $zero
-/* 087BC0 80086FC0 15E00002 */  bnez  $t7, .L80086FCC
-/* 087BC4 80086FC4 00000000 */   nop   
-/* 087BC8 80086FC8 24030001 */  li    $v1, 1
-.L80086FCC:
-/* 087BCC 80086FCC 03E00008 */  jr    $ra
-/* 087BD0 80086FD0 00601025 */   move  $v0, $v1
diff --git a/asm/non_matchings/code_80086E70/func_80086FD4.s b/asm/non_matchings/code_80086E70/func_80086FD4.s
deleted file mode 100644
index 229de0624..000000000
--- a/asm/non_matchings/code_80086E70/func_80086FD4.s
+++ /dev/null
@@ -1,19 +0,0 @@
-glabel func_80086FD4
-/* 087BD4 80086FD4 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 087BD8 80086FD8 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 087BDC 80086FDC AFA40018 */  sw    $a0, 0x18($sp)
-/* 087BE0 80086FE0 0C01C87A */  jal   func_800721E8
-/* 087BE4 80086FE4 24050008 */   li    $a1, 8
-/* 087BE8 80086FE8 8FAE0018 */  lw    $t6, 0x18($sp)
-/* 087BEC 80086FEC 3C188016 */  lui   $t8, %hi(D_80165C18) # $t8, 0x8016
-/* 087BF0 80086FF0 27185C18 */  addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18
-/* 087BF4 80086FF4 000E78C0 */  sll   $t7, $t6, 3
-/* 087BF8 80086FF8 01EE7823 */  subu  $t7, $t7, $t6
-/* 087BFC 80086FFC 000F7940 */  sll   $t7, $t7, 5
-/* 087C00 80087000 01F81021 */  addu  $v0, $t7, $t8
-/* 087C04 80087004 845900AE */  lh    $t9, 0xae($v0)
-/* 087C08 80087008 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 087C0C 8008700C 27BD0018 */  addiu $sp, $sp, 0x18
-/* 087C10 80087010 27280001 */  addiu $t0, $t9, 1
-/* 087C14 80087014 03E00008 */  jr    $ra
-/* 087C18 80087018 A44800AE */   sh    $t0, 0xae($v0)
diff --git a/asm/non_matchings/code_80086E70/func_8008701C.s b/asm/non_matchings/code_80086E70/func_8008701C.s
deleted file mode 100644
index be6500acb..000000000
--- a/asm/non_matchings/code_80086E70/func_8008701C.s
+++ /dev/null
@@ -1,18 +0,0 @@
-glabel func_8008701C
-/* 087C1C 8008701C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 087C20 80087020 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 087C24 80087024 AFA5001C */  sw    $a1, 0x1c($sp)
-/* 087C28 80087028 AFA40018 */  sw    $a0, 0x18($sp)
-/* 087C2C 8008702C 0C01C87A */  jal   func_800721E8
-/* 087C30 80087030 24050008 */   li    $a1, 8
-/* 087C34 80087034 8FAF0018 */  lw    $t7, 0x18($sp)
-/* 087C38 80087038 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 087C3C 8008703C 8FAE001C */  lw    $t6, 0x1c($sp)
-/* 087C40 80087040 000FC0C0 */  sll   $t8, $t7, 3
-/* 087C44 80087044 030FC023 */  subu  $t8, $t8, $t7
-/* 087C48 80087048 0018C140 */  sll   $t8, $t8, 5
-/* 087C4C 8008704C 3C018016 */  lui   $at, %hi(D_80165CC6) # 0x8016
-/* 087C50 80087050 00380821 */  addu  $at, $at, $t8
-/* 087C54 80087054 27BD0018 */  addiu $sp, $sp, 0x18
-/* 087C58 80087058 03E00008 */  jr    $ra
-/* 087C5C 8008705C A42E5CC6 */   sh    $t6, %lo(D_80165CC6)($at) # 0x5cc6($at)
diff --git a/asm/non_matchings/code_80086E70/func_8008781C.s b/asm/non_matchings/code_80086E70/func_8008781C.s
deleted file mode 100644
index 08a3600d8..000000000
--- a/asm/non_matchings/code_80086E70/func_8008781C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_8008781C
-/* 08841C 8008781C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 088420 80087820 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 088424 80087824 0C021D47 */  jal   func_8008751C
-/* 088428 80087828 AFA40018 */   sw    $a0, 0x18($sp)
-/* 08842C 8008782C 0C021DD7 */  jal   func_8008775C
-/* 088430 80087830 8FA40018 */   lw    $a0, 0x18($sp)
-/* 088434 80087834 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 088438 80087838 27BD0018 */  addiu $sp, $sp, 0x18
-/* 08843C 8008783C 03E00008 */  jr    $ra
-/* 088440 80087840 00000000 */   nop   
diff --git a/asm/non_matchings/code_80086E70/func_80087844.s b/asm/non_matchings/code_80086E70/func_80087844.s
deleted file mode 100644
index e72aa7ead..000000000
--- a/asm/non_matchings/code_80086E70/func_80087844.s
+++ /dev/null
@@ -1,24 +0,0 @@
-glabel func_80087844
-/* 088444 80087844 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 088448 80087848 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 08844C 8008784C 0C021D5F */  jal   func_8008757C
-/* 088450 80087850 AFA40018 */   sw    $a0, 0x18($sp)
-/* 088454 80087854 0C021DC4 */  jal   func_80087710
-/* 088458 80087858 8FA40018 */   lw    $a0, 0x18($sp)
-/* 08845C 8008785C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 088460 80087860 27BD0018 */  addiu $sp, $sp, 0x18
-/* 088464 80087864 03E00008 */  jr    $ra
-/* 088468 80087868 00000000 */   nop   
-
-/* 08846C 8008786C AFA60008 */  sw    $a2, 8($sp)
-/* 088470 80087870 AFA7000C */  sw    $a3, 0xc($sp)
-/* 088474 80087874 C7AA000C */  lwc1  $f10, 0xc($sp)
-/* 088478 80087878 C7A60008 */  lwc1  $f6, 8($sp)
-/* 08847C 8008787C C7A40010 */  lwc1  $f4, 0x10($sp)
-/* 088480 80087880 460E5401 */  sub.s $f16, $f10, $f14
-/* 088484 80087884 46062201 */  sub.s $f8, $f4, $f6
-/* 088488 80087888 460E6101 */  sub.s $f4, $f12, $f14
-/* 08848C 8008788C 46104483 */  div.s $f18, $f8, $f16
-/* 088490 80087890 46049282 */  mul.s $f10, $f18, $f4
-/* 088494 80087894 03E00008 */  jr    $ra
-/* 088498 80087898 46065000 */   add.s $f0, $f10, $f6
diff --git a/asm/non_matchings/code_80086E70/func_80088150.s b/asm/non_matchings/code_80086E70/func_80088150.s
deleted file mode 100644
index b3faf2d75..000000000
--- a/asm/non_matchings/code_80086E70/func_80088150.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80088150
-/* 088D50 80088150 000470C0 */  sll   $t6, $a0, 3
-/* 088D54 80088154 01C47023 */  subu  $t6, $t6, $a0
-/* 088D58 80088158 3C0F8016 */  lui   $t7, %hi(D_80165C18) # $t7, 0x8016
-/* 088D5C 8008815C 25EF5C18 */  addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18
-/* 088D60 80088160 000E7140 */  sll   $t6, $t6, 5
-/* 088D64 80088164 01CF1021 */  addu  $v0, $t6, $t7
-/* 088D68 80088168 8C58007C */  lw    $t8, 0x7c($v0)
-/* 088D6C 8008816C 27190008 */  addiu $t9, $t8, 8
-/* 088D70 80088170 03E00008 */  jr    $ra
-/* 088D74 80088174 AC59007C */   sw    $t9, 0x7c($v0)
diff --git a/asm/non_matchings/code_80086E70/func_80088FF0.s b/asm/non_matchings/code_80086E70/func_80088FF0.s
deleted file mode 100644
index 11364f21b..000000000
--- a/asm/non_matchings/code_80086E70/func_80088FF0.s
+++ /dev/null
@@ -1,14 +0,0 @@
-glabel func_80088FF0
-/* 089BF0 80088FF0 44800000 */  mtc1  $zero, $f0
-/* 089BF4 80088FF4 00000000 */  nop   
-/* 089BF8 80088FF8 E480008C */  swc1  $f0, 0x8c($a0)
-/* 089BFC 80088FFC E480009C */  swc1  $f0, 0x9c($a0)
-/* 089C00 80089000 E4800034 */  swc1  $f0, 0x34($a0)
-/* 089C04 80089004 03E00008 */  jr    $ra
-/* 089C08 80089008 E480003C */   swc1  $f0, 0x3c($a0)
-
-/* 089C0C 8008900C 44800000 */  mtc1  $zero, $f0
-/* 089C10 80089010 00000000 */  nop   
-/* 089C14 80089014 E480008C */  swc1  $f0, 0x8c($a0)
-/* 089C18 80089018 03E00008 */  jr    $ra
-/* 089C1C 8008901C E480009C */   swc1  $f0, 0x9c($a0)
diff --git a/asm/non_matchings/code_80086E70/func_8008B44C.s b/asm/non_matchings/code_80086E70/func_8008B44C.s
deleted file mode 100644
index dffc21aaa..000000000
--- a/asm/non_matchings/code_80086E70/func_8008B44C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-glabel func_8008B44C
-/* 08C04C 8008B44C 000470C0 */  sll   $t6, $a0, 3
-/* 08C050 8008B450 01C47023 */  subu  $t6, $t6, $a0
-/* 08C054 8008B454 3C0F8016 */  lui   $t7, %hi(D_80165C18) # $t7, 0x8016
-/* 08C058 8008B458 25EF5C18 */  addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18
-/* 08C05C 8008B45C 000E7140 */  sll   $t6, $t6, 5
-/* 08C060 8008B460 01CF1021 */  addu  $v0, $t6, $t7
-/* 08C064 8008B464 8C58007C */  lw    $t8, 0x7c($v0)
-/* 08C068 8008B468 A4400098 */  sh    $zero, 0x98($v0)
-/* 08C06C 8008B46C 27190008 */  addiu $t9, $t8, 8
-/* 08C070 8008B470 03E00008 */  jr    $ra
-/* 08C074 8008B474 AC59007C */   sw    $t9, 0x7c($v0)
diff --git a/asm/non_matchings/code_80091750/func_80093A30.s b/asm/non_matchings/code_80091750/func_80093A30.s
deleted file mode 100644
index 326e2d681..000000000
--- a/asm/non_matchings/code_80091750/func_80093A30.s
+++ /dev/null
@@ -1,12 +0,0 @@
-glabel func_80093A30
-/* 094630 80093A30 00802825 */  move  $a1, $a0
-/* 094634 80093A34 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 094638 80093A38 3C04800F */  lui   $a0, %hi(D_800F0B1C)
-/* 09463C 80093A3C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 094640 80093A40 00852021 */  addu  $a0, $a0, $a1
-/* 094644 80093A44 0C0278AA */  jal   func_8009E2A8
-/* 094648 80093A48 80840B1C */   lb    $a0, %lo(D_800F0B1C)($a0)
-/* 09464C 80093A4C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 094650 80093A50 27BD0018 */  addiu $sp, $sp, 0x18
-/* 094654 80093A54 03E00008 */  jr    $ra
-/* 094658 80093A58 00000000 */   nop   
diff --git a/asm/non_matchings/code_80091750/func_80094660.s b/asm/non_matchings/code_80091750/func_80094660.s
deleted file mode 100644
index 4e9b18eba..000000000
--- a/asm/non_matchings/code_80091750/func_80094660.s
+++ /dev/null
@@ -1,86 +0,0 @@
-glabel func_80094660
-/* 095260 80094660 27BDFFA8 */  addiu $sp, $sp, -0x58
-/* 095264 80094664 AFBF0034 */  sw    $ra, 0x34($sp)
-/* 095268 80094668 AFB00030 */  sw    $s0, 0x30($sp)
-/* 09526C 8009466C AFA40058 */  sw    $a0, 0x58($sp)
-/* 095270 80094670 0C0A9F02 */  jal   move_segment_table_to_dmem
-/* 095274 80094674 AFA5005C */   sw    $a1, 0x5c($sp)
-/* 095278 80094678 3C108015 */  lui   $s0, %hi(gDisplayListHead) # $s0, 0x8015
-/* 09527C 8009467C 26100298 */  addiu $s0, %lo(gDisplayListHead) # addiu $s0, $s0, 0x298
-/* 095280 80094680 8E020000 */  lw    $v0, ($s0)
-/* 095284 80094684 3C0142C8 */  li    $at, 0x42C80000 # 100.000000
-/* 095288 80094688 44812000 */  mtc1  $at, $f4
-/* 09528C 8009468C 244E0008 */  addiu $t6, $v0, 8
-/* 095290 80094690 AE0E0000 */  sw    $t6, ($s0)
-/* 095294 80094694 3C0FBA00 */  lui   $t7, (0xBA001301 >> 16) # lui $t7, 0xba00
-/* 095298 80094698 3C014648 */  li    $at, 0x46480000 # 12800.000000
-/* 09529C 8009469C 44813000 */  mtc1  $at, $f6
-/* 0952A0 800946A0 35EF1301 */  ori   $t7, (0xBA001301 & 0xFFFF) # ori $t7, $t7, 0x1301
-/* 0952A4 800946A4 3C180008 */  lui   $t8, 8
-/* 0952A8 800946A8 3C013F80 */  li    $at, 0x3F800000 # 1.000000
-/* 0952AC 800946AC AC580004 */  sw    $t8, 4($v0)
-/* 0952B0 800946B0 AC4F0000 */  sw    $t7, ($v0)
-/* 0952B4 800946B4 44814000 */  mtc1  $at, $f8
-/* 0952B8 800946B8 3C073FAA */  lui   $a3, (0x3FAAAAAB >> 16) # lui $a3, 0x3faa
-/* 0952BC 800946BC 34E7AAAB */  ori   $a3, (0x3FAAAAAB & 0xFFFF) # ori $a3, $a3, 0xaaab
-/* 0952C0 800946C0 8FA40058 */  lw    $a0, 0x58($sp)
-/* 0952C4 800946C4 27A50056 */  addiu $a1, $sp, 0x56
-/* 0952C8 800946C8 3C064234 */  lui   $a2, 0x4234
-/* 0952CC 800946CC E7A40010 */  swc1  $f4, 0x10($sp)
-/* 0952D0 800946D0 E7A60014 */  swc1  $f6, 0x14($sp)
-/* 0952D4 800946D4 0C033CCC */  jal   guPerspective
-/* 0952D8 800946D8 E7A80018 */   swc1  $f8, 0x18($sp)
-/* 0952DC 800946DC 8E020000 */  lw    $v0, ($s0)
-/* 0952E0 800946E0 3C08B400 */  lui   $t0, 0xb400
-/* 0952E4 800946E4 3C0A8019 */  lui   $t2, %hi(D_8018EDC0) # $t2, 0x8019
-/* 0952E8 800946E8 24590008 */  addiu $t9, $v0, 8
-/* 0952EC 800946EC AE190000 */  sw    $t9, ($s0)
-/* 0952F0 800946F0 AC480000 */  sw    $t0, ($v0)
-/* 0952F4 800946F4 97A90056 */  lhu   $t1, 0x56($sp)
-/* 0952F8 800946F8 44800000 */  mtc1  $zero, $f0
-/* 0952FC 800946FC 3C013F80 */  li    $at, 0x3F800000 # 1.000000
-/* 095300 80094700 AC490004 */  sw    $t1, 4($v0)
-/* 095304 80094704 8D4AEDC0 */  lw    $t2, %lo(D_8018EDC0)($t2)
-/* 095308 80094708 8FA40058 */  lw    $a0, 0x58($sp)
-/* 09530C 8009470C 44818000 */  mtc1  $at, $f16
-/* 095310 80094710 448A5000 */  mtc1  $t2, $f10
-/* 095314 80094714 44050000 */  mfc1  $a1, $f0
-/* 095318 80094718 44060000 */  mfc1  $a2, $f0
-/* 09531C 8009471C 468052A0 */  cvt.s.w $f10, $f10
-/* 095320 80094720 E7A00024 */  swc1  $f0, 0x24($sp)
-/* 095324 80094724 E7A0001C */  swc1  $f0, 0x1c($sp)
-/* 095328 80094728 E7A00018 */  swc1  $f0, 0x18($sp)
-/* 09532C 8009472C E7A00014 */  swc1  $f0, 0x14($sp)
-/* 095330 80094730 E7A00010 */  swc1  $f0, 0x10($sp)
-/* 095334 80094734 44075000 */  mfc1  $a3, $f10
-/* 095338 80094738 248401C0 */  addiu $a0, $a0, 0x1c0
-/* 09533C 8009473C 0C033D92 */  jal   guLookAt
-/* 095340 80094740 E7B00020 */   swc1  $f16, 0x20($sp)
-/* 095344 80094744 0C0250B4 */  jal   func_800942D0
-/* 095348 80094748 00000000 */   nop   
-/* 09534C 8009474C 8E020000 */  lw    $v0, ($s0)
-/* 095350 80094750 3C0CE700 */  lui   $t4, 0xe700
-/* 095354 80094754 3C0EBA00 */  lui   $t6, (0xBA001301 >> 16) # lui $t6, 0xba00
-/* 095358 80094758 244B0008 */  addiu $t3, $v0, 8
-/* 09535C 8009475C AE0B0000 */  sw    $t3, ($s0)
-/* 095360 80094760 AC400004 */  sw    $zero, 4($v0)
-/* 095364 80094764 AC4C0000 */  sw    $t4, ($v0)
-/* 095368 80094768 8E020000 */  lw    $v0, ($s0)
-/* 09536C 8009476C 35CE1301 */  ori   $t6, (0xBA001301 & 0xFFFF) # ori $t6, $t6, 0x1301
-/* 095370 80094770 3C18BA00 */  lui   $t8, (0xBA000C02 >> 16) # lui $t8, 0xba00
-/* 095374 80094774 244D0008 */  addiu $t5, $v0, 8
-/* 095378 80094778 AE0D0000 */  sw    $t5, ($s0)
-/* 09537C 8009477C AC400004 */  sw    $zero, 4($v0)
-/* 095380 80094780 AC4E0000 */  sw    $t6, ($v0)
-/* 095384 80094784 8E020000 */  lw    $v0, ($s0)
-/* 095388 80094788 37180C02 */  ori   $t8, (0xBA000C02 & 0xFFFF) # ori $t8, $t8, 0xc02
-/* 09538C 8009478C 24192000 */  li    $t9, 8192
-/* 095390 80094790 244F0008 */  addiu $t7, $v0, 8
-/* 095394 80094794 AE0F0000 */  sw    $t7, ($s0)
-/* 095398 80094798 AC590004 */  sw    $t9, 4($v0)
-/* 09539C 8009479C AC580000 */  sw    $t8, ($v0)
-/* 0953A0 800947A0 8FBF0034 */  lw    $ra, 0x34($sp)
-/* 0953A4 800947A4 8FB00030 */  lw    $s0, 0x30($sp)
-/* 0953A8 800947A8 27BD0058 */  addiu $sp, $sp, 0x58
-/* 0953AC 800947AC 03E00008 */  jr    $ra
-/* 0953B0 800947B0 00000000 */   nop   
diff --git a/asm/non_matchings/code_80091750/func_800959A0.s b/asm/non_matchings/code_80091750/func_800959A0.s
deleted file mode 100644
index 164907a5b..000000000
--- a/asm/non_matchings/code_80091750/func_800959A0.s
+++ /dev/null
@@ -1,12 +0,0 @@
-glabel func_800959A0
-/* 0965A0 800959A0 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 0965A4 800959A4 8FAE0030 */  lw    $t6, 0x30($sp)
-/* 0965A8 800959A8 AFBF001C */  sw    $ra, 0x1c($sp)
-/* 0965AC 800959AC 240F0040 */  li    $t7, 64
-/* 0965B0 800959B0 AFAF0014 */  sw    $t7, 0x14($sp)
-/* 0965B4 800959B4 0C025635 */  jal   func_800958D4
-/* 0965B8 800959B8 AFAE0010 */   sw    $t6, 0x10($sp)
-/* 0965BC 800959BC 8FBF001C */  lw    $ra, 0x1c($sp)
-/* 0965C0 800959C0 27BD0020 */  addiu $sp, $sp, 0x20
-/* 0965C4 800959C4 03E00008 */  jr    $ra
-/* 0965C8 800959C8 00000000 */   nop   
diff --git a/asm/non_matchings/code_80091750/func_800959CC.s b/asm/non_matchings/code_80091750/func_800959CC.s
deleted file mode 100644
index 270c659ff..000000000
--- a/asm/non_matchings/code_80091750/func_800959CC.s
+++ /dev/null
@@ -1,12 +0,0 @@
-glabel func_800959CC
-/* 0965CC 800959CC 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 0965D0 800959D0 8FAE0030 */  lw    $t6, 0x30($sp)
-/* 0965D4 800959D4 AFBF001C */  sw    $ra, 0x1c($sp)
-/* 0965D8 800959D8 240F0004 */  li    $t7, 4
-/* 0965DC 800959DC AFAF0014 */  sw    $t7, 0x14($sp)
-/* 0965E0 800959E0 0C025635 */  jal   func_800958D4
-/* 0965E4 800959E4 AFAE0010 */   sw    $t6, 0x10($sp)
-/* 0965E8 800959E8 8FBF001C */  lw    $ra, 0x1c($sp)
-/* 0965EC 800959EC 27BD0020 */  addiu $sp, $sp, 0x20
-/* 0965F0 800959F0 03E00008 */  jr    $ra
-/* 0965F4 800959F4 00000000 */   nop   
diff --git a/asm/non_matchings/memory/func_802A7CF0.s b/asm/non_matchings/memory/func_802A7CF0.s
deleted file mode 100644
index bd2c060e1..000000000
--- a/asm/non_matchings/memory/func_802A7CF0.s
+++ /dev/null
@@ -1,12 +0,0 @@
-glabel func_802A7CF0
-/* 111300 802A7CF0 2402FFF0 */  li    $v0, -16
-/* 111304 802A7CF4 248E000F */  addiu $t6, $a0, 0xf
-/* 111308 802A7CF8 01C22024 */  and   $a0, $t6, $v0
-/* 11130C 802A7CFC 00A22824 */  and   $a1, $a1, $v0
-/* 111310 802A7D00 00A47823 */  subu  $t7, $a1, $a0
-/* 111314 802A7D04 25F8FFF0 */  addiu $t8, $t7, -0x10
-/* 111318 802A7D08 3C018016 */  lui   $at, %hi(D_8015F724) # $at, 0x8016
-/* 11131C 802A7D0C AC38F724 */  sw    $t8, %lo(D_8015F724)($at)
-/* 111320 802A7D10 3C018016 */  lui   $at, %hi(gPrevLoadedAddress) # $at, 0x8016
-/* 111324 802A7D14 03E00008 */  jr    $ra
-/* 111328 802A7D18 AC24F728 */   sw    $a0, %lo(gPrevLoadedAddress)($at) # $a0, -0x8d8($at)
diff --git a/include/common_structs.h b/include/common_structs.h
index 79ddfdd19..cd62cadc1 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -439,8 +439,13 @@ typedef struct
     /* 0x6C */ s32 unk_06C;
     /* 0x70 */ s32 unk_070;
     /* 0x74 */ s32 unk_074;
-    /* 0x78 */ s8  unk_078[0x0C];
-    /* 0x84 */ s16 unk_084[0xE];
+    /* 0x78 */ s8  unk_078[0x04];
+    /* 0x7C */ s32 unk_07C;
+    /* 0x80 */ s32 unk_080;
+    /* 0x84 */ s16 unk_084[0xA];
+    /* 0x98 */ s16 unk_098;
+    /* 0x9A */ s16 unk_09A;
+    /* 0x9C */ s32 unk_09C;
     /* 0xA0 */ s16 unk_0A0;
     /* 0xA2 */ s16 unk_0A2;
     /* 0xA4 */ s16 unk_0A4;
diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c
index 964c74ca0..7014b28b2 100644
--- a/src/code_80005FD0.c
+++ b/src/code_80005FD0.c
@@ -7901,15 +7901,15 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800146B8.s")
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800139E4(f32, f32, ?, ?, ? *, s16 *); // extern
+//? func_800139E4(f32, f32, ?, ?, ? *, s16 *); // extern
 extern f64 D_800ED1B8;
 extern f64 D_800ED1C0;
 extern f64 D_800ED1C8;
-extern ? D_80163818;
+extern s32 D_80163818;
 
 void func_800147E0(void) {
     f64 temp_f0;
-    ? phi_a2;
+    s32 phi_a2;
 
     temp_f0 = (gCCSelection * D_800ED1B8) / 216.0;
     phi_a2 = 7;
@@ -7943,29 +7943,19 @@ void func_8001487C(void) {
 GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001487C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80013F7C(? *, ?, f32, s32, s32); // extern
-extern ? D_80163818;
+void func_80013F7C(s32 playerId, Player *player, void *arg2, f32 arg3, f32 arg4, s32 arg5, u32 arg6);
 
-void func_800148C4(void) {
-    func_80013F7C(&D_80163818, 0x425C0000, 12.5f, 7, 0x51018003);
+extern s32 D_80163818;
+
+void func_800148C4(s32 arg0, s32 arg1) {
+    func_80013F7C(arg0, arg1, &D_80163818, 55.0f, 12.5f, 7, 0x51018003);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800148C4.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800146B8(?, ? *); // extern
-extern ? D_80163818;
+extern s32 D_80163818;
 
-void func_8001490C(void) {
-    func_800146B8(7, &D_80163818);
+void func_8001490C(s32 arg0) {
+    func_800146B8(arg0, 7, &D_80163818);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001490C.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -8011,29 +8001,17 @@ void func_800149D0(void) {
 GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800149D0.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80013F7C(? *, ?, f32, s32, s32); // extern
-extern ? D_80163988;
+extern s32 D_80163988;
 
-void func_80014A18(void) {
-    func_80013F7C(&D_80163988, 0x428C0000, 12.5f, 7, 0x51018002);
+void func_80014A18(s32 arg0, s32 arg1) {
+    func_80013F7C(arg0, arg1, &D_80163988, 70.0f, 12.5f, 7, 0x51018002);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014A18.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800146B8(?, ? *); // extern
-extern ? D_80163988;
+extern s32 D_80163988;
 
-void func_80014A60(void) {
-    func_800146B8(7, &D_80163988);
+void func_80014A60(s32 arg0) {
+    func_800146B8(arg0, 7, &D_80163988);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014A60.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -8079,29 +8057,17 @@ void func_80014B24(void) {
 GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014B24.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80013F7C(? *, ?, f32, s32, s32); // extern
-extern ? D_80163AF8;
+extern s32 D_80163AF8;
 
-void func_80014B6C(void) {
-    func_80013F7C(&D_80163AF8, 0x425C0000, 12.5f, 7, 0x51018004);
+void func_80014B6C(s32 arg0, s32 arg1) {
+    func_80013F7C(arg0, arg1, &D_80163AF8, 55.0f, 12.5f, 7, 0x51018004);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014B6C.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800146B8(?, ? *); // extern
-extern ? D_80163AF8;
+extern s32 D_80163AF8;
 
-void func_80014BB4(void) {
-    func_800146B8(7, &D_80163AF8);
+void func_80014BB4(s32 arg0) {
+    func_800146B8(arg0, 7, &D_80163AF8);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014BB4.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -8147,29 +8113,17 @@ void func_80014C78(void) {
 GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014C78.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80013F7C(? *, ?, f32, s32, s32); // extern
-extern ? D_80163C68;
+extern s32 D_80163C68;
 
-void func_80014CC0(void) {
-    func_80013F7C(&D_80163C68, 0x41380000, 8.5f, 7, 0x51018005);
+void func_80014CC0(s32 arg0, s32 arg1) {
+    func_80013F7C(arg0, arg1, &D_80163C68, 11.5f, 8.5f, 7, 0x51018005);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014CC0.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800146B8(?, ? *); // extern
-extern ? D_80163C68;
+extern s32 D_80163C68;
 
-void func_80014D08(void) {
-    func_800146B8(7, &D_80163C68);
+void func_80014D08(s32 arg0) {
+    func_800146B8(arg0, 7, &D_80163C68);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014D08.s")
-#endif
 
 void func_80014D30(s32 cameraId, s32 pathIndex) {
     s16 cameraWayPoint;
@@ -8394,14 +8348,14 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800151A4.s")
 
 #ifdef MIPS_TO_C
 //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
-? func_80015390(Camera *, Player *, ?, s32);        /* extern */
-
+//? func_80015390(Camera *, Player *, ?, s32);        /* extern */
+void func_80015390(Camera*, Player*, s32,s32);
 void func_80015314(s32 playerId, s32 arg1, s32 cameraId) {
-    Camera *temp_a0;
-    Player *temp_a1;
+    Camera *temp_a0 = &camera1[cameraId];
+    Player *temp_a1 = &gPlayerOne[playerId];
 
-    temp_a1 = &gPlayerOne[playerId];
-    temp_a0 = &camera1[cameraId];
+    //temp_a1 = &gPlayerOne[playerId];
+    //temp_a0 = &camera1[cameraId];
     temp_a0->unk_2C = temp_a1->unk_02E;
     func_80015390(temp_a0, temp_a1, 0, playerId);
 }
diff --git a/src/code_800431B0.c b/src/code_800431B0.c
index 9caf3d565..941a83041 100644
--- a/src/code_800431B0.c
+++ b/src/code_800431B0.c
@@ -6748,18 +6748,10 @@ void func_8005309C(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005309C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80052F20(s32); // extern
-? func_8005309C(); // extern
-
 void func_8005327C(s32 arg0) {
     func_8005309C();
     func_80052F20(arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005327C.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -8597,17 +8589,11 @@ void func_80055FA0(s32 arg0, s32 arg1) {
 GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055FA0.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80055FA0(s32, s32); // extern
 extern s32 D_80183EAC;
 
 void func_80056160(s32 arg0) {
     func_80055FA0(D_80183EAC, arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80056160.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
diff --git a/src/code_80057C60.c b/src/code_80057C60.c
index fee72ae9a..a5835be8e 100644
--- a/src/code_80057C60.c
+++ b/src/code_80057C60.c
@@ -2496,23 +2496,26 @@ block_10:
 GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005C360.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 void func_8005C64C(s32 arg0) {
 
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005C64C.s")
-#endif
+
+void func_8005C654(s32 *arg0) {
+    *arg0 = 0;
+}
+extern s32 D_8018D2C8[];
+
+void func_8005C65C(s32 arg0) {
+    D_8018D2C8[arg0] = 1;
+}
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_800E4730;
+extern s16 D_800E4730[];
 
 void func_8005C674(s8 arg0, s16 *arg1, s16 *arg2, s16 *arg3) {
-    void *temp_v0;
+    void *temp_v0 = D_800E4730 + arg0;
 
-    temp_v0 = (arg0 * 6) + &D_800E4730;
     *arg1 = temp_v0->unk0;
     *arg2 = temp_v0->unk2;
     *arg3 = temp_v0->unk4;
diff --git a/src/code_80071F00.c b/src/code_80071F00.c
index c45bcc35e..5f95f7a15 100644
--- a/src/code_80071F00.c
+++ b/src/code_80071F00.c
@@ -3319,18 +3319,10 @@ loop_1:
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077AB0.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80072488(); // extern
-? func_80086E70(s32); // extern
-
 void func_80077B14(s32 arg0) {
-    func_80072488();
+    func_80072488(arg0);
     func_80086E70(arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077B14.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -4191,53 +4183,25 @@ void func_80078F64(void) {
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078F64.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800723A4(s32, ?); // extern
-extern ? D_80183DB8;
+extern s32 D_80183DB8[];
 
 void func_80079054(s32 arg0) {
-    func_800723A4(*(&D_80183DB8 + (arg0 * 4)), 2);
+    func_800723A4(D_80183DB8[arg0], 2);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079054.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800723A4(s32, ?); // extern
-extern ? D_80183DB8;
 
 void func_80079084(s32 arg0) {
-    func_800723A4(*(&D_80183DB8 + (arg0 * 4)), 4);
+    func_800723A4(D_80183DB8[arg0], 4);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079084.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800723A4(s32, ?); // extern
-extern ? D_80183DB8;
 
 void func_800790B4(s32 arg0) {
-    func_800723A4(*(&D_80183DB8 + (arg0 * 4)), 5);
+    func_800723A4(D_80183DB8[arg0], 5);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800790B4.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800723A4(s32, ?); // extern
-extern ? D_80183DB8;
+extern s32 D_80183DB8[];
 
 void func_800790E4(s32 arg0) {
-    func_800723A4(*(&D_80183DB8 + (arg0 * 4)), 6);
+    func_800723A4(D_80183DB8[arg0], 6);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800790E4.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -7186,18 +7150,10 @@ s32 func_8007D804(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D804.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80072488(); // extern
-? func_80086E70(s32); // extern
-
 void func_8007D8AC(s32 arg0) {
-    func_80072488();
+    func_80072488(arg0);
     func_80086E70(arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D8AC.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -7272,18 +7228,10 @@ void func_8007D8D4(s32 arg0, s32 arg1) {
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D8D4.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8008781C(); // extern
-? func_8008BF18(s32); // extern
-
 void func_8007DA4C(s32 arg0) {
-    func_8008781C();
+    func_8008781C(arg0);
     func_8008BF18(arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007DA4C.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -12049,20 +11997,11 @@ void func_8008502C(s32 arg0, ? arg1) {
 GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8008502C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800873F4(s32); // extern
-? func_8008B78C(); // extern
-? func_8008BF18(s32); // extern
-
 void func_80085080(s32 arg0) {
-    func_8008B78C();
+    func_8008B78C(arg0);
     func_8008BF18(arg0);
     func_800873F4(arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085080.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
diff --git a/src/code_80086E70.c b/src/code_80086E70.c
index ae217d272..c647939c5 100644
--- a/src/code_80086E70.c
+++ b/src/code_80086E70.c
@@ -2,121 +2,71 @@
 #include <macros.h>
 #include <common_structs.h>
 #include <types.h>
+#include "math_util_2.h"
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800721E8(?); // extern
-extern ? D_80165CC6;
+// Struct from 80071F00.c
+// No idea if it goes here. But it gets us to the size requirement.
+// Once we find out what this actually is, we can replace it.
+struct struct_E0 {
+    union {
+        s8 s8;
+        s16 s16;
+    } unk00;
+    s16 unk2;
+    s8 unk4[0xDC];
+}; // Size 0xE0
+extern struct struct_E0 D_80165CC6[];
 
+void func_800721E8(s32, s32); // extern
 void func_80086E70(s32 arg0) {
-    *(&D_80165CC6 + (arg0 * 0xE0)) = 1;
-    func_800721E8(8);
-}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80086E70.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800721E8(?); // extern
-extern ? D_80165C18;
-
-void func_80086EAC(s32 arg0, s8 arg1, s16 arg2) {
-    void *temp_v0;
-
-    temp_v0 = (arg0 * 0xE0) + &D_80165C18;
-    temp_v0->unkDD = arg1;
-    temp_v0->unkAE = arg2;
-    func_800721E8(8);
-}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80086EAC.s")
-#endif
-
-void func_80086EF0(void) {
-    func_80086E70();
+    D_80165CC6[arg0].unk00.s16 = 1;// * 0xE0)) = 1;
+    func_800721E8(arg0, 8);
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80086E70(); // extern
-extern ? D_80165C18;
+extern struct_80165C18_entry D_80165C18[];
+
+void func_80086EAC(s32 arg0, s32 arg1, s16 arg2) {
+    D_80165C18[arg0].unk_0DD = arg1;
+    D_80165C18[arg0].unk_0AE = arg2;
+    func_800721E8(arg0, 8);
+}
+
+void func_80086EF0(s32 arg0) {
+    func_80086E70(arg0);
+}
 
 void func_80086F10(s32 arg0, s32 arg1, s32 arg2) {
-    void *temp_v0;
-
-    func_80086E70();
-    temp_v0 = (arg0 * 0xE0) + &D_80165C18;
-    temp_v0->unkDE = arg1;
-    temp_v0->unk80 = arg2;
+    func_80086E70(arg0);
+    D_80165C18[arg0].unk_0DE = arg1;
+    D_80165C18[arg0].unk_080 = arg2;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80086F10.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800721E8(?); // extern
-extern ? D_80165C18;
 
 void func_80086F60(s32 arg0) {
-    void *temp_v0;
-
-    temp_v0 = (arg0 * 0xE0) + &D_80165C18;
-    temp_v0->unkAE = 0;
-    temp_v0->unkDD = 0;
-    temp_v0->unkDE = 0;
-    func_800721E8(8);
+    D_80165C18[arg0].unk_0AE = 0;
+    D_80165C18[arg0].unk_0DD = 0;
+    D_80165C18[arg0].unk_0DE = 0;
+    func_800721E8(arg0, 8);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80086F60.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165CC6;
+extern struct struct_E0 D_80165CC6[];
 
-? func_80086FA4(s32 arg0) {
-    ? phi_v1;
-
-    phi_v1 = 0;
-    if (*(&D_80165CC6 + (arg0 * 0xE0)) == 0) {
-        phi_v1 = 1;
+s32 func_80086FA4(s32 arg0) {
+    s32 ret = 0;
+    if (D_80165CC6[arg0].unk00.s16 == 0) {
+        ret = 1;
     }
-    return phi_v1;
+    return ret;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80086FA4.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800721E8(?); // extern
-extern ? D_80165C18;
 
 void func_80086FD4(s32 arg0) {
-    void *temp_v0;
-
-    func_800721E8(8);
-    temp_v0 = (arg0 * 0xE0) + &D_80165C18;
-    temp_v0->unkAE = temp_v0->unkAE + 1;
+    func_800721E8(arg0, 8);
+    D_80165C18[arg0].unk_0AE += 1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80086FD4.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800721E8(?); // extern
-extern ? D_80165CC6;
 
 void func_8008701C(s32 arg0, s32 arg1) {
-    func_800721E8(8);
-    *(&D_80165CC6 + (arg0 * 0xE0)) = arg1;
+    func_800721E8(arg0, 8);
+    D_80165CC6[arg0].unk00.s16 = arg1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008701C.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -401,31 +351,19 @@ void func_800877C4(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80086E70/func_800877C4.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8008751C(); // extern
-? func_8008775C(s32); // extern
-
 void func_8008781C(s32 arg0) {
-    func_8008751C();
+    func_8008751C(arg0);
     func_8008775C(arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008781C.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8008757C(); // extern
-? func_80087710(s32); // extern
 
 void func_80087844(s32 arg0) {
-    func_8008757C();
+    func_8008757C(arg0);
     func_80087710(arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80087844.s")
-#endif
+
+f32 func_8008786C(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
+    return (((arg4 - arg2) / (arg3 - arg1)) * (arg0 - arg1)) + arg2;
+}
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -769,19 +707,9 @@ void func_800880E4(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80086E70/func_800880E4.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165C18;
-
 void func_80088150(s32 arg0) {
-    void *temp_v0;
-
-    temp_v0 = (arg0 * 0xE0) + &D_80165C18;
-    temp_v0->unk7C = temp_v0->unk7C + 8;
+    D_80165C18[arg0].unk_07C += 8;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80088150.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -1202,17 +1130,17 @@ f32 func_80088F54(s32 arg0, void *arg1) {
 GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80088F54.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_80088FF0(void *arg0) {
-    arg0->unk8C = 0.0f;
-    arg0->unk9C = 0.0f;
-    arg0->unk34 = 0.0f;
-    arg0->unk3C = 0.0f;
+void func_80088FF0(Player *player) {
+    player->unk_08C = 0.0f;
+    player->unk_09C = 0.0f;
+    player->unk_034[0] = 0.0f;
+    player->unk_034[2] = 0.0f;
+}
+
+UNUSED void func_8008900C(Player *player) {
+    player->unk_08C = 0.0f;
+    player->unk_09C = 0.0f;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80088FF0.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -2288,20 +2216,10 @@ void func_8008B3E4(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B3E4.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-extern ? D_80165C18;
-
 void func_8008B44C(s32 arg0) {
-    void *temp_v0;
-
-    temp_v0 = (arg0 * 0xE0) + &D_80165C18;
-    temp_v0->unk98 = 0;
-    temp_v0->unk7C = temp_v0->unk7C + 8;
+    D_80165C18[arg0].unk_098 = 0;
+    D_80165C18[arg0].unk_07C += 8;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B44C.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
diff --git a/src/code_80091750.c b/src/code_80091750.c
index 3e4e1c21b..76ff9d05f 100644
--- a/src/code_80091750.c
+++ b/src/code_80091750.c
@@ -1182,17 +1182,11 @@ void text_draw(s32 column, s32 row, char *text, s32 tracking, f32 x_scale, f32 y
     print_text2(column, row, text, tracking, x_scale, y_scale, 2);
 }
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8009E2A8(s8, s32); // extern
-extern ? D_800F0B1C;
+extern s8 D_800F0B1C[];
 
 void func_80093A30(s32 arg0) {
-    func_8009E2A8(*(&D_800F0B1C + arg0), arg0);
+    func_8009E2A8(D_800F0B1C[arg0], arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_80093A30.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
@@ -1883,7 +1877,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80095574.s")
 //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda
 extern s32 D_8018E7A8;
 
-void func_800958D4(s32 arg0, s32 ulx, s32 uly, s32 lrx, s32 lry, s32 arg5) {
+Gfx *func_800958D4(Gfx *displayListHead, s32 ulx, s32 uly, s32 lrx, s32 lry, s32 arg5) {
     s32 temp_lo;
     s32 phi_v0;
     s32 phi_v0_2;
@@ -1903,27 +1897,13 @@ void func_800958D4(s32 arg0, s32 ulx, s32 uly, s32 lrx, s32 lry, s32 arg5) {
 GLOBAL_ASM("asm/non_matchings/code_80091750/func_800958D4.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800958D4(s32, s32); // extern
-
-void func_800959A0(s32 arg4) {
-    func_800958D4(arg4, 0x40);
+Gfx *func_800959A0(Gfx *displayListHead, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
+    return func_800958D4(displayListHead, arg1, arg2, arg3, arg4, 64);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_800959A0.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800958D4(s32, s32); // extern
-
-void func_800959CC(s32 arg4) {
-    func_800958D4(arg4, 4);
+Gfx *func_800959CC(Gfx *displayListHead, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
+    func_800958D4(displayListHead, arg1, arg2, arg3, arg4, 4);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_800959CC.s")
-#endif
 
 Gfx *func_800959F8(Gfx *displayListHead, Vtx *arg1) {
     s32 index;