diff --git a/asm/non_matchings/ovl19/ovl19_3/func_80227B20_ovl19.s b/asm/non_matchings/ovl19/ovl19_3/func_80227B20_ovl19.s
deleted file mode 100644
index 9fe1da87..00000000
--- a/asm/non_matchings/ovl19/ovl19_3/func_80227B20_ovl19.s
+++ /dev/null
@@ -1,95 +0,0 @@
-glabel func_80227B20_ovl19
-/* 248230 80227B20 3C0E800D */  lui   $t6, %hi(D_800D6B54) # $t6, 0x800d
-/* 248234 80227B24 8DCE6B54 */  lw    $t6, %lo(D_800D6B54)($t6)
-/* 248238 80227B28 27BDFFC8 */  addiu $sp, $sp, -0x38
-/* 24823C 80227B2C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 248240 80227B30 15C0000E */  bnez  $t6, .L80227B6C_ovl19
-/* 248244 80227B34 3C028005 */   lui   $v0, %hi(D_8004A7C4) # $v0, 0x8005
-/* 248248 80227B38 8C42A7C4 */  lw    $v0, %lo(D_8004A7C4)($v0)
-/* 24824C 80227B3C 3C01800E */ lui $at, %hi(D_800E7B20)
-/* 248250 80227B40 44802000 */  mtc1  $zero, $f4
-/* 248254 80227B44 8C430000 */  lw    $v1, ($v0)
-/* 248258 80227B48 00031880 */  sll   $v1, $v1, 2
-/* 24825C 80227B4C 00230821 */  addu  $at, $at, $v1
-/* 248260 80227B50 C4267B20 */ lwc1 $f6, %lo(D_800E7B20)($at)
-/* 248264 80227B54 3C01800E */ lui $at, %hi(D_800E2B10)
-/* 248268 80227B58 00230821 */  addu  $at, $at, $v1
-/* 24826C 80227B5C 46062032 */  c.eq.s $f4, $f6
-/* 248270 80227B60 00000000 */  nop   
-/* 248274 80227B64 45000003 */  bc1f  .L80227B74_ovl19
-/* 248278 80227B68 00000000 */   nop   
-.L80227B6C_ovl19:
-/* 24827C 80227B6C 10000042 */  b     .L80227C78_ovl19
-/* 248280 80227B70 24020001 */   li    $v0, 1
-.L80227B74_ovl19:
-/* 248284 80227B74 C4282B10 */ lwc1 $f8, %lo(D_800E2B10)($at)
-/* 248288 80227B78 3C01800E */ lui $at, %hi(D_800E2CD0)
-/* 24828C 80227B7C 27A4002C */  addiu $a0, $sp, 0x2c
-/* 248290 80227B80 E7A8002C */  swc1  $f8, 0x2c($sp)
-/* 248294 80227B84 8C4F0000 */  lw    $t7, ($v0)
-/* 248298 80227B88 27A50020 */  addiu $a1, $sp, 0x20
-/* 24829C 80227B8C 000FC080 */  sll   $t8, $t7, 2
-/* 2482A0 80227B90 00380821 */  addu  $at, $at, $t8
-/* 2482A4 80227B94 C42A2CD0 */ lwc1 $f10, %lo(D_800E2CD0)($at)
-/* 2482A8 80227B98 3C01800E */ lui $at, %hi(D_800E2E90)
-/* 2482AC 80227B9C E7AA0030 */  swc1  $f10, 0x30($sp)
-/* 2482B0 80227BA0 8C590000 */  lw    $t9, ($v0)
-/* 2482B4 80227BA4 00194080 */  sll   $t0, $t9, 2
-/* 2482B8 80227BA8 00280821 */  addu  $at, $at, $t0
-/* 2482BC 80227BAC C4302E90 */ lwc1 $f16, %lo(D_800E2E90)($at)
-/* 2482C0 80227BB0 3C01800E */ lui $at, %hi(gEntitiesPosXArray)
-/* 2482C4 80227BB4 E7B00034 */  swc1  $f16, 0x34($sp)
-/* 2482C8 80227BB8 8C490000 */  lw    $t1, ($v0)
-/* 2482CC 80227BBC 00095080 */  sll   $t2, $t1, 2
-/* 2482D0 80227BC0 002A0821 */  addu  $at, $at, $t2
-/* 2482D4 80227BC4 C43225D0 */ lwc1 $f18, %lo(gEntitiesPosXArray)($at)
-/* 2482D8 80227BC8 3C01800E */ lui $at, %hi(gEntitiesPosYArray)
-/* 2482DC 80227BCC E7B20020 */  swc1  $f18, 0x20($sp)
-/* 2482E0 80227BD0 8C4B0000 */  lw    $t3, ($v0)
-/* 2482E4 80227BD4 000B6080 */  sll   $t4, $t3, 2
-/* 2482E8 80227BD8 002C0821 */  addu  $at, $at, $t4
-/* 2482EC 80227BDC C4242790 */ lwc1 $f4, %lo(gEntitiesPosYArray)($at)
-/* 2482F0 80227BE0 3C01800E */ lui $at, %hi(gEntitiesPosZArray)
-/* 2482F4 80227BE4 E7A40024 */  swc1  $f4, 0x24($sp)
-/* 2482F8 80227BE8 8C4D0000 */  lw    $t5, ($v0)
-/* 2482FC 80227BEC 000D7080 */  sll   $t6, $t5, 2
-/* 248300 80227BF0 002E0821 */  addu  $at, $at, $t6
-/* 248304 80227BF4 C4262950 */ lwc1 $f6, %lo(gEntitiesPosZArray)($at)
-/* 248308 80227BF8 0C0411D3 */  jal   func_8010474C
-/* 24830C 80227BFC E7A60028 */   swc1  $f6, 0x28($sp)
-/* 248310 80227C00 10400005 */  beqz  $v0, .L80227C18_ovl19
-/* 248314 80227C04 00000000 */   nop   
-/* 248318 80227C08 0C047503 */  jal   func_8011D40C
-/* 24831C 80227C0C 00000000 */   nop   
-/* 248320 80227C10 10000019 */  b     .L80227C78_ovl19
-/* 248324 80227C14 24020001 */   li    $v0, 1
-.L80227C18_ovl19:
-/* 248328 80227C18 3C028013 */  lui   $v0, %hi(gKirbyState) # $v0, 0x8013
-/* 24832C 80227C1C 2442E7C0 */  addiu $v0, %lo(gKirbyState) # addiu $v0, $v0, -0x1840
-/* 248330 80227C20 8C4F0140 */  lw    $t7, 0x140($v0)
-/* 248334 80227C24 3C188005 */  lui   $t8, %hi(D_8004A7C4) # $t8, 0x8005
-/* 248338 80227C28 51E00013 */  beql  $t7, $zero, .L80227C78_ovl19
-/* 24833C 80227C2C 00001025 */   move  $v0, $zero
-/* 248340 80227C30 8F18A7C4 */  lw    $t8, %lo(D_8004A7C4)($t8)
-/* 248344 80227C34 3C01800E */ lui $at, %hi(D_800E7B20)
-/* 248348 80227C38 44804000 */  mtc1  $zero, $f8
-/* 24834C 80227C3C 8F190000 */  lw    $t9, ($t8)
-/* 248350 80227C40 00194080 */  sll   $t0, $t9, 2
-/* 248354 80227C44 00280821 */  addu  $at, $at, $t0
-/* 248358 80227C48 C42A7B20 */ lwc1 $f10, %lo(D_800E7B20)($at)
-/* 24835C 80227C4C 460A4032 */  c.eq.s $f8, $f10
-/* 248360 80227C50 00000000 */  nop   
-/* 248364 80227C54 45030008 */  bc1tl .L80227C78_ovl19
-/* 248368 80227C58 00001025 */   move  $v0, $zero
-/* 24836C 80227C5C 8C490044 */  lw    $t1, 0x44($v0)
-/* 248370 80227C60 24010004 */  li    $at, 4
-/* 248374 80227C64 51210004 */  beql  $t1, $at, .L80227C78_ovl19
-/* 248378 80227C68 00001025 */   move  $v0, $zero
-/* 24837C 80227C6C 10000002 */  b     .L80227C78_ovl19
-/* 248380 80227C70 24020001 */   li    $v0, 1
-/* 248384 80227C74 00001025 */  move  $v0, $zero
-.L80227C78_ovl19:
-/* 248388 80227C78 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 24838C 80227C7C 27BD0038 */  addiu $sp, $sp, 0x38
-/* 248390 80227C80 03E00008 */  jr    $ra
-/* 248394 80227C84 00000000 */   nop   
diff --git a/asm/non_matchings/ovl19/ovl19_3/func_802283A8_ovl19.s b/asm/non_matchings/ovl19/ovl19_3/func_802283A8_ovl19.s
deleted file mode 100644
index 4e47d5ab..00000000
--- a/asm/non_matchings/ovl19/ovl19_3/func_802283A8_ovl19.s
+++ /dev/null
@@ -1,51 +0,0 @@
-glabel func_802283A8_ovl19
-/* 248AB8 802283A8 3C028005 */  lui   $v0, %hi(D_8004A7C4) # $v0, 0x8005
-/* 248ABC 802283AC 8C42A7C4 */  lw    $v0, %lo(D_8004A7C4)($v0)
-/* 248AC0 802283B0 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 248AC4 802283B4 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 248AC8 802283B8 AFA40018 */  sw    $a0, 0x18($sp)
-/* 248ACC 802283BC 8C430000 */  lw    $v1, ($v0)
-/* 248AD0 802283C0 3C01800E */ lui $at, %hi(D_800E17D0)
-/* 248AD4 802283C4 3C18800F */ lui $t8, %hi(D_800E98E0)
-/* 248AD8 802283C8 00031880 */  sll   $v1, $v1, 2
-/* 248ADC 802283CC 00230821 */  addu  $at, $at, $v1
-/* 248AE0 802283D0 C42417D0 */ lwc1 $f4, %lo(D_800E17D0)($at)
-/* 248AE4 802283D4 3C01800E */ lui $at, %hi(gEntitiesAngleYArray)
-/* 248AE8 802283D8 00230821 */  addu  $at, $at, $v1
-/* 248AEC 802283DC E42441D0 */ swc1 $f4, %lo(gEntitiesAngleYArray)($at)
-/* 248AF0 802283E0 8C4E0000 */  lw    $t6, ($v0)
-/* 248AF4 802283E4 3C01420C */  li    $at, 0x420C0000 # 35.000000
-/* 248AF8 802283E8 000E7880 */  sll   $t7, $t6, 2
-/* 248AFC 802283EC 030FC021 */  addu  $t8, $t8, $t7
-/* 248B00 802283F0 8F1898E0 */ lw $t8, %lo(D_800E98E0)($t8)
-/* 248B04 802283F4 17000016 */  bnez  $t8, .L80228450_ovl19
-/* 248B08 802283F8 00000000 */   nop   
-/* 248B0C 802283FC 44813000 */  mtc1  $at, $f6
-/* 248B10 80228400 3C01800E */  lui   $at, %hi(gEntitiesPosYArray) # $at, 0x800e
-/* 248B14 80228404 C4282790 */  lwc1  $f8, %lo(gEntitiesPosYArray)($at)
-/* 248B18 80228408 3C028013 */  lui   $v0, %hi(gKirbyState) # $v0, 0x8013
-/* 248B1C 8022840C 2419004D */  li    $t9, 77
-/* 248B20 80228410 4606403E */  c.le.s $f8, $f6
-/* 248B24 80228414 2442E7C0 */  addiu $v0, %lo(gKirbyState) # addiu $v0, $v0, -0x1840
-/* 248B28 80228418 332400FF */  andi  $a0, $t9, 0xff
-/* 248B2C 8022841C 2405001C */  li    $a1, 28
-/* 248B30 80228420 4500000B */  bc1f  .L80228450_ovl19
-/* 248B34 80228424 00000000 */   nop   
-/* 248B38 80228428 0C048BE5 */  jal   set_kirby_action_2
-/* 248B3C 8022842C A059000C */   sb    $t9, 0xc($v0)
-/* 248B40 80228430 3C098005 */  lui   $t1, %hi(D_8004A7C4) # $t1, 0x8005
-/* 248B44 80228434 8D29A7C4 */  lw    $t1, %lo(D_8004A7C4)($t1)
-/* 248B48 80228438 3C01800F */ lui $at, %hi(D_800E98E0)
-/* 248B4C 8022843C 24080001 */  li    $t0, 1
-/* 248B50 80228440 8D2A0000 */  lw    $t2, ($t1)
-/* 248B54 80228444 000A5880 */  sll   $t3, $t2, 2
-/* 248B58 80228448 002B0821 */  addu  $at, $at, $t3
-/* 248B5C 8022844C AC2898E0 */ sw $t0, %lo(D_800E98E0)($at)
-.L80228450_ovl19:
-/* 248B60 80228450 3C048023 */  lui   $a0, %hi(D_8022FAB0) # $a0, 0x8023
-/* 248B64 80228454 0C03FC80 */  jal   func_800FF200
-/* 248B68 80228458 8C84FAB0 */   lw    $a0, %lo(D_8022FAB0)($a0)
-/* 248B6C 8022845C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 248B70 80228460 27BD0018 */  addiu $sp, $sp, 0x18
-/* 248B74 80228464 03E00008 */  jr    $ra
-/* 248B78 80228468 00000000 */   nop   
diff --git a/asm/non_matchings/ovl2_2/func_800F6C98.s b/asm/non_matchings/ovl2_2/func_800F6C98.s
deleted file mode 100644
index 2c77285a..00000000
--- a/asm/non_matchings/ovl2_2/func_800F6C98.s
+++ /dev/null
@@ -1,97 +0,0 @@
-glabel func_800F6C98
-/* 07F708 800F6C98 3C028005 */  lui   $v0, %hi(D_8004A7C4) # $v0, 0x8005
-/* 07F70C 800F6C9C 8C42A7C4 */  lw    $v0, %lo(D_8004A7C4)($v0)
-/* 07F710 800F6CA0 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 07F714 800F6CA4 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 07F718 800F6CA8 AFA40018 */  sw    $a0, 0x18($sp)
-/* 07F71C 800F6CAC 8C4E0000 */  lw    $t6, ($v0)
-/* 07F720 800F6CB0 3C01800E */  lui   $at, 0x800e
-/* 07F724 800F6CB4 3C04800E */  lui   $a0, 0x800e
-/* 07F728 800F6CB8 000E7880 */  sll   $t7, $t6, 2
-/* 07F72C 800F6CBC 002F0821 */  addu  $at, $at, $t7
-/* 07F730 800F6CC0 AC20EF90 */  sw    $zero, -0x1070($at)
-/* 07F734 800F6CC4 8C580000 */  lw    $t8, ($v0)
-/* 07F738 800F6CC8 3C05800B */  lui   $a1, %hi(func_800B1434) # $a1, 0x800b
-/* 07F73C 800F6CCC 24A51434 */  addiu $a1, %lo(func_800B1434) # addiu $a1, $a1, 0x1434
-/* 07F740 800F6CD0 0018C880 */  sll   $t9, $t8, 2
-/* 07F744 800F6CD4 00992021 */  addu  $a0, $a0, $t9
-/* 07F748 800F6CD8 0C02C7DA */  jal   func_800B1F68
-/* 07F74C 800F6CDC 8C84EC10 */   lw    $a0, -0x13f0($a0)
-/* 07F750 800F6CE0 3C0142F0 */  li    $at, 0x42F00000 # 120.000000
-/* 07F754 800F6CE4 44812000 */  mtc1  $at, $f4
-/* 07F758 800F6CE8 3C01800D */  lui   $at, %hi(D_800D6B14) # $at, 0x800d
-/* 07F75C 800F6CEC C4266B14 */  lwc1  $f6, %lo(D_800D6B14)($at)
-/* 07F760 800F6CF0 24040001 */  li    $a0, 1
-/* 07F764 800F6CF4 3C014F00 */  li    $at, 0x4F000000 # 2147483648.000000
-/* 07F768 800F6CF8 46062202 */  mul.s $f8, $f4, $f6
-/* 07F76C 800F6CFC 4448F800 */  cfc1  $t0, $31
-/* 07F770 800F6D00 44C4F800 */  ctc1  $a0, $31
-/* 07F774 800F6D04 00000000 */  nop   
-/* 07F778 800F6D08 460042A4 */  cvt.w.s $f10, $f8
-/* 07F77C 800F6D0C 4444F800 */  cfc1  $a0, $31
-/* 07F780 800F6D10 00000000 */  nop   
-/* 07F784 800F6D14 30840078 */  andi  $a0, $a0, 0x78
-/* 07F788 800F6D18 50800013 */  beql  $a0, $zero, .L800F6D68_ovl2
-/* 07F78C 800F6D1C 44045000 */   mfc1  $a0, $f10
-/* 07F790 800F6D20 44815000 */  mtc1  $at, $f10
-/* 07F794 800F6D24 24040001 */  li    $a0, 1
-/* 07F798 800F6D28 460A4281 */  sub.s $f10, $f8, $f10
-/* 07F79C 800F6D2C 44C4F800 */  ctc1  $a0, $31
-/* 07F7A0 800F6D30 00000000 */  nop   
-/* 07F7A4 800F6D34 460052A4 */  cvt.w.s $f10, $f10
-/* 07F7A8 800F6D38 4444F800 */  cfc1  $a0, $31
-/* 07F7AC 800F6D3C 00000000 */  nop   
-/* 07F7B0 800F6D40 30840078 */  andi  $a0, $a0, 0x78
-/* 07F7B4 800F6D44 14800005 */  bnez  $a0, .L800F6D5C_ovl2
-/* 07F7B8 800F6D48 00000000 */   nop   
-/* 07F7BC 800F6D4C 44045000 */  mfc1  $a0, $f10
-/* 07F7C0 800F6D50 3C018000 */  lui   $at, 0x8000
-/* 07F7C4 800F6D54 10000007 */  b     .L800F6D74_ovl2
-/* 07F7C8 800F6D58 00812025 */   or    $a0, $a0, $at
-.L800F6D5C_ovl2:
-/* 07F7CC 800F6D5C 10000005 */  b     .L800F6D74_ovl2
-/* 07F7D0 800F6D60 2404FFFF */   li    $a0, -1
-/* 07F7D4 800F6D64 44045000 */  mfc1  $a0, $f10
-.L800F6D68_ovl2:
-/* 07F7D8 800F6D68 00000000 */  nop   
-/* 07F7DC 800F6D6C 0480FFFB */  bltz  $a0, .L800F6D5C_ovl2
-/* 07F7E0 800F6D70 00000000 */   nop   
-.L800F6D74_ovl2:
-/* 07F7E4 800F6D74 44C8F800 */  ctc1  $t0, $31
-/* 07F7E8 800F6D78 0C002DAF */  jal   func_8000B6BC
-/* 07F7EC 800F6D7C 00000000 */   nop   
-/* 07F7F0 800F6D80 3C098005 */  lui   $t1, %hi(D_8004A7C4) # $t1, 0x8005
-/* 07F7F4 800F6D84 8D29A7C4 */  lw    $t1, %lo(D_8004A7C4)($t1)
-/* 07F7F8 800F6D88 3C03800F */  lui   $v1, 0x800f
-/* 07F7FC 800F6D8C 24010003 */  li    $at, 3
-/* 07F800 800F6D90 8D220000 */  lw    $v0, ($t1)
-/* 07F804 800F6D94 00025080 */  sll   $t2, $v0, 2
-/* 07F808 800F6D98 006A1821 */  addu  $v1, $v1, $t2
-/* 07F80C 800F6D9C 8C6398E0 */  lw    $v1, -0x6720($v1)
-/* 07F810 800F6DA0 5461000B */  bnel  $v1, $at, .L800F6DD0_ovl2
-/* 07F814 800F6DA4 24010004 */   li    $at, 4
-/* 07F818 800F6DA8 0C03DB1A */  jal   func_800F6C68
-/* 07F81C 800F6DAC 00000000 */   nop   
-/* 07F820 800F6DB0 3C0B8005 */  lui   $t3, %hi(D_8004A7C4) # $t3, 0x8005
-/* 07F824 800F6DB4 8D6BA7C4 */  lw    $t3, %lo(D_8004A7C4)($t3)
-/* 07F828 800F6DB8 3C03800F */  lui   $v1, 0x800f
-/* 07F82C 800F6DBC 8D620000 */  lw    $v0, ($t3)
-/* 07F830 800F6DC0 00026080 */  sll   $t4, $v0, 2
-/* 07F834 800F6DC4 006C1821 */  addu  $v1, $v1, $t4
-/* 07F838 800F6DC8 8C6398E0 */  lw    $v1, -0x6720($v1)
-/* 07F83C 800F6DCC 24010004 */  li    $at, 4
-.L800F6DD0_ovl2:
-/* 07F840 800F6DD0 14610006 */  bne   $v1, $at, .L800F6DEC_ovl2
-/* 07F844 800F6DD4 00000000 */   nop   
-/* 07F848 800F6DD8 0C03DB1E */  jal   func_800F6C78
-/* 07F84C 800F6DDC 00000000 */   nop   
-/* 07F850 800F6DE0 3C0D8005 */  lui   $t5, %hi(D_8004A7C4) # $t5, 0x8005
-/* 07F854 800F6DE4 8DADA7C4 */  lw    $t5, %lo(D_8004A7C4)($t5)
-/* 07F858 800F6DE8 8DA20000 */  lw    $v0, ($t5)
-.L800F6DEC_ovl2:
-/* 07F85C 800F6DEC 0C02C640 */  jal   func_800B1900
-/* 07F860 800F6DF0 3044FFFF */   andi  $a0, $v0, 0xffff
-/* 07F864 800F6DF4 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 07F868 800F6DF8 27BD0018 */  addiu $sp, $sp, 0x18
-/* 07F86C 800F6DFC 03E00008 */  jr    $ra
-/* 07F870 800F6E00 00000000 */   nop   
diff --git a/asm/non_matchings/ovl2_2/func_800F6E30.s b/asm/non_matchings/ovl2_2/func_800F6E30.s
index 257bbacc..fa76d034 100644
--- a/asm/non_matchings/ovl2_2/func_800F6E30.s
+++ b/asm/non_matchings/ovl2_2/func_800F6E30.s
@@ -16,56 +16,56 @@ glabel func_800F6E30
 /* 07F8D8 800F6E68 F7B40018 */  sdc1  $f20, 0x18($sp)
 /* 07F8DC 800F6E6C AFA40048 */  sw    $a0, 0x48($sp)
 /* 07F8E0 800F6E70 8DCF0000 */  lw    $t7, ($t6)
-/* 07F8E4 800F6E74 3C04800E */  lui   $a0, 0x800e
+/* 07F8E4 800F6E74 3C04800E */ lui $a0, %hi(D_800DEC10)
 /* 07F8E8 800F6E78 3C05800B */  lui   $a1, %hi(func_800B1434) # $a1, 0x800b
 /* 07F8EC 800F6E7C 000FC080 */  sll   $t8, $t7, 2
 /* 07F8F0 800F6E80 00982021 */  addu  $a0, $a0, $t8
-/* 07F8F4 800F6E84 8C84EC10 */  lw    $a0, -0x13f0($a0)
+/* 07F8F4 800F6E84 8C84EC10 */ lw $a0, %lo(D_800DEC10)($a0)
 /* 07F8F8 800F6E88 0C02C7DA */  jal   func_800B1F68
 /* 07F8FC 800F6E8C 24A51434 */   addiu $a1, %lo(func_800B1434) # addiu $a1, $a1, 0x1434
 /* 07F900 800F6E90 8EC80000 */  lw    $t0, ($s6)
 /* 07F904 800F6E94 3C19800F */  lui   $t9, %hi(D_800F6E04) # $t9, 0x800f
-/* 07F908 800F6E98 3C01800E */  lui   $at, 0x800e
+/* 07F908 800F6E98 3C01800E */ lui $at, %hi(D_800DEF90)
 /* 07F90C 800F6E9C 8D090000 */  lw    $t1, ($t0)
 /* 07F910 800F6EA0 27396E04 */  addiu $t9, %lo(D_800F6E04) # addiu $t9, $t9, 0x6e04
 /* 07F914 800F6EA4 24040018 */  li    $a0, 24
 /* 07F918 800F6EA8 00095080 */  sll   $t2, $t1, 2
 /* 07F91C 800F6EAC 002A0821 */  addu  $at, $at, $t2
 /* 07F920 800F6EB0 0C02BE60 */  jal   func_800AF980
-/* 07F924 800F6EB4 AC39EF90 */   sw    $t9, -0x1070($at)
+/* 07F924 800F6EB4 AC39EF90 */ sw $t9, %lo(D_800DEF90)($at)
 /* 07F928 800F6EB8 8ECC0000 */  lw    $t4, ($s6)
 /* 07F92C 800F6EBC 3C0B800F */  lui   $t3, %hi(D_800F7258) # $t3, 0x800f
-/* 07F930 800F6EC0 3C01800E */  lui   $at, 0x800e
+/* 07F930 800F6EC0 3C01800E */ lui $at, %hi(D_800DF150)
 /* 07F934 800F6EC4 8D8D0000 */  lw    $t5, ($t4)
 /* 07F938 800F6EC8 3C0F8013 */  lui   $t7, %hi(D_801290D8) # $t7, 0x8013
 /* 07F93C 800F6ECC 8DEF90D8 */  lw    $t7, %lo(D_801290D8)($t7)
 /* 07F940 800F6ED0 000D7080 */  sll   $t6, $t5, 2
 /* 07F944 800F6ED4 002E0821 */  addu  $at, $at, $t6
 /* 07F948 800F6ED8 256B7258 */  addiu $t3, %lo(D_800F7258) # addiu $t3, $t3, 0x7258
-/* 07F94C 800F6EDC AC2BF150 */  sw    $t3, -0xeb0($at)
+/* 07F94C 800F6EDC AC2BF150 */ sw $t3, %lo(D_800DF150)($at)
 /* 07F950 800F6EE0 24050026 */  li    $a1, 38
 /* 07F954 800F6EE4 24060010 */  li    $a2, 16
 /* 07F958 800F6EE8 0C02A619 */  jal   func_800A9864
 /* 07F95C 800F6EEC 8DE40000 */   lw    $a0, ($t7)
 /* 07F960 800F6EF0 3C188013 */  lui   $t8, %hi(D_801290D0) # $t8, 0x8013
 /* 07F964 800F6EF4 8F1890D0 */  lw    $t8, %lo(D_801290D0)($t8)
-/* 07F968 800F6EF8 3C04800E */  lui   $a0, 0x800e
+/* 07F968 800F6EF8 3C04800E */ lui $a0, %hi(D_800DFA10)
 /* 07F96C 800F6EFC 00184080 */  sll   $t0, $t8, 2
 /* 07F970 800F6F00 00882021 */  addu  $a0, $a0, $t0
 /* 07F974 800F6F04 0C028954 */  jal   func_800A2550
-/* 07F978 800F6F08 8C84FA10 */   lw    $a0, -0x5f0($a0)
+/* 07F978 800F6F08 8C84FA10 */ lw $a0, %lo(D_800DFA10)($a0)
 /* 07F97C 800F6F0C 3C05800D */  lui   $a1, %hi(D_800D6B10) # $a1, 0x800d
 /* 07F980 800F6F10 8CA56B10 */  lw    $a1, %lo(D_800D6B10)($a1)
 /* 07F984 800F6F14 0C02CC1C */  jal   func_800B3070
 /* 07F988 800F6F18 24040010 */   li    $a0, 16
 /* 07F98C 800F6F1C 8EC90000 */  lw    $t1, ($s6)
-/* 07F990 800F6F20 3C02800E */  lui   $v0, 0x800e
+/* 07F990 800F6F20 3C02800E */ lui $v0, %hi(gSegment4StartArray)
 /* 07F994 800F6F24 00008825 */  move  $s1, $zero
 /* 07F998 800F6F28 8D230000 */  lw    $v1, ($t1)
 /* 07F99C 800F6F2C 00009025 */  move  $s2, $zero
 /* 07F9A0 800F6F30 00031880 */  sll   $v1, $v1, 2
 /* 07F9A4 800F6F34 00431021 */  addu  $v0, $v0, $v1
-/* 07F9A8 800F6F38 8C42F4D0 */  lw    $v0, -0xb30($v0)
+/* 07F9A8 800F6F38 8C42F4D0 */ lw $v0, %lo(gSegment4StartArray)($v0)
 /* 07F9AC 800F6F3C 8C440014 */  lw    $a0, 0x14($v0)
 /* 07F9B0 800F6F40 10800077 */  beqz  $a0, .L800F7120_ovl2
 /* 07F9B4 800F6F44 00000000 */   nop   
@@ -95,12 +95,12 @@ glabel func_800F6E30
 /* 07FA10 800F6FA0 8ECC0000 */   lw    $t4, ($s6)
 .L800F6FA4_ovl2:
 /* 07FA14 800F6FA4 16400018 */  bnez  $s2, .L800F7008_ovl2
-/* 07FA18 800F6FA8 3C018013 */   lui   $at, 0x8013
+/* 07FA18 800F6FA8 3C018013 */ lui $at, %hi(D_8012E7B0)
 /* 07FA1C 800F6FAC 8EC20000 */  lw    $v0, ($s6)
 /* 07FA20 800F6FB0 3C03800E */  lui   $v1, %hi(D_800DF690) # $v1, 0x800e
 /* 07FA24 800F6FB4 2463F690 */  addiu $v1, %lo(D_800DF690) # addiu $v1, $v1, -0x970
 /* 07FA28 800F6FB8 8C4C0000 */  lw    $t4, ($v0)
-/* 07FA2C 800F6FBC 3C01800E */  lui   $at, 0x800e
+/* 07FA2C 800F6FBC 3C01800E */ lui $at, %hi(D_800DFF50)
 /* 07FA30 800F6FC0 4405A000 */  mfc1  $a1, $f20
 /* 07FA34 800F6FC4 000C6880 */  sll   $t5, $t4, 2
 /* 07FA38 800F6FC8 006D5821 */  addu  $t3, $v1, $t5
@@ -108,7 +108,7 @@ glabel func_800F6E30
 /* 07FA40 800F6FD0 8C4E0000 */  lw    $t6, ($v0)
 /* 07FA44 800F6FD4 000E7880 */  sll   $t7, $t6, 2
 /* 07FA48 800F6FD8 002F0821 */  addu  $at, $at, $t7
-/* 07FA4C 800F6FDC AC30FF50 */  sw    $s0, -0xb0($at)
+/* 07FA4C 800F6FDC AC30FF50 */  sw    $s0, %lo(D_800DFF50)($at)
 /* 07FA50 800F6FE0 8C580000 */  lw    $t8, ($v0)
 /* 07FA54 800F6FE4 00184080 */  sll   $t0, $t8, 2
 /* 07FA58 800F6FE8 00684821 */  addu  $t1, $v1, $t0
@@ -125,12 +125,12 @@ glabel func_800F6E30
 /* 07FA80 800F7010 26520001 */   addiu $s2, $s2, 1
 .L800F7014_ovl2:
 /* 07FA84 800F7014 16200018 */  bnez  $s1, .L800F7078_ovl2
-/* 07FA88 800F7018 3C018013 */   lui   $at, 0x8013
+/* 07FA88 800F7018 3C018013 */ lui $at, %hi(D_8012E7B0)
 /* 07FA8C 800F701C 8EC20000 */  lw    $v0, ($s6)
 /* 07FA90 800F7020 3C03800E */  lui   $v1, %hi(D_800DF850) # $v1, 0x800e
 /* 07FA94 800F7024 2463F850 */  addiu $v1, %lo(D_800DF850) # addiu $v1, $v1, -0x7b0
 /* 07FA98 800F7028 8C4A0000 */  lw    $t2, ($v0)
-/* 07FA9C 800F702C 3C01800E */  lui   $at, 0x800e
+/* 07FA9C 800F702C 3C01800E */ lui $at, %hi(D_800E0110)
 /* 07FAA0 800F7030 4405A000 */  mfc1  $a1, $f20
 /* 07FAA4 800F7034 000A6080 */  sll   $t4, $t2, 2
 /* 07FAA8 800F7038 006C6821 */  addu  $t5, $v1, $t4
@@ -138,7 +138,7 @@ glabel func_800F6E30
 /* 07FAB0 800F7040 8C4B0000 */  lw    $t3, ($v0)
 /* 07FAB4 800F7044 000B7080 */  sll   $t6, $t3, 2
 /* 07FAB8 800F7048 002E0821 */  addu  $at, $at, $t6
-/* 07FABC 800F704C AC300110 */  sw    $s0, 0x110($at)
+/* 07FABC 800F704C AC300110 */  sw    $s0, %lo(D_800E0110)($at)
 /* 07FAC0 800F7050 8C4F0000 */  lw    $t7, ($v0)
 /* 07FAC4 800F7054 000FC080 */  sll   $t8, $t7, 2
 /* 07FAC8 800F7058 00784021 */  addu  $t0, $v1, $t8
@@ -185,24 +185,24 @@ glabel func_800F6E30
 .L800F70F0_ovl2:
 /* 07FB60 800F70F0 8ECC0000 */  lw    $t4, ($s6)
 .L800F70F4_ovl2:
-/* 07FB64 800F70F4 3C02800E */  lui   $v0, 0x800e
+/* 07FB64 800F70F4 3C02800E */ lui $v0, %hi(gSegment4StartArray)
 /* 07FB68 800F70F8 26730001 */  addiu $s3, $s3, 1
 /* 07FB6C 800F70FC 8D830000 */  lw    $v1, ($t4)
 /* 07FB70 800F7100 26940004 */  addiu $s4, $s4, 4
 /* 07FB74 800F7104 00031880 */  sll   $v1, $v1, 2
 /* 07FB78 800F7108 00431021 */  addu  $v0, $v0, $v1
-/* 07FB7C 800F710C 8C42F4D0 */  lw    $v0, -0xb30($v0)
+/* 07FB7C 800F710C 8C42F4D0 */ lw $v0, %lo(gSegment4StartArray)($v0)
 /* 07FB80 800F7110 8C4D0014 */  lw    $t5, 0x14($v0)
 /* 07FB84 800F7114 026D082B */  sltu  $at, $s3, $t5
 /* 07FB88 800F7118 5420FF94 */  bnezl $at, .L800F6F6C_ovl2
 /* 07FB8C 800F711C 8C590018 */   lw    $t9, 0x18($v0)
 .L800F7120_ovl2:
 /* 07FB90 800F7120 3C0B800F */  lui   $t3, %hi(D_800F6E0C) # $t3, 0x800f
-/* 07FB94 800F7124 3C01800E */  lui   $at, 0x800e
+/* 07FB94 800F7124 3C01800E */ lui $at, %hi(D_800DF310)
 /* 07FB98 800F7128 00230821 */  addu  $at, $at, $v1
 /* 07FB9C 800F712C 256B6E0C */  addiu $t3, %lo(D_800F6E0C) # addiu $t3, $t3, 0x6e0c
 /* 07FBA0 800F7130 0C02BE85 */  jal   func_800AFA14
-/* 07FBA4 800F7134 AC2BF310 */   sw    $t3, -0xcf0($at)
+/* 07FBA4 800F7134 AC2BF310 */ sw $t3, %lo(D_800DF310)($at)
 /* 07FBA8 800F7138 8FBF0044 */  lw    $ra, 0x44($sp)
 /* 07FBAC 800F713C D7B40018 */  ldc1  $f20, 0x18($sp)
 /* 07FBB0 800F7140 8FB00020 */  lw    $s0, 0x20($sp)
diff --git a/asm/non_matchings/ovl2_2/func_800F716C.s b/asm/non_matchings/ovl2_2/func_800F716C.s
deleted file mode 100644
index 17bff9ae..00000000
--- a/asm/non_matchings/ovl2_2/func_800F716C.s
+++ /dev/null
@@ -1,62 +0,0 @@
-glabel func_800F716C
-/* 07FBDC 800F716C 3C0E800C */  lui   $t6, %hi(D_800BE500) # $t6, 0x800c
-/* 07FBE0 800F7170 8DCEE500 */  lw    $t6, %lo(D_800BE500)($t6)
-/* 07FBE4 800F7174 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 07FBE8 800F7178 24010001 */  li    $at, 1
-/* 07FBEC 800F717C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 07FBF0 800F7180 15C10015 */  bne   $t6, $at, .L800F71D8_ovl2
-/* 07FBF4 800F7184 00803825 */   move  $a3, $a0
-/* 07FBF8 800F7188 3C0F800C */  lui   $t7, %hi(D_800BE504) # $t7, 0x800c
-/* 07FBFC 800F718C 8DEFE504 */  lw    $t7, %lo(D_800BE504)($t7)
-/* 07FC00 800F7190 24010002 */  li    $at, 2
-/* 07FC04 800F7194 3C068005 */  lui   $a2, %hi(gDisplayListHeads) # $a2, 0x8005
-/* 07FC08 800F7198 15E1000F */  bne   $t7, $at, .L800F71D8_ovl2
-/* 07FC0C 800F719C 24C6A3D0 */   addiu $a2, %lo(gDisplayListHeads) # addiu $a2, $a2, -0x5c30
-/* 07FC10 800F71A0 8CC30000 */  lw    $v1, ($a2)
-/* 07FC14 800F71A4 3C09008E */  lui   $t1, (0x008E0071 >> 16) # lui $t1, 0x8e
-/* 07FC18 800F71A8 35290071 */  ori   $t1, (0x008E0071 & 0xFFFF) # ori $t1, $t1, 0x71
-/* 07FC1C 800F71AC 24780008 */  addiu $t8, $v1, 8
-/* 07FC20 800F71B0 ACD80000 */  sw    $t8, ($a2)
-/* 07FC24 800F71B4 3C08DB08 */  lui   $t0, 0xdb08
-/* 07FC28 800F71B8 AC680000 */  sw    $t0, ($v1)
-/* 07FC2C 800F71BC AC690004 */  sw    $t1, 4($v1)
-/* 07FC30 800F71C0 8CC50004 */  lw    $a1, 4($a2)
-/* 07FC34 800F71C4 24B90008 */  addiu $t9, $a1, 8
-/* 07FC38 800F71C8 ACD90004 */  sw    $t9, 4($a2)
-/* 07FC3C 800F71CC ACA90004 */  sw    $t1, 4($a1)
-/* 07FC40 800F71D0 10000010 */  b     .L800F7214_ovl2
-/* 07FC44 800F71D4 ACA80000 */   sw    $t0, ($a1)
-.L800F71D8_ovl2:
-/* 07FC48 800F71D8 3C068005 */  lui   $a2, %hi(gDisplayListHeads) # $a2, 0x8005
-/* 07FC4C 800F71DC 24C6A3D0 */  addiu $a2, %lo(gDisplayListHeads) # addiu $a2, $a2, -0x5c30
-/* 07FC50 800F71E0 8CC30000 */  lw    $v1, ($a2)
-/* 07FC54 800F71E4 3C090640 */  lui   $t1, (0x0640FAC0 >> 16) # lui $t1, 0x640
-/* 07FC58 800F71E8 3529FAC0 */  ori   $t1, (0x0640FAC0 & 0xFFFF) # ori $t1, $t1, 0xfac0
-/* 07FC5C 800F71EC 246A0008 */  addiu $t2, $v1, 8
-/* 07FC60 800F71F0 ACCA0000 */  sw    $t2, ($a2)
-/* 07FC64 800F71F4 3C08DB08 */  lui   $t0, 0xdb08
-/* 07FC68 800F71F8 AC680000 */  sw    $t0, ($v1)
-/* 07FC6C 800F71FC AC690004 */  sw    $t1, 4($v1)
-/* 07FC70 800F7200 8CC50004 */  lw    $a1, 4($a2)
-/* 07FC74 800F7204 24AB0008 */  addiu $t3, $a1, 8
-/* 07FC78 800F7208 ACCB0004 */  sw    $t3, 4($a2)
-/* 07FC7C 800F720C ACA90004 */  sw    $t1, 4($a1)
-/* 07FC80 800F7210 ACA80000 */  sw    $t0, ($a1)
-.L800F7214_ovl2:
-/* 07FC84 800F7214 8CEC0000 */  lw    $t4, ($a3)
-/* 07FC88 800F7218 3C0E800E */  lui   $t6, 0x800e
-/* 07FC8C 800F721C 3C19800D */  lui   $t9, 0x800d
-/* 07FC90 800F7220 000C6880 */  sll   $t5, $t4, 2
-/* 07FC94 800F7224 01CD7021 */  addu  $t6, $t6, $t5
-/* 07FC98 800F7228 8DCEF4D0 */  lw    $t6, -0xb30($t6)
-/* 07FC9C 800F722C 00E02025 */  move  $a0, $a3
-/* 07FCA0 800F7230 8DCF0008 */  lw    $t7, 8($t6)
-/* 07FCA4 800F7234 000FC080 */  sll   $t8, $t7, 2
-/* 07FCA8 800F7238 0338C821 */  addu  $t9, $t9, $t8
-/* 07FCAC 800F723C 8F394F10 */  lw    $t9, 0x4f10($t9)
-/* 07FCB0 800F7240 0320F809 */  jalr  $t9
-/* 07FCB4 800F7244 00000000 */  nop   
-/* 07FCB8 800F7248 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 07FCBC 800F724C 27BD0018 */  addiu $sp, $sp, 0x18
-/* 07FCC0 800F7250 03E00008 */  jr    $ra
-/* 07FCC4 800F7254 00000000 */   nop   
diff --git a/asm/non_matchings/ovl2_2/func_800F8824.s b/asm/non_matchings/ovl2_2/func_800F8824.s
deleted file mode 100644
index a710ab3e..00000000
--- a/asm/non_matchings/ovl2_2/func_800F8824.s
+++ /dev/null
@@ -1,34 +0,0 @@
-glabel func_800F8824
-/* 081294 800F8824 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 081298 800F8828 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 08129C 800F882C 10800014 */  beqz  $a0, .L800F8880_ovl2
-/* 0812A0 800F8830 AFA50024 */   sw    $a1, 0x24($sp)
-/* 0812A4 800F8834 C7AC0024 */  lwc1  $f12, 0x24($sp)
-/* 0812A8 800F8838 0C00B5B8 */  jal   sinf
-/* 0812AC 800F883C AFA40020 */   sw    $a0, 0x20($sp)
-/* 0812B0 800F8840 E7A00018 */  swc1  $f0, 0x18($sp)
-/* 0812B4 800F8844 0C00D604 */  jal   cosf
-/* 0812B8 800F8848 C7AC0024 */   lwc1  $f12, 0x24($sp)
-/* 0812BC 800F884C 8FA40020 */  lw    $a0, 0x20($sp)
-/* 0812C0 800F8850 C7A60018 */  lwc1  $f6, 0x18($sp)
-/* 0812C4 800F8854 C4840000 */  lwc1  $f4, ($a0)
-/* 0812C8 800F8858 C48A0008 */  lwc1  $f10, 8($a0)
-/* 0812CC 800F885C 46062202 */  mul.s $f8, $f4, $f6
-/* 0812D0 800F8860 C4860004 */  lwc1  $f6, 4($a0)
-/* 0812D4 800F8864 460A0402 */  mul.s $f16, $f0, $f10
-/* 0812D8 800F8868 46088480 */  add.s $f18, $f16, $f8
-/* 0812DC 800F886C 46009107 */  neg.s $f4, $f18
-/* 0812E0 800F8870 0C006179 */  jal   atanf
-/* 0812E4 800F8874 46062303 */   div.s $f12, $f4, $f6
-/* 0812E8 800F8878 10000004 */  b     .L800F888C_ovl2
-/* 0812EC 800F887C 8FBF0014 */   lw    $ra, 0x14($sp)
-.L800F8880_ovl2:
-/* 0812F0 800F8880 44800000 */  mtc1  $zero, $f0
-/* 0812F4 800F8884 00000000 */  nop   
-/* 0812F8 800F8888 8FBF0014 */  lw    $ra, 0x14($sp)
-.L800F888C_ovl2:
-/* 0812FC 800F888C 27BD0020 */  addiu $sp, $sp, 0x20
-/* 081300 800F8890 03E00008 */  jr    $ra
-/* 081304 800F8894 00000000 */   nop   
-/* 081308 800F8898 00000000 */  nop   
-/* 08130C 800F889C 00000000 */  nop   
diff --git a/asm/non_matchings/ovl2_6/func_8010474C.s b/asm/non_matchings/ovl2_6/func_8010474C.s
deleted file mode 100644
index d04ab6df..00000000
--- a/asm/non_matchings/ovl2_6/func_8010474C.s
+++ /dev/null
@@ -1,42 +0,0 @@
-glabel func_8010474C
-/* 08D1BC 8010474C 27BDFF98 */  addiu $sp, $sp, -0x68
-/* 08D1C0 80104750 27AE0018 */  addiu $t6, $sp, 0x18
-/* 08D1C4 80104754 3C018013 */  lui   $at, %hi(gCollisionState) # $at, 0x8013
-/* 08D1C8 80104758 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 08D1CC 8010475C AFA40068 */  sw    $a0, 0x68($sp)
-/* 08D1D0 80104760 AFA5006C */  sw    $a1, 0x6c($sp)
-/* 08D1D4 80104764 AC2EBCF8 */  sw    $t6, %lo(gCollisionState)($at)
-/* 08D1D8 80104768 8C880000 */  lw    $t0, ($a0)
-/* 08D1DC 8010476C 27AF0020 */  addiu $t7, $sp, 0x20
-/* 08D1E0 80104770 27A9002C */  addiu $t1, $sp, 0x2c
-/* 08D1E4 80104774 ADE80000 */  sw    $t0, ($t7)
-/* 08D1E8 80104778 8C990004 */  lw    $t9, 4($a0)
-/* 08D1EC 8010477C 3C0D8010 */  lui   $t5, %hi(func_80102364) # $t5, 0x8010
-/* 08D1F0 80104780 3C0E8010 */  lui   $t6, %hi(func_80101F4C) # $t6, 0x8010
-/* 08D1F4 80104784 ADF90004 */  sw    $t9, 4($t7)
-/* 08D1F8 80104788 8C880008 */  lw    $t0, 8($a0)
-/* 08D1FC 8010478C 25AD2364 */  addiu $t5, %lo(func_80102364) # addiu $t5, $t5, 0x2364
-/* 08D200 80104790 25CE1F4C */  addiu $t6, %lo(func_80101F4C) # addiu $t6, $t6, 0x1f4c
-/* 08D204 80104794 ADE80008 */  sw    $t0, 8($t7)
-/* 08D208 80104798 8FAA006C */  lw    $t2, 0x6c($sp)
-/* 08D20C 8010479C 00002025 */  move  $a0, $zero
-/* 08D210 801047A0 00002825 */  move  $a1, $zero
-/* 08D214 801047A4 8D4C0000 */  lw    $t4, ($t2)
-/* 08D218 801047A8 00003025 */  move  $a2, $zero
-/* 08D21C 801047AC 00003825 */  move  $a3, $zero
-/* 08D220 801047B0 AD2C0000 */  sw    $t4, ($t1)
-/* 08D224 801047B4 8D4B0004 */  lw    $t3, 4($t2)
-/* 08D228 801047B8 AD2B0004 */  sw    $t3, 4($t1)
-/* 08D22C 801047BC 8D4C0008 */  lw    $t4, 8($t2)
-/* 08D230 801047C0 AD2C0008 */  sw    $t4, 8($t1)
-/* 08D234 801047C4 AFA00044 */  sw    $zero, 0x44($sp)
-/* 08D238 801047C8 AFA00054 */  sw    $zero, 0x54($sp)
-/* 08D23C 801047CC AFAD005C */  sw    $t5, 0x5c($sp)
-/* 08D240 801047D0 AFAE0058 */  sw    $t6, 0x58($sp)
-/* 08D244 801047D4 AFA0004C */  sw    $zero, 0x4c($sp)
-/* 08D248 801047D8 0C040F60 */  jal   func_80103D80
-/* 08D24C 801047DC AFA00050 */   sw    $zero, 0x50($sp)
-/* 08D250 801047E0 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 08D254 801047E4 27BD0068 */  addiu $sp, $sp, 0x68
-/* 08D258 801047E8 03E00008 */  jr    $ra
-/* 08D25C 801047EC 00000000 */   nop   
diff --git a/asm/non_matchings/ovl2_7/func_8011B878.s b/asm/non_matchings/ovl2_7/func_8011B878.s
deleted file mode 100644
index 67e1ccfa..00000000
--- a/asm/non_matchings/ovl2_7/func_8011B878.s
+++ /dev/null
@@ -1,54 +0,0 @@
-glabel func_8011B878
-/* 0A42E8 8011B878 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 0A42EC 8011B87C AFBF001C */  sw    $ra, 0x1c($sp)
-/* 0A42F0 8011B880 AFB00018 */  sw    $s0, 0x18($sp)
-/* 0A42F4 8011B884 0C04555E */  jal   func_80115578
-/* 0A42F8 8011B888 00808025 */   move  $s0, $a0
-/* 0A42FC 8011B88C 0C0461D8 */  jal   func_80118760
-/* 0A4300 8011B890 02002025 */   move  $a0, $s0
-/* 0A4304 8011B894 44806000 */  mtc1  $zero, $f12
-/* 0A4308 8011B898 0C02BB30 */  jal   func_800AECC0
-/* 0A430C 8011B89C 00000000 */   nop   
-/* 0A4310 8011B8A0 44806000 */  mtc1  $zero, $f12
-/* 0A4314 8011B8A4 0C02BB48 */  jal   func_800AED20
-/* 0A4318 8011B8A8 00000000 */   nop   
-/* 0A431C 8011B8AC 3C10800D */  lui   $s0, %hi(D_800D6E14) # $s0, 0x800d
-/* 0A4320 8011B8B0 26106E14 */  addiu $s0, %lo(D_800D6E14) # addiu $s0, $s0, 0x6e14
-/* 0A4324 8011B8B4 8E0E0000 */  lw    $t6, ($s0)
-/* 0A4328 8011B8B8 15C00006 */  bnez  $t6, .L8011B8D4_ovl2
-/* 0A432C 8011B8BC 00000000 */   nop   
-.L8011B8C0_ovl2:
-/* 0A4330 8011B8C0 0C002DAF */  jal   func_8000B6BC
-/* 0A4334 8011B8C4 24040001 */   li    $a0, 1
-/* 0A4338 8011B8C8 8E0F0000 */  lw    $t7, ($s0)
-/* 0A433C 8011B8CC 11E0FFFC */  beqz  $t7, .L8011B8C0_ovl2
-/* 0A4340 8011B8D0 00000000 */   nop   
-.L8011B8D4_ovl2:
-/* 0A4344 8011B8D4 3C10800D */  lui   $s0, %hi(D_800D6B10) # $s0, 0x800d
-/* 0A4348 8011B8D8 26106B10 */  addiu $s0, %lo(D_800D6B10) # addiu $s0, $s0, 0x6b10
-/* 0A434C 8011B8DC 0C02BB30 */  jal   func_800AECC0
-/* 0A4350 8011B8E0 C60C0000 */   lwc1  $f12, ($s0)
-/* 0A4354 8011B8E4 0C02BB48 */  jal   func_800AED20
-/* 0A4358 8011B8E8 C60C0000 */   lwc1  $f12, ($s0)
-/* 0A435C 8011B8EC 3C0141F0 */  li    $at, 0x41F00000 # 30.000000
-/* 0A4360 8011B8F0 44812000 */  mtc1  $at, $f4
-/* 0A4364 8011B8F4 3C01800D */  lui   $at, %hi(D_800D6B14) # $at, 0x800d
-/* 0A4368 8011B8F8 C4266B14 */  lwc1  $f6, %lo(D_800D6B14)($at)
-/* 0A436C 8011B8FC 46062202 */  mul.s $f8, $f4, $f6
-/* 0A4370 8011B900 4600428D */  trunc.w.s $f10, $f8
-/* 0A4374 8011B904 44045000 */  mfc1  $a0, $f10
-/* 0A4378 8011B908 0C002DAF */  jal   func_8000B6BC
-/* 0A437C 8011B90C 00000000 */   nop   
-/* 0A4380 8011B910 44806000 */  mtc1  $zero, $f12
-/* 0A4384 8011B914 0C02BB30 */  jal   func_800AECC0
-/* 0A4388 8011B918 00000000 */   nop   
-/* 0A438C 8011B91C 44806000 */  mtc1  $zero, $f12
-/* 0A4390 8011B920 0C02BB48 */  jal   func_800AED20
-/* 0A4394 8011B924 00000000 */   nop   
-/* 0A4398 8011B928 0C00236A */  jal   func_80008DA8
-/* 0A439C 8011B92C 00002025 */   move  $a0, $zero
-/* 0A43A0 8011B930 8FBF001C */  lw    $ra, 0x1c($sp)
-/* 0A43A4 8011B934 8FB00018 */  lw    $s0, 0x18($sp)
-/* 0A43A8 8011B938 27BD0020 */  addiu $sp, $sp, 0x20
-/* 0A43AC 8011B93C 03E00008 */  jr    $ra
-/* 0A43B0 8011B940 00000000 */   nop   
diff --git a/data/kirby.ovl19.rodata.s b/data/kirby.ovl19.rodata.s
index 79eb7f18..cfcb7559 100644
--- a/data/kirby.ovl19.rodata.s
+++ b/data/kirby.ovl19.rodata.s
@@ -369,6 +369,8 @@ glabel D_8022F968
 glabel D_8022F96C
 .float 65535.0
 
+# ovl19_4
+
 glabel D_8022F970
 .asciiz "No List Id:%d\n"
 
diff --git a/include/types.h b/include/types.h
index 84af559f..eb4318ee 100644
--- a/include/types.h
+++ b/include/types.h
@@ -157,7 +157,9 @@ struct KirbyState {
     f32 unk40;
     u32 unk44;
     u32 unk48;
+    // struct pointer
     u32 unk4C;
+    // struct pointer
     u32 unk50;
     u32 unk54;
     u32 unk58;
diff --git a/src/ovl19/ovl19_3.c b/src/ovl19/ovl19_3.c
index d40c17d6..1ab52b07 100644
--- a/src/ovl19/ovl19_3.c
+++ b/src/ovl19/ovl19_3.c
@@ -31,11 +31,10 @@ void func_80223200_ovl19(s32 arg0) {
         D_800DDE10[D_8004A7C4->objId] = 0;
         assign_new_process_entry(D_800DE890[D_8004A7C4->objId], &D_80227A38);
         func_8011CF58();
-        temp_v1_2 = D_8004A7C4;
-        D_800DDFD0[temp_v1_2->objId] = 0;
+        D_800DDFD0[D_8004A7C4->objId] = 0;
         gKirbyState.unk15C = &D_8019257C;
         gKirbyState.unk154 = 7;
-        (&gEntitiesPosYArray[temp_v1_2->objId])[0x124] = (bitwise f32) &D_80192FF4;
+        (&gEntitiesPosYArray[D_8004A7C4->objId])[0x124] = (bitwise f32) &D_80192FF4;
         func_80152348_ovl19(20.0f);
         // minecart?
         func_800A9760(BANK_INDEX(2, 100));
@@ -107,11 +106,10 @@ void func_80223200_ovl19(s32 arg0) {
             gKirbyState.jumpHeight = 0;
             gKirbyState.isFullJump = 0;
             play_sound(0xF7);
-            temp_v1_5 = D_8004A7C4;
             gKirbyState.unkCC = 8.0f;
-            D_800E3210[temp_v1_5->objId] = 15.0f;
-            D_800E3750[temp_v1_5->objId] = -0.980665f;
-            D_800E3C90[temp_v1_5->objId] = 15.0f;
+            D_800E3210[D_8004A7C4->objId] = 15.0f;
+            D_800E3750[D_8004A7C4->objId] = -0.980665f;
+            D_800E3C90[D_8004A7C4->objId] = 15.0f;
             temp_v0_4 = &D_8022F1B8 + (0 * 0x18);
             gKirbyState.unk3C = 0;
             D_800EC2E0[1] = temp_v0_4->player1Anim1;
@@ -972,6 +970,7 @@ block_38:
     func_800AFA14();
 }
 #else
+void func_802248C0_ovl19(s32 arg0);
 GLOBAL_ASM("asm/non_matchings/ovl19/ovl19_3/func_802248C0_ovl19.s")
 #endif
 
@@ -1268,30 +1267,29 @@ void func_80225DF8_ovl19(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/ovl19/ovl19_3/func_80225DF8_ovl19.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3ec45aadfc2cb619035fb802d88c52eacfab0326
+extern f32 gKirbyHp;
+s32 change_kirby_hp(f32);
+#ifdef NON_MATCHING
 void func_80225E38_ovl19(s32 arg0) {
-    s32 temp_v1;
-
     if ((D_800E83E0[D_8004A7C4->objId] != 0) && (gKirbyState.unk44 != 7)) {
         if (gKirbyState.unk68 == 3) {
-            gKirbyHp = gKirbyHp + 1.0f;
+            gKirbyHp++;
         }
         if (change_kirby_hp(-1.0f) == 0) {
             D_800E83E0[D_8004A7C4->objId] = 1;
         } else {
             D_800E64D0[D_8004A7C4->objId] = 7.5f;
         }
-        temp_v1 = D_800E83E0[D_8004A7C4->objId];
-        if (temp_v1 != 1) {
-            if (temp_v1 != 3) {
-
-            }
-            gKirbyState.unk44 = 4;
-        } else {
-            gKirbyState.unk44 = 5;
+        switch (D_800E83E0[D_8004A7C4->objId]) {
+            case 1:
+                gKirbyState.unk44 = 5;
+            default:
+                gKirbyState.unk44 = 4;
+                break;
+            case 3:
+                break;
         }
-        assign_new_process_entry(*(&gEntityGObjProcessArray + (D_8004A7C4->objId * 4)), &func_802248C0_ovl19, &gKirbyState, &D_8004A7C4);
+        assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], func_802248C0_ovl19);
         D_800E98E0[D_8004A7C4->objId] = gKirbyState.unk44;
     }
 }
@@ -1299,45 +1297,28 @@ void func_80225E38_ovl19(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/ovl19/ovl19_3/func_80225E38_ovl19.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3ec45aadfc2cb619035fb802d88c52eacfab0326
-struct UnkStruct8004A7C4 *func_80225FB4_ovl19(void) {
-    struct UnkStruct8004A7C4 *temp_ret;
-    struct UnkStruct8004A7C4 *temp_v0;
-    struct UnkStruct8004A7C4 *temp_v0_2;
-    u32 temp_v1;
-    struct UnkStruct8004A7C4 *phi_return;
+extern s32 D_8012E804, D_8012E80C, D_8012E810;
+#ifdef NEEDS_RODATA
+void func_80225FB4_ovl19(void) {
+    f32 tmp = 12.0f;
 
-    temp_v0 = D_8004A7C4;
-    temp_v1 = temp_v0->objId;
-    if (D_800E8920[temp_v1] != 0) {
-        D_800E6690[temp_v1] = 0.45f;
-        if (12.0f < 0.0f) {
-            D_800E6850[temp_v0->objId] = -12.0f;
-        } else {
-            D_800E6850[temp_v0->objId] = 12.0f;
-        }
-        phi_return = &gKirbyState;
+    if (D_800E8920[D_8004A7C4->objId] != 0) {
+        D_800E6690[D_8004A7C4->objId] = 0.45f;
+        D_800E6850[D_8004A7C4->objId] = ABSF(tmp);
         if (gKirbyState.unk4C == 0) {
             gKirbyState.unk48 = 0;
             D_8012E80C = func_800A8234(2, 1, 0x61);
-            temp_ret = func_800A8234(2, 1, 0x61);
-            D_8012E810 = temp_ret;
-            return temp_ret;
+            D_8012E810 = func_800A8234(2, 1, 0x61);
         }
     } else {
         if (D_8012E80C != 0) {
             func_8011E0E8();
         }
-        phi_return = &D_8004A7C4;
         if (D_8012E804 != 1) {
-            temp_v0_2 = D_8004A7C4;
-            D_800E6690[temp_v0_2->objId] = 0.025f;
-            D_800E6850[temp_v0_2->objId] = 0.0f;
-            phi_return = temp_v0_2;
+            D_800E6690[D_8004A7C4->objId] = 0.025f;
+            D_800E6850[D_8004A7C4->objId] = 0.0f;
         }
     }
-    return phi_return;
 }
 #else
 GLOBAL_ASM("asm/non_matchings/ovl19/ovl19_3/func_80225FB4_ovl19.s")
@@ -2121,38 +2102,21 @@ s32 func_80227AA8_ovl19(void) {
 GLOBAL_ASM("asm/non_matchings/ovl19/ovl19_3/func_80227AA8_ovl19.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3ec45aadfc2cb619035fb802d88c52eacfab0326
-? func_80227B20_ovl19(void) {
-    f32 sp34;
-    f32 sp30;
-    f32 sp2C;
-    f32 sp28;
-    f32 sp24;
-    f32 sp20;
-    f32 *temp_a0;
-    f32 *temp_a1;
-    struct UnkStruct8004A7C4 *temp_v0;
-    u32 temp_v1;
+extern s32 D_800D6B54;
 
-    if (D_800D6B54 != 0) {
-block_2:
+u32 func_80227B20_ovl19(void) {
+    Vector v0, v1;
+
+    if (D_800D6B54 != 0 || D_800E7B20[D_8004A7C4->objId] == 0.0f) {
         return 1;
     }
-    temp_v0 = D_8004A7C4;
-    temp_v1 = temp_v0->objId;
-    if (D_800E7B20[temp_v1] == 0.0f) {
-        goto block_2;
-    }
-    temp_a0 = &sp2C;
-    sp2C = D_800E2B10[temp_v1];
-    temp_a1 = &sp20;
-    sp30 = D_800E2CD0[temp_v0->objId];
-    sp34 = D_800E2E90[temp_v0->objId];
-    sp20 = gEntitiesPosXArray[temp_v0->objId];
-    sp24 = gEntitiesPosYArray[temp_v0->objId];
-    sp28 = gEntitiesPosZArray[temp_v0->objId];
-    if (func_8010474C(temp_a0, temp_a1) != 0) {
+    v0.x = D_800E2B10[D_8004A7C4->objId];
+    v0.y = D_800E2CD0[D_8004A7C4->objId];
+    v0.z = D_800E2E90[D_8004A7C4->objId];
+    v1.x = gEntitiesPosXArray[D_8004A7C4->objId];
+    v1.y = gEntitiesPosYArray[D_8004A7C4->objId];
+    v1.z = gEntitiesPosZArray[D_8004A7C4->objId];
+    if (func_8010474C(&v0, &v1) != 0) {
         func_8011D40C();
         return 1;
     }
@@ -2161,9 +2125,6 @@ block_2:
     }
     return 0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/ovl19/ovl19_3/func_80227B20_ovl19.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3ec45aadfc2cb619035fb802d88c52eacfab0326
@@ -2289,9 +2250,10 @@ void func_800AED20(f32);
 void func_80227F90_ovl19(struct UnkStruct8004A7C4 *arg0) {
     int idx;
     int idx2;
-    int i = 0;
+    int i;
+    struct JointAnim *tmp;
 
-    D_800E98E0[D_8004A7C4->objId] = i;
+    D_800E98E0[D_8004A7C4->objId] = 0;
     D_800E6A10[D_8004A7C4->objId] = 1.0f;
     D_800DEF90[D_8004A7C4->objId] = func_800B4954;
     func_800AECC0(D_800D6B10);
@@ -2330,12 +2292,17 @@ void func_80227F90_ovl19(struct UnkStruct8004A7C4 *arg0) {
     D_800E6690[D_8004A7C4->objId] = 0.0f;
     D_800E6850[D_8004A7C4->objId] = 0.0f;
     gEntitiesPosYArray[D_8004A7C4->objId] = 0.0f;
-    D_800EC2E0[idx] = D_8022F560[MATHMA(i)].player1Anim1;
-    D_800EC4A0[idx] = D_8022F560[MATHMA(i)].player1Anim2;
-    D_800EC2E0[idx] = D_8022F560[MATHMA(i)].player2Anim1;
+    i = -1;
+    if (i < 0) {
+        i--;
+    }
+    tmp = &D_8022F560[2 + i];
+    D_800EC2E0[idx] = tmp->player1Anim1;
+    D_800EC4A0[idx] = tmp->player1Anim2;
+    D_800EC2E0[idx] = tmp->player2Anim1;
     gKirbyState.unk3C = 0;
-    D_800EC4A0[idx] = D_8022F560[MATHMA(i)].player2Anim2;
-    func_800AA018(D_8022F560[MATHMA(i)].jointAnim1);
+    D_800EC4A0[idx] = tmp->player2Anim2;
+    func_800AA018(tmp->jointAnim1);
     while (D_800E98E0[D_8004A7C4->objId] == 0) {
         func_8000B6BC(1);
     }
@@ -2349,25 +2316,15 @@ void func_80227F90_ovl19(struct UnkStruct8004A7C4 *arg0) {
 GLOBAL_ASM("asm/non_matchings/ovl19/ovl19_3/func_80227F90_ovl19.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3ec45aadfc2cb619035fb802d88c52eacfab0326
-void func_802283A8_ovl19(s32 arg0) {
-    struct UnkStruct8004A7C4 *temp_v0;
-    u32 temp_v1;
-
-    temp_v0 = D_8004A7C4;
-    temp_v1 = temp_v0->objId;
-    gEntitiesAngleYArray[temp_v1] = D_800E17D0[temp_v1];
-    if ((D_800E98E0[temp_v0->objId] == 0) && (*gEntitiesPosYArray <= 35.0f)) {
+void func_802283A8_ovl19(struct UnkStruct8004A7C4 *this) {
+    gEntitiesAngleYArray[D_8004A7C4->objId] = D_800E17D0[D_8004A7C4->objId];
+    if ((D_800E98E0[D_8004A7C4->objId] == 0) && (gEntitiesPosYArray[0] <= 35.0f)) {
         gKirbyState.abilityState = 0x4D;
-        set_kirby_action_2(0x4D & 0xFF, 0x1C);
+        set_kirby_action_2((u8) gKirbyState.abilityState, 0x1C);
         D_800E98E0[D_8004A7C4->objId] = 1;
     }
     func_800FF200(D_8022FAB0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/ovl19/ovl19_3/func_802283A8_ovl19.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3ec45aadfc2cb619035fb802d88c52eacfab0326
diff --git a/src/ovl2/ovl2_2.c b/src/ovl2/ovl2_2.c
index 58df20ed..db9343a2 100644
--- a/src/ovl2/ovl2_2.c
+++ b/src/ovl2/ovl2_2.c
@@ -1,7 +1,11 @@
 #include <ultra64.h>
 #include <macros.h>
 
-extern Gfx *gDisplayListHeads;
+#include "ovl1/ovl1_6.h"
+#include "D_8004A7C4.h"
+#include "buffers.h"
+
+extern Gfx *gDisplayListHeads[4];
 
 extern u32 D_800BE4F8;
 extern u32 D_800BE4FC;
@@ -25,38 +29,21 @@ void func_800F6C88(void) {
     D_800BE4F8 = 7;
 }
 
-#ifdef MIPS_TO_C
-void func_800F6C98(s32 arg0) {
-    s32 temp_v0_2;
-    s32 temp_v0_3;
-    s32 temp_v1;
-    struct UnkStruct8004A7C4 *temp_v0;
-    s32 phi_v1;
-    s32 phi_v0;
+extern f32 D_800D6B14;
+void func_800B1434(void);
 
-    temp_v0 = D_8004A7C4;
-    ((temp_v0->unk0 * 4) + 0x800E0000)->unk-1070 = 0;
-    func_800B1F68(((temp_v0->unk0 * 4) + 0x800E0000)->unk-13F0, &func_800B1434);
-    func_8000B6BC(120.0f * D_800D6B14);
-    temp_v0_2 = D_8004A7C4->objId;
-    temp_v1 = ((temp_v0_2 * 4) + 0x800F0000)->unk-6720;
-    phi_v1 = temp_v1;
-    phi_v0 = temp_v0_2;
-    if (temp_v1 == 3) {
+void func_800F6C98(s32 arg0) {
+    D_800DEF90[D_8004A7C4->objId] = NULL;
+    func_800B1F68(D_800DEC10[D_8004A7C4->objId], func_800B1434);
+    func_8000B6BC((u32) (120.0f * D_800D6B14));
+    if (D_800E98E0[D_8004A7C4->objId] == 3) {
         func_800F6C68();
-        temp_v0_3 = D_8004A7C4->objId;
-        phi_v1 = ((temp_v0_3 * 4) + 0x800F0000)->unk-6720;
-        phi_v0 = temp_v0_3;
     }
-    if (phi_v1 == 4) {
+    if (D_800E98E0[D_8004A7C4->objId] == 4) {
         func_800F6C78();
-        phi_v0 = D_8004A7C4->objId;
     }
-    func_800B1900(phi_v0 & 0xFFFF);
+    func_800B1900(D_8004A7C4->objId & 0xFFFF);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/ovl2_2/func_800F6C98.s")
-#endif
 
 void func_800F6E04(UNUSED s32 arg0) {
 
@@ -72,13 +59,13 @@ void func_800F6E0C(void *arg0, UNUSED void *arg1, UNUSED void *arg2) {
 void func_800F6E30(s32 arg0) {
     s32 temp_a0;
     s32 temp_s0;
-    s32 temp_v0_3;
     s32 temp_v1;
     s32 temp_v1_2;
     s32 temp_v1_3;
     struct UnkStruct8004A7C4 *temp_v0_4;
     struct UnkStruct8004A7C4 *temp_v0_5;
     u32 temp_s3;
+    u32 temp_v0_3;
     void *temp_v0;
     void *temp_v0_2;
     void *temp_v0_6;
@@ -89,15 +76,15 @@ void func_800F6E30(s32 arg0) {
     u32 phi_s3;
     s32 phi_v1;
 
-    func_800B1F68(((D_8004A7C4->objId * 4) + 0x800E0000)->unk-13F0, &func_800B1434);
-    ((D_8004A7C4->objId * 4) + 0x800E0000)->unk-1070 = &D_800F6E04;
+    func_800B1F68(D_800DEC10[D_8004A7C4->objId], func_800B1434);
+    D_800DEF90[D_8004A7C4->objId] = &D_800F6E04;
     func_800AF980(0x18);
-    ((D_8004A7C4->objId * 4) + 0x800E0000)->unk-EB0 = &D_800F7258;
-    func_800A9864(*D_801290D8, 0x26, 0x10);
-    func_800A2550(((D_801290D0 * 4) + 0x800E0000)->unk-5F0);
+    D_800DF150[D_8004A7C4->objId] = &D_800F7258;
+    func_800A9864(D_801290D8->filler, 0x26, 0x10);
+    func_800A2550(*(&D_800DFA10 + (D_801290D0 * 4)));
     func_800B3070(0x10, (bitwise s32) D_800D6B10);
     temp_v1 = D_8004A7C4->objId * 4;
-    temp_v0 = (temp_v1 + 0x800E0000)->unk-B30;
+    temp_v0 = *(&gSegment4StartArray + temp_v1);
     temp_a0 = temp_v0->unk14;
     phi_v1 = temp_v1;
     if (temp_a0 != 0) {
@@ -117,12 +104,12 @@ loop_3:
                     if (temp_v1_2 != 2) {
 
                     } else {
-                        func_800FA414(0x8000000D, temp_v0_2);
+                        func_800FA414(0x8000000D);
                         func_800AAF34(0x10, temp_s0, 0);
                         func_801129AC();
                         func_801129DC();
                         temp_v0_3 = D_800BE500;
-                        if ((1 == temp_v0_3) && (D_800BE504 == 0)) {
+                        if ((temp_v0_3 == 1) && (D_800BE504 == 0)) {
                             D_800D6E44 = 1;
                         }
                         if ((temp_v0_3 == 3) && (D_800BE504 == 0)) {
@@ -131,31 +118,29 @@ loop_3:
                     }
                 } else if (phi_s1 == 0) {
                     temp_v0_4 = D_8004A7C4;
-                    *(&D_800DF850 + (temp_v0_4->unk0 * 4)) = temp_v0_2;
-                    ((temp_v0_4->unk0 * 4) + 0x800E0000)->unk110 = temp_s0;
-                    func_800AEEB4(**(&D_800DF850 + (temp_v0_4->unk0 * 4)), 0, temp_v0_2);
+                    D_800DF850[temp_v0_4->objId] = temp_v0_2;
+                    D_800E0110[temp_v0_4->objId] = temp_s0;
+                    func_800AEEB4(*D_800DF850[temp_v0_4->objId], 0, temp_v0_2);
                     D_8012E7B4 = 0;
-                    phi_s1 = phi_s1 + 1;
+                    phi_s1 += 1;
                 } else {
-                    *0x80130000 = temp_v0_2;
-                    phi_s1 = phi_s1 + 1;
+                    D_8012F310 = temp_v0_2;
+                    phi_s1 += 1;
                 }
             } else if (phi_s2 == 0) {
-                temp_v0_5 = D_8004A7C4;
-                *(&D_800DF690 + (temp_v0_5->unk0 * 4)) = temp_v0_2;
-                ((temp_v0_5->unk0 * 4) + 0x800E0000)->unk-B0 = temp_s0;
-                func_800AEE20(**(&D_800DF690 + (temp_v0_5->unk0 * 4)), 0, temp_v0_2);
+                D_800DF690[D_8004A7C4->objId] = temp_v0_2;
+                D_800DFF50[D_8004A7C4->objId] = temp_s0;
+                func_800AEE20(D_800DF690[D_8004A7C4->objId], 0, temp_v0_2);
                 D_8012E7B0 = 0;
-                phi_s2 = phi_s2 + 1;
+                phi_s2 += 1;
             } else {
-                *0x80130000 = temp_v0_2;
-                phi_s2 = phi_s2 + 1;
+                D_8012F310 = temp_v0_2;
+                phi_s2 += 1;
             }
             temp_s3 = phi_s3 + 1;
-            temp_v1_3 = D_8004A7C4->objId * 4;
-            temp_v0_6 = (temp_v1_3 + 0x800E0000)->unk-B30;
+            temp_v0_6 = gSegment4StartArray[D_8004A7C4->objId];
             phi_v0 = temp_v0_6;
-            phi_s4 = phi_s4 + 4;
+            phi_s4 += 4;
             phi_s3 = temp_s3;
             phi_v1 = temp_v1_3;
             if (temp_s3 < temp_v0_6->unk14) {
@@ -163,47 +148,25 @@ loop_3:
             }
         }
     }
-    (phi_v1 + 0x800E0000)->unk-CF0 = &D_800F6E0C;
+    D_800DF310[D_8004A7C4->objId] = &D_800F6E0C;
     func_800AFA14();
-}
 #else
 GLOBAL_ASM("asm/non_matchings/ovl2_2/func_800F6E30.s")
 #endif
 
+extern s32 D_800BE500, D_800BE504;
+extern void (*D_800D4F10[])(struct UnkStruct8004A7C4 *);
 
-#ifdef MIPS_TO_C
-void func_800F716C(void *arg0) {
-    Gfx *temp_a1;
-    Gfx *temp_a1_2;
-    Gfx *temp_v1;
-    Gfx *temp_v1_2;
-    Gfx *phi_a1;
-
+void func_800F716C(struct UnkStruct8004A7C4 *arg0) {
     if ((D_800BE500 == 1) && (D_800BE504 == 2)) {
-        temp_v1 = gDisplayListHeads->unk0;
-        gDisplayListHeads->unk0 = temp_v1 + 8;
-        temp_v1->words.w0 = 0xDB080000;
-        temp_v1->words.w1 = 0x8E0071;
-        temp_a1 = gDisplayListHeads[1];
-        gDisplayListHeads[1] = temp_a1 + 8;
-        temp_a1->words.w1 = 0x8E0071;
-        phi_a1 = temp_a1;
+        gSPFogPosition(gDisplayListHeads[0]++, 102, 1003);
+        gSPFogPosition(gDisplayListHeads[1]++, 102, 1003);
     } else {
-        temp_v1_2 = gDisplayListHeads->unk0;
-        gDisplayListHeads->unk0 = temp_v1_2 + 8;
-        temp_v1_2->words.w0 = 0xDB080000;
-        temp_v1_2->words.w1 = 0x640FAC0;
-        temp_a1_2 = gDisplayListHeads[1];
-        gDisplayListHeads[1] = temp_a1_2 + 8;
-        temp_a1_2->words.w1 = 0x640FAC0;
-        phi_a1 = temp_a1_2;
+        gSPFogPosition(gDisplayListHeads[0]++, 920, 1000);
+        gSPFogPosition(gDisplayListHeads[1]++, 920, 1000);
     }
-    phi_a1->words.w0 = 0xDB080000;
-    ((((*arg0 * 4) + 0x800E0000)->unk-B30->unk8 * 4) + 0x800D0000)->unk4F10(arg0, phi_a1, gDisplayListHeads, arg0);
+    D_800D4F10[gSegment4StartArray[arg0->objId][2]](arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/ovl2_2/func_800F716C.s")
-#endif
 
 extern u32 D_800D7010;
 extern u32 D_800D7028;
@@ -856,16 +819,12 @@ f32 func_800F8728(s32 arg0, f32 arg1, f32 arg2) {
 GLOBAL_ASM("asm/non_matchings/ovl2_2/func_800F8728.s")
 #endif
 
-#ifdef MIPS_TO_C
-? func_800F8824(void *arg0, f32 arg1) {
-    f32 sp18;
-
-    if (arg0 != 0) {
-        sp18 = sinf(arg1);
-        return atanf(-((cosf(arg1) * arg0->unk8) + (arg0->unk0 * sp18)) / arg0->unk4, arg0);
+f32 sinf(f32);
+f32 atanf(f32);
+#include "types.h"
+f32 func_800F8824(Vector *arg0, f32 arg1) {
+    if (arg0 != NULL) {
+        return atanf(-((arg0->x * sinf(arg1)) + (cosf(arg1) * arg0->z)) / arg0->y);
     }
     return 0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/ovl2_2/func_800F8824.s")
-#endif
diff --git a/src/ovl2/ovl2_6_2.c b/src/ovl2/ovl2_6_2.c
index e6b96291..71c014f2 100644
--- a/src/ovl2/ovl2_6_2.c
+++ b/src/ovl2/ovl2_6_2.c
@@ -1736,36 +1736,20 @@ void func_801046A0(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg
 GLOBAL_ASM("asm/non_matchings/ovl2_6/func_801046A0.s")
 #endif
 
-#ifdef MIPS_TO_C
-void func_8010474C(void *arg0, void *arg1) {
-    void *sp5C;
-    void *sp58;
-    ?32 sp54;
-    ?32 sp50;
-    ?32 sp4C;
-    ?32 sp44;
-    ? sp2C;
-    ? sp20;
-    ? sp18;
+u32 func_8010474C(Vector *v0, Vector *v1) {
+    struct CollisionState newColState;
 
-    gCollisionState = &sp18;
-    sp20.unk0 = arg0->unk0;
-    sp20.unk4 = arg0->unk4;
-    sp20.unk8 = arg0->unk8;
-    sp2C.unk0 = arg1->unk0;
-    sp2C.unk4 = arg1->unk4;
-    sp2C.unk8 = arg1->unk8;
-    sp44 = 0;
-    sp54 = 0;
-    sp5C = &func_80102364;
-    sp58 = &func_80101F4C;
-    sp4C = 0;
-    sp50 = 0;
-    func_80103D80(0, 0, 0, 0);
+    gCollisionState = &newColState;
+    newColState.currPos = *v0;
+    newColState.nextPos = *v1;
+    newColState.someNormal = NULL;
+    newColState.unk3C = NULL;
+    newColState.unk44 = func_80102364;
+    newColState.unk40 = func_80101F4C;
+    newColState.unk34 = NULL;
+    newColState.unk38 = NULL;
+    return func_80103D80(0, 0, 0, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/ovl2_6/func_8010474C.s")
-#endif
 
 #ifdef MIPS_TO_C
 void func_801047F0(void *arg0, void *arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) {
diff --git a/src/ovl2/ovl2_7.c b/src/ovl2/ovl2_7.c
index 0964e0da..8dedeb6e 100644
--- a/src/ovl2/ovl2_7.c
+++ b/src/ovl2/ovl2_7.c
@@ -1,6 +1,9 @@
 #include <ultra64.h>
 #include <macros.h>
 #include "D_8004A7C4.h"
+#include "ovl1/ovl1_6.h"
+#include "buffers.h"
+#include "unk_structs/D_800DE350.h"
 
 #ifdef MIPS_TO_C
 f32 func_80111F10(void) {
@@ -163,7 +166,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801121E0.s")
 #endif
 
 #ifdef MIPS_TO_C
-void *func_801123AC(void *arg0) {
+void *func_801123AC(struct UnkStruct8004A7C4 *arg0) {
     f32 sp1C;
     f32 temp_f0;
     void *temp_v0;
@@ -195,7 +198,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801123AC.s")
 #endif
 
 #ifdef MIPS_TO_C
-? func_80112498(void *arg0) {
+? func_80112498(struct UnkStruct8004A7C4 *arg0) {
     f32 temp_f14;
     s32 temp_a1;
     void *temp_v1;
@@ -225,7 +228,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80112498.s")
 #endif
 
 #ifdef MIPS_TO_C
-? func_8011253C(void *arg0) {
+? func_8011253C(struct UnkStruct8004A7C4 *arg0) {
     f32 temp_f0;
     f32 temp_f12;
     f32 temp_f2;
@@ -255,7 +258,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011253C.s")
 #endif
 
 #ifdef MIPS_TO_C
-? func_80112600(void *arg0) {
+? func_80112600(struct UnkStruct8004A7C4 *arg0) {
     f32 temp_f14;
     s32 temp_a1;
     void *temp_v1;
@@ -285,7 +288,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80112600.s")
 #endif
 
 #ifdef MIPS_TO_C
-? func_801126A4(void *arg0) {
+? func_801126A4(struct UnkStruct8004A7C4 *arg0) {
     f32 temp_f0;
     f32 temp_f12;
     f32 temp_f2;
@@ -315,7 +318,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801126A4.s")
 #endif
 
 #ifdef MIPS_TO_C
-? func_80112768(void *arg0) {
+? func_80112768(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = D_8012D934;
@@ -329,7 +332,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80112768.s")
 #endif
 
 #ifdef MIPS_TO_C
-? func_801127D8(void *arg0) {
+? func_801127D8(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v1;
 
     temp_v1 = D_8012D934;
@@ -341,7 +344,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801127D8.s")
 #endif
 
 #ifdef MIPS_TO_C
-? func_80112828(void *arg0) {
+? func_80112828(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = D_8012D934;
@@ -483,7 +486,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80112A40.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80112B4C(void *arg0) {
+void func_80112B4C(struct UnkStruct8004A7C4 *arg0) {
     void *sp3C;
     s32 sp28;
     f32 *sp24;
@@ -594,7 +597,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80112CD4.s")
 #endif
 
 #ifdef MIPS_TO_C
-f32 func_80112ED4(void *arg0, void *arg1, void *arg2) {
+f32 func_80112ED4(struct UnkStruct8004A7C4 *arg0, void *arg1, void *arg2) {
     f32 temp_f0;
     f32 temp_f12;
     f32 temp_f2;
@@ -612,7 +615,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80112ED4.s")
 #endif
 
 #ifdef MIPS_TO_C
-f32 func_80112F70(void *arg0, void *arg1, void *arg2) {
+f32 func_80112F70(struct UnkStruct8004A7C4 *arg0, void *arg1, void *arg2) {
     f32 temp_f0;
     f32 temp_f12;
     f32 temp_f2;
@@ -630,7 +633,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80112F70.s")
 #endif
 
 #ifdef MIPS_TO_C
-f32 func_80113028(void *arg0, void *arg1) {
+f32 func_80113028(struct UnkStruct8004A7C4 *arg0, void *arg1) {
     f32 temp_f0;
     f32 temp_f12;
     f32 temp_f14;
@@ -1251,7 +1254,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801133C8.s")
 #endif
 
 #ifdef MIPS_TO_C
-void (*)(struct UnkStruct8004A7C4 *) func_80113F08(void *arg0, s32 arg2) {
+void (*)(struct UnkStruct8004A7C4 *) func_80113F08(struct UnkStruct8004A7C4 *arg0, s32 arg2) {
     struct struct8011BA10_temp *sp114;
     u32 sp110;
     f32 sp104;
@@ -1739,7 +1742,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80114974.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801149C0(void *arg0) {
+void func_801149C0(struct UnkStruct8004A7C4 *arg0) {
     func_8000B6BC(1);
     *(&D_801249C0 + (D_800E77A0[*arg0] * 4))(arg0);
 }
@@ -1866,7 +1869,7 @@ void func_80114CCC(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_80114CF4(void *arg0) {
+void func_80114CF4(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
 
     sp1C = (arg0->unk4C * 0xC) + &D_80126CD0;
@@ -1928,7 +1931,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80114DBC.s")
 #endif
 
 #ifdef MIPS_TO_C
-void *func_80114E80(void *arg0, s32 arg1, f32 arg2) {
+void *func_80114E80(struct UnkStruct8004A7C4 *arg0, s32 arg1, f32 arg2) {
     void *sp24;
     void *sp20;
     void *sp18;
@@ -1996,7 +1999,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80114E80.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80115070(void *arg0) {
+void func_80115070(struct UnkStruct8004A7C4 *arg0) {
     s32 temp_a0;
     void *temp_s0;
 
@@ -2016,7 +2019,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80115070.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011511C(void *arg0) {
+void func_8011511C(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
 
     sp1C = (D_800E77A0[*arg0] * 0x1C) + &D_80124E14;
@@ -2031,7 +2034,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011511C.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801151BC(void *arg0) {
+void func_801151BC(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
     void *sp18;
 
@@ -2049,7 +2052,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801151BC.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80115270(void *arg0) {
+void func_80115270(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
     void *sp18;
 
@@ -2068,7 +2071,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80115270.s")
 #endif
 
 #ifdef MIPS_TO_C
-s32 func_80115330(void *arg0) {
+s32 func_80115330(struct UnkStruct8004A7C4 *arg0) {
     s32 temp_v0;
 
     func_80112B4C();
@@ -2083,7 +2086,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80115330.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801153B8(void *arg0) {
+void func_801153B8(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
 
     sp1C = (D_800E77A0[*arg0] * 0x1C) + &D_80124E14;
@@ -2097,7 +2100,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801153B8.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011544C(void *arg0) {
+void func_8011544C(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
 
     sp1C = (D_800E77A0[*arg0] * 0x1C) + &D_80124E14;
@@ -2112,7 +2115,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011544C.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801154F0(void *arg0) {
+void func_801154F0(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
 
     sp1C = (D_800E77A0[*arg0] * 0x1C) + &D_80124E14;
@@ -2125,7 +2128,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801154F0.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80115578(void *arg0) {
+void func_80115578(struct UnkStruct8004A7C4 *arg0) {
     s32 temp_a0;
     void *temp_s0;
 
@@ -2222,7 +2225,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011572C.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80115888(void *arg0) {
+void func_80115888(struct UnkStruct8004A7C4 *arg0) {
     s32 temp_v1;
 
     func_80112B4C();
@@ -2285,7 +2288,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011591C.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80115A7C(void *arg0) {
+void func_80115A7C(struct UnkStruct8004A7C4 *arg0) {
     D_800E98E0[*arg0] = 0;
     func_801153B8();
 }
@@ -2298,7 +2301,7 @@ void func_80115AAC(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_80115ACC(void *arg0) {
+void func_80115ACC(struct UnkStruct8004A7C4 *arg0) {
     D_800B4924_ovl2();
     if ((D_800DD8D0[*arg0] * 2) < 0) {
         func_800AA018(0x202E9);
@@ -2310,6 +2313,7 @@ void func_80115ACC(void *arg0) {
     func_80121284(1);
 }
 #else
+void func_80115ACC(struct UnkStruct8004A7C4 *arg0);
 GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80115ACC.s")
 #endif
 
@@ -2359,49 +2363,39 @@ void func_80115C4C(struct UnkStruct8004A7C4 *arg0) {
 GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80115C4C.s")
 #endif
 
-#ifdef MIPS_TO_C
-void func_80115D38(struct UnkStruct8004A7C4 *arg0) {
-    s32 sp24;
-    s32 sp20;
-    s32 sp18;
-    f32 temp_f0;
-    s32 temp_a1;
-    s32 temp_t8;
-    s32 temp_v0;
-    struct GObjThreadStack **temp_a0;
+void func_80115EAC(struct UnkStruct8004A7C4 *this);
+extern f32 D_80128CF0;
+#ifdef NON_MATCHING
+void func_80115D38(struct UnkStruct8004A7C4 *this) {
+    // f32 temp_f0;
+    s32 idx = func_800AEC08(0x1E, 0x1E, 0x3C);
 
-    sp24 = arg0->objId;
-    temp_v0 = func_800AEC08(0x1E, 0x1E, 0x3C);
-    temp_t8 = D_800DE350[temp_v0];
-    temp_a0 = &gEntityGObjProcessArray[temp_v0];
-    sp20 = temp_v0;
-    D_8004A7C4 = temp_t8;
-    func_80008DA8(*temp_a0);
+    // idx = func_800AEC08(0x1E, 0x1E, 0x3C);
+    D_8004A7C4 = D_800DE350[idx];
+    func_80008DA8(gEntityGObjProcessArray[idx]);
     func_800AF980(0x17);
     func_800A9864(0x20060, 0x1869F, 0x10);
-    temp_a1 = sp24 * 4;
-    temp_f0 = D_80128CF0;
-    gEntitiesPosXArray[sp20] = gEntitiesPosXArray[sp24];
-    gEntitiesPosYArray[sp20] = gEntitiesPosYArray[sp24] + 220.0f;
-    gEntitiesPosZArray[sp20] = gEntitiesPosZArray[sp24];
-    D_800E48D0[sp20] = temp_f0;
-    D_800E4710[sp20] = temp_f0;
-    sp18 = temp_a1;
-    D_800E4550[sp20] = temp_f0;
+    // temp_f0 = D_80128CF0;
+    gEntitiesPosXArray[idx] = gEntitiesPosXArray[this->objId];
+    gEntitiesPosYArray[idx] = gEntitiesPosYArray[this->objId] + 220.0f;
+    gEntitiesPosZArray[idx] = gEntitiesPosZArray[this->objId];
+    D_800E48D0[idx] = D_80128CF0;
+    D_800E4710[idx] = D_80128CF0;
+    D_800E4550[idx] = D_80128CF0;
     func_800AA018(0x202E5);
     func_800AA018(0x202E6);
-    D_800DEF90[D_8004A7C4->objId] = &D_80115ACC;
-    D_800E98E0[sp24] = sp20;
-    D_8004A7C4 = arg0;
-    func_801153B8(arg0, temp_a1);
+    D_800DEF90[D_8004A7C4->objId] = &func_80115ACC;
+    D_800E98E0[this->objId] = idx;
+    D_8004A7C4 = this;
+    func_801153B8(this);
 }
 #else
 GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80115D38.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80115EAC(void *arg0) {
-    D_800E98E0[*arg0] = 0;
+void func_80115EAC(struct UnkStruct8004A7C4 *this) {
+    D_800E98E0[this->objId] = 0;
     func_8011511C();
 }
 #else
@@ -2417,7 +2411,7 @@ void func_80115EFC(s32 arg0) {
 }
 
 #ifdef MIPS_TO_C
-void func_80115F04(void *arg0) {
+void func_80115F04(struct UnkStruct8004A7C4 *arg0) {
     void *sp6C;
     f32 sp60;
     f32 sp5C;
@@ -2503,7 +2497,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80115F04.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80116118(void *arg0) {
+void func_80116118(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
     f32 *temp_v1;
     f32 temp_f0;
@@ -2527,7 +2521,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80116118.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801161D4(void *arg0) {
+void func_801161D4(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     D_800EA6E0[arg0->unk0] = 0.0f;
@@ -2567,7 +2561,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80116260.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801162F4(void *arg0) {
+void func_801162F4(struct UnkStruct8004A7C4 *arg0) {
     s32 temp_a0;
     u32 temp_v0;
     void *temp_s0;
@@ -2600,7 +2594,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801162F4.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80116438(void *arg0) {
+void func_80116438(struct UnkStruct8004A7C4 *arg0) {
     D_800D7098.unk0 = *arg0;
     func_801154F0();
     func_80116508(arg0);
@@ -2610,7 +2604,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80116438.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011646C(void *arg0) {
+void func_8011646C(struct UnkStruct8004A7C4 *arg0) {
     D_800D709C = *arg0;
     func_801154F0();
     func_80116508(arg0);
@@ -2620,7 +2614,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011646C.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801164A0(void *arg0) {
+void func_801164A0(struct UnkStruct8004A7C4 *arg0) {
     D_800D70A0 = *arg0;
     func_801154F0();
     func_80116508(arg0);
@@ -2630,7 +2624,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801164A0.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801164D4(void *arg0) {
+void func_801164D4(struct UnkStruct8004A7C4 *arg0) {
     D_800D70A4 = *arg0;
     func_801154F0();
     func_80116508(arg0);
@@ -2646,7 +2640,7 @@ extern const f32 D_80128D1C, D_80128D20, D_80128D24,D_80128D28;
 s32 random_soft_s32_range(s32);
 // loop doesnt pad enough bytes
 #ifdef NON_MATCHING
-void func_80116508(s32 *arg0) {
+void func_80116508(struct UnkStruct8004A7C4 *arg0) {
     f32 temp_f0_2;
     f32 temp_f0_3;
     f32 temp_f0_4;
@@ -2655,28 +2649,25 @@ void func_80116508(s32 *arg0) {
     f32 temp_f2_3;
     f32 temp_f30;
 
-    u32 tmp = *arg0;
+    u32 tmp = arg0->objId;
 
     D_800EA6E0[tmp] = gEntitiesPosYArray[tmp];
     D_800E98E0[tmp] = 0;
     temp_f30 = D_80128D1C;
-    while (TRUE) {
-        if (random_soft_s32_range(2) != 0) {
-            D_800E3210[D_8004A7C4->objId] = 0.25f;
-        } else {
-            D_800E3210[D_8004A7C4->objId] = -0.25f;
-        }
+    for (;;) {
+        D_800E3210[D_8004A7C4->objId] = (random_soft_s32_range(2) != 0) ? 0.25f : -0.25f;
         while (TRUE) {
             if (D_800E98E0[tmp] == 0) {
                 f32 temp_f0 = gEntitiesPosYArray[tmp] - D_800EA6E0[tmp];
                 if (temp_f0 >= 15.0f) {
                     D_800E3210[D_8004A7C4->objId] = -0.25f;
                 } else if (temp_f0 <= -10.0f) {
-                D_800E3210[D_8004A7C4->objId] = 0.25f;
+                    D_800E3210[D_8004A7C4->objId] = 0.25f;
                 }
                 func_8000B6BC(1);
-                continue;
-            } else break;
+            } else {
+                break;
+            }
         }
         if (D_800E98E0[tmp] == 1) {
             D_800E3590[D_8004A7C4->objId] = 0.0f;
@@ -2721,31 +2712,29 @@ void func_80116508(s32 *arg0) {
             D_800E3C90[D_8004A7C4->objId] = temp_f2_2;
             D_800E3AD0[D_8004A7C4->objId] = temp_f2_2;
             D_800E98E0[tmp] = 0;
-            continue;
         }
-        if (D_800E98E0[tmp] != 2) {
-            continue;
+        else if (D_800E98E0[tmp] == 2) {
+            D_800E3590[D_8004A7C4->objId] = 0.0f;
+            D_800E3050[D_8004A7C4->objId] = D_800E3590[D_8004A7C4->objId];
+            D_800E3AD0[D_8004A7C4->objId] = temp_f30;
+            D_800E3210[D_8004A7C4->objId] = -8.0f;
+            D_800E33D0[D_8004A7C4->objId] = 0.0f;
+            D_800E3910[D_8004A7C4->objId] = 0.0f;
+            D_800E3E50[D_8004A7C4->objId] = temp_f30;
+            func_8000B6BC(0xA);
+            D_800E3910[D_8004A7C4->objId] = 0.0f;
+            temp_f0_4 = D_800E3910[D_8004A7C4->objId];
+            D_800E3750[D_8004A7C4->objId] = temp_f0_4;
+            D_800E3590[D_8004A7C4->objId] = temp_f0_4;
+            D_800E33D0[D_8004A7C4->objId] = temp_f0_4;
+            D_800E3210[D_8004A7C4->objId] = temp_f0_4;
+            D_800E3050[D_8004A7C4->objId] = temp_f0_4;
+            D_800E3E50[D_8004A7C4->objId] = temp_f30;
+            temp_f2_3 = D_800E3E50[D_8004A7C4->objId];
+            D_800E3C90[D_8004A7C4->objId] = temp_f2_3;
+            D_800E3AD0[D_8004A7C4->objId] = temp_f2_3;
+            func_800AFA14();
         }
-        D_800E3590[D_8004A7C4->objId] = 0.0f;
-        D_800E3050[D_8004A7C4->objId] = D_800E3590[D_8004A7C4->objId];
-        D_800E3AD0[D_8004A7C4->objId] = temp_f30;
-        D_800E3210[D_8004A7C4->objId] = -8.0f;
-        D_800E33D0[D_8004A7C4->objId] = 0.0f;
-        D_800E3910[D_8004A7C4->objId] = 0.0f;
-        D_800E3E50[D_8004A7C4->objId] = temp_f30;
-        func_8000B6BC(0xA);
-        D_800E3910[D_8004A7C4->objId] = 0.0f;
-        temp_f0_4 = D_800E3910[D_8004A7C4->objId];
-        D_800E3750[D_8004A7C4->objId] = temp_f0_4;
-        D_800E3590[D_8004A7C4->objId] = temp_f0_4;
-        D_800E33D0[D_8004A7C4->objId] = temp_f0_4;
-        D_800E3210[D_8004A7C4->objId] = temp_f0_4;
-        D_800E3050[D_8004A7C4->objId] = temp_f0_4;
-        D_800E3E50[D_8004A7C4->objId] = temp_f30;
-        temp_f2_3 = D_800E3E50[D_8004A7C4->objId];
-        D_800E3C90[D_8004A7C4->objId] = temp_f2_3;
-        D_800E3AD0[D_8004A7C4->objId] = temp_f2_3;
-        func_800AFA14();
     }
 }
 #else
@@ -2753,7 +2742,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80116508.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80116B68(void *arg0) {
+void func_80116B68(struct UnkStruct8004A7C4 *arg0) {
     D_800D7098.unk0 = *arg0;
     func_80115070();
 }
@@ -2762,7 +2751,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80116B68.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80116B90(void *arg0) {
+void func_80116B90(struct UnkStruct8004A7C4 *arg0) {
     void *temp_s0;
 
     temp_s0 = (D_800E77A0[*arg0] * 0x1C) + &D_80124E14;
@@ -2881,7 +2870,7 @@ void func_80116F60(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_80116F80(void *arg0) {
+void func_80116F80(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
 
     sp1C = arg0->unk4C;
@@ -2893,12 +2882,12 @@ void func_80116F80(void *arg0) {
     }
 }
 #else
-void func_80116F80(void *arg0);
+void func_80116F80(struct UnkStruct8004A7C4 *arg0);
 GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80116F80.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80116FF8(void *arg0) {
+void func_80116FF8(struct UnkStruct8004A7C4 *arg0) {
     if (arg0->unk40 <= 900.0f) {
         func_80112B4C();
         return;
@@ -2944,7 +2933,7 @@ void func_80117158(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_80117178(void *arg0) {
+void func_80117178(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
 
     sp1C = arg0->unk4C;
@@ -2964,7 +2953,7 @@ void func_801171F0(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_80117210(void *arg0) {
+void func_80117210(struct UnkStruct8004A7C4 *arg0) {
     void *sp24;
     s32 sp20;
     s32 sp1C;
@@ -2994,7 +2983,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80117210.s")
 #endif
 
 #ifdef MIPS_TO_C
-s32 *func_80117328(void *arg0) {
+s32 *func_80117328(struct UnkStruct8004A7C4 *arg0) {
     void *sp24;
     s32 sp1C;
     s32 *temp_v0;
@@ -3030,7 +3019,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80117328.s")
 #endif
 
 #ifdef MIPS_TO_C
-f32 func_801173F4(void *arg0) {
+f32 func_801173F4(struct UnkStruct8004A7C4 *arg0) {
     void *sp24;
     s32 sp20;
     f32 sp1C;
@@ -3078,7 +3067,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801173F4.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80117570(void *arg0) {
+void func_80117570(struct UnkStruct8004A7C4 *arg0) {
     void *sp24;
     s32 sp1C;
     s32 *temp_v0_2;
@@ -3112,7 +3101,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80117570.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011764C(void *arg0) {
+void func_8011764C(struct UnkStruct8004A7C4 *arg0) {
     s32 temp_v1;
 
     temp_v1 = *arg0;
@@ -3149,7 +3138,7 @@ void func_80117738(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_80117758(void *arg0) {
+void func_80117758(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -3161,7 +3150,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80117758.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80117784(void *arg0) {
+void func_80117784(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -3173,7 +3162,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80117784.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801177B0(void *arg0) {
+void func_801177B0(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -3185,7 +3174,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801177B0.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801177DC(void *arg0) {
+void func_801177DC(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -3197,7 +3186,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801177DC.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80117808(void *arg0) {
+void func_80117808(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -3209,7 +3198,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80117808.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80117834(void *arg0) {
+void func_80117834(struct UnkStruct8004A7C4 *arg0) {
     void *temp_s0;
     void *temp_v0;
 
@@ -3473,7 +3462,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801180B8.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80118130(void *arg0) {
+void func_80118130(struct UnkStruct8004A7C4 *arg0) {
     func_80112B4C();
     if ((D_800DD8D0[*arg0] * 2) < 0) {
         D_800DEF90[D_8004A7C4->objId] = func_80112B4C;
@@ -3486,7 +3475,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80118130.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801181AC(void *arg0) {
+void func_801181AC(struct UnkStruct8004A7C4 *arg0) {
     void *sp18;
     f32 temp_f0;
     s32 temp_v0;
@@ -3512,7 +3501,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801181AC.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80118270(void *arg0) {
+void func_80118270(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -3524,7 +3513,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80118270.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011829C(void *arg0) {
+void func_8011829C(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -3536,7 +3525,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011829C.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801182C8(void *arg0) {
+void func_801182C8(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -3548,7 +3537,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801182C8.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801182F4(void *arg0) {
+void func_801182F4(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -3610,7 +3599,7 @@ void func_80118498(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_801184B8(void *arg0) {
+void func_801184B8(struct UnkStruct8004A7C4 *arg0) {
     f32 temp_f0;
     s32 temp_v1;
     f32 phi_f2;
@@ -3656,7 +3645,7 @@ void func_80118618(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_80118638(void *arg0) {
+void func_80118638(struct UnkStruct8004A7C4 *arg0) {
     s32 sp54;
     f32 sp48;
     f32 sp44;
@@ -3687,7 +3676,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80118638.s")
 #endif
 
 #ifdef MIPS_TO_C
-void *func_80118760(void *arg0) {
+void *func_80118760(struct UnkStruct8004A7C4 *arg0) {
     s32 temp_v1;
     void *temp_v0;
     void *temp_v0_2;
@@ -3780,7 +3769,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011890C.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80118A60(void *arg0, s32 arg1) {
+void func_80118A60(struct UnkStruct8004A7C4 *arg0, s32 arg1) {
     f32 sp20;
     f32 temp_f0;
     s32 temp_a0;
@@ -3916,7 +3905,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80118D84.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80118E44(void *arg0, ? arg1) {
+void func_80118E44(struct UnkStruct8004A7C4 *arg0, ? arg1) {
     s32 temp_s0;
 
     func_80115618();
@@ -3950,7 +3939,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80118E44.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80118F70(void *arg0) {
+void func_80118F70(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -3962,7 +3951,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80118F70.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80118F9C(void *arg0) {
+void func_80118F9C(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -4006,7 +3995,7 @@ void func_80119090(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_801190B0(void *arg0) {
+void func_801190B0(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -4018,7 +4007,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_801190B0.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_801190DC(void *arg0) {
+void func_801190DC(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -4046,7 +4035,7 @@ void func_80119168(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_80119188(void *arg0) {
+void func_80119188(struct UnkStruct8004A7C4 *arg0) {
     if (D_800D6E20[D_800BE508] != 0) {
         func_80118A60(0x3C);
     } else {
@@ -4097,7 +4086,7 @@ void func_80119300(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_80119320(void *arg0) {
+void func_80119320(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
     void *sp18;
     void *temp_v1;
@@ -4252,7 +4241,7 @@ void func_8011976C(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_8011978C(void *arg0) {
+void func_8011978C(struct UnkStruct8004A7C4 *arg0) {
     f32 temp_f0;
     f32 phi_f2;
 
@@ -4304,7 +4293,7 @@ void func_8011990C(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_8011992C(void *arg0) {
+void func_8011992C(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
 
     sp1C = (D_800E77A0[*arg0] * 0x1C) + &D_80124E14;
@@ -4397,7 +4386,7 @@ void func_80119C20(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_80119C40(void *arg0) {
+void func_80119C40(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -4409,7 +4398,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80119C40.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80119C6C(void *arg0) {
+void func_80119C6C(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -4421,7 +4410,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80119C6C.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80119C98(void *arg0) {
+void func_80119C98(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -4433,7 +4422,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80119C98.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80119CC4(void *arg0) {
+void func_80119CC4(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -4445,7 +4434,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80119CC4.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80119CF0(void *arg0) {
+void func_80119CF0(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -4457,7 +4446,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80119CF0.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80119D1C(void *arg0) {
+void func_80119D1C(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -4469,7 +4458,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80119D1C.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80119D48(void *arg0) {
+void func_80119D48(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -4481,7 +4470,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_80119D48.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_80119D74(void *arg0) {
+void func_80119D74(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -4603,7 +4592,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011A060.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011A0FC(void *arg0) {
+void func_8011A0FC(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
 
     sp1C = arg0->unk4C;
@@ -4621,7 +4610,7 @@ void func_8011A178(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_8011A198(void *arg0) {
+void func_8011A198(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
 
     sp1C = arg0->unk4C;
@@ -4676,7 +4665,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011A294.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011A2F4(void *arg0) {
+void func_8011A2F4(struct UnkStruct8004A7C4 *arg0) {
     void *sp24;
     s32 sp20;
     void *sp18;
@@ -4790,7 +4779,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011A638.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011A678(void *arg0) {
+void func_8011A678(struct UnkStruct8004A7C4 *arg0) {
     f32 temp_f0;
     f32 temp_f0_2;
     s32 temp_v0;
@@ -4831,7 +4820,7 @@ void func_8011A770(s32 arg0) {
 }
 
 #ifdef MIPS_TO_C
-void func_8011A7A8(void *arg0) {
+void func_8011A7A8(struct UnkStruct8004A7C4 *arg0) {
     void *sp24;
     s32 sp20;
     void *sp18;
@@ -4903,7 +4892,7 @@ void func_8011A9CC(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_8011A9EC(void *arg0) {
+void func_8011A9EC(struct UnkStruct8004A7C4 *arg0) {
     func_80112B4C();
     if ((D_800DD8D0[*arg0] * 2) < 0) {
         func_800AECC0(0.0f);
@@ -4917,7 +4906,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011A9EC.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011AA7C(void *arg0) {
+void func_8011AA7C(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
     s32 temp_v1;
     u16 temp_v0;
@@ -5027,7 +5016,7 @@ void func_8011ADDC(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_8011ADFC(void *arg0) {
+void func_8011ADFC(struct UnkStruct8004A7C4 *arg0) {
     func_80112B4C();
     if ((D_800DD8D0[*arg0] * 2) < 0) {
         func_8011E504();
@@ -5039,7 +5028,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011ADFC.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011AE6C(void *arg0) {
+void func_8011AE6C(struct UnkStruct8004A7C4 *arg0) {
     if (func_8012122C() == 1) {
         func_800AA018(((D_800E77A0[*arg0] * 0x1C) + &D_80124E14)->unk8);
         D_800DEF90[D_8004A7C4->objId] = &D_8011ADFC;
@@ -5050,7 +5039,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011AE6C.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011AEF0(void *arg0) {
+void func_8011AEF0(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
 
     sp1C = arg0->unk4C;
@@ -5064,7 +5053,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011AEF0.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011AF50(void *arg0) {
+void func_8011AF50(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
 
     sp1C = arg0->unk4C;
@@ -5098,7 +5087,7 @@ void func_8011B030(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_8011B050(void *arg0) {
+void func_8011B050(struct UnkStruct8004A7C4 *arg0) {
     D_800E3050[*arg0] = 0.0f;
     D_800B4924_ovl2();
     D_800DEF90[D_8004A7C4->objId] = &D_800B4924;
@@ -5108,7 +5097,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011B050.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011B0A4(void *arg0) {
+void func_8011B0A4(struct UnkStruct8004A7C4 *arg0) {
     f32 temp_f0;
     f32 temp_f12;
     f32 temp_f14;
@@ -5143,7 +5132,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011B0A4.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011B188(void *arg0) {
+void func_8011B188(struct UnkStruct8004A7C4 *arg0) {
     s32 sp1C;
     s32 sp18;
     s32 *temp_v0;
@@ -5177,7 +5166,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011B188.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011B22C(void *arg0) {
+void func_8011B22C(struct UnkStruct8004A7C4 *arg0) {
     s32 sp28;
     f32 *sp20;
     f32 *temp_a2;
@@ -5211,7 +5200,7 @@ void func_8011B328(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_8011B348(void *arg0) {
+void func_8011B348(struct UnkStruct8004A7C4 *arg0) {
     func_80112B4C();
     if ((D_800DD8D0[*arg0] * 2) < 0) {
         func_800FB914(ERROR(Read from unset register $f12));
@@ -5223,7 +5212,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011B348.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011B3B8(void *arg0) {
+void func_8011B3B8(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     func_800FB914((bitwise f32) arg0);
@@ -5236,7 +5225,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011B3B8.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011B3F4(void *arg0) {
+void func_8011B3F4(struct UnkStruct8004A7C4 *arg0) {
     func_80112B4C();
     if ((D_800DD8D0[*arg0] * 2) < 0) {
         D_800DEF90[D_8004A7C4->objId] = func_80112B4C;
@@ -5248,7 +5237,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011B3F4.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011B464(void *arg0) {
+void func_8011B464(struct UnkStruct8004A7C4 *arg0) {
     void *sp18;
     f32 temp_f0;
     s32 temp_v0;
@@ -5274,7 +5263,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011B464.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011B528(void *arg0) {
+void func_8011B528(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -5286,7 +5275,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011B528.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011B554(void *arg0) {
+void func_8011B554(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -5298,7 +5287,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011B554.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011B580(void *arg0) {
+void func_8011B580(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -5310,7 +5299,7 @@ GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011B580.s")
 #endif
 
 #ifdef MIPS_TO_C
-void func_8011B5AC(void *arg0) {
+void func_8011B5AC(struct UnkStruct8004A7C4 *arg0) {
     void *temp_v0;
 
     temp_v0 = arg0->unk4C;
@@ -5354,7 +5343,7 @@ void func_8011B6B8(void) {
 }
 
 #ifdef MIPS_TO_C
-void func_8011B6D8(void *arg0) {
+void func_8011B6D8(struct UnkStruct8004A7C4 *arg0) {
     f32 temp_f0;
     f32 temp_f2;
     s32 temp_v1;
@@ -5381,7 +5370,7 @@ void func_8011B794(s32 arg0) {
 }
 
 #ifdef MIPS_TO_C
-void func_8011B7CC(void *arg0) {
+void func_8011B7CC(struct UnkStruct8004A7C4 *arg0) {
     void *sp1C;
 
     sp1C = arg0->unk4C;
@@ -5403,32 +5392,29 @@ void func_8011B858(void) {
     func_80118C88();
 }
 
-#ifdef MIPS_TO_C
+extern f32 D_800D6B14;
+extern s32 D_800D6E14;
+void func_800AECC0(f32);
+void func_800AED20(f32);
+
 void func_8011B878(s32 arg0) {
     func_80115578();
     func_80118760(arg0);
     func_800AECC0(0.0f);
     func_800AED20(0.0f);
-    if (D_800D6E14 == 0) {
-loop_1:
+    while (D_800D6E14 == 0) {
         func_8000B6BC(1);
-        if (D_800D6E14 == 0) {
-            goto loop_1;
-        }
     }
     func_800AECC0(D_800D6B10);
     func_800AED20(D_800D6B10);
-    func_8000B6BC(30.0f * D_800D6B14);
+    func_8000B6BC((s32) (30.0f * D_800D6B14));
     func_800AECC0(0.0f);
     func_800AED20(0.0f);
     func_80008DA8(NULL);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/ovl2_7/func_8011B878.s")
-#endif
 
-void func_8011B944(void) {
-    func_8011B878();
+void func_8011B944(struct UnkStruct8004A7C4 *arg0) {
+    func_8011B878(arg0);
 }
 
 void func_8011B964(void) {
@@ -5439,14 +5425,14 @@ void func_8011B984(void) {
     func_80115070();
 }
 
-void func_8011B9A4(void) {
-    func_8011B878();
+void func_8011B9A4(struct UnkStruct8004A7C4 *arg0) {
+    func_8011B878(arg0);
 }
 
 void func_8011B9C4(void) {
     func_80118C88();
 }
 
-void func_8011B9E4(void) {
-    func_8011B878();
+void func_8011B9E4(struct UnkStruct8004A7C4 *arg0) {
+    func_8011B878(arg0);
 }