Turn D_802BFB80 into a union (#582)

* Turn D_802BFB80 into a union As much as I hate it, it does make more matches possible Got a few more, unrelated matches Signed-off-by: Taggerung <[email protected]> * Update based on comment Signed-off-by: Taggerung <[email protected]> * Update to address comment Signed-off-by: Taggerung <[email protected]> --------- Signed-off-by: Taggerung <[email protected]> Co-authored-by: Taggerung <[email protected]>
n64decomp · Mar 25, 2024 · 893ecbe · 893ecbe
1 parent 65f0393
commit 893ecbe
Show file tree

Hide file tree

Showing 15 changed files with 263 additions and 1,582 deletions.
diff --git a/asm/non_matchings/code_80091750/func_80099958.s b/asm/non_matchings/code_80091750/func_80099958.s
diff --git a/asm/non_matchings/code_80091750/func_80099EC4.s b/asm/non_matchings/code_80091750/func_80099EC4.s
@@ -242,77 +242,3 @@ glabel func_80099EC4
 /* 09AE2C 8009A22C 8FBE0048 */  lw    $fp, 0x48($sp)
 /* 09AE30 8009A230 03E00008 */  jr    $ra
 /* 09AE34 8009A234 27BD0090 */   addiu $sp, $sp, 0x90
-
-/* 09AE38 8009A238 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 09AE3C 8009A23C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 09AE40 8009A240 8C980004 */  lw    $t8, 4($a0)
-/* 09AE44 8009A244 3C0F8019 */  lui   $t7, %hi(D_8018E118) # $t7, 0x8019
-/* 09AE48 8009A248 25EFE118 */  addiu $t7, %lo(D_8018E118) # addiu $t7, $t7, -0x1ee8
-/* 09AE4C 8009A24C AFB80024 */  sw    $t8, 0x24($sp)
-/* 09AE50 8009A250 94870010 */  lhu   $a3, 0x10($a0)
-/* 09AE54 8009A254 000570C0 */  sll   $t6, $a1, 3
-/* 09AE58 8009A258 01CF1021 */  addu  $v0, $t6, $t7
-/* 09AE5C 8009A25C 8C430004 */  lw    $v1, 4($v0)
-/* 09AE60 8009A260 04E10004 */  bgez  $a3, .L8009A274
-/* 09AE64 8009A264 30F90007 */   andi  $t9, $a3, 7
-/* 09AE68 8009A268 13200002 */  beqz  $t9, .L8009A274
-/* 09AE6C 8009A26C 00000000 */   nop   
-/* 09AE70 8009A270 2739FFF8 */  addiu $t9, $t9, -8
-.L8009A274:
-/* 09AE74 8009A274 13200007 */  beqz  $t9, .L8009A294
-/* 09AE78 8009A278 8FA40024 */   lw    $a0, 0x24($sp)
-/* 09AE7C 8009A27C 04E10003 */  bgez  $a3, .L8009A28C
-/* 09AE80 8009A280 000740C3 */   sra   $t0, $a3, 3
-/* 09AE84 8009A284 24E10007 */  addiu $at, $a3, 7
-/* 09AE88 8009A288 000140C3 */  sra   $t0, $at, 3
-.L8009A28C:
-/* 09AE8C 8009A28C 000848C0 */  sll   $t1, $t0, 3
-/* 09AE90 8009A290 25270008 */  addiu $a3, $t1, 8
-.L8009A294:
-/* 09AE94 8009A294 3C068019 */  lui   $a2, %hi(D_8018D9B4) # $a2, 0x8019
-/* 09AE98 8009A298 8CC6D9B4 */  lw    $a2, %lo(D_8018D9B4)($a2)
-/* 09AE9C 8009A29C 00E02825 */  move  $a1, $a3
-/* 09AEA0 8009A2A0 AFA2001C */  sw    $v0, 0x1c($sp)
-/* 09AEA4 8009A2A4 0C026422 */  jal   dma_copy_base_7fa3c0
-/* 09AEA8 8009A2A8 AFA30028 */   sw    $v1, 0x28($sp)
-/* 09AEAC 8009A2AC 8FA30028 */  lw    $v1, 0x28($sp)
-/* 09AEB0 8009A2B0 3C0B8019 */  lui   $t3, %hi(D_8018D9B0) # $t3, 0x8019
-/* 09AEB4 8009A2B4 8D6BD9B0 */  lw    $t3, %lo(D_8018D9B0)($t3)
-/* 09AEB8 8009A2B8 3C048019 */  lui   $a0, %hi(D_8018D9B4) # $a0, 0x8019
-/* 09AEBC 8009A2BC 3C058019 */  lui   $a1, %hi(D_8018D9B8) # $a1, 0x8019
-/* 09AEC0 8009A2C0 00035040 */  sll   $t2, $v1, 1
-/* 09AEC4 8009A2C4 8CA5D9B8 */  lw    $a1, %lo(D_8018D9B8)($a1)
-/* 09AEC8 8009A2C8 8C84D9B4 */  lw    $a0, %lo(D_8018D9B4)($a0)
-/* 09AECC 8009A2CC 24070001 */  li    $a3, 1
-/* 09AED0 8009A2D0 0C010174 */  jal   tkmk00decode
-/* 09AED4 8009A2D4 014B3021 */   addu  $a2, $t2, $t3
-/* 09AED8 8009A2D8 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 09AEDC 8009A2DC 8FA2001C */  lw    $v0, 0x1c($sp)
-/* 09AEE0 8009A2E0 8FAC0024 */  lw    $t4, 0x24($sp)
-/* 09AEE4 8009A2E4 27BD0030 */  addiu $sp, $sp, 0x30
-/* 09AEE8 8009A2E8 03E00008 */  jr    $ra
-/* 09AEEC 8009A2EC AC4C0000 */   sw    $t4, ($v0)
-
-/* 09AEF0 8009A2F0 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 09AEF4 8009A2F4 AFBF001C */  sw    $ra, 0x1c($sp)
-/* 09AEF8 8009A2F8 0C026455 */  jal   segmented_to_virtual_dupe_2
-/* 09AEFC 8009A2FC AFB00018 */   sw    $s0, 0x18($sp)
-/* 09AF00 8009A300 8C440000 */  lw    $a0, ($v0)
-/* 09AF04 8009A304 00408025 */  move  $s0, $v0
-/* 09AF08 8009A308 5080000A */  beql  $a0, $zero, .L8009A334
-/* 09AF0C 8009A30C 8FBF001C */   lw    $ra, 0x1c($sp)
-.L8009A310:
-/* 09AF10 8009A310 50800008 */  beql  $a0, $zero, .L8009A334
-/* 09AF14 8009A314 8FBF001C */   lw    $ra, 0x1c($sp)
-/* 09AF18 8009A318 0C0265AF */  jal   func_800996BC
-/* 09AF1C 8009A31C 00002825 */   move  $a1, $zero
-/* 09AF20 8009A320 8E040008 */  lw    $a0, 8($s0)
-/* 09AF24 8009A324 26100008 */  addiu $s0, $s0, 8
-/* 09AF28 8009A328 1480FFF9 */  bnez  $a0, .L8009A310
-/* 09AF2C 8009A32C 00000000 */   nop   
-/* 09AF30 8009A330 8FBF001C */  lw    $ra, 0x1c($sp)
-.L8009A334:
-/* 09AF34 8009A334 8FB00018 */  lw    $s0, 0x18($sp)
-/* 09AF38 8009A338 27BD0020 */  addiu $sp, $sp, 0x20
-/* 09AF3C 8009A33C 03E00008 */  jr    $ra
-/* 09AF40 8009A340 00000000 */   nop   
diff --git a/asm/non_matchings/code_80091750/func_8009C708.s b/asm/non_matchings/code_80091750/func_8009C708.s