diff --git a/asm/non_matchings/code/z_collision_btltbls/CollisionBtlTbl_Get.s b/asm/non_matchings/code/z_collision_btltbls/CollisionBtlTbl_Get.s deleted file mode 100644 index 9dd221dbb6..0000000000 --- a/asm/non_matchings/code/z_collision_btltbls/CollisionBtlTbl_Get.s +++ /dev/null @@ -1,29 +0,0 @@ -.rdata -glabel D_8013A580 - .asciz "CollisionBtlTbl_get():インデックスオーバー\n" - # EUC-JP: インデックスオーバー | Index over - .balign 4 - -.text -glabel CollisionBtlTbl_Get -/* AD23A0 8005B200 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD23A4 8005B204 04800004 */ bltz $a0, .L8005B218 -/* AD23A8 8005B208 AFBF0014 */ sw $ra, 0x14($sp) -/* AD23AC 8005B20C 28810017 */ slti $at, $a0, 0x17 -/* AD23B0 8005B210 14200006 */ bnez $at, .L8005B22C -/* AD23B4 8005B214 00047140 */ sll $t6, $a0, 5 -.L8005B218: -/* AD23B8 8005B218 3C048014 */ lui $a0, %hi(D_8013A580) # $a0, 0x8014 -/* AD23BC 8005B21C 0C00084C */ jal osSyncPrintf -/* AD23C0 8005B220 2484A580 */ addiu $a0, %lo(D_8013A580) # addiu $a0, $a0, -0x5a80 -/* AD23C4 8005B224 10000004 */ b .L8005B238 -/* AD23C8 8005B228 00001025 */ move $v0, $zero -.L8005B22C: -/* AD23CC 8005B22C 3C0F8012 */ lui $t7, %hi(D_8011DB20) # $t7, 0x8012 -/* AD23D0 8005B230 25EFDB20 */ addiu $t7, %lo(D_8011DB20) # addiu $t7, $t7, -0x24e0 -/* AD23D4 8005B234 01CF1021 */ addu $v0, $t6, $t7 -.L8005B238: -/* AD23D8 8005B238 8FBF0014 */ lw $ra, 0x14($sp) -/* AD23DC 8005B23C 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD23E0 8005B240 03E00008 */ jr $ra -/* AD23E4 8005B244 00000000 */ nop diff --git a/asm/non_matchings/code/z_collision_btltbls/func_8005B248.s b/asm/non_matchings/code/z_collision_btltbls/func_8005B248.s deleted file mode 100644 index f40889214a..0000000000 --- a/asm/non_matchings/code/z_collision_btltbls/func_8005B248.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8005B248 -/* AD23E8 8005B248 00801825 */ move $v1, $a0 -/* AD23EC 8005B24C 24040020 */ li $a0, 32 -/* AD23F0 8005B250 00001025 */ move $v0, $zero -.L8005B254: -/* AD23F4 8005B254 24420004 */ addiu $v0, $v0, 4 -/* AD23F8 8005B258 A0600001 */ sb $zero, 1($v1) -/* AD23FC 8005B25C A0600002 */ sb $zero, 2($v1) -/* AD2400 8005B260 A0600003 */ sb $zero, 3($v1) -/* AD2404 8005B264 24630004 */ addiu $v1, $v1, 4 -/* AD2408 8005B268 1444FFFA */ bne $v0, $a0, .L8005B254 -/* AD240C 8005B26C A060FFFC */ sb $zero, -4($v1) -/* AD2410 8005B270 03E00008 */ jr $ra -/* AD2414 8005B274 00000000 */ nop diff --git a/asm/non_matchings/code/z_collision_check/func_8005B280.s b/asm/non_matchings/code/z_collision_check/func_8005B280.s deleted file mode 100644 index a04f6ecba0..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005B280.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8005B280 -/* AD2420 8005B280 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD2424 8005B284 AFBF0024 */ sw $ra, 0x24($sp) -/* AD2428 8005B288 240E00FF */ li $t6, 255 -/* AD242C 8005B28C AFAE0010 */ sw $t6, 0x10($sp) -/* AD2430 8005B290 AFA00014 */ sw $zero, 0x14($sp) -/* AD2434 8005B294 0C016CAB */ jal func_8005B2AC -/* AD2438 8005B298 AFA00018 */ sw $zero, 0x18($sp) -/* AD243C 8005B29C 8FBF0024 */ lw $ra, 0x24($sp) -/* AD2440 8005B2A0 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD2444 8005B2A4 03E00008 */ jr $ra -/* AD2448 8005B2A8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005B65C.s b/asm/non_matchings/code/z_collision_check/func_8005B65C.s deleted file mode 100644 index 2c19ed3184..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005B65C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8005B65C -/* AD27FC 8005B65C 3C0E8012 */ lui $t6, %hi(D_8011DE00) # $t6, 0x8012 -/* AD2800 8005B660 AFA40000 */ sw $a0, ($sp) -/* AD2804 8005B664 25CEDE00 */ addiu $t6, %lo(D_8011DE00) # addiu $t6, $t6, -0x2200 -/* AD2808 8005B668 8DD80000 */ lw $t8, ($t6) -/* AD280C 8005B66C 24020001 */ li $v0, 1 -/* AD2810 8005B670 ACB80000 */ sw $t8, ($a1) -/* AD2814 8005B674 8DCF0004 */ lw $t7, 4($t6) -/* AD2818 8005B678 ACAF0004 */ sw $t7, 4($a1) -/* AD281C 8005B67C 8DD80008 */ lw $t8, 8($t6) -/* AD2820 8005B680 ACB80008 */ sw $t8, 8($a1) -/* AD2824 8005B684 8DCF000C */ lw $t7, 0xc($t6) -/* AD2828 8005B688 ACAF000C */ sw $t7, 0xc($a1) -/* AD282C 8005B68C 8DD80010 */ lw $t8, 0x10($t6) -/* AD2830 8005B690 ACB80010 */ sw $t8, 0x10($a1) -/* AD2834 8005B694 8DCF0014 */ lw $t7, 0x14($t6) -/* AD2838 8005B698 03E00008 */ jr $ra -/* AD283C 8005B69C ACAF0014 */ sw $t7, 0x14($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005B6B0.s b/asm/non_matchings/code/z_collision_check/func_8005B6B0.s deleted file mode 100644 index 7eb01f8454..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005B6B0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8005B6B0 -/* AD2850 8005B6B0 AFA40000 */ sw $a0, ($sp) -/* AD2854 8005B6B4 8CCE0000 */ lw $t6, ($a2) -/* AD2858 8005B6B8 24080010 */ li $t0, 16 -/* AD285C 8005B6BC 24020001 */ li $v0, 1 -/* AD2860 8005B6C0 ACAE0000 */ sw $t6, ($a1) -/* AD2864 8005B6C4 90CF0004 */ lbu $t7, 4($a2) -/* AD2868 8005B6C8 A0AF0010 */ sb $t7, 0x10($a1) -/* AD286C 8005B6CC 90D80005 */ lbu $t8, 5($a2) -/* AD2870 8005B6D0 A0B80011 */ sb $t8, 0x11($a1) -/* AD2874 8005B6D4 90D90006 */ lbu $t9, 6($a2) -/* AD2878 8005B6D8 A0A80013 */ sb $t0, 0x13($a1) -/* AD287C 8005B6DC A0B90012 */ sb $t9, 0x12($a1) -/* AD2880 8005B6E0 90C90007 */ lbu $t1, 7($a2) -/* AD2884 8005B6E4 03E00008 */ jr $ra -/* AD2888 8005B6E8 A0A90015 */ sb $t1, 0x15($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005B7C0.s b/asm/non_matchings/code/z_collision_check/func_8005B7C0.s deleted file mode 100644 index e86d871e46..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005B7C0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8005B7C0 -/* AD2960 8005B7C0 3C0E8012 */ lui $t6, %hi(D_8011DE18) # $t6, 0x8012 -/* AD2964 8005B7C4 AFA40000 */ sw $a0, ($sp) -/* AD2968 8005B7C8 25CEDE18 */ addiu $t6, %lo(D_8011DE18) # addiu $t6, $t6, -0x21e8 -/* AD296C 8005B7CC 8DD80000 */ lw $t8, ($t6) -/* AD2970 8005B7D0 24020001 */ li $v0, 1 -/* AD2974 8005B7D4 ACB80000 */ sw $t8, ($a1) -/* AD2978 8005B7D8 8DCF0004 */ lw $t7, 4($t6) -/* AD297C 8005B7DC 03E00008 */ jr $ra -/* AD2980 8005B7E0 ACAF0004 */ sw $t7, 4($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005B7F4.s b/asm/non_matchings/code/z_collision_check/func_8005B7F4.s deleted file mode 100644 index ab676a972c..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005B7F4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8005B7F4 -/* AD2994 8005B7F4 AFA40000 */ sw $a0, ($sp) -/* AD2998 8005B7F8 8CCE0000 */ lw $t6, ($a2) -/* AD299C 8005B7FC 24020001 */ li $v0, 1 -/* AD29A0 8005B800 ACAE0000 */ sw $t6, ($a1) -/* AD29A4 8005B804 90CF0004 */ lbu $t7, 4($a2) -/* AD29A8 8005B808 A0AF0004 */ sb $t7, 4($a1) -/* AD29AC 8005B80C 90D80005 */ lbu $t8, 5($a2) -/* AD29B0 8005B810 03E00008 */ jr $ra -/* AD29B4 8005B814 A0B80005 */ sb $t8, 5($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005B824.s b/asm/non_matchings/code/z_collision_check/func_8005B824.s deleted file mode 100644 index 830bee4f20..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005B824.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8005B824 -/* AD29C4 8005B824 3C0E8012 */ lui $t6, %hi(D_8011DE20) # $t6, 0x8012 -/* AD29C8 8005B828 AFA40000 */ sw $a0, ($sp) -/* AD29CC 8005B82C 25CEDE20 */ addiu $t6, %lo(D_8011DE20) # addiu $t6, $t6, -0x21e0 -/* AD29D0 8005B830 8DD80000 */ lw $t8, ($t6) -/* AD29D4 8005B834 24020001 */ li $v0, 1 -/* AD29D8 8005B838 ACB80000 */ sw $t8, ($a1) -/* AD29DC 8005B83C 8DCF0004 */ lw $t7, 4($t6) -/* AD29E0 8005B840 ACAF0004 */ sw $t7, 4($a1) -/* AD29E4 8005B844 8DD80008 */ lw $t8, 8($t6) -/* AD29E8 8005B848 03E00008 */ jr $ra -/* AD29EC 8005B84C ACB80008 */ sw $t8, 8($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005B860.s b/asm/non_matchings/code/z_collision_check/func_8005B860.s deleted file mode 100644 index 0604780831..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005B860.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8005B860 -/* AD2A00 8005B860 AFA40000 */ sw $a0, ($sp) -/* AD2A04 8005B864 8CCE0000 */ lw $t6, ($a2) -/* AD2A08 8005B868 24020001 */ li $v0, 1 -/* AD2A0C 8005B86C ACAE0000 */ sw $t6, ($a1) -/* AD2A10 8005B870 90CF0004 */ lbu $t7, 4($a2) -/* AD2A14 8005B874 A0AF0004 */ sb $t7, 4($a1) -/* AD2A18 8005B878 90D80005 */ lbu $t8, 5($a2) -/* AD2A1C 8005B87C 03E00008 */ jr $ra -/* AD2A20 8005B880 A0B80005 */ sb $t8, 5($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005B884.s b/asm/non_matchings/code/z_collision_check/func_8005B884.s deleted file mode 100644 index ac6baac29e..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005B884.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8005B884 -/* AD2A24 8005B884 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD2A28 8005B888 3C0E8012 */ lui $t6, %hi(D_8011DE2C) # $t6, 0x8012 -/* AD2A2C 8005B88C 25CEDE2C */ addiu $t6, %lo(D_8011DE2C) # addiu $t6, $t6, -0x21d4 -/* AD2A30 8005B890 AFBF0014 */ sw $ra, 0x14($sp) -/* AD2A34 8005B894 AFA40018 */ sw $a0, 0x18($sp) -/* AD2A38 8005B898 00A03025 */ move $a2, $a1 -/* AD2A3C 8005B89C 25C80024 */ addiu $t0, $t6, 0x24 -/* AD2A40 8005B8A0 00A0C825 */ move $t9, $a1 -.L8005B8A4: -/* AD2A44 8005B8A4 8DD80000 */ lw $t8, ($t6) -/* AD2A48 8005B8A8 25CE000C */ addiu $t6, $t6, 0xc -/* AD2A4C 8005B8AC 2739000C */ addiu $t9, $t9, 0xc -/* AD2A50 8005B8B0 AF38FFF4 */ sw $t8, -0xc($t9) -/* AD2A54 8005B8B4 8DCFFFF8 */ lw $t7, -8($t6) -/* AD2A58 8005B8B8 AF2FFFF8 */ sw $t7, -8($t9) -/* AD2A5C 8005B8BC 8DD8FFFC */ lw $t8, -4($t6) -/* AD2A60 8005B8C0 15C8FFF8 */ bne $t6, $t0, .L8005B8A4 -/* AD2A64 8005B8C4 AF38FFFC */ sw $t8, -4($t9) -/* AD2A68 8005B8C8 8DD80000 */ lw $t8, ($t6) -/* AD2A6C 8005B8CC 00C02825 */ move $a1, $a2 -/* AD2A70 8005B8D0 AF380000 */ sw $t8, ($t9) -/* AD2A74 8005B8D4 AFA6001C */ sw $a2, 0x1c($sp) -/* AD2A78 8005B8D8 0C016DF0 */ jal func_8005B7C0 -/* AD2A7C 8005B8DC 8FA40018 */ lw $a0, 0x18($sp) -/* AD2A80 8005B8E0 8FA6001C */ lw $a2, 0x1c($sp) -/* AD2A84 8005B8E4 8FA40018 */ lw $a0, 0x18($sp) -/* AD2A88 8005B8E8 0C016E09 */ jal func_8005B824 -/* AD2A8C 8005B8EC 24C50008 */ addiu $a1, $a2, 8 -/* AD2A90 8005B8F0 8FBF0014 */ lw $ra, 0x14($sp) -/* AD2A94 8005B8F4 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD2A98 8005B8F8 24020001 */ li $v0, 1 -/* AD2A9C 8005B8FC 03E00008 */ jr $ra -/* AD2AA0 8005B900 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005BA30.s b/asm/non_matchings/code/z_collision_check/func_8005BA30.s deleted file mode 100644 index 6729be5bdf..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005BA30.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8005BA30 -/* AD2BD0 8005BA30 3C0E8012 */ lui $t6, %hi(D_8011DE54) # $t6, 0x8012 -/* AD2BD4 8005BA34 AFA40000 */ sw $a0, ($sp) -/* AD2BD8 8005BA38 25CEDE54 */ addiu $t6, %lo(D_8011DE54) # addiu $t6, $t6, -0x21ac -/* AD2BDC 8005BA3C 8DD80000 */ lw $t8, ($t6) -/* AD2BE0 8005BA40 24020001 */ li $v0, 1 -/* AD2BE4 8005BA44 ACB80000 */ sw $t8, ($a1) -/* AD2BE8 8005BA48 8DCF0004 */ lw $t7, 4($t6) -/* AD2BEC 8005BA4C ACAF0004 */ sw $t7, 4($a1) -/* AD2BF0 8005BA50 8DD80008 */ lw $t8, 8($t6) -/* AD2BF4 8005BA54 ACB80008 */ sw $t8, 8($a1) -/* AD2BF8 8005BA58 8DCF000C */ lw $t7, 0xc($t6) -/* AD2BFC 8005BA5C ACAF000C */ sw $t7, 0xc($a1) -/* AD2C00 8005BA60 8DD80010 */ lw $t8, 0x10($t6) -/* AD2C04 8005BA64 ACB80010 */ sw $t8, 0x10($a1) -/* AD2C08 8005BA68 8DCF0014 */ lw $t7, 0x14($t6) -/* AD2C0C 8005BA6C 03E00008 */ jr $ra -/* AD2C10 8005BA70 ACAF0014 */ sw $t7, 0x14($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005BA84.s b/asm/non_matchings/code/z_collision_check/func_8005BA84.s deleted file mode 100644 index cc22a3408c..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005BA84.s +++ /dev/null @@ -1,28 +0,0 @@ -.late_rodata -glabel D_8013ACF0 - .float 0.01 - -.text -glabel func_8005BA84 -/* AD2C24 8005BA84 AFA40000 */ sw $a0, ($sp) -/* AD2C28 8005BA88 90CE0000 */ lbu $t6, ($a2) -/* AD2C2C 8005BA8C 3C018014 */ lui $at, %hi(D_8013ACF0) -/* AD2C30 8005BA90 24020001 */ li $v0, 1 -/* AD2C34 8005BA94 A0AE0014 */ sb $t6, 0x14($a1) -/* AD2C38 8005BA98 88D80002 */ lwl $t8, 2($a2) -/* AD2C3C 8005BA9C 98D80005 */ lwr $t8, 5($a2) -/* AD2C40 8005BAA0 A8B80000 */ swl $t8, ($a1) -/* AD2C44 8005BAA4 B8B80003 */ swr $t8, 3($a1) -/* AD2C48 8005BAA8 88CF0006 */ lwl $t7, 6($a2) -/* AD2C4C 8005BAAC 98CF0009 */ lwr $t7, 9($a2) -/* AD2C50 8005BAB0 A8AF0004 */ swl $t7, 4($a1) -/* AD2C54 8005BAB4 B8AF0007 */ swr $t7, 7($a1) -/* AD2C58 8005BAB8 84D9000A */ lh $t9, 0xa($a2) -/* AD2C5C 8005BABC C428ACF0 */ lwc1 $f8, %lo(D_8013ACF0)($at) -/* AD2C60 8005BAC0 44992000 */ mtc1 $t9, $f4 -/* AD2C64 8005BAC4 00000000 */ nop -/* AD2C68 8005BAC8 468021A0 */ cvt.s.w $f6, $f4 -/* AD2C6C 8005BACC 46083282 */ mul.s $f10, $f6, $f8 -/* AD2C70 8005BAD0 03E00008 */ jr $ra -/* AD2C74 8005BAD4 E4AA0010 */ swc1 $f10, 0x10($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005BAD8.s b/asm/non_matchings/code/z_collision_check/func_8005BAD8.s deleted file mode 100644 index 0142b7990a..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005BAD8.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8005BAD8 -/* AD2C78 8005BAD8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD2C7C 8005BADC AFBF0014 */ sw $ra, 0x14($sp) -/* AD2C80 8005BAE0 AFA40018 */ sw $a0, 0x18($sp) -/* AD2C84 8005BAE4 0C016E21 */ jal func_8005B884 -/* AD2C88 8005BAE8 AFA5001C */ sw $a1, 0x1c($sp) -/* AD2C8C 8005BAEC 8FA5001C */ lw $a1, 0x1c($sp) -/* AD2C90 8005BAF0 8FA40018 */ lw $a0, 0x18($sp) -/* AD2C94 8005BAF4 0C016E8C */ jal func_8005BA30 -/* AD2C98 8005BAF8 24A50028 */ addiu $a1, $a1, 0x28 -/* AD2C9C 8005BAFC 8FBF0014 */ lw $ra, 0x14($sp) -/* AD2CA0 8005BB00 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD2CA4 8005BB04 24020001 */ li $v0, 1 -/* AD2CA8 8005BB08 03E00008 */ jr $ra -/* AD2CAC 8005BB0C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005BB10.s b/asm/non_matchings/code/z_collision_check/func_8005BB10.s deleted file mode 100644 index 702a629856..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005BB10.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8005BB10 -/* AD2CB0 8005BB10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD2CB4 8005BB14 AFBF0014 */ sw $ra, 0x14($sp) -/* AD2CB8 8005BB18 AFA40018 */ sw $a0, 0x18($sp) -/* AD2CBC 8005BB1C 0C016E41 */ jal func_8005B904 -/* AD2CC0 8005BB20 AFA5001C */ sw $a1, 0x1c($sp) -/* AD2CC4 8005BB24 8FA5001C */ lw $a1, 0x1c($sp) -/* AD2CC8 8005BB28 8FA40018 */ lw $a0, 0x18($sp) -/* AD2CCC 8005BB2C 0C016E9D */ jal func_8005BA74 -/* AD2CD0 8005BB30 24A50028 */ addiu $a1, $a1, 0x28 -/* AD2CD4 8005BB34 8FBF0014 */ lw $ra, 0x14($sp) -/* AD2CD8 8005BB38 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD2CDC 8005BB3C 24020001 */ li $v0, 1 -/* AD2CE0 8005BB40 03E00008 */ jr $ra -/* AD2CE4 8005BB44 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005BB48.s b/asm/non_matchings/code/z_collision_check/func_8005BB48.s deleted file mode 100644 index 7245033170..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005BB48.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8005BB48 -/* AD2CE8 8005BB48 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD2CEC 8005BB4C AFBF0014 */ sw $ra, 0x14($sp) -/* AD2CF0 8005BB50 AFA40018 */ sw $a0, 0x18($sp) -/* AD2CF4 8005BB54 AFA5001C */ sw $a1, 0x1c($sp) -/* AD2CF8 8005BB58 0C016E4F */ jal func_8005B93C -/* AD2CFC 8005BB5C AFA60020 */ sw $a2, 0x20($sp) -/* AD2D00 8005BB60 8FA5001C */ lw $a1, 0x1c($sp) -/* AD2D04 8005BB64 8FA60020 */ lw $a2, 0x20($sp) -/* AD2D08 8005BB68 8FA40018 */ lw $a0, 0x18($sp) -/* AD2D0C 8005BB6C 24A50028 */ addiu $a1, $a1, 0x28 -/* AD2D10 8005BB70 0C016EA1 */ jal func_8005BA84 -/* AD2D14 8005BB74 24C60018 */ addiu $a2, $a2, 0x18 -/* AD2D18 8005BB78 8FBF0014 */ lw $ra, 0x14($sp) -/* AD2D1C 8005BB7C 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD2D20 8005BB80 24020001 */ li $v0, 1 -/* AD2D24 8005BB84 03E00008 */ jr $ra -/* AD2D28 8005BB88 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005BB8C.s b/asm/non_matchings/code/z_collision_check/func_8005BB8C.s deleted file mode 100644 index b36dbc691f..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005BB8C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8005BB8C -/* AD2D2C 8005BB8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD2D30 8005BB90 AFBF0014 */ sw $ra, 0x14($sp) -/* AD2D34 8005BB94 0C016E6C */ jal func_8005B9B0 -/* AD2D38 8005BB98 00000000 */ nop -/* AD2D3C 8005BB9C 8FBF0014 */ lw $ra, 0x14($sp) -/* AD2D40 8005BBA0 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD2D44 8005BBA4 24020001 */ li $v0, 1 -/* AD2D48 8005BBA8 03E00008 */ jr $ra -/* AD2D4C 8005BBAC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005BBB0.s b/asm/non_matchings/code/z_collision_check/func_8005BBB0.s deleted file mode 100644 index 6d4c923fad..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005BBB0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8005BBB0 -/* AD2D50 8005BBB0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD2D54 8005BBB4 AFBF0014 */ sw $ra, 0x14($sp) -/* AD2D58 8005BBB8 0C016E7A */ jal func_8005B9E8 -/* AD2D5C 8005BBBC 00000000 */ nop -/* AD2D60 8005BBC0 8FBF0014 */ lw $ra, 0x14($sp) -/* AD2D64 8005BBC4 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD2D68 8005BBC8 24020001 */ li $v0, 1 -/* AD2D6C 8005BBCC 03E00008 */ jr $ra -/* AD2D70 8005BBD0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005BBD4.s b/asm/non_matchings/code/z_collision_check/func_8005BBD4.s deleted file mode 100644 index 3f8f424377..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005BBD4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8005BBD4 -/* AD2D74 8005BBD4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD2D78 8005BBD8 AFBF0014 */ sw $ra, 0x14($sp) -/* AD2D7C 8005BBDC 0C016E87 */ jal func_8005BA1C -/* AD2D80 8005BBE0 00000000 */ nop -/* AD2D84 8005BBE4 8FBF0014 */ lw $ra, 0x14($sp) -/* AD2D88 8005BBE8 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD2D8C 8005BBEC 24020001 */ li $v0, 1 -/* AD2D90 8005BBF0 03E00008 */ jr $ra -/* AD2D94 8005BBF4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005BBF8.s b/asm/non_matchings/code/z_collision_check/func_8005BBF8.s deleted file mode 100644 index 157c17e3b8..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005BBF8.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8005BBF8 -/* AD2D98 8005BBF8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD2D9C 8005BBFC AFBF0014 */ sw $ra, 0x14($sp) -/* AD2DA0 8005BC00 0C016D97 */ jal func_8005B65C -/* AD2DA4 8005BC04 AFA5001C */ sw $a1, 0x1c($sp) -/* AD2DA8 8005BC08 8FA5001C */ lw $a1, 0x1c($sp) -/* AD2DAC 8005BC0C 24020001 */ li $v0, 1 -/* AD2DB0 8005BC10 ACA00018 */ sw $zero, 0x18($a1) -/* AD2DB4 8005BC14 ACA0001C */ sw $zero, 0x1c($a1) -/* AD2DB8 8005BC18 8FBF0014 */ lw $ra, 0x14($sp) -/* AD2DBC 8005BC1C 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD2DC0 8005BC20 03E00008 */ jr $ra -/* AD2DC4 8005BC24 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005BC28.s b/asm/non_matchings/code/z_collision_check/func_8005BC28.s deleted file mode 100644 index 30e2ac8799..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005BC28.s +++ /dev/null @@ -1,51 +0,0 @@ -.rdata -glabel D_8013A608 - .asciz "../z_collision_check.c" - .balign 4 - -.text -glabel func_8005BC28 -/* AD2DC8 8005BC28 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD2DCC 8005BC2C AFBF0024 */ sw $ra, 0x24($sp) -/* AD2DD0 8005BC30 AFB20020 */ sw $s2, 0x20($sp) -/* AD2DD4 8005BC34 AFB1001C */ sw $s1, 0x1c($sp) -/* AD2DD8 8005BC38 00A08825 */ move $s1, $a1 -/* AD2DDC 8005BC3C 00809025 */ move $s2, $a0 -/* AD2DE0 8005BC40 0C016DA8 */ jal func_8005B6A0 -/* AD2DE4 8005BC44 AFB00018 */ sw $s0, 0x18($sp) -/* AD2DE8 8005BC48 8E2E0018 */ lw $t6, 0x18($s1) -/* AD2DEC 8005BC4C 8E24001C */ lw $a0, 0x1c($s1) -/* AD2DF0 8005BC50 000E7980 */ sll $t7, $t6, 6 -/* AD2DF4 8005BC54 008FC021 */ addu $t8, $a0, $t7 -/* AD2DF8 8005BC58 0098082B */ sltu $at, $a0, $t8 -/* AD2DFC 8005BC5C 1020000C */ beqz $at, .L8005BC90 -/* AD2E00 8005BC60 00808025 */ move $s0, $a0 -/* AD2E04 8005BC64 02402025 */ move $a0, $s2 -.L8005BC68: -/* AD2E08 8005BC68 0C016EC4 */ jal func_8005BB10 -/* AD2E0C 8005BC6C 02002825 */ move $a1, $s0 -/* AD2E10 8005BC70 8E390018 */ lw $t9, 0x18($s1) -/* AD2E14 8005BC74 8E24001C */ lw $a0, 0x1c($s1) -/* AD2E18 8005BC78 26100040 */ addiu $s0, $s0, 0x40 -/* AD2E1C 8005BC7C 00194180 */ sll $t0, $t9, 6 -/* AD2E20 8005BC80 00884821 */ addu $t1, $a0, $t0 -/* AD2E24 8005BC84 0209082B */ sltu $at, $s0, $t1 -/* AD2E28 8005BC88 5420FFF7 */ bnezl $at, .L8005BC68 -/* AD2E2C 8005BC8C 02402025 */ move $a0, $s2 -.L8005BC90: -/* AD2E30 8005BC90 10800005 */ beqz $a0, .L8005BCA8 -/* AD2E34 8005BC94 AE200018 */ sw $zero, 0x18($s1) -/* AD2E38 8005BC98 3C058014 */ lui $a1, %hi(D_8013A608) # $a1, 0x8014 -/* AD2E3C 8005BC9C 24A5A608 */ addiu $a1, %lo(D_8013A608) # addiu $a1, $a1, -0x59f8 -/* AD2E40 8005BCA0 0C01EC35 */ jal ZeldaArena_FreeDebug -/* AD2E44 8005BCA4 24060571 */ li $a2, 1393 -.L8005BCA8: -/* AD2E48 8005BCA8 AE20001C */ sw $zero, 0x1c($s1) -/* AD2E4C 8005BCAC 8FBF0024 */ lw $ra, 0x24($sp) -/* AD2E50 8005BCB0 8FB20020 */ lw $s2, 0x20($sp) -/* AD2E54 8005BCB4 8FB1001C */ lw $s1, 0x1c($sp) -/* AD2E58 8005BCB8 8FB00018 */ lw $s0, 0x18($sp) -/* AD2E5C 8005BCBC 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD2E60 8005BCC0 03E00008 */ jr $ra -/* AD2E64 8005BCC4 24020001 */ li $v0, 1 - diff --git a/asm/non_matchings/code/z_collision_check/func_8005BCC8.s b/asm/non_matchings/code/z_collision_check/func_8005BCC8.s deleted file mode 100644 index 69ac7c5ed2..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005BCC8.s +++ /dev/null @@ -1,126 +0,0 @@ -.rdata -glabel D_8013A620 - .asciz "../z_collision_check.c" - .balign 4 - -glabel D_8013A638 - .asciz "\x1b[31m" - .balign 4 - -glabel D_8013A640 - .asciz "ClObjJntSph_set():zelda_malloc()出来ません。\n" - # EUC-JP: 出来ません。 | Can not. - .balign 4 - -glabel D_8013A670 - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_8005BCC8 -/* AD2E68 8005BCC8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD2E6C 8005BCCC AFBF0024 */ sw $ra, 0x24($sp) -/* AD2E70 8005BCD0 AFB20020 */ sw $s2, 0x20($sp) -/* AD2E74 8005BCD4 AFB1001C */ sw $s1, 0x1c($sp) -/* AD2E78 8005BCD8 00A08825 */ move $s1, $a1 -/* AD2E7C 8005BCDC 00809025 */ move $s2, $a0 -/* AD2E80 8005BCE0 0C016DA8 */ jal func_8005B6A0 -/* AD2E84 8005BCE4 AFB00018 */ sw $s0, 0x18($sp) -/* AD2E88 8005BCE8 8E2E0018 */ lw $t6, 0x18($s1) -/* AD2E8C 8005BCEC 8E30001C */ lw $s0, 0x1c($s1) -/* AD2E90 8005BCF0 000E7980 */ sll $t7, $t6, 6 -/* AD2E94 8005BCF4 020FC021 */ addu $t8, $s0, $t7 -/* AD2E98 8005BCF8 0218082B */ sltu $at, $s0, $t8 -/* AD2E9C 8005BCFC 1020000B */ beqz $at, .L8005BD2C -/* AD2EA0 8005BD00 02402025 */ move $a0, $s2 -.L8005BD04: -/* AD2EA4 8005BD04 0C016EC4 */ jal func_8005BB10 -/* AD2EA8 8005BD08 02002825 */ move $a1, $s0 -/* AD2EAC 8005BD0C 8E280018 */ lw $t0, 0x18($s1) -/* AD2EB0 8005BD10 8E39001C */ lw $t9, 0x1c($s1) -/* AD2EB4 8005BD14 26100040 */ addiu $s0, $s0, 0x40 -/* AD2EB8 8005BD18 00084980 */ sll $t1, $t0, 6 -/* AD2EBC 8005BD1C 03295021 */ addu $t2, $t9, $t1 -/* AD2EC0 8005BD20 020A082B */ sltu $at, $s0, $t2 -/* AD2EC4 8005BD24 5420FFF7 */ bnezl $at, .L8005BD04 -/* AD2EC8 8005BD28 02402025 */ move $a0, $s2 -.L8005BD2C: -/* AD2ECC 8005BD2C AE200018 */ sw $zero, 0x18($s1) -/* AD2ED0 8005BD30 AE20001C */ sw $zero, 0x1c($s1) -/* AD2ED4 8005BD34 8FBF0024 */ lw $ra, 0x24($sp) -/* AD2ED8 8005BD38 8FB20020 */ lw $s2, 0x20($sp) -/* AD2EDC 8005BD3C 8FB1001C */ lw $s1, 0x1c($sp) -/* AD2EE0 8005BD40 8FB00018 */ lw $s0, 0x18($sp) -/* AD2EE4 8005BD44 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD2EE8 8005BD48 03E00008 */ jr $ra -/* AD2EEC 8005BD4C 24020001 */ li $v0, 1 - -/* AD2EF0 8005BD50 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD2EF4 8005BD54 AFBF0024 */ sw $ra, 0x24($sp) -/* AD2EF8 8005BD58 AFB30020 */ sw $s3, 0x20($sp) -/* AD2EFC 8005BD5C AFB2001C */ sw $s2, 0x1c($sp) -/* AD2F00 8005BD60 00A09025 */ move $s2, $a1 -/* AD2F04 8005BD64 00809825 */ move $s3, $a0 -/* AD2F08 8005BD68 AFB10018 */ sw $s1, 0x18($sp) -/* AD2F0C 8005BD6C AFB00014 */ sw $s0, 0x14($sp) -/* AD2F10 8005BD70 0C016DAC */ jal func_8005B6B0 -/* AD2F14 8005BD74 AFA60030 */ sw $a2, 0x30($sp) -/* AD2F18 8005BD78 8FA30030 */ lw $v1, 0x30($sp) -/* AD2F1C 8005BD7C 3C058014 */ lui $a1, %hi(D_8013A620) # $a1, 0x8014 -/* AD2F20 8005BD80 24A5A620 */ addiu $a1, %lo(D_8013A620) # addiu $a1, $a1, -0x59e0 -/* AD2F24 8005BD84 8C6E0008 */ lw $t6, 8($v1) -/* AD2F28 8005BD88 240605A3 */ li $a2, 1443 -/* AD2F2C 8005BD8C AE4E0018 */ sw $t6, 0x18($s2) -/* AD2F30 8005BD90 8C640008 */ lw $a0, 8($v1) -/* AD2F34 8005BD94 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* AD2F38 8005BD98 00042180 */ sll $a0, $a0, 6 -/* AD2F3C 8005BD9C 1440000D */ bnez $v0, .L8005BDD4 -/* AD2F40 8005BDA0 AE42001C */ sw $v0, 0x1c($s2) -/* AD2F44 8005BDA4 3C048014 */ lui $a0, %hi(D_8013A638) # $a0, 0x8014 -/* AD2F48 8005BDA8 AE400018 */ sw $zero, 0x18($s2) -/* AD2F4C 8005BDAC 0C00084C */ jal osSyncPrintf -/* AD2F50 8005BDB0 2484A638 */ addiu $a0, %lo(D_8013A638) # addiu $a0, $a0, -0x59c8 -/* AD2F54 8005BDB4 3C048014 */ lui $a0, %hi(D_8013A640) # $a0, 0x8014 -/* AD2F58 8005BDB8 0C00084C */ jal osSyncPrintf -/* AD2F5C 8005BDBC 2484A640 */ addiu $a0, %lo(D_8013A640) # addiu $a0, $a0, -0x59c0 -/* AD2F60 8005BDC0 3C048014 */ lui $a0, %hi(D_8013A670) # $a0, 0x8014 -/* AD2F64 8005BDC4 0C00084C */ jal osSyncPrintf -/* AD2F68 8005BDC8 2484A670 */ addiu $a0, %lo(D_8013A670) # addiu $a0, $a0, -0x5990 -/* AD2F6C 8005BDCC 10000019 */ b .L8005BE34 -/* AD2F70 8005BDD0 00001025 */ move $v0, $zero -.L8005BDD4: -/* AD2F74 8005BDD4 8E580018 */ lw $t8, 0x18($s2) -/* AD2F78 8005BDD8 8E50001C */ lw $s0, 0x1c($s2) -/* AD2F7C 8005BDDC 8FAF0030 */ lw $t7, 0x30($sp) -/* AD2F80 8005BDE0 0018C980 */ sll $t9, $t8, 6 -/* AD2F84 8005BDE4 02194021 */ addu $t0, $s0, $t9 -/* AD2F88 8005BDE8 0208082B */ sltu $at, $s0, $t0 -/* AD2F8C 8005BDEC 10200010 */ beqz $at, .L8005BE30 -/* AD2F90 8005BDF0 8DF1000C */ lw $s1, 0xc($t7) -.L8005BDF4: -/* AD2F94 8005BDF4 02602025 */ move $a0, $s3 -/* AD2F98 8005BDF8 0C016EB6 */ jal func_8005BAD8 -/* AD2F9C 8005BDFC 02002825 */ move $a1, $s0 -/* AD2FA0 8005BE00 02602025 */ move $a0, $s3 -/* AD2FA4 8005BE04 02002825 */ move $a1, $s0 -/* AD2FA8 8005BE08 0C016ED2 */ jal func_8005BB48 -/* AD2FAC 8005BE0C 02203025 */ move $a2, $s1 -/* AD2FB0 8005BE10 8E4A0018 */ lw $t2, 0x18($s2) -/* AD2FB4 8005BE14 8E49001C */ lw $t1, 0x1c($s2) -/* AD2FB8 8005BE18 26100040 */ addiu $s0, $s0, 0x40 -/* AD2FBC 8005BE1C 000A5980 */ sll $t3, $t2, 6 -/* AD2FC0 8005BE20 012B6021 */ addu $t4, $t1, $t3 -/* AD2FC4 8005BE24 020C082B */ sltu $at, $s0, $t4 -/* AD2FC8 8005BE28 1420FFF2 */ bnez $at, .L8005BDF4 -/* AD2FCC 8005BE2C 26310024 */ addiu $s1, $s1, 0x24 -.L8005BE30: -/* AD2FD0 8005BE30 24020001 */ li $v0, 1 -.L8005BE34: -/* AD2FD4 8005BE34 8FBF0024 */ lw $ra, 0x24($sp) -/* AD2FD8 8005BE38 8FB00014 */ lw $s0, 0x14($sp) -/* AD2FDC 8005BE3C 8FB10018 */ lw $s1, 0x18($sp) -/* AD2FE0 8005BE40 8FB2001C */ lw $s2, 0x1c($sp) -/* AD2FE4 8005BE44 8FB30020 */ lw $s3, 0x20($sp) -/* AD2FE8 8005BE48 03E00008 */ jr $ra -/* AD2FEC 8005BE4C 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_collision_check/func_8005BE50.s b/asm/non_matchings/code/z_collision_check/func_8005BE50.s deleted file mode 100644 index 1d6afd0549..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005BE50.s +++ /dev/null @@ -1,175 +0,0 @@ -.rdata -glabel D_8013A674 - .asciz "../z_collision_check.c" - .balign 4 - -glabel D_8013A68C - .asciz "\x1b[31m" - .balign 4 - -glabel D_8013A694 - .asciz "ClObjJntSph_set3():zelda_malloc_出来ません。\n" - # EUC-JP: 出来ません。 | Can not. - .balign 4 - -glabel D_8013A6C4 - .asciz "\x1b[m" - .balign 4 - -glabel D_8013A6C8 - .asciz "../z_collision_check.c" - .balign 4 - -glabel D_8013A6E0 - .asciz "\x1b[31m" - .balign 4 - -glabel D_8013A6E8 - .asciz "ClObjJntSph_set5():zelda_malloc出来ません\n" - # EUC-JP: 出来ません。 | Can not. - .balign 4 - -glabel D_8013A714 - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_8005BE50 -/* AD2FF0 8005BE50 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD2FF4 8005BE54 AFBF0024 */ sw $ra, 0x24($sp) -/* AD2FF8 8005BE58 AFB30020 */ sw $s3, 0x20($sp) -/* AD2FFC 8005BE5C AFB2001C */ sw $s2, 0x1c($sp) -/* AD3000 8005BE60 00A09025 */ move $s2, $a1 -/* AD3004 8005BE64 00809825 */ move $s3, $a0 -/* AD3008 8005BE68 AFB10018 */ sw $s1, 0x18($sp) -/* AD300C 8005BE6C AFB00014 */ sw $s0, 0x14($sp) -/* AD3010 8005BE70 0C016DBB */ jal func_8005B6EC -/* AD3014 8005BE74 AFA70034 */ sw $a3, 0x34($sp) -/* AD3018 8005BE78 8FA30034 */ lw $v1, 0x34($sp) -/* AD301C 8005BE7C 3C058014 */ lui $a1, %hi(D_8013A674) # $a1, 0x8014 -/* AD3020 8005BE80 24A5A674 */ addiu $a1, %lo(D_8013A674) # addiu $a1, $a1, -0x598c -/* AD3024 8005BE84 8C6E0008 */ lw $t6, 8($v1) -/* AD3028 8005BE88 240605D2 */ li $a2, 1490 -/* AD302C 8005BE8C AE4E0018 */ sw $t6, 0x18($s2) -/* AD3030 8005BE90 8C640008 */ lw $a0, 8($v1) -/* AD3034 8005BE94 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* AD3038 8005BE98 00042180 */ sll $a0, $a0, 6 -/* AD303C 8005BE9C 1440000D */ bnez $v0, .L8005BED4 -/* AD3040 8005BEA0 AE42001C */ sw $v0, 0x1c($s2) -/* AD3044 8005BEA4 3C048014 */ lui $a0, %hi(D_8013A68C) # $a0, 0x8014 -/* AD3048 8005BEA8 AE400018 */ sw $zero, 0x18($s2) -/* AD304C 8005BEAC 0C00084C */ jal osSyncPrintf -/* AD3050 8005BEB0 2484A68C */ addiu $a0, %lo(D_8013A68C) # addiu $a0, $a0, -0x5974 -/* AD3054 8005BEB4 3C048014 */ lui $a0, %hi(D_8013A694) # $a0, 0x8014 -/* AD3058 8005BEB8 0C00084C */ jal osSyncPrintf -/* AD305C 8005BEBC 2484A694 */ addiu $a0, %lo(D_8013A694) # addiu $a0, $a0, -0x596c -/* AD3060 8005BEC0 3C048014 */ lui $a0, %hi(D_8013A6C4) # $a0, 0x8014 -/* AD3064 8005BEC4 0C00084C */ jal osSyncPrintf -/* AD3068 8005BEC8 2484A6C4 */ addiu $a0, %lo(D_8013A6C4) # addiu $a0, $a0, -0x593c -/* AD306C 8005BECC 10000019 */ b .L8005BF34 -/* AD3070 8005BED0 00001025 */ move $v0, $zero -.L8005BED4: -/* AD3074 8005BED4 8E580018 */ lw $t8, 0x18($s2) -/* AD3078 8005BED8 8E50001C */ lw $s0, 0x1c($s2) -/* AD307C 8005BEDC 8FAF0034 */ lw $t7, 0x34($sp) -/* AD3080 8005BEE0 0018C980 */ sll $t9, $t8, 6 -/* AD3084 8005BEE4 02194021 */ addu $t0, $s0, $t9 -/* AD3088 8005BEE8 0208082B */ sltu $at, $s0, $t0 -/* AD308C 8005BEEC 10200010 */ beqz $at, .L8005BF30 -/* AD3090 8005BEF0 8DF1000C */ lw $s1, 0xc($t7) -.L8005BEF4: -/* AD3094 8005BEF4 02602025 */ move $a0, $s3 -/* AD3098 8005BEF8 0C016EB6 */ jal func_8005BAD8 -/* AD309C 8005BEFC 02002825 */ move $a1, $s0 -/* AD30A0 8005BF00 02602025 */ move $a0, $s3 -/* AD30A4 8005BF04 02002825 */ move $a1, $s0 -/* AD30A8 8005BF08 0C016ED2 */ jal func_8005BB48 -/* AD30AC 8005BF0C 02203025 */ move $a2, $s1 -/* AD30B0 8005BF10 8E4A0018 */ lw $t2, 0x18($s2) -/* AD30B4 8005BF14 8E49001C */ lw $t1, 0x1c($s2) -/* AD30B8 8005BF18 26100040 */ addiu $s0, $s0, 0x40 -/* AD30BC 8005BF1C 000A5980 */ sll $t3, $t2, 6 -/* AD30C0 8005BF20 012B6021 */ addu $t4, $t1, $t3 -/* AD30C4 8005BF24 020C082B */ sltu $at, $s0, $t4 -/* AD30C8 8005BF28 1420FFF2 */ bnez $at, .L8005BEF4 -/* AD30CC 8005BF2C 26310024 */ addiu $s1, $s1, 0x24 -.L8005BF30: -/* AD30D0 8005BF30 24020001 */ li $v0, 1 -.L8005BF34: -/* AD30D4 8005BF34 8FBF0024 */ lw $ra, 0x24($sp) -/* AD30D8 8005BF38 8FB00014 */ lw $s0, 0x14($sp) -/* AD30DC 8005BF3C 8FB10018 */ lw $s1, 0x18($sp) -/* AD30E0 8005BF40 8FB2001C */ lw $s2, 0x1c($sp) -/* AD30E4 8005BF44 8FB30020 */ lw $s3, 0x20($sp) -/* AD30E8 8005BF48 03E00008 */ jr $ra -/* AD30EC 8005BF4C 27BD0028 */ addiu $sp, $sp, 0x28 - -/* AD30F0 8005BF50 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD30F4 8005BF54 AFBF0024 */ sw $ra, 0x24($sp) -/* AD30F8 8005BF58 AFB30020 */ sw $s3, 0x20($sp) -/* AD30FC 8005BF5C AFB2001C */ sw $s2, 0x1c($sp) -/* AD3100 8005BF60 00A09025 */ move $s2, $a1 -/* AD3104 8005BF64 00809825 */ move $s3, $a0 -/* AD3108 8005BF68 AFB10018 */ sw $s1, 0x18($sp) -/* AD310C 8005BF6C AFB00014 */ sw $s0, 0x14($sp) -/* AD3110 8005BF70 0C016DCB */ jal func_8005B72C -/* AD3114 8005BF74 AFA70034 */ sw $a3, 0x34($sp) -/* AD3118 8005BF78 8FA30034 */ lw $v1, 0x34($sp) -/* AD311C 8005BF7C 3C058014 */ lui $a1, %hi(D_8013A6C8) # $a1, 0x8014 -/* AD3120 8005BF80 24A5A6C8 */ addiu $a1, %lo(D_8013A6C8) # addiu $a1, $a1, -0x5938 -/* AD3124 8005BF84 8C6E0008 */ lw $t6, 8($v1) -/* AD3128 8005BF88 2406060F */ li $a2, 1551 -/* AD312C 8005BF8C AE4E0018 */ sw $t6, 0x18($s2) -/* AD3130 8005BF90 8C640008 */ lw $a0, 8($v1) -/* AD3134 8005BF94 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* AD3138 8005BF98 00042180 */ sll $a0, $a0, 6 -/* AD313C 8005BF9C 1440000D */ bnez $v0, .L8005BFD4 -/* AD3140 8005BFA0 AE42001C */ sw $v0, 0x1c($s2) -/* AD3144 8005BFA4 3C048014 */ lui $a0, %hi(D_8013A6E0) # $a0, 0x8014 -/* AD3148 8005BFA8 AE400018 */ sw $zero, 0x18($s2) -/* AD314C 8005BFAC 0C00084C */ jal osSyncPrintf -/* AD3150 8005BFB0 2484A6E0 */ addiu $a0, %lo(D_8013A6E0) # addiu $a0, $a0, -0x5920 -/* AD3154 8005BFB4 3C048014 */ lui $a0, %hi(D_8013A6E8) # $a0, 0x8014 -/* AD3158 8005BFB8 0C00084C */ jal osSyncPrintf -/* AD315C 8005BFBC 2484A6E8 */ addiu $a0, %lo(D_8013A6E8) # addiu $a0, $a0, -0x5918 -/* AD3160 8005BFC0 3C048014 */ lui $a0, %hi(D_8013A714) # $a0, 0x8014 -/* AD3164 8005BFC4 0C00084C */ jal osSyncPrintf -/* AD3168 8005BFC8 2484A714 */ addiu $a0, %lo(D_8013A714) # addiu $a0, $a0, -0x58ec -/* AD316C 8005BFCC 10000019 */ b .L8005C034 -/* AD3170 8005BFD0 00001025 */ move $v0, $zero -.L8005BFD4: -/* AD3174 8005BFD4 8E580018 */ lw $t8, 0x18($s2) -/* AD3178 8005BFD8 8E50001C */ lw $s0, 0x1c($s2) -/* AD317C 8005BFDC 8FAF0034 */ lw $t7, 0x34($sp) -/* AD3180 8005BFE0 0018C980 */ sll $t9, $t8, 6 -/* AD3184 8005BFE4 02194021 */ addu $t0, $s0, $t9 -/* AD3188 8005BFE8 0208082B */ sltu $at, $s0, $t0 -/* AD318C 8005BFEC 10200010 */ beqz $at, .L8005C030 -/* AD3190 8005BFF0 8DF1000C */ lw $s1, 0xc($t7) -.L8005BFF4: -/* AD3194 8005BFF4 02602025 */ move $a0, $s3 -/* AD3198 8005BFF8 0C016EB6 */ jal func_8005BAD8 -/* AD319C 8005BFFC 02002825 */ move $a1, $s0 -/* AD31A0 8005C000 02602025 */ move $a0, $s3 -/* AD31A4 8005C004 02002825 */ move $a1, $s0 -/* AD31A8 8005C008 0C016ED2 */ jal func_8005BB48 -/* AD31AC 8005C00C 02203025 */ move $a2, $s1 -/* AD31B0 8005C010 8E4A0018 */ lw $t2, 0x18($s2) -/* AD31B4 8005C014 8E49001C */ lw $t1, 0x1c($s2) -/* AD31B8 8005C018 26100040 */ addiu $s0, $s0, 0x40 -/* AD31BC 8005C01C 000A5980 */ sll $t3, $t2, 6 -/* AD31C0 8005C020 012B6021 */ addu $t4, $t1, $t3 -/* AD31C4 8005C024 020C082B */ sltu $at, $s0, $t4 -/* AD31C8 8005C028 1420FFF2 */ bnez $at, .L8005BFF4 -/* AD31CC 8005C02C 26310024 */ addiu $s1, $s1, 0x24 -.L8005C030: -/* AD31D0 8005C030 24020001 */ li $v0, 1 -.L8005C034: -/* AD31D4 8005C034 8FBF0024 */ lw $ra, 0x24($sp) -/* AD31D8 8005C038 8FB00014 */ lw $s0, 0x14($sp) -/* AD31DC 8005C03C 8FB10018 */ lw $s1, 0x18($sp) -/* AD31E0 8005C040 8FB2001C */ lw $s2, 0x1c($sp) -/* AD31E4 8005C044 8FB30020 */ lw $s3, 0x20($sp) -/* AD31E8 8005C048 03E00008 */ jr $ra -/* AD31EC 8005C04C 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C050.s b/asm/non_matchings/code/z_collision_check/func_8005C050.s deleted file mode 100644 index dd7b0a868d..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C050.s +++ /dev/null @@ -1,179 +0,0 @@ -.rdata -glabel D_8013A718 - .asciz "pclobj_jntsph->elem_tbl != NULL" - .balign 4 - -glabel D_8013A738 - .asciz "../z_collision_check.c" - .balign 4 - -.text -glabel func_8005C050 -/* AD31F0 8005C050 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD31F4 8005C054 AFBF0024 */ sw $ra, 0x24($sp) -/* AD31F8 8005C058 AFB30020 */ sw $s3, 0x20($sp) -/* AD31FC 8005C05C AFB2001C */ sw $s2, 0x1c($sp) -/* AD3200 8005C060 00A09025 */ move $s2, $a1 -/* AD3204 8005C064 00809825 */ move $s3, $a0 -/* AD3208 8005C068 AFB10018 */ sw $s1, 0x18($sp) -/* AD320C 8005C06C AFB00014 */ sw $s0, 0x14($sp) -/* AD3210 8005C070 0C016DCB */ jal func_8005B72C -/* AD3214 8005C074 AFA70034 */ sw $a3, 0x34($sp) -/* AD3218 8005C078 8FAE0034 */ lw $t6, 0x34($sp) -/* AD321C 8005C07C 8FA20038 */ lw $v0, 0x38($sp) -/* AD3220 8005C080 3C048014 */ lui $a0, %hi(D_8013A718) # $a0, 0x8014 -/* AD3224 8005C084 8DCF0008 */ lw $t7, 8($t6) -/* AD3228 8005C088 AE42001C */ sw $v0, 0x1c($s2) -/* AD322C 8005C08C 14400006 */ bnez $v0, .L8005C0A8 -/* AD3230 8005C090 AE4F0018 */ sw $t7, 0x18($s2) -/* AD3234 8005C094 3C058014 */ lui $a1, %hi(D_8013A738) # $a1, 0x8014 -/* AD3238 8005C098 24A5A738 */ addiu $a1, %lo(D_8013A738) # addiu $a1, $a1, -0x58c8 -/* AD323C 8005C09C 2484A718 */ addiu $a0, %lo(D_8013A718) # addiu $a0, $a0, -0x58e8 -/* AD3240 8005C0A0 0C0007FC */ jal __assert -/* AD3244 8005C0A4 24060643 */ li $a2, 1603 -.L8005C0A8: -/* AD3248 8005C0A8 8E590018 */ lw $t9, 0x18($s2) -/* AD324C 8005C0AC 8E50001C */ lw $s0, 0x1c($s2) -/* AD3250 8005C0B0 8FB80034 */ lw $t8, 0x34($sp) -/* AD3254 8005C0B4 00194180 */ sll $t0, $t9, 6 -/* AD3258 8005C0B8 02084821 */ addu $t1, $s0, $t0 -/* AD325C 8005C0BC 0209082B */ sltu $at, $s0, $t1 -/* AD3260 8005C0C0 10200010 */ beqz $at, .L8005C104 -/* AD3264 8005C0C4 8F11000C */ lw $s1, 0xc($t8) -.L8005C0C8: -/* AD3268 8005C0C8 02602025 */ move $a0, $s3 -/* AD326C 8005C0CC 0C016EB6 */ jal func_8005BAD8 -/* AD3270 8005C0D0 02002825 */ move $a1, $s0 -/* AD3274 8005C0D4 02602025 */ move $a0, $s3 -/* AD3278 8005C0D8 02002825 */ move $a1, $s0 -/* AD327C 8005C0DC 0C016ED2 */ jal func_8005BB48 -/* AD3280 8005C0E0 02203025 */ move $a2, $s1 -/* AD3284 8005C0E4 8E4B0018 */ lw $t3, 0x18($s2) -/* AD3288 8005C0E8 8E4A001C */ lw $t2, 0x1c($s2) -/* AD328C 8005C0EC 26100040 */ addiu $s0, $s0, 0x40 -/* AD3290 8005C0F0 000B6180 */ sll $t4, $t3, 6 -/* AD3294 8005C0F4 014C6821 */ addu $t5, $t2, $t4 -/* AD3298 8005C0F8 020D082B */ sltu $at, $s0, $t5 -/* AD329C 8005C0FC 1420FFF2 */ bnez $at, .L8005C0C8 -/* AD32A0 8005C100 26310024 */ addiu $s1, $s1, 0x24 -.L8005C104: -/* AD32A4 8005C104 8FBF0024 */ lw $ra, 0x24($sp) -/* AD32A8 8005C108 8FB00014 */ lw $s0, 0x14($sp) -/* AD32AC 8005C10C 8FB10018 */ lw $s1, 0x18($sp) -/* AD32B0 8005C110 8FB2001C */ lw $s2, 0x1c($sp) -/* AD32B4 8005C114 8FB30020 */ lw $s3, 0x20($sp) -/* AD32B8 8005C118 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD32BC 8005C11C 03E00008 */ jr $ra -/* AD32C0 8005C120 24020001 */ li $v0, 1 - -/* AD32C4 8005C124 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD32C8 8005C128 AFBF0024 */ sw $ra, 0x24($sp) -/* AD32CC 8005C12C AFB20020 */ sw $s2, 0x20($sp) -/* AD32D0 8005C130 AFB1001C */ sw $s1, 0x1c($sp) -/* AD32D4 8005C134 00809025 */ move $s2, $a0 -/* AD32D8 8005C138 AFB00018 */ sw $s0, 0x18($sp) -/* AD32DC 8005C13C 00A08825 */ move $s1, $a1 -/* AD32E0 8005C140 0C016DDB */ jal func_8005B76C -/* AD32E4 8005C144 AFA5002C */ sw $a1, 0x2c($sp) -/* AD32E8 8005C148 8FA5002C */ lw $a1, 0x2c($sp) -/* AD32EC 8005C14C 8CAE0018 */ lw $t6, 0x18($a1) -/* AD32F0 8005C150 8CB0001C */ lw $s0, 0x1c($a1) -/* AD32F4 8005C154 000E7980 */ sll $t7, $t6, 6 -/* AD32F8 8005C158 020FC021 */ addu $t8, $s0, $t7 -/* AD32FC 8005C15C 0218082B */ sltu $at, $s0, $t8 -/* AD3300 8005C160 1020000B */ beqz $at, .L8005C190 -/* AD3304 8005C164 02402025 */ move $a0, $s2 -.L8005C168: -/* AD3308 8005C168 0C016EE3 */ jal func_8005BB8C -/* AD330C 8005C16C 02002825 */ move $a1, $s0 -/* AD3310 8005C170 8E280018 */ lw $t0, 0x18($s1) -/* AD3314 8005C174 8E39001C */ lw $t9, 0x1c($s1) -/* AD3318 8005C178 26100040 */ addiu $s0, $s0, 0x40 -/* AD331C 8005C17C 00084980 */ sll $t1, $t0, 6 -/* AD3320 8005C180 03295021 */ addu $t2, $t9, $t1 -/* AD3324 8005C184 020A082B */ sltu $at, $s0, $t2 -/* AD3328 8005C188 5420FFF7 */ bnezl $at, .L8005C168 -/* AD332C 8005C18C 02402025 */ move $a0, $s2 -.L8005C190: -/* AD3330 8005C190 8FBF0024 */ lw $ra, 0x24($sp) -/* AD3334 8005C194 8FB00018 */ lw $s0, 0x18($sp) -/* AD3338 8005C198 8FB1001C */ lw $s1, 0x1c($sp) -/* AD333C 8005C19C 8FB20020 */ lw $s2, 0x20($sp) -/* AD3340 8005C1A0 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD3344 8005C1A4 03E00008 */ jr $ra -/* AD3348 8005C1A8 24020001 */ li $v0, 1 - -/* AD334C 8005C1AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD3350 8005C1B0 AFBF0024 */ sw $ra, 0x24($sp) -/* AD3354 8005C1B4 AFB20020 */ sw $s2, 0x20($sp) -/* AD3358 8005C1B8 AFB1001C */ sw $s1, 0x1c($sp) -/* AD335C 8005C1BC 00809025 */ move $s2, $a0 -/* AD3360 8005C1C0 AFB00018 */ sw $s0, 0x18($sp) -/* AD3364 8005C1C4 00A08825 */ move $s1, $a1 -/* AD3368 8005C1C8 0C016DE1 */ jal func_8005B784 -/* AD336C 8005C1CC AFA5002C */ sw $a1, 0x2c($sp) -/* AD3370 8005C1D0 8FA5002C */ lw $a1, 0x2c($sp) -/* AD3374 8005C1D4 8CAE0018 */ lw $t6, 0x18($a1) -/* AD3378 8005C1D8 8CB0001C */ lw $s0, 0x1c($a1) -/* AD337C 8005C1DC 000E7980 */ sll $t7, $t6, 6 -/* AD3380 8005C1E0 020FC021 */ addu $t8, $s0, $t7 -/* AD3384 8005C1E4 0218082B */ sltu $at, $s0, $t8 -/* AD3388 8005C1E8 1020000B */ beqz $at, .L8005C218 -/* AD338C 8005C1EC 02402025 */ move $a0, $s2 -.L8005C1F0: -/* AD3390 8005C1F0 0C016EEC */ jal func_8005BBB0 -/* AD3394 8005C1F4 02002825 */ move $a1, $s0 -/* AD3398 8005C1F8 8E280018 */ lw $t0, 0x18($s1) -/* AD339C 8005C1FC 8E39001C */ lw $t9, 0x1c($s1) -/* AD33A0 8005C200 26100040 */ addiu $s0, $s0, 0x40 -/* AD33A4 8005C204 00084980 */ sll $t1, $t0, 6 -/* AD33A8 8005C208 03295021 */ addu $t2, $t9, $t1 -/* AD33AC 8005C20C 020A082B */ sltu $at, $s0, $t2 -/* AD33B0 8005C210 5420FFF7 */ bnezl $at, .L8005C1F0 -/* AD33B4 8005C214 02402025 */ move $a0, $s2 -.L8005C218: -/* AD33B8 8005C218 8FBF0024 */ lw $ra, 0x24($sp) -/* AD33BC 8005C21C 8FB00018 */ lw $s0, 0x18($sp) -/* AD33C0 8005C220 8FB1001C */ lw $s1, 0x1c($sp) -/* AD33C4 8005C224 8FB20020 */ lw $s2, 0x20($sp) -/* AD33C8 8005C228 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD33CC 8005C22C 03E00008 */ jr $ra -/* AD33D0 8005C230 24020001 */ li $v0, 1 - -/* AD33D4 8005C234 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD33D8 8005C238 AFBF0024 */ sw $ra, 0x24($sp) -/* AD33DC 8005C23C AFB20020 */ sw $s2, 0x20($sp) -/* AD33E0 8005C240 AFB1001C */ sw $s1, 0x1c($sp) -/* AD33E4 8005C244 00809025 */ move $s2, $a0 -/* AD33E8 8005C248 AFB00018 */ sw $s0, 0x18($sp) -/* AD33EC 8005C24C 00A08825 */ move $s1, $a1 -/* AD33F0 8005C250 0C016DE7 */ jal func_8005B79C -/* AD33F4 8005C254 AFA5002C */ sw $a1, 0x2c($sp) -/* AD33F8 8005C258 8FA5002C */ lw $a1, 0x2c($sp) -/* AD33FC 8005C25C 8CAE0018 */ lw $t6, 0x18($a1) -/* AD3400 8005C260 8CB0001C */ lw $s0, 0x1c($a1) -/* AD3404 8005C264 000E7980 */ sll $t7, $t6, 6 -/* AD3408 8005C268 020FC021 */ addu $t8, $s0, $t7 -/* AD340C 8005C26C 0218082B */ sltu $at, $s0, $t8 -/* AD3410 8005C270 1020000B */ beqz $at, .L8005C2A0 -/* AD3414 8005C274 02402025 */ move $a0, $s2 -.L8005C278: -/* AD3418 8005C278 0C016EF5 */ jal func_8005BBD4 -/* AD341C 8005C27C 02002825 */ move $a1, $s0 -/* AD3420 8005C280 8E280018 */ lw $t0, 0x18($s1) -/* AD3424 8005C284 8E39001C */ lw $t9, 0x1c($s1) -/* AD3428 8005C288 26100040 */ addiu $s0, $s0, 0x40 -/* AD342C 8005C28C 00084980 */ sll $t1, $t0, 6 -/* AD3430 8005C290 03295021 */ addu $t2, $t9, $t1 -/* AD3434 8005C294 020A082B */ sltu $at, $s0, $t2 -/* AD3438 8005C298 5420FFF7 */ bnezl $at, .L8005C278 -/* AD343C 8005C29C 02402025 */ move $a0, $s2 -.L8005C2A0: -/* AD3440 8005C2A0 8FBF0024 */ lw $ra, 0x24($sp) -/* AD3444 8005C2A4 8FB00018 */ lw $s0, 0x18($sp) -/* AD3448 8005C2A8 8FB1001C */ lw $s1, 0x1c($sp) -/* AD344C 8005C2AC 8FB20020 */ lw $s2, 0x20($sp) -/* AD3450 8005C2B0 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD3454 8005C2B4 03E00008 */ jr $ra -/* AD3458 8005C2B8 24020001 */ li $v0, 1 - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C2BC.s b/asm/non_matchings/code/z_collision_check/func_8005C2BC.s deleted file mode 100644 index eaa0a3c1b5..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C2BC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8005C2BC -/* AD345C 8005C2BC 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* AD3460 8005C2C0 3C0E8012 */ lui $t6, %hi(D_8011DE6C) # $t6, 0x8012 -/* AD3464 8005C2C4 AFA40010 */ sw $a0, 0x10($sp) -/* AD3468 8005C2C8 25CEDE6C */ addiu $t6, %lo(D_8011DE6C) # addiu $t6, $t6, -0x2194 -/* AD346C 8005C2CC 8DD80000 */ lw $t8, ($t6) -/* AD3470 8005C2D0 27A30004 */ addiu $v1, $sp, 4 -/* AD3474 8005C2D4 24020001 */ li $v0, 1 -/* AD3478 8005C2D8 AC780000 */ sw $t8, ($v1) -/* AD347C 8005C2DC 8DCF0004 */ lw $t7, 4($t6) -/* AD3480 8005C2E0 8C680000 */ lw $t0, ($v1) -/* AD3484 8005C2E4 AC6F0004 */ sw $t7, 4($v1) -/* AD3488 8005C2E8 8DD80008 */ lw $t8, 8($t6) -/* AD348C 8005C2EC AC780008 */ sw $t8, 8($v1) -/* AD3490 8005C2F0 A8A80000 */ swl $t0, ($a1) -/* AD3494 8005C2F4 B8A80003 */ swr $t0, 3($a1) -/* AD3498 8005C2F8 8C790004 */ lw $t9, 4($v1) -/* AD349C 8005C2FC A8B90004 */ swl $t9, 4($a1) -/* AD34A0 8005C300 B8B90007 */ swr $t9, 7($a1) -/* AD34A4 8005C304 8C680008 */ lw $t0, 8($v1) -/* AD34A8 8005C308 27BD0010 */ addiu $sp, $sp, 0x10 -/* AD34AC 8005C30C A8A80008 */ swl $t0, 8($a1) -/* AD34B0 8005C310 03E00008 */ jr $ra -/* AD34B4 8005C314 B8A8000B */ swr $t0, 0xb($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C5B0.s b/asm/non_matchings/code/z_collision_check/func_8005C5B0.s deleted file mode 100644 index dccc06f2f7..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C5B0.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8005C5B0 -/* AD3750 8005C5B0 3C0E8012 */ lui $t6, %hi(D_8011DE78) # $t6, 0x8012 -/* AD3754 8005C5B4 25CEDE78 */ addiu $t6, %lo(D_8011DE78) # addiu $t6, $t6, -0x2188 -/* AD3758 8005C5B8 AFA40000 */ sw $a0, ($sp) -/* AD375C 8005C5BC 25C80030 */ addiu $t0, $t6, 0x30 -/* AD3760 8005C5C0 00A0C825 */ move $t9, $a1 -.L8005C5C4: -/* AD3764 8005C5C4 8DD80000 */ lw $t8, ($t6) -/* AD3768 8005C5C8 25CE000C */ addiu $t6, $t6, 0xc -/* AD376C 8005C5CC 2739000C */ addiu $t9, $t9, 0xc -/* AD3770 8005C5D0 AF38FFF4 */ sw $t8, -0xc($t9) -/* AD3774 8005C5D4 8DCFFFF8 */ lw $t7, -8($t6) -/* AD3778 8005C5D8 AF2FFFF8 */ sw $t7, -8($t9) -/* AD377C 8005C5DC 8DD8FFFC */ lw $t8, -4($t6) -/* AD3780 8005C5E0 15C8FFF8 */ bne $t6, $t0, .L8005C5C4 -/* AD3784 8005C5E4 AF38FFFC */ sw $t8, -4($t9) -/* AD3788 8005C5E8 8DD80000 */ lw $t8, ($t6) -/* AD378C 8005C5EC 24020001 */ li $v0, 1 -/* AD3790 8005C5F0 03E00008 */ jr $ra -/* AD3794 8005C5F4 AF380000 */ sw $t8, ($t9) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C608.s b/asm/non_matchings/code/z_collision_check/func_8005C608.s deleted file mode 100644 index 7c1f86a814..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C608.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_8005C608 -/* AD37A8 8005C608 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* AD37AC 8005C60C AFA40050 */ sw $a0, 0x50($sp) -/* AD37B0 8005C610 24A40024 */ addiu $a0, $a1, 0x24 -/* AD37B4 8005C614 AFB00028 */ sw $s0, 0x28($sp) -/* AD37B8 8005C618 00A4082B */ sltu $at, $a1, $a0 -/* AD37BC 8005C61C 00A08025 */ move $s0, $a1 -/* AD37C0 8005C620 AFBF002C */ sw $ra, 0x2c($sp) -/* AD37C4 8005C624 AFA60058 */ sw $a2, 0x58($sp) -/* AD37C8 8005C628 00A01025 */ move $v0, $a1 -/* AD37CC 8005C62C 1020000B */ beqz $at, .L8005C65C -/* AD37D0 8005C630 00C01825 */ move $v1, $a2 -.L8005C634: -/* AD37D4 8005C634 8C6F0000 */ lw $t7, ($v1) -/* AD37D8 8005C638 2442000C */ addiu $v0, $v0, 0xc -/* AD37DC 8005C63C 0044082B */ sltu $at, $v0, $a0 -/* AD37E0 8005C640 AC4FFFF4 */ sw $t7, -0xc($v0) -/* AD37E4 8005C644 8C6E0004 */ lw $t6, 4($v1) -/* AD37E8 8005C648 2463000C */ addiu $v1, $v1, 0xc -/* AD37EC 8005C64C AC4EFFF8 */ sw $t6, -8($v0) -/* AD37F0 8005C650 8C6FFFFC */ lw $t7, -4($v1) -/* AD37F4 8005C654 1420FFF7 */ bnez $at, .L8005C634 -/* AD37F8 8005C658 AC4FFFFC */ sw $t7, -4($v0) -.L8005C65C: -/* AD37FC 8005C65C 8FA40058 */ lw $a0, 0x58($sp) -/* AD3800 8005C660 27B90040 */ addiu $t9, $sp, 0x40 -/* AD3804 8005C664 27A8003C */ addiu $t0, $sp, 0x3c -/* AD3808 8005C668 27A90038 */ addiu $t1, $sp, 0x38 -/* AD380C 8005C66C AFA90018 */ sw $t1, 0x18($sp) -/* AD3810 8005C670 AFA80014 */ sw $t0, 0x14($sp) -/* AD3814 8005C674 AFB90010 */ sw $t9, 0x10($sp) -/* AD3818 8005C678 27A70044 */ addiu $a3, $sp, 0x44 -/* AD381C 8005C67C 2485000C */ addiu $a1, $a0, 0xc -/* AD3820 8005C680 0C03322D */ jal func_800CC8B4 -/* AD3824 8005C684 24860018 */ addiu $a2, $a0, 0x18 -/* AD3828 8005C688 C7A40044 */ lwc1 $f4, 0x44($sp) -/* AD382C 8005C68C 24020001 */ li $v0, 1 -/* AD3830 8005C690 E6040024 */ swc1 $f4, 0x24($s0) -/* AD3834 8005C694 C7A60040 */ lwc1 $f6, 0x40($sp) -/* AD3838 8005C698 E6060028 */ swc1 $f6, 0x28($s0) -/* AD383C 8005C69C C7A8003C */ lwc1 $f8, 0x3c($sp) -/* AD3840 8005C6A0 E608002C */ swc1 $f8, 0x2c($s0) -/* AD3844 8005C6A4 C7AA0038 */ lwc1 $f10, 0x38($sp) -/* AD3848 8005C6A8 E60A0030 */ swc1 $f10, 0x30($s0) -/* AD384C 8005C6AC 8FBF002C */ lw $ra, 0x2c($sp) -/* AD3850 8005C6B0 8FB00028 */ lw $s0, 0x28($sp) -/* AD3854 8005C6B4 27BD0050 */ addiu $sp, $sp, 0x50 -/* AD3858 8005C6B8 03E00008 */ jr $ra -/* AD385C 8005C6BC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C6C0.s b/asm/non_matchings/code/z_collision_check/func_8005C6C0.s deleted file mode 100644 index a87b9c4d96..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C6C0.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8005C6C0 -/* AD3860 8005C6C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD3864 8005C6C4 AFBF0014 */ sw $ra, 0x14($sp) -/* AD3868 8005C6C8 AFA40018 */ sw $a0, 0x18($sp) -/* AD386C 8005C6CC 0C016E21 */ jal func_8005B884 -/* AD3870 8005C6D0 AFA5001C */ sw $a1, 0x1c($sp) -/* AD3874 8005C6D4 8FA5001C */ lw $a1, 0x1c($sp) -/* AD3878 8005C6D8 8FA40018 */ lw $a0, 0x18($sp) -/* AD387C 8005C6DC 0C01716C */ jal func_8005C5B0 -/* AD3880 8005C6E0 24A50028 */ addiu $a1, $a1, 0x28 -/* AD3884 8005C6E4 8FBF0014 */ lw $ra, 0x14($sp) -/* AD3888 8005C6E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD388C 8005C6EC 24020001 */ li $v0, 1 -/* AD3890 8005C6F0 03E00008 */ jr $ra -/* AD3894 8005C6F4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C6F8.s b/asm/non_matchings/code/z_collision_check/func_8005C6F8.s deleted file mode 100644 index 41817c4f1e..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C6F8.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8005C6F8 -/* AD3898 8005C6F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD389C 8005C6FC AFBF0014 */ sw $ra, 0x14($sp) -/* AD38A0 8005C700 AFA40018 */ sw $a0, 0x18($sp) -/* AD38A4 8005C704 0C016E41 */ jal func_8005B904 -/* AD38A8 8005C708 AFA5001C */ sw $a1, 0x1c($sp) -/* AD38AC 8005C70C 8FA5001C */ lw $a1, 0x1c($sp) -/* AD38B0 8005C710 8FA40018 */ lw $a0, 0x18($sp) -/* AD38B4 8005C714 0C01717E */ jal func_8005C5F8 -/* AD38B8 8005C718 24A50028 */ addiu $a1, $a1, 0x28 -/* AD38BC 8005C71C 8FBF0014 */ lw $ra, 0x14($sp) -/* AD38C0 8005C720 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD38C4 8005C724 24020001 */ li $v0, 1 -/* AD38C8 8005C728 03E00008 */ jr $ra -/* AD38CC 8005C72C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C730.s b/asm/non_matchings/code/z_collision_check/func_8005C730.s deleted file mode 100644 index 1e9bba3c8c..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C730.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8005C730 -/* AD38D0 8005C730 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD38D4 8005C734 AFBF0014 */ sw $ra, 0x14($sp) -/* AD38D8 8005C738 AFA40018 */ sw $a0, 0x18($sp) -/* AD38DC 8005C73C AFA5001C */ sw $a1, 0x1c($sp) -/* AD38E0 8005C740 0C016E4F */ jal func_8005B93C -/* AD38E4 8005C744 AFA60020 */ sw $a2, 0x20($sp) -/* AD38E8 8005C748 8FA5001C */ lw $a1, 0x1c($sp) -/* AD38EC 8005C74C 8FA60020 */ lw $a2, 0x20($sp) -/* AD38F0 8005C750 8FA40018 */ lw $a0, 0x18($sp) -/* AD38F4 8005C754 24A50028 */ addiu $a1, $a1, 0x28 -/* AD38F8 8005C758 0C017182 */ jal func_8005C608 -/* AD38FC 8005C75C 24C60018 */ addiu $a2, $a2, 0x18 -/* AD3900 8005C760 8FBF0014 */ lw $ra, 0x14($sp) -/* AD3904 8005C764 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD3908 8005C768 24020001 */ li $v0, 1 -/* AD390C 8005C76C 03E00008 */ jr $ra -/* AD3910 8005C770 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C774.s b/asm/non_matchings/code/z_collision_check/func_8005C774.s deleted file mode 100644 index 82d851d71e..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C774.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8005C774 -/* AD3914 8005C774 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD3918 8005C778 AFBF0014 */ sw $ra, 0x14($sp) -/* AD391C 8005C77C 0C016E6C */ jal func_8005B9B0 -/* AD3920 8005C780 00000000 */ nop -/* AD3924 8005C784 8FBF0014 */ lw $ra, 0x14($sp) -/* AD3928 8005C788 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD392C 8005C78C 24020001 */ li $v0, 1 -/* AD3930 8005C790 03E00008 */ jr $ra -/* AD3934 8005C794 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C798.s b/asm/non_matchings/code/z_collision_check/func_8005C798.s deleted file mode 100644 index 722d5987a4..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C798.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8005C798 -/* AD3938 8005C798 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD393C 8005C79C AFBF0014 */ sw $ra, 0x14($sp) -/* AD3940 8005C7A0 0C016E7A */ jal func_8005B9E8 -/* AD3944 8005C7A4 00000000 */ nop -/* AD3948 8005C7A8 8FBF0014 */ lw $ra, 0x14($sp) -/* AD394C 8005C7AC 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD3950 8005C7B0 24020001 */ li $v0, 1 -/* AD3954 8005C7B4 03E00008 */ jr $ra -/* AD3958 8005C7B8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C7BC.s b/asm/non_matchings/code/z_collision_check/func_8005C7BC.s deleted file mode 100644 index 324532a634..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C7BC.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8005C7BC -/* AD395C 8005C7BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD3960 8005C7C0 AFBF0014 */ sw $ra, 0x14($sp) -/* AD3964 8005C7C4 0C016E87 */ jal func_8005BA1C -/* AD3968 8005C7C8 00000000 */ nop -/* AD396C 8005C7CC 8FBF0014 */ lw $ra, 0x14($sp) -/* AD3970 8005C7D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD3974 8005C7D4 24020001 */ li $v0, 1 -/* AD3978 8005C7D8 03E00008 */ jr $ra -/* AD397C 8005C7DC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C7E0.s b/asm/non_matchings/code/z_collision_check/func_8005C7E0.s deleted file mode 100644 index 22777e07f4..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C7E0.s +++ /dev/null @@ -1,70 +0,0 @@ -.rdata -glabel D_8013A750 - .asciz "../z_collision_check.c" - .balign 4 - -.text -glabel func_8005C7E0 -/* AD3980 8005C7E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD3984 8005C7E4 AFBF0014 */ sw $ra, 0x14($sp) -/* AD3988 8005C7E8 0C016D97 */ jal func_8005B65C -/* AD398C 8005C7EC AFA5001C */ sw $a1, 0x1c($sp) -/* AD3990 8005C7F0 8FA5001C */ lw $a1, 0x1c($sp) -/* AD3994 8005C7F4 24020001 */ li $v0, 1 -/* AD3998 8005C7F8 ACA00018 */ sw $zero, 0x18($a1) -/* AD399C 8005C7FC ACA0001C */ sw $zero, 0x1c($a1) -/* AD39A0 8005C800 8FBF0014 */ lw $ra, 0x14($sp) -/* AD39A4 8005C804 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD39A8 8005C808 03E00008 */ jr $ra -/* AD39AC 8005C80C 00000000 */ nop - -/* AD39B0 8005C810 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD39B4 8005C814 AFBF0024 */ sw $ra, 0x24($sp) -/* AD39B8 8005C818 AFB2001C */ sw $s2, 0x1c($sp) -/* AD39BC 8005C81C AFB10018 */ sw $s1, 0x18($sp) -/* AD39C0 8005C820 00A08825 */ move $s1, $a1 -/* AD39C4 8005C824 00809025 */ move $s2, $a0 -/* AD39C8 8005C828 AFB30020 */ sw $s3, 0x20($sp) -/* AD39CC 8005C82C 0C016DA8 */ jal func_8005B6A0 -/* AD39D0 8005C830 AFB00014 */ sw $s0, 0x14($sp) -/* AD39D4 8005C834 8E2E0018 */ lw $t6, 0x18($s1) -/* AD39D8 8005C838 2413005C */ li $s3, 92 -/* AD39DC 8005C83C 8E24001C */ lw $a0, 0x1c($s1) -/* AD39E0 8005C840 01D30019 */ multu $t6, $s3 -/* AD39E4 8005C844 00808025 */ move $s0, $a0 -/* AD39E8 8005C848 00007812 */ mflo $t7 -/* AD39EC 8005C84C 008FC021 */ addu $t8, $a0, $t7 -/* AD39F0 8005C850 0098082B */ sltu $at, $a0, $t8 -/* AD39F4 8005C854 1020000D */ beqz $at, .L8005C88C -/* AD39F8 8005C858 00000000 */ nop -/* AD39FC 8005C85C 02402025 */ move $a0, $s2 -.L8005C860: -/* AD3A00 8005C860 0C0171BE */ jal func_8005C6F8 -/* AD3A04 8005C864 02002825 */ move $a1, $s0 -/* AD3A08 8005C868 8E390018 */ lw $t9, 0x18($s1) -/* AD3A0C 8005C86C 8E24001C */ lw $a0, 0x1c($s1) -/* AD3A10 8005C870 2610005C */ addiu $s0, $s0, 0x5c -/* AD3A14 8005C874 03330019 */ multu $t9, $s3 -/* AD3A18 8005C878 00004012 */ mflo $t0 -/* AD3A1C 8005C87C 00884821 */ addu $t1, $a0, $t0 -/* AD3A20 8005C880 0209082B */ sltu $at, $s0, $t1 -/* AD3A24 8005C884 5420FFF6 */ bnezl $at, .L8005C860 -/* AD3A28 8005C888 02402025 */ move $a0, $s2 -.L8005C88C: -/* AD3A2C 8005C88C 10800005 */ beqz $a0, .L8005C8A4 -/* AD3A30 8005C890 AE200018 */ sw $zero, 0x18($s1) -/* AD3A34 8005C894 3C058014 */ lui $a1, %hi(D_8013A750) # $a1, 0x8014 -/* AD3A38 8005C898 24A5A750 */ addiu $a1, %lo(D_8013A750) # addiu $a1, $a1, -0x58b0 -/* AD3A3C 8005C89C 0C01EC35 */ jal ZeldaArena_FreeDebug -/* AD3A40 8005C8A0 24060833 */ li $a2, 2099 -.L8005C8A4: -/* AD3A44 8005C8A4 AE20001C */ sw $zero, 0x1c($s1) -/* AD3A48 8005C8A8 8FBF0024 */ lw $ra, 0x24($sp) -/* AD3A4C 8005C8AC 8FB30020 */ lw $s3, 0x20($sp) -/* AD3A50 8005C8B0 8FB2001C */ lw $s2, 0x1c($sp) -/* AD3A54 8005C8B4 8FB10018 */ lw $s1, 0x18($sp) -/* AD3A58 8005C8B8 8FB00014 */ lw $s0, 0x14($sp) -/* AD3A5C 8005C8BC 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD3A60 8005C8C0 03E00008 */ jr $ra -/* AD3A64 8005C8C4 24020001 */ li $v0, 1 - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C8C8.s b/asm/non_matchings/code/z_collision_check/func_8005C8C8.s deleted file mode 100644 index dc5dec9bd2..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C8C8.s +++ /dev/null @@ -1,235 +0,0 @@ -.rdata -glabel D_8013A768 - .asciz "../z_collision_check.c" - .balign 4 - -glabel D_8013A780 - .asciz "\x1b[31m" - .balign 4 - -glabel D_8013A788 - .asciz "ClObjTris_set3():zelda_malloc()出来ません\n" - # EUC-JP: 出来ません。 | Can not. - .balign 4 - -glabel D_8013A7B4 - .asciz "\x1b[m" - .balign 4 - -glabel D_8013A7B8 - .asciz "../z_collision_check.c" - .balign 4 - -glabel D_8013A7D0 - .asciz "\x1b[31m" - .balign 4 - -glabel D_8013A7D8 - .asciz "ClObjTris_set5():zelda_malloc出来ません\n" - # EUC-JP: 出来ません。 | Can not. - .balign 4 - -glabel D_8013A804 - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_8005C8C8 -/* AD3A68 8005C8C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD3A6C 8005C8CC AFBF0024 */ sw $ra, 0x24($sp) -/* AD3A70 8005C8D0 AFB2001C */ sw $s2, 0x1c($sp) -/* AD3A74 8005C8D4 AFB10018 */ sw $s1, 0x18($sp) -/* AD3A78 8005C8D8 00A08825 */ move $s1, $a1 -/* AD3A7C 8005C8DC 00809025 */ move $s2, $a0 -/* AD3A80 8005C8E0 AFB30020 */ sw $s3, 0x20($sp) -/* AD3A84 8005C8E4 0C016DA8 */ jal func_8005B6A0 -/* AD3A88 8005C8E8 AFB00014 */ sw $s0, 0x14($sp) -/* AD3A8C 8005C8EC 8E2E0018 */ lw $t6, 0x18($s1) -/* AD3A90 8005C8F0 2413005C */ li $s3, 92 -/* AD3A94 8005C8F4 8E30001C */ lw $s0, 0x1c($s1) -/* AD3A98 8005C8F8 01D30019 */ multu $t6, $s3 -/* AD3A9C 8005C8FC 00007812 */ mflo $t7 -/* AD3AA0 8005C900 020FC021 */ addu $t8, $s0, $t7 -/* AD3AA4 8005C904 0218082B */ sltu $at, $s0, $t8 -/* AD3AA8 8005C908 1020000C */ beqz $at, .L8005C93C -/* AD3AAC 8005C90C 02402025 */ move $a0, $s2 -.L8005C910: -/* AD3AB0 8005C910 0C0171BE */ jal func_8005C6F8 -/* AD3AB4 8005C914 02002825 */ move $a1, $s0 -/* AD3AB8 8005C918 8E280018 */ lw $t0, 0x18($s1) -/* AD3ABC 8005C91C 8E39001C */ lw $t9, 0x1c($s1) -/* AD3AC0 8005C920 2610005C */ addiu $s0, $s0, 0x5c -/* AD3AC4 8005C924 01130019 */ multu $t0, $s3 -/* AD3AC8 8005C928 00004812 */ mflo $t1 -/* AD3ACC 8005C92C 03295021 */ addu $t2, $t9, $t1 -/* AD3AD0 8005C930 020A082B */ sltu $at, $s0, $t2 -/* AD3AD4 8005C934 5420FFF6 */ bnezl $at, .L8005C910 -/* AD3AD8 8005C938 02402025 */ move $a0, $s2 -.L8005C93C: -/* AD3ADC 8005C93C AE200018 */ sw $zero, 0x18($s1) -/* AD3AE0 8005C940 AE20001C */ sw $zero, 0x1c($s1) -/* AD3AE4 8005C944 8FBF0024 */ lw $ra, 0x24($sp) -/* AD3AE8 8005C948 8FB30020 */ lw $s3, 0x20($sp) -/* AD3AEC 8005C94C 8FB2001C */ lw $s2, 0x1c($sp) -/* AD3AF0 8005C950 8FB10018 */ lw $s1, 0x18($sp) -/* AD3AF4 8005C954 8FB00014 */ lw $s0, 0x14($sp) -/* AD3AF8 8005C958 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD3AFC 8005C95C 03E00008 */ jr $ra -/* AD3B00 8005C960 24020001 */ li $v0, 1 - -/* AD3B04 8005C964 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AD3B08 8005C968 AFBF002C */ sw $ra, 0x2c($sp) -/* AD3B0C 8005C96C AFB30024 */ sw $s3, 0x24($sp) -/* AD3B10 8005C970 AFB20020 */ sw $s2, 0x20($sp) -/* AD3B14 8005C974 00A09025 */ move $s2, $a1 -/* AD3B18 8005C978 00809825 */ move $s3, $a0 -/* AD3B1C 8005C97C AFB40028 */ sw $s4, 0x28($sp) -/* AD3B20 8005C980 AFB1001C */ sw $s1, 0x1c($sp) -/* AD3B24 8005C984 AFB00018 */ sw $s0, 0x18($sp) -/* AD3B28 8005C988 0C016DBB */ jal func_8005B6EC -/* AD3B2C 8005C98C AFA7003C */ sw $a3, 0x3c($sp) -/* AD3B30 8005C990 8FAE003C */ lw $t6, 0x3c($sp) -/* AD3B34 8005C994 3C058014 */ lui $a1, %hi(D_8013A768) # $a1, 0x8014 -/* AD3B38 8005C998 24A5A768 */ addiu $a1, %lo(D_8013A768) # addiu $a1, $a1, -0x5898 -/* AD3B3C 8005C99C 8DCF0008 */ lw $t7, 8($t6) -/* AD3B40 8005C9A0 2406086C */ li $a2, 2156 -/* AD3B44 8005C9A4 000F2080 */ sll $a0, $t7, 2 -/* AD3B48 8005C9A8 008F2023 */ subu $a0, $a0, $t7 -/* AD3B4C 8005C9AC 000420C0 */ sll $a0, $a0, 3 -/* AD3B50 8005C9B0 008F2023 */ subu $a0, $a0, $t7 -/* AD3B54 8005C9B4 00042080 */ sll $a0, $a0, 2 -/* AD3B58 8005C9B8 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* AD3B5C 8005C9BC AE4F0018 */ sw $t7, 0x18($s2) -/* AD3B60 8005C9C0 1440000D */ bnez $v0, .L8005C9F8 -/* AD3B64 8005C9C4 AE42001C */ sw $v0, 0x1c($s2) -/* AD3B68 8005C9C8 3C048014 */ lui $a0, %hi(D_8013A780) # $a0, 0x8014 -/* AD3B6C 8005C9CC AE400018 */ sw $zero, 0x18($s2) -/* AD3B70 8005C9D0 0C00084C */ jal osSyncPrintf -/* AD3B74 8005C9D4 2484A780 */ addiu $a0, %lo(D_8013A780) # addiu $a0, $a0, -0x5880 -/* AD3B78 8005C9D8 3C048014 */ lui $a0, %hi(D_8013A788) # $a0, 0x8014 -/* AD3B7C 8005C9DC 0C00084C */ jal osSyncPrintf -/* AD3B80 8005C9E0 2484A788 */ addiu $a0, %lo(D_8013A788) # addiu $a0, $a0, -0x5878 -/* AD3B84 8005C9E4 3C048014 */ lui $a0, %hi(D_8013A7B4) # $a0, 0x8014 -/* AD3B88 8005C9E8 0C00084C */ jal osSyncPrintf -/* AD3B8C 8005C9EC 2484A7B4 */ addiu $a0, %lo(D_8013A7B4) # addiu $a0, $a0, -0x584c -/* AD3B90 8005C9F0 1000001D */ b .L8005CA68 -/* AD3B94 8005C9F4 00001025 */ move $v0, $zero -.L8005C9F8: -/* AD3B98 8005C9F8 8E590018 */ lw $t9, 0x18($s2) -/* AD3B9C 8005C9FC 2414005C */ li $s4, 92 -/* AD3BA0 8005CA00 8E50001C */ lw $s0, 0x1c($s2) -/* AD3BA4 8005CA04 03340019 */ multu $t9, $s4 -/* AD3BA8 8005CA08 8FB8003C */ lw $t8, 0x3c($sp) -/* AD3BAC 8005CA0C 8F11000C */ lw $s1, 0xc($t8) -/* AD3BB0 8005CA10 00004012 */ mflo $t0 -/* AD3BB4 8005CA14 02084821 */ addu $t1, $s0, $t0 -/* AD3BB8 8005CA18 0209082B */ sltu $at, $s0, $t1 -/* AD3BBC 8005CA1C 10200011 */ beqz $at, .L8005CA64 -/* AD3BC0 8005CA20 02602025 */ move $a0, $s3 -.L8005CA24: -/* AD3BC4 8005CA24 0C0171B0 */ jal func_8005C6C0 -/* AD3BC8 8005CA28 02002825 */ move $a1, $s0 -/* AD3BCC 8005CA2C 02602025 */ move $a0, $s3 -/* AD3BD0 8005CA30 02002825 */ move $a1, $s0 -/* AD3BD4 8005CA34 0C0171CC */ jal func_8005C730 -/* AD3BD8 8005CA38 02203025 */ move $a2, $s1 -/* AD3BDC 8005CA3C 8E4B0018 */ lw $t3, 0x18($s2) -/* AD3BE0 8005CA40 8E4A001C */ lw $t2, 0x1c($s2) -/* AD3BE4 8005CA44 2610005C */ addiu $s0, $s0, 0x5c -/* AD3BE8 8005CA48 01740019 */ multu $t3, $s4 -/* AD3BEC 8005CA4C 2631003C */ addiu $s1, $s1, 0x3c -/* AD3BF0 8005CA50 00006012 */ mflo $t4 -/* AD3BF4 8005CA54 014C6821 */ addu $t5, $t2, $t4 -/* AD3BF8 8005CA58 020D082B */ sltu $at, $s0, $t5 -/* AD3BFC 8005CA5C 5420FFF1 */ bnezl $at, .L8005CA24 -/* AD3C00 8005CA60 02602025 */ move $a0, $s3 -.L8005CA64: -/* AD3C04 8005CA64 24020001 */ li $v0, 1 -.L8005CA68: -/* AD3C08 8005CA68 8FBF002C */ lw $ra, 0x2c($sp) -/* AD3C0C 8005CA6C 8FB00018 */ lw $s0, 0x18($sp) -/* AD3C10 8005CA70 8FB1001C */ lw $s1, 0x1c($sp) -/* AD3C14 8005CA74 8FB20020 */ lw $s2, 0x20($sp) -/* AD3C18 8005CA78 8FB30024 */ lw $s3, 0x24($sp) -/* AD3C1C 8005CA7C 8FB40028 */ lw $s4, 0x28($sp) -/* AD3C20 8005CA80 03E00008 */ jr $ra -/* AD3C24 8005CA84 27BD0030 */ addiu $sp, $sp, 0x30 - -/* AD3C28 8005CA88 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AD3C2C 8005CA8C AFBF002C */ sw $ra, 0x2c($sp) -/* AD3C30 8005CA90 AFB30024 */ sw $s3, 0x24($sp) -/* AD3C34 8005CA94 AFB20020 */ sw $s2, 0x20($sp) -/* AD3C38 8005CA98 00809025 */ move $s2, $a0 -/* AD3C3C 8005CA9C 00A09825 */ move $s3, $a1 -/* AD3C40 8005CAA0 AFB40028 */ sw $s4, 0x28($sp) -/* AD3C44 8005CAA4 AFB1001C */ sw $s1, 0x1c($sp) -/* AD3C48 8005CAA8 AFB00018 */ sw $s0, 0x18($sp) -/* AD3C4C 8005CAAC 0C016DCB */ jal func_8005B72C -/* AD3C50 8005CAB0 AFA7003C */ sw $a3, 0x3c($sp) -/* AD3C54 8005CAB4 8FAE003C */ lw $t6, 0x3c($sp) -/* AD3C58 8005CAB8 3C058014 */ lui $a1, %hi(D_8013A7B8) # $a1, 0x8014 -/* AD3C5C 8005CABC 24A5A7B8 */ addiu $a1, %lo(D_8013A7B8) # addiu $a1, $a1, -0x5848 -/* AD3C60 8005CAC0 8DCF0008 */ lw $t7, 8($t6) -/* AD3C64 8005CAC4 2406089F */ li $a2, 2207 -/* AD3C68 8005CAC8 000F2080 */ sll $a0, $t7, 2 -/* AD3C6C 8005CACC 008F2023 */ subu $a0, $a0, $t7 -/* AD3C70 8005CAD0 000420C0 */ sll $a0, $a0, 3 -/* AD3C74 8005CAD4 008F2023 */ subu $a0, $a0, $t7 -/* AD3C78 8005CAD8 00042080 */ sll $a0, $a0, 2 -/* AD3C7C 8005CADC 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* AD3C80 8005CAE0 AE6F0018 */ sw $t7, 0x18($s3) -/* AD3C84 8005CAE4 1440000D */ bnez $v0, .L8005CB1C -/* AD3C88 8005CAE8 AE62001C */ sw $v0, 0x1c($s3) -/* AD3C8C 8005CAEC 3C048014 */ lui $a0, %hi(D_8013A7D0) # $a0, 0x8014 -/* AD3C90 8005CAF0 0C00084C */ jal osSyncPrintf -/* AD3C94 8005CAF4 2484A7D0 */ addiu $a0, %lo(D_8013A7D0) # addiu $a0, $a0, -0x5830 -/* AD3C98 8005CAF8 3C048014 */ lui $a0, %hi(D_8013A7D8) # $a0, 0x8014 -/* AD3C9C 8005CAFC 0C00084C */ jal osSyncPrintf -/* AD3CA0 8005CB00 2484A7D8 */ addiu $a0, %lo(D_8013A7D8) # addiu $a0, $a0, -0x5828 -/* AD3CA4 8005CB04 3C048014 */ lui $a0, %hi(D_8013A804) # $a0, 0x8014 -/* AD3CA8 8005CB08 0C00084C */ jal osSyncPrintf -/* AD3CAC 8005CB0C 2484A804 */ addiu $a0, %lo(D_8013A804) # addiu $a0, $a0, -0x57fc -/* AD3CB0 8005CB10 AE600018 */ sw $zero, 0x18($s3) -/* AD3CB4 8005CB14 1000001D */ b .L8005CB8C -/* AD3CB8 8005CB18 00001025 */ move $v0, $zero -.L8005CB1C: -/* AD3CBC 8005CB1C 8E790018 */ lw $t9, 0x18($s3) -/* AD3CC0 8005CB20 2414005C */ li $s4, 92 -/* AD3CC4 8005CB24 8E70001C */ lw $s0, 0x1c($s3) -/* AD3CC8 8005CB28 03340019 */ multu $t9, $s4 -/* AD3CCC 8005CB2C 8FB8003C */ lw $t8, 0x3c($sp) -/* AD3CD0 8005CB30 8F11000C */ lw $s1, 0xc($t8) -/* AD3CD4 8005CB34 00004012 */ mflo $t0 -/* AD3CD8 8005CB38 02084821 */ addu $t1, $s0, $t0 -/* AD3CDC 8005CB3C 0209082B */ sltu $at, $s0, $t1 -/* AD3CE0 8005CB40 10200011 */ beqz $at, .L8005CB88 -/* AD3CE4 8005CB44 02402025 */ move $a0, $s2 -.L8005CB48: -/* AD3CE8 8005CB48 0C0171B0 */ jal func_8005C6C0 -/* AD3CEC 8005CB4C 02002825 */ move $a1, $s0 -/* AD3CF0 8005CB50 02402025 */ move $a0, $s2 -/* AD3CF4 8005CB54 02002825 */ move $a1, $s0 -/* AD3CF8 8005CB58 0C0171CC */ jal func_8005C730 -/* AD3CFC 8005CB5C 02203025 */ move $a2, $s1 -/* AD3D00 8005CB60 8E6B0018 */ lw $t3, 0x18($s3) -/* AD3D04 8005CB64 8E6A001C */ lw $t2, 0x1c($s3) -/* AD3D08 8005CB68 2610005C */ addiu $s0, $s0, 0x5c -/* AD3D0C 8005CB6C 01740019 */ multu $t3, $s4 -/* AD3D10 8005CB70 2631003C */ addiu $s1, $s1, 0x3c -/* AD3D14 8005CB74 00006012 */ mflo $t4 -/* AD3D18 8005CB78 014C6821 */ addu $t5, $t2, $t4 -/* AD3D1C 8005CB7C 020D082B */ sltu $at, $s0, $t5 -/* AD3D20 8005CB80 5420FFF1 */ bnezl $at, .L8005CB48 -/* AD3D24 8005CB84 02402025 */ move $a0, $s2 -.L8005CB88: -/* AD3D28 8005CB88 24020001 */ li $v0, 1 -.L8005CB8C: -/* AD3D2C 8005CB8C 8FBF002C */ lw $ra, 0x2c($sp) -/* AD3D30 8005CB90 8FB00018 */ lw $s0, 0x18($sp) -/* AD3D34 8005CB94 8FB1001C */ lw $s1, 0x1c($sp) -/* AD3D38 8005CB98 8FB20020 */ lw $s2, 0x20($sp) -/* AD3D3C 8005CB9C 8FB30024 */ lw $s3, 0x24($sp) -/* AD3D40 8005CBA0 8FB40028 */ lw $s4, 0x28($sp) -/* AD3D44 8005CBA4 03E00008 */ jr $ra -/* AD3D48 8005CBA8 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/z_collision_check/func_8005CBAC.s b/asm/non_matchings/code/z_collision_check/func_8005CBAC.s deleted file mode 100644 index 5156f5bacd..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005CBAC.s +++ /dev/null @@ -1,200 +0,0 @@ -.rdata -glabel D_8013A808 - .asciz "pclobj_tris->elem_tbl != NULL" - .balign 4 - -glabel D_8013A828 - .asciz "../z_collision_check.c" - .balign 4 - -.text -glabel func_8005CBAC -/* AD3D4C 8005CBAC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AD3D50 8005CBB0 AFBF002C */ sw $ra, 0x2c($sp) -/* AD3D54 8005CBB4 AFB30024 */ sw $s3, 0x24($sp) -/* AD3D58 8005CBB8 AFB20020 */ sw $s2, 0x20($sp) -/* AD3D5C 8005CBBC 00A09025 */ move $s2, $a1 -/* AD3D60 8005CBC0 00809825 */ move $s3, $a0 -/* AD3D64 8005CBC4 AFB40028 */ sw $s4, 0x28($sp) -/* AD3D68 8005CBC8 AFB1001C */ sw $s1, 0x1c($sp) -/* AD3D6C 8005CBCC AFB00018 */ sw $s0, 0x18($sp) -/* AD3D70 8005CBD0 0C016DCB */ jal func_8005B72C -/* AD3D74 8005CBD4 AFA7003C */ sw $a3, 0x3c($sp) -/* AD3D78 8005CBD8 8FAE003C */ lw $t6, 0x3c($sp) -/* AD3D7C 8005CBDC 8FA20040 */ lw $v0, 0x40($sp) -/* AD3D80 8005CBE0 3C048014 */ lui $a0, %hi(D_8013A808) # $a0, 0x8014 -/* AD3D84 8005CBE4 8DCF0008 */ lw $t7, 8($t6) -/* AD3D88 8005CBE8 AE42001C */ sw $v0, 0x1c($s2) -/* AD3D8C 8005CBEC 14400006 */ bnez $v0, .L8005CC08 -/* AD3D90 8005CBF0 AE4F0018 */ sw $t7, 0x18($s2) -/* AD3D94 8005CBF4 3C058014 */ lui $a1, %hi(D_8013A828) # $a1, 0x8014 -/* AD3D98 8005CBF8 24A5A828 */ addiu $a1, %lo(D_8013A828) # addiu $a1, $a1, -0x57d8 -/* AD3D9C 8005CBFC 2484A808 */ addiu $a0, %lo(D_8013A808) # addiu $a0, $a0, -0x57f8 -/* AD3DA0 8005CC00 0C0007FC */ jal __assert -/* AD3DA4 8005CC04 240608D2 */ li $a2, 2258 -.L8005CC08: -/* AD3DA8 8005CC08 8E590018 */ lw $t9, 0x18($s2) -/* AD3DAC 8005CC0C 2414005C */ li $s4, 92 -/* AD3DB0 8005CC10 8E50001C */ lw $s0, 0x1c($s2) -/* AD3DB4 8005CC14 03340019 */ multu $t9, $s4 -/* AD3DB8 8005CC18 8FB8003C */ lw $t8, 0x3c($sp) -/* AD3DBC 8005CC1C 8F11000C */ lw $s1, 0xc($t8) -/* AD3DC0 8005CC20 00004012 */ mflo $t0 -/* AD3DC4 8005CC24 02084821 */ addu $t1, $s0, $t0 -/* AD3DC8 8005CC28 0209082B */ sltu $at, $s0, $t1 -/* AD3DCC 8005CC2C 10200011 */ beqz $at, .L8005CC74 -/* AD3DD0 8005CC30 02602025 */ move $a0, $s3 -.L8005CC34: -/* AD3DD4 8005CC34 0C0171B0 */ jal func_8005C6C0 -/* AD3DD8 8005CC38 02002825 */ move $a1, $s0 -/* AD3DDC 8005CC3C 02602025 */ move $a0, $s3 -/* AD3DE0 8005CC40 02002825 */ move $a1, $s0 -/* AD3DE4 8005CC44 0C0171CC */ jal func_8005C730 -/* AD3DE8 8005CC48 02203025 */ move $a2, $s1 -/* AD3DEC 8005CC4C 8E4B0018 */ lw $t3, 0x18($s2) -/* AD3DF0 8005CC50 8E4A001C */ lw $t2, 0x1c($s2) -/* AD3DF4 8005CC54 2610005C */ addiu $s0, $s0, 0x5c -/* AD3DF8 8005CC58 01740019 */ multu $t3, $s4 -/* AD3DFC 8005CC5C 2631003C */ addiu $s1, $s1, 0x3c -/* AD3E00 8005CC60 00006012 */ mflo $t4 -/* AD3E04 8005CC64 014C6821 */ addu $t5, $t2, $t4 -/* AD3E08 8005CC68 020D082B */ sltu $at, $s0, $t5 -/* AD3E0C 8005CC6C 5420FFF1 */ bnezl $at, .L8005CC34 -/* AD3E10 8005CC70 02602025 */ move $a0, $s3 -.L8005CC74: -/* AD3E14 8005CC74 8FBF002C */ lw $ra, 0x2c($sp) -/* AD3E18 8005CC78 8FB00018 */ lw $s0, 0x18($sp) -/* AD3E1C 8005CC7C 8FB1001C */ lw $s1, 0x1c($sp) -/* AD3E20 8005CC80 8FB20020 */ lw $s2, 0x20($sp) -/* AD3E24 8005CC84 8FB30024 */ lw $s3, 0x24($sp) -/* AD3E28 8005CC88 8FB40028 */ lw $s4, 0x28($sp) -/* AD3E2C 8005CC8C 27BD0030 */ addiu $sp, $sp, 0x30 -/* AD3E30 8005CC90 03E00008 */ jr $ra -/* AD3E34 8005CC94 24020001 */ li $v0, 1 - -/* AD3E38 8005CC98 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD3E3C 8005CC9C AFBF0024 */ sw $ra, 0x24($sp) -/* AD3E40 8005CCA0 AFB2001C */ sw $s2, 0x1c($sp) -/* AD3E44 8005CCA4 AFB10018 */ sw $s1, 0x18($sp) -/* AD3E48 8005CCA8 00809025 */ move $s2, $a0 -/* AD3E4C 8005CCAC AFB30020 */ sw $s3, 0x20($sp) -/* AD3E50 8005CCB0 AFB00014 */ sw $s0, 0x14($sp) -/* AD3E54 8005CCB4 00A08825 */ move $s1, $a1 -/* AD3E58 8005CCB8 0C016DDB */ jal func_8005B76C -/* AD3E5C 8005CCBC AFA5002C */ sw $a1, 0x2c($sp) -/* AD3E60 8005CCC0 8FA5002C */ lw $a1, 0x2c($sp) -/* AD3E64 8005CCC4 2413005C */ li $s3, 92 -/* AD3E68 8005CCC8 8CAE0018 */ lw $t6, 0x18($a1) -/* AD3E6C 8005CCCC 8CB0001C */ lw $s0, 0x1c($a1) -/* AD3E70 8005CCD0 01D30019 */ multu $t6, $s3 -/* AD3E74 8005CCD4 00007812 */ mflo $t7 -/* AD3E78 8005CCD8 020FC021 */ addu $t8, $s0, $t7 -/* AD3E7C 8005CCDC 0218082B */ sltu $at, $s0, $t8 -/* AD3E80 8005CCE0 1020000C */ beqz $at, .L8005CD14 -/* AD3E84 8005CCE4 02402025 */ move $a0, $s2 -.L8005CCE8: -/* AD3E88 8005CCE8 0C0171DD */ jal func_8005C774 -/* AD3E8C 8005CCEC 02002825 */ move $a1, $s0 -/* AD3E90 8005CCF0 8E280018 */ lw $t0, 0x18($s1) -/* AD3E94 8005CCF4 8E39001C */ lw $t9, 0x1c($s1) -/* AD3E98 8005CCF8 2610005C */ addiu $s0, $s0, 0x5c -/* AD3E9C 8005CCFC 01130019 */ multu $t0, $s3 -/* AD3EA0 8005CD00 00004812 */ mflo $t1 -/* AD3EA4 8005CD04 03295021 */ addu $t2, $t9, $t1 -/* AD3EA8 8005CD08 020A082B */ sltu $at, $s0, $t2 -/* AD3EAC 8005CD0C 5420FFF6 */ bnezl $at, .L8005CCE8 -/* AD3EB0 8005CD10 02402025 */ move $a0, $s2 -.L8005CD14: -/* AD3EB4 8005CD14 8FBF0024 */ lw $ra, 0x24($sp) -/* AD3EB8 8005CD18 8FB00014 */ lw $s0, 0x14($sp) -/* AD3EBC 8005CD1C 8FB10018 */ lw $s1, 0x18($sp) -/* AD3EC0 8005CD20 8FB2001C */ lw $s2, 0x1c($sp) -/* AD3EC4 8005CD24 8FB30020 */ lw $s3, 0x20($sp) -/* AD3EC8 8005CD28 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD3ECC 8005CD2C 03E00008 */ jr $ra -/* AD3ED0 8005CD30 24020001 */ li $v0, 1 - -/* AD3ED4 8005CD34 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD3ED8 8005CD38 AFBF0024 */ sw $ra, 0x24($sp) -/* AD3EDC 8005CD3C AFB2001C */ sw $s2, 0x1c($sp) -/* AD3EE0 8005CD40 AFB10018 */ sw $s1, 0x18($sp) -/* AD3EE4 8005CD44 00809025 */ move $s2, $a0 -/* AD3EE8 8005CD48 AFB30020 */ sw $s3, 0x20($sp) -/* AD3EEC 8005CD4C AFB00014 */ sw $s0, 0x14($sp) -/* AD3EF0 8005CD50 00A08825 */ move $s1, $a1 -/* AD3EF4 8005CD54 0C016DE1 */ jal func_8005B784 -/* AD3EF8 8005CD58 AFA5002C */ sw $a1, 0x2c($sp) -/* AD3EFC 8005CD5C 8FA5002C */ lw $a1, 0x2c($sp) -/* AD3F00 8005CD60 2413005C */ li $s3, 92 -/* AD3F04 8005CD64 8CAE0018 */ lw $t6, 0x18($a1) -/* AD3F08 8005CD68 8CB0001C */ lw $s0, 0x1c($a1) -/* AD3F0C 8005CD6C 01D30019 */ multu $t6, $s3 -/* AD3F10 8005CD70 00007812 */ mflo $t7 -/* AD3F14 8005CD74 020FC021 */ addu $t8, $s0, $t7 -/* AD3F18 8005CD78 0218082B */ sltu $at, $s0, $t8 -/* AD3F1C 8005CD7C 1020000C */ beqz $at, .L8005CDB0 -/* AD3F20 8005CD80 02402025 */ move $a0, $s2 -.L8005CD84: -/* AD3F24 8005CD84 0C0171E6 */ jal func_8005C798 -/* AD3F28 8005CD88 02002825 */ move $a1, $s0 -/* AD3F2C 8005CD8C 8E280018 */ lw $t0, 0x18($s1) -/* AD3F30 8005CD90 8E39001C */ lw $t9, 0x1c($s1) -/* AD3F34 8005CD94 2610005C */ addiu $s0, $s0, 0x5c -/* AD3F38 8005CD98 01130019 */ multu $t0, $s3 -/* AD3F3C 8005CD9C 00004812 */ mflo $t1 -/* AD3F40 8005CDA0 03295021 */ addu $t2, $t9, $t1 -/* AD3F44 8005CDA4 020A082B */ sltu $at, $s0, $t2 -/* AD3F48 8005CDA8 5420FFF6 */ bnezl $at, .L8005CD84 -/* AD3F4C 8005CDAC 02402025 */ move $a0, $s2 -.L8005CDB0: -/* AD3F50 8005CDB0 8FBF0024 */ lw $ra, 0x24($sp) -/* AD3F54 8005CDB4 8FB00014 */ lw $s0, 0x14($sp) -/* AD3F58 8005CDB8 8FB10018 */ lw $s1, 0x18($sp) -/* AD3F5C 8005CDBC 8FB2001C */ lw $s2, 0x1c($sp) -/* AD3F60 8005CDC0 8FB30020 */ lw $s3, 0x20($sp) -/* AD3F64 8005CDC4 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD3F68 8005CDC8 03E00008 */ jr $ra -/* AD3F6C 8005CDCC 24020001 */ li $v0, 1 - -/* AD3F70 8005CDD0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD3F74 8005CDD4 AFBF0024 */ sw $ra, 0x24($sp) -/* AD3F78 8005CDD8 AFB2001C */ sw $s2, 0x1c($sp) -/* AD3F7C 8005CDDC AFB10018 */ sw $s1, 0x18($sp) -/* AD3F80 8005CDE0 00809025 */ move $s2, $a0 -/* AD3F84 8005CDE4 AFB30020 */ sw $s3, 0x20($sp) -/* AD3F88 8005CDE8 AFB00014 */ sw $s0, 0x14($sp) -/* AD3F8C 8005CDEC 00A08825 */ move $s1, $a1 -/* AD3F90 8005CDF0 0C016DE7 */ jal func_8005B79C -/* AD3F94 8005CDF4 AFA5002C */ sw $a1, 0x2c($sp) -/* AD3F98 8005CDF8 8FA5002C */ lw $a1, 0x2c($sp) -/* AD3F9C 8005CDFC 2413005C */ li $s3, 92 -/* AD3FA0 8005CE00 8CAE0018 */ lw $t6, 0x18($a1) -/* AD3FA4 8005CE04 8CB0001C */ lw $s0, 0x1c($a1) -/* AD3FA8 8005CE08 01D30019 */ multu $t6, $s3 -/* AD3FAC 8005CE0C 00007812 */ mflo $t7 -/* AD3FB0 8005CE10 020FC021 */ addu $t8, $s0, $t7 -/* AD3FB4 8005CE14 0218082B */ sltu $at, $s0, $t8 -/* AD3FB8 8005CE18 1020000C */ beqz $at, .L8005CE4C -/* AD3FBC 8005CE1C 02402025 */ move $a0, $s2 -.L8005CE20: -/* AD3FC0 8005CE20 0C0171EF */ jal func_8005C7BC -/* AD3FC4 8005CE24 02002825 */ move $a1, $s0 -/* AD3FC8 8005CE28 8E280018 */ lw $t0, 0x18($s1) -/* AD3FCC 8005CE2C 8E39001C */ lw $t9, 0x1c($s1) -/* AD3FD0 8005CE30 2610005C */ addiu $s0, $s0, 0x5c -/* AD3FD4 8005CE34 01130019 */ multu $t0, $s3 -/* AD3FD8 8005CE38 00004812 */ mflo $t1 -/* AD3FDC 8005CE3C 03295021 */ addu $t2, $t9, $t1 -/* AD3FE0 8005CE40 020A082B */ sltu $at, $s0, $t2 -/* AD3FE4 8005CE44 5420FFF6 */ bnezl $at, .L8005CE20 -/* AD3FE8 8005CE48 02402025 */ move $a0, $s2 -.L8005CE4C: -/* AD3FEC 8005CE4C 8FBF0024 */ lw $ra, 0x24($sp) -/* AD3FF0 8005CE50 8FB00014 */ lw $s0, 0x14($sp) -/* AD3FF4 8005CE54 8FB10018 */ lw $s1, 0x18($sp) -/* AD3FF8 8005CE58 8FB2001C */ lw $s2, 0x1c($sp) -/* AD3FFC 8005CE5C 8FB30020 */ lw $s3, 0x20($sp) -/* AD4000 8005CE60 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD4004 8005CE64 03E00008 */ jr $ra -/* AD4008 8005CE68 24020001 */ li $v0, 1 - diff --git a/asm/non_matchings/code/z_collision_check/func_8005CE6C.s b/asm/non_matchings/code/z_collision_check/func_8005CE6C.s deleted file mode 100644 index 9ebbbfed23..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005CE6C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8005CE6C -/* AD400C 8005CE6C 3C0E8012 */ lui $t6, %hi(D_8011DEAC) # $t6, 0x8012 -/* AD4010 8005CE70 25CEDEAC */ addiu $t6, %lo(D_8011DEAC) # addiu $t6, $t6, -0x2154 -/* AD4014 8005CE74 AFA40000 */ sw $a0, ($sp) -/* AD4018 8005CE78 25C8003C */ addiu $t0, $t6, 0x3c -/* AD401C 8005CE7C 00A0C825 */ move $t9, $a1 -.L8005CE80: -/* AD4020 8005CE80 8DD80000 */ lw $t8, ($t6) -/* AD4024 8005CE84 25CE000C */ addiu $t6, $t6, 0xc -/* AD4028 8005CE88 2739000C */ addiu $t9, $t9, 0xc -/* AD402C 8005CE8C AF38FFF4 */ sw $t8, -0xc($t9) -/* AD4030 8005CE90 8DCFFFF8 */ lw $t7, -8($t6) -/* AD4034 8005CE94 AF2FFFF8 */ sw $t7, -8($t9) -/* AD4038 8005CE98 8DD8FFFC */ lw $t8, -4($t6) -/* AD403C 8005CE9C 15C8FFF8 */ bne $t6, $t0, .L8005CE80 -/* AD4040 8005CEA0 AF38FFFC */ sw $t8, -4($t9) -/* AD4044 8005CEA4 8DD80000 */ lw $t8, ($t6) -/* AD4048 8005CEA8 24020001 */ li $v0, 1 -/* AD404C 8005CEAC 03E00008 */ jr $ra -/* AD4050 8005CEB0 AF380000 */ sw $t8, ($t9) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005CEC4.s b/asm/non_matchings/code/z_collision_check/func_8005CEC4.s deleted file mode 100644 index 1f2b88691d..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005CEC4.s +++ /dev/null @@ -1,13 +0,0 @@ -.late_rodata -glabel D_8013ACF4 - .float 1.0E38 - -.text -glabel func_8005CEC4 -/* AD4064 8005CEC4 3C018014 */ lui $at, %hi(D_8013ACF4) -/* AD4068 8005CEC8 C424ACF4 */ lwc1 $f4, %lo(D_8013ACF4)($at) -/* AD406C 8005CECC AFA40000 */ sw $a0, ($sp) -/* AD4070 8005CED0 24020001 */ li $v0, 1 -/* AD4074 8005CED4 03E00008 */ jr $ra -/* AD4078 8005CED8 E4A4003C */ swc1 $f4, 0x3c($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005CEDC.s b/asm/non_matchings/code/z_collision_check/func_8005CEDC.s deleted file mode 100644 index f8608f1865..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005CEDC.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_8005CEDC -/* AD407C 8005CEDC C4840018 */ lwc1 $f4, 0x18($a0) -/* AD4080 8005CEE0 C4860024 */ lwc1 $f6, 0x24($a0) -/* AD4084 8005CEE4 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* AD4088 8005CEE8 44810000 */ mtc1 $at, $f0 -/* AD408C 8005CEEC 46062200 */ add.s $f8, $f4, $f6 -/* AD4090 8005CEF0 C4840028 */ lwc1 $f4, 0x28($a0) -/* AD4094 8005CEF4 C492001C */ lwc1 $f18, 0x1c($a0) -/* AD4098 8005CEF8 46004282 */ mul.s $f10, $f8, $f0 -/* AD409C 8005CEFC 46049180 */ add.s $f6, $f18, $f4 -/* AD40A0 8005CF00 C492002C */ lwc1 $f18, 0x2c($a0) -/* AD40A4 8005CF04 46003202 */ mul.s $f8, $f6, $f0 -/* AD40A8 8005CF08 4600540D */ trunc.w.s $f16, $f10 -/* AD40AC 8005CF0C 4600428D */ trunc.w.s $f10, $f8 -/* AD40B0 8005CF10 440F8000 */ mfc1 $t7, $f16 -/* AD40B4 8005CF14 C4900020 */ lwc1 $f16, 0x20($a0) -/* AD40B8 8005CF18 44195000 */ mfc1 $t9, $f10 -/* AD40BC 8005CF1C 46128100 */ add.s $f4, $f16, $f18 -/* AD40C0 8005CF20 C490000C */ lwc1 $f16, 0xc($a0) -/* AD40C4 8005CF24 C48A0000 */ lwc1 $f10, ($a0) -/* AD40C8 8005CF28 A48F0030 */ sh $t7, 0x30($a0) -/* AD40CC 8005CF2C 46002182 */ mul.s $f6, $f4, $f0 -/* AD40D0 8005CF30 46105480 */ add.s $f18, $f10, $f16 -/* AD40D4 8005CF34 C48A0010 */ lwc1 $f10, 0x10($a0) -/* AD40D8 8005CF38 A4990032 */ sh $t9, 0x32($a0) -/* AD40DC 8005CF3C 46009102 */ mul.s $f4, $f18, $f0 -/* AD40E0 8005CF40 4600320D */ trunc.w.s $f8, $f6 -/* AD40E4 8005CF44 4600218D */ trunc.w.s $f6, $f4 -/* AD40E8 8005CF48 44094000 */ mfc1 $t1, $f8 -/* AD40EC 8005CF4C C4880004 */ lwc1 $f8, 4($a0) -/* AD40F0 8005CF50 440B3000 */ mfc1 $t3, $f6 -/* AD40F4 8005CF54 460A4400 */ add.s $f16, $f8, $f10 -/* AD40F8 8005CF58 C4880014 */ lwc1 $f8, 0x14($a0) -/* AD40FC 8005CF5C C4860008 */ lwc1 $f6, 8($a0) -/* AD4100 8005CF60 A4890034 */ sh $t1, 0x34($a0) -/* AD4104 8005CF64 46008482 */ mul.s $f18, $f16, $f0 -/* AD4108 8005CF68 46083280 */ add.s $f10, $f6, $f8 -/* AD410C 8005CF6C A48B0036 */ sh $t3, 0x36($a0) -/* AD4110 8005CF70 46005402 */ mul.s $f16, $f10, $f0 -/* AD4114 8005CF74 4600910D */ trunc.w.s $f4, $f18 -/* AD4118 8005CF78 4600848D */ trunc.w.s $f18, $f16 -/* AD411C 8005CF7C 440D2000 */ mfc1 $t5, $f4 -/* AD4120 8005CF80 440F9000 */ mfc1 $t7, $f18 -/* AD4124 8005CF84 A48D0038 */ sh $t5, 0x38($a0) -/* AD4128 8005CF88 03E00008 */ jr $ra -/* AD412C 8005CF8C A48F003A */ sh $t7, 0x3a($a0) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005CF90.s b/asm/non_matchings/code/z_collision_check/func_8005CF90.s deleted file mode 100644 index 52f48d154e..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005CF90.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8005CF90 -/* AD4130 8005CF90 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD4134 8005CF94 AFBF0014 */ sw $ra, 0x14($sp) -/* AD4138 8005CF98 AFA40018 */ sw $a0, 0x18($sp) -/* AD413C 8005CF9C 8CCF0000 */ lw $t7, ($a2) -/* AD4140 8005CFA0 00A02025 */ move $a0, $a1 -/* AD4144 8005CFA4 ACAF0000 */ sw $t7, ($a1) -/* AD4148 8005CFA8 8CCE0004 */ lw $t6, 4($a2) -/* AD414C 8005CFAC ACAE0004 */ sw $t6, 4($a1) -/* AD4150 8005CFB0 8CCF0008 */ lw $t7, 8($a2) -/* AD4154 8005CFB4 ACAF0008 */ sw $t7, 8($a1) -/* AD4158 8005CFB8 8CD9000C */ lw $t9, 0xc($a2) -/* AD415C 8005CFBC ACB9000C */ sw $t9, 0xc($a1) -/* AD4160 8005CFC0 8CD80010 */ lw $t8, 0x10($a2) -/* AD4164 8005CFC4 ACB80010 */ sw $t8, 0x10($a1) -/* AD4168 8005CFC8 8CD90014 */ lw $t9, 0x14($a2) -/* AD416C 8005CFCC ACB90014 */ sw $t9, 0x14($a1) -/* AD4170 8005CFD0 8CC90018 */ lw $t1, 0x18($a2) -/* AD4174 8005CFD4 ACA90018 */ sw $t1, 0x18($a1) -/* AD4178 8005CFD8 8CC8001C */ lw $t0, 0x1c($a2) -/* AD417C 8005CFDC ACA8001C */ sw $t0, 0x1c($a1) -/* AD4180 8005CFE0 8CC90020 */ lw $t1, 0x20($a2) -/* AD4184 8005CFE4 ACA90020 */ sw $t1, 0x20($a1) -/* AD4188 8005CFE8 8CCB0024 */ lw $t3, 0x24($a2) -/* AD418C 8005CFEC ACAB0024 */ sw $t3, 0x24($a1) -/* AD4190 8005CFF0 8CCA0028 */ lw $t2, 0x28($a2) -/* AD4194 8005CFF4 ACAA0028 */ sw $t2, 0x28($a1) -/* AD4198 8005CFF8 8CCB002C */ lw $t3, 0x2c($a2) -/* AD419C 8005CFFC 0C0173B7 */ jal func_8005CEDC -/* AD41A0 8005D000 ACAB002C */ sw $t3, 0x2c($a1) -/* AD41A4 8005D004 8FBF0014 */ lw $ra, 0x14($sp) -/* AD41A8 8005D008 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD41AC 8005D00C 24020001 */ li $v0, 1 -/* AD41B0 8005D010 03E00008 */ jr $ra -/* AD41B4 8005D014 00000000 */ nop diff --git a/asm/non_matchings/code/z_collision_check/func_8005D218.s b/asm/non_matchings/code/z_collision_check/func_8005D218.s deleted file mode 100644 index 9781bb067e..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005D218.s +++ /dev/null @@ -1,79 +0,0 @@ -glabel func_8005D218 -/* AD43B8 8005D218 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AD43BC 8005D21C AFBF0014 */ sw $ra, 0x14($sp) -/* AD43C0 8005D220 AFA40030 */ sw $a0, 0x30($sp) -/* AD43C4 8005D224 AFA60038 */ sw $a2, 0x38($sp) -/* AD43C8 8005D228 90AE002D */ lbu $t6, 0x2d($a1) -/* AD43CC 8005D22C 00A03825 */ move $a3, $a1 -/* AD43D0 8005D230 24E50070 */ addiu $a1, $a3, 0x70 -/* AD43D4 8005D234 31CF0004 */ andi $t7, $t6, 4 -/* AD43D8 8005D238 15E00003 */ bnez $t7, .L8005D248 -/* AD43DC 8005D23C 27A40020 */ addiu $a0, $sp, 0x20 -/* AD43E0 8005D240 1000001C */ b .L8005D2B4 -/* AD43E4 8005D244 24020001 */ li $v0, 1 -.L8005D248: -/* AD43E8 8005D248 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD43EC 8005D24C AFA70034 */ sw $a3, 0x34($sp) -/* AD43F0 8005D250 27A40020 */ addiu $a0, $sp, 0x20 -/* AD43F4 8005D254 0C032D94 */ jal func_800CB650 -/* AD43F8 8005D258 8FA50038 */ lw $a1, 0x38($sp) -/* AD43FC 8005D25C 8FA70034 */ lw $a3, 0x34($sp) -/* AD4400 8005D260 00001025 */ move $v0, $zero -/* AD4404 8005D264 C4E4007C */ lwc1 $f4, 0x7c($a3) -/* AD4408 8005D268 4604003C */ c.lt.s $f0, $f4 -/* AD440C 8005D26C 00000000 */ nop -/* AD4410 8005D270 45000010 */ bc1f .L8005D2B4 -/* AD4414 8005D274 00000000 */ nop -/* AD4418 8005D278 8CE50030 */ lw $a1, 0x30($a3) -/* AD441C 8005D27C E4E0007C */ swc1 $f0, 0x7c($a3) -/* AD4420 8005D280 8FA40030 */ lw $a0, 0x30($sp) -/* AD4424 8005D284 50A00005 */ beql $a1, $zero, .L8005D29C -/* AD4428 8005D288 8CE50038 */ lw $a1, 0x38($a3) -/* AD442C 8005D28C 0C016DE1 */ jal func_8005B784 -/* AD4430 8005D290 AFA70034 */ sw $a3, 0x34($sp) -/* AD4434 8005D294 8FA70034 */ lw $a3, 0x34($sp) -/* AD4438 8005D298 8CE50038 */ lw $a1, 0x38($a3) -.L8005D29C: -/* AD443C 8005D29C 10A00003 */ beqz $a1, .L8005D2AC -/* AD4440 8005D2A0 00000000 */ nop -/* AD4444 8005D2A4 0C016E7A */ jal func_8005B9E8 -/* AD4448 8005D2A8 8FA40030 */ lw $a0, 0x30($sp) -.L8005D2AC: -/* AD444C 8005D2AC 10000001 */ b .L8005D2B4 -/* AD4450 8005D2B0 24020001 */ li $v0, 1 -.L8005D2B4: -/* AD4454 8005D2B4 8FBF0014 */ lw $ra, 0x14($sp) -/* AD4458 8005D2B8 27BD0030 */ addiu $sp, $sp, 0x30 -/* AD445C 8005D2BC 03E00008 */ jr $ra -/* AD4460 8005D2C0 00000000 */ nop - -/* AD4464 8005D2C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD4468 8005D2C8 3C0E8012 */ lui $t6, %hi(D_8011DEEC) # $t6, 0x8012 -/* AD446C 8005D2CC AFBF0014 */ sw $ra, 0x14($sp) -/* AD4470 8005D2D0 AFA40028 */ sw $a0, 0x28($sp) -/* AD4474 8005D2D4 AFA5002C */ sw $a1, 0x2c($sp) -/* AD4478 8005D2D8 25CEDEEC */ addiu $t6, %lo(D_8011DEEC) # addiu $t6, $t6, -0x2114 -/* AD447C 8005D2DC 8DD80000 */ lw $t8, ($t6) -/* AD4480 8005D2E0 27A5001C */ addiu $a1, $sp, 0x1c -/* AD4484 8005D2E4 ACB80000 */ sw $t8, ($a1) -/* AD4488 8005D2E8 8DCF0004 */ lw $t7, 4($t6) -/* AD448C 8005D2EC ACAF0004 */ sw $t7, 4($a1) -/* AD4490 8005D2F0 8DD80008 */ lw $t8, 8($t6) -/* AD4494 8005D2F4 ACB80008 */ sw $t8, 8($a1) -/* AD4498 8005D2F8 0C01DF90 */ jal Math_Vec3f_Copy -/* AD449C 8005D2FC 8FA4002C */ lw $a0, 0x2c($sp) -/* AD44A0 8005D300 8FA4002C */ lw $a0, 0x2c($sp) -/* AD44A4 8005D304 27A5001C */ addiu $a1, $sp, 0x1c -/* AD44A8 8005D308 0C01DF90 */ jal Math_Vec3f_Copy -/* AD44AC 8005D30C 2484000C */ addiu $a0, $a0, 0xc -/* AD44B0 8005D310 8FBF0014 */ lw $ra, 0x14($sp) -/* AD44B4 8005D314 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD44B8 8005D318 24020001 */ li $v0, 1 -/* AD44BC 8005D31C 03E00008 */ jr $ra -/* AD44C0 8005D320 00000000 */ nop - -/* AD44C4 8005D324 AFA40000 */ sw $a0, ($sp) -/* AD44C8 8005D328 AFA50004 */ sw $a1, 4($sp) -/* AD44CC 8005D32C 03E00008 */ jr $ra -/* AD44D0 8005D330 24020001 */ li $v0, 1 - diff --git a/asm/non_matchings/code/z_collision_check/func_8005D334.s b/asm/non_matchings/code/z_collision_check/func_8005D334.s deleted file mode 100644 index ab41eddc42..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005D334.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8005D334 -/* AD44D4 8005D334 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD44D8 8005D338 AFA40018 */ sw $a0, 0x18($sp) -/* AD44DC 8005D33C AFBF0014 */ sw $ra, 0x14($sp) -/* AD44E0 8005D340 AFA5001C */ sw $a1, 0x1c($sp) -/* AD44E4 8005D344 00A02025 */ move $a0, $a1 -/* AD44E8 8005D348 AFA70024 */ sw $a3, 0x24($sp) -/* AD44EC 8005D34C 0C01DF90 */ jal Math_Vec3f_Copy -/* AD44F0 8005D350 00C02825 */ move $a1, $a2 -/* AD44F4 8005D354 8FA4001C */ lw $a0, 0x1c($sp) -/* AD44F8 8005D358 8FA50024 */ lw $a1, 0x24($sp) -/* AD44FC 8005D35C 0C01DF90 */ jal Math_Vec3f_Copy -/* AD4500 8005D360 2484000C */ addiu $a0, $a0, 0xc -/* AD4504 8005D364 8FBF0014 */ lw $ra, 0x14($sp) -/* AD4508 8005D368 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD450C 8005D36C 24020001 */ li $v0, 1 -/* AD4510 8005D370 03E00008 */ jr $ra -/* AD4514 8005D374 00000000 */ nop - -/* AD4518 8005D378 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD451C 8005D37C AFBF0014 */ sw $ra, 0x14($sp) -/* AD4520 8005D380 94CE0018 */ lhu $t6, 0x18($a2) -/* AD4524 8005D384 24C7000C */ addiu $a3, $a2, 0xc -/* AD4528 8005D388 0C0174CD */ jal func_8005D334 -/* AD452C 8005D38C A4AE0018 */ sh $t6, 0x18($a1) -/* AD4530 8005D390 8FBF0014 */ lw $ra, 0x14($sp) -/* AD4534 8005D394 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD4538 8005D398 24020001 */ li $v0, 1 -/* AD453C 8005D39C 03E00008 */ jr $ra -/* AD4540 8005D3A0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005D3A4.s b/asm/non_matchings/code/z_collision_check/func_8005D3A4.s deleted file mode 100644 index 77291e1c9e..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005D3A4.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_8005D3A4 -/* AD4544 8005D3A4 AFA40000 */ sw $a0, ($sp) -/* AD4548 8005D3A8 94AE0018 */ lhu $t6, 0x18($a1) -/* AD454C 8005D3AC 24020001 */ li $v0, 1 -/* AD4550 8005D3B0 31CFFFFE */ andi $t7, $t6, 0xfffe -/* AD4554 8005D3B4 03E00008 */ jr $ra -/* AD4558 8005D3B8 A4AF0018 */ sh $t7, 0x18($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005D3BC.s b/asm/non_matchings/code/z_collision_check/func_8005D3BC.s deleted file mode 100644 index 613608fb9a..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005D3BC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8005D3BC -/* AD455C 8005D3BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD4560 8005D3C0 AFBF0014 */ sw $ra, 0x14($sp) -/* AD4564 8005D3C4 0C017503 */ jal func_8005D40C -/* AD4568 8005D3C8 A4A00002 */ sh $zero, 2($a1) -/* AD456C 8005D3CC 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* AD4570 8005D3D0 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* AD4574 8005D3D4 8C4E0000 */ lw $t6, ($v0) -/* AD4578 8005D3D8 24030001 */ li $v1, 1 -/* AD457C 8005D3DC A5C30E7E */ sh $v1, 0xe7e($t6) -/* AD4580 8005D3E0 8C4F0000 */ lw $t7, ($v0) -/* AD4584 8005D3E4 A5E30E80 */ sh $v1, 0xe80($t7) -/* AD4588 8005D3E8 8C580000 */ lw $t8, ($v0) -/* AD458C 8005D3EC A7030E82 */ sh $v1, 0xe82($t8) -/* AD4590 8005D3F0 8FBF0014 */ lw $ra, 0x14($sp) -/* AD4594 8005D3F4 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD4598 8005D3F8 03E00008 */ jr $ra -/* AD459C 8005D3FC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005D40C.s b/asm/non_matchings/code/z_collision_check/func_8005D40C.s deleted file mode 100644 index 16c5e2dc8c..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005D40C.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_8005D40C -/* AD45AC 8005D40C AFA40000 */ sw $a0, ($sp) -/* AD45B0 8005D410 94AE0002 */ lhu $t6, 2($a1) -/* AD45B4 8005D414 24A400CC */ addiu $a0, $a1, 0xcc -/* AD45B8 8005D418 24A20004 */ addiu $v0, $a1, 4 -/* AD45BC 8005D41C 31CF0001 */ andi $t7, $t6, 1 -/* AD45C0 8005D420 15E00022 */ bnez $t7, .L8005D4AC -/* AD45C4 8005D424 0044082B */ sltu $at, $v0, $a0 -/* AD45C8 8005D428 A4A00000 */ sh $zero, ($a1) -/* AD45CC 8005D42C ACA000CC */ sw $zero, 0xcc($a1) -/* AD45D0 8005D430 ACA001C0 */ sw $zero, 0x1c0($a1) -/* AD45D4 8005D434 10200005 */ beqz $at, .L8005D44C -/* AD45D8 8005D438 ACA0028C */ sw $zero, 0x28c($a1) -.L8005D43C: -/* AD45DC 8005D43C 24420004 */ addiu $v0, $v0, 4 -/* AD45E0 8005D440 0044082B */ sltu $at, $v0, $a0 -/* AD45E4 8005D444 1420FFFD */ bnez $at, .L8005D43C -/* AD45E8 8005D448 AC40FFFC */ sw $zero, -4($v0) -.L8005D44C: -/* AD45EC 8005D44C 24A200D0 */ addiu $v0, $a1, 0xd0 -/* AD45F0 8005D450 24A401C0 */ addiu $a0, $a1, 0x1c0 -/* AD45F4 8005D454 0044082B */ sltu $at, $v0, $a0 -/* AD45F8 8005D458 10200004 */ beqz $at, .L8005D46C -.L8005D45C: -/* AD45FC 8005D45C 24420004 */ addiu $v0, $v0, 4 -/* AD4600 8005D460 0044082B */ sltu $at, $v0, $a0 -/* AD4604 8005D464 1420FFFD */ bnez $at, .L8005D45C -/* AD4608 8005D468 AC40FFFC */ sw $zero, -4($v0) -.L8005D46C: -/* AD460C 8005D46C 24A201C4 */ addiu $v0, $a1, 0x1c4 -/* AD4610 8005D470 24A4028C */ addiu $a0, $a1, 0x28c -/* AD4614 8005D474 0044082B */ sltu $at, $v0, $a0 -/* AD4618 8005D478 10200004 */ beqz $at, .L8005D48C -.L8005D47C: -/* AD461C 8005D47C 24420004 */ addiu $v0, $v0, 4 -/* AD4620 8005D480 0044082B */ sltu $at, $v0, $a0 -/* AD4624 8005D484 1420FFFD */ bnez $at, .L8005D47C -/* AD4628 8005D488 AC40FFFC */ sw $zero, -4($v0) -.L8005D48C: -/* AD462C 8005D48C 24A20290 */ addiu $v0, $a1, 0x290 -/* AD4630 8005D490 24A4029C */ addiu $a0, $a1, 0x29c -/* AD4634 8005D494 0044082B */ sltu $at, $v0, $a0 -/* AD4638 8005D498 10200004 */ beqz $at, .L8005D4AC -.L8005D49C: -/* AD463C 8005D49C 24420004 */ addiu $v0, $v0, 4 -/* AD4640 8005D4A0 0044082B */ sltu $at, $v0, $a0 -/* AD4644 8005D4A4 1420FFFD */ bnez $at, .L8005D49C -/* AD4648 8005D4A8 AC40FFFC */ sw $zero, -4($v0) -.L8005D4AC: -/* AD464C 8005D4AC 03E00008 */ jr $ra -/* AD4650 8005D4B0 00000000 */ nop - -/* AD4654 8005D4B4 AFA40000 */ sw $a0, ($sp) -/* AD4658 8005D4B8 94AE0002 */ lhu $t6, 2($a1) -/* AD465C 8005D4BC 35CF0001 */ ori $t7, $t6, 1 -/* AD4660 8005D4C0 03E00008 */ jr $ra -/* AD4664 8005D4C4 A4AF0002 */ sh $t7, 2($a1) - -/* AD4668 8005D4C8 AFA40000 */ sw $a0, ($sp) -/* AD466C 8005D4CC 94AE0002 */ lhu $t6, 2($a1) -/* AD4670 8005D4D0 31CFFFFE */ andi $t7, $t6, 0xfffe -/* AD4674 8005D4D4 03E00008 */ jr $ra -/* AD4678 8005D4D8 A4AF0002 */ sh $t7, 2($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005D4DC.s b/asm/non_matchings/code/z_collision_check/func_8005D4DC.s deleted file mode 100644 index 029e57e080..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005D4DC.s +++ /dev/null @@ -1,94 +0,0 @@ -glabel func_8005D4DC -/* AD467C 8005D4DC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AD4680 8005D4E0 AFB40028 */ sw $s4, 0x28($sp) -/* AD4684 8005D4E4 AFB20020 */ sw $s2, 0x20($sp) -/* AD4688 8005D4E8 00A09025 */ move $s2, $a1 -/* AD468C 8005D4EC 0080A025 */ move $s4, $a0 -/* AD4690 8005D4F0 AFBF002C */ sw $ra, 0x2c($sp) -/* AD4694 8005D4F4 AFB30024 */ sw $s3, 0x24($sp) -/* AD4698 8005D4F8 AFB1001C */ sw $s1, 0x1c($sp) -/* AD469C 8005D4FC 10A00043 */ beqz $a1, .L8005D60C -/* AD46A0 8005D500 AFB00018 */ sw $s0, 0x18($sp) -/* AD46A4 8005D504 90A20015 */ lbu $v0, 0x15($a1) -/* AD46A8 8005D508 24010001 */ li $at, 1 -/* AD46AC 8005D50C 5040000B */ beql $v0, $zero, .L8005D53C -/* AD46B0 8005D510 8E4E0018 */ lw $t6, 0x18($s2) -/* AD46B4 8005D514 1041001A */ beq $v0, $at, .L8005D580 -/* AD46B8 8005D518 02802025 */ move $a0, $s4 -/* AD46BC 8005D51C 24010002 */ li $at, 2 -/* AD46C0 8005D520 1041001B */ beq $v0, $at, .L8005D590 -/* AD46C4 8005D524 24010003 */ li $at, 3 -/* AD46C8 8005D528 1041002D */ beq $v0, $at, .L8005D5E0 -/* AD46CC 8005D52C 26500058 */ addiu $s0, $s2, 0x58 -/* AD46D0 8005D530 10000037 */ b .L8005D610 -/* AD46D4 8005D534 8FBF002C */ lw $ra, 0x2c($sp) -/* AD46D8 8005D538 8E4E0018 */ lw $t6, 0x18($s2) -.L8005D53C: -/* AD46DC 8005D53C 02409825 */ move $s3, $s2 -/* AD46E0 8005D540 00008025 */ move $s0, $zero -/* AD46E4 8005D544 19C00031 */ blez $t6, .L8005D60C -/* AD46E8 8005D548 00008825 */ move $s1, $zero -/* AD46EC 8005D54C 8E4F001C */ lw $t7, 0x1c($s2) -.L8005D550: -/* AD46F0 8005D550 02802025 */ move $a0, $s4 -/* AD46F4 8005D554 01F12821 */ addu $a1, $t7, $s1 -/* AD46F8 8005D558 0C034174 */ jal func_800D05D0 -/* AD46FC 8005D55C 24A50030 */ addiu $a1, $a1, 0x30 -/* AD4700 8005D560 8E780018 */ lw $t8, 0x18($s3) -/* AD4704 8005D564 26100001 */ addiu $s0, $s0, 1 -/* AD4708 8005D568 26310040 */ addiu $s1, $s1, 0x40 -/* AD470C 8005D56C 0218082A */ slt $at, $s0, $t8 -/* AD4710 8005D570 5420FFF7 */ bnezl $at, .L8005D550 -/* AD4714 8005D574 8E4F001C */ lw $t7, 0x1c($s2) -/* AD4718 8005D578 10000025 */ b .L8005D610 -/* AD471C 8005D57C 8FBF002C */ lw $ra, 0x2c($sp) -.L8005D580: -/* AD4720 8005D580 0C034177 */ jal func_800D05DC -/* AD4724 8005D584 26450040 */ addiu $a1, $s2, 0x40 -/* AD4728 8005D588 10000021 */ b .L8005D610 -/* AD472C 8005D58C 8FBF002C */ lw $ra, 0x2c($sp) -.L8005D590: -/* AD4730 8005D590 8E590018 */ lw $t9, 0x18($s2) -/* AD4734 8005D594 02409825 */ move $s3, $s2 -/* AD4738 8005D598 00008025 */ move $s0, $zero -/* AD473C 8005D59C 1B20001B */ blez $t9, .L8005D60C -/* AD4740 8005D5A0 00008825 */ move $s1, $zero -/* AD4744 8005D5A4 8E48001C */ lw $t0, 0x1c($s2) -.L8005D5A8: -/* AD4748 8005D5A8 8E840000 */ lw $a0, ($s4) -/* AD474C 8005D5AC 01111021 */ addu $v0, $t0, $s1 -/* AD4750 8005D5B0 24450028 */ addiu $a1, $v0, 0x28 -/* AD4754 8005D5B4 24460034 */ addiu $a2, $v0, 0x34 -/* AD4758 8005D5B8 0C016CA0 */ jal func_8005B280 -/* AD475C 8005D5BC 24470040 */ addiu $a3, $v0, 0x40 -/* AD4760 8005D5C0 8E690018 */ lw $t1, 0x18($s3) -/* AD4764 8005D5C4 26100001 */ addiu $s0, $s0, 1 -/* AD4768 8005D5C8 2631005C */ addiu $s1, $s1, 0x5c -/* AD476C 8005D5CC 0209082A */ slt $at, $s0, $t1 -/* AD4770 8005D5D0 5420FFF5 */ bnezl $at, .L8005D5A8 -/* AD4774 8005D5D4 8E48001C */ lw $t0, 0x1c($s2) -/* AD4778 8005D5D8 1000000D */ b .L8005D610 -/* AD477C 8005D5DC 8FBF002C */ lw $ra, 0x2c($sp) -.L8005D5E0: -/* AD4780 8005D5E0 2651004C */ addiu $s1, $s2, 0x4c -/* AD4784 8005D5E4 02203825 */ move $a3, $s1 -/* AD4788 8005D5E8 8E840000 */ lw $a0, ($s4) -/* AD478C 8005D5EC 02002825 */ move $a1, $s0 -/* AD4790 8005D5F0 0C016CA0 */ jal func_8005B280 -/* AD4794 8005D5F4 26460064 */ addiu $a2, $s2, 0x64 -/* AD4798 8005D5F8 8E840000 */ lw $a0, ($s4) -/* AD479C 8005D5FC 02202825 */ move $a1, $s1 -/* AD47A0 8005D600 26460040 */ addiu $a2, $s2, 0x40 -/* AD47A4 8005D604 0C016CA0 */ jal func_8005B280 -/* AD47A8 8005D608 02003825 */ move $a3, $s0 -.L8005D60C: -/* AD47AC 8005D60C 8FBF002C */ lw $ra, 0x2c($sp) -.L8005D610: -/* AD47B0 8005D610 8FB00018 */ lw $s0, 0x18($sp) -/* AD47B4 8005D614 8FB1001C */ lw $s1, 0x1c($sp) -/* AD47B8 8005D618 8FB20020 */ lw $s2, 0x20($sp) -/* AD47BC 8005D61C 8FB30024 */ lw $s3, 0x24($sp) -/* AD47C0 8005D620 8FB40028 */ lw $s4, 0x28($sp) -/* AD47C4 8005D624 03E00008 */ jr $ra -/* AD47C8 8005D628 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/z_collision_check/func_8005D62C.s b/asm/non_matchings/code/z_collision_check/func_8005D62C.s deleted file mode 100644 index a8c432d97b..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005D62C.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel func_8005D62C -/* AD47CC 8005D62C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD47D0 8005D630 3C038016 */ lui $v1, %hi(gGameInfo) # $v1, 0x8016 -/* AD47D4 8005D634 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* AD47D8 8005D638 AFBF0024 */ sw $ra, 0x24($sp) -/* AD47DC 8005D63C AFB30020 */ sw $s3, 0x20($sp) -/* AD47E0 8005D640 AFB2001C */ sw $s2, 0x1c($sp) -/* AD47E4 8005D644 AFB10018 */ sw $s1, 0x18($sp) -/* AD47E8 8005D648 AFB00014 */ sw $s0, 0x14($sp) -/* AD47EC 8005D64C 846E0E72 */ lh $t6, 0xe72($v1) -/* AD47F0 8005D650 00A09025 */ move $s2, $a1 -/* AD47F4 8005D654 00809825 */ move $s3, $a0 -/* AD47F8 8005D658 51C0004A */ beql $t6, $zero, .L8005D784 -/* AD47FC 8005D65C 8FBF0024 */ lw $ra, 0x24($sp) -/* AD4800 8005D660 846F0E7E */ lh $t7, 0xe7e($v1) -/* AD4804 8005D664 51E00011 */ beql $t7, $zero, .L8005D6AC -/* AD4808 8005D668 84680E80 */ lh $t0, 0xe80($v1) -/* AD480C 8005D66C 84B80000 */ lh $t8, ($a1) -/* AD4810 8005D670 00008825 */ move $s1, $zero -/* AD4814 8005D674 00A08025 */ move $s0, $a1 -/* AD4818 8005D678 1B00000B */ blez $t8, .L8005D6A8 -/* AD481C 8005D67C 02602025 */ move $a0, $s3 -.L8005D680: -/* AD4820 8005D680 0C017537 */ jal func_8005D4DC -/* AD4824 8005D684 8E050004 */ lw $a1, 4($s0) -/* AD4828 8005D688 86590000 */ lh $t9, ($s2) -/* AD482C 8005D68C 26310001 */ addiu $s1, $s1, 1 -/* AD4830 8005D690 26100004 */ addiu $s0, $s0, 4 -/* AD4834 8005D694 0239082A */ slt $at, $s1, $t9 -/* AD4838 8005D698 5420FFF9 */ bnezl $at, .L8005D680 -/* AD483C 8005D69C 02602025 */ move $a0, $s3 -/* AD4840 8005D6A0 3C038016 */ lui $v1, %hi(gGameInfo) # $v1, 0x8016 -/* AD4844 8005D6A4 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -.L8005D6A8: -/* AD4848 8005D6A8 84680E80 */ lh $t0, 0xe80($v1) -.L8005D6AC: -/* AD484C 8005D6AC 51000011 */ beql $t0, $zero, .L8005D6F4 -/* AD4850 8005D6B0 846B0E82 */ lh $t3, 0xe82($v1) -/* AD4854 8005D6B4 8E4900CC */ lw $t1, 0xcc($s2) -/* AD4858 8005D6B8 00008825 */ move $s1, $zero -/* AD485C 8005D6BC 02408025 */ move $s0, $s2 -/* AD4860 8005D6C0 1920000B */ blez $t1, .L8005D6F0 -/* AD4864 8005D6C4 02602025 */ move $a0, $s3 -.L8005D6C8: -/* AD4868 8005D6C8 0C017537 */ jal func_8005D4DC -/* AD486C 8005D6CC 8E0500D0 */ lw $a1, 0xd0($s0) -/* AD4870 8005D6D0 8E4A00CC */ lw $t2, 0xcc($s2) -/* AD4874 8005D6D4 26310001 */ addiu $s1, $s1, 1 -/* AD4878 8005D6D8 26100004 */ addiu $s0, $s0, 4 -/* AD487C 8005D6DC 022A082A */ slt $at, $s1, $t2 -/* AD4880 8005D6E0 5420FFF9 */ bnezl $at, .L8005D6C8 -/* AD4884 8005D6E4 02602025 */ move $a0, $s3 -/* AD4888 8005D6E8 3C038016 */ lui $v1, %hi(gGameInfo) # $v1, 0x8016 -/* AD488C 8005D6EC 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -.L8005D6F0: -/* AD4890 8005D6F0 846B0E82 */ lh $t3, 0xe82($v1) -.L8005D6F4: -/* AD4894 8005D6F4 51600015 */ beql $t3, $zero, .L8005D74C -/* AD4898 8005D6F8 846E0E84 */ lh $t6, 0xe84($v1) -/* AD489C 8005D6FC 8E4201C0 */ lw $v0, 0x1c0($s2) -/* AD48A0 8005D700 00008825 */ move $s1, $zero -/* AD48A4 8005D704 02408025 */ move $s0, $s2 -/* AD48A8 8005D708 58400010 */ blezl $v0, .L8005D74C -/* AD48AC 8005D70C 846E0E84 */ lh $t6, 0xe84($v1) -.L8005D710: -/* AD48B0 8005D710 8E0501C4 */ lw $a1, 0x1c4($s0) -/* AD48B4 8005D714 90AC0012 */ lbu $t4, 0x12($a1) -/* AD48B8 8005D718 318D0001 */ andi $t5, $t4, 1 -/* AD48BC 8005D71C 51A00005 */ beql $t5, $zero, .L8005D734 -/* AD48C0 8005D720 26310001 */ addiu $s1, $s1, 1 -/* AD48C4 8005D724 0C017537 */ jal func_8005D4DC -/* AD48C8 8005D728 02602025 */ move $a0, $s3 -/* AD48CC 8005D72C 8E4201C0 */ lw $v0, 0x1c0($s2) -/* AD48D0 8005D730 26310001 */ addiu $s1, $s1, 1 -.L8005D734: -/* AD48D4 8005D734 0222082A */ slt $at, $s1, $v0 -/* AD48D8 8005D738 1420FFF5 */ bnez $at, .L8005D710 -/* AD48DC 8005D73C 26100004 */ addiu $s0, $s0, 4 -/* AD48E0 8005D740 3C038016 */ lui $v1, %hi(gGameInfo) # $v1, 0x8016 -/* AD48E4 8005D744 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* AD48E8 8005D748 846E0E84 */ lh $t6, 0xe84($v1) -.L8005D74C: -/* AD48EC 8005D74C 02602025 */ move $a0, $s3 -/* AD48F0 8005D750 51C00006 */ beql $t6, $zero, .L8005D76C -/* AD48F4 8005D754 846F0E86 */ lh $t7, 0xe86($v1) -/* AD48F8 8005D758 0C010B0F */ jal func_80042C3C -/* AD48FC 8005D75C 266507C0 */ addiu $a1, $s3, 0x7c0 -/* AD4900 8005D760 3C038016 */ lui $v1, %hi(gGameInfo) # $v1, 0x8016 -/* AD4904 8005D764 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* AD4908 8005D768 846F0E86 */ lh $t7, 0xe86($v1) -.L8005D76C: -/* AD490C 8005D76C 02602025 */ move $a0, $s3 -/* AD4910 8005D770 51E00004 */ beql $t7, $zero, .L8005D784 -/* AD4914 8005D774 8FBF0024 */ lw $ra, 0x24($sp) -/* AD4918 8005D778 0C010BF1 */ jal func_80042FC4 -/* AD491C 8005D77C 266507C0 */ addiu $a1, $s3, 0x7c0 -/* AD4920 8005D780 8FBF0024 */ lw $ra, 0x24($sp) -.L8005D784: -/* AD4924 8005D784 8FB00014 */ lw $s0, 0x14($sp) -/* AD4928 8005D788 8FB10018 */ lw $s1, 0x18($sp) -/* AD492C 8005D78C 8FB2001C */ lw $s2, 0x1c($sp) -/* AD4930 8005D790 8FB30020 */ lw $s3, 0x20($sp) -/* AD4934 8005D794 03E00008 */ jr $ra -/* AD4938 8005D798 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_collision_check/func_8005D79C.s b/asm/non_matchings/code/z_collision_check/func_8005D79C.s deleted file mode 100644 index 1c2eabb237..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005D79C.s +++ /dev/null @@ -1,200 +0,0 @@ -.rdata -glabel D_8013A840 - .asciz "pcl_obj->data_type <= CL_DATA_LBL_SWRD" - .balign 4 - -glabel D_8013A868 - .asciz "../z_collision_check.c" - .balign 4 - -glabel D_8013A880 - .asciz "CollisionCheck_setAT():インデックスがオーバーして追加不能\n" - # EUC-JP: インデックスがオーバーして追加不能 | Index cannot be added due to over index - .balign 4 - -glabel D_8013A8BC - .asciz "pcl_obj->data_type <= CL_DATA_LBL_SWRD" - .balign 4 - -glabel D_8013A8E4 - .asciz "../z_collision_check.c" - .balign 4 - -glabel D_8013A8FC - .asciz "CollisionCheck_setAT_SAC():全データ数より大きいところに登録しようとしている。\n" - # EUC-JP: 全データ数より大きいところに登録しようとしている。 | You are trying to register a location that is larger than the total number of data. - .balign 4 - -glabel D_8013A94C - .asciz "CollisionCheck_setAT():インデックスがオーバーして追加不能\n" - # EUC-JP: インデックスがオーバーして追加不能 | Index cannot be added due to over index - .balign 4 - -.text -glabel Actor_CollisionCheck_SetAT -/* AD493C 8005D79C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD4940 8005D7A0 AFBF001C */ sw $ra, 0x1c($sp) -/* AD4944 8005D7A4 AFB00018 */ sw $s0, 0x18($sp) -/* AD4948 8005D7A8 00C08025 */ move $s0, $a2 -/* AD494C 8005D7AC AFA40020 */ sw $a0, 0x20($sp) -/* AD4950 8005D7B0 0C03034A */ jal func_800C0D28 -/* AD4954 8005D7B4 AFA50024 */ sw $a1, 0x24($sp) -/* AD4958 8005D7B8 24010001 */ li $at, 1 -/* AD495C 8005D7BC 14410003 */ bne $v0, $at, .L8005D7CC -/* AD4960 8005D7C0 8FA70024 */ lw $a3, 0x24($sp) -/* AD4964 8005D7C4 10000034 */ b .L8005D898 -/* AD4968 8005D7C8 2402FFFF */ li $v0, -1 -.L8005D7CC: -/* AD496C 8005D7CC 92020015 */ lbu $v0, 0x15($s0) -/* AD4970 8005D7D0 3C048014 */ lui $a0, %hi(D_8013A840) # $a0, 0x8014 -/* AD4974 8005D7D4 2484A840 */ addiu $a0, %lo(D_8013A840) # addiu $a0, $a0, -0x57c0 -/* AD4978 8005D7D8 28410004 */ slti $at, $v0, 4 -/* AD497C 8005D7DC 14200007 */ bnez $at, .L8005D7FC -/* AD4980 8005D7E0 3C058014 */ lui $a1, %hi(D_8013A868) # $a1, 0x8014 -/* AD4984 8005D7E4 24A5A868 */ addiu $a1, %lo(D_8013A868) # addiu $a1, $a1, -0x5798 -/* AD4988 8005D7E8 24060BB5 */ li $a2, 2997 -/* AD498C 8005D7EC 0C0007FC */ jal __assert -/* AD4990 8005D7F0 AFA70024 */ sw $a3, 0x24($sp) -/* AD4994 8005D7F4 8FA70024 */ lw $a3, 0x24($sp) -/* AD4998 8005D7F8 92020015 */ lbu $v0, 0x15($s0) -.L8005D7FC: -/* AD499C 8005D7FC 00027080 */ sll $t6, $v0, 2 -/* AD49A0 8005D800 3C198012 */ lui $t9, %hi(D_8011DEF8) -/* AD49A4 8005D804 032EC821 */ addu $t9, $t9, $t6 -/* AD49A8 8005D808 8F39DEF8 */ lw $t9, %lo(D_8011DEF8)($t9) -/* AD49AC 8005D80C 8FA40020 */ lw $a0, 0x20($sp) -/* AD49B0 8005D810 02002825 */ move $a1, $s0 -/* AD49B4 8005D814 0320F809 */ jalr $t9 -/* AD49B8 8005D818 AFA70024 */ sw $a3, 0x24($sp) -/* AD49BC 8005D81C 8E030000 */ lw $v1, ($s0) -/* AD49C0 8005D820 8FA70024 */ lw $a3, 0x24($sp) -/* AD49C4 8005D824 50600007 */ beql $v1, $zero, .L8005D844 -/* AD49C8 8005D828 84E30000 */ lh $v1, ($a3) -/* AD49CC 8005D82C 8C6F0130 */ lw $t7, 0x130($v1) -/* AD49D0 8005D830 55E00004 */ bnezl $t7, .L8005D844 -/* AD49D4 8005D834 84E30000 */ lh $v1, ($a3) -/* AD49D8 8005D838 10000017 */ b .L8005D898 -/* AD49DC 8005D83C 2402FFFF */ li $v0, -1 -/* AD49E0 8005D840 84E30000 */ lh $v1, ($a3) -.L8005D844: -/* AD49E4 8005D844 3C048014 */ lui $a0, %hi(D_8013A880) # $a0, 0x8014 -/* AD49E8 8005D848 28610032 */ slti $at, $v1, 0x32 -/* AD49EC 8005D84C 54200006 */ bnezl $at, .L8005D868 -/* AD49F0 8005D850 94F80002 */ lhu $t8, 2($a3) -/* AD49F4 8005D854 0C00084C */ jal osSyncPrintf -/* AD49F8 8005D858 2484A880 */ addiu $a0, %lo(D_8013A880) # addiu $a0, $a0, -0x5780 -/* AD49FC 8005D85C 1000000E */ b .L8005D898 -/* AD4A00 8005D860 2402FFFF */ li $v0, -1 -/* AD4A04 8005D864 94F80002 */ lhu $t8, 2($a3) -.L8005D868: -/* AD4A08 8005D868 00034880 */ sll $t1, $v1, 2 -/* AD4A0C 8005D86C 00E95021 */ addu $t2, $a3, $t1 -/* AD4A10 8005D870 33080001 */ andi $t0, $t8, 1 -/* AD4A14 8005D874 51000004 */ beql $t0, $zero, .L8005D888 -/* AD4A18 8005D878 AD500004 */ sw $s0, 4($t2) -/* AD4A1C 8005D87C 10000006 */ b .L8005D898 -/* AD4A20 8005D880 2402FFFF */ li $v0, -1 -/* AD4A24 8005D884 AD500004 */ sw $s0, 4($t2) -.L8005D888: -/* AD4A28 8005D888 84EB0000 */ lh $t3, ($a3) -/* AD4A2C 8005D88C 00601025 */ move $v0, $v1 -/* AD4A30 8005D890 256C0001 */ addiu $t4, $t3, 1 -/* AD4A34 8005D894 A4EC0000 */ sh $t4, ($a3) -.L8005D898: -/* AD4A38 8005D898 8FBF001C */ lw $ra, 0x1c($sp) -/* AD4A3C 8005D89C 8FB00018 */ lw $s0, 0x18($sp) -/* AD4A40 8005D8A0 27BD0020 */ addiu $sp, $sp, 0x20 -/* AD4A44 8005D8A4 03E00008 */ jr $ra -/* AD4A48 8005D8A8 00000000 */ nop - -/* AD4A4C 8005D8AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD4A50 8005D8B0 AFBF001C */ sw $ra, 0x1c($sp) -/* AD4A54 8005D8B4 AFB10018 */ sw $s1, 0x18($sp) -/* AD4A58 8005D8B8 AFB00014 */ sw $s0, 0x14($sp) -/* AD4A5C 8005D8BC AFA40020 */ sw $a0, 0x20($sp) -/* AD4A60 8005D8C0 90CE0015 */ lbu $t6, 0x15($a2) -/* AD4A64 8005D8C4 00A08025 */ move $s0, $a1 -/* AD4A68 8005D8C8 00C08825 */ move $s1, $a2 -/* AD4A6C 8005D8CC 29C10004 */ slti $at, $t6, 4 -/* AD4A70 8005D8D0 14200008 */ bnez $at, .L8005D8F4 -/* AD4A74 8005D8D4 3C048014 */ lui $a0, %hi(D_8013A8BC) # $a0, 0x8014 -/* AD4A78 8005D8D8 3C058014 */ lui $a1, %hi(D_8013A8E4) # $a1, 0x8014 -/* AD4A7C 8005D8DC 24A5A8E4 */ addiu $a1, %lo(D_8013A8E4) # addiu $a1, $a1, -0x571c -/* AD4A80 8005D8E0 2484A8BC */ addiu $a0, %lo(D_8013A8BC) # addiu $a0, $a0, -0x5744 -/* AD4A84 8005D8E4 24060BDD */ li $a2, 3037 -/* AD4A88 8005D8E8 0C0007FC */ jal __assert -/* AD4A8C 8005D8EC AFA7002C */ sw $a3, 0x2c($sp) -/* AD4A90 8005D8F0 8FA7002C */ lw $a3, 0x2c($sp) -.L8005D8F4: -/* AD4A94 8005D8F4 8FA40020 */ lw $a0, 0x20($sp) -/* AD4A98 8005D8F8 0C03034A */ jal func_800C0D28 -/* AD4A9C 8005D8FC AFA7002C */ sw $a3, 0x2c($sp) -/* AD4AA0 8005D900 24010001 */ li $at, 1 -/* AD4AA4 8005D904 14410003 */ bne $v0, $at, .L8005D914 -/* AD4AA8 8005D908 8FA7002C */ lw $a3, 0x2c($sp) -/* AD4AAC 8005D90C 10000034 */ b .L8005D9E0 -/* AD4AB0 8005D910 2402FFFF */ li $v0, -1 -.L8005D914: -/* AD4AB4 8005D914 AFA7002C */ sw $a3, 0x2c($sp) -/* AD4AB8 8005D918 922F0015 */ lbu $t7, 0x15($s1) -/* AD4ABC 8005D91C 3C198012 */ lui $t9, %hi(D_8011DEF8) -/* AD4AC0 8005D920 8FA40020 */ lw $a0, 0x20($sp) -/* AD4AC4 8005D924 000FC080 */ sll $t8, $t7, 2 -/* AD4AC8 8005D928 0338C821 */ addu $t9, $t9, $t8 -/* AD4ACC 8005D92C 8F39DEF8 */ lw $t9, %lo(D_8011DEF8)($t9) -/* AD4AD0 8005D930 02202825 */ move $a1, $s1 -/* AD4AD4 8005D934 0320F809 */ jalr $t9 -/* AD4AD8 8005D938 00000000 */ nop -/* AD4ADC 8005D93C 8E230000 */ lw $v1, ($s1) -/* AD4AE0 8005D940 8FA7002C */ lw $a3, 0x2c($sp) -/* AD4AE4 8005D944 50600007 */ beql $v1, $zero, .L8005D964 -/* AD4AE8 8005D948 96090002 */ lhu $t1, 2($s0) -/* AD4AEC 8005D94C 8C680130 */ lw $t0, 0x130($v1) -/* AD4AF0 8005D950 55000004 */ bnezl $t0, .L8005D964 -/* AD4AF4 8005D954 96090002 */ lhu $t1, 2($s0) -/* AD4AF8 8005D958 10000021 */ b .L8005D9E0 -/* AD4AFC 8005D95C 2402FFFF */ li $v0, -1 -/* AD4B00 8005D960 96090002 */ lhu $t1, 2($s0) -.L8005D964: -/* AD4B04 8005D964 312A0001 */ andi $t2, $t1, 1 -/* AD4B08 8005D968 5140000E */ beql $t2, $zero, .L8005D9A4 -/* AD4B0C 8005D96C 86020000 */ lh $v0, ($s0) -/* AD4B10 8005D970 860B0000 */ lh $t3, ($s0) -/* AD4B14 8005D974 00076080 */ sll $t4, $a3, 2 -/* AD4B18 8005D978 3C048014 */ lui $a0, %hi(D_8013A8FC) # $a0, 0x8014 -/* AD4B1C 8005D97C 00EB082A */ slt $at, $a3, $t3 -/* AD4B20 8005D980 14200005 */ bnez $at, .L8005D998 -/* AD4B24 8005D984 020C6821 */ addu $t5, $s0, $t4 -/* AD4B28 8005D988 0C00084C */ jal osSyncPrintf -/* AD4B2C 8005D98C 2484A8FC */ addiu $a0, %lo(D_8013A8FC) # addiu $a0, $a0, -0x5704 -/* AD4B30 8005D990 10000013 */ b .L8005D9E0 -/* AD4B34 8005D994 2402FFFF */ li $v0, -1 -.L8005D998: -/* AD4B38 8005D998 10000010 */ b .L8005D9DC -/* AD4B3C 8005D99C ADB10004 */ sw $s1, 4($t5) -/* AD4B40 8005D9A0 86020000 */ lh $v0, ($s0) -.L8005D9A4: -/* AD4B44 8005D9A4 3C048014 */ lui $a0, %hi(D_8013A94C) # $a0, 0x8014 -/* AD4B48 8005D9A8 28410032 */ slti $at, $v0, 0x32 -/* AD4B4C 8005D9AC 14200005 */ bnez $at, .L8005D9C4 -/* AD4B50 8005D9B0 00027080 */ sll $t6, $v0, 2 -/* AD4B54 8005D9B4 0C00084C */ jal osSyncPrintf -/* AD4B58 8005D9B8 2484A94C */ addiu $a0, %lo(D_8013A94C) # addiu $a0, $a0, -0x56b4 -/* AD4B5C 8005D9BC 10000008 */ b .L8005D9E0 -/* AD4B60 8005D9C0 2402FFFF */ li $v0, -1 -.L8005D9C4: -/* AD4B64 8005D9C4 020E7821 */ addu $t7, $s0, $t6 -/* AD4B68 8005D9C8 ADF10004 */ sw $s1, 4($t7) -/* AD4B6C 8005D9CC 86180000 */ lh $t8, ($s0) -/* AD4B70 8005D9D0 00403825 */ move $a3, $v0 -/* AD4B74 8005D9D4 27190001 */ addiu $t9, $t8, 1 -/* AD4B78 8005D9D8 A6190000 */ sh $t9, ($s0) -.L8005D9DC: -/* AD4B7C 8005D9DC 00E01025 */ move $v0, $a3 -.L8005D9E0: -/* AD4B80 8005D9E0 8FBF001C */ lw $ra, 0x1c($sp) -/* AD4B84 8005D9E4 8FB00014 */ lw $s0, 0x14($sp) -/* AD4B88 8005D9E8 8FB10018 */ lw $s1, 0x18($sp) -/* AD4B8C 8005D9EC 03E00008 */ jr $ra -/* AD4B90 8005D9F0 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/code/z_collision_check/func_8005D9F4.s b/asm/non_matchings/code/z_collision_check/func_8005D9F4.s deleted file mode 100644 index 67ee9bd94a..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005D9F4.s +++ /dev/null @@ -1,200 +0,0 @@ -.rdata -glabel D_8013A988 - .asciz "pcl_obj->data_type <= CL_DATA_LBL_SWRD" - .balign 4 - -glabel D_8013A9B0 - .asciz "../z_collision_check.c" - .balign 4 - -glabel D_8013A9C8 - .asciz "CollisionCheck_setAC():インデックスがオーバして追加不能\n" - # EUC-JP: インデックスがオーバして追加不能 | Index exceeded and cannot be added - .balign 4 - -glabel D_8013AA04 - .asciz "pcl_obj->data_type <= CL_DATA_LBL_SWRD" - .balign 4 - -glabel D_8013AA2C - .asciz "../z_collision_check.c" - .balign 4 - -glabel D_8013AA44 - .asciz "CollisionCheck_setAC_SAC():全データ数より大きいところに登録しようとしている。\n" - # EUC-JP: 全データ数より大きいところに登録しようとしている。| You are trying to register a location that is larger than the total number of data. - .balign 4 - -glabel D_8013AA94 - .asciz "CollisionCheck_setAC():インデックスがオーバして追加不能\n" - # EUC-JP: インデックスがオーバして追加不能 | Index exceeded and cannot be added - .balign 4 - -.text -glabel Actor_CollisionCheck_SetAC -/* AD4B94 8005D9F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD4B98 8005D9F8 AFBF001C */ sw $ra, 0x1c($sp) -/* AD4B9C 8005D9FC AFB00018 */ sw $s0, 0x18($sp) -/* AD4BA0 8005DA00 00C08025 */ move $s0, $a2 -/* AD4BA4 8005DA04 AFA40020 */ sw $a0, 0x20($sp) -/* AD4BA8 8005DA08 0C03034A */ jal func_800C0D28 -/* AD4BAC 8005DA0C AFA50024 */ sw $a1, 0x24($sp) -/* AD4BB0 8005DA10 24010001 */ li $at, 1 -/* AD4BB4 8005DA14 14410003 */ bne $v0, $at, .L8005DA24 -/* AD4BB8 8005DA18 8FA70024 */ lw $a3, 0x24($sp) -/* AD4BBC 8005DA1C 10000034 */ b .L8005DAF0 -/* AD4BC0 8005DA20 2402FFFF */ li $v0, -1 -.L8005DA24: -/* AD4BC4 8005DA24 92020015 */ lbu $v0, 0x15($s0) -/* AD4BC8 8005DA28 3C048014 */ lui $a0, %hi(D_8013A988) # $a0, 0x8014 -/* AD4BCC 8005DA2C 2484A988 */ addiu $a0, %lo(D_8013A988) # addiu $a0, $a0, -0x5678 -/* AD4BD0 8005DA30 28410004 */ slti $at, $v0, 4 -/* AD4BD4 8005DA34 14200007 */ bnez $at, .L8005DA54 -/* AD4BD8 8005DA38 3C058014 */ lui $a1, %hi(D_8013A9B0) # $a1, 0x8014 -/* AD4BDC 8005DA3C 24A5A9B0 */ addiu $a1, %lo(D_8013A9B0) # addiu $a1, $a1, -0x5650 -/* AD4BE0 8005DA40 24060C2A */ li $a2, 3114 -/* AD4BE4 8005DA44 0C0007FC */ jal __assert -/* AD4BE8 8005DA48 AFA70024 */ sw $a3, 0x24($sp) -/* AD4BEC 8005DA4C 8FA70024 */ lw $a3, 0x24($sp) -/* AD4BF0 8005DA50 92020015 */ lbu $v0, 0x15($s0) -.L8005DA54: -/* AD4BF4 8005DA54 00027080 */ sll $t6, $v0, 2 -/* AD4BF8 8005DA58 3C198012 */ lui $t9, %hi(D_8011DF08) -/* AD4BFC 8005DA5C 032EC821 */ addu $t9, $t9, $t6 -/* AD4C00 8005DA60 8F39DF08 */ lw $t9, %lo(D_8011DF08)($t9) -/* AD4C04 8005DA64 8FA40020 */ lw $a0, 0x20($sp) -/* AD4C08 8005DA68 02002825 */ move $a1, $s0 -/* AD4C0C 8005DA6C 0320F809 */ jalr $t9 -/* AD4C10 8005DA70 AFA70024 */ sw $a3, 0x24($sp) -/* AD4C14 8005DA74 8E030000 */ lw $v1, ($s0) -/* AD4C18 8005DA78 8FA70024 */ lw $a3, 0x24($sp) -/* AD4C1C 8005DA7C 50600007 */ beql $v1, $zero, .L8005DA9C -/* AD4C20 8005DA80 8CE300CC */ lw $v1, 0xcc($a3) -/* AD4C24 8005DA84 8C6F0130 */ lw $t7, 0x130($v1) -/* AD4C28 8005DA88 55E00004 */ bnezl $t7, .L8005DA9C -/* AD4C2C 8005DA8C 8CE300CC */ lw $v1, 0xcc($a3) -/* AD4C30 8005DA90 10000017 */ b .L8005DAF0 -/* AD4C34 8005DA94 2402FFFF */ li $v0, -1 -/* AD4C38 8005DA98 8CE300CC */ lw $v1, 0xcc($a3) -.L8005DA9C: -/* AD4C3C 8005DA9C 3C048014 */ lui $a0, %hi(D_8013A9C8) # $a0, 0x8014 -/* AD4C40 8005DAA0 2861003C */ slti $at, $v1, 0x3c -/* AD4C44 8005DAA4 54200006 */ bnezl $at, .L8005DAC0 -/* AD4C48 8005DAA8 94F80002 */ lhu $t8, 2($a3) -/* AD4C4C 8005DAAC 0C00084C */ jal osSyncPrintf -/* AD4C50 8005DAB0 2484A9C8 */ addiu $a0, %lo(D_8013A9C8) # addiu $a0, $a0, -0x5638 -/* AD4C54 8005DAB4 1000000E */ b .L8005DAF0 -/* AD4C58 8005DAB8 2402FFFF */ li $v0, -1 -/* AD4C5C 8005DABC 94F80002 */ lhu $t8, 2($a3) -.L8005DAC0: -/* AD4C60 8005DAC0 00034880 */ sll $t1, $v1, 2 -/* AD4C64 8005DAC4 00E95021 */ addu $t2, $a3, $t1 -/* AD4C68 8005DAC8 33080001 */ andi $t0, $t8, 1 -/* AD4C6C 8005DACC 51000004 */ beql $t0, $zero, .L8005DAE0 -/* AD4C70 8005DAD0 AD5000D0 */ sw $s0, 0xd0($t2) -/* AD4C74 8005DAD4 10000006 */ b .L8005DAF0 -/* AD4C78 8005DAD8 2402FFFF */ li $v0, -1 -/* AD4C7C 8005DADC AD5000D0 */ sw $s0, 0xd0($t2) -.L8005DAE0: -/* AD4C80 8005DAE0 8CEB00CC */ lw $t3, 0xcc($a3) -/* AD4C84 8005DAE4 00601025 */ move $v0, $v1 -/* AD4C88 8005DAE8 256C0001 */ addiu $t4, $t3, 1 -/* AD4C8C 8005DAEC ACEC00CC */ sw $t4, 0xcc($a3) -.L8005DAF0: -/* AD4C90 8005DAF0 8FBF001C */ lw $ra, 0x1c($sp) -/* AD4C94 8005DAF4 8FB00018 */ lw $s0, 0x18($sp) -/* AD4C98 8005DAF8 27BD0020 */ addiu $sp, $sp, 0x20 -/* AD4C9C 8005DAFC 03E00008 */ jr $ra -/* AD4CA0 8005DB00 00000000 */ nop - -/* AD4CA4 8005DB04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD4CA8 8005DB08 AFBF001C */ sw $ra, 0x1c($sp) -/* AD4CAC 8005DB0C AFB10018 */ sw $s1, 0x18($sp) -/* AD4CB0 8005DB10 AFB00014 */ sw $s0, 0x14($sp) -/* AD4CB4 8005DB14 AFA40020 */ sw $a0, 0x20($sp) -/* AD4CB8 8005DB18 90CE0015 */ lbu $t6, 0x15($a2) -/* AD4CBC 8005DB1C 00A08025 */ move $s0, $a1 -/* AD4CC0 8005DB20 00C08825 */ move $s1, $a2 -/* AD4CC4 8005DB24 29C10004 */ slti $at, $t6, 4 -/* AD4CC8 8005DB28 14200008 */ bnez $at, .L8005DB4C -/* AD4CCC 8005DB2C 3C048014 */ lui $a0, %hi(D_8013AA04) # $a0, 0x8014 -/* AD4CD0 8005DB30 3C058014 */ lui $a1, %hi(D_8013AA2C) # $a1, 0x8014 -/* AD4CD4 8005DB34 24A5AA2C */ addiu $a1, %lo(D_8013AA2C) # addiu $a1, $a1, -0x55d4 -/* AD4CD8 8005DB38 2484AA04 */ addiu $a0, %lo(D_8013AA04) # addiu $a0, $a0, -0x55fc -/* AD4CDC 8005DB3C 24060C51 */ li $a2, 3153 -/* AD4CE0 8005DB40 0C0007FC */ jal __assert -/* AD4CE4 8005DB44 AFA7002C */ sw $a3, 0x2c($sp) -/* AD4CE8 8005DB48 8FA7002C */ lw $a3, 0x2c($sp) -.L8005DB4C: -/* AD4CEC 8005DB4C 8FA40020 */ lw $a0, 0x20($sp) -/* AD4CF0 8005DB50 0C03034A */ jal func_800C0D28 -/* AD4CF4 8005DB54 AFA7002C */ sw $a3, 0x2c($sp) -/* AD4CF8 8005DB58 24010001 */ li $at, 1 -/* AD4CFC 8005DB5C 14410003 */ bne $v0, $at, .L8005DB6C -/* AD4D00 8005DB60 8FA7002C */ lw $a3, 0x2c($sp) -/* AD4D04 8005DB64 10000034 */ b .L8005DC38 -/* AD4D08 8005DB68 2402FFFF */ li $v0, -1 -.L8005DB6C: -/* AD4D0C 8005DB6C AFA7002C */ sw $a3, 0x2c($sp) -/* AD4D10 8005DB70 922F0015 */ lbu $t7, 0x15($s1) -/* AD4D14 8005DB74 3C198012 */ lui $t9, %hi(D_8011DF08) -/* AD4D18 8005DB78 8FA40020 */ lw $a0, 0x20($sp) -/* AD4D1C 8005DB7C 000FC080 */ sll $t8, $t7, 2 -/* AD4D20 8005DB80 0338C821 */ addu $t9, $t9, $t8 -/* AD4D24 8005DB84 8F39DF08 */ lw $t9, %lo(D_8011DF08)($t9) -/* AD4D28 8005DB88 02202825 */ move $a1, $s1 -/* AD4D2C 8005DB8C 0320F809 */ jalr $t9 -/* AD4D30 8005DB90 00000000 */ nop -/* AD4D34 8005DB94 8E230000 */ lw $v1, ($s1) -/* AD4D38 8005DB98 8FA7002C */ lw $a3, 0x2c($sp) -/* AD4D3C 8005DB9C 50600007 */ beql $v1, $zero, .L8005DBBC -/* AD4D40 8005DBA0 96090002 */ lhu $t1, 2($s0) -/* AD4D44 8005DBA4 8C680130 */ lw $t0, 0x130($v1) -/* AD4D48 8005DBA8 55000004 */ bnezl $t0, .L8005DBBC -/* AD4D4C 8005DBAC 96090002 */ lhu $t1, 2($s0) -/* AD4D50 8005DBB0 10000021 */ b .L8005DC38 -/* AD4D54 8005DBB4 2402FFFF */ li $v0, -1 -/* AD4D58 8005DBB8 96090002 */ lhu $t1, 2($s0) -.L8005DBBC: -/* AD4D5C 8005DBBC 312A0001 */ andi $t2, $t1, 1 -/* AD4D60 8005DBC0 5140000E */ beql $t2, $zero, .L8005DBFC -/* AD4D64 8005DBC4 8E0200CC */ lw $v0, 0xcc($s0) -/* AD4D68 8005DBC8 8E0B00CC */ lw $t3, 0xcc($s0) -/* AD4D6C 8005DBCC 00076080 */ sll $t4, $a3, 2 -/* AD4D70 8005DBD0 3C048014 */ lui $a0, %hi(D_8013AA44) # $a0, 0x8014 -/* AD4D74 8005DBD4 00EB082A */ slt $at, $a3, $t3 -/* AD4D78 8005DBD8 14200005 */ bnez $at, .L8005DBF0 -/* AD4D7C 8005DBDC 020C6821 */ addu $t5, $s0, $t4 -/* AD4D80 8005DBE0 0C00084C */ jal osSyncPrintf -/* AD4D84 8005DBE4 2484AA44 */ addiu $a0, %lo(D_8013AA44) # addiu $a0, $a0, -0x55bc -/* AD4D88 8005DBE8 10000013 */ b .L8005DC38 -/* AD4D8C 8005DBEC 2402FFFF */ li $v0, -1 -.L8005DBF0: -/* AD4D90 8005DBF0 10000010 */ b .L8005DC34 -/* AD4D94 8005DBF4 ADB100D0 */ sw $s1, 0xd0($t5) -/* AD4D98 8005DBF8 8E0200CC */ lw $v0, 0xcc($s0) -.L8005DBFC: -/* AD4D9C 8005DBFC 3C048014 */ lui $a0, %hi(D_8013AA94) # $a0, 0x8014 -/* AD4DA0 8005DC00 2841003C */ slti $at, $v0, 0x3c -/* AD4DA4 8005DC04 14200005 */ bnez $at, .L8005DC1C -/* AD4DA8 8005DC08 00027080 */ sll $t6, $v0, 2 -/* AD4DAC 8005DC0C 0C00084C */ jal osSyncPrintf -/* AD4DB0 8005DC10 2484AA94 */ addiu $a0, %lo(D_8013AA94) # addiu $a0, $a0, -0x556c -/* AD4DB4 8005DC14 10000008 */ b .L8005DC38 -/* AD4DB8 8005DC18 2402FFFF */ li $v0, -1 -.L8005DC1C: -/* AD4DBC 8005DC1C 020E7821 */ addu $t7, $s0, $t6 -/* AD4DC0 8005DC20 ADF100D0 */ sw $s1, 0xd0($t7) -/* AD4DC4 8005DC24 8E1800CC */ lw $t8, 0xcc($s0) -/* AD4DC8 8005DC28 00403825 */ move $a3, $v0 -/* AD4DCC 8005DC2C 27190001 */ addiu $t9, $t8, 1 -/* AD4DD0 8005DC30 AE1900CC */ sw $t9, 0xcc($s0) -.L8005DC34: -/* AD4DD4 8005DC34 00E01025 */ move $v0, $a3 -.L8005DC38: -/* AD4DD8 8005DC38 8FBF001C */ lw $ra, 0x1c($sp) -/* AD4DDC 8005DC3C 8FB00014 */ lw $s0, 0x14($sp) -/* AD4DE0 8005DC40 8FB10018 */ lw $s1, 0x18($sp) -/* AD4DE4 8005DC44 03E00008 */ jr $ra -/* AD4DE8 8005DC48 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/code/z_collision_check/func_8005DC4C.s b/asm/non_matchings/code/z_collision_check/func_8005DC4C.s deleted file mode 100644 index b7d9b3663b..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005DC4C.s +++ /dev/null @@ -1,243 +0,0 @@ -.rdata -glabel D_8013AAD0 - .asciz "pcl_obj->data_type <= CL_DATA_LBL_SWRD" - .balign 4 - -glabel D_8013AAF8 - .asciz "../z_collision_check.c" - .balign 4 - -glabel D_8013AB10 - .asciz "CollisionCheck_setOC():インデックスがオーバして追加不能\n" - # EUC-JP: インデックスがオーバして追加不能 | Index exceeded and cannot be added - .balign 4 - -glabel D_8013AB4C - .asciz "pcl_obj->data_type <= CL_DATA_LBL_SWRD" - .balign 4 - -glabel D_8013AB74 - .asciz "../z_collision_check.c" - .balign 4 - -glabel D_8013AB8C - .asciz "CollisionCheck_setOC_SAC():全データ数より大きいところに登録しようとしている。\n" - # EUC-JP: 全データ数より大きいところに登録しようとしている。| You are trying to register a location that is larger than the total number of data. - .balign 4 - -glabel D_8013ABDC - .asciz "CollisionCheck_setOC():インデックスがオーバして追加不能\n" - # EUC-JP: インデックスがオーバして追加不能 | Index exceeded and cannot be added - .balign 4 - -glabel D_8013AC18 - .asciz "CollisionCheck_setOCLine():インデックスがオーバして追加不能\n" - # EUC-JP: インデックスがオーバして追加不能 | Index exceeded and cannot be added - .balign 4 - -.text -glabel Actor_CollisionCheck_SetOT -/* AD4DEC 8005DC4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD4DF0 8005DC50 AFBF001C */ sw $ra, 0x1c($sp) -/* AD4DF4 8005DC54 AFB00018 */ sw $s0, 0x18($sp) -/* AD4DF8 8005DC58 00C08025 */ move $s0, $a2 -/* AD4DFC 8005DC5C AFA40020 */ sw $a0, 0x20($sp) -/* AD4E00 8005DC60 0C03034A */ jal func_800C0D28 -/* AD4E04 8005DC64 AFA50024 */ sw $a1, 0x24($sp) -/* AD4E08 8005DC68 24010001 */ li $at, 1 -/* AD4E0C 8005DC6C 14410003 */ bne $v0, $at, .L8005DC7C -/* AD4E10 8005DC70 8FA70024 */ lw $a3, 0x24($sp) -/* AD4E14 8005DC74 10000034 */ b .L8005DD48 -/* AD4E18 8005DC78 2402FFFF */ li $v0, -1 -.L8005DC7C: -/* AD4E1C 8005DC7C 92020015 */ lbu $v0, 0x15($s0) -/* AD4E20 8005DC80 3C048014 */ lui $a0, %hi(D_8013AAD0) # $a0, 0x8014 -/* AD4E24 8005DC84 2484AAD0 */ addiu $a0, %lo(D_8013AAD0) # addiu $a0, $a0, -0x5530 -/* AD4E28 8005DC88 28410004 */ slti $at, $v0, 4 -/* AD4E2C 8005DC8C 14200007 */ bnez $at, .L8005DCAC -/* AD4E30 8005DC90 3C058014 */ lui $a1, %hi(D_8013AAF8) # $a1, 0x8014 -/* AD4E34 8005DC94 24A5AAF8 */ addiu $a1, %lo(D_8013AAF8) # addiu $a1, $a1, -0x5508 -/* AD4E38 8005DC98 24060C9D */ li $a2, 3229 -/* AD4E3C 8005DC9C 0C0007FC */ jal __assert -/* AD4E40 8005DCA0 AFA70024 */ sw $a3, 0x24($sp) -/* AD4E44 8005DCA4 8FA70024 */ lw $a3, 0x24($sp) -/* AD4E48 8005DCA8 92020015 */ lbu $v0, 0x15($s0) -.L8005DCAC: -/* AD4E4C 8005DCAC 00027080 */ sll $t6, $v0, 2 -/* AD4E50 8005DCB0 3C198012 */ lui $t9, %hi(D_8011DF18) -/* AD4E54 8005DCB4 032EC821 */ addu $t9, $t9, $t6 -/* AD4E58 8005DCB8 8F39DF18 */ lw $t9, %lo(D_8011DF18)($t9) -/* AD4E5C 8005DCBC 8FA40020 */ lw $a0, 0x20($sp) -/* AD4E60 8005DCC0 02002825 */ move $a1, $s0 -/* AD4E64 8005DCC4 0320F809 */ jalr $t9 -/* AD4E68 8005DCC8 AFA70024 */ sw $a3, 0x24($sp) -/* AD4E6C 8005DCCC 8E030000 */ lw $v1, ($s0) -/* AD4E70 8005DCD0 8FA70024 */ lw $a3, 0x24($sp) -/* AD4E74 8005DCD4 50600007 */ beql $v1, $zero, .L8005DCF4 -/* AD4E78 8005DCD8 8CE301C0 */ lw $v1, 0x1c0($a3) -/* AD4E7C 8005DCDC 8C6F0130 */ lw $t7, 0x130($v1) -/* AD4E80 8005DCE0 55E00004 */ bnezl $t7, .L8005DCF4 -/* AD4E84 8005DCE4 8CE301C0 */ lw $v1, 0x1c0($a3) -/* AD4E88 8005DCE8 10000017 */ b .L8005DD48 -/* AD4E8C 8005DCEC 2402FFFF */ li $v0, -1 -/* AD4E90 8005DCF0 8CE301C0 */ lw $v1, 0x1c0($a3) -.L8005DCF4: -/* AD4E94 8005DCF4 3C048014 */ lui $a0, %hi(D_8013AB10) # $a0, 0x8014 -/* AD4E98 8005DCF8 28610032 */ slti $at, $v1, 0x32 -/* AD4E9C 8005DCFC 54200006 */ bnezl $at, .L8005DD18 -/* AD4EA0 8005DD00 94F80002 */ lhu $t8, 2($a3) -/* AD4EA4 8005DD04 0C00084C */ jal osSyncPrintf -/* AD4EA8 8005DD08 2484AB10 */ addiu $a0, %lo(D_8013AB10) # addiu $a0, $a0, -0x54f0 -/* AD4EAC 8005DD0C 1000000E */ b .L8005DD48 -/* AD4EB0 8005DD10 2402FFFF */ li $v0, -1 -/* AD4EB4 8005DD14 94F80002 */ lhu $t8, 2($a3) -.L8005DD18: -/* AD4EB8 8005DD18 00034880 */ sll $t1, $v1, 2 -/* AD4EBC 8005DD1C 00E95021 */ addu $t2, $a3, $t1 -/* AD4EC0 8005DD20 33080001 */ andi $t0, $t8, 1 -/* AD4EC4 8005DD24 51000004 */ beql $t0, $zero, .L8005DD38 -/* AD4EC8 8005DD28 AD5001C4 */ sw $s0, 0x1c4($t2) -/* AD4ECC 8005DD2C 10000006 */ b .L8005DD48 -/* AD4ED0 8005DD30 2402FFFF */ li $v0, -1 -/* AD4ED4 8005DD34 AD5001C4 */ sw $s0, 0x1c4($t2) -.L8005DD38: -/* AD4ED8 8005DD38 8CEB01C0 */ lw $t3, 0x1c0($a3) -/* AD4EDC 8005DD3C 00601025 */ move $v0, $v1 -/* AD4EE0 8005DD40 256C0001 */ addiu $t4, $t3, 1 -/* AD4EE4 8005DD44 ACEC01C0 */ sw $t4, 0x1c0($a3) -.L8005DD48: -/* AD4EE8 8005DD48 8FBF001C */ lw $ra, 0x1c($sp) -/* AD4EEC 8005DD4C 8FB00018 */ lw $s0, 0x18($sp) -/* AD4EF0 8005DD50 27BD0020 */ addiu $sp, $sp, 0x20 -/* AD4EF4 8005DD54 03E00008 */ jr $ra -/* AD4EF8 8005DD58 00000000 */ nop - -/* AD4EFC 8005DD5C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD4F00 8005DD60 AFBF001C */ sw $ra, 0x1c($sp) -/* AD4F04 8005DD64 AFB10018 */ sw $s1, 0x18($sp) -/* AD4F08 8005DD68 AFB00014 */ sw $s0, 0x14($sp) -/* AD4F0C 8005DD6C 00A08025 */ move $s0, $a1 -/* AD4F10 8005DD70 00C08825 */ move $s1, $a2 -/* AD4F14 8005DD74 AFA40020 */ sw $a0, 0x20($sp) -/* AD4F18 8005DD78 0C03034A */ jal func_800C0D28 -/* AD4F1C 8005DD7C AFA7002C */ sw $a3, 0x2c($sp) -/* AD4F20 8005DD80 24010001 */ li $at, 1 -/* AD4F24 8005DD84 14410003 */ bne $v0, $at, .L8005DD94 -/* AD4F28 8005DD88 8FA7002C */ lw $a3, 0x2c($sp) -/* AD4F2C 8005DD8C 1000003E */ b .L8005DE88 -/* AD4F30 8005DD90 2402FFFF */ li $v0, -1 -.L8005DD94: -/* AD4F34 8005DD94 92220015 */ lbu $v0, 0x15($s1) -/* AD4F38 8005DD98 3C048014 */ lui $a0, %hi(D_8013AB4C) # $a0, 0x8014 -/* AD4F3C 8005DD9C 2484AB4C */ addiu $a0, %lo(D_8013AB4C) # addiu $a0, $a0, -0x54b4 -/* AD4F40 8005DDA0 28410004 */ slti $at, $v0, 4 -/* AD4F44 8005DDA4 14200007 */ bnez $at, .L8005DDC4 -/* AD4F48 8005DDA8 3C058014 */ lui $a1, %hi(D_8013AB74) # $a1, 0x8014 -/* AD4F4C 8005DDAC 24A5AB74 */ addiu $a1, %lo(D_8013AB74) # addiu $a1, $a1, -0x548c -/* AD4F50 8005DDB0 24060CCA */ li $a2, 3274 -/* AD4F54 8005DDB4 0C0007FC */ jal __assert -/* AD4F58 8005DDB8 AFA7002C */ sw $a3, 0x2c($sp) -/* AD4F5C 8005DDBC 8FA7002C */ lw $a3, 0x2c($sp) -/* AD4F60 8005DDC0 92220015 */ lbu $v0, 0x15($s1) -.L8005DDC4: -/* AD4F64 8005DDC4 00027080 */ sll $t6, $v0, 2 -/* AD4F68 8005DDC8 3C198012 */ lui $t9, %hi(D_8011DF18) -/* AD4F6C 8005DDCC 032EC821 */ addu $t9, $t9, $t6 -/* AD4F70 8005DDD0 8F39DF18 */ lw $t9, %lo(D_8011DF18)($t9) -/* AD4F74 8005DDD4 8FA40020 */ lw $a0, 0x20($sp) -/* AD4F78 8005DDD8 02202825 */ move $a1, $s1 -/* AD4F7C 8005DDDC 0320F809 */ jalr $t9 -/* AD4F80 8005DDE0 AFA7002C */ sw $a3, 0x2c($sp) -/* AD4F84 8005DDE4 8E230000 */ lw $v1, ($s1) -/* AD4F88 8005DDE8 8FA7002C */ lw $a3, 0x2c($sp) -/* AD4F8C 8005DDEC 50600007 */ beql $v1, $zero, .L8005DE0C -/* AD4F90 8005DDF0 96180002 */ lhu $t8, 2($s0) -/* AD4F94 8005DDF4 8C6F0130 */ lw $t7, 0x130($v1) -/* AD4F98 8005DDF8 55E00004 */ bnezl $t7, .L8005DE0C -/* AD4F9C 8005DDFC 96180002 */ lhu $t8, 2($s0) -/* AD4FA0 8005DE00 10000021 */ b .L8005DE88 -/* AD4FA4 8005DE04 2402FFFF */ li $v0, -1 -/* AD4FA8 8005DE08 96180002 */ lhu $t8, 2($s0) -.L8005DE0C: -/* AD4FAC 8005DE0C 33080001 */ andi $t0, $t8, 1 -/* AD4FB0 8005DE10 5100000E */ beql $t0, $zero, .L8005DE4C -/* AD4FB4 8005DE14 8E0201C0 */ lw $v0, 0x1c0($s0) -/* AD4FB8 8005DE18 8E0901C0 */ lw $t1, 0x1c0($s0) -/* AD4FBC 8005DE1C 00075080 */ sll $t2, $a3, 2 -/* AD4FC0 8005DE20 3C048014 */ lui $a0, %hi(D_8013AB8C) # $a0, 0x8014 -/* AD4FC4 8005DE24 00E9082A */ slt $at, $a3, $t1 -/* AD4FC8 8005DE28 14200005 */ bnez $at, .L8005DE40 -/* AD4FCC 8005DE2C 020A5821 */ addu $t3, $s0, $t2 -/* AD4FD0 8005DE30 0C00084C */ jal osSyncPrintf -/* AD4FD4 8005DE34 2484AB8C */ addiu $a0, %lo(D_8013AB8C) # addiu $a0, $a0, -0x5474 -/* AD4FD8 8005DE38 10000013 */ b .L8005DE88 -/* AD4FDC 8005DE3C 2402FFFF */ li $v0, -1 -.L8005DE40: -/* AD4FE0 8005DE40 10000010 */ b .L8005DE84 -/* AD4FE4 8005DE44 AD710004 */ sw $s1, 4($t3) -/* AD4FE8 8005DE48 8E0201C0 */ lw $v0, 0x1c0($s0) -.L8005DE4C: -/* AD4FEC 8005DE4C 3C048014 */ lui $a0, %hi(D_8013ABDC) # $a0, 0x8014 -/* AD4FF0 8005DE50 28410032 */ slti $at, $v0, 0x32 -/* AD4FF4 8005DE54 14200005 */ bnez $at, .L8005DE6C -/* AD4FF8 8005DE58 00026080 */ sll $t4, $v0, 2 -/* AD4FFC 8005DE5C 0C00084C */ jal osSyncPrintf -/* AD5000 8005DE60 2484ABDC */ addiu $a0, %lo(D_8013ABDC) # addiu $a0, $a0, -0x5424 -/* AD5004 8005DE64 10000008 */ b .L8005DE88 -/* AD5008 8005DE68 2402FFFF */ li $v0, -1 -.L8005DE6C: -/* AD500C 8005DE6C 020C6821 */ addu $t5, $s0, $t4 -/* AD5010 8005DE70 ADB101C4 */ sw $s1, 0x1c4($t5) -/* AD5014 8005DE74 8E0E01C0 */ lw $t6, 0x1c0($s0) -/* AD5018 8005DE78 00403825 */ move $a3, $v0 -/* AD501C 8005DE7C 25D90001 */ addiu $t9, $t6, 1 -/* AD5020 8005DE80 AE1901C0 */ sw $t9, 0x1c0($s0) -.L8005DE84: -/* AD5024 8005DE84 00E01025 */ move $v0, $a3 -.L8005DE88: -/* AD5028 8005DE88 8FBF001C */ lw $ra, 0x1c($sp) -/* AD502C 8005DE8C 8FB00014 */ lw $s0, 0x14($sp) -/* AD5030 8005DE90 8FB10018 */ lw $s1, 0x18($sp) -/* AD5034 8005DE94 03E00008 */ jr $ra -/* AD5038 8005DE98 27BD0020 */ addiu $sp, $sp, 0x20 - -/* AD503C 8005DE9C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD5040 8005DEA0 AFBF0014 */ sw $ra, 0x14($sp) -/* AD5044 8005DEA4 AFA40018 */ sw $a0, 0x18($sp) -/* AD5048 8005DEA8 AFA60020 */ sw $a2, 0x20($sp) -/* AD504C 8005DEAC 0C03034A */ jal func_800C0D28 -/* AD5050 8005DEB0 AFA5001C */ sw $a1, 0x1c($sp) -/* AD5054 8005DEB4 24010001 */ li $at, 1 -/* AD5058 8005DEB8 14410003 */ bne $v0, $at, .L8005DEC8 -/* AD505C 8005DEBC 8FA7001C */ lw $a3, 0x1c($sp) -/* AD5060 8005DEC0 10000016 */ b .L8005DF1C -/* AD5064 8005DEC4 2402FFFF */ li $v0, -1 -.L8005DEC8: -/* AD5068 8005DEC8 8FA40018 */ lw $a0, 0x18($sp) -/* AD506C 8005DECC 8FA50020 */ lw $a1, 0x20($sp) -/* AD5070 8005DED0 0C0174E9 */ jal func_8005D3A4 -/* AD5074 8005DED4 AFA7001C */ sw $a3, 0x1c($sp) -/* AD5078 8005DED8 8FA7001C */ lw $a3, 0x1c($sp) -/* AD507C 8005DEDC 3C048014 */ lui $a0, %hi(D_8013AC18) # $a0, 0x8014 -/* AD5080 8005DEE0 8FAE0020 */ lw $t6, 0x20($sp) -/* AD5084 8005DEE4 8CE3028C */ lw $v1, 0x28c($a3) -/* AD5088 8005DEE8 28610003 */ slti $at, $v1, 3 -/* AD508C 8005DEEC 14200005 */ bnez $at, .L8005DF04 -/* AD5090 8005DEF0 00037880 */ sll $t7, $v1, 2 -/* AD5094 8005DEF4 0C00084C */ jal osSyncPrintf -/* AD5098 8005DEF8 2484AC18 */ addiu $a0, %lo(D_8013AC18) # addiu $a0, $a0, -0x53e8 -/* AD509C 8005DEFC 10000007 */ b .L8005DF1C -/* AD50A0 8005DF00 2402FFFF */ li $v0, -1 -.L8005DF04: -/* AD50A4 8005DF04 00EFC021 */ addu $t8, $a3, $t7 -/* AD50A8 8005DF08 AF0E0290 */ sw $t6, 0x290($t8) -/* AD50AC 8005DF0C 8CF9028C */ lw $t9, 0x28c($a3) -/* AD50B0 8005DF10 00601025 */ move $v0, $v1 -/* AD50B4 8005DF14 27280001 */ addiu $t0, $t9, 1 -/* AD50B8 8005DF18 ACE8028C */ sw $t0, 0x28c($a3) -.L8005DF1C: -/* AD50BC 8005DF1C 8FBF0014 */ lw $ra, 0x14($sp) -/* AD50C0 8005DF20 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD50C4 8005DF24 03E00008 */ jr $ra -/* AD50C8 8005DF28 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005DF2C.s b/asm/non_matchings/code/z_collision_check/func_8005DF2C.s deleted file mode 100644 index e65e2978b0..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005DF2C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8005DF2C -/* AD50CC 8005DF2C 908E0015 */ lbu $t6, 0x15($a0) -/* AD50D0 8005DF30 00001025 */ move $v0, $zero -/* AD50D4 8005DF34 31CF0001 */ andi $t7, $t6, 1 -/* AD50D8 8005DF38 15E00003 */ bnez $t7, .L8005DF48 -/* AD50DC 8005DF3C 00000000 */ nop -/* AD50E0 8005DF40 03E00008 */ jr $ra -/* AD50E4 8005DF44 24020001 */ li $v0, 1 - -.L8005DF48: -/* AD50E8 8005DF48 03E00008 */ jr $ra -/* AD50EC 8005DF4C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005DF50.s b/asm/non_matchings/code/z_collision_check/func_8005DF50.s deleted file mode 100644 index 607fca01f3..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005DF50.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8005DF50 -/* AD50F0 8005DF50 908E0016 */ lbu $t6, 0x16($a0) -/* AD50F4 8005DF54 00001025 */ move $v0, $zero -/* AD50F8 8005DF58 31CF0001 */ andi $t7, $t6, 1 -/* AD50FC 8005DF5C 15E00003 */ bnez $t7, .L8005DF6C -/* AD5100 8005DF60 00000000 */ nop -/* AD5104 8005DF64 03E00008 */ jr $ra -/* AD5108 8005DF68 24020001 */ li $v0, 1 - -.L8005DF6C: -/* AD510C 8005DF6C 03E00008 */ jr $ra -/* AD5110 8005DF70 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005DF74.s b/asm/non_matchings/code/z_collision_check/func_8005DF74.s deleted file mode 100644 index 1babbe25f9..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005DF74.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8005DF74 -/* AD5114 8005DF74 8C8E0000 */ lw $t6, ($a0) -/* AD5118 8005DF78 8CAF0008 */ lw $t7, 8($a1) -/* AD511C 8005DF7C 00001025 */ move $v0, $zero -/* AD5120 8005DF80 01CFC024 */ and $t8, $t6, $t7 -/* AD5124 8005DF84 17000003 */ bnez $t8, .L8005DF94 -/* AD5128 8005DF88 00000000 */ nop -/* AD512C 8005DF8C 03E00008 */ jr $ra -/* AD5130 8005DF90 24020001 */ li $v0, 1 - -.L8005DF94: -/* AD5134 8005DF94 03E00008 */ jr $ra -/* AD5138 8005DF98 00000000 */ nop - -/* AD513C 8005DF9C AFA40000 */ sw $a0, ($sp) -/* AD5140 8005DFA0 AFA50004 */ sw $a1, 4($sp) -/* AD5144 8005DFA4 03E00008 */ jr $ra -/* AD5148 8005DFA8 AFA60008 */ sw $a2, 8($sp) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005DFAC.s b/asm/non_matchings/code/z_collision_check/func_8005DFAC.s index 7c5d7a030f..5b0a527e22 100644 --- a/asm/non_matchings/code/z_collision_check/func_8005DFAC.s +++ b/asm/non_matchings/code/z_collision_check/func_8005DFAC.s @@ -87,128 +87,3 @@ glabel func_8005DFAC /* AD52A0 8005E100 27BD0028 */ addiu $sp, $sp, 0x28 /* AD52A4 8005E104 03E00008 */ jr $ra /* AD52A8 8005E108 00000000 */ nop - -/* AD52AC 8005E10C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD52B0 8005E110 AFBF001C */ sw $ra, 0x1c($sp) -/* AD52B4 8005E114 AFA5002C */ sw $a1, 0x2c($sp) -/* AD52B8 8005E118 AFA60030 */ sw $a2, 0x30($sp) -/* AD52BC 8005E11C C4C40000 */ lwc1 $f4, ($a2) -/* AD52C0 8005E120 3C018016 */ lui $at, %hi(D_8015DD6C) # $at, 0x8016 -/* AD52C4 8005E124 24190005 */ li $t9, 5 -/* AD52C8 8005E128 4600218D */ trunc.w.s $f6, $f4 -/* AD52CC 8005E12C 3C028016 */ lui $v0, %hi(D_8015DD68) # $v0, 0x8016 -/* AD52D0 8005E130 2442DD68 */ addiu $v0, %lo(D_8015DD68) # addiu $v0, $v0, -0x2298 -/* AD52D4 8005E134 240300FF */ li $v1, 255 -/* AD52D8 8005E138 44183000 */ mfc1 $t8, $f6 -/* AD52DC 8005E13C 24080080 */ li $t0, 128 -/* AD52E0 8005E140 2409000A */ li $t1, 10 -/* AD52E4 8005E144 A438DD68 */ sh $t8, %lo(D_8015DD68)($at) -/* AD52E8 8005E148 C4C80004 */ lwc1 $f8, 4($a2) -/* AD52EC 8005E14C 24180005 */ li $t8, 5 -/* AD52F0 8005E150 240A0020 */ li $t2, 32 -/* AD52F4 8005E154 4600428D */ trunc.w.s $f10, $f8 -/* AD52F8 8005E158 240B0040 */ li $t3, 64 -/* AD52FC 8005E15C 240E0010 */ li $t6, 16 -/* AD5300 8005E160 240D0001 */ li $t5, 1 -/* AD5304 8005E164 440C5000 */ mfc1 $t4, $f10 -/* AD5308 8005E168 27A50024 */ addiu $a1, $sp, 0x24 -/* AD530C 8005E16C 00003825 */ move $a3, $zero -/* AD5310 8005E170 A42CDD6A */ sh $t4, %lo(D_8015DD6A)($at) -/* AD5314 8005E174 C4D00008 */ lwc1 $f16, 8($a2) -/* AD5318 8005E178 240C00C8 */ li $t4, 200 -/* AD531C 8005E17C AFA20014 */ sw $v0, 0x14($sp) -/* AD5320 8005E180 4600848D */ trunc.w.s $f18, $f16 -/* AD5324 8005E184 AFAD0010 */ sw $t5, 0x10($sp) -/* AD5328 8005E188 00003025 */ move $a2, $zero -/* AD532C 8005E18C 440F9000 */ mfc1 $t7, $f18 -/* AD5330 8005E190 00000000 */ nop -/* AD5334 8005E194 A42FDD6C */ sh $t7, %lo(D_8015DD6C)($at) -/* AD5338 8005E198 3C018016 */ lui $at, %hi(D_8015E1FC) # $at, 0x8016 -/* AD533C 8005E19C AC38E1FC */ sw $t8, %lo(D_8015E1FC)($at) -/* AD5340 8005E1A0 3C018016 */ lui $at, %hi(D_8015E200) # $at, 0x8016 -/* AD5344 8005E1A4 AC39E200 */ sw $t9, %lo(D_8015E200)($at) -/* AD5348 8005E1A8 A049049C */ sb $t1, 0x49c($v0) -/* AD534C 8005E1AC A04C049D */ sb $t4, 0x49d($v0) -/* AD5350 8005E1B0 A049049E */ sb $t1, 0x49e($v0) -/* AD5354 8005E1B4 A043049F */ sb $v1, 0x49f($v0) -/* AD5358 8005E1B8 A04004A0 */ sb $zero, 0x4a0($v0) -/* AD535C 8005E1BC A04804A1 */ sb $t0, 0x4a1($v0) -/* AD5360 8005E1C0 A04004A2 */ sb $zero, 0x4a2($v0) -/* AD5364 8005E1C4 A04304A3 */ sb $v1, 0x4a3($v0) -/* AD5368 8005E1C8 A04004A4 */ sb $zero, 0x4a4($v0) -/* AD536C 8005E1CC A04804A5 */ sb $t0, 0x4a5($v0) -/* AD5370 8005E1D0 A04004A6 */ sb $zero, 0x4a6($v0) -/* AD5374 8005E1D4 A04304A7 */ sb $v1, 0x4a7($v0) -/* AD5378 8005E1D8 A04004A8 */ sb $zero, 0x4a8($v0) -/* AD537C 8005E1DC A04804A9 */ sb $t0, 0x4a9($v0) -/* AD5380 8005E1E0 A04004AA */ sb $zero, 0x4aa($v0) -/* AD5384 8005E1E4 A04304AB */ sb $v1, 0x4ab($v0) -/* AD5388 8005E1E8 A04004AC */ sb $zero, 0x4ac($v0) -/* AD538C 8005E1EC A04A04AD */ sb $t2, 0x4ad($v0) -/* AD5390 8005E1F0 A04004AE */ sb $zero, 0x4ae($v0) -/* AD5394 8005E1F4 A04004AF */ sb $zero, 0x4af($v0) -/* AD5398 8005E1F8 A04004B0 */ sb $zero, 0x4b0($v0) -/* AD539C 8005E1FC A04A04B1 */ sb $t2, 0x4b1($v0) -/* AD53A0 8005E200 A04004B2 */ sb $zero, 0x4b2($v0) -/* AD53A4 8005E204 A04004B3 */ sb $zero, 0x4b3($v0) -/* AD53A8 8005E208 A04004B4 */ sb $zero, 0x4b4($v0) -/* AD53AC 8005E20C A04B04B5 */ sb $t3, 0x4b5($v0) -/* AD53B0 8005E210 A04004B6 */ sb $zero, 0x4b6($v0) -/* AD53B4 8005E214 A04004B7 */ sb $zero, 0x4b7($v0) -/* AD53B8 8005E218 A04004B8 */ sb $zero, 0x4b8($v0) -/* AD53BC 8005E21C A04B04B9 */ sb $t3, 0x4b9($v0) -/* AD53C0 8005E220 A04004BA */ sb $zero, 0x4ba($v0) -/* AD53C4 8005E224 A04004BB */ sb $zero, 0x4bb($v0) -/* AD53C8 8005E228 3C018016 */ lui $at, %hi(D_8015E224) # $at, 0x8016 -/* AD53CC 8005E22C AC20E224 */ sw $zero, %lo(D_8015E224)($at) -/* AD53D0 8005E230 3C018016 */ lui $at, %hi(D_8015E228) # $at, 0x8016 -/* AD53D4 8005E234 AC2EE228 */ sw $t6, %lo(D_8015E228)($at) -/* AD53D8 8005E238 3C014100 */ li $at, 0x41000000 # 0.000000 -/* AD53DC 8005E23C 44812000 */ mtc1 $at, $f4 -/* AD53E0 8005E240 3C018016 */ lui $at, %hi(D_8015E1F4) -/* AD53E4 8005E244 E424E1F4 */ swc1 $f4, %lo(D_8015E1F4)($at) -/* AD53E8 8005E248 3C01BF80 */ li $at, 0xBF800000 # 0.000000 -/* AD53EC 8005E24C 44813000 */ mtc1 $at, $f6 -/* AD53F0 8005E250 3C018016 */ lui $at, %hi(D_8015E1F8) -/* AD53F4 8005E254 0C009B35 */ jal Effect_Add -/* AD53F8 8005E258 E426E1F8 */ swc1 $f6, %lo(D_8015E1F8)($at) -/* AD53FC 8005E25C 8FBF001C */ lw $ra, 0x1c($sp) -/* AD5400 8005E260 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD5404 8005E264 03E00008 */ jr $ra -/* AD5408 8005E268 00000000 */ nop - -/* AD540C 8005E26C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD5410 8005E270 AFBF0014 */ sw $ra, 0x14($sp) -/* AD5414 8005E274 AFA5001C */ sw $a1, 0x1c($sp) -/* AD5418 8005E278 AFA40018 */ sw $a0, 0x18($sp) -/* AD541C 8005E27C AFA60020 */ sw $a2, 0x20($sp) -/* AD5420 8005E280 0C00A66B */ jal func_800299AC -/* AD5424 8005E284 00C02825 */ move $a1, $a2 -/* AD5428 8005E288 8FA40018 */ lw $a0, 0x18($sp) -/* AD542C 8005E28C 0C018AE0 */ jal func_80062B80 -/* AD5430 8005E290 8FA50020 */ lw $a1, 0x20($sp) -/* AD5434 8005E294 8FBF0014 */ lw $ra, 0x14($sp) -/* AD5438 8005E298 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD543C 8005E29C 03E00008 */ jr $ra -/* AD5440 8005E2A0 00000000 */ nop - -/* AD5444 8005E2A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD5448 8005E2A8 AFBF0014 */ sw $ra, 0x14($sp) -/* AD544C 8005E2AC AFA5001C */ sw $a1, 0x1c($sp) -/* AD5450 8005E2B0 0C018A8A */ jal func_80062A28 -/* AD5454 8005E2B4 00C02825 */ move $a1, $a2 -/* AD5458 8005E2B8 8FBF0014 */ lw $ra, 0x14($sp) -/* AD545C 8005E2BC 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD5460 8005E2C0 03E00008 */ jr $ra -/* AD5464 8005E2C4 00000000 */ nop - -/* AD5468 8005E2C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD546C 8005E2CC AFBF0014 */ sw $ra, 0x14($sp) -/* AD5470 8005E2D0 AFA5001C */ sw $a1, 0x1c($sp) -/* AD5474 8005E2D4 0C018A8A */ jal func_80062A28 -/* AD5478 8005E2D8 00C02825 */ move $a1, $a2 -/* AD547C 8005E2DC 8FBF0014 */ lw $ra, 0x14($sp) -/* AD5480 8005E2E0 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD5484 8005E2E4 03E00008 */ jr $ra -/* AD5488 8005E2E8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005E10C.s b/asm/non_matchings/code/z_collision_check/func_8005E10C.s new file mode 100644 index 0000000000..e1db92478a --- /dev/null +++ b/asm/non_matchings/code/z_collision_check/func_8005E10C.s @@ -0,0 +1,89 @@ +glabel func_8005E10C +/* AD52AC 8005E10C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* AD52B0 8005E110 AFBF001C */ sw $ra, 0x1c($sp) +/* AD52B4 8005E114 AFA5002C */ sw $a1, 0x2c($sp) +/* AD52B8 8005E118 AFA60030 */ sw $a2, 0x30($sp) +/* AD52BC 8005E11C C4C40000 */ lwc1 $f4, ($a2) +/* AD52C0 8005E120 3C018016 */ lui $at, %hi(D_8015DD6C) # $at, 0x8016 +/* AD52C4 8005E124 24190005 */ li $t9, 5 +/* AD52C8 8005E128 4600218D */ trunc.w.s $f6, $f4 +/* AD52CC 8005E12C 3C028016 */ lui $v0, %hi(D_8015DD68) # $v0, 0x8016 +/* AD52D0 8005E130 2442DD68 */ addiu $v0, %lo(D_8015DD68) # addiu $v0, $v0, -0x2298 +/* AD52D4 8005E134 240300FF */ li $v1, 255 +/* AD52D8 8005E138 44183000 */ mfc1 $t8, $f6 +/* AD52DC 8005E13C 24080080 */ li $t0, 128 +/* AD52E0 8005E140 2409000A */ li $t1, 10 +/* AD52E4 8005E144 A438DD68 */ sh $t8, %lo(D_8015DD68)($at) +/* AD52E8 8005E148 C4C80004 */ lwc1 $f8, 4($a2) +/* AD52EC 8005E14C 24180005 */ li $t8, 5 +/* AD52F0 8005E150 240A0020 */ li $t2, 32 +/* AD52F4 8005E154 4600428D */ trunc.w.s $f10, $f8 +/* AD52F8 8005E158 240B0040 */ li $t3, 64 +/* AD52FC 8005E15C 240E0010 */ li $t6, 16 +/* AD5300 8005E160 240D0001 */ li $t5, 1 +/* AD5304 8005E164 440C5000 */ mfc1 $t4, $f10 +/* AD5308 8005E168 27A50024 */ addiu $a1, $sp, 0x24 +/* AD530C 8005E16C 00003825 */ move $a3, $zero +/* AD5310 8005E170 A42CDD6A */ sh $t4, %lo(D_8015DD6A)($at) +/* AD5314 8005E174 C4D00008 */ lwc1 $f16, 8($a2) +/* AD5318 8005E178 240C00C8 */ li $t4, 200 +/* AD531C 8005E17C AFA20014 */ sw $v0, 0x14($sp) +/* AD5320 8005E180 4600848D */ trunc.w.s $f18, $f16 +/* AD5324 8005E184 AFAD0010 */ sw $t5, 0x10($sp) +/* AD5328 8005E188 00003025 */ move $a2, $zero +/* AD532C 8005E18C 440F9000 */ mfc1 $t7, $f18 +/* AD5330 8005E190 00000000 */ nop +/* AD5334 8005E194 A42FDD6C */ sh $t7, %lo(D_8015DD6C)($at) +/* AD5338 8005E198 3C018016 */ lui $at, %hi(D_8015E1FC) # $at, 0x8016 +/* AD533C 8005E19C AC38E1FC */ sw $t8, %lo(D_8015E1FC)($at) +/* AD5340 8005E1A0 3C018016 */ lui $at, %hi(D_8015E200) # $at, 0x8016 +/* AD5344 8005E1A4 AC39E200 */ sw $t9, %lo(D_8015E200)($at) +/* AD5348 8005E1A8 A049049C */ sb $t1, 0x49c($v0) +/* AD534C 8005E1AC A04C049D */ sb $t4, 0x49d($v0) +/* AD5350 8005E1B0 A049049E */ sb $t1, 0x49e($v0) +/* AD5354 8005E1B4 A043049F */ sb $v1, 0x49f($v0) +/* AD5358 8005E1B8 A04004A0 */ sb $zero, 0x4a0($v0) +/* AD535C 8005E1BC A04804A1 */ sb $t0, 0x4a1($v0) +/* AD5360 8005E1C0 A04004A2 */ sb $zero, 0x4a2($v0) +/* AD5364 8005E1C4 A04304A3 */ sb $v1, 0x4a3($v0) +/* AD5368 8005E1C8 A04004A4 */ sb $zero, 0x4a4($v0) +/* AD536C 8005E1CC A04804A5 */ sb $t0, 0x4a5($v0) +/* AD5370 8005E1D0 A04004A6 */ sb $zero, 0x4a6($v0) +/* AD5374 8005E1D4 A04304A7 */ sb $v1, 0x4a7($v0) +/* AD5378 8005E1D8 A04004A8 */ sb $zero, 0x4a8($v0) +/* AD537C 8005E1DC A04804A9 */ sb $t0, 0x4a9($v0) +/* AD5380 8005E1E0 A04004AA */ sb $zero, 0x4aa($v0) +/* AD5384 8005E1E4 A04304AB */ sb $v1, 0x4ab($v0) +/* AD5388 8005E1E8 A04004AC */ sb $zero, 0x4ac($v0) +/* AD538C 8005E1EC A04A04AD */ sb $t2, 0x4ad($v0) +/* AD5390 8005E1F0 A04004AE */ sb $zero, 0x4ae($v0) +/* AD5394 8005E1F4 A04004AF */ sb $zero, 0x4af($v0) +/* AD5398 8005E1F8 A04004B0 */ sb $zero, 0x4b0($v0) +/* AD539C 8005E1FC A04A04B1 */ sb $t2, 0x4b1($v0) +/* AD53A0 8005E200 A04004B2 */ sb $zero, 0x4b2($v0) +/* AD53A4 8005E204 A04004B3 */ sb $zero, 0x4b3($v0) +/* AD53A8 8005E208 A04004B4 */ sb $zero, 0x4b4($v0) +/* AD53AC 8005E20C A04B04B5 */ sb $t3, 0x4b5($v0) +/* AD53B0 8005E210 A04004B6 */ sb $zero, 0x4b6($v0) +/* AD53B4 8005E214 A04004B7 */ sb $zero, 0x4b7($v0) +/* AD53B8 8005E218 A04004B8 */ sb $zero, 0x4b8($v0) +/* AD53BC 8005E21C A04B04B9 */ sb $t3, 0x4b9($v0) +/* AD53C0 8005E220 A04004BA */ sb $zero, 0x4ba($v0) +/* AD53C4 8005E224 A04004BB */ sb $zero, 0x4bb($v0) +/* AD53C8 8005E228 3C018016 */ lui $at, %hi(D_8015E224) # $at, 0x8016 +/* AD53CC 8005E22C AC20E224 */ sw $zero, %lo(D_8015E224)($at) +/* AD53D0 8005E230 3C018016 */ lui $at, %hi(D_8015E228) # $at, 0x8016 +/* AD53D4 8005E234 AC2EE228 */ sw $t6, %lo(D_8015E228)($at) +/* AD53D8 8005E238 3C014100 */ li $at, 0x41000000 # 0.000000 +/* AD53DC 8005E23C 44812000 */ mtc1 $at, $f4 +/* AD53E0 8005E240 3C018016 */ lui $at, %hi(D_8015E1F4) +/* AD53E4 8005E244 E424E1F4 */ swc1 $f4, %lo(D_8015E1F4)($at) +/* AD53E8 8005E248 3C01BF80 */ li $at, 0xBF800000 # 0.000000 +/* AD53EC 8005E24C 44813000 */ mtc1 $at, $f6 +/* AD53F0 8005E250 3C018016 */ lui $at, %hi(D_8015E1F8) +/* AD53F4 8005E254 0C009B35 */ jal Effect_Add +/* AD53F8 8005E258 E426E1F8 */ swc1 $f6, %lo(D_8015E1F8)($at) +/* AD53FC 8005E25C 8FBF001C */ lw $ra, 0x1c($sp) +/* AD5400 8005E260 27BD0028 */ addiu $sp, $sp, 0x28 +/* AD5404 8005E264 03E00008 */ jr $ra +/* AD5408 8005E268 00000000 */ nop diff --git a/asm/non_matchings/code/z_collision_check/func_8005E2EC.s b/asm/non_matchings/code/z_collision_check/func_8005E2EC.s deleted file mode 100644 index 3b685f2dee..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005E2EC.s +++ /dev/null @@ -1,142 +0,0 @@ -glabel func_8005E2EC -/* AD548C 8005E2EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD5490 8005E2F0 AFBF001C */ sw $ra, 0x1c($sp) -/* AD5494 8005E2F4 AFA60028 */ sw $a2, 0x28($sp) -/* AD5498 8005E2F8 90A20015 */ lbu $v0, 0x15($a1) -/* AD549C 8005E2FC 30420018 */ andi $v0, $v0, 0x18 -/* AD54A0 8005E300 14400024 */ bnez $v0, .L8005E394 -/* AD54A4 8005E304 00000000 */ nop -/* AD54A8 8005E308 90CF0014 */ lbu $t7, 0x14($a2) -/* AD54AC 8005E30C 24010009 */ li $at, 9 -/* AD54B0 8005E310 00002825 */ move $a1, $zero -/* AD54B4 8005E314 11E1001F */ beq $t7, $at, .L8005E394 -/* AD54B8 8005E318 00000000 */ nop -/* AD54BC 8005E31C 0C00A729 */ jal func_80029CA4 -/* AD54C0 8005E320 00E03025 */ move $a2, $a3 -/* AD54C4 8005E324 8FB80028 */ lw $t8, 0x28($sp) -/* AD54C8 8005E328 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD54CC 8005E32C 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD54D0 8005E330 8F020000 */ lw $v0, ($t8) -/* AD54D4 8005E334 24041806 */ li $a0, 6150 -/* AD54D8 8005E338 24060004 */ li $a2, 4 -/* AD54DC 8005E33C 1440000E */ bnez $v0, .L8005E378 -/* AD54E0 8005E340 244500E4 */ addiu $a1, $v0, 0xe4 -/* AD54E4 8005E344 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD54E8 8005E348 3C198013 */ lui $t9, %hi(D_801333E8) # $t9, 0x8013 -/* AD54EC 8005E34C 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD54F0 8005E350 273933E8 */ addiu $t9, %lo(D_801333E8) # addiu $t9, $t9, 0x33e8 -/* AD54F4 8005E354 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* AD54F8 8005E358 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* AD54FC 8005E35C AFB90014 */ sw $t9, 0x14($sp) -/* AD5500 8005E360 AFA70010 */ sw $a3, 0x10($sp) -/* AD5504 8005E364 24041806 */ li $a0, 6150 -/* AD5508 8005E368 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD550C 8005E36C 24060004 */ li $a2, 4 -/* AD5510 8005E370 1000005E */ b .L8005E4EC -/* AD5514 8005E374 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E378: -/* AD5518 8005E378 3C088013 */ lui $t0, %hi(D_801333E8) # $t0, 0x8013 -/* AD551C 8005E37C 250833E8 */ addiu $t0, %lo(D_801333E8) # addiu $t0, $t0, 0x33e8 -/* AD5520 8005E380 AFA80014 */ sw $t0, 0x14($sp) -/* AD5524 8005E384 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD5528 8005E388 AFA70010 */ sw $a3, 0x10($sp) -/* AD552C 8005E38C 10000057 */ b .L8005E4EC -/* AD5530 8005E390 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E394: -/* AD5534 8005E394 14400015 */ bnez $v0, .L8005E3EC -/* AD5538 8005E398 24010008 */ li $at, 8 -/* AD553C 8005E39C 24050003 */ li $a1, 3 -/* AD5540 8005E3A0 00E03025 */ move $a2, $a3 -/* AD5544 8005E3A4 AFA40020 */ sw $a0, 0x20($sp) -/* AD5548 8005E3A8 0C00A729 */ jal func_80029CA4 -/* AD554C 8005E3AC AFA7002C */ sw $a3, 0x2c($sp) -/* AD5550 8005E3B0 8FA90028 */ lw $t1, 0x28($sp) -/* AD5554 8005E3B4 8FA7002C */ lw $a3, 0x2c($sp) -/* AD5558 8005E3B8 8FA40020 */ lw $a0, 0x20($sp) -/* AD555C 8005E3BC 8D220000 */ lw $v0, ($t1) -/* AD5560 8005E3C0 00E02825 */ move $a1, $a3 -/* AD5564 8005E3C4 14400005 */ bnez $v0, .L8005E3DC -/* AD5568 8005E3C8 00000000 */ nop -/* AD556C 8005E3CC 0C018B58 */ jal func_80062D60 -/* AD5570 8005E3D0 00E02825 */ move $a1, $a3 -/* AD5574 8005E3D4 10000045 */ b .L8005E4EC -/* AD5578 8005E3D8 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E3DC: -/* AD557C 8005E3DC 0C018B6B */ jal func_80062DAC -/* AD5580 8005E3E0 244600E4 */ addiu $a2, $v0, 0xe4 -/* AD5584 8005E3E4 10000041 */ b .L8005E4EC -/* AD5588 8005E3E8 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E3EC: -/* AD558C 8005E3EC 1441001F */ bne $v0, $at, .L8005E46C -/* AD5590 8005E3F0 00002825 */ move $a1, $zero -/* AD5594 8005E3F4 0C00A729 */ jal func_80029CA4 -/* AD5598 8005E3F8 00E03025 */ move $a2, $a3 -/* AD559C 8005E3FC 8FAA0028 */ lw $t2, 0x28($sp) -/* AD55A0 8005E400 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD55A4 8005E404 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD55A8 8005E408 8D420000 */ lw $v0, ($t2) -/* AD55AC 8005E40C 24041806 */ li $a0, 6150 -/* AD55B0 8005E410 24060004 */ li $a2, 4 -/* AD55B4 8005E414 1440000E */ bnez $v0, .L8005E450 -/* AD55B8 8005E418 244500E4 */ addiu $a1, $v0, 0xe4 -/* AD55BC 8005E41C 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD55C0 8005E420 3C0B8013 */ lui $t3, %hi(D_801333E8) # $t3, 0x8013 -/* AD55C4 8005E424 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD55C8 8005E428 256B33E8 */ addiu $t3, %lo(D_801333E8) # addiu $t3, $t3, 0x33e8 -/* AD55CC 8005E42C 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* AD55D0 8005E430 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* AD55D4 8005E434 AFAB0014 */ sw $t3, 0x14($sp) -/* AD55D8 8005E438 AFA70010 */ sw $a3, 0x10($sp) -/* AD55DC 8005E43C 24041806 */ li $a0, 6150 -/* AD55E0 8005E440 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD55E4 8005E444 24060004 */ li $a2, 4 -/* AD55E8 8005E448 10000028 */ b .L8005E4EC -/* AD55EC 8005E44C 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E450: -/* AD55F0 8005E450 3C0C8013 */ lui $t4, %hi(D_801333E8) # $t4, 0x8013 -/* AD55F4 8005E454 258C33E8 */ addiu $t4, %lo(D_801333E8) # addiu $t4, $t4, 0x33e8 -/* AD55F8 8005E458 AFAC0014 */ sw $t4, 0x14($sp) -/* AD55FC 8005E45C 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD5600 8005E460 AFA70010 */ sw $a3, 0x10($sp) -/* AD5604 8005E464 10000021 */ b .L8005E4EC -/* AD5608 8005E468 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E46C: -/* AD560C 8005E46C 24010010 */ li $at, 16 -/* AD5610 8005E470 1441001D */ bne $v0, $at, .L8005E4E8 -/* AD5614 8005E474 24050001 */ li $a1, 1 -/* AD5618 8005E478 0C00A729 */ jal func_80029CA4 -/* AD561C 8005E47C 00E03025 */ move $a2, $a3 -/* AD5620 8005E480 8FAD0028 */ lw $t5, 0x28($sp) -/* AD5624 8005E484 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD5628 8005E488 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD562C 8005E48C 8DA20000 */ lw $v0, ($t5) -/* AD5630 8005E490 24041837 */ li $a0, 6199 -/* AD5634 8005E494 24060004 */ li $a2, 4 -/* AD5638 8005E498 1440000E */ bnez $v0, .L8005E4D4 -/* AD563C 8005E49C 244500E4 */ addiu $a1, $v0, 0xe4 -/* AD5640 8005E4A0 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD5644 8005E4A4 3C0E8013 */ lui $t6, %hi(D_801333E8) # $t6, 0x8013 -/* AD5648 8005E4A8 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD564C 8005E4AC 25CE33E8 */ addiu $t6, %lo(D_801333E8) # addiu $t6, $t6, 0x33e8 -/* AD5650 8005E4B0 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* AD5654 8005E4B4 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* AD5658 8005E4B8 AFAE0014 */ sw $t6, 0x14($sp) -/* AD565C 8005E4BC AFA70010 */ sw $a3, 0x10($sp) -/* AD5660 8005E4C0 24041837 */ li $a0, 6199 -/* AD5664 8005E4C4 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD5668 8005E4C8 24060004 */ li $a2, 4 -/* AD566C 8005E4CC 10000007 */ b .L8005E4EC -/* AD5670 8005E4D0 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E4D4: -/* AD5674 8005E4D4 3C0F8013 */ lui $t7, %hi(D_801333E8) # $t7, 0x8013 -/* AD5678 8005E4D8 25EF33E8 */ addiu $t7, %lo(D_801333E8) # addiu $t7, $t7, 0x33e8 -/* AD567C 8005E4DC AFAF0014 */ sw $t7, 0x14($sp) -/* AD5680 8005E4E0 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD5684 8005E4E4 AFA70010 */ sw $a3, 0x10($sp) -.L8005E4E8: -/* AD5688 8005E4E8 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E4EC: -/* AD568C 8005E4EC 27BD0020 */ addiu $sp, $sp, 0x20 -/* AD5690 8005E4F0 03E00008 */ jr $ra -/* AD5694 8005E4F4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005E4F8.s b/asm/non_matchings/code/z_collision_check/func_8005E4F8.s deleted file mode 100644 index b9609c2e4b..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005E4F8.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel func_8005E4F8 -/* AD5698 8005E4F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD569C 8005E4FC AFBF001C */ sw $ra, 0x1c($sp) -/* AD56A0 8005E500 8C830000 */ lw $v1, ($a0) -/* AD56A4 8005E504 5060003B */ beql $v1, $zero, .L8005E5F4 -/* AD56A8 8005E508 8FBF001C */ lw $ra, 0x1c($sp) -/* AD56AC 8005E50C 906E0002 */ lbu $t6, 2($v1) -/* AD56B0 8005E510 24040002 */ li $a0, 2 -/* AD56B4 8005E514 548E0037 */ bnel $a0, $t6, .L8005E5F4 -/* AD56B8 8005E518 8FBF001C */ lw $ra, 0x1c($sp) -/* AD56BC 8005E51C 90A20014 */ lbu $v0, 0x14($a1) -/* AD56C0 8005E520 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD56C4 8005E524 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD56C8 8005E528 1440000B */ bnez $v0, .L8005E558 -/* AD56CC 8005E52C 24010001 */ li $at, 1 -/* AD56D0 8005E530 3C0F8013 */ lui $t7, %hi(D_801333E8) # $t7, 0x8013 -/* AD56D4 8005E534 25EF33E8 */ addiu $t7, %lo(D_801333E8) # addiu $t7, $t7, 0x33e8 -/* AD56D8 8005E538 AFAF0014 */ sw $t7, 0x14($sp) -/* AD56DC 8005E53C 24041811 */ li $a0, 6161 -/* AD56E0 8005E540 246500E4 */ addiu $a1, $v1, 0xe4 -/* AD56E4 8005E544 24060004 */ li $a2, 4 -/* AD56E8 8005E548 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD56EC 8005E54C AFA70010 */ sw $a3, 0x10($sp) -/* AD56F0 8005E550 10000028 */ b .L8005E5F4 -/* AD56F4 8005E554 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E558: -/* AD56F8 8005E558 1441000C */ bne $v0, $at, .L8005E58C -/* AD56FC 8005E55C 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD5700 8005E560 3C188013 */ lui $t8, %hi(D_801333E8) # $t8, 0x8013 -/* AD5704 8005E564 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD5708 8005E568 271833E8 */ addiu $t8, %lo(D_801333E8) # addiu $t8, $t8, 0x33e8 -/* AD570C 8005E56C AFB80014 */ sw $t8, 0x14($sp) -/* AD5710 8005E570 AFA70010 */ sw $a3, 0x10($sp) -/* AD5714 8005E574 24041824 */ li $a0, 6180 -/* AD5718 8005E578 246500E4 */ addiu $a1, $v1, 0xe4 -/* AD571C 8005E57C 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD5720 8005E580 24060004 */ li $a2, 4 -/* AD5724 8005E584 1000001B */ b .L8005E5F4 -/* AD5728 8005E588 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E58C: -/* AD572C 8005E58C 1482000D */ bne $a0, $v0, .L8005E5C4 -/* AD5730 8005E590 24010003 */ li $at, 3 -/* AD5734 8005E594 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD5738 8005E598 3C198013 */ lui $t9, %hi(D_801333E8) # $t9, 0x8013 -/* AD573C 8005E59C 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD5740 8005E5A0 273933E8 */ addiu $t9, %lo(D_801333E8) # addiu $t9, $t9, 0x33e8 -/* AD5744 8005E5A4 AFB90014 */ sw $t9, 0x14($sp) -/* AD5748 8005E5A8 AFA70010 */ sw $a3, 0x10($sp) -/* AD574C 8005E5AC 00002025 */ move $a0, $zero -/* AD5750 8005E5B0 246500E4 */ addiu $a1, $v1, 0xe4 -/* AD5754 8005E5B4 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD5758 8005E5B8 24060004 */ li $a2, 4 -/* AD575C 8005E5BC 1000000D */ b .L8005E5F4 -/* AD5760 8005E5C0 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E5C4: -/* AD5764 8005E5C4 1441000A */ bne $v0, $at, .L8005E5F0 -/* AD5768 8005E5C8 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD576C 8005E5CC 3C088013 */ lui $t0, %hi(D_801333E8) # $t0, 0x8013 -/* AD5770 8005E5D0 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD5774 8005E5D4 250833E8 */ addiu $t0, %lo(D_801333E8) # addiu $t0, $t0, 0x33e8 -/* AD5778 8005E5D8 AFA80014 */ sw $t0, 0x14($sp) -/* AD577C 8005E5DC AFA70010 */ sw $a3, 0x10($sp) -/* AD5780 8005E5E0 00002025 */ move $a0, $zero -/* AD5784 8005E5E4 246500E4 */ addiu $a1, $v1, 0xe4 -/* AD5788 8005E5E8 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD578C 8005E5EC 24060004 */ li $a2, 4 -.L8005E5F0: -/* AD5790 8005E5F0 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E5F4: -/* AD5794 8005E5F4 27BD0020 */ addiu $sp, $sp, 0x20 -/* AD5798 8005E5F8 24020001 */ li $v0, 1 -/* AD579C 8005E5FC 03E00008 */ jr $ra -/* AD57A0 8005E600 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005E604.s b/asm/non_matchings/code/z_collision_check/func_8005E604.s deleted file mode 100644 index fe081da181..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005E604.s +++ /dev/null @@ -1,137 +0,0 @@ -glabel func_8005E604 -/* AD57A4 8005E604 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD57A8 8005E608 8FAE0030 */ lw $t6, 0x30($sp) -/* AD57AC 8005E60C AFBF001C */ sw $ra, 0x1c($sp) -/* AD57B0 8005E610 AFA50024 */ sw $a1, 0x24($sp) -/* AD57B4 8005E614 AFA60028 */ sw $a2, 0x28($sp) -/* AD57B8 8005E618 AFA7002C */ sw $a3, 0x2c($sp) -/* AD57BC 8005E61C 91CF0016 */ lbu $t7, 0x16($t6) -/* AD57C0 8005E620 31F80040 */ andi $t8, $t7, 0x40 -/* AD57C4 8005E624 57000073 */ bnezl $t8, .L8005E7F4 -/* AD57C8 8005E628 8FBF001C */ lw $ra, 0x1c($sp) -/* AD57CC 8005E62C 90C20015 */ lbu $v0, 0x15($a2) -/* AD57D0 8005E630 8FAA002C */ lw $t2, 0x2c($sp) -/* AD57D4 8005E634 30480020 */ andi $t0, $v0, 0x20 -/* AD57D8 8005E638 15000003 */ bnez $t0, .L8005E648 -/* AD57DC 8005E63C 30490040 */ andi $t1, $v0, 0x40 -/* AD57E0 8005E640 5520006C */ bnezl $t1, .L8005E7F4 -/* AD57E4 8005E644 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E648: -/* AD57E8 8005E648 8D420000 */ lw $v0, ($t2) -/* AD57EC 8005E64C 10400012 */ beqz $v0, .L8005E698 -/* AD57F0 8005E650 00000000 */ nop -/* AD57F4 8005E654 AFA40020 */ sw $a0, 0x20($sp) -/* AD57F8 8005E658 914B0014 */ lbu $t3, 0x14($t2) -/* AD57FC 8005E65C 3C0D8012 */ lui $t5, %hi(D_8011DF40) -/* AD5800 8005E660 3C198012 */ lui $t9, %hi(D_8011DF28) -/* AD5804 8005E664 000B6040 */ sll $t4, $t3, 1 -/* AD5808 8005E668 01AC6821 */ addu $t5, $t5, $t4 -/* AD580C 8005E66C 91ADDF40 */ lbu $t5, %lo(D_8011DF40)($t5) -/* AD5810 8005E670 8FA60034 */ lw $a2, 0x34($sp) -/* AD5814 8005E674 01402825 */ move $a1, $t2 -/* AD5818 8005E678 000D7080 */ sll $t6, $t5, 2 -/* AD581C 8005E67C 032EC821 */ addu $t9, $t9, $t6 -/* AD5820 8005E680 8F39DF28 */ lw $t9, %lo(D_8011DF28)($t9) -/* AD5824 8005E684 0320F809 */ jalr $t9 -/* AD5828 8005E688 00000000 */ nop -/* AD582C 8005E68C 8FAF002C */ lw $t7, 0x2c($sp) -/* AD5830 8005E690 8FA40020 */ lw $a0, 0x20($sp) -/* AD5834 8005E694 8DE20000 */ lw $v0, ($t7) -.L8005E698: -/* AD5838 8005E698 10400038 */ beqz $v0, .L8005E77C -/* AD583C 8005E69C 8FA70034 */ lw $a3, 0x34($sp) -/* AD5840 8005E6A0 8FB8002C */ lw $t8, 0x2c($sp) -/* AD5844 8005E6A4 3C058012 */ lui $a1, %hi(D_8011DF41) -/* AD5848 8005E6A8 24010003 */ li $at, 3 -/* AD584C 8005E6AC 93080014 */ lbu $t0, 0x14($t8) -/* AD5850 8005E6B0 03003025 */ move $a2, $t8 -/* AD5854 8005E6B4 00084840 */ sll $t1, $t0, 1 -/* AD5858 8005E6B8 00A92821 */ addu $a1, $a1, $t1 -/* AD585C 8005E6BC 90A5DF41 */ lbu $a1, %lo(D_8011DF41)($a1) -/* AD5860 8005E6C0 54A10006 */ bnel $a1, $at, .L8005E6DC -/* AD5864 8005E6C4 24010004 */ li $at, 4 -/* AD5868 8005E6C8 0C0178BB */ jal func_8005E2EC -/* AD586C 8005E6CC 8FA50028 */ lw $a1, 0x28($sp) -/* AD5870 8005E6D0 10000048 */ b .L8005E7F4 -/* AD5874 8005E6D4 8FBF001C */ lw $ra, 0x1c($sp) -/* AD5878 8005E6D8 24010004 */ li $at, 4 -.L8005E6DC: -/* AD587C 8005E6DC 14A10018 */ bne $a1, $at, .L8005E740 -/* AD5880 8005E6E0 8FAA0024 */ lw $t2, 0x24($sp) -/* AD5884 8005E6E4 8D420000 */ lw $v0, ($t2) -/* AD5888 8005E6E8 00E02825 */ move $a1, $a3 -/* AD588C 8005E6EC 14400010 */ bnez $v0, .L8005E730 -/* AD5890 8005E6F0 00000000 */ nop -/* AD5894 8005E6F4 0C018B35 */ jal func_80062CD4 -/* AD5898 8005E6F8 00E02825 */ move $a1, $a3 -/* AD589C 8005E6FC 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD58A0 8005E700 3C0B8013 */ lui $t3, %hi(D_801333E8) # $t3, 0x8013 -/* AD58A4 8005E704 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD58A8 8005E708 256B33E8 */ addiu $t3, %lo(D_801333E8) # addiu $t3, $t3, 0x33e8 -/* AD58AC 8005E70C 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* AD58B0 8005E710 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* AD58B4 8005E714 AFAB0014 */ sw $t3, 0x14($sp) -/* AD58B8 8005E718 AFA70010 */ sw $a3, 0x10($sp) -/* AD58BC 8005E71C 24041837 */ li $a0, 6199 -/* AD58C0 8005E720 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD58C4 8005E724 24060004 */ li $a2, 4 -/* AD58C8 8005E728 10000032 */ b .L8005E7F4 -/* AD58CC 8005E72C 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E730: -/* AD58D0 8005E730 0C018B85 */ jal func_80062E14 -/* AD58D4 8005E734 244600E4 */ addiu $a2, $v0, 0xe4 -/* AD58D8 8005E738 1000002E */ b .L8005E7F4 -/* AD58DC 8005E73C 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E740: -/* AD58E0 8005E740 24010005 */ li $at, 5 -/* AD58E4 8005E744 50A1002B */ beql $a1, $at, .L8005E7F4 -/* AD58E8 8005E748 8FBF001C */ lw $ra, 0x1c($sp) -/* AD58EC 8005E74C 0C00A729 */ jal func_80029CA4 -/* AD58F0 8005E750 00E03025 */ move $a2, $a3 -/* AD58F4 8005E754 8FAC0030 */ lw $t4, 0x30($sp) -/* AD58F8 8005E758 8FA40024 */ lw $a0, 0x24($sp) -/* AD58FC 8005E75C 918D0016 */ lbu $t5, 0x16($t4) -/* AD5900 8005E760 31AE0020 */ andi $t6, $t5, 0x20 -/* AD5904 8005E764 55C00023 */ bnezl $t6, .L8005E7F4 -/* AD5908 8005E768 8FBF001C */ lw $ra, 0x1c($sp) -/* AD590C 8005E76C 0C01793E */ jal func_8005E4F8 -/* AD5910 8005E770 01802825 */ move $a1, $t4 -/* AD5914 8005E774 1000001F */ b .L8005E7F4 -/* AD5918 8005E778 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E77C: -/* AD591C 8005E77C 00002825 */ move $a1, $zero -/* AD5920 8005E780 0C00A729 */ jal func_80029CA4 -/* AD5924 8005E784 00E03025 */ move $a2, $a3 -/* AD5928 8005E788 8FB9002C */ lw $t9, 0x2c($sp) -/* AD592C 8005E78C 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD5930 8005E790 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD5934 8005E794 8F220000 */ lw $v0, ($t9) -/* AD5938 8005E798 24041806 */ li $a0, 6150 -/* AD593C 8005E79C 24060004 */ li $a2, 4 -/* AD5940 8005E7A0 1440000E */ bnez $v0, .L8005E7DC -/* AD5944 8005E7A4 244500E4 */ addiu $a1, $v0, 0xe4 -/* AD5948 8005E7A8 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD594C 8005E7AC 3C0F8013 */ lui $t7, %hi(D_801333E8) # $t7, 0x8013 -/* AD5950 8005E7B0 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD5954 8005E7B4 25EF33E8 */ addiu $t7, %lo(D_801333E8) # addiu $t7, $t7, 0x33e8 -/* AD5958 8005E7B8 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* AD595C 8005E7BC 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* AD5960 8005E7C0 AFAF0014 */ sw $t7, 0x14($sp) -/* AD5964 8005E7C4 AFA70010 */ sw $a3, 0x10($sp) -/* AD5968 8005E7C8 24041806 */ li $a0, 6150 -/* AD596C 8005E7CC 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD5970 8005E7D0 24060004 */ li $a2, 4 -/* AD5974 8005E7D4 10000007 */ b .L8005E7F4 -/* AD5978 8005E7D8 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E7DC: -/* AD597C 8005E7DC 3C088013 */ lui $t0, %hi(D_801333E8) # $t0, 0x8013 -/* AD5980 8005E7E0 250833E8 */ addiu $t0, %lo(D_801333E8) # addiu $t0, $t0, 0x33e8 -/* AD5984 8005E7E4 AFA80014 */ sw $t0, 0x14($sp) -/* AD5988 8005E7E8 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD598C 8005E7EC AFA70010 */ sw $a3, 0x10($sp) -/* AD5990 8005E7F0 8FBF001C */ lw $ra, 0x1c($sp) -.L8005E7F4: -/* AD5994 8005E7F4 27BD0020 */ addiu $sp, $sp, 0x20 -/* AD5998 8005E7F8 03E00008 */ jr $ra -/* AD599C 8005E7FC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_8005E800.s b/asm/non_matchings/code/z_collision_check/func_8005E800.s deleted file mode 100644 index 6704bccc65..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005E800.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8005E800 -/* AD59A0 8005E800 908E0010 */ lbu $t6, 0x10($a0) -/* AD59A4 8005E804 35CF0004 */ ori $t7, $t6, 4 -/* AD59A8 8005E808 A08F0010 */ sb $t7, 0x10($a0) -/* AD59AC 8005E80C 90B80011 */ lbu $t8, 0x11($a1) -/* AD59B0 8005E810 37190080 */ ori $t9, $t8, 0x80 -/* AD59B4 8005E814 03E00008 */ jr $ra -/* AD59B8 8005E818 A0B90011 */ sb $t9, 0x11($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005E81C.s b/asm/non_matchings/code/z_collision_check/func_8005E81C.s deleted file mode 100644 index 2c867294ba..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005E81C.s +++ /dev/null @@ -1,2829 +0,0 @@ -.late_rodata -glabel D_8013ACF8 - .float 0.008 - -glabel D_8013ACFC - .float 0.008 - -glabel D_8013AD00 - .float 0.008 - -glabel D_8013AD04 - .float 0.33333334 - -glabel D_8013AD08 - .float 0.33333334 - -glabel D_8013AD0C - .float 0.008 - -glabel D_8013AD10 - .float 0.33333334 - -glabel D_8013AD14 - .float 0.33333334 - -glabel D_8013AD18 - .float 0.33333334 - -glabel D_8013AD1C - .float 0.33333334 - -glabel D_8013AD20 - .float 0.33333334 - -.text -glabel func_8005E81C -/* AD59BC 8005E81C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD59C0 8005E820 AFA70034 */ sw $a3, 0x34($sp) -/* AD59C4 8005E824 8FA70038 */ lw $a3, 0x38($sp) -/* AD59C8 8005E828 AFBF0024 */ sw $ra, 0x24($sp) -/* AD59CC 8005E82C AFB00020 */ sw $s0, 0x20($sp) -/* AD59D0 8005E830 AFA40028 */ sw $a0, 0x28($sp) -/* AD59D4 8005E834 90EE0011 */ lbu $t6, 0x11($a3) -/* AD59D8 8005E838 00A08025 */ move $s0, $a1 -/* AD59DC 8005E83C 31CF0004 */ andi $t7, $t6, 4 -/* AD59E0 8005E840 51E0000E */ beql $t7, $zero, .L8005E87C -/* AD59E4 8005E844 8FA2003C */ lw $v0, 0x3c($sp) -/* AD59E8 8005E848 8CB80000 */ lw $t8, ($a1) -/* AD59EC 8005E84C 5300000B */ beql $t8, $zero, .L8005E87C -/* AD59F0 8005E850 8FA2003C */ lw $v0, 0x3c($sp) -/* AD59F4 8005E854 8CF90000 */ lw $t9, ($a3) -/* AD59F8 8005E858 00A02025 */ move $a0, $a1 -/* AD59FC 8005E85C 00E02825 */ move $a1, $a3 -/* AD5A00 8005E860 53200006 */ beql $t9, $zero, .L8005E87C -/* AD5A04 8005E864 8FA2003C */ lw $v0, 0x3c($sp) -/* AD5A08 8005E868 0C017A00 */ jal func_8005E800 -/* AD5A0C 8005E86C AFA60030 */ sw $a2, 0x30($sp) -/* AD5A10 8005E870 8FA60030 */ lw $a2, 0x30($sp) -/* AD5A14 8005E874 8FA70038 */ lw $a3, 0x38($sp) -/* AD5A18 8005E878 8FA2003C */ lw $v0, 0x3c($sp) -.L8005E87C: -/* AD5A1C 8005E87C 02002825 */ move $a1, $s0 -/* AD5A20 8005E880 90490016 */ lbu $t1, 0x16($v0) -/* AD5A24 8005E884 312A0008 */ andi $t2, $t1, 8 -/* AD5A28 8005E888 55400011 */ bnezl $t2, .L8005E8D0 -/* AD5A2C 8005E88C 90F90011 */ lbu $t9, 0x11($a3) -/* AD5A30 8005E890 920B0010 */ lbu $t3, 0x10($s0) -/* AD5A34 8005E894 356C0002 */ ori $t4, $t3, 2 -/* AD5A38 8005E898 A20C0010 */ sb $t4, 0x10($s0) -/* AD5A3C 8005E89C 8CED0000 */ lw $t5, ($a3) -/* AD5A40 8005E8A0 AE0D0004 */ sw $t5, 4($s0) -/* AD5A44 8005E8A4 90CE0015 */ lbu $t6, 0x15($a2) -/* AD5A48 8005E8A8 ACC70018 */ sw $a3, 0x18($a2) -/* AD5A4C 8005E8AC ACC20020 */ sw $v0, 0x20($a2) -/* AD5A50 8005E8B0 35CF0002 */ ori $t7, $t6, 2 -/* AD5A54 8005E8B4 A0CF0015 */ sb $t7, 0x15($a2) -/* AD5A58 8005E8B8 8E030000 */ lw $v1, ($s0) -/* AD5A5C 8005E8BC 50600004 */ beql $v1, $zero, .L8005E8D0 -/* AD5A60 8005E8C0 90F90011 */ lbu $t9, 0x11($a3) -/* AD5A64 8005E8C4 9058000C */ lbu $t8, 0xc($v0) -/* AD5A68 8005E8C8 A07800B2 */ sb $t8, 0xb2($v1) -/* AD5A6C 8005E8CC 90F90011 */ lbu $t9, 0x11($a3) -.L8005E8D0: -/* AD5A70 8005E8D0 37290002 */ ori $t1, $t9, 2 -/* AD5A74 8005E8D4 A0E90011 */ sb $t1, 0x11($a3) -/* AD5A78 8005E8D8 8E0A0000 */ lw $t2, ($s0) -/* AD5A7C 8005E8DC ACEA0008 */ sw $t2, 8($a3) -/* AD5A80 8005E8E0 904B0016 */ lbu $t3, 0x16($v0) -/* AD5A84 8005E8E4 AC50001C */ sw $s0, 0x1c($v0) -/* AD5A88 8005E8E8 AC460024 */ sw $a2, 0x24($v0) -/* AD5A8C 8005E8EC 356C0002 */ ori $t4, $t3, 2 -/* AD5A90 8005E8F0 A04C0016 */ sb $t4, 0x16($v0) -/* AD5A94 8005E8F4 8CE30000 */ lw $v1, ($a3) -/* AD5A98 8005E8F8 50600004 */ beql $v1, $zero, .L8005E90C -/* AD5A9C 8005E8FC 8FA80044 */ lw $t0, 0x44($sp) -/* AD5AA0 8005E900 90CD0004 */ lbu $t5, 4($a2) -/* AD5AA4 8005E904 A06D00B3 */ sb $t5, 0xb3($v1) -/* AD5AA8 8005E908 8FA80044 */ lw $t0, 0x44($sp) -.L8005E90C: -/* AD5AAC 8005E90C C5040000 */ lwc1 $f4, ($t0) -/* AD5AB0 8005E910 4600218D */ trunc.w.s $f6, $f4 -/* AD5AB4 8005E914 440F3000 */ mfc1 $t7, $f6 -/* AD5AB8 8005E918 00000000 */ nop -/* AD5ABC 8005E91C A44F000E */ sh $t7, 0xe($v0) -/* AD5AC0 8005E920 C5080004 */ lwc1 $f8, 4($t0) -/* AD5AC4 8005E924 4600428D */ trunc.w.s $f10, $f8 -/* AD5AC8 8005E928 44195000 */ mfc1 $t9, $f10 -/* AD5ACC 8005E92C 00000000 */ nop -/* AD5AD0 8005E930 A4590010 */ sh $t9, 0x10($v0) -/* AD5AD4 8005E934 C5100008 */ lwc1 $f16, 8($t0) -/* AD5AD8 8005E938 4600848D */ trunc.w.s $f18, $f16 -/* AD5ADC 8005E93C 440A9000 */ mfc1 $t2, $f18 -/* AD5AE0 8005E940 00000000 */ nop -/* AD5AE4 8005E944 A44A0012 */ sh $t2, 0x12($v0) -/* AD5AE8 8005E948 90CB0015 */ lbu $t3, 0x15($a2) -/* AD5AEC 8005E94C 8FA40028 */ lw $a0, 0x28($sp) -/* AD5AF0 8005E950 316C0020 */ andi $t4, $t3, 0x20 -/* AD5AF4 8005E954 5580000E */ bnezl $t4, .L8005E990 -/* AD5AF8 8005E958 AFA20010 */ sw $v0, 0x10($sp) -/* AD5AFC 8005E95C 90E30014 */ lbu $v1, 0x14($a3) -/* AD5B00 8005E960 24010009 */ li $at, 9 -/* AD5B04 8005E964 10610009 */ beq $v1, $at, .L8005E98C -/* AD5B08 8005E968 2401000B */ li $at, 11 -/* AD5B0C 8005E96C 10610007 */ beq $v1, $at, .L8005E98C -/* AD5B10 8005E970 2401000C */ li $at, 12 -/* AD5B14 8005E974 50610006 */ beql $v1, $at, .L8005E990 -/* AD5B18 8005E978 AFA20010 */ sw $v0, 0x10($sp) -/* AD5B1C 8005E97C 904D0016 */ lbu $t5, 0x16($v0) -/* AD5B20 8005E980 35AE0080 */ ori $t6, $t5, 0x80 -/* AD5B24 8005E984 10000009 */ b .L8005E9AC -/* AD5B28 8005E988 A04E0016 */ sb $t6, 0x16($v0) -.L8005E98C: -/* AD5B2C 8005E98C AFA20010 */ sw $v0, 0x10($sp) -.L8005E990: -/* AD5B30 8005E990 AFA80014 */ sw $t0, 0x14($sp) -/* AD5B34 8005E994 0C017981 */ jal func_8005E604 -/* AD5B38 8005E998 AFA60030 */ sw $a2, 0x30($sp) -/* AD5B3C 8005E99C 8FA60030 */ lw $a2, 0x30($sp) -/* AD5B40 8005E9A0 90CF0015 */ lbu $t7, 0x15($a2) -/* AD5B44 8005E9A4 35F80040 */ ori $t8, $t7, 0x40 -/* AD5B48 8005E9A8 A0D80015 */ sb $t8, 0x15($a2) -.L8005E9AC: -/* AD5B4C 8005E9AC 8FBF0024 */ lw $ra, 0x24($sp) -/* AD5B50 8005E9B0 8FB00020 */ lw $s0, 0x20($sp) -/* AD5B54 8005E9B4 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD5B58 8005E9B8 03E00008 */ jr $ra -/* AD5B5C 8005E9BC 24020001 */ li $v0, 1 - -/* AD5B60 8005E9C0 27BDFF60 */ addiu $sp, $sp, -0xa0 -/* AD5B64 8005E9C4 AFBF0054 */ sw $ra, 0x54($sp) -/* AD5B68 8005E9C8 AFBE0050 */ sw $fp, 0x50($sp) -/* AD5B6C 8005E9CC AFB7004C */ sw $s7, 0x4c($sp) -/* AD5B70 8005E9D0 AFB60048 */ sw $s6, 0x48($sp) -/* AD5B74 8005E9D4 AFB50044 */ sw $s5, 0x44($sp) -/* AD5B78 8005E9D8 AFB40040 */ sw $s4, 0x40($sp) -/* AD5B7C 8005E9DC AFB3003C */ sw $s3, 0x3c($sp) -/* AD5B80 8005E9E0 AFB20038 */ sw $s2, 0x38($sp) -/* AD5B84 8005E9E4 AFB10034 */ sw $s1, 0x34($sp) -/* AD5B88 8005E9E8 AFB00030 */ sw $s0, 0x30($sp) -/* AD5B8C 8005E9EC F7B40028 */ sdc1 $f20, 0x28($sp) -/* AD5B90 8005E9F0 AFA400A0 */ sw $a0, 0xa0($sp) -/* AD5B94 8005E9F4 AFA500A4 */ sw $a1, 0xa4($sp) -/* AD5B98 8005E9F8 AFA6009C */ sw $a2, 0x9c($sp) -/* AD5B9C 8005E9FC 8CC30018 */ lw $v1, 0x18($a2) -/* AD5BA0 8005EA00 00E0A825 */ move $s5, $a3 -/* AD5BA4 8005EA04 00E0B025 */ move $s6, $a3 -/* AD5BA8 8005EA08 5860008C */ blezl $v1, .L8005EC3C -/* AD5BAC 8005EA0C 8FBF0054 */ lw $ra, 0x54($sp) -/* AD5BB0 8005EA10 8CC2001C */ lw $v0, 0x1c($a2) -/* AD5BB4 8005EA14 50400089 */ beql $v0, $zero, .L8005EC3C -/* AD5BB8 8005EA18 8FBF0054 */ lw $ra, 0x54($sp) -/* AD5BBC 8005EA1C 8CEE0018 */ lw $t6, 0x18($a3) -/* AD5BC0 8005EA20 59C00086 */ blezl $t6, .L8005EC3C -/* AD5BC4 8005EA24 8FBF0054 */ lw $ra, 0x54($sp) -/* AD5BC8 8005EA28 8CEF001C */ lw $t7, 0x1c($a3) -/* AD5BCC 8005EA2C 0003C180 */ sll $t8, $v1, 6 -/* AD5BD0 8005EA30 0058C821 */ addu $t9, $v0, $t8 -/* AD5BD4 8005EA34 11E00080 */ beqz $t7, .L8005EC38 -/* AD5BD8 8005EA38 0059082B */ sltu $at, $v0, $t9 -/* AD5BDC 8005EA3C 1020007E */ beqz $at, .L8005EC38 -/* AD5BE0 8005EA40 00408825 */ move $s1, $v0 -/* AD5BE4 8005EA44 3C018014 */ lui $at, %hi(D_8013ACF8) -/* AD5BE8 8005EA48 C434ACF8 */ lwc1 $f20, %lo(D_8013ACF8)($at) -/* AD5BEC 8005EA4C AFA600A8 */ sw $a2, 0xa8($sp) -/* AD5BF0 8005EA50 27BE0088 */ addiu $fp, $sp, 0x88 -/* AD5BF4 8005EA54 27B7008C */ addiu $s7, $sp, 0x8c -/* AD5BF8 8005EA58 27B40078 */ addiu $s4, $sp, 0x78 -/* AD5BFC 8005EA5C 27B3006C */ addiu $s3, $sp, 0x6c -/* AD5C00 8005EA60 24120001 */ li $s2, 1 -.L8005EA64: -/* AD5C04 8005EA64 0C0177CB */ jal func_8005DF2C -/* AD5C08 8005EA68 02202025 */ move $a0, $s1 -/* AD5C0C 8005EA6C 5052006A */ beql $v0, $s2, .L8005EC18 -/* AD5C10 8005EA70 8FA2009C */ lw $v0, 0x9c($sp) -/* AD5C14 8005EA74 8EA80018 */ lw $t0, 0x18($s5) -/* AD5C18 8005EA78 8EB0001C */ lw $s0, 0x1c($s5) -/* AD5C1C 8005EA7C 00084980 */ sll $t1, $t0, 6 -/* AD5C20 8005EA80 02095021 */ addu $t2, $s0, $t1 -/* AD5C24 8005EA84 020A082B */ sltu $at, $s0, $t2 -/* AD5C28 8005EA88 50200063 */ beql $at, $zero, .L8005EC18 -/* AD5C2C 8005EA8C 8FA2009C */ lw $v0, 0x9c($sp) -.L8005EA90: -/* AD5C30 8005EA90 0C0177D4 */ jal func_8005DF50 -/* AD5C34 8005EA94 02002025 */ move $a0, $s0 -/* AD5C38 8005EA98 10520056 */ beq $v0, $s2, .L8005EBF4 -/* AD5C3C 8005EA9C 02202025 */ move $a0, $s1 -/* AD5C40 8005EAA0 0C0177DD */ jal func_8005DF74 -/* AD5C44 8005EAA4 02002825 */ move $a1, $s0 -/* AD5C48 8005EAA8 10520052 */ beq $v0, $s2, .L8005EBF4 -/* AD5C4C 8005EAAC 26240030 */ addiu $a0, $s1, 0x30 -/* AD5C50 8005EAB0 26050030 */ addiu $a1, $s0, 0x30 -/* AD5C54 8005EAB4 02E03025 */ move $a2, $s7 -/* AD5C58 8005EAB8 0C033F2B */ jal Math3D_SpheresTouchingSurfaceCenter -/* AD5C5C 8005EABC 03C03825 */ move $a3, $fp -/* AD5C60 8005EAC0 5452004D */ bnel $v0, $s2, .L8005EBF8 -/* AD5C64 8005EAC4 8ECC0018 */ lw $t4, 0x18($s6) -/* AD5C68 8005EAC8 862B0030 */ lh $t3, 0x30($s1) -/* AD5C6C 8005EACC 02802025 */ move $a0, $s4 -/* AD5C70 8005EAD0 448B2000 */ mtc1 $t3, $f4 -/* AD5C74 8005EAD4 00000000 */ nop -/* AD5C78 8005EAD8 468021A0 */ cvt.s.w $f6, $f4 -/* AD5C7C 8005EADC E7A6006C */ swc1 $f6, 0x6c($sp) -/* AD5C80 8005EAE0 862C0032 */ lh $t4, 0x32($s1) -/* AD5C84 8005EAE4 448C4000 */ mtc1 $t4, $f8 -/* AD5C88 8005EAE8 00000000 */ nop -/* AD5C8C 8005EAEC 468042A0 */ cvt.s.w $f10, $f8 -/* AD5C90 8005EAF0 E7AA0070 */ swc1 $f10, 0x70($sp) -/* AD5C94 8005EAF4 862D0034 */ lh $t5, 0x34($s1) -/* AD5C98 8005EAF8 448D8000 */ mtc1 $t5, $f16 -/* AD5C9C 8005EAFC 00000000 */ nop -/* AD5CA0 8005EB00 468084A0 */ cvt.s.w $f18, $f16 -/* AD5CA4 8005EB04 E7B20074 */ swc1 $f18, 0x74($sp) -/* AD5CA8 8005EB08 860E0030 */ lh $t6, 0x30($s0) -/* AD5CAC 8005EB0C 448E2000 */ mtc1 $t6, $f4 -/* AD5CB0 8005EB10 00000000 */ nop -/* AD5CB4 8005EB14 468021A0 */ cvt.s.w $f6, $f4 -/* AD5CB8 8005EB18 C7A40088 */ lwc1 $f4, 0x88($sp) -/* AD5CBC 8005EB1C 46002005 */ abs.s $f0, $f4 -/* AD5CC0 8005EB20 E7A60060 */ swc1 $f6, 0x60($sp) -/* AD5CC4 8005EB24 860F0032 */ lh $t7, 0x32($s0) -/* AD5CC8 8005EB28 4614003C */ c.lt.s $f0, $f20 -/* AD5CCC 8005EB2C 448F4000 */ mtc1 $t7, $f8 -/* AD5CD0 8005EB30 00000000 */ nop -/* AD5CD4 8005EB34 468042A0 */ cvt.s.w $f10, $f8 -/* AD5CD8 8005EB38 E7AA0064 */ swc1 $f10, 0x64($sp) -/* AD5CDC 8005EB3C 86180034 */ lh $t8, 0x34($s0) -/* AD5CE0 8005EB40 C7AA006C */ lwc1 $f10, 0x6c($sp) -/* AD5CE4 8005EB44 44988000 */ mtc1 $t8, $f16 -/* AD5CE8 8005EB48 00000000 */ nop -/* AD5CEC 8005EB4C 468084A0 */ cvt.s.w $f18, $f16 -/* AD5CF0 8005EB50 C7B00060 */ lwc1 $f16, 0x60($sp) -/* AD5CF4 8005EB54 45010017 */ bc1t .L8005EBB4 -/* AD5CF8 8005EB58 E7B20068 */ swc1 $f18, 0x68($sp) -/* AD5CFC 8005EB5C 86190036 */ lh $t9, 0x36($s0) -/* AD5D00 8005EB60 46105481 */ sub.s $f18, $f10, $f16 -/* AD5D04 8005EB64 C7AA0064 */ lwc1 $f10, 0x64($sp) -/* AD5D08 8005EB68 44993000 */ mtc1 $t9, $f6 -/* AD5D0C 8005EB6C 00000000 */ nop -/* AD5D10 8005EB70 46803220 */ cvt.s.w $f8, $f6 -/* AD5D14 8005EB74 46044003 */ div.s $f0, $f8, $f4 -/* AD5D18 8005EB78 C7A40070 */ lwc1 $f4, 0x70($sp) -/* AD5D1C 8005EB7C 46009182 */ mul.s $f6, $f18, $f0 -/* AD5D20 8005EB80 460A2481 */ sub.s $f18, $f4, $f10 -/* AD5D24 8005EB84 C7A40068 */ lwc1 $f4, 0x68($sp) -/* AD5D28 8005EB88 46103200 */ add.s $f8, $f6, $f16 -/* AD5D2C 8005EB8C 46009182 */ mul.s $f6, $f18, $f0 -/* AD5D30 8005EB90 E7A80078 */ swc1 $f8, 0x78($sp) -/* AD5D34 8005EB94 C7A80074 */ lwc1 $f8, 0x74($sp) -/* AD5D38 8005EB98 46044481 */ sub.s $f18, $f8, $f4 -/* AD5D3C 8005EB9C 460A3400 */ add.s $f16, $f6, $f10 -/* AD5D40 8005EBA0 46009182 */ mul.s $f6, $f18, $f0 -/* AD5D44 8005EBA4 E7B0007C */ swc1 $f16, 0x7c($sp) -/* AD5D48 8005EBA8 46043280 */ add.s $f10, $f6, $f4 -/* AD5D4C 8005EBAC 10000003 */ b .L8005EBBC -/* AD5D50 8005EBB0 E7AA0080 */ swc1 $f10, 0x80($sp) -.L8005EBB4: -/* AD5D54 8005EBB4 0C01DF90 */ jal Math_Vec3f_Copy -/* AD5D58 8005EBB8 02602825 */ move $a1, $s3 -.L8005EBBC: -/* AD5D5C 8005EBBC 27A80060 */ addiu $t0, $sp, 0x60 -/* AD5D60 8005EBC0 AFA80018 */ sw $t0, 0x18($sp) -/* AD5D64 8005EBC4 8FA400A0 */ lw $a0, 0xa0($sp) -/* AD5D68 8005EBC8 8FA500A8 */ lw $a1, 0xa8($sp) -/* AD5D6C 8005EBCC 02203025 */ move $a2, $s1 -/* AD5D70 8005EBD0 02603825 */ move $a3, $s3 -/* AD5D74 8005EBD4 AFB50010 */ sw $s5, 0x10($sp) -/* AD5D78 8005EBD8 AFB00014 */ sw $s0, 0x14($sp) -/* AD5D7C 8005EBDC 0C017A07 */ jal func_8005E81C -/* AD5D80 8005EBE0 AFB4001C */ sw $s4, 0x1c($sp) -/* AD5D84 8005EBE4 92A90013 */ lbu $t1, 0x13($s5) -/* AD5D88 8005EBE8 312A0040 */ andi $t2, $t1, 0x40 -/* AD5D8C 8005EBEC 51400013 */ beql $t2, $zero, .L8005EC3C -/* AD5D90 8005EBF0 8FBF0054 */ lw $ra, 0x54($sp) -.L8005EBF4: -/* AD5D94 8005EBF4 8ECC0018 */ lw $t4, 0x18($s6) -.L8005EBF8: -/* AD5D98 8005EBF8 8ECB001C */ lw $t3, 0x1c($s6) -/* AD5D9C 8005EBFC 26100040 */ addiu $s0, $s0, 0x40 -/* AD5DA0 8005EC00 000C6980 */ sll $t5, $t4, 6 -/* AD5DA4 8005EC04 016D7021 */ addu $t6, $t3, $t5 -/* AD5DA8 8005EC08 020E082B */ sltu $at, $s0, $t6 -/* AD5DAC 8005EC0C 1420FFA0 */ bnez $at, .L8005EA90 -/* AD5DB0 8005EC10 00000000 */ nop -/* AD5DB4 8005EC14 8FA2009C */ lw $v0, 0x9c($sp) -.L8005EC18: -/* AD5DB8 8005EC18 26310040 */ addiu $s1, $s1, 0x40 -/* AD5DBC 8005EC1C 8C580018 */ lw $t8, 0x18($v0) -/* AD5DC0 8005EC20 8C4F001C */ lw $t7, 0x1c($v0) -/* AD5DC4 8005EC24 0018C980 */ sll $t9, $t8, 6 -/* AD5DC8 8005EC28 01F94021 */ addu $t0, $t7, $t9 -/* AD5DCC 8005EC2C 0228082B */ sltu $at, $s1, $t0 -/* AD5DD0 8005EC30 1420FF8C */ bnez $at, .L8005EA64 -/* AD5DD4 8005EC34 00000000 */ nop -.L8005EC38: -/* AD5DD8 8005EC38 8FBF0054 */ lw $ra, 0x54($sp) -.L8005EC3C: -/* AD5DDC 8005EC3C D7B40028 */ ldc1 $f20, 0x28($sp) -/* AD5DE0 8005EC40 8FB00030 */ lw $s0, 0x30($sp) -/* AD5DE4 8005EC44 8FB10034 */ lw $s1, 0x34($sp) -/* AD5DE8 8005EC48 8FB20038 */ lw $s2, 0x38($sp) -/* AD5DEC 8005EC4C 8FB3003C */ lw $s3, 0x3c($sp) -/* AD5DF0 8005EC50 8FB40040 */ lw $s4, 0x40($sp) -/* AD5DF4 8005EC54 8FB50044 */ lw $s5, 0x44($sp) -/* AD5DF8 8005EC58 8FB60048 */ lw $s6, 0x48($sp) -/* AD5DFC 8005EC5C 8FB7004C */ lw $s7, 0x4c($sp) -/* AD5E00 8005EC60 8FBE0050 */ lw $fp, 0x50($sp) -/* AD5E04 8005EC64 03E00008 */ jr $ra -/* AD5E08 8005EC68 27BD00A0 */ addiu $sp, $sp, 0xa0 - -/* AD5E0C 8005EC6C 27BDFF70 */ addiu $sp, $sp, -0x90 -/* AD5E10 8005EC70 AFBF0044 */ sw $ra, 0x44($sp) -/* AD5E14 8005EC74 AFB60040 */ sw $s6, 0x40($sp) -/* AD5E18 8005EC78 AFB5003C */ sw $s5, 0x3c($sp) -/* AD5E1C 8005EC7C AFB40038 */ sw $s4, 0x38($sp) -/* AD5E20 8005EC80 AFB30034 */ sw $s3, 0x34($sp) -/* AD5E24 8005EC84 AFB20030 */ sw $s2, 0x30($sp) -/* AD5E28 8005EC88 AFB1002C */ sw $s1, 0x2c($sp) -/* AD5E2C 8005EC8C AFB00028 */ sw $s0, 0x28($sp) -/* AD5E30 8005EC90 AFA40090 */ sw $a0, 0x90($sp) -/* AD5E34 8005EC94 AFA50094 */ sw $a1, 0x94($sp) -/* AD5E38 8005EC98 8CCE0018 */ lw $t6, 0x18($a2) -/* AD5E3C 8005EC9C 00E09025 */ move $s2, $a3 -/* AD5E40 8005ECA0 00C09825 */ move $s3, $a2 -/* AD5E44 8005ECA4 59C00085 */ blezl $t6, .L8005EEBC -/* AD5E48 8005ECA8 8FBF0044 */ lw $ra, 0x44($sp) -/* AD5E4C 8005ECAC 8CCF001C */ lw $t7, 0x1c($a2) -/* AD5E50 8005ECB0 51E00082 */ beql $t7, $zero, .L8005EEBC -/* AD5E54 8005ECB4 8FBF0044 */ lw $ra, 0x44($sp) -/* AD5E58 8005ECB8 84F80040 */ lh $t8, 0x40($a3) -/* AD5E5C 8005ECBC 5B00007F */ blezl $t8, .L8005EEBC -/* AD5E60 8005ECC0 8FBF0044 */ lw $ra, 0x44($sp) -/* AD5E64 8005ECC4 84F90042 */ lh $t9, 0x42($a3) -/* AD5E68 8005ECC8 24F60018 */ addiu $s6, $a3, 0x18 -/* AD5E6C 8005ECCC 02C02025 */ move $a0, $s6 -/* AD5E70 8005ECD0 5B20007A */ blezl $t9, .L8005EEBC -/* AD5E74 8005ECD4 8FBF0044 */ lw $ra, 0x44($sp) -/* AD5E78 8005ECD8 0C0177D4 */ jal func_8005DF50 -/* AD5E7C 8005ECDC AFA60098 */ sw $a2, 0x98($sp) -/* AD5E80 8005ECE0 24110001 */ li $s1, 1 -/* AD5E84 8005ECE4 10510074 */ beq $v0, $s1, .L8005EEB8 -/* AD5E88 8005ECE8 8FA30098 */ lw $v1, 0x98($sp) -/* AD5E8C 8005ECEC 8C680018 */ lw $t0, 0x18($v1) -/* AD5E90 8005ECF0 8C70001C */ lw $s0, 0x1c($v1) -/* AD5E94 8005ECF4 27B5007C */ addiu $s5, $sp, 0x7c -/* AD5E98 8005ECF8 00084980 */ sll $t1, $t0, 6 -/* AD5E9C 8005ECFC 02095021 */ addu $t2, $s0, $t1 -/* AD5EA0 8005ED00 020A082B */ sltu $at, $s0, $t2 -/* AD5EA4 8005ED04 1020006C */ beqz $at, .L8005EEB8 -/* AD5EA8 8005ED08 27B40080 */ addiu $s4, $sp, 0x80 -.L8005ED0C: -/* AD5EAC 8005ED0C 0C0177CB */ jal func_8005DF2C -/* AD5EB0 8005ED10 02002025 */ move $a0, $s0 -/* AD5EB4 8005ED14 10510060 */ beq $v0, $s1, .L8005EE98 -/* AD5EB8 8005ED18 02002025 */ move $a0, $s0 -/* AD5EBC 8005ED1C 0C0177DD */ jal func_8005DF74 -/* AD5EC0 8005ED20 02C02825 */ move $a1, $s6 -/* AD5EC4 8005ED24 1051005C */ beq $v0, $s1, .L8005EE98 -/* AD5EC8 8005ED28 26040030 */ addiu $a0, $s0, 0x30 -/* AD5ECC 8005ED2C 26450040 */ addiu $a1, $s2, 0x40 -/* AD5ED0 8005ED30 02803025 */ move $a2, $s4 -/* AD5ED4 8005ED34 0C033F69 */ jal func_800CFDA4 -/* AD5ED8 8005ED38 02A03825 */ move $a3, $s5 -/* AD5EDC 8005ED3C 50400057 */ beql $v0, $zero, .L8005EE9C -/* AD5EE0 8005ED40 8E6B0018 */ lw $t3, 0x18($s3) -/* AD5EE4 8005ED44 860B0030 */ lh $t3, 0x30($s0) -/* AD5EE8 8005ED48 3C018014 */ lui $at, %hi(D_8013ACFC) -/* AD5EEC 8005ED4C 27A40070 */ addiu $a0, $sp, 0x70 -/* AD5EF0 8005ED50 448B2000 */ mtc1 $t3, $f4 -/* AD5EF4 8005ED54 00000000 */ nop -/* AD5EF8 8005ED58 468021A0 */ cvt.s.w $f6, $f4 -/* AD5EFC 8005ED5C E7A60064 */ swc1 $f6, 0x64($sp) -/* AD5F00 8005ED60 860C0032 */ lh $t4, 0x32($s0) -/* AD5F04 8005ED64 448C4000 */ mtc1 $t4, $f8 -/* AD5F08 8005ED68 00000000 */ nop -/* AD5F0C 8005ED6C 468042A0 */ cvt.s.w $f10, $f8 -/* AD5F10 8005ED70 E7AA0068 */ swc1 $f10, 0x68($sp) -/* AD5F14 8005ED74 860D0034 */ lh $t5, 0x34($s0) -/* AD5F18 8005ED78 448D8000 */ mtc1 $t5, $f16 -/* AD5F1C 8005ED7C 00000000 */ nop -/* AD5F20 8005ED80 468084A0 */ cvt.s.w $f18, $f16 -/* AD5F24 8005ED84 E7B2006C */ swc1 $f18, 0x6c($sp) -/* AD5F28 8005ED88 864E0046 */ lh $t6, 0x46($s2) -/* AD5F2C 8005ED8C 448E2000 */ mtc1 $t6, $f4 -/* AD5F30 8005ED90 00000000 */ nop -/* AD5F34 8005ED94 468021A0 */ cvt.s.w $f6, $f4 -/* AD5F38 8005ED98 C7A4007C */ lwc1 $f4, 0x7c($sp) -/* AD5F3C 8005ED9C 46002005 */ abs.s $f0, $f4 -/* AD5F40 8005EDA0 E7A60058 */ swc1 $f6, 0x58($sp) -/* AD5F44 8005EDA4 864F0048 */ lh $t7, 0x48($s2) -/* AD5F48 8005EDA8 C426ACFC */ lwc1 $f6, %lo(D_8013ACFC)($at) -/* AD5F4C 8005EDAC 448F4000 */ mtc1 $t7, $f8 -/* AD5F50 8005EDB0 4606003C */ c.lt.s $f0, $f6 -/* AD5F54 8005EDB4 468042A0 */ cvt.s.w $f10, $f8 -/* AD5F58 8005EDB8 E7AA005C */ swc1 $f10, 0x5c($sp) -/* AD5F5C 8005EDBC 8658004A */ lh $t8, 0x4a($s2) -/* AD5F60 8005EDC0 44988000 */ mtc1 $t8, $f16 -/* AD5F64 8005EDC4 00000000 */ nop -/* AD5F68 8005EDC8 468084A0 */ cvt.s.w $f18, $f16 -/* AD5F6C 8005EDCC 45010023 */ bc1t .L8005EE5C -/* AD5F70 8005EDD0 E7B20060 */ swc1 $f18, 0x60($sp) -/* AD5F74 8005EDD4 86590040 */ lh $t9, 0x40($s2) -/* AD5F78 8005EDD8 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* AD5F7C 8005EDDC 44818000 */ mtc1 $at, $f16 -/* AD5F80 8005EDE0 44994000 */ mtc1 $t9, $f8 -/* AD5F84 8005EDE4 C7A20058 */ lwc1 $f2, 0x58($sp) -/* AD5F88 8005EDE8 C7B20064 */ lwc1 $f18, 0x64($sp) -/* AD5F8C 8005EDEC 468042A0 */ cvt.s.w $f10, $f8 -/* AD5F90 8005EDF0 27A40070 */ addiu $a0, $sp, 0x70 -/* AD5F94 8005EDF4 46045003 */ div.s $f0, $f10, $f4 -/* AD5F98 8005EDF8 4610003E */ c.le.s $f0, $f16 -/* AD5F9C 8005EDFC 00000000 */ nop -/* AD5FA0 8005EE00 45000012 */ bc1f .L8005EE4C -/* AD5FA4 8005EE04 00000000 */ nop -/* AD5FA8 8005EE08 46029181 */ sub.s $f6, $f18, $f2 -/* AD5FAC 8005EE0C C7AC005C */ lwc1 $f12, 0x5c($sp) -/* AD5FB0 8005EE10 C7A40068 */ lwc1 $f4, 0x68($sp) -/* AD5FB4 8005EE14 C7AE0060 */ lwc1 $f14, 0x60($sp) -/* AD5FB8 8005EE18 46003202 */ mul.s $f8, $f6, $f0 -/* AD5FBC 8005EE1C 460C2401 */ sub.s $f16, $f4, $f12 -/* AD5FC0 8005EE20 46008482 */ mul.s $f18, $f16, $f0 -/* AD5FC4 8005EE24 46024280 */ add.s $f10, $f8, $f2 -/* AD5FC8 8005EE28 C7A8006C */ lwc1 $f8, 0x6c($sp) -/* AD5FCC 8005EE2C E7AA0070 */ swc1 $f10, 0x70($sp) -/* AD5FD0 8005EE30 460E4281 */ sub.s $f10, $f8, $f14 -/* AD5FD4 8005EE34 460C9180 */ add.s $f6, $f18, $f12 -/* AD5FD8 8005EE38 46005102 */ mul.s $f4, $f10, $f0 -/* AD5FDC 8005EE3C E7A60074 */ swc1 $f6, 0x74($sp) -/* AD5FE0 8005EE40 460E2400 */ add.s $f16, $f4, $f14 -/* AD5FE4 8005EE44 10000007 */ b .L8005EE64 -/* AD5FE8 8005EE48 E7B00078 */ swc1 $f16, 0x78($sp) -.L8005EE4C: -/* AD5FEC 8005EE4C 0C01DF90 */ jal Math_Vec3f_Copy -/* AD5FF0 8005EE50 27A50064 */ addiu $a1, $sp, 0x64 -/* AD5FF4 8005EE54 10000004 */ b .L8005EE68 -/* AD5FF8 8005EE58 27A80058 */ addiu $t0, $sp, 0x58 -.L8005EE5C: -/* AD5FFC 8005EE5C 0C01DF90 */ jal Math_Vec3f_Copy -/* AD6000 8005EE60 27A50064 */ addiu $a1, $sp, 0x64 -.L8005EE64: -/* AD6004 8005EE64 27A80058 */ addiu $t0, $sp, 0x58 -.L8005EE68: -/* AD6008 8005EE68 27A90070 */ addiu $t1, $sp, 0x70 -/* AD600C 8005EE6C AFA9001C */ sw $t1, 0x1c($sp) -/* AD6010 8005EE70 AFA80018 */ sw $t0, 0x18($sp) -/* AD6014 8005EE74 8FA40090 */ lw $a0, 0x90($sp) -/* AD6018 8005EE78 8FA50098 */ lw $a1, 0x98($sp) -/* AD601C 8005EE7C 02003025 */ move $a2, $s0 -/* AD6020 8005EE80 27A70064 */ addiu $a3, $sp, 0x64 -/* AD6024 8005EE84 AFB20010 */ sw $s2, 0x10($sp) -/* AD6028 8005EE88 0C017A07 */ jal func_8005E81C -/* AD602C 8005EE8C AFB60014 */ sw $s6, 0x14($sp) -/* AD6030 8005EE90 1000000A */ b .L8005EEBC -/* AD6034 8005EE94 8FBF0044 */ lw $ra, 0x44($sp) -.L8005EE98: -/* AD6038 8005EE98 8E6B0018 */ lw $t3, 0x18($s3) -.L8005EE9C: -/* AD603C 8005EE9C 8E6A001C */ lw $t2, 0x1c($s3) -/* AD6040 8005EEA0 26100040 */ addiu $s0, $s0, 0x40 -/* AD6044 8005EEA4 000B6180 */ sll $t4, $t3, 6 -/* AD6048 8005EEA8 014C6821 */ addu $t5, $t2, $t4 -/* AD604C 8005EEAC 020D082B */ sltu $at, $s0, $t5 -/* AD6050 8005EEB0 1420FF96 */ bnez $at, .L8005ED0C -/* AD6054 8005EEB4 00000000 */ nop -.L8005EEB8: -/* AD6058 8005EEB8 8FBF0044 */ lw $ra, 0x44($sp) -.L8005EEBC: -/* AD605C 8005EEBC 8FB00028 */ lw $s0, 0x28($sp) -/* AD6060 8005EEC0 8FB1002C */ lw $s1, 0x2c($sp) -/* AD6064 8005EEC4 8FB20030 */ lw $s2, 0x30($sp) -/* AD6068 8005EEC8 8FB30034 */ lw $s3, 0x34($sp) -/* AD606C 8005EECC 8FB40038 */ lw $s4, 0x38($sp) -/* AD6070 8005EED0 8FB5003C */ lw $s5, 0x3c($sp) -/* AD6074 8005EED4 8FB60040 */ lw $s6, 0x40($sp) -/* AD6078 8005EED8 03E00008 */ jr $ra -/* AD607C 8005EEDC 27BD0090 */ addiu $sp, $sp, 0x90 - -/* AD6080 8005EEE0 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* AD6084 8005EEE4 AFBF005C */ sw $ra, 0x5c($sp) -/* AD6088 8005EEE8 AFBE0058 */ sw $fp, 0x58($sp) -/* AD608C 8005EEEC AFB70054 */ sw $s7, 0x54($sp) -/* AD6090 8005EEF0 AFB60050 */ sw $s6, 0x50($sp) -/* AD6094 8005EEF4 AFB5004C */ sw $s5, 0x4c($sp) -/* AD6098 8005EEF8 AFB40048 */ sw $s4, 0x48($sp) -/* AD609C 8005EEFC AFB30044 */ sw $s3, 0x44($sp) -/* AD60A0 8005EF00 AFB20040 */ sw $s2, 0x40($sp) -/* AD60A4 8005EF04 AFB1003C */ sw $s1, 0x3c($sp) -/* AD60A8 8005EF08 AFB00038 */ sw $s0, 0x38($sp) -/* AD60AC 8005EF0C F7B60030 */ sdc1 $f22, 0x30($sp) -/* AD60B0 8005EF10 F7B40028 */ sdc1 $f20, 0x28($sp) -/* AD60B4 8005EF14 AFA400A8 */ sw $a0, 0xa8($sp) -/* AD60B8 8005EF18 AFA500AC */ sw $a1, 0xac($sp) -/* AD60BC 8005EF1C 8CEE0018 */ lw $t6, 0x18($a3) -/* AD60C0 8005EF20 00C08825 */ move $s1, $a2 -/* AD60C4 8005EF24 00E0A825 */ move $s5, $a3 -/* AD60C8 8005EF28 19C00086 */ blez $t6, .L8005F144 -/* AD60CC 8005EF2C 00E0B825 */ move $s7, $a3 -/* AD60D0 8005EF30 8CEF001C */ lw $t7, 0x1c($a3) -/* AD60D4 8005EF34 51E00084 */ beql $t7, $zero, .L8005F148 -/* AD60D8 8005EF38 8FBF005C */ lw $ra, 0x5c($sp) -/* AD60DC 8005EF3C 84D80040 */ lh $t8, 0x40($a2) -/* AD60E0 8005EF40 5B000081 */ blezl $t8, .L8005F148 -/* AD60E4 8005EF44 8FBF005C */ lw $ra, 0x5c($sp) -/* AD60E8 8005EF48 84D90042 */ lh $t9, 0x42($a2) -/* AD60EC 8005EF4C 24D40018 */ addiu $s4, $a2, 0x18 -/* AD60F0 8005EF50 5B20007D */ blezl $t9, .L8005F148 -/* AD60F4 8005EF54 8FBF005C */ lw $ra, 0x5c($sp) -/* AD60F8 8005EF58 0C0177CB */ jal func_8005DF2C -/* AD60FC 8005EF5C 02802025 */ move $a0, $s4 -/* AD6100 8005EF60 24160001 */ li $s6, 1 -/* AD6104 8005EF64 50560078 */ beql $v0, $s6, .L8005F148 -/* AD6108 8005EF68 8FBF005C */ lw $ra, 0x5c($sp) -/* AD610C 8005EF6C 8EA80018 */ lw $t0, 0x18($s5) -/* AD6110 8005EF70 8EB0001C */ lw $s0, 0x1c($s5) -/* AD6114 8005EF74 27BE009C */ addiu $fp, $sp, 0x9c -/* AD6118 8005EF78 00084980 */ sll $t1, $t0, 6 -/* AD611C 8005EF7C 02095021 */ addu $t2, $s0, $t1 -/* AD6120 8005EF80 020A082B */ sltu $at, $s0, $t2 -/* AD6124 8005EF84 1020006F */ beqz $at, .L8005F144 -/* AD6128 8005EF88 27B30088 */ addiu $s3, $sp, 0x88 -/* AD612C 8005EF8C 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* AD6130 8005EF90 4481B000 */ mtc1 $at, $f22 -/* AD6134 8005EF94 3C018014 */ lui $at, %hi(D_8013AD00) -/* AD6138 8005EF98 C434AD00 */ lwc1 $f20, %lo(D_8013AD00)($at) -/* AD613C 8005EF9C 27B2007C */ addiu $s2, $sp, 0x7c -.L8005EFA0: -/* AD6140 8005EFA0 0C0177D4 */ jal func_8005DF50 -/* AD6144 8005EFA4 02002025 */ move $a0, $s0 -/* AD6148 8005EFA8 1056005E */ beq $v0, $s6, .L8005F124 -/* AD614C 8005EFAC 02802025 */ move $a0, $s4 -/* AD6150 8005EFB0 0C0177DD */ jal func_8005DF74 -/* AD6154 8005EFB4 02002825 */ move $a1, $s0 -/* AD6158 8005EFB8 1056005A */ beq $v0, $s6, .L8005F124 -/* AD615C 8005EFBC 26040030 */ addiu $a0, $s0, 0x30 -/* AD6160 8005EFC0 26250040 */ addiu $a1, $s1, 0x40 -/* AD6164 8005EFC4 03C03025 */ move $a2, $fp -/* AD6168 8005EFC8 0C033F69 */ jal func_800CFDA4 -/* AD616C 8005EFCC 27A70098 */ addiu $a3, $sp, 0x98 -/* AD6170 8005EFD0 50400055 */ beql $v0, $zero, .L8005F128 -/* AD6174 8005EFD4 8EEC0018 */ lw $t4, 0x18($s7) -/* AD6178 8005EFD8 862B0046 */ lh $t3, 0x46($s1) -/* AD617C 8005EFDC 02602025 */ move $a0, $s3 -/* AD6180 8005EFE0 448B2000 */ mtc1 $t3, $f4 -/* AD6184 8005EFE4 00000000 */ nop -/* AD6188 8005EFE8 468021A0 */ cvt.s.w $f6, $f4 -/* AD618C 8005EFEC E7A6007C */ swc1 $f6, 0x7c($sp) -/* AD6190 8005EFF0 862C0048 */ lh $t4, 0x48($s1) -/* AD6194 8005EFF4 448C4000 */ mtc1 $t4, $f8 -/* AD6198 8005EFF8 00000000 */ nop -/* AD619C 8005EFFC 468042A0 */ cvt.s.w $f10, $f8 -/* AD61A0 8005F000 E7AA0080 */ swc1 $f10, 0x80($sp) -/* AD61A4 8005F004 862D004A */ lh $t5, 0x4a($s1) -/* AD61A8 8005F008 448D8000 */ mtc1 $t5, $f16 -/* AD61AC 8005F00C 00000000 */ nop -/* AD61B0 8005F010 468084A0 */ cvt.s.w $f18, $f16 -/* AD61B4 8005F014 E7B20084 */ swc1 $f18, 0x84($sp) -/* AD61B8 8005F018 860E0030 */ lh $t6, 0x30($s0) -/* AD61BC 8005F01C 448E2000 */ mtc1 $t6, $f4 -/* AD61C0 8005F020 00000000 */ nop -/* AD61C4 8005F024 468021A0 */ cvt.s.w $f6, $f4 -/* AD61C8 8005F028 C7A40098 */ lwc1 $f4, 0x98($sp) -/* AD61CC 8005F02C 46002005 */ abs.s $f0, $f4 -/* AD61D0 8005F030 E7A60070 */ swc1 $f6, 0x70($sp) -/* AD61D4 8005F034 860F0032 */ lh $t7, 0x32($s0) -/* AD61D8 8005F038 4614003C */ c.lt.s $f0, $f20 -/* AD61DC 8005F03C 448F4000 */ mtc1 $t7, $f8 -/* AD61E0 8005F040 00000000 */ nop -/* AD61E4 8005F044 468042A0 */ cvt.s.w $f10, $f8 -/* AD61E8 8005F048 E7AA0074 */ swc1 $f10, 0x74($sp) -/* AD61EC 8005F04C 86180034 */ lh $t8, 0x34($s0) -/* AD61F0 8005F050 44988000 */ mtc1 $t8, $f16 -/* AD61F4 8005F054 00000000 */ nop -/* AD61F8 8005F058 468084A0 */ cvt.s.w $f18, $f16 -/* AD61FC 8005F05C 45010021 */ bc1t .L8005F0E4 -/* AD6200 8005F060 E7B20078 */ swc1 $f18, 0x78($sp) -/* AD6204 8005F064 86190036 */ lh $t9, 0x36($s0) -/* AD6208 8005F068 C7A20070 */ lwc1 $f2, 0x70($sp) -/* AD620C 8005F06C C7AA007C */ lwc1 $f10, 0x7c($sp) -/* AD6210 8005F070 44993000 */ mtc1 $t9, $f6 -/* AD6214 8005F074 02602025 */ move $a0, $s3 -/* AD6218 8005F078 46803220 */ cvt.s.w $f8, $f6 -/* AD621C 8005F07C 46044003 */ div.s $f0, $f8, $f4 -/* AD6220 8005F080 4616003E */ c.le.s $f0, $f22 -/* AD6224 8005F084 00000000 */ nop -/* AD6228 8005F088 45000012 */ bc1f .L8005F0D4 -/* AD622C 8005F08C 00000000 */ nop -/* AD6230 8005F090 46025401 */ sub.s $f16, $f10, $f2 -/* AD6234 8005F094 C7AC0074 */ lwc1 $f12, 0x74($sp) -/* AD6238 8005F098 C7A80080 */ lwc1 $f8, 0x80($sp) -/* AD623C 8005F09C C7AE0078 */ lwc1 $f14, 0x78($sp) -/* AD6240 8005F0A0 46008482 */ mul.s $f18, $f16, $f0 -/* AD6244 8005F0A4 460C4101 */ sub.s $f4, $f8, $f12 -/* AD6248 8005F0A8 46002282 */ mul.s $f10, $f4, $f0 -/* AD624C 8005F0AC 46029180 */ add.s $f6, $f18, $f2 -/* AD6250 8005F0B0 C7B20084 */ lwc1 $f18, 0x84($sp) -/* AD6254 8005F0B4 E7A60088 */ swc1 $f6, 0x88($sp) -/* AD6258 8005F0B8 460E9181 */ sub.s $f6, $f18, $f14 -/* AD625C 8005F0BC 460C5400 */ add.s $f16, $f10, $f12 -/* AD6260 8005F0C0 46003202 */ mul.s $f8, $f6, $f0 -/* AD6264 8005F0C4 E7B0008C */ swc1 $f16, 0x8c($sp) -/* AD6268 8005F0C8 460E4100 */ add.s $f4, $f8, $f14 -/* AD626C 8005F0CC 10000007 */ b .L8005F0EC -/* AD6270 8005F0D0 E7A40090 */ swc1 $f4, 0x90($sp) -.L8005F0D4: -/* AD6274 8005F0D4 0C01DF90 */ jal Math_Vec3f_Copy -/* AD6278 8005F0D8 02402825 */ move $a1, $s2 -/* AD627C 8005F0DC 10000004 */ b .L8005F0F0 -/* AD6280 8005F0E0 27A80070 */ addiu $t0, $sp, 0x70 -.L8005F0E4: -/* AD6284 8005F0E4 0C01DF90 */ jal Math_Vec3f_Copy -/* AD6288 8005F0E8 02402825 */ move $a1, $s2 -.L8005F0EC: -/* AD628C 8005F0EC 27A80070 */ addiu $t0, $sp, 0x70 -.L8005F0F0: -/* AD6290 8005F0F0 AFA80018 */ sw $t0, 0x18($sp) -/* AD6294 8005F0F4 8FA400A8 */ lw $a0, 0xa8($sp) -/* AD6298 8005F0F8 02202825 */ move $a1, $s1 -/* AD629C 8005F0FC 02803025 */ move $a2, $s4 -/* AD62A0 8005F100 02403825 */ move $a3, $s2 -/* AD62A4 8005F104 AFB50010 */ sw $s5, 0x10($sp) -/* AD62A8 8005F108 AFB00014 */ sw $s0, 0x14($sp) -/* AD62AC 8005F10C 0C017A07 */ jal func_8005E81C -/* AD62B0 8005F110 AFB3001C */ sw $s3, 0x1c($sp) -/* AD62B4 8005F114 92A90013 */ lbu $t1, 0x13($s5) -/* AD62B8 8005F118 312A0040 */ andi $t2, $t1, 0x40 -/* AD62BC 8005F11C 5140000A */ beql $t2, $zero, .L8005F148 -/* AD62C0 8005F120 8FBF005C */ lw $ra, 0x5c($sp) -.L8005F124: -/* AD62C4 8005F124 8EEC0018 */ lw $t4, 0x18($s7) -.L8005F128: -/* AD62C8 8005F128 8EEB001C */ lw $t3, 0x1c($s7) -/* AD62CC 8005F12C 26100040 */ addiu $s0, $s0, 0x40 -/* AD62D0 8005F130 000C6980 */ sll $t5, $t4, 6 -/* AD62D4 8005F134 016D7021 */ addu $t6, $t3, $t5 -/* AD62D8 8005F138 020E082B */ sltu $at, $s0, $t6 -/* AD62DC 8005F13C 1420FF98 */ bnez $at, .L8005EFA0 -/* AD62E0 8005F140 00000000 */ nop -.L8005F144: -/* AD62E4 8005F144 8FBF005C */ lw $ra, 0x5c($sp) -.L8005F148: -/* AD62E8 8005F148 D7B40028 */ ldc1 $f20, 0x28($sp) -/* AD62EC 8005F14C D7B60030 */ ldc1 $f22, 0x30($sp) -/* AD62F0 8005F150 8FB00038 */ lw $s0, 0x38($sp) -/* AD62F4 8005F154 8FB1003C */ lw $s1, 0x3c($sp) -/* AD62F8 8005F158 8FB20040 */ lw $s2, 0x40($sp) -/* AD62FC 8005F15C 8FB30044 */ lw $s3, 0x44($sp) -/* AD6300 8005F160 8FB40048 */ lw $s4, 0x48($sp) -/* AD6304 8005F164 8FB5004C */ lw $s5, 0x4c($sp) -/* AD6308 8005F168 8FB60050 */ lw $s6, 0x50($sp) -/* AD630C 8005F16C 8FB70054 */ lw $s7, 0x54($sp) -/* AD6310 8005F170 8FBE0058 */ lw $fp, 0x58($sp) -/* AD6314 8005F174 03E00008 */ jr $ra -/* AD6318 8005F178 27BD00A8 */ addiu $sp, $sp, 0xa8 - -/* AD631C 8005F17C 27BDFF78 */ addiu $sp, $sp, -0x88 -/* AD6320 8005F180 AFBF0044 */ sw $ra, 0x44($sp) -/* AD6324 8005F184 AFB70040 */ sw $s7, 0x40($sp) -/* AD6328 8005F188 AFB6003C */ sw $s6, 0x3c($sp) -/* AD632C 8005F18C AFB50038 */ sw $s5, 0x38($sp) -/* AD6330 8005F190 AFB40034 */ sw $s4, 0x34($sp) -/* AD6334 8005F194 AFB30030 */ sw $s3, 0x30($sp) -/* AD6338 8005F198 AFB2002C */ sw $s2, 0x2c($sp) -/* AD633C 8005F19C AFB10028 */ sw $s1, 0x28($sp) -/* AD6340 8005F1A0 AFB00024 */ sw $s0, 0x24($sp) -/* AD6344 8005F1A4 AFA40088 */ sw $a0, 0x88($sp) -/* AD6348 8005F1A8 AFA5008C */ sw $a1, 0x8c($sp) -/* AD634C 8005F1AC 8CC30018 */ lw $v1, 0x18($a2) -/* AD6350 8005F1B0 00E0B025 */ move $s6, $a3 -/* AD6354 8005F1B4 00C0B825 */ move $s7, $a2 -/* AD6358 8005F1B8 1860006D */ blez $v1, .L8005F370 -/* AD635C 8005F1BC 00E09825 */ move $s3, $a3 -/* AD6360 8005F1C0 8CC2001C */ lw $v0, 0x1c($a2) -/* AD6364 8005F1C4 5040006B */ beql $v0, $zero, .L8005F374 -/* AD6368 8005F1C8 8FBF0044 */ lw $ra, 0x44($sp) -/* AD636C 8005F1CC 8CEE0018 */ lw $t6, 0x18($a3) -/* AD6370 8005F1D0 59C00068 */ blezl $t6, .L8005F374 -/* AD6374 8005F1D4 8FBF0044 */ lw $ra, 0x44($sp) -/* AD6378 8005F1D8 8CEF001C */ lw $t7, 0x1c($a3) -/* AD637C 8005F1DC 0003C180 */ sll $t8, $v1, 6 -/* AD6380 8005F1E0 0058C821 */ addu $t9, $v0, $t8 -/* AD6384 8005F1E4 11E00062 */ beqz $t7, .L8005F370 -/* AD6388 8005F1E8 0059082B */ sltu $at, $v0, $t9 -/* AD638C 8005F1EC 10200060 */ beqz $at, .L8005F370 -/* AD6390 8005F1F0 00409025 */ move $s2, $v0 -/* AD6394 8005F1F4 AFA60090 */ sw $a2, 0x90($sp) -/* AD6398 8005F1F8 27B5006C */ addiu $s5, $sp, 0x6c -/* AD639C 8005F1FC 2414005C */ li $s4, 92 -/* AD63A0 8005F200 24110001 */ li $s1, 1 -.L8005F204: -/* AD63A4 8005F204 0C0177CB */ jal func_8005DF2C -/* AD63A8 8005F208 02402025 */ move $a0, $s2 -/* AD63AC 8005F20C 50510051 */ beql $v0, $s1, .L8005F354 -/* AD63B0 8005F210 8EEA0018 */ lw $t2, 0x18($s7) -/* AD63B4 8005F214 8EC80018 */ lw $t0, 0x18($s6) -/* AD63B8 8005F218 8ED0001C */ lw $s0, 0x1c($s6) -/* AD63BC 8005F21C 01140019 */ multu $t0, $s4 -/* AD63C0 8005F220 00004812 */ mflo $t1 -/* AD63C4 8005F224 02095021 */ addu $t2, $s0, $t1 -/* AD63C8 8005F228 020A082B */ sltu $at, $s0, $t2 -/* AD63CC 8005F22C 50200049 */ beql $at, $zero, .L8005F354 -/* AD63D0 8005F230 8EEA0018 */ lw $t2, 0x18($s7) -.L8005F234: -/* AD63D4 8005F234 0C0177D4 */ jal func_8005DF50 -/* AD63D8 8005F238 02002025 */ move $a0, $s0 -/* AD63DC 8005F23C 1051003B */ beq $v0, $s1, .L8005F32C -/* AD63E0 8005F240 02402025 */ move $a0, $s2 -/* AD63E4 8005F244 0C0177DD */ jal func_8005DF74 -/* AD63E8 8005F248 02002825 */ move $a1, $s0 -/* AD63EC 8005F24C 10510037 */ beq $v0, $s1, .L8005F32C -/* AD63F0 8005F250 26440030 */ addiu $a0, $s2, 0x30 -/* AD63F4 8005F254 26050028 */ addiu $a1, $s0, 0x28 -/* AD63F8 8005F258 0C033A4D */ jal func_800CE934 -/* AD63FC 8005F25C 02A03025 */ move $a2, $s5 -/* AD6400 8005F260 54510033 */ bnel $v0, $s1, .L8005F330 -/* AD6404 8005F264 8E780018 */ lw $t8, 0x18($s3) -/* AD6408 8005F268 864B0030 */ lh $t3, 0x30($s2) -/* AD640C 8005F26C 3C018014 */ lui $at, %hi(D_8013AD04) -/* AD6410 8005F270 C420AD04 */ lwc1 $f0, %lo(D_8013AD04)($at) -/* AD6414 8005F274 448B2000 */ mtc1 $t3, $f4 -/* AD6418 8005F278 27AE0054 */ addiu $t6, $sp, 0x54 -/* AD641C 8005F27C 8FA40088 */ lw $a0, 0x88($sp) -/* AD6420 8005F280 468021A0 */ cvt.s.w $f6, $f4 -/* AD6424 8005F284 8FA50090 */ lw $a1, 0x90($sp) -/* AD6428 8005F288 02403025 */ move $a2, $s2 -/* AD642C 8005F28C 27A70060 */ addiu $a3, $sp, 0x60 -/* AD6430 8005F290 E7A60060 */ swc1 $f6, 0x60($sp) -/* AD6434 8005F294 864C0032 */ lh $t4, 0x32($s2) -/* AD6438 8005F298 448C4000 */ mtc1 $t4, $f8 -/* AD643C 8005F29C 00000000 */ nop -/* AD6440 8005F2A0 468042A0 */ cvt.s.w $f10, $f8 -/* AD6444 8005F2A4 E7AA0064 */ swc1 $f10, 0x64($sp) -/* AD6448 8005F2A8 864D0034 */ lh $t5, 0x34($s2) -/* AD644C 8005F2AC 448D8000 */ mtc1 $t5, $f16 -/* AD6450 8005F2B0 00000000 */ nop -/* AD6454 8005F2B4 468084A0 */ cvt.s.w $f18, $f16 -/* AD6458 8005F2B8 E7B20068 */ swc1 $f18, 0x68($sp) -/* AD645C 8005F2BC C6060034 */ lwc1 $f6, 0x34($s0) -/* AD6460 8005F2C0 C6040028 */ lwc1 $f4, 0x28($s0) -/* AD6464 8005F2C4 C60A0040 */ lwc1 $f10, 0x40($s0) -/* AD6468 8005F2C8 46062200 */ add.s $f8, $f4, $f6 -/* AD646C 8005F2CC 46085400 */ add.s $f16, $f10, $f8 -/* AD6470 8005F2D0 46008482 */ mul.s $f18, $f16, $f0 -/* AD6474 8005F2D4 E7B20054 */ swc1 $f18, 0x54($sp) -/* AD6478 8005F2D8 C6060038 */ lwc1 $f6, 0x38($s0) -/* AD647C 8005F2DC C604002C */ lwc1 $f4, 0x2c($s0) -/* AD6480 8005F2E0 C6080044 */ lwc1 $f8, 0x44($s0) -/* AD6484 8005F2E4 46062280 */ add.s $f10, $f4, $f6 -/* AD6488 8005F2E8 460A4400 */ add.s $f16, $f8, $f10 -/* AD648C 8005F2EC 46008482 */ mul.s $f18, $f16, $f0 -/* AD6490 8005F2F0 E7B20058 */ swc1 $f18, 0x58($sp) -/* AD6494 8005F2F4 C606003C */ lwc1 $f6, 0x3c($s0) -/* AD6498 8005F2F8 C6040030 */ lwc1 $f4, 0x30($s0) -/* AD649C 8005F2FC C60A0048 */ lwc1 $f10, 0x48($s0) -/* AD64A0 8005F300 AFB5001C */ sw $s5, 0x1c($sp) -/* AD64A4 8005F304 46062200 */ add.s $f8, $f4, $f6 -/* AD64A8 8005F308 AFAE0018 */ sw $t6, 0x18($sp) -/* AD64AC 8005F30C AFB00014 */ sw $s0, 0x14($sp) -/* AD64B0 8005F310 AFB60010 */ sw $s6, 0x10($sp) -/* AD64B4 8005F314 46085400 */ add.s $f16, $f10, $f8 -/* AD64B8 8005F318 46008482 */ mul.s $f18, $f16, $f0 -/* AD64BC 8005F31C 0C017A07 */ jal func_8005E81C -/* AD64C0 8005F320 E7B2005C */ swc1 $f18, 0x5c($sp) -/* AD64C4 8005F324 10000013 */ b .L8005F374 -/* AD64C8 8005F328 8FBF0044 */ lw $ra, 0x44($sp) -.L8005F32C: -/* AD64CC 8005F32C 8E780018 */ lw $t8, 0x18($s3) -.L8005F330: -/* AD64D0 8005F330 8E6F001C */ lw $t7, 0x1c($s3) -/* AD64D4 8005F334 2610005C */ addiu $s0, $s0, 0x5c -/* AD64D8 8005F338 03140019 */ multu $t8, $s4 -/* AD64DC 8005F33C 0000C812 */ mflo $t9 -/* AD64E0 8005F340 01F94021 */ addu $t0, $t7, $t9 -/* AD64E4 8005F344 0208082B */ sltu $at, $s0, $t0 -/* AD64E8 8005F348 1420FFBA */ bnez $at, .L8005F234 -/* AD64EC 8005F34C 00000000 */ nop -/* AD64F0 8005F350 8EEA0018 */ lw $t2, 0x18($s7) -.L8005F354: -/* AD64F4 8005F354 8EE9001C */ lw $t1, 0x1c($s7) -/* AD64F8 8005F358 26520040 */ addiu $s2, $s2, 0x40 -/* AD64FC 8005F35C 000A5980 */ sll $t3, $t2, 6 -/* AD6500 8005F360 012B6021 */ addu $t4, $t1, $t3 -/* AD6504 8005F364 024C082B */ sltu $at, $s2, $t4 -/* AD6508 8005F368 1420FFA6 */ bnez $at, .L8005F204 -/* AD650C 8005F36C 00000000 */ nop -.L8005F370: -/* AD6510 8005F370 8FBF0044 */ lw $ra, 0x44($sp) -.L8005F374: -/* AD6514 8005F374 8FB00024 */ lw $s0, 0x24($sp) -/* AD6518 8005F378 8FB10028 */ lw $s1, 0x28($sp) -/* AD651C 8005F37C 8FB2002C */ lw $s2, 0x2c($sp) -/* AD6520 8005F380 8FB30030 */ lw $s3, 0x30($sp) -/* AD6524 8005F384 8FB40034 */ lw $s4, 0x34($sp) -/* AD6528 8005F388 8FB50038 */ lw $s5, 0x38($sp) -/* AD652C 8005F38C 8FB6003C */ lw $s6, 0x3c($sp) -/* AD6530 8005F390 8FB70040 */ lw $s7, 0x40($sp) -/* AD6534 8005F394 03E00008 */ jr $ra -/* AD6538 8005F398 27BD0088 */ addiu $sp, $sp, 0x88 - -/* AD653C 8005F39C 27BDFF68 */ addiu $sp, $sp, -0x98 -/* AD6540 8005F3A0 AFBF0054 */ sw $ra, 0x54($sp) -/* AD6544 8005F3A4 AFBE0050 */ sw $fp, 0x50($sp) -/* AD6548 8005F3A8 AFB7004C */ sw $s7, 0x4c($sp) -/* AD654C 8005F3AC AFB60048 */ sw $s6, 0x48($sp) -/* AD6550 8005F3B0 AFB50044 */ sw $s5, 0x44($sp) -/* AD6554 8005F3B4 AFB40040 */ sw $s4, 0x40($sp) -/* AD6558 8005F3B8 AFB3003C */ sw $s3, 0x3c($sp) -/* AD655C 8005F3BC AFB20038 */ sw $s2, 0x38($sp) -/* AD6560 8005F3C0 AFB10034 */ sw $s1, 0x34($sp) -/* AD6564 8005F3C4 AFB00030 */ sw $s0, 0x30($sp) -/* AD6568 8005F3C8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* AD656C 8005F3CC AFA40098 */ sw $a0, 0x98($sp) -/* AD6570 8005F3D0 AFA5009C */ sw $a1, 0x9c($sp) -/* AD6574 8005F3D4 AFA7008C */ sw $a3, 0x8c($sp) -/* AD6578 8005F3D8 8CE30018 */ lw $v1, 0x18($a3) -/* AD657C 8005F3DC 00E0B025 */ move $s6, $a3 -/* AD6580 8005F3E0 00C0B825 */ move $s7, $a2 -/* AD6584 8005F3E4 58600066 */ blezl $v1, .L8005F580 -/* AD6588 8005F3E8 8FBF0054 */ lw $ra, 0x54($sp) -/* AD658C 8005F3EC 8CE2001C */ lw $v0, 0x1c($a3) -/* AD6590 8005F3F0 50400063 */ beql $v0, $zero, .L8005F580 -/* AD6594 8005F3F4 8FBF0054 */ lw $ra, 0x54($sp) -/* AD6598 8005F3F8 8CCE0018 */ lw $t6, 0x18($a2) -/* AD659C 8005F3FC 59C00060 */ blezl $t6, .L8005F580 -/* AD65A0 8005F400 8FBF0054 */ lw $ra, 0x54($sp) -/* AD65A4 8005F404 8CCF001C */ lw $t7, 0x1c($a2) -/* AD65A8 8005F408 0003C180 */ sll $t8, $v1, 6 -/* AD65AC 8005F40C 0058C821 */ addu $t9, $v0, $t8 -/* AD65B0 8005F410 11E0005A */ beqz $t7, .L8005F57C -/* AD65B4 8005F414 0059082B */ sltu $at, $v0, $t9 -/* AD65B8 8005F418 10200058 */ beqz $at, .L8005F57C -/* AD65BC 8005F41C 00409825 */ move $s3, $v0 -/* AD65C0 8005F420 3C018014 */ lui $at, %hi(D_8013AD08) -/* AD65C4 8005F424 C434AD08 */ lwc1 $f20, %lo(D_8013AD08)($at) -/* AD65C8 8005F428 AFA600A0 */ sw $a2, 0xa0($sp) -/* AD65CC 8005F42C 241E005C */ li $fp, 92 -/* AD65D0 8005F430 27B50064 */ addiu $s5, $sp, 0x64 -/* AD65D4 8005F434 27B4007C */ addiu $s4, $sp, 0x7c -/* AD65D8 8005F438 24120001 */ li $s2, 1 -.L8005F43C: -/* AD65DC 8005F43C 0C0177D4 */ jal func_8005DF50 -/* AD65E0 8005F440 02602025 */ move $a0, $s3 -/* AD65E4 8005F444 10520044 */ beq $v0, $s2, .L8005F558 -/* AD65E8 8005F448 8FA800A0 */ lw $t0, 0xa0($sp) -/* AD65EC 8005F44C 8D090018 */ lw $t1, 0x18($t0) -/* AD65F0 8005F450 8D10001C */ lw $s0, 0x1c($t0) -/* AD65F4 8005F454 013E0019 */ multu $t1, $fp -/* AD65F8 8005F458 00005012 */ mflo $t2 -/* AD65FC 8005F45C 020A5821 */ addu $t3, $s0, $t2 -/* AD6600 8005F460 020B082B */ sltu $at, $s0, $t3 -/* AD6604 8005F464 5020003D */ beql $at, $zero, .L8005F55C -/* AD6608 8005F468 8FA2008C */ lw $v0, 0x8c($sp) -.L8005F46C: -/* AD660C 8005F46C 0C0177CB */ jal func_8005DF2C -/* AD6610 8005F470 02002025 */ move $a0, $s0 -/* AD6614 8005F474 1052002F */ beq $v0, $s2, .L8005F534 -/* AD6618 8005F478 02002025 */ move $a0, $s0 -/* AD661C 8005F47C 0C0177DD */ jal func_8005DF74 -/* AD6620 8005F480 02602825 */ move $a1, $s3 -/* AD6624 8005F484 1052002B */ beq $v0, $s2, .L8005F534 -/* AD6628 8005F488 26710030 */ addiu $s1, $s3, 0x30 -/* AD662C 8005F48C 02202025 */ move $a0, $s1 -/* AD6630 8005F490 26050028 */ addiu $a1, $s0, 0x28 -/* AD6634 8005F494 0C033A4D */ jal func_800CE934 -/* AD6638 8005F498 02803025 */ move $a2, $s4 -/* AD663C 8005F49C 14520025 */ bne $v0, $s2, .L8005F534 -/* AD6640 8005F4A0 02A02025 */ move $a0, $s5 -/* AD6644 8005F4A4 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD6648 8005F4A8 02202825 */ move $a1, $s1 -/* AD664C 8005F4AC C6040028 */ lwc1 $f4, 0x28($s0) -/* AD6650 8005F4B0 C6060034 */ lwc1 $f6, 0x34($s0) -/* AD6654 8005F4B4 C60A0040 */ lwc1 $f10, 0x40($s0) -/* AD6658 8005F4B8 8FA40098 */ lw $a0, 0x98($sp) -/* AD665C 8005F4BC 46062200 */ add.s $f8, $f4, $f6 -/* AD6660 8005F4C0 8FA500A0 */ lw $a1, 0xa0($sp) -/* AD6664 8005F4C4 02003025 */ move $a2, $s0 -/* AD6668 8005F4C8 27A70070 */ addiu $a3, $sp, 0x70 -/* AD666C 8005F4CC 46085400 */ add.s $f16, $f10, $f8 -/* AD6670 8005F4D0 46148482 */ mul.s $f18, $f16, $f20 -/* AD6674 8005F4D4 E7B20070 */ swc1 $f18, 0x70($sp) -/* AD6678 8005F4D8 C6060038 */ lwc1 $f6, 0x38($s0) -/* AD667C 8005F4DC C604002C */ lwc1 $f4, 0x2c($s0) -/* AD6680 8005F4E0 C6080044 */ lwc1 $f8, 0x44($s0) -/* AD6684 8005F4E4 46062280 */ add.s $f10, $f4, $f6 -/* AD6688 8005F4E8 460A4400 */ add.s $f16, $f8, $f10 -/* AD668C 8005F4EC 46148482 */ mul.s $f18, $f16, $f20 -/* AD6690 8005F4F0 E7B20074 */ swc1 $f18, 0x74($sp) -/* AD6694 8005F4F4 C606003C */ lwc1 $f6, 0x3c($s0) -/* AD6698 8005F4F8 C6040030 */ lwc1 $f4, 0x30($s0) -/* AD669C 8005F4FC C60A0048 */ lwc1 $f10, 0x48($s0) -/* AD66A0 8005F500 AFB4001C */ sw $s4, 0x1c($sp) -/* AD66A4 8005F504 46062200 */ add.s $f8, $f4, $f6 -/* AD66A8 8005F508 AFB50018 */ sw $s5, 0x18($sp) -/* AD66AC 8005F50C AFB30014 */ sw $s3, 0x14($sp) -/* AD66B0 8005F510 AFB60010 */ sw $s6, 0x10($sp) -/* AD66B4 8005F514 46085400 */ add.s $f16, $f10, $f8 -/* AD66B8 8005F518 46148482 */ mul.s $f18, $f16, $f20 -/* AD66BC 8005F51C 0C017A07 */ jal func_8005E81C -/* AD66C0 8005F520 E7B20078 */ swc1 $f18, 0x78($sp) -/* AD66C4 8005F524 92CC0013 */ lbu $t4, 0x13($s6) -/* AD66C8 8005F528 318D0040 */ andi $t5, $t4, 0x40 -/* AD66CC 8005F52C 51A00014 */ beql $t5, $zero, .L8005F580 -/* AD66D0 8005F530 8FBF0054 */ lw $ra, 0x54($sp) -.L8005F534: -/* AD66D4 8005F534 8EEF0018 */ lw $t7, 0x18($s7) -/* AD66D8 8005F538 8EEE001C */ lw $t6, 0x1c($s7) -/* AD66DC 8005F53C 2610005C */ addiu $s0, $s0, 0x5c -/* AD66E0 8005F540 01FE0019 */ multu $t7, $fp -/* AD66E4 8005F544 0000C012 */ mflo $t8 -/* AD66E8 8005F548 01D8C821 */ addu $t9, $t6, $t8 -/* AD66EC 8005F54C 0219082B */ sltu $at, $s0, $t9 -/* AD66F0 8005F550 1420FFC6 */ bnez $at, .L8005F46C -/* AD66F4 8005F554 00000000 */ nop -.L8005F558: -/* AD66F8 8005F558 8FA2008C */ lw $v0, 0x8c($sp) -.L8005F55C: -/* AD66FC 8005F55C 26730040 */ addiu $s3, $s3, 0x40 -/* AD6700 8005F560 8C490018 */ lw $t1, 0x18($v0) -/* AD6704 8005F564 8C48001C */ lw $t0, 0x1c($v0) -/* AD6708 8005F568 00095180 */ sll $t2, $t1, 6 -/* AD670C 8005F56C 010A5821 */ addu $t3, $t0, $t2 -/* AD6710 8005F570 026B082B */ sltu $at, $s3, $t3 -/* AD6714 8005F574 1420FFB1 */ bnez $at, .L8005F43C -/* AD6718 8005F578 00000000 */ nop -.L8005F57C: -/* AD671C 8005F57C 8FBF0054 */ lw $ra, 0x54($sp) -.L8005F580: -/* AD6720 8005F580 D7B40028 */ ldc1 $f20, 0x28($sp) -/* AD6724 8005F584 8FB00030 */ lw $s0, 0x30($sp) -/* AD6728 8005F588 8FB10034 */ lw $s1, 0x34($sp) -/* AD672C 8005F58C 8FB20038 */ lw $s2, 0x38($sp) -/* AD6730 8005F590 8FB3003C */ lw $s3, 0x3c($sp) -/* AD6734 8005F594 8FB40040 */ lw $s4, 0x40($sp) -/* AD6738 8005F598 8FB50044 */ lw $s5, 0x44($sp) -/* AD673C 8005F59C 8FB60048 */ lw $s6, 0x48($sp) -/* AD6740 8005F5A0 8FB7004C */ lw $s7, 0x4c($sp) -/* AD6744 8005F5A4 8FBE0050 */ lw $fp, 0x50($sp) -/* AD6748 8005F5A8 03E00008 */ jr $ra -/* AD674C 8005F5AC 27BD0098 */ addiu $sp, $sp, 0x98 - -/* AD6750 8005F5B0 27BDFF70 */ addiu $sp, $sp, -0x90 -/* AD6754 8005F5B4 AFBF004C */ sw $ra, 0x4c($sp) -/* AD6758 8005F5B8 AFBE0048 */ sw $fp, 0x48($sp) -/* AD675C 8005F5BC AFB70044 */ sw $s7, 0x44($sp) -/* AD6760 8005F5C0 AFB60040 */ sw $s6, 0x40($sp) -/* AD6764 8005F5C4 AFB5003C */ sw $s5, 0x3c($sp) -/* AD6768 8005F5C8 AFB40038 */ sw $s4, 0x38($sp) -/* AD676C 8005F5CC AFB30034 */ sw $s3, 0x34($sp) -/* AD6770 8005F5D0 AFB20030 */ sw $s2, 0x30($sp) -/* AD6774 8005F5D4 AFB1002C */ sw $s1, 0x2c($sp) -/* AD6778 8005F5D8 AFB00028 */ sw $s0, 0x28($sp) -/* AD677C 8005F5DC AFA40090 */ sw $a0, 0x90($sp) -/* AD6780 8005F5E0 AFA50094 */ sw $a1, 0x94($sp) -/* AD6784 8005F5E4 8CCE0018 */ lw $t6, 0x18($a2) -/* AD6788 8005F5E8 00E09825 */ move $s3, $a3 -/* AD678C 8005F5EC 00C0A825 */ move $s5, $a2 -/* AD6790 8005F5F0 59C0006C */ blezl $t6, .L8005F7A4 -/* AD6794 8005F5F4 8FBF004C */ lw $ra, 0x4c($sp) -/* AD6798 8005F5F8 8CCF001C */ lw $t7, 0x1c($a2) -/* AD679C 8005F5FC 24F60018 */ addiu $s6, $a3, 0x18 -/* AD67A0 8005F600 02C02025 */ move $a0, $s6 -/* AD67A4 8005F604 51E00067 */ beql $t7, $zero, .L8005F7A4 -/* AD67A8 8005F608 8FBF004C */ lw $ra, 0x4c($sp) -/* AD67AC 8005F60C 0C0177D4 */ jal func_8005DF50 -/* AD67B0 8005F610 AFA60098 */ sw $a2, 0x98($sp) -/* AD67B4 8005F614 24120001 */ li $s2, 1 -/* AD67B8 8005F618 10520061 */ beq $v0, $s2, .L8005F7A0 -/* AD67BC 8005F61C 3C178016 */ lui $s7, %hi(D_8015E230) # $s7, 0x8016 -/* AD67C0 8005F620 26F7E230 */ addiu $s7, %lo(D_8015E230) # addiu $s7, $s7, -0x1dd0 -/* AD67C4 8005F624 26710058 */ addiu $s1, $s3, 0x58 -/* AD67C8 8005F628 2670004C */ addiu $s0, $s3, 0x4c -/* AD67CC 8005F62C 02003825 */ move $a3, $s0 -/* AD67D0 8005F630 02202825 */ move $a1, $s1 -/* AD67D4 8005F634 02E02025 */ move $a0, $s7 -/* AD67D8 8005F638 0C0338F0 */ jal Math3D_TriNorm -/* AD67DC 8005F63C 26660064 */ addiu $a2, $s3, 0x64 -/* AD67E0 8005F640 3C1E8016 */ lui $fp, %hi(D_8015E268) # $fp, 0x8016 -/* AD67E4 8005F644 27DEE268 */ addiu $fp, %lo(D_8015E268) # addiu $fp, $fp, -0x1d98 -/* AD67E8 8005F648 03C02025 */ move $a0, $fp -/* AD67EC 8005F64C 02002825 */ move $a1, $s0 -/* AD67F0 8005F650 26660040 */ addiu $a2, $s3, 0x40 -/* AD67F4 8005F654 0C0338F0 */ jal Math3D_TriNorm -/* AD67F8 8005F658 02203825 */ move $a3, $s1 -/* AD67FC 8005F65C 8FA30098 */ lw $v1, 0x98($sp) -/* AD6800 8005F660 27B4007C */ addiu $s4, $sp, 0x7c -/* AD6804 8005F664 8C780018 */ lw $t8, 0x18($v1) -/* AD6808 8005F668 8C70001C */ lw $s0, 0x1c($v1) -/* AD680C 8005F66C 0018C980 */ sll $t9, $t8, 6 -/* AD6810 8005F670 02194021 */ addu $t0, $s0, $t9 -/* AD6814 8005F674 0208082B */ sltu $at, $s0, $t0 -/* AD6818 8005F678 5020004A */ beql $at, $zero, .L8005F7A4 -/* AD681C 8005F67C 8FBF004C */ lw $ra, 0x4c($sp) -.L8005F680: -/* AD6820 8005F680 0C0177CB */ jal func_8005DF2C -/* AD6824 8005F684 02002025 */ move $a0, $s0 -/* AD6828 8005F688 1052003D */ beq $v0, $s2, .L8005F780 -/* AD682C 8005F68C 02002025 */ move $a0, $s0 -/* AD6830 8005F690 0C0177DD */ jal func_8005DF74 -/* AD6834 8005F694 02C02825 */ move $a1, $s6 -/* AD6838 8005F698 10520039 */ beq $v0, $s2, .L8005F780 -/* AD683C 8005F69C 26110030 */ addiu $s1, $s0, 0x30 -/* AD6840 8005F6A0 02202025 */ move $a0, $s1 -/* AD6844 8005F6A4 02E02825 */ move $a1, $s7 -/* AD6848 8005F6A8 0C033A4D */ jal func_800CE934 -/* AD684C 8005F6AC 02803025 */ move $a2, $s4 -/* AD6850 8005F6B0 10520006 */ beq $v0, $s2, .L8005F6CC -/* AD6854 8005F6B4 02202025 */ move $a0, $s1 -/* AD6858 8005F6B8 03C02825 */ move $a1, $fp -/* AD685C 8005F6BC 0C033A4D */ jal func_800CE934 -/* AD6860 8005F6C0 02803025 */ move $a2, $s4 -/* AD6864 8005F6C4 5452002F */ bnel $v0, $s2, .L8005F784 -/* AD6868 8005F6C8 8EAB0018 */ lw $t3, 0x18($s5) -.L8005F6CC: -/* AD686C 8005F6CC 27B2006C */ addiu $s2, $sp, 0x6c -/* AD6870 8005F6D0 02402025 */ move $a0, $s2 -/* AD6874 8005F6D4 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD6878 8005F6D8 02202825 */ move $a1, $s1 -/* AD687C 8005F6DC C6640058 */ lwc1 $f4, 0x58($s3) -/* AD6880 8005F6E0 C6660064 */ lwc1 $f6, 0x64($s3) -/* AD6884 8005F6E4 C66A004C */ lwc1 $f10, 0x4c($s3) -/* AD6888 8005F6E8 C6720040 */ lwc1 $f18, 0x40($s3) -/* AD688C 8005F6EC 46062200 */ add.s $f8, $f4, $f6 -/* AD6890 8005F6F0 3C013E80 */ li $at, 0x3E800000 # 0.000000 -/* AD6894 8005F6F4 44810000 */ mtc1 $at, $f0 -/* AD6898 8005F6F8 27A90060 */ addiu $t1, $sp, 0x60 -/* AD689C 8005F6FC 460A4400 */ add.s $f16, $f8, $f10 -/* AD68A0 8005F700 8FA40090 */ lw $a0, 0x90($sp) -/* AD68A4 8005F704 8FA50098 */ lw $a1, 0x98($sp) -/* AD68A8 8005F708 02003025 */ move $a2, $s0 -/* AD68AC 8005F70C 46128100 */ add.s $f4, $f16, $f18 -/* AD68B0 8005F710 02403825 */ move $a3, $s2 -/* AD68B4 8005F714 46002182 */ mul.s $f6, $f4, $f0 -/* AD68B8 8005F718 E7A60060 */ swc1 $f6, 0x60($sp) -/* AD68BC 8005F71C C66A0068 */ lwc1 $f10, 0x68($s3) -/* AD68C0 8005F720 C668005C */ lwc1 $f8, 0x5c($s3) -/* AD68C4 8005F724 C6720050 */ lwc1 $f18, 0x50($s3) -/* AD68C8 8005F728 C6660044 */ lwc1 $f6, 0x44($s3) -/* AD68CC 8005F72C 460A4400 */ add.s $f16, $f8, $f10 -/* AD68D0 8005F730 46128100 */ add.s $f4, $f16, $f18 -/* AD68D4 8005F734 46062200 */ add.s $f8, $f4, $f6 -/* AD68D8 8005F738 46004282 */ mul.s $f10, $f8, $f0 -/* AD68DC 8005F73C E7AA0064 */ swc1 $f10, 0x64($sp) -/* AD68E0 8005F740 C672006C */ lwc1 $f18, 0x6c($s3) -/* AD68E4 8005F744 C6700060 */ lwc1 $f16, 0x60($s3) -/* AD68E8 8005F748 C6660054 */ lwc1 $f6, 0x54($s3) -/* AD68EC 8005F74C C66A0048 */ lwc1 $f10, 0x48($s3) -/* AD68F0 8005F750 46128100 */ add.s $f4, $f16, $f18 -/* AD68F4 8005F754 AFB4001C */ sw $s4, 0x1c($sp) -/* AD68F8 8005F758 AFA90018 */ sw $t1, 0x18($sp) -/* AD68FC 8005F75C AFB60014 */ sw $s6, 0x14($sp) -/* AD6900 8005F760 46062200 */ add.s $f8, $f4, $f6 -/* AD6904 8005F764 AFB30010 */ sw $s3, 0x10($sp) -/* AD6908 8005F768 460A4400 */ add.s $f16, $f8, $f10 -/* AD690C 8005F76C 46008482 */ mul.s $f18, $f16, $f0 -/* AD6910 8005F770 0C017A07 */ jal func_8005E81C -/* AD6914 8005F774 E7B20068 */ swc1 $f18, 0x68($sp) -/* AD6918 8005F778 1000000A */ b .L8005F7A4 -/* AD691C 8005F77C 8FBF004C */ lw $ra, 0x4c($sp) -.L8005F780: -/* AD6920 8005F780 8EAB0018 */ lw $t3, 0x18($s5) -.L8005F784: -/* AD6924 8005F784 8EAA001C */ lw $t2, 0x1c($s5) -/* AD6928 8005F788 26100040 */ addiu $s0, $s0, 0x40 -/* AD692C 8005F78C 000B6180 */ sll $t4, $t3, 6 -/* AD6930 8005F790 014C6821 */ addu $t5, $t2, $t4 -/* AD6934 8005F794 020D082B */ sltu $at, $s0, $t5 -/* AD6938 8005F798 1420FFB9 */ bnez $at, .L8005F680 -/* AD693C 8005F79C 00000000 */ nop -.L8005F7A0: -/* AD6940 8005F7A0 8FBF004C */ lw $ra, 0x4c($sp) -.L8005F7A4: -/* AD6944 8005F7A4 8FB00028 */ lw $s0, 0x28($sp) -/* AD6948 8005F7A8 8FB1002C */ lw $s1, 0x2c($sp) -/* AD694C 8005F7AC 8FB20030 */ lw $s2, 0x30($sp) -/* AD6950 8005F7B0 8FB30034 */ lw $s3, 0x34($sp) -/* AD6954 8005F7B4 8FB40038 */ lw $s4, 0x38($sp) -/* AD6958 8005F7B8 8FB5003C */ lw $s5, 0x3c($sp) -/* AD695C 8005F7BC 8FB60040 */ lw $s6, 0x40($sp) -/* AD6960 8005F7C0 8FB70044 */ lw $s7, 0x44($sp) -/* AD6964 8005F7C4 8FBE0048 */ lw $fp, 0x48($sp) -/* AD6968 8005F7C8 03E00008 */ jr $ra -/* AD696C 8005F7CC 27BD0090 */ addiu $sp, $sp, 0x90 - -/* AD6970 8005F7D0 27BDFF68 */ addiu $sp, $sp, -0x98 -/* AD6974 8005F7D4 AFBF0054 */ sw $ra, 0x54($sp) -/* AD6978 8005F7D8 AFBE0050 */ sw $fp, 0x50($sp) -/* AD697C 8005F7DC AFB7004C */ sw $s7, 0x4c($sp) -/* AD6980 8005F7E0 AFB60048 */ sw $s6, 0x48($sp) -/* AD6984 8005F7E4 AFB50044 */ sw $s5, 0x44($sp) -/* AD6988 8005F7E8 AFB40040 */ sw $s4, 0x40($sp) -/* AD698C 8005F7EC AFB3003C */ sw $s3, 0x3c($sp) -/* AD6990 8005F7F0 AFB20038 */ sw $s2, 0x38($sp) -/* AD6994 8005F7F4 AFB10034 */ sw $s1, 0x34($sp) -/* AD6998 8005F7F8 AFB00030 */ sw $s0, 0x30($sp) -/* AD699C 8005F7FC F7B40028 */ sdc1 $f20, 0x28($sp) -/* AD69A0 8005F800 AFA5009C */ sw $a1, 0x9c($sp) -/* AD69A4 8005F804 8CEE0018 */ lw $t6, 0x18($a3) -/* AD69A8 8005F808 00C08025 */ move $s0, $a2 -/* AD69AC 8005F80C 00E0A825 */ move $s5, $a3 -/* AD69B0 8005F810 0080F025 */ move $fp, $a0 -/* AD69B4 8005F814 19C00079 */ blez $t6, .L8005F9FC -/* AD69B8 8005F818 00E0B825 */ move $s7, $a3 -/* AD69BC 8005F81C 8CEF001C */ lw $t7, 0x1c($a3) -/* AD69C0 8005F820 24D60018 */ addiu $s6, $a2, 0x18 -/* AD69C4 8005F824 51E00076 */ beql $t7, $zero, .L8005FA00 -/* AD69C8 8005F828 8FBF0054 */ lw $ra, 0x54($sp) -/* AD69CC 8005F82C 0C0177CB */ jal func_8005DF2C -/* AD69D0 8005F830 02C02025 */ move $a0, $s6 -/* AD69D4 8005F834 24140001 */ li $s4, 1 -/* AD69D8 8005F838 10540070 */ beq $v0, $s4, .L8005F9FC -/* AD69DC 8005F83C 3C048016 */ lui $a0, %hi(D_8015E2A0) # $a0, 0x8016 -/* AD69E0 8005F840 26110058 */ addiu $s1, $s0, 0x58 -/* AD69E4 8005F844 2612004C */ addiu $s2, $s0, 0x4c -/* AD69E8 8005F848 02403825 */ move $a3, $s2 -/* AD69EC 8005F84C 02202825 */ move $a1, $s1 -/* AD69F0 8005F850 2484E2A0 */ addiu $a0, %lo(D_8015E2A0) # addiu $a0, $a0, -0x1d60 -/* AD69F4 8005F854 0C0338F0 */ jal Math3D_TriNorm -/* AD69F8 8005F858 26060064 */ addiu $a2, $s0, 0x64 -/* AD69FC 8005F85C 3C048016 */ lui $a0, %hi(D_8015E2D8) # $a0, 0x8016 -/* AD6A00 8005F860 2484E2D8 */ addiu $a0, %lo(D_8015E2D8) # addiu $a0, $a0, -0x1d28 -/* AD6A04 8005F864 02202825 */ move $a1, $s1 -/* AD6A08 8005F868 02403025 */ move $a2, $s2 -/* AD6A0C 8005F86C 0C0338F0 */ jal Math3D_TriNorm -/* AD6A10 8005F870 26070040 */ addiu $a3, $s0, 0x40 -/* AD6A14 8005F874 8EB80018 */ lw $t8, 0x18($s5) -/* AD6A18 8005F878 8EB1001C */ lw $s1, 0x1c($s5) -/* AD6A1C 8005F87C 0018C980 */ sll $t9, $t8, 6 -/* AD6A20 8005F880 02394021 */ addu $t0, $s1, $t9 -/* AD6A24 8005F884 0228082B */ sltu $at, $s1, $t0 -/* AD6A28 8005F888 1020005C */ beqz $at, .L8005F9FC -/* AD6A2C 8005F88C 3C013E80 */ li $at, 0x3E800000 # 0.000000 -/* AD6A30 8005F890 4481A000 */ mtc1 $at, $f20 -/* AD6A34 8005F894 27B30088 */ addiu $s3, $sp, 0x88 -.L8005F898: -/* AD6A38 8005F898 0C0177D4 */ jal func_8005DF50 -/* AD6A3C 8005F89C 02202025 */ move $a0, $s1 -/* AD6A40 8005F8A0 1054004E */ beq $v0, $s4, .L8005F9DC -/* AD6A44 8005F8A4 02C02025 */ move $a0, $s6 -/* AD6A48 8005F8A8 0C0177DD */ jal func_8005DF74 -/* AD6A4C 8005F8AC 02202825 */ move $a1, $s1 -/* AD6A50 8005F8B0 1054004A */ beq $v0, $s4, .L8005F9DC -/* AD6A54 8005F8B4 26320030 */ addiu $s2, $s1, 0x30 -/* AD6A58 8005F8B8 3C058016 */ lui $a1, %hi(D_8015E2A0) # $a1, 0x8016 -/* AD6A5C 8005F8BC 24A5E2A0 */ addiu $a1, %lo(D_8015E2A0) # addiu $a1, $a1, -0x1d60 -/* AD6A60 8005F8C0 02402025 */ move $a0, $s2 -/* AD6A64 8005F8C4 0C033A4D */ jal func_800CE934 -/* AD6A68 8005F8C8 02603025 */ move $a2, $s3 -/* AD6A6C 8005F8CC 10540006 */ beq $v0, $s4, .L8005F8E8 -/* AD6A70 8005F8D0 02402025 */ move $a0, $s2 -/* AD6A74 8005F8D4 3C058016 */ lui $a1, %hi(D_8015E2D8) # $a1, 0x8016 -/* AD6A78 8005F8D8 24A5E2D8 */ addiu $a1, %lo(D_8015E2D8) # addiu $a1, $a1, -0x1d28 -/* AD6A7C 8005F8DC 0C033A4D */ jal func_800CE934 -/* AD6A80 8005F8E0 02603025 */ move $a2, $s3 -/* AD6A84 8005F8E4 1454003D */ bne $v0, $s4, .L8005F9DC -.L8005F8E8: -/* AD6A88 8005F8E8 03C02025 */ move $a0, $fp -/* AD6A8C 8005F8EC 02002825 */ move $a1, $s0 -/* AD6A90 8005F8F0 0C017486 */ jal func_8005D218 -/* AD6A94 8005F8F4 02603025 */ move $a2, $s3 -/* AD6A98 8005F8F8 50400039 */ beql $v0, $zero, .L8005F9E0 -/* AD6A9C 8005F8FC 8EF80018 */ lw $t8, 0x18($s7) -/* AD6AA0 8005F900 86290030 */ lh $t1, 0x30($s1) -/* AD6AA4 8005F904 27AC0068 */ addiu $t4, $sp, 0x68 -/* AD6AA8 8005F908 03C02025 */ move $a0, $fp -/* AD6AAC 8005F90C 44892000 */ mtc1 $t1, $f4 -/* AD6AB0 8005F910 02002825 */ move $a1, $s0 -/* AD6AB4 8005F914 02C03025 */ move $a2, $s6 -/* AD6AB8 8005F918 468021A0 */ cvt.s.w $f6, $f4 -/* AD6ABC 8005F91C 27A70074 */ addiu $a3, $sp, 0x74 -/* AD6AC0 8005F920 E7A60068 */ swc1 $f6, 0x68($sp) -/* AD6AC4 8005F924 862A0032 */ lh $t2, 0x32($s1) -/* AD6AC8 8005F928 448A4000 */ mtc1 $t2, $f8 -/* AD6ACC 8005F92C 00000000 */ nop -/* AD6AD0 8005F930 468042A0 */ cvt.s.w $f10, $f8 -/* AD6AD4 8005F934 E7AA006C */ swc1 $f10, 0x6c($sp) -/* AD6AD8 8005F938 862B0034 */ lh $t3, 0x34($s1) -/* AD6ADC 8005F93C 448B8000 */ mtc1 $t3, $f16 -/* AD6AE0 8005F940 00000000 */ nop -/* AD6AE4 8005F944 468084A0 */ cvt.s.w $f18, $f16 -/* AD6AE8 8005F948 E7B20070 */ swc1 $f18, 0x70($sp) -/* AD6AEC 8005F94C C6060064 */ lwc1 $f6, 0x64($s0) -/* AD6AF0 8005F950 C6040058 */ lwc1 $f4, 0x58($s0) -/* AD6AF4 8005F954 C60A004C */ lwc1 $f10, 0x4c($s0) -/* AD6AF8 8005F958 C6120040 */ lwc1 $f18, 0x40($s0) -/* AD6AFC 8005F95C 46062200 */ add.s $f8, $f4, $f6 -/* AD6B00 8005F960 460A4400 */ add.s $f16, $f8, $f10 -/* AD6B04 8005F964 46128100 */ add.s $f4, $f16, $f18 -/* AD6B08 8005F968 46142182 */ mul.s $f6, $f4, $f20 -/* AD6B0C 8005F96C E7A60074 */ swc1 $f6, 0x74($sp) -/* AD6B10 8005F970 C60A0068 */ lwc1 $f10, 0x68($s0) -/* AD6B14 8005F974 C608005C */ lwc1 $f8, 0x5c($s0) -/* AD6B18 8005F978 C6120050 */ lwc1 $f18, 0x50($s0) -/* AD6B1C 8005F97C C6060044 */ lwc1 $f6, 0x44($s0) -/* AD6B20 8005F980 460A4400 */ add.s $f16, $f8, $f10 -/* AD6B24 8005F984 46128100 */ add.s $f4, $f16, $f18 -/* AD6B28 8005F988 46062200 */ add.s $f8, $f4, $f6 -/* AD6B2C 8005F98C 46144282 */ mul.s $f10, $f8, $f20 -/* AD6B30 8005F990 E7AA0078 */ swc1 $f10, 0x78($sp) -/* AD6B34 8005F994 C612006C */ lwc1 $f18, 0x6c($s0) -/* AD6B38 8005F998 C6100060 */ lwc1 $f16, 0x60($s0) -/* AD6B3C 8005F99C C6060054 */ lwc1 $f6, 0x54($s0) -/* AD6B40 8005F9A0 C60A0048 */ lwc1 $f10, 0x48($s0) -/* AD6B44 8005F9A4 46128100 */ add.s $f4, $f16, $f18 -/* AD6B48 8005F9A8 AFB3001C */ sw $s3, 0x1c($sp) -/* AD6B4C 8005F9AC AFAC0018 */ sw $t4, 0x18($sp) -/* AD6B50 8005F9B0 AFB10014 */ sw $s1, 0x14($sp) -/* AD6B54 8005F9B4 46062200 */ add.s $f8, $f4, $f6 -/* AD6B58 8005F9B8 AFB50010 */ sw $s5, 0x10($sp) -/* AD6B5C 8005F9BC 460A4400 */ add.s $f16, $f8, $f10 -/* AD6B60 8005F9C0 46148482 */ mul.s $f18, $f16, $f20 -/* AD6B64 8005F9C4 0C017A07 */ jal func_8005E81C -/* AD6B68 8005F9C8 E7B2007C */ swc1 $f18, 0x7c($sp) -/* AD6B6C 8005F9CC 92AD0013 */ lbu $t5, 0x13($s5) -/* AD6B70 8005F9D0 31AE0040 */ andi $t6, $t5, 0x40 -/* AD6B74 8005F9D4 51C0000A */ beql $t6, $zero, .L8005FA00 -/* AD6B78 8005F9D8 8FBF0054 */ lw $ra, 0x54($sp) -.L8005F9DC: -/* AD6B7C 8005F9DC 8EF80018 */ lw $t8, 0x18($s7) -.L8005F9E0: -/* AD6B80 8005F9E0 8EEF001C */ lw $t7, 0x1c($s7) -/* AD6B84 8005F9E4 26310040 */ addiu $s1, $s1, 0x40 -/* AD6B88 8005F9E8 0018C980 */ sll $t9, $t8, 6 -/* AD6B8C 8005F9EC 01F94021 */ addu $t0, $t7, $t9 -/* AD6B90 8005F9F0 0228082B */ sltu $at, $s1, $t0 -/* AD6B94 8005F9F4 1420FFA8 */ bnez $at, .L8005F898 -/* AD6B98 8005F9F8 00000000 */ nop -.L8005F9FC: -/* AD6B9C 8005F9FC 8FBF0054 */ lw $ra, 0x54($sp) -.L8005FA00: -/* AD6BA0 8005FA00 D7B40028 */ ldc1 $f20, 0x28($sp) -/* AD6BA4 8005FA04 8FB00030 */ lw $s0, 0x30($sp) -/* AD6BA8 8005FA08 8FB10034 */ lw $s1, 0x34($sp) -/* AD6BAC 8005FA0C 8FB20038 */ lw $s2, 0x38($sp) -/* AD6BB0 8005FA10 8FB3003C */ lw $s3, 0x3c($sp) -/* AD6BB4 8005FA14 8FB40040 */ lw $s4, 0x40($sp) -/* AD6BB8 8005FA18 8FB50044 */ lw $s5, 0x44($sp) -/* AD6BBC 8005FA1C 8FB60048 */ lw $s6, 0x48($sp) -/* AD6BC0 8005FA20 8FB7004C */ lw $s7, 0x4c($sp) -/* AD6BC4 8005FA24 8FBE0050 */ lw $fp, 0x50($sp) -/* AD6BC8 8005FA28 03E00008 */ jr $ra -/* AD6BCC 8005FA2C 27BD0098 */ addiu $sp, $sp, 0x98 - -/* AD6BD0 8005FA30 27BDFF88 */ addiu $sp, $sp, -0x78 -/* AD6BD4 8005FA34 AFBF002C */ sw $ra, 0x2c($sp) -/* AD6BD8 8005FA38 AFB10028 */ sw $s1, 0x28($sp) -/* AD6BDC 8005FA3C AFB00024 */ sw $s0, 0x24($sp) -/* AD6BE0 8005FA40 AFA40078 */ sw $a0, 0x78($sp) -/* AD6BE4 8005FA44 AFA5007C */ sw $a1, 0x7c($sp) -/* AD6BE8 8005FA48 84CE0040 */ lh $t6, 0x40($a2) -/* AD6BEC 8005FA4C 00E08025 */ move $s0, $a3 -/* AD6BF0 8005FA50 00C08825 */ move $s1, $a2 -/* AD6BF4 8005FA54 59C00067 */ blezl $t6, .L8005FBF4 -/* AD6BF8 8005FA58 8FBF002C */ lw $ra, 0x2c($sp) -/* AD6BFC 8005FA5C 84CF0042 */ lh $t7, 0x42($a2) -/* AD6C00 8005FA60 59E00064 */ blezl $t7, .L8005FBF4 -/* AD6C04 8005FA64 8FBF002C */ lw $ra, 0x2c($sp) -/* AD6C08 8005FA68 84F80040 */ lh $t8, 0x40($a3) -/* AD6C0C 8005FA6C 5B000061 */ blezl $t8, .L8005FBF4 -/* AD6C10 8005FA70 8FBF002C */ lw $ra, 0x2c($sp) -/* AD6C14 8005FA74 84F90042 */ lh $t9, 0x42($a3) -/* AD6C18 8005FA78 24E40018 */ addiu $a0, $a3, 0x18 -/* AD6C1C 8005FA7C 5B20005D */ blezl $t9, .L8005FBF4 -/* AD6C20 8005FA80 8FBF002C */ lw $ra, 0x2c($sp) -/* AD6C24 8005FA84 0C0177D4 */ jal func_8005DF50 -/* AD6C28 8005FA88 AFA40034 */ sw $a0, 0x34($sp) -/* AD6C2C 8005FA8C 24010001 */ li $at, 1 -/* AD6C30 8005FA90 10410057 */ beq $v0, $at, .L8005FBF0 -/* AD6C34 8005FA94 26240018 */ addiu $a0, $s1, 0x18 -/* AD6C38 8005FA98 0C0177CB */ jal func_8005DF2C -/* AD6C3C 8005FA9C AFA40038 */ sw $a0, 0x38($sp) -/* AD6C40 8005FAA0 24010001 */ li $at, 1 -/* AD6C44 8005FAA4 10410052 */ beq $v0, $at, .L8005FBF0 -/* AD6C48 8005FAA8 8FA40038 */ lw $a0, 0x38($sp) -/* AD6C4C 8005FAAC 0C0177DD */ jal func_8005DF74 -/* AD6C50 8005FAB0 8FA50034 */ lw $a1, 0x34($sp) -/* AD6C54 8005FAB4 24010001 */ li $at, 1 -/* AD6C58 8005FAB8 1041004D */ beq $v0, $at, .L8005FBF0 -/* AD6C5C 8005FABC 26240040 */ addiu $a0, $s1, 0x40 -/* AD6C60 8005FAC0 26050040 */ addiu $a1, $s0, 0x40 -/* AD6C64 8005FAC4 27A6006C */ addiu $a2, $sp, 0x6c -/* AD6C68 8005FAC8 0C033FCD */ jal Math3D_CylinderOutCylinderDist -/* AD6C6C 8005FACC 27A70068 */ addiu $a3, $sp, 0x68 -/* AD6C70 8005FAD0 24010001 */ li $at, 1 -/* AD6C74 8005FAD4 14410046 */ bne $v0, $at, .L8005FBF0 -/* AD6C78 8005FAD8 27A40050 */ addiu $a0, $sp, 0x50 -/* AD6C7C 8005FADC 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD6C80 8005FAE0 26250046 */ addiu $a1, $s1, 0x46 -/* AD6C84 8005FAE4 26050046 */ addiu $a1, $s0, 0x46 -/* AD6C88 8005FAE8 AFA5003C */ sw $a1, 0x3c($sp) -/* AD6C8C 8005FAEC 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD6C90 8005FAF0 27A40044 */ addiu $a0, $sp, 0x44 -/* AD6C94 8005FAF4 C7A40068 */ lwc1 $f4, 0x68($sp) -/* AD6C98 8005FAF8 3C018014 */ lui $at, %hi(D_8013AD0C) -/* AD6C9C 8005FAFC C426AD0C */ lwc1 $f6, %lo(D_8013AD0C)($at) -/* AD6CA0 8005FB00 46002005 */ abs.s $f0, $f4 -/* AD6CA4 8005FB04 8FA5003C */ lw $a1, 0x3c($sp) -/* AD6CA8 8005FB08 4606003C */ c.lt.s $f0, $f6 -/* AD6CAC 8005FB0C 00000000 */ nop -/* AD6CB0 8005FB10 45010029 */ bc1t .L8005FBB8 -/* AD6CB4 8005FB14 00000000 */ nop -/* AD6CB8 8005FB18 86080040 */ lh $t0, 0x40($s0) -/* AD6CBC 8005FB1C 86090048 */ lh $t1, 0x48($s0) -/* AD6CC0 8005FB20 860A0044 */ lh $t2, 0x44($s0) -/* AD6CC4 8005FB24 44884000 */ mtc1 $t0, $f8 -/* AD6CC8 8005FB28 860B0042 */ lh $t3, 0x42($s0) -/* AD6CCC 8005FB2C 44898000 */ mtc1 $t1, $f16 -/* AD6CD0 8005FB30 468042A0 */ cvt.s.w $f10, $f8 -/* AD6CD4 8005FB34 448A3000 */ mtc1 $t2, $f6 -/* AD6CD8 8005FB38 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* AD6CDC 8005FB3C 468084A0 */ cvt.s.w $f18, $f16 -/* AD6CE0 8005FB40 46045003 */ div.s $f0, $f10, $f4 -/* AD6CE4 8005FB44 448B2000 */ mtc1 $t3, $f4 -/* AD6CE8 8005FB48 46803220 */ cvt.s.w $f8, $f6 -/* AD6CEC 8005FB4C 44813000 */ mtc1 $at, $f6 -/* AD6CF0 8005FB50 46802420 */ cvt.s.w $f16, $f4 -/* AD6CF4 8005FB54 46089280 */ add.s $f10, $f18, $f8 -/* AD6CF8 8005FB58 46068482 */ mul.s $f18, $f16, $f6 -/* AD6CFC 8005FB5C 46125200 */ add.s $f8, $f10, $f18 -/* AD6D00 8005FB60 E7A80060 */ swc1 $f8, 0x60($sp) -/* AD6D04 8005FB64 862D0046 */ lh $t5, 0x46($s1) -/* AD6D08 8005FB68 860C0046 */ lh $t4, 0x46($s0) -/* AD6D0C 8005FB6C 448D8000 */ mtc1 $t5, $f16 -/* AD6D10 8005FB70 448C2000 */ mtc1 $t4, $f4 -/* AD6D14 8005FB74 468081A0 */ cvt.s.w $f6, $f16 -/* AD6D18 8005FB78 468020A0 */ cvt.s.w $f2, $f4 -/* AD6D1C 8005FB7C 46023281 */ sub.s $f10, $f6, $f2 -/* AD6D20 8005FB80 46005482 */ mul.s $f18, $f10, $f0 -/* AD6D24 8005FB84 46029200 */ add.s $f8, $f18, $f2 -/* AD6D28 8005FB88 E7A8005C */ swc1 $f8, 0x5c($sp) -/* AD6D2C 8005FB8C 862F004A */ lh $t7, 0x4a($s1) -/* AD6D30 8005FB90 860E004A */ lh $t6, 0x4a($s0) -/* AD6D34 8005FB94 448F8000 */ mtc1 $t7, $f16 -/* AD6D38 8005FB98 448E2000 */ mtc1 $t6, $f4 -/* AD6D3C 8005FB9C 468081A0 */ cvt.s.w $f6, $f16 -/* AD6D40 8005FBA0 46802320 */ cvt.s.w $f12, $f4 -/* AD6D44 8005FBA4 460C3281 */ sub.s $f10, $f6, $f12 -/* AD6D48 8005FBA8 46005482 */ mul.s $f18, $f10, $f0 -/* AD6D4C 8005FBAC 460C9200 */ add.s $f8, $f18, $f12 -/* AD6D50 8005FBB0 10000003 */ b .L8005FBC0 -/* AD6D54 8005FBB4 E7A80064 */ swc1 $f8, 0x64($sp) -.L8005FBB8: -/* AD6D58 8005FBB8 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD6D5C 8005FBBC 27A4005C */ addiu $a0, $sp, 0x5c -.L8005FBC0: -/* AD6D60 8005FBC0 8FB80034 */ lw $t8, 0x34($sp) -/* AD6D64 8005FBC4 27B90044 */ addiu $t9, $sp, 0x44 -/* AD6D68 8005FBC8 27A8005C */ addiu $t0, $sp, 0x5c -/* AD6D6C 8005FBCC AFA8001C */ sw $t0, 0x1c($sp) -/* AD6D70 8005FBD0 AFB90018 */ sw $t9, 0x18($sp) -/* AD6D74 8005FBD4 8FA40078 */ lw $a0, 0x78($sp) -/* AD6D78 8005FBD8 02202825 */ move $a1, $s1 -/* AD6D7C 8005FBDC 8FA60038 */ lw $a2, 0x38($sp) -/* AD6D80 8005FBE0 27A70050 */ addiu $a3, $sp, 0x50 -/* AD6D84 8005FBE4 AFB00010 */ sw $s0, 0x10($sp) -/* AD6D88 8005FBE8 0C017A07 */ jal func_8005E81C -/* AD6D8C 8005FBEC AFB80014 */ sw $t8, 0x14($sp) -.L8005FBF0: -/* AD6D90 8005FBF0 8FBF002C */ lw $ra, 0x2c($sp) -.L8005FBF4: -/* AD6D94 8005FBF4 8FB00024 */ lw $s0, 0x24($sp) -/* AD6D98 8005FBF8 8FB10028 */ lw $s1, 0x28($sp) -/* AD6D9C 8005FBFC 03E00008 */ jr $ra -/* AD6DA0 8005FC00 27BD0078 */ addiu $sp, $sp, 0x78 - -/* AD6DA4 8005FC04 27BDFF80 */ addiu $sp, $sp, -0x80 -/* AD6DA8 8005FC08 AFBF0044 */ sw $ra, 0x44($sp) -/* AD6DAC 8005FC0C AFB60040 */ sw $s6, 0x40($sp) -/* AD6DB0 8005FC10 AFB5003C */ sw $s5, 0x3c($sp) -/* AD6DB4 8005FC14 AFB40038 */ sw $s4, 0x38($sp) -/* AD6DB8 8005FC18 AFB30034 */ sw $s3, 0x34($sp) -/* AD6DBC 8005FC1C AFB20030 */ sw $s2, 0x30($sp) -/* AD6DC0 8005FC20 AFB1002C */ sw $s1, 0x2c($sp) -/* AD6DC4 8005FC24 AFB00028 */ sw $s0, 0x28($sp) -/* AD6DC8 8005FC28 AFA40080 */ sw $a0, 0x80($sp) -/* AD6DCC 8005FC2C AFA50084 */ sw $a1, 0x84($sp) -/* AD6DD0 8005FC30 84CE0040 */ lh $t6, 0x40($a2) -/* AD6DD4 8005FC34 00C09025 */ move $s2, $a2 -/* AD6DD8 8005FC38 00E09825 */ move $s3, $a3 -/* AD6DDC 8005FC3C 59C0005A */ blezl $t6, .L8005FDA8 -/* AD6DE0 8005FC40 8FBF0044 */ lw $ra, 0x44($sp) -/* AD6DE4 8005FC44 84CF0042 */ lh $t7, 0x42($a2) -/* AD6DE8 8005FC48 59E00057 */ blezl $t7, .L8005FDA8 -/* AD6DEC 8005FC4C 8FBF0044 */ lw $ra, 0x44($sp) -/* AD6DF0 8005FC50 8CF80018 */ lw $t8, 0x18($a3) -/* AD6DF4 8005FC54 5B000054 */ blezl $t8, .L8005FDA8 -/* AD6DF8 8005FC58 8FBF0044 */ lw $ra, 0x44($sp) -/* AD6DFC 8005FC5C 8CF9001C */ lw $t9, 0x1c($a3) -/* AD6E00 8005FC60 24D50018 */ addiu $s5, $a2, 0x18 -/* AD6E04 8005FC64 02A02025 */ move $a0, $s5 -/* AD6E08 8005FC68 5320004F */ beql $t9, $zero, .L8005FDA8 -/* AD6E0C 8005FC6C 8FBF0044 */ lw $ra, 0x44($sp) -/* AD6E10 8005FC70 0C0177CB */ jal func_8005DF2C -/* AD6E14 8005FC74 AFA7008C */ sw $a3, 0x8c($sp) -/* AD6E18 8005FC78 24110001 */ li $s1, 1 -/* AD6E1C 8005FC7C 10510049 */ beq $v0, $s1, .L8005FDA4 -/* AD6E20 8005FC80 8FA3008C */ lw $v1, 0x8c($sp) -/* AD6E24 8005FC84 8C680018 */ lw $t0, 0x18($v1) -/* AD6E28 8005FC88 2416005C */ li $s6, 92 -/* AD6E2C 8005FC8C 8C70001C */ lw $s0, 0x1c($v1) -/* AD6E30 8005FC90 01160019 */ multu $t0, $s6 -/* AD6E34 8005FC94 27B40068 */ addiu $s4, $sp, 0x68 -/* AD6E38 8005FC98 00004812 */ mflo $t1 -/* AD6E3C 8005FC9C 02095021 */ addu $t2, $s0, $t1 -/* AD6E40 8005FCA0 020A082B */ sltu $at, $s0, $t2 -/* AD6E44 8005FCA4 50200040 */ beql $at, $zero, .L8005FDA8 -/* AD6E48 8005FCA8 8FBF0044 */ lw $ra, 0x44($sp) -.L8005FCAC: -/* AD6E4C 8005FCAC 0C0177D4 */ jal func_8005DF50 -/* AD6E50 8005FCB0 02002025 */ move $a0, $s0 -/* AD6E54 8005FCB4 10510032 */ beq $v0, $s1, .L8005FD80 -/* AD6E58 8005FCB8 02A02025 */ move $a0, $s5 -/* AD6E5C 8005FCBC 0C0177DD */ jal func_8005DF74 -/* AD6E60 8005FCC0 02002825 */ move $a1, $s0 -/* AD6E64 8005FCC4 1051002E */ beq $v0, $s1, .L8005FD80 -/* AD6E68 8005FCC8 26440040 */ addiu $a0, $s2, 0x40 -/* AD6E6C 8005FCCC 26050028 */ addiu $a1, $s0, 0x28 -/* AD6E70 8005FCD0 0C033DF4 */ jal Math3D_CylTriTouchingIntersect -/* AD6E74 8005FCD4 02803025 */ move $a2, $s4 -/* AD6E78 8005FCD8 5451002A */ bnel $v0, $s1, .L8005FD84 -/* AD6E7C 8005FCDC 8E6E0018 */ lw $t6, 0x18($s3) -/* AD6E80 8005FCE0 27B1005C */ addiu $s1, $sp, 0x5c -/* AD6E84 8005FCE4 02202025 */ move $a0, $s1 -/* AD6E88 8005FCE8 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD6E8C 8005FCEC 26450046 */ addiu $a1, $s2, 0x46 -/* AD6E90 8005FCF0 C6040028 */ lwc1 $f4, 0x28($s0) -/* AD6E94 8005FCF4 C6060034 */ lwc1 $f6, 0x34($s0) -/* AD6E98 8005FCF8 C60A0040 */ lwc1 $f10, 0x40($s0) -/* AD6E9C 8005FCFC 3C018014 */ lui $at, %hi(D_8013AD10) -/* AD6EA0 8005FD00 46062200 */ add.s $f8, $f4, $f6 -/* AD6EA4 8005FD04 C420AD10 */ lwc1 $f0, %lo(D_8013AD10)($at) -/* AD6EA8 8005FD08 8FAB008C */ lw $t3, 0x8c($sp) -/* AD6EAC 8005FD0C 27AC0050 */ addiu $t4, $sp, 0x50 -/* AD6EB0 8005FD10 46085400 */ add.s $f16, $f10, $f8 -/* AD6EB4 8005FD14 8FA40080 */ lw $a0, 0x80($sp) -/* AD6EB8 8005FD18 02402825 */ move $a1, $s2 -/* AD6EBC 8005FD1C 02A03025 */ move $a2, $s5 -/* AD6EC0 8005FD20 46008482 */ mul.s $f18, $f16, $f0 -/* AD6EC4 8005FD24 02203825 */ move $a3, $s1 -/* AD6EC8 8005FD28 E7B20050 */ swc1 $f18, 0x50($sp) -/* AD6ECC 8005FD2C C6060038 */ lwc1 $f6, 0x38($s0) -/* AD6ED0 8005FD30 C604002C */ lwc1 $f4, 0x2c($s0) -/* AD6ED4 8005FD34 C6080044 */ lwc1 $f8, 0x44($s0) -/* AD6ED8 8005FD38 46062280 */ add.s $f10, $f4, $f6 -/* AD6EDC 8005FD3C 460A4400 */ add.s $f16, $f8, $f10 -/* AD6EE0 8005FD40 46008482 */ mul.s $f18, $f16, $f0 -/* AD6EE4 8005FD44 E7B20054 */ swc1 $f18, 0x54($sp) -/* AD6EE8 8005FD48 C606003C */ lwc1 $f6, 0x3c($s0) -/* AD6EEC 8005FD4C C6040030 */ lwc1 $f4, 0x30($s0) -/* AD6EF0 8005FD50 C60A0048 */ lwc1 $f10, 0x48($s0) -/* AD6EF4 8005FD54 AFB4001C */ sw $s4, 0x1c($sp) -/* AD6EF8 8005FD58 46062200 */ add.s $f8, $f4, $f6 -/* AD6EFC 8005FD5C AFAC0018 */ sw $t4, 0x18($sp) -/* AD6F00 8005FD60 AFB00014 */ sw $s0, 0x14($sp) -/* AD6F04 8005FD64 AFAB0010 */ sw $t3, 0x10($sp) -/* AD6F08 8005FD68 46085400 */ add.s $f16, $f10, $f8 -/* AD6F0C 8005FD6C 46008482 */ mul.s $f18, $f16, $f0 -/* AD6F10 8005FD70 0C017A07 */ jal func_8005E81C -/* AD6F14 8005FD74 E7B20058 */ swc1 $f18, 0x58($sp) -/* AD6F18 8005FD78 1000000B */ b .L8005FDA8 -/* AD6F1C 8005FD7C 8FBF0044 */ lw $ra, 0x44($sp) -.L8005FD80: -/* AD6F20 8005FD80 8E6E0018 */ lw $t6, 0x18($s3) -.L8005FD84: -/* AD6F24 8005FD84 8E6D001C */ lw $t5, 0x1c($s3) -/* AD6F28 8005FD88 2610005C */ addiu $s0, $s0, 0x5c -/* AD6F2C 8005FD8C 01D60019 */ multu $t6, $s6 -/* AD6F30 8005FD90 00007812 */ mflo $t7 -/* AD6F34 8005FD94 01AFC021 */ addu $t8, $t5, $t7 -/* AD6F38 8005FD98 0218082B */ sltu $at, $s0, $t8 -/* AD6F3C 8005FD9C 1420FFC3 */ bnez $at, .L8005FCAC -/* AD6F40 8005FDA0 00000000 */ nop -.L8005FDA4: -/* AD6F44 8005FDA4 8FBF0044 */ lw $ra, 0x44($sp) -.L8005FDA8: -/* AD6F48 8005FDA8 8FB00028 */ lw $s0, 0x28($sp) -/* AD6F4C 8005FDAC 8FB1002C */ lw $s1, 0x2c($sp) -/* AD6F50 8005FDB0 8FB20030 */ lw $s2, 0x30($sp) -/* AD6F54 8005FDB4 8FB30034 */ lw $s3, 0x34($sp) -/* AD6F58 8005FDB8 8FB40038 */ lw $s4, 0x38($sp) -/* AD6F5C 8005FDBC 8FB5003C */ lw $s5, 0x3c($sp) -/* AD6F60 8005FDC0 8FB60040 */ lw $s6, 0x40($sp) -/* AD6F64 8005FDC4 03E00008 */ jr $ra -/* AD6F68 8005FDC8 27BD0080 */ addiu $sp, $sp, 0x80 - -/* AD6F6C 8005FDCC 27BDFF88 */ addiu $sp, $sp, -0x78 -/* AD6F70 8005FDD0 AFBF0044 */ sw $ra, 0x44($sp) -/* AD6F74 8005FDD4 AFB60040 */ sw $s6, 0x40($sp) -/* AD6F78 8005FDD8 AFB5003C */ sw $s5, 0x3c($sp) -/* AD6F7C 8005FDDC AFB40038 */ sw $s4, 0x38($sp) -/* AD6F80 8005FDE0 AFB30034 */ sw $s3, 0x34($sp) -/* AD6F84 8005FDE4 AFB20030 */ sw $s2, 0x30($sp) -/* AD6F88 8005FDE8 AFB1002C */ sw $s1, 0x2c($sp) -/* AD6F8C 8005FDEC AFB00028 */ sw $s0, 0x28($sp) -/* AD6F90 8005FDF0 AFA40078 */ sw $a0, 0x78($sp) -/* AD6F94 8005FDF4 AFA5007C */ sw $a1, 0x7c($sp) -/* AD6F98 8005FDF8 84EE0040 */ lh $t6, 0x40($a3) -/* AD6F9C 8005FDFC 00E09025 */ move $s2, $a3 -/* AD6FA0 8005FE00 00C09825 */ move $s3, $a2 -/* AD6FA4 8005FE04 59C00059 */ blezl $t6, .L8005FF6C -/* AD6FA8 8005FE08 8FBF0044 */ lw $ra, 0x44($sp) -/* AD6FAC 8005FE0C 84EF0042 */ lh $t7, 0x42($a3) -/* AD6FB0 8005FE10 59E00056 */ blezl $t7, .L8005FF6C -/* AD6FB4 8005FE14 8FBF0044 */ lw $ra, 0x44($sp) -/* AD6FB8 8005FE18 8CD80018 */ lw $t8, 0x18($a2) -/* AD6FBC 8005FE1C 5B000053 */ blezl $t8, .L8005FF6C -/* AD6FC0 8005FE20 8FBF0044 */ lw $ra, 0x44($sp) -/* AD6FC4 8005FE24 8CD9001C */ lw $t9, 0x1c($a2) -/* AD6FC8 8005FE28 24F50018 */ addiu $s5, $a3, 0x18 -/* AD6FCC 8005FE2C 02A02025 */ move $a0, $s5 -/* AD6FD0 8005FE30 5320004E */ beql $t9, $zero, .L8005FF6C -/* AD6FD4 8005FE34 8FBF0044 */ lw $ra, 0x44($sp) -/* AD6FD8 8005FE38 0C0177D4 */ jal func_8005DF50 -/* AD6FDC 8005FE3C AFA60080 */ sw $a2, 0x80($sp) -/* AD6FE0 8005FE40 24110001 */ li $s1, 1 -/* AD6FE4 8005FE44 10510048 */ beq $v0, $s1, .L8005FF68 -/* AD6FE8 8005FE48 8FA30080 */ lw $v1, 0x80($sp) -/* AD6FEC 8005FE4C 8C680018 */ lw $t0, 0x18($v1) -/* AD6FF0 8005FE50 2416005C */ li $s6, 92 -/* AD6FF4 8005FE54 8C70001C */ lw $s0, 0x1c($v1) -/* AD6FF8 8005FE58 01160019 */ multu $t0, $s6 -/* AD6FFC 8005FE5C 3C148016 */ lui $s4, %hi(D_8015E310) # $s4, 0x8016 -/* AD7000 8005FE60 2694E310 */ addiu $s4, %lo(D_8015E310) # addiu $s4, $s4, -0x1cf0 -/* AD7004 8005FE64 00004812 */ mflo $t1 -/* AD7008 8005FE68 02095021 */ addu $t2, $s0, $t1 -/* AD700C 8005FE6C 020A082B */ sltu $at, $s0, $t2 -/* AD7010 8005FE70 5020003E */ beql $at, $zero, .L8005FF6C -/* AD7014 8005FE74 8FBF0044 */ lw $ra, 0x44($sp) -.L8005FE78: -/* AD7018 8005FE78 0C0177CB */ jal func_8005DF2C -/* AD701C 8005FE7C 02002025 */ move $a0, $s0 -/* AD7020 8005FE80 10510030 */ beq $v0, $s1, .L8005FF44 -/* AD7024 8005FE84 02002025 */ move $a0, $s0 -/* AD7028 8005FE88 0C0177DD */ jal func_8005DF74 -/* AD702C 8005FE8C 02A02825 */ move $a1, $s5 -/* AD7030 8005FE90 1051002C */ beq $v0, $s1, .L8005FF44 -/* AD7034 8005FE94 26440040 */ addiu $a0, $s2, 0x40 -/* AD7038 8005FE98 26050028 */ addiu $a1, $s0, 0x28 -/* AD703C 8005FE9C 0C033DF4 */ jal Math3D_CylTriTouchingIntersect -/* AD7040 8005FEA0 02803025 */ move $a2, $s4 -/* AD7044 8005FEA4 54510028 */ bnel $v0, $s1, .L8005FF48 -/* AD7048 8005FEA8 8E6C0018 */ lw $t4, 0x18($s3) -/* AD704C 8005FEAC C6040028 */ lwc1 $f4, 0x28($s0) -/* AD7050 8005FEB0 C6060034 */ lwc1 $f6, 0x34($s0) -/* AD7054 8005FEB4 C60A0040 */ lwc1 $f10, 0x40($s0) -/* AD7058 8005FEB8 3C018014 */ lui $at, %hi(D_8013AD14) -/* AD705C 8005FEBC 46062200 */ add.s $f8, $f4, $f6 -/* AD7060 8005FEC0 C420AD14 */ lwc1 $f0, %lo(D_8013AD14)($at) -/* AD7064 8005FEC4 27B10054 */ addiu $s1, $sp, 0x54 -/* AD7068 8005FEC8 02202025 */ move $a0, $s1 -/* AD706C 8005FECC 46085400 */ add.s $f16, $f10, $f8 -/* AD7070 8005FED0 26450046 */ addiu $a1, $s2, 0x46 -/* AD7074 8005FED4 46008482 */ mul.s $f18, $f16, $f0 -/* AD7078 8005FED8 E7B20060 */ swc1 $f18, 0x60($sp) -/* AD707C 8005FEDC C6060038 */ lwc1 $f6, 0x38($s0) -/* AD7080 8005FEE0 C604002C */ lwc1 $f4, 0x2c($s0) -/* AD7084 8005FEE4 C6080044 */ lwc1 $f8, 0x44($s0) -/* AD7088 8005FEE8 46062280 */ add.s $f10, $f4, $f6 -/* AD708C 8005FEEC 460A4400 */ add.s $f16, $f8, $f10 -/* AD7090 8005FEF0 46008482 */ mul.s $f18, $f16, $f0 -/* AD7094 8005FEF4 E7B20064 */ swc1 $f18, 0x64($sp) -/* AD7098 8005FEF8 C606003C */ lwc1 $f6, 0x3c($s0) -/* AD709C 8005FEFC C6040030 */ lwc1 $f4, 0x30($s0) -/* AD70A0 8005FF00 C60A0048 */ lwc1 $f10, 0x48($s0) -/* AD70A4 8005FF04 46062200 */ add.s $f8, $f4, $f6 -/* AD70A8 8005FF08 46085400 */ add.s $f16, $f10, $f8 -/* AD70AC 8005FF0C 46008482 */ mul.s $f18, $f16, $f0 -/* AD70B0 8005FF10 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD70B4 8005FF14 E7B20068 */ swc1 $f18, 0x68($sp) -/* AD70B8 8005FF18 8FA40078 */ lw $a0, 0x78($sp) -/* AD70BC 8005FF1C 8FA50080 */ lw $a1, 0x80($sp) -/* AD70C0 8005FF20 02003025 */ move $a2, $s0 -/* AD70C4 8005FF24 27A70060 */ addiu $a3, $sp, 0x60 -/* AD70C8 8005FF28 AFB20010 */ sw $s2, 0x10($sp) -/* AD70CC 8005FF2C AFB50014 */ sw $s5, 0x14($sp) -/* AD70D0 8005FF30 AFB10018 */ sw $s1, 0x18($sp) -/* AD70D4 8005FF34 0C017A07 */ jal func_8005E81C -/* AD70D8 8005FF38 AFB4001C */ sw $s4, 0x1c($sp) -/* AD70DC 8005FF3C 1000000B */ b .L8005FF6C -/* AD70E0 8005FF40 8FBF0044 */ lw $ra, 0x44($sp) -.L8005FF44: -/* AD70E4 8005FF44 8E6C0018 */ lw $t4, 0x18($s3) -.L8005FF48: -/* AD70E8 8005FF48 8E6B001C */ lw $t3, 0x1c($s3) -/* AD70EC 8005FF4C 2610005C */ addiu $s0, $s0, 0x5c -/* AD70F0 8005FF50 01960019 */ multu $t4, $s6 -/* AD70F4 8005FF54 00006812 */ mflo $t5 -/* AD70F8 8005FF58 016D7021 */ addu $t6, $t3, $t5 -/* AD70FC 8005FF5C 020E082B */ sltu $at, $s0, $t6 -/* AD7100 8005FF60 1420FFC5 */ bnez $at, .L8005FE78 -/* AD7104 8005FF64 00000000 */ nop -.L8005FF68: -/* AD7108 8005FF68 8FBF0044 */ lw $ra, 0x44($sp) -.L8005FF6C: -/* AD710C 8005FF6C 8FB00028 */ lw $s0, 0x28($sp) -/* AD7110 8005FF70 8FB1002C */ lw $s1, 0x2c($sp) -/* AD7114 8005FF74 8FB20030 */ lw $s2, 0x30($sp) -/* AD7118 8005FF78 8FB30034 */ lw $s3, 0x34($sp) -/* AD711C 8005FF7C 8FB40038 */ lw $s4, 0x38($sp) -/* AD7120 8005FF80 8FB5003C */ lw $s5, 0x3c($sp) -/* AD7124 8005FF84 8FB60040 */ lw $s6, 0x40($sp) -/* AD7128 8005FF88 03E00008 */ jr $ra -/* AD712C 8005FF8C 27BD0078 */ addiu $sp, $sp, 0x78 - -/* AD7130 8005FF90 27BDFF88 */ addiu $sp, $sp, -0x78 -/* AD7134 8005FF94 AFBF002C */ sw $ra, 0x2c($sp) -/* AD7138 8005FF98 AFB10028 */ sw $s1, 0x28($sp) -/* AD713C 8005FF9C AFB00024 */ sw $s0, 0x24($sp) -/* AD7140 8005FFA0 AFA40078 */ sw $a0, 0x78($sp) -/* AD7144 8005FFA4 AFA5007C */ sw $a1, 0x7c($sp) -/* AD7148 8005FFA8 84CE0042 */ lh $t6, 0x42($a2) -/* AD714C 8005FFAC 00E08025 */ move $s0, $a3 -/* AD7150 8005FFB0 00C08825 */ move $s1, $a2 -/* AD7154 8005FFB4 59C0008F */ blezl $t6, .L800601F4 -/* AD7158 8005FFB8 8FBF002C */ lw $ra, 0x2c($sp) -/* AD715C 8005FFBC 84CF0040 */ lh $t7, 0x40($a2) -/* AD7160 8005FFC0 24C40018 */ addiu $a0, $a2, 0x18 -/* AD7164 8005FFC4 59E0008B */ blezl $t7, .L800601F4 -/* AD7168 8005FFC8 8FBF002C */ lw $ra, 0x2c($sp) -/* AD716C 8005FFCC 0C0177CB */ jal func_8005DF2C -/* AD7170 8005FFD0 AFA4003C */ sw $a0, 0x3c($sp) -/* AD7174 8005FFD4 24010001 */ li $at, 1 -/* AD7178 8005FFD8 10410085 */ beq $v0, $at, .L800601F0 -/* AD717C 8005FFDC 26040018 */ addiu $a0, $s0, 0x18 -/* AD7180 8005FFE0 0C0177D4 */ jal func_8005DF50 -/* AD7184 8005FFE4 AFA40038 */ sw $a0, 0x38($sp) -/* AD7188 8005FFE8 24010001 */ li $at, 1 -/* AD718C 8005FFEC 10410080 */ beq $v0, $at, .L800601F0 -/* AD7190 8005FFF0 8FA4003C */ lw $a0, 0x3c($sp) -/* AD7194 8005FFF4 0C0177DD */ jal func_8005DF74 -/* AD7198 8005FFF8 8FA50038 */ lw $a1, 0x38($sp) -/* AD719C 8005FFFC 24010001 */ li $at, 1 -/* AD71A0 80060000 1041007B */ beq $v0, $at, .L800601F0 -/* AD71A4 80060004 3C048016 */ lui $a0, %hi(D_8015E320) # $a0, 0x8016 -/* AD71A8 80060008 26050058 */ addiu $a1, $s0, 0x58 -/* AD71AC 8006000C 2607004C */ addiu $a3, $s0, 0x4c -/* AD71B0 80060010 AFA70034 */ sw $a3, 0x34($sp) -/* AD71B4 80060014 AFA50030 */ sw $a1, 0x30($sp) -/* AD71B8 80060018 2484E320 */ addiu $a0, %lo(D_8015E320) # addiu $a0, $a0, -0x1ce0 -/* AD71BC 8006001C 0C0338F0 */ jal Math3D_TriNorm -/* AD71C0 80060020 26060064 */ addiu $a2, $s0, 0x64 -/* AD71C4 80060024 3C048016 */ lui $a0, %hi(D_8015E358) # $a0, 0x8016 -/* AD71C8 80060028 2484E358 */ addiu $a0, %lo(D_8015E358) # addiu $a0, $a0, -0x1ca8 -/* AD71CC 8006002C 8FA50034 */ lw $a1, 0x34($sp) -/* AD71D0 80060030 26060040 */ addiu $a2, $s0, 0x40 -/* AD71D4 80060034 0C0338F0 */ jal Math3D_TriNorm -/* AD71D8 80060038 8FA70030 */ lw $a3, 0x30($sp) -/* AD71DC 8006003C 26240040 */ addiu $a0, $s1, 0x40 -/* AD71E0 80060040 3C058016 */ lui $a1, %hi(D_8015E320) # $a1, 0x8016 -/* AD71E4 80060044 3C068016 */ lui $a2, %hi(D_8015E390) # $a2, 0x8016 -/* AD71E8 80060048 24C6E390 */ addiu $a2, %lo(D_8015E390) # addiu $a2, $a2, -0x1c70 -/* AD71EC 8006004C 24A5E320 */ addiu $a1, %lo(D_8015E320) # addiu $a1, $a1, -0x1ce0 -/* AD71F0 80060050 0C033DF4 */ jal Math3D_CylTriTouchingIntersect -/* AD71F4 80060054 AFA40034 */ sw $a0, 0x34($sp) -/* AD71F8 80060058 24010001 */ li $at, 1 -/* AD71FC 8006005C 14410030 */ bne $v0, $at, .L80060120 -/* AD7200 80060060 8FA40034 */ lw $a0, 0x34($sp) -/* AD7204 80060064 27A40064 */ addiu $a0, $sp, 0x64 -/* AD7208 80060068 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD720C 8006006C 26250046 */ addiu $a1, $s1, 0x46 -/* AD7210 80060070 C6040058 */ lwc1 $f4, 0x58($s0) -/* AD7214 80060074 C6060064 */ lwc1 $f6, 0x64($s0) -/* AD7218 80060078 C60A004C */ lwc1 $f10, 0x4c($s0) -/* AD721C 8006007C C6120040 */ lwc1 $f18, 0x40($s0) -/* AD7220 80060080 46062200 */ add.s $f8, $f4, $f6 -/* AD7224 80060084 3C013E80 */ li $at, 0x3E800000 # 0.000000 -/* AD7228 80060088 44810000 */ mtc1 $at, $f0 -/* AD722C 8006008C 8FB80038 */ lw $t8, 0x38($sp) -/* AD7230 80060090 460A4400 */ add.s $f16, $f8, $f10 -/* AD7234 80060094 3C088016 */ lui $t0, %hi(D_8015E390) # $t0, 0x8016 -/* AD7238 80060098 2508E390 */ addiu $t0, %lo(D_8015E390) # addiu $t0, $t0, -0x1c70 -/* AD723C 8006009C 27B90058 */ addiu $t9, $sp, 0x58 -/* AD7240 800600A0 46128100 */ add.s $f4, $f16, $f18 -/* AD7244 800600A4 8FA40078 */ lw $a0, 0x78($sp) -/* AD7248 800600A8 02202825 */ move $a1, $s1 -/* AD724C 800600AC 8FA6003C */ lw $a2, 0x3c($sp) -/* AD7250 800600B0 46002182 */ mul.s $f6, $f4, $f0 -/* AD7254 800600B4 27A70064 */ addiu $a3, $sp, 0x64 -/* AD7258 800600B8 E7A60058 */ swc1 $f6, 0x58($sp) -/* AD725C 800600BC C60A0068 */ lwc1 $f10, 0x68($s0) -/* AD7260 800600C0 C608005C */ lwc1 $f8, 0x5c($s0) -/* AD7264 800600C4 C6120050 */ lwc1 $f18, 0x50($s0) -/* AD7268 800600C8 C6060044 */ lwc1 $f6, 0x44($s0) -/* AD726C 800600CC 460A4400 */ add.s $f16, $f8, $f10 -/* AD7270 800600D0 46128100 */ add.s $f4, $f16, $f18 -/* AD7274 800600D4 46062200 */ add.s $f8, $f4, $f6 -/* AD7278 800600D8 46004282 */ mul.s $f10, $f8, $f0 -/* AD727C 800600DC E7AA005C */ swc1 $f10, 0x5c($sp) -/* AD7280 800600E0 C612006C */ lwc1 $f18, 0x6c($s0) -/* AD7284 800600E4 C6100060 */ lwc1 $f16, 0x60($s0) -/* AD7288 800600E8 C6060054 */ lwc1 $f6, 0x54($s0) -/* AD728C 800600EC C60A0048 */ lwc1 $f10, 0x48($s0) -/* AD7290 800600F0 46128100 */ add.s $f4, $f16, $f18 -/* AD7294 800600F4 AFA8001C */ sw $t0, 0x1c($sp) -/* AD7298 800600F8 AFB90018 */ sw $t9, 0x18($sp) -/* AD729C 800600FC AFB00010 */ sw $s0, 0x10($sp) -/* AD72A0 80060100 46062200 */ add.s $f8, $f4, $f6 -/* AD72A4 80060104 AFB80014 */ sw $t8, 0x14($sp) -/* AD72A8 80060108 460A4400 */ add.s $f16, $f8, $f10 -/* AD72AC 8006010C 46008482 */ mul.s $f18, $f16, $f0 -/* AD72B0 80060110 0C017A07 */ jal func_8005E81C -/* AD72B4 80060114 E7B20060 */ swc1 $f18, 0x60($sp) -/* AD72B8 80060118 10000036 */ b .L800601F4 -/* AD72BC 8006011C 8FBF002C */ lw $ra, 0x2c($sp) -.L80060120: -/* AD72C0 80060120 3C058016 */ lui $a1, %hi(D_8015E358) # $a1, 0x8016 -/* AD72C4 80060124 3C068016 */ lui $a2, %hi(D_8015E390) # $a2, 0x8016 -/* AD72C8 80060128 24C6E390 */ addiu $a2, %lo(D_8015E390) # addiu $a2, $a2, -0x1c70 -/* AD72CC 8006012C 0C033DF4 */ jal Math3D_CylTriTouchingIntersect -/* AD72D0 80060130 24A5E358 */ addiu $a1, %lo(D_8015E358) # addiu $a1, $a1, -0x1ca8 -/* AD72D4 80060134 24010001 */ li $at, 1 -/* AD72D8 80060138 1441002D */ bne $v0, $at, .L800601F0 -/* AD72DC 8006013C 27A4004C */ addiu $a0, $sp, 0x4c -/* AD72E0 80060140 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD72E4 80060144 26250046 */ addiu $a1, $s1, 0x46 -/* AD72E8 80060148 C6040058 */ lwc1 $f4, 0x58($s0) -/* AD72EC 8006014C C6060064 */ lwc1 $f6, 0x64($s0) -/* AD72F0 80060150 C60A004C */ lwc1 $f10, 0x4c($s0) -/* AD72F4 80060154 C6120040 */ lwc1 $f18, 0x40($s0) -/* AD72F8 80060158 46062200 */ add.s $f8, $f4, $f6 -/* AD72FC 8006015C 3C013E80 */ li $at, 0x3E800000 # 0.000000 -/* AD7300 80060160 44810000 */ mtc1 $at, $f0 -/* AD7304 80060164 8FA90038 */ lw $t1, 0x38($sp) -/* AD7308 80060168 460A4400 */ add.s $f16, $f8, $f10 -/* AD730C 8006016C 3C0B8016 */ lui $t3, %hi(D_8015E390) # $t3, 0x8016 -/* AD7310 80060170 256BE390 */ addiu $t3, %lo(D_8015E390) # addiu $t3, $t3, -0x1c70 -/* AD7314 80060174 27AA0040 */ addiu $t2, $sp, 0x40 -/* AD7318 80060178 46128100 */ add.s $f4, $f16, $f18 -/* AD731C 8006017C 8FA40078 */ lw $a0, 0x78($sp) -/* AD7320 80060180 02202825 */ move $a1, $s1 -/* AD7324 80060184 8FA6003C */ lw $a2, 0x3c($sp) -/* AD7328 80060188 46002182 */ mul.s $f6, $f4, $f0 -/* AD732C 8006018C 27A7004C */ addiu $a3, $sp, 0x4c -/* AD7330 80060190 E7A60040 */ swc1 $f6, 0x40($sp) -/* AD7334 80060194 C60A0068 */ lwc1 $f10, 0x68($s0) -/* AD7338 80060198 C608005C */ lwc1 $f8, 0x5c($s0) -/* AD733C 8006019C C6120050 */ lwc1 $f18, 0x50($s0) -/* AD7340 800601A0 C6060044 */ lwc1 $f6, 0x44($s0) -/* AD7344 800601A4 460A4400 */ add.s $f16, $f8, $f10 -/* AD7348 800601A8 46128100 */ add.s $f4, $f16, $f18 -/* AD734C 800601AC 46062200 */ add.s $f8, $f4, $f6 -/* AD7350 800601B0 46004282 */ mul.s $f10, $f8, $f0 -/* AD7354 800601B4 E7AA0044 */ swc1 $f10, 0x44($sp) -/* AD7358 800601B8 C612006C */ lwc1 $f18, 0x6c($s0) -/* AD735C 800601BC C6100060 */ lwc1 $f16, 0x60($s0) -/* AD7360 800601C0 C6060054 */ lwc1 $f6, 0x54($s0) -/* AD7364 800601C4 C60A0048 */ lwc1 $f10, 0x48($s0) -/* AD7368 800601C8 46128100 */ add.s $f4, $f16, $f18 -/* AD736C 800601CC AFAB001C */ sw $t3, 0x1c($sp) -/* AD7370 800601D0 AFAA0018 */ sw $t2, 0x18($sp) -/* AD7374 800601D4 AFB00010 */ sw $s0, 0x10($sp) -/* AD7378 800601D8 46062200 */ add.s $f8, $f4, $f6 -/* AD737C 800601DC AFA90014 */ sw $t1, 0x14($sp) -/* AD7380 800601E0 460A4400 */ add.s $f16, $f8, $f10 -/* AD7384 800601E4 46008482 */ mul.s $f18, $f16, $f0 -/* AD7388 800601E8 0C017A07 */ jal func_8005E81C -/* AD738C 800601EC E7B20048 */ swc1 $f18, 0x48($sp) -.L800601F0: -/* AD7390 800601F0 8FBF002C */ lw $ra, 0x2c($sp) -.L800601F4: -/* AD7394 800601F4 8FB00024 */ lw $s0, 0x24($sp) -/* AD7398 800601F8 8FB10028 */ lw $s1, 0x28($sp) -/* AD739C 800601FC 03E00008 */ jr $ra -/* AD73A0 80060200 27BD0078 */ addiu $sp, $sp, 0x78 - -/* AD73A4 80060204 27BDFF88 */ addiu $sp, $sp, -0x78 -/* AD73A8 80060208 AFBF002C */ sw $ra, 0x2c($sp) -/* AD73AC 8006020C AFB10028 */ sw $s1, 0x28($sp) -/* AD73B0 80060210 AFB00024 */ sw $s0, 0x24($sp) -/* AD73B4 80060214 AFA40078 */ sw $a0, 0x78($sp) -/* AD73B8 80060218 AFA5007C */ sw $a1, 0x7c($sp) -/* AD73BC 8006021C 84EE0042 */ lh $t6, 0x42($a3) -/* AD73C0 80060220 00C08025 */ move $s0, $a2 -/* AD73C4 80060224 00E08825 */ move $s1, $a3 -/* AD73C8 80060228 59C0009D */ blezl $t6, .L800604A0 -/* AD73CC 8006022C 8FBF002C */ lw $ra, 0x2c($sp) -/* AD73D0 80060230 84EF0040 */ lh $t7, 0x40($a3) -/* AD73D4 80060234 24E40018 */ addiu $a0, $a3, 0x18 -/* AD73D8 80060238 59E00099 */ blezl $t7, .L800604A0 -/* AD73DC 8006023C 8FBF002C */ lw $ra, 0x2c($sp) -/* AD73E0 80060240 0C0177D4 */ jal func_8005DF50 -/* AD73E4 80060244 AFA40038 */ sw $a0, 0x38($sp) -/* AD73E8 80060248 24010001 */ li $at, 1 -/* AD73EC 8006024C 10410093 */ beq $v0, $at, .L8006049C -/* AD73F0 80060250 26040018 */ addiu $a0, $s0, 0x18 -/* AD73F4 80060254 0C0177CB */ jal func_8005DF2C -/* AD73F8 80060258 AFA4003C */ sw $a0, 0x3c($sp) -/* AD73FC 8006025C 24010001 */ li $at, 1 -/* AD7400 80060260 1041008E */ beq $v0, $at, .L8006049C -/* AD7404 80060264 8FA4003C */ lw $a0, 0x3c($sp) -/* AD7408 80060268 0C0177DD */ jal func_8005DF74 -/* AD740C 8006026C 8FA50038 */ lw $a1, 0x38($sp) -/* AD7410 80060270 24010001 */ li $at, 1 -/* AD7414 80060274 10410089 */ beq $v0, $at, .L8006049C -/* AD7418 80060278 3C048016 */ lui $a0, %hi(D_8015E3A0) # $a0, 0x8016 -/* AD741C 8006027C 26050058 */ addiu $a1, $s0, 0x58 -/* AD7420 80060280 2607004C */ addiu $a3, $s0, 0x4c -/* AD7424 80060284 AFA70030 */ sw $a3, 0x30($sp) -/* AD7428 80060288 AFA50034 */ sw $a1, 0x34($sp) -/* AD742C 8006028C 2484E3A0 */ addiu $a0, %lo(D_8015E3A0) # addiu $a0, $a0, -0x1c60 -/* AD7430 80060290 0C0338F0 */ jal Math3D_TriNorm -/* AD7434 80060294 26060064 */ addiu $a2, $s0, 0x64 -/* AD7438 80060298 3C048016 */ lui $a0, %hi(D_8015E3D8) # $a0, 0x8016 -/* AD743C 8006029C 8FA50034 */ lw $a1, 0x34($sp) -/* AD7440 800602A0 2484E3D8 */ addiu $a0, %lo(D_8015E3D8) # addiu $a0, $a0, -0x1c28 -/* AD7444 800602A4 8FA60030 */ lw $a2, 0x30($sp) -/* AD7448 800602A8 0C0338F0 */ jal Math3D_TriNorm -/* AD744C 800602AC 26070040 */ addiu $a3, $s0, 0x40 -/* AD7450 800602B0 26240040 */ addiu $a0, $s1, 0x40 -/* AD7454 800602B4 3C058016 */ lui $a1, %hi(D_8015E3A0) # $a1, 0x8016 -/* AD7458 800602B8 3C068016 */ lui $a2, %hi(D_8015E410) # $a2, 0x8016 -/* AD745C 800602BC 24C6E410 */ addiu $a2, %lo(D_8015E410) # addiu $a2, $a2, -0x1bf0 -/* AD7460 800602C0 24A5E3A0 */ addiu $a1, %lo(D_8015E3A0) # addiu $a1, $a1, -0x1c60 -/* AD7464 800602C4 0C033DF4 */ jal Math3D_CylTriTouchingIntersect -/* AD7468 800602C8 AFA40034 */ sw $a0, 0x34($sp) -/* AD746C 800602CC 24010001 */ li $at, 1 -/* AD7470 800602D0 14410036 */ bne $v0, $at, .L800603AC -/* AD7474 800602D4 8FA40078 */ lw $a0, 0x78($sp) -/* AD7478 800602D8 3C068016 */ lui $a2, %hi(D_8015E410) # $a2, 0x8016 -/* AD747C 800602DC 24C6E410 */ addiu $a2, %lo(D_8015E410) # addiu $a2, $a2, -0x1bf0 -/* AD7480 800602E0 0C017486 */ jal func_8005D218 -/* AD7484 800602E4 02002825 */ move $a1, $s0 -/* AD7488 800602E8 10400030 */ beqz $v0, .L800603AC -/* AD748C 800602EC 00000000 */ nop -/* AD7490 800602F0 C6040058 */ lwc1 $f4, 0x58($s0) -/* AD7494 800602F4 C6060064 */ lwc1 $f6, 0x64($s0) -/* AD7498 800602F8 C60A004C */ lwc1 $f10, 0x4c($s0) -/* AD749C 800602FC C6120040 */ lwc1 $f18, 0x40($s0) -/* AD74A0 80060300 46062200 */ add.s $f8, $f4, $f6 -/* AD74A4 80060304 3C013E80 */ li $at, 0x3E800000 # 0.000000 -/* AD74A8 80060308 44810000 */ mtc1 $at, $f0 -/* AD74AC 8006030C 27A40058 */ addiu $a0, $sp, 0x58 -/* AD74B0 80060310 460A4400 */ add.s $f16, $f8, $f10 -/* AD74B4 80060314 26250046 */ addiu $a1, $s1, 0x46 -/* AD74B8 80060318 46128100 */ add.s $f4, $f16, $f18 -/* AD74BC 8006031C 46002182 */ mul.s $f6, $f4, $f0 -/* AD74C0 80060320 E7A60064 */ swc1 $f6, 0x64($sp) -/* AD74C4 80060324 C60A0068 */ lwc1 $f10, 0x68($s0) -/* AD74C8 80060328 C608005C */ lwc1 $f8, 0x5c($s0) -/* AD74CC 8006032C C6120050 */ lwc1 $f18, 0x50($s0) -/* AD74D0 80060330 C6060044 */ lwc1 $f6, 0x44($s0) -/* AD74D4 80060334 460A4400 */ add.s $f16, $f8, $f10 -/* AD74D8 80060338 46128100 */ add.s $f4, $f16, $f18 -/* AD74DC 8006033C 46062200 */ add.s $f8, $f4, $f6 -/* AD74E0 80060340 46004282 */ mul.s $f10, $f8, $f0 -/* AD74E4 80060344 E7AA0068 */ swc1 $f10, 0x68($sp) -/* AD74E8 80060348 C612006C */ lwc1 $f18, 0x6c($s0) -/* AD74EC 8006034C C6100060 */ lwc1 $f16, 0x60($s0) -/* AD74F0 80060350 C6060054 */ lwc1 $f6, 0x54($s0) -/* AD74F4 80060354 C60A0048 */ lwc1 $f10, 0x48($s0) -/* AD74F8 80060358 46128100 */ add.s $f4, $f16, $f18 -/* AD74FC 8006035C 46062200 */ add.s $f8, $f4, $f6 -/* AD7500 80060360 460A4400 */ add.s $f16, $f8, $f10 -/* AD7504 80060364 46008482 */ mul.s $f18, $f16, $f0 -/* AD7508 80060368 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD750C 8006036C E7B2006C */ swc1 $f18, 0x6c($sp) -/* AD7510 80060370 8FB80038 */ lw $t8, 0x38($sp) -/* AD7514 80060374 3C088016 */ lui $t0, %hi(D_8015E410) # $t0, 0x8016 -/* AD7518 80060378 2508E410 */ addiu $t0, %lo(D_8015E410) # addiu $t0, $t0, -0x1bf0 -/* AD751C 8006037C 27B90058 */ addiu $t9, $sp, 0x58 -/* AD7520 80060380 AFB90018 */ sw $t9, 0x18($sp) -/* AD7524 80060384 AFA8001C */ sw $t0, 0x1c($sp) -/* AD7528 80060388 8FA40078 */ lw $a0, 0x78($sp) -/* AD752C 8006038C 02002825 */ move $a1, $s0 -/* AD7530 80060390 8FA6003C */ lw $a2, 0x3c($sp) -/* AD7534 80060394 27A70064 */ addiu $a3, $sp, 0x64 -/* AD7538 80060398 AFB10010 */ sw $s1, 0x10($sp) -/* AD753C 8006039C 0C017A07 */ jal func_8005E81C -/* AD7540 800603A0 AFB80014 */ sw $t8, 0x14($sp) -/* AD7544 800603A4 1000003E */ b .L800604A0 -/* AD7548 800603A8 8FBF002C */ lw $ra, 0x2c($sp) -.L800603AC: -/* AD754C 800603AC 3C058016 */ lui $a1, %hi(D_8015E3D8) # $a1, 0x8016 -/* AD7550 800603B0 3C068016 */ lui $a2, %hi(D_8015E410) # $a2, 0x8016 -/* AD7554 800603B4 24C6E410 */ addiu $a2, %lo(D_8015E410) # addiu $a2, $a2, -0x1bf0 -/* AD7558 800603B8 24A5E3D8 */ addiu $a1, %lo(D_8015E3D8) # addiu $a1, $a1, -0x1c28 -/* AD755C 800603BC 0C033DF4 */ jal Math3D_CylTriTouchingIntersect -/* AD7560 800603C0 8FA40034 */ lw $a0, 0x34($sp) -/* AD7564 800603C4 24010001 */ li $at, 1 -/* AD7568 800603C8 14410034 */ bne $v0, $at, .L8006049C -/* AD756C 800603CC 8FA40078 */ lw $a0, 0x78($sp) -/* AD7570 800603D0 3C068016 */ lui $a2, %hi(D_8015E410) # $a2, 0x8016 -/* AD7574 800603D4 24C6E410 */ addiu $a2, %lo(D_8015E410) # addiu $a2, $a2, -0x1bf0 -/* AD7578 800603D8 0C017486 */ jal func_8005D218 -/* AD757C 800603DC 02002825 */ move $a1, $s0 -/* AD7580 800603E0 5040002F */ beql $v0, $zero, .L800604A0 -/* AD7584 800603E4 8FBF002C */ lw $ra, 0x2c($sp) -/* AD7588 800603E8 C6040058 */ lwc1 $f4, 0x58($s0) -/* AD758C 800603EC C6060064 */ lwc1 $f6, 0x64($s0) -/* AD7590 800603F0 C60A004C */ lwc1 $f10, 0x4c($s0) -/* AD7594 800603F4 C6120040 */ lwc1 $f18, 0x40($s0) -/* AD7598 800603F8 46062200 */ add.s $f8, $f4, $f6 -/* AD759C 800603FC 3C013E80 */ li $at, 0x3E800000 # 0.000000 -/* AD75A0 80060400 44810000 */ mtc1 $at, $f0 -/* AD75A4 80060404 27A40040 */ addiu $a0, $sp, 0x40 -/* AD75A8 80060408 460A4400 */ add.s $f16, $f8, $f10 -/* AD75AC 8006040C 26250046 */ addiu $a1, $s1, 0x46 -/* AD75B0 80060410 46128100 */ add.s $f4, $f16, $f18 -/* AD75B4 80060414 46002182 */ mul.s $f6, $f4, $f0 -/* AD75B8 80060418 E7A6004C */ swc1 $f6, 0x4c($sp) -/* AD75BC 8006041C C60A0068 */ lwc1 $f10, 0x68($s0) -/* AD75C0 80060420 C608005C */ lwc1 $f8, 0x5c($s0) -/* AD75C4 80060424 C6120050 */ lwc1 $f18, 0x50($s0) -/* AD75C8 80060428 C6060044 */ lwc1 $f6, 0x44($s0) -/* AD75CC 8006042C 460A4400 */ add.s $f16, $f8, $f10 -/* AD75D0 80060430 46128100 */ add.s $f4, $f16, $f18 -/* AD75D4 80060434 46062200 */ add.s $f8, $f4, $f6 -/* AD75D8 80060438 46004282 */ mul.s $f10, $f8, $f0 -/* AD75DC 8006043C E7AA0050 */ swc1 $f10, 0x50($sp) -/* AD75E0 80060440 C612006C */ lwc1 $f18, 0x6c($s0) -/* AD75E4 80060444 C6100060 */ lwc1 $f16, 0x60($s0) -/* AD75E8 80060448 C6060054 */ lwc1 $f6, 0x54($s0) -/* AD75EC 8006044C C60A0048 */ lwc1 $f10, 0x48($s0) -/* AD75F0 80060450 46128100 */ add.s $f4, $f16, $f18 -/* AD75F4 80060454 46062200 */ add.s $f8, $f4, $f6 -/* AD75F8 80060458 460A4400 */ add.s $f16, $f8, $f10 -/* AD75FC 8006045C 46008482 */ mul.s $f18, $f16, $f0 -/* AD7600 80060460 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD7604 80060464 E7B20054 */ swc1 $f18, 0x54($sp) -/* AD7608 80060468 8FA90038 */ lw $t1, 0x38($sp) -/* AD760C 8006046C 3C0B8016 */ lui $t3, %hi(D_8015E410) # $t3, 0x8016 -/* AD7610 80060470 256BE410 */ addiu $t3, %lo(D_8015E410) # addiu $t3, $t3, -0x1bf0 -/* AD7614 80060474 27AA0040 */ addiu $t2, $sp, 0x40 -/* AD7618 80060478 AFAA0018 */ sw $t2, 0x18($sp) -/* AD761C 8006047C AFAB001C */ sw $t3, 0x1c($sp) -/* AD7620 80060480 8FA40078 */ lw $a0, 0x78($sp) -/* AD7624 80060484 02002825 */ move $a1, $s0 -/* AD7628 80060488 8FA6003C */ lw $a2, 0x3c($sp) -/* AD762C 8006048C 27A7004C */ addiu $a3, $sp, 0x4c -/* AD7630 80060490 AFB10010 */ sw $s1, 0x10($sp) -/* AD7634 80060494 0C017A07 */ jal func_8005E81C -/* AD7638 80060498 AFA90014 */ sw $t1, 0x14($sp) -.L8006049C: -/* AD763C 8006049C 8FBF002C */ lw $ra, 0x2c($sp) -.L800604A0: -/* AD7640 800604A0 8FB00024 */ lw $s0, 0x24($sp) -/* AD7644 800604A4 8FB10028 */ lw $s1, 0x28($sp) -/* AD7648 800604A8 03E00008 */ jr $ra -/* AD764C 800604AC 27BD0078 */ addiu $sp, $sp, 0x78 - -/* AD7650 800604B0 27BDFF88 */ addiu $sp, $sp, -0x78 -/* AD7654 800604B4 AFBF0044 */ sw $ra, 0x44($sp) -/* AD7658 800604B8 AFB70040 */ sw $s7, 0x40($sp) -/* AD765C 800604BC AFB6003C */ sw $s6, 0x3c($sp) -/* AD7660 800604C0 AFB50038 */ sw $s5, 0x38($sp) -/* AD7664 800604C4 AFB40034 */ sw $s4, 0x34($sp) -/* AD7668 800604C8 AFB30030 */ sw $s3, 0x30($sp) -/* AD766C 800604CC AFB2002C */ sw $s2, 0x2c($sp) -/* AD7670 800604D0 AFB10028 */ sw $s1, 0x28($sp) -/* AD7674 800604D4 AFB00024 */ sw $s0, 0x24($sp) -/* AD7678 800604D8 AFA40078 */ sw $a0, 0x78($sp) -/* AD767C 800604DC AFA5007C */ sw $a1, 0x7c($sp) -/* AD7680 800604E0 8CE30018 */ lw $v1, 0x18($a3) -/* AD7684 800604E4 00C0B025 */ move $s6, $a2 -/* AD7688 800604E8 00C09825 */ move $s3, $a2 -/* AD768C 800604EC 1860007A */ blez $v1, .L800606D8 -/* AD7690 800604F0 00E0B825 */ move $s7, $a3 -/* AD7694 800604F4 8CE2001C */ lw $v0, 0x1c($a3) -/* AD7698 800604F8 50400078 */ beql $v0, $zero, .L800606DC -/* AD769C 800604FC 8FBF0044 */ lw $ra, 0x44($sp) -/* AD76A0 80060500 8CCE0018 */ lw $t6, 0x18($a2) -/* AD76A4 80060504 59C00075 */ blezl $t6, .L800606DC -/* AD76A8 80060508 8FBF0044 */ lw $ra, 0x44($sp) -/* AD76AC 8006050C 8CCF001C */ lw $t7, 0x1c($a2) -/* AD76B0 80060510 2414005C */ li $s4, 92 -/* AD76B4 80060514 51E00071 */ beql $t7, $zero, .L800606DC -/* AD76B8 80060518 8FBF0044 */ lw $ra, 0x44($sp) -/* AD76BC 8006051C 00740019 */ multu $v1, $s4 -/* AD76C0 80060520 3C158016 */ lui $s5, %hi(D_8015E420) # $s5, 0x8016 -/* AD76C4 80060524 26B5E420 */ addiu $s5, %lo(D_8015E420) # addiu $s5, $s5, -0x1be0 -/* AD76C8 80060528 00409025 */ move $s2, $v0 -/* AD76CC 8006052C 24110001 */ li $s1, 1 -/* AD76D0 80060530 0000C012 */ mflo $t8 -/* AD76D4 80060534 0058C821 */ addu $t9, $v0, $t8 -/* AD76D8 80060538 0059082B */ sltu $at, $v0, $t9 -/* AD76DC 8006053C 50200067 */ beql $at, $zero, .L800606DC -/* AD76E0 80060540 8FBF0044 */ lw $ra, 0x44($sp) -/* AD76E4 80060544 AFA70084 */ sw $a3, 0x84($sp) -.L80060548: -/* AD76E8 80060548 0C0177D4 */ jal func_8005DF50 -/* AD76EC 8006054C 02402025 */ move $a0, $s2 -/* AD76F0 80060550 50510059 */ beql $v0, $s1, .L800606B8 -/* AD76F4 80060554 8EE80018 */ lw $t0, 0x18($s7) -/* AD76F8 80060558 8EC80018 */ lw $t0, 0x18($s6) -/* AD76FC 8006055C 8ED0001C */ lw $s0, 0x1c($s6) -/* AD7700 80060560 01140019 */ multu $t0, $s4 -/* AD7704 80060564 00004812 */ mflo $t1 -/* AD7708 80060568 02095021 */ addu $t2, $s0, $t1 -/* AD770C 8006056C 020A082B */ sltu $at, $s0, $t2 -/* AD7710 80060570 50200051 */ beql $at, $zero, .L800606B8 -/* AD7714 80060574 8EE80018 */ lw $t0, 0x18($s7) -.L80060578: -/* AD7718 80060578 0C0177CB */ jal func_8005DF2C -/* AD771C 8006057C 02002025 */ move $a0, $s0 -/* AD7720 80060580 10510043 */ beq $v0, $s1, .L80060690 -/* AD7724 80060584 02002025 */ move $a0, $s0 -/* AD7728 80060588 0C0177DD */ jal func_8005DF74 -/* AD772C 8006058C 02402825 */ move $a1, $s2 -/* AD7730 80060590 1051003F */ beq $v0, $s1, .L80060690 -/* AD7734 80060594 26040028 */ addiu $a0, $s0, 0x28 -/* AD7738 80060598 26450028 */ addiu $a1, $s2, 0x28 -/* AD773C 8006059C 0C034041 */ jal Math3D_TrisIntersect -/* AD7740 800605A0 02A03025 */ move $a2, $s5 -/* AD7744 800605A4 5451003B */ bnel $v0, $s1, .L80060694 -/* AD7748 800605A8 8E6E0018 */ lw $t6, 0x18($s3) -/* AD774C 800605AC C6040028 */ lwc1 $f4, 0x28($s0) -/* AD7750 800605B0 C6060034 */ lwc1 $f6, 0x34($s0) -/* AD7754 800605B4 C60A0040 */ lwc1 $f10, 0x40($s0) -/* AD7758 800605B8 3C018014 */ lui $at, %hi(D_8013AD18) -/* AD775C 800605BC 46062200 */ add.s $f8, $f4, $f6 -/* AD7760 800605C0 C420AD18 */ lwc1 $f0, %lo(D_8013AD18)($at) -/* AD7764 800605C4 8FAB0084 */ lw $t3, 0x84($sp) -/* AD7768 800605C8 27AC0050 */ addiu $t4, $sp, 0x50 -/* AD776C 800605CC 46085400 */ add.s $f16, $f10, $f8 -/* AD7770 800605D0 8FA40078 */ lw $a0, 0x78($sp) -/* AD7774 800605D4 02C02825 */ move $a1, $s6 -/* AD7778 800605D8 02003025 */ move $a2, $s0 -/* AD777C 800605DC 46008482 */ mul.s $f18, $f16, $f0 -/* AD7780 800605E0 27A7005C */ addiu $a3, $sp, 0x5c -/* AD7784 800605E4 E7B2005C */ swc1 $f18, 0x5c($sp) -/* AD7788 800605E8 C6060038 */ lwc1 $f6, 0x38($s0) -/* AD778C 800605EC C604002C */ lwc1 $f4, 0x2c($s0) -/* AD7790 800605F0 C6080044 */ lwc1 $f8, 0x44($s0) -/* AD7794 800605F4 46062280 */ add.s $f10, $f4, $f6 -/* AD7798 800605F8 460A4400 */ add.s $f16, $f8, $f10 -/* AD779C 800605FC 46008482 */ mul.s $f18, $f16, $f0 -/* AD77A0 80060600 E7B20060 */ swc1 $f18, 0x60($sp) -/* AD77A4 80060604 C606003C */ lwc1 $f6, 0x3c($s0) -/* AD77A8 80060608 C6040030 */ lwc1 $f4, 0x30($s0) -/* AD77AC 8006060C C60A0048 */ lwc1 $f10, 0x48($s0) -/* AD77B0 80060610 46062200 */ add.s $f8, $f4, $f6 -/* AD77B4 80060614 46085400 */ add.s $f16, $f10, $f8 -/* AD77B8 80060618 46008482 */ mul.s $f18, $f16, $f0 -/* AD77BC 8006061C E7B20064 */ swc1 $f18, 0x64($sp) -/* AD77C0 80060620 C6460034 */ lwc1 $f6, 0x34($s2) -/* AD77C4 80060624 C6440028 */ lwc1 $f4, 0x28($s2) -/* AD77C8 80060628 C6480040 */ lwc1 $f8, 0x40($s2) -/* AD77CC 8006062C 46062280 */ add.s $f10, $f4, $f6 -/* AD77D0 80060630 460A4400 */ add.s $f16, $f8, $f10 -/* AD77D4 80060634 46008482 */ mul.s $f18, $f16, $f0 -/* AD77D8 80060638 E7B20050 */ swc1 $f18, 0x50($sp) -/* AD77DC 8006063C C6460038 */ lwc1 $f6, 0x38($s2) -/* AD77E0 80060640 C644002C */ lwc1 $f4, 0x2c($s2) -/* AD77E4 80060644 C64A0044 */ lwc1 $f10, 0x44($s2) -/* AD77E8 80060648 46062200 */ add.s $f8, $f4, $f6 -/* AD77EC 8006064C 46085400 */ add.s $f16, $f10, $f8 -/* AD77F0 80060650 46008482 */ mul.s $f18, $f16, $f0 -/* AD77F4 80060654 E7B20054 */ swc1 $f18, 0x54($sp) -/* AD77F8 80060658 C646003C */ lwc1 $f6, 0x3c($s2) -/* AD77FC 8006065C C6440030 */ lwc1 $f4, 0x30($s2) -/* AD7800 80060660 C6480048 */ lwc1 $f8, 0x48($s2) -/* AD7804 80060664 AFB5001C */ sw $s5, 0x1c($sp) -/* AD7808 80060668 46062280 */ add.s $f10, $f4, $f6 -/* AD780C 8006066C AFAC0018 */ sw $t4, 0x18($sp) -/* AD7810 80060670 AFB20014 */ sw $s2, 0x14($sp) -/* AD7814 80060674 AFAB0010 */ sw $t3, 0x10($sp) -/* AD7818 80060678 460A4400 */ add.s $f16, $f8, $f10 -/* AD781C 8006067C 46008482 */ mul.s $f18, $f16, $f0 -/* AD7820 80060680 0C017A07 */ jal func_8005E81C -/* AD7824 80060684 E7B20058 */ swc1 $f18, 0x58($sp) -/* AD7828 80060688 10000014 */ b .L800606DC -/* AD782C 8006068C 8FBF0044 */ lw $ra, 0x44($sp) -.L80060690: -/* AD7830 80060690 8E6E0018 */ lw $t6, 0x18($s3) -.L80060694: -/* AD7834 80060694 8E6D001C */ lw $t5, 0x1c($s3) -/* AD7838 80060698 2610005C */ addiu $s0, $s0, 0x5c -/* AD783C 8006069C 01D40019 */ multu $t6, $s4 -/* AD7840 800606A0 00007812 */ mflo $t7 -/* AD7844 800606A4 01AFC021 */ addu $t8, $t5, $t7 -/* AD7848 800606A8 0218082B */ sltu $at, $s0, $t8 -/* AD784C 800606AC 1420FFB2 */ bnez $at, .L80060578 -/* AD7850 800606B0 00000000 */ nop -/* AD7854 800606B4 8EE80018 */ lw $t0, 0x18($s7) -.L800606B8: -/* AD7858 800606B8 8EF9001C */ lw $t9, 0x1c($s7) -/* AD785C 800606BC 2652005C */ addiu $s2, $s2, 0x5c -/* AD7860 800606C0 01140019 */ multu $t0, $s4 -/* AD7864 800606C4 00004812 */ mflo $t1 -/* AD7868 800606C8 03295021 */ addu $t2, $t9, $t1 -/* AD786C 800606CC 024A082B */ sltu $at, $s2, $t2 -/* AD7870 800606D0 1420FF9D */ bnez $at, .L80060548 -/* AD7874 800606D4 00000000 */ nop -.L800606D8: -/* AD7878 800606D8 8FBF0044 */ lw $ra, 0x44($sp) -.L800606DC: -/* AD787C 800606DC 8FB00024 */ lw $s0, 0x24($sp) -/* AD7880 800606E0 8FB10028 */ lw $s1, 0x28($sp) -/* AD7884 800606E4 8FB2002C */ lw $s2, 0x2c($sp) -/* AD7888 800606E8 8FB30030 */ lw $s3, 0x30($sp) -/* AD788C 800606EC 8FB40034 */ lw $s4, 0x34($sp) -/* AD7890 800606F0 8FB50038 */ lw $s5, 0x38($sp) -/* AD7894 800606F4 8FB6003C */ lw $s6, 0x3c($sp) -/* AD7898 800606F8 8FB70040 */ lw $s7, 0x40($sp) -/* AD789C 800606FC 03E00008 */ jr $ra -/* AD78A0 80060700 27BD0078 */ addiu $sp, $sp, 0x78 - -/* AD78A4 80060704 27BDFF80 */ addiu $sp, $sp, -0x80 -/* AD78A8 80060708 AFBF004C */ sw $ra, 0x4c($sp) -/* AD78AC 8006070C AFBE0048 */ sw $fp, 0x48($sp) -/* AD78B0 80060710 AFB70044 */ sw $s7, 0x44($sp) -/* AD78B4 80060714 AFB60040 */ sw $s6, 0x40($sp) -/* AD78B8 80060718 AFB5003C */ sw $s5, 0x3c($sp) -/* AD78BC 8006071C AFB40038 */ sw $s4, 0x38($sp) -/* AD78C0 80060720 AFB30034 */ sw $s3, 0x34($sp) -/* AD78C4 80060724 AFB20030 */ sw $s2, 0x30($sp) -/* AD78C8 80060728 AFB1002C */ sw $s1, 0x2c($sp) -/* AD78CC 8006072C AFB00028 */ sw $s0, 0x28($sp) -/* AD78D0 80060730 AFA40080 */ sw $a0, 0x80($sp) -/* AD78D4 80060734 AFA50084 */ sw $a1, 0x84($sp) -/* AD78D8 80060738 8CCE0018 */ lw $t6, 0x18($a2) -/* AD78DC 8006073C 00E09825 */ move $s3, $a3 -/* AD78E0 80060740 00C0A825 */ move $s5, $a2 -/* AD78E4 80060744 59C00088 */ blezl $t6, .L80060968 -/* AD78E8 80060748 8FBF004C */ lw $ra, 0x4c($sp) -/* AD78EC 8006074C 8CCF001C */ lw $t7, 0x1c($a2) -/* AD78F0 80060750 24F60018 */ addiu $s6, $a3, 0x18 -/* AD78F4 80060754 02C02025 */ move $a0, $s6 -/* AD78F8 80060758 51E00083 */ beql $t7, $zero, .L80060968 -/* AD78FC 8006075C 8FBF004C */ lw $ra, 0x4c($sp) -/* AD7900 80060760 0C0177D4 */ jal func_8005DF50 -/* AD7904 80060764 AFA60088 */ sw $a2, 0x88($sp) -/* AD7908 80060768 24120001 */ li $s2, 1 -/* AD790C 8006076C 1052007D */ beq $v0, $s2, .L80060964 -/* AD7910 80060770 3C178016 */ lui $s7, %hi(D_8015E440) # $s7, 0x8016 -/* AD7914 80060774 26F7E440 */ addiu $s7, %lo(D_8015E440) # addiu $s7, $s7, -0x1bc0 -/* AD7918 80060778 26710058 */ addiu $s1, $s3, 0x58 -/* AD791C 8006077C 2670004C */ addiu $s0, $s3, 0x4c -/* AD7920 80060780 02003825 */ move $a3, $s0 -/* AD7924 80060784 02202825 */ move $a1, $s1 -/* AD7928 80060788 02E02025 */ move $a0, $s7 -/* AD792C 8006078C 0C0338F0 */ jal Math3D_TriNorm -/* AD7930 80060790 26660064 */ addiu $a2, $s3, 0x64 -/* AD7934 80060794 3C1E8016 */ lui $fp, %hi(D_8015E478) # $fp, 0x8016 -/* AD7938 80060798 27DEE478 */ addiu $fp, %lo(D_8015E478) # addiu $fp, $fp, -0x1b88 -/* AD793C 8006079C 03C02025 */ move $a0, $fp -/* AD7940 800607A0 02002825 */ move $a1, $s0 -/* AD7944 800607A4 26660040 */ addiu $a2, $s3, 0x40 -/* AD7948 800607A8 0C0338F0 */ jal Math3D_TriNorm -/* AD794C 800607AC 02203825 */ move $a3, $s1 -/* AD7950 800607B0 8FA30088 */ lw $v1, 0x88($sp) -/* AD7954 800607B4 3C148016 */ lui $s4, %hi(D_8015E430) # $s4, 0x8016 -/* AD7958 800607B8 2694E430 */ addiu $s4, %lo(D_8015E430) # addiu $s4, $s4, -0x1bd0 -/* AD795C 800607BC 8C780018 */ lw $t8, 0x18($v1) -/* AD7960 800607C0 8C71001C */ lw $s1, 0x1c($v1) -/* AD7964 800607C4 0018C880 */ sll $t9, $t8, 2 -/* AD7968 800607C8 0338C823 */ subu $t9, $t9, $t8 -/* AD796C 800607CC 0019C8C0 */ sll $t9, $t9, 3 -/* AD7970 800607D0 0338C823 */ subu $t9, $t9, $t8 -/* AD7974 800607D4 0019C880 */ sll $t9, $t9, 2 -/* AD7978 800607D8 02394021 */ addu $t0, $s1, $t9 -/* AD797C 800607DC 0228082B */ sltu $at, $s1, $t0 -/* AD7980 800607E0 50200061 */ beql $at, $zero, .L80060968 -/* AD7984 800607E4 8FBF004C */ lw $ra, 0x4c($sp) -.L800607E8: -/* AD7988 800607E8 0C0177CB */ jal func_8005DF2C -/* AD798C 800607EC 02202025 */ move $a0, $s1 -/* AD7990 800607F0 10520050 */ beq $v0, $s2, .L80060934 -/* AD7994 800607F4 02202025 */ move $a0, $s1 -/* AD7998 800607F8 0C0177DD */ jal func_8005DF74 -/* AD799C 800607FC 02C02825 */ move $a1, $s6 -/* AD79A0 80060800 1052004C */ beq $v0, $s2, .L80060934 -/* AD79A4 80060804 02E02025 */ move $a0, $s7 -/* AD79A8 80060808 26300028 */ addiu $s0, $s1, 0x28 -/* AD79AC 8006080C 02002825 */ move $a1, $s0 -/* AD79B0 80060810 0C034041 */ jal Math3D_TrisIntersect -/* AD79B4 80060814 02803025 */ move $a2, $s4 -/* AD79B8 80060818 10520006 */ beq $v0, $s2, .L80060834 -/* AD79BC 8006081C 03C02025 */ move $a0, $fp -/* AD79C0 80060820 02002825 */ move $a1, $s0 -/* AD79C4 80060824 0C034041 */ jal Math3D_TrisIntersect -/* AD79C8 80060828 02803025 */ move $a2, $s4 -/* AD79CC 8006082C 54520042 */ bnel $v0, $s2, .L80060938 -/* AD79D0 80060830 8EAB0018 */ lw $t3, 0x18($s5) -.L80060834: -/* AD79D4 80060834 C6240028 */ lwc1 $f4, 0x28($s1) -/* AD79D8 80060838 C6260034 */ lwc1 $f6, 0x34($s1) -/* AD79DC 8006083C C62A0040 */ lwc1 $f10, 0x40($s1) -/* AD79E0 80060840 3C018014 */ lui $at, %hi(D_8013AD1C) -/* AD79E4 80060844 46062200 */ add.s $f8, $f4, $f6 -/* AD79E8 80060848 C420AD1C */ lwc1 $f0, %lo(D_8013AD1C)($at) -/* AD79EC 8006084C 3C013E80 */ li $at, 0x3E800000 # 0.000000 -/* AD79F0 80060850 44811000 */ mtc1 $at, $f2 -/* AD79F4 80060854 46085400 */ add.s $f16, $f10, $f8 -/* AD79F8 80060858 27A9005C */ addiu $t1, $sp, 0x5c -/* AD79FC 8006085C 8FA40080 */ lw $a0, 0x80($sp) -/* AD7A00 80060860 8FA50088 */ lw $a1, 0x88($sp) -/* AD7A04 80060864 46008482 */ mul.s $f18, $f16, $f0 -/* AD7A08 80060868 02203025 */ move $a2, $s1 -/* AD7A0C 8006086C 27A70068 */ addiu $a3, $sp, 0x68 -/* AD7A10 80060870 E7B20068 */ swc1 $f18, 0x68($sp) -/* AD7A14 80060874 C6260038 */ lwc1 $f6, 0x38($s1) -/* AD7A18 80060878 C624002C */ lwc1 $f4, 0x2c($s1) -/* AD7A1C 8006087C C6280044 */ lwc1 $f8, 0x44($s1) -/* AD7A20 80060880 46062280 */ add.s $f10, $f4, $f6 -/* AD7A24 80060884 460A4400 */ add.s $f16, $f8, $f10 -/* AD7A28 80060888 46008482 */ mul.s $f18, $f16, $f0 -/* AD7A2C 8006088C E7B2006C */ swc1 $f18, 0x6c($sp) -/* AD7A30 80060890 C626003C */ lwc1 $f6, 0x3c($s1) -/* AD7A34 80060894 C6240030 */ lwc1 $f4, 0x30($s1) -/* AD7A38 80060898 C62A0048 */ lwc1 $f10, 0x48($s1) -/* AD7A3C 8006089C 46062200 */ add.s $f8, $f4, $f6 -/* AD7A40 800608A0 46085400 */ add.s $f16, $f10, $f8 -/* AD7A44 800608A4 46008482 */ mul.s $f18, $f16, $f0 -/* AD7A48 800608A8 E7B20070 */ swc1 $f18, 0x70($sp) -/* AD7A4C 800608AC C6660064 */ lwc1 $f6, 0x64($s3) -/* AD7A50 800608B0 C6640058 */ lwc1 $f4, 0x58($s3) -/* AD7A54 800608B4 C668004C */ lwc1 $f8, 0x4c($s3) -/* AD7A58 800608B8 C6720040 */ lwc1 $f18, 0x40($s3) -/* AD7A5C 800608BC 46062280 */ add.s $f10, $f4, $f6 -/* AD7A60 800608C0 46085400 */ add.s $f16, $f10, $f8 -/* AD7A64 800608C4 46128100 */ add.s $f4, $f16, $f18 -/* AD7A68 800608C8 46022182 */ mul.s $f6, $f4, $f2 -/* AD7A6C 800608CC E7A6005C */ swc1 $f6, 0x5c($sp) -/* AD7A70 800608D0 C6680068 */ lwc1 $f8, 0x68($s3) -/* AD7A74 800608D4 C66A005C */ lwc1 $f10, 0x5c($s3) -/* AD7A78 800608D8 C6720050 */ lwc1 $f18, 0x50($s3) -/* AD7A7C 800608DC C6660044 */ lwc1 $f6, 0x44($s3) -/* AD7A80 800608E0 46085400 */ add.s $f16, $f10, $f8 -/* AD7A84 800608E4 46128100 */ add.s $f4, $f16, $f18 -/* AD7A88 800608E8 46062280 */ add.s $f10, $f4, $f6 -/* AD7A8C 800608EC 46025202 */ mul.s $f8, $f10, $f2 -/* AD7A90 800608F0 E7A80060 */ swc1 $f8, 0x60($sp) -/* AD7A94 800608F4 C672006C */ lwc1 $f18, 0x6c($s3) -/* AD7A98 800608F8 C6700060 */ lwc1 $f16, 0x60($s3) -/* AD7A9C 800608FC C6660054 */ lwc1 $f6, 0x54($s3) -/* AD7AA0 80060900 C6680048 */ lwc1 $f8, 0x48($s3) -/* AD7AA4 80060904 46128100 */ add.s $f4, $f16, $f18 -/* AD7AA8 80060908 AFB4001C */ sw $s4, 0x1c($sp) -/* AD7AAC 8006090C AFA90018 */ sw $t1, 0x18($sp) -/* AD7AB0 80060910 AFB60014 */ sw $s6, 0x14($sp) -/* AD7AB4 80060914 46062280 */ add.s $f10, $f4, $f6 -/* AD7AB8 80060918 AFB30010 */ sw $s3, 0x10($sp) -/* AD7ABC 8006091C 46085400 */ add.s $f16, $f10, $f8 -/* AD7AC0 80060920 46028482 */ mul.s $f18, $f16, $f2 -/* AD7AC4 80060924 0C017A07 */ jal func_8005E81C -/* AD7AC8 80060928 E7B20064 */ swc1 $f18, 0x64($sp) -/* AD7ACC 8006092C 1000000E */ b .L80060968 -/* AD7AD0 80060930 8FBF004C */ lw $ra, 0x4c($sp) -.L80060934: -/* AD7AD4 80060934 8EAB0018 */ lw $t3, 0x18($s5) -.L80060938: -/* AD7AD8 80060938 8EAA001C */ lw $t2, 0x1c($s5) -/* AD7ADC 8006093C 2631005C */ addiu $s1, $s1, 0x5c -/* AD7AE0 80060940 000B6080 */ sll $t4, $t3, 2 -/* AD7AE4 80060944 018B6023 */ subu $t4, $t4, $t3 -/* AD7AE8 80060948 000C60C0 */ sll $t4, $t4, 3 -/* AD7AEC 8006094C 018B6023 */ subu $t4, $t4, $t3 -/* AD7AF0 80060950 000C6080 */ sll $t4, $t4, 2 -/* AD7AF4 80060954 014C6821 */ addu $t5, $t2, $t4 -/* AD7AF8 80060958 022D082B */ sltu $at, $s1, $t5 -/* AD7AFC 8006095C 1420FFA2 */ bnez $at, .L800607E8 -/* AD7B00 80060960 00000000 */ nop -.L80060964: -/* AD7B04 80060964 8FBF004C */ lw $ra, 0x4c($sp) -.L80060968: -/* AD7B08 80060968 8FB00028 */ lw $s0, 0x28($sp) -/* AD7B0C 8006096C 8FB1002C */ lw $s1, 0x2c($sp) -/* AD7B10 80060970 8FB20030 */ lw $s2, 0x30($sp) -/* AD7B14 80060974 8FB30034 */ lw $s3, 0x34($sp) -/* AD7B18 80060978 8FB40038 */ lw $s4, 0x38($sp) -/* AD7B1C 8006097C 8FB5003C */ lw $s5, 0x3c($sp) -/* AD7B20 80060980 8FB60040 */ lw $s6, 0x40($sp) -/* AD7B24 80060984 8FB70044 */ lw $s7, 0x44($sp) -/* AD7B28 80060988 8FBE0048 */ lw $fp, 0x48($sp) -/* AD7B2C 8006098C 03E00008 */ jr $ra -/* AD7B30 80060990 27BD0080 */ addiu $sp, $sp, 0x80 - -/* AD7B34 80060994 27BDFF80 */ addiu $sp, $sp, -0x80 -/* AD7B38 80060998 AFBF004C */ sw $ra, 0x4c($sp) -/* AD7B3C 8006099C AFBE0048 */ sw $fp, 0x48($sp) -/* AD7B40 800609A0 AFB70044 */ sw $s7, 0x44($sp) -/* AD7B44 800609A4 AFB60040 */ sw $s6, 0x40($sp) -/* AD7B48 800609A8 AFB5003C */ sw $s5, 0x3c($sp) -/* AD7B4C 800609AC AFB40038 */ sw $s4, 0x38($sp) -/* AD7B50 800609B0 AFB30034 */ sw $s3, 0x34($sp) -/* AD7B54 800609B4 AFB20030 */ sw $s2, 0x30($sp) -/* AD7B58 800609B8 AFB1002C */ sw $s1, 0x2c($sp) -/* AD7B5C 800609BC AFB00028 */ sw $s0, 0x28($sp) -/* AD7B60 800609C0 AFA40080 */ sw $a0, 0x80($sp) -/* AD7B64 800609C4 AFA50084 */ sw $a1, 0x84($sp) -/* AD7B68 800609C8 8CEE0018 */ lw $t6, 0x18($a3) -/* AD7B6C 800609CC 00C0A025 */ move $s4, $a2 -/* AD7B70 800609D0 00E0A825 */ move $s5, $a3 -/* AD7B74 800609D4 59C0008A */ blezl $t6, .L80060C00 -/* AD7B78 800609D8 8FBF004C */ lw $ra, 0x4c($sp) -/* AD7B7C 800609DC 8CEF001C */ lw $t7, 0x1c($a3) -/* AD7B80 800609E0 24D70018 */ addiu $s7, $a2, 0x18 -/* AD7B84 800609E4 02E02025 */ move $a0, $s7 -/* AD7B88 800609E8 51E00085 */ beql $t7, $zero, .L80060C00 -/* AD7B8C 800609EC 8FBF004C */ lw $ra, 0x4c($sp) -/* AD7B90 800609F0 0C0177CB */ jal func_8005DF2C -/* AD7B94 800609F4 AFA7008C */ sw $a3, 0x8c($sp) -/* AD7B98 800609F8 24120001 */ li $s2, 1 -/* AD7B9C 800609FC 1052007F */ beq $v0, $s2, .L80060BFC -/* AD7BA0 80060A00 3C1E8016 */ lui $fp, %hi(D_8015E4C0) # $fp, 0x8016 -/* AD7BA4 80060A04 27DEE4C0 */ addiu $fp, %lo(D_8015E4C0) # addiu $fp, $fp, -0x1b40 -/* AD7BA8 80060A08 26910058 */ addiu $s1, $s4, 0x58 -/* AD7BAC 80060A0C 2690004C */ addiu $s0, $s4, 0x4c -/* AD7BB0 80060A10 02003825 */ move $a3, $s0 -/* AD7BB4 80060A14 02202825 */ move $a1, $s1 -/* AD7BB8 80060A18 03C02025 */ move $a0, $fp -/* AD7BBC 80060A1C 0C0338F0 */ jal Math3D_TriNorm -/* AD7BC0 80060A20 26860064 */ addiu $a2, $s4, 0x64 -/* AD7BC4 80060A24 3C048016 */ lui $a0, %hi(D_8015E4F8) # $a0, 0x8016 -/* AD7BC8 80060A28 2484E4F8 */ addiu $a0, %lo(D_8015E4F8) # addiu $a0, $a0, -0x1b08 -/* AD7BCC 80060A2C 02002825 */ move $a1, $s0 -/* AD7BD0 80060A30 26860040 */ addiu $a2, $s4, 0x40 -/* AD7BD4 80060A34 0C0338F0 */ jal Math3D_TriNorm -/* AD7BD8 80060A38 02203825 */ move $a3, $s1 -/* AD7BDC 80060A3C 8FA3008C */ lw $v1, 0x8c($sp) -/* AD7BE0 80060A40 2416005C */ li $s6, 92 -/* AD7BE4 80060A44 3C138016 */ lui $s3, %hi(D_8015E4B0) # $s3, 0x8016 -/* AD7BE8 80060A48 8C780018 */ lw $t8, 0x18($v1) -/* AD7BEC 80060A4C 8C71001C */ lw $s1, 0x1c($v1) -/* AD7BF0 80060A50 2673E4B0 */ addiu $s3, %lo(D_8015E4B0) # addiu $s3, $s3, -0x1b50 -/* AD7BF4 80060A54 03160019 */ multu $t8, $s6 -/* AD7BF8 80060A58 0000C812 */ mflo $t9 -/* AD7BFC 80060A5C 02394021 */ addu $t0, $s1, $t9 -/* AD7C00 80060A60 0228082B */ sltu $at, $s1, $t0 -/* AD7C04 80060A64 50200066 */ beql $at, $zero, .L80060C00 -/* AD7C08 80060A68 8FBF004C */ lw $ra, 0x4c($sp) -.L80060A6C: -/* AD7C0C 80060A6C 0C0177D4 */ jal func_8005DF50 -/* AD7C10 80060A70 02202025 */ move $a0, $s1 -/* AD7C14 80060A74 10520058 */ beq $v0, $s2, .L80060BD8 -/* AD7C18 80060A78 02E02025 */ move $a0, $s7 -/* AD7C1C 80060A7C 0C0177DD */ jal func_8005DF74 -/* AD7C20 80060A80 02202825 */ move $a1, $s1 -/* AD7C24 80060A84 10520054 */ beq $v0, $s2, .L80060BD8 -/* AD7C28 80060A88 03C02025 */ move $a0, $fp -/* AD7C2C 80060A8C 26300028 */ addiu $s0, $s1, 0x28 -/* AD7C30 80060A90 02002825 */ move $a1, $s0 -/* AD7C34 80060A94 0C034041 */ jal Math3D_TrisIntersect -/* AD7C38 80060A98 02603025 */ move $a2, $s3 -/* AD7C3C 80060A9C 10520007 */ beq $v0, $s2, .L80060ABC -/* AD7C40 80060AA0 3C048016 */ lui $a0, %hi(D_8015E4F8) # $a0, 0x8016 -/* AD7C44 80060AA4 2484E4F8 */ addiu $a0, %lo(D_8015E4F8) # addiu $a0, $a0, -0x1b08 -/* AD7C48 80060AA8 02002825 */ move $a1, $s0 -/* AD7C4C 80060AAC 0C034041 */ jal Math3D_TrisIntersect -/* AD7C50 80060AB0 02603025 */ move $a2, $s3 -/* AD7C54 80060AB4 54520049 */ bnel $v0, $s2, .L80060BDC -/* AD7C58 80060AB8 8EAC0018 */ lw $t4, 0x18($s5) -.L80060ABC: -/* AD7C5C 80060ABC 8FA40080 */ lw $a0, 0x80($sp) -/* AD7C60 80060AC0 02802825 */ move $a1, $s4 -/* AD7C64 80060AC4 0C017486 */ jal func_8005D218 -/* AD7C68 80060AC8 02603025 */ move $a2, $s3 -/* AD7C6C 80060ACC 50400043 */ beql $v0, $zero, .L80060BDC -/* AD7C70 80060AD0 8EAC0018 */ lw $t4, 0x18($s5) -/* AD7C74 80060AD4 C6240028 */ lwc1 $f4, 0x28($s1) -/* AD7C78 80060AD8 C6260034 */ lwc1 $f6, 0x34($s1) -/* AD7C7C 80060ADC C62A0040 */ lwc1 $f10, 0x40($s1) -/* AD7C80 80060AE0 3C018014 */ lui $at, %hi(D_8013AD20) -/* AD7C84 80060AE4 46062200 */ add.s $f8, $f4, $f6 -/* AD7C88 80060AE8 C420AD20 */ lwc1 $f0, %lo(D_8013AD20)($at) -/* AD7C8C 80060AEC 3C013E80 */ li $at, 0x3E800000 # 0.000000 -/* AD7C90 80060AF0 44811000 */ mtc1 $at, $f2 -/* AD7C94 80060AF4 46085400 */ add.s $f16, $f10, $f8 -/* AD7C98 80060AF8 8FA9008C */ lw $t1, 0x8c($sp) -/* AD7C9C 80060AFC 27AA005C */ addiu $t2, $sp, 0x5c -/* AD7CA0 80060B00 8FA40080 */ lw $a0, 0x80($sp) -/* AD7CA4 80060B04 46008482 */ mul.s $f18, $f16, $f0 -/* AD7CA8 80060B08 02802825 */ move $a1, $s4 -/* AD7CAC 80060B0C 02E03025 */ move $a2, $s7 -/* AD7CB0 80060B10 27A70068 */ addiu $a3, $sp, 0x68 -/* AD7CB4 80060B14 E7B2005C */ swc1 $f18, 0x5c($sp) -/* AD7CB8 80060B18 C6260038 */ lwc1 $f6, 0x38($s1) -/* AD7CBC 80060B1C C624002C */ lwc1 $f4, 0x2c($s1) -/* AD7CC0 80060B20 C6280044 */ lwc1 $f8, 0x44($s1) -/* AD7CC4 80060B24 46062280 */ add.s $f10, $f4, $f6 -/* AD7CC8 80060B28 460A4400 */ add.s $f16, $f8, $f10 -/* AD7CCC 80060B2C 46008482 */ mul.s $f18, $f16, $f0 -/* AD7CD0 80060B30 E7B20060 */ swc1 $f18, 0x60($sp) -/* AD7CD4 80060B34 C626003C */ lwc1 $f6, 0x3c($s1) -/* AD7CD8 80060B38 C6240030 */ lwc1 $f4, 0x30($s1) -/* AD7CDC 80060B3C C62A0048 */ lwc1 $f10, 0x48($s1) -/* AD7CE0 80060B40 46062200 */ add.s $f8, $f4, $f6 -/* AD7CE4 80060B44 46085400 */ add.s $f16, $f10, $f8 -/* AD7CE8 80060B48 46008482 */ mul.s $f18, $f16, $f0 -/* AD7CEC 80060B4C E7B20064 */ swc1 $f18, 0x64($sp) -/* AD7CF0 80060B50 C6860064 */ lwc1 $f6, 0x64($s4) -/* AD7CF4 80060B54 C6840058 */ lwc1 $f4, 0x58($s4) -/* AD7CF8 80060B58 C688004C */ lwc1 $f8, 0x4c($s4) -/* AD7CFC 80060B5C C6920040 */ lwc1 $f18, 0x40($s4) -/* AD7D00 80060B60 46062280 */ add.s $f10, $f4, $f6 -/* AD7D04 80060B64 46085400 */ add.s $f16, $f10, $f8 -/* AD7D08 80060B68 46128100 */ add.s $f4, $f16, $f18 -/* AD7D0C 80060B6C 46022182 */ mul.s $f6, $f4, $f2 -/* AD7D10 80060B70 E7A60068 */ swc1 $f6, 0x68($sp) -/* AD7D14 80060B74 C6880068 */ lwc1 $f8, 0x68($s4) -/* AD7D18 80060B78 C68A005C */ lwc1 $f10, 0x5c($s4) -/* AD7D1C 80060B7C C6920050 */ lwc1 $f18, 0x50($s4) -/* AD7D20 80060B80 C6860044 */ lwc1 $f6, 0x44($s4) -/* AD7D24 80060B84 46085400 */ add.s $f16, $f10, $f8 -/* AD7D28 80060B88 46128100 */ add.s $f4, $f16, $f18 -/* AD7D2C 80060B8C 46062280 */ add.s $f10, $f4, $f6 -/* AD7D30 80060B90 46025202 */ mul.s $f8, $f10, $f2 -/* AD7D34 80060B94 E7A8006C */ swc1 $f8, 0x6c($sp) -/* AD7D38 80060B98 C692006C */ lwc1 $f18, 0x6c($s4) -/* AD7D3C 80060B9C C6900060 */ lwc1 $f16, 0x60($s4) -/* AD7D40 80060BA0 C6860054 */ lwc1 $f6, 0x54($s4) -/* AD7D44 80060BA4 C6880048 */ lwc1 $f8, 0x48($s4) -/* AD7D48 80060BA8 46128100 */ add.s $f4, $f16, $f18 -/* AD7D4C 80060BAC AFB3001C */ sw $s3, 0x1c($sp) -/* AD7D50 80060BB0 AFAA0018 */ sw $t2, 0x18($sp) -/* AD7D54 80060BB4 AFB10014 */ sw $s1, 0x14($sp) -/* AD7D58 80060BB8 46062280 */ add.s $f10, $f4, $f6 -/* AD7D5C 80060BBC AFA90010 */ sw $t1, 0x10($sp) -/* AD7D60 80060BC0 46085400 */ add.s $f16, $f10, $f8 -/* AD7D64 80060BC4 46028482 */ mul.s $f18, $f16, $f2 -/* AD7D68 80060BC8 0C017A07 */ jal func_8005E81C -/* AD7D6C 80060BCC E7B20070 */ swc1 $f18, 0x70($sp) -/* AD7D70 80060BD0 1000000B */ b .L80060C00 -/* AD7D74 80060BD4 8FBF004C */ lw $ra, 0x4c($sp) -.L80060BD8: -/* AD7D78 80060BD8 8EAC0018 */ lw $t4, 0x18($s5) -.L80060BDC: -/* AD7D7C 80060BDC 8EAB001C */ lw $t3, 0x1c($s5) -/* AD7D80 80060BE0 2631005C */ addiu $s1, $s1, 0x5c -/* AD7D84 80060BE4 01960019 */ multu $t4, $s6 -/* AD7D88 80060BE8 00006812 */ mflo $t5 -/* AD7D8C 80060BEC 016D7021 */ addu $t6, $t3, $t5 -/* AD7D90 80060BF0 022E082B */ sltu $at, $s1, $t6 -/* AD7D94 80060BF4 1420FF9D */ bnez $at, .L80060A6C -/* AD7D98 80060BF8 00000000 */ nop -.L80060BFC: -/* AD7D9C 80060BFC 8FBF004C */ lw $ra, 0x4c($sp) -.L80060C00: -/* AD7DA0 80060C00 8FB00028 */ lw $s0, 0x28($sp) -/* AD7DA4 80060C04 8FB1002C */ lw $s1, 0x2c($sp) -/* AD7DA8 80060C08 8FB20030 */ lw $s2, 0x30($sp) -/* AD7DAC 80060C0C 8FB30034 */ lw $s3, 0x34($sp) -/* AD7DB0 80060C10 8FB40038 */ lw $s4, 0x38($sp) -/* AD7DB4 80060C14 8FB5003C */ lw $s5, 0x3c($sp) -/* AD7DB8 80060C18 8FB60040 */ lw $s6, 0x40($sp) -/* AD7DBC 80060C1C 8FB70044 */ lw $s7, 0x44($sp) -/* AD7DC0 80060C20 8FBE0048 */ lw $fp, 0x48($sp) -/* AD7DC4 80060C24 03E00008 */ jr $ra -/* AD7DC8 80060C28 27BD0080 */ addiu $sp, $sp, 0x80 - -/* AD7DCC 80060C2C 27BDFF78 */ addiu $sp, $sp, -0x88 -/* AD7DD0 80060C30 AFB60040 */ sw $s6, 0x40($sp) -/* AD7DD4 80060C34 0080B025 */ move $s6, $a0 -/* AD7DD8 80060C38 AFBF004C */ sw $ra, 0x4c($sp) -/* AD7DDC 80060C3C AFB70044 */ sw $s7, 0x44($sp) -/* AD7DE0 80060C40 AFB40038 */ sw $s4, 0x38($sp) -/* AD7DE4 80060C44 24C40018 */ addiu $a0, $a2, 0x18 -/* AD7DE8 80060C48 00C0A025 */ move $s4, $a2 -/* AD7DEC 80060C4C 00E0B825 */ move $s7, $a3 -/* AD7DF0 80060C50 AFBE0048 */ sw $fp, 0x48($sp) -/* AD7DF4 80060C54 AFB5003C */ sw $s5, 0x3c($sp) -/* AD7DF8 80060C58 AFB30034 */ sw $s3, 0x34($sp) -/* AD7DFC 80060C5C AFB20030 */ sw $s2, 0x30($sp) -/* AD7E00 80060C60 AFB1002C */ sw $s1, 0x2c($sp) -/* AD7E04 80060C64 AFB00028 */ sw $s0, 0x28($sp) -/* AD7E08 80060C68 AFA5008C */ sw $a1, 0x8c($sp) -/* AD7E0C 80060C6C 0C0177CB */ jal func_8005DF2C -/* AD7E10 80060C70 AFA4005C */ sw $a0, 0x5c($sp) -/* AD7E14 80060C74 24150001 */ li $s5, 1 -/* AD7E18 80060C78 10550084 */ beq $v0, $s5, .L80060E8C -/* AD7E1C 80060C7C 26E40018 */ addiu $a0, $s7, 0x18 -/* AD7E20 80060C80 0C0177D4 */ jal func_8005DF50 -/* AD7E24 80060C84 AFA40050 */ sw $a0, 0x50($sp) -/* AD7E28 80060C88 10550080 */ beq $v0, $s5, .L80060E8C -/* AD7E2C 80060C8C 8FA4005C */ lw $a0, 0x5c($sp) -/* AD7E30 80060C90 0C0177DD */ jal func_8005DF74 -/* AD7E34 80060C94 8FA50050 */ lw $a1, 0x50($sp) -/* AD7E38 80060C98 1055007C */ beq $v0, $s5, .L80060E8C -/* AD7E3C 80060C9C 3C048016 */ lui $a0, %hi(D_8015E5A8) # $a0, 0x8016 -/* AD7E40 80060CA0 26900058 */ addiu $s0, $s4, 0x58 -/* AD7E44 80060CA4 2691004C */ addiu $s1, $s4, 0x4c -/* AD7E48 80060CA8 02203825 */ move $a3, $s1 -/* AD7E4C 80060CAC 02002825 */ move $a1, $s0 -/* AD7E50 80060CB0 2484E5A8 */ addiu $a0, %lo(D_8015E5A8) # addiu $a0, $a0, -0x1a58 -/* AD7E54 80060CB4 0C0338F0 */ jal Math3D_TriNorm -/* AD7E58 80060CB8 26860064 */ addiu $a2, $s4, 0x64 -/* AD7E5C 80060CBC 3C048016 */ lui $a0, %hi(D_8015E5DC) # $a0, 0x8016 -/* AD7E60 80060CC0 2484E5DC */ addiu $a0, %lo(D_8015E5DC) # addiu $a0, $a0, -0x1a24 -/* AD7E64 80060CC4 02002825 */ move $a1, $s0 -/* AD7E68 80060CC8 02203025 */ move $a2, $s1 -/* AD7E6C 80060CCC 0C0338F0 */ jal Math3D_TriNorm -/* AD7E70 80060CD0 26870040 */ addiu $a3, $s4, 0x40 -/* AD7E74 80060CD4 3C048016 */ lui $a0, %hi(D_8015E530) # $a0, 0x8016 -/* AD7E78 80060CD8 26F00058 */ addiu $s0, $s7, 0x58 -/* AD7E7C 80060CDC 26F1004C */ addiu $s1, $s7, 0x4c -/* AD7E80 80060CE0 02203825 */ move $a3, $s1 -/* AD7E84 80060CE4 02002825 */ move $a1, $s0 -/* AD7E88 80060CE8 2484E530 */ addiu $a0, %lo(D_8015E530) # addiu $a0, $a0, -0x1ad0 -/* AD7E8C 80060CEC 0C0338F0 */ jal Math3D_TriNorm -/* AD7E90 80060CF0 26E60064 */ addiu $a2, $s7, 0x64 -/* AD7E94 80060CF4 3C048016 */ lui $a0, %hi(D_8015E564) # $a0, 0x8016 -/* AD7E98 80060CF8 2484E564 */ addiu $a0, %lo(D_8015E564) # addiu $a0, $a0, -0x1a9c -/* AD7E9C 80060CFC 02002825 */ move $a1, $s0 -/* AD7EA0 80060D00 02203025 */ move $a2, $s1 -/* AD7EA4 80060D04 0C0338F0 */ jal Math3D_TriNorm -/* AD7EA8 80060D08 26E70040 */ addiu $a3, $s7, 0x40 -/* AD7EAC 80060D0C 3C128016 */ lui $s2, %hi(D_8015E530) # $s2, 0x8016 -/* AD7EB0 80060D10 3C1E8016 */ lui $fp, %hi(D_8015E598) # $fp, 0x8016 -/* AD7EB4 80060D14 3C138016 */ lui $s3, %hi(D_8015E610) # $s3, 0x8016 -/* AD7EB8 80060D18 3C118016 */ lui $s1, %hi(D_8015E598) # $s1, 0x8016 -/* AD7EBC 80060D1C 2631E598 */ addiu $s1, %lo(D_8015E598) # addiu $s1, $s1, -0x1a68 -/* AD7EC0 80060D20 2673E610 */ addiu $s3, %lo(D_8015E610) # addiu $s3, $s3, -0x19f0 -/* AD7EC4 80060D24 27DEE598 */ addiu $fp, %lo(D_8015E598) # addiu $fp, $fp, -0x1a68 -/* AD7EC8 80060D28 2652E530 */ addiu $s2, %lo(D_8015E530) # addiu $s2, $s2, -0x1ad0 -.L80060D2C: -/* AD7ECC 80060D2C 3C108016 */ lui $s0, %hi(D_8015E5A8) # $s0, 0x8016 -/* AD7ED0 80060D30 2610E5A8 */ addiu $s0, %lo(D_8015E5A8) # addiu $s0, $s0, -0x1a58 -/* AD7ED4 80060D34 02002025 */ move $a0, $s0 -.L80060D38: -/* AD7ED8 80060D38 02402825 */ move $a1, $s2 -/* AD7EDC 80060D3C 0C034041 */ jal Math3D_TrisIntersect -/* AD7EE0 80060D40 02203025 */ move $a2, $s1 -/* AD7EE4 80060D44 1455004B */ bne $v0, $s5, .L80060E74 -/* AD7EE8 80060D48 02C02025 */ move $a0, $s6 -/* AD7EEC 80060D4C 02802825 */ move $a1, $s4 -/* AD7EF0 80060D50 0C017486 */ jal func_8005D218 -/* AD7EF4 80060D54 02203025 */ move $a2, $s1 -/* AD7EF8 80060D58 50400047 */ beql $v0, $zero, .L80060E78 -/* AD7EFC 80060D5C 26100034 */ addiu $s0, $s0, 0x34 -/* AD7F00 80060D60 C6840058 */ lwc1 $f4, 0x58($s4) -/* AD7F04 80060D64 C6860064 */ lwc1 $f6, 0x64($s4) -/* AD7F08 80060D68 C68A004C */ lwc1 $f10, 0x4c($s4) -/* AD7F0C 80060D6C C6920040 */ lwc1 $f18, 0x40($s4) -/* AD7F10 80060D70 46062200 */ add.s $f8, $f4, $f6 -/* AD7F14 80060D74 3C013E80 */ li $at, 0x3E800000 # 0.000000 -/* AD7F18 80060D78 44810000 */ mtc1 $at, $f0 -/* AD7F1C 80060D7C 8FAE0050 */ lw $t6, 0x50($sp) -/* AD7F20 80060D80 460A4400 */ add.s $f16, $f8, $f10 -/* AD7F24 80060D84 27AF0060 */ addiu $t7, $sp, 0x60 -/* AD7F28 80060D88 02C02025 */ move $a0, $s6 -/* AD7F2C 80060D8C 02802825 */ move $a1, $s4 -/* AD7F30 80060D90 46128100 */ add.s $f4, $f16, $f18 -/* AD7F34 80060D94 8FA6005C */ lw $a2, 0x5c($sp) -/* AD7F38 80060D98 27A7006C */ addiu $a3, $sp, 0x6c -/* AD7F3C 80060D9C 46002182 */ mul.s $f6, $f4, $f0 -/* AD7F40 80060DA0 E7A6006C */ swc1 $f6, 0x6c($sp) -/* AD7F44 80060DA4 C68A0068 */ lwc1 $f10, 0x68($s4) -/* AD7F48 80060DA8 C688005C */ lwc1 $f8, 0x5c($s4) -/* AD7F4C 80060DAC C6920050 */ lwc1 $f18, 0x50($s4) -/* AD7F50 80060DB0 C6860044 */ lwc1 $f6, 0x44($s4) -/* AD7F54 80060DB4 460A4400 */ add.s $f16, $f8, $f10 -/* AD7F58 80060DB8 46128100 */ add.s $f4, $f16, $f18 -/* AD7F5C 80060DBC 46062200 */ add.s $f8, $f4, $f6 -/* AD7F60 80060DC0 46004282 */ mul.s $f10, $f8, $f0 -/* AD7F64 80060DC4 E7AA0070 */ swc1 $f10, 0x70($sp) -/* AD7F68 80060DC8 C692006C */ lwc1 $f18, 0x6c($s4) -/* AD7F6C 80060DCC C6900060 */ lwc1 $f16, 0x60($s4) -/* AD7F70 80060DD0 C6860054 */ lwc1 $f6, 0x54($s4) -/* AD7F74 80060DD4 C68A0048 */ lwc1 $f10, 0x48($s4) -/* AD7F78 80060DD8 46128100 */ add.s $f4, $f16, $f18 -/* AD7F7C 80060DDC 46062200 */ add.s $f8, $f4, $f6 -/* AD7F80 80060DE0 460A4400 */ add.s $f16, $f8, $f10 -/* AD7F84 80060DE4 46008482 */ mul.s $f18, $f16, $f0 -/* AD7F88 80060DE8 E7B20074 */ swc1 $f18, 0x74($sp) -/* AD7F8C 80060DEC C6E60064 */ lwc1 $f6, 0x64($s7) -/* AD7F90 80060DF0 C6E40058 */ lwc1 $f4, 0x58($s7) -/* AD7F94 80060DF4 C6EA004C */ lwc1 $f10, 0x4c($s7) -/* AD7F98 80060DF8 C6F20040 */ lwc1 $f18, 0x40($s7) -/* AD7F9C 80060DFC 46062200 */ add.s $f8, $f4, $f6 -/* AD7FA0 80060E00 460A4400 */ add.s $f16, $f8, $f10 -/* AD7FA4 80060E04 46128100 */ add.s $f4, $f16, $f18 -/* AD7FA8 80060E08 46002182 */ mul.s $f6, $f4, $f0 -/* AD7FAC 80060E0C E7A60060 */ swc1 $f6, 0x60($sp) -/* AD7FB0 80060E10 C6EA0068 */ lwc1 $f10, 0x68($s7) -/* AD7FB4 80060E14 C6E8005C */ lwc1 $f8, 0x5c($s7) -/* AD7FB8 80060E18 C6F20050 */ lwc1 $f18, 0x50($s7) -/* AD7FBC 80060E1C C6E60044 */ lwc1 $f6, 0x44($s7) -/* AD7FC0 80060E20 460A4400 */ add.s $f16, $f8, $f10 -/* AD7FC4 80060E24 46128100 */ add.s $f4, $f16, $f18 -/* AD7FC8 80060E28 46062200 */ add.s $f8, $f4, $f6 -/* AD7FCC 80060E2C 46004282 */ mul.s $f10, $f8, $f0 -/* AD7FD0 80060E30 E7AA0064 */ swc1 $f10, 0x64($sp) -/* AD7FD4 80060E34 C6F2006C */ lwc1 $f18, 0x6c($s7) -/* AD7FD8 80060E38 C6F00060 */ lwc1 $f16, 0x60($s7) -/* AD7FDC 80060E3C C6E60054 */ lwc1 $f6, 0x54($s7) -/* AD7FE0 80060E40 C6EA0048 */ lwc1 $f10, 0x48($s7) -/* AD7FE4 80060E44 46128100 */ add.s $f4, $f16, $f18 -/* AD7FE8 80060E48 AFB1001C */ sw $s1, 0x1c($sp) -/* AD7FEC 80060E4C AFAF0018 */ sw $t7, 0x18($sp) -/* AD7FF0 80060E50 AFB70010 */ sw $s7, 0x10($sp) -/* AD7FF4 80060E54 46062200 */ add.s $f8, $f4, $f6 -/* AD7FF8 80060E58 AFAE0014 */ sw $t6, 0x14($sp) -/* AD7FFC 80060E5C 460A4400 */ add.s $f16, $f8, $f10 -/* AD8000 80060E60 46008482 */ mul.s $f18, $f16, $f0 -/* AD8004 80060E64 0C017A07 */ jal func_8005E81C -/* AD8008 80060E68 E7B20068 */ swc1 $f18, 0x68($sp) -/* AD800C 80060E6C 10000008 */ b .L80060E90 -/* AD8010 80060E70 8FBF004C */ lw $ra, 0x4c($sp) -.L80060E74: -/* AD8014 80060E74 26100034 */ addiu $s0, $s0, 0x34 -.L80060E78: -/* AD8018 80060E78 5613FFAF */ bnel $s0, $s3, .L80060D38 -/* AD801C 80060E7C 02002025 */ move $a0, $s0 -/* AD8020 80060E80 26520034 */ addiu $s2, $s2, 0x34 -/* AD8024 80060E84 165EFFA9 */ bne $s2, $fp, .L80060D2C -/* AD8028 80060E88 00000000 */ nop -.L80060E8C: -/* AD802C 80060E8C 8FBF004C */ lw $ra, 0x4c($sp) -.L80060E90: -/* AD8030 80060E90 8FB00028 */ lw $s0, 0x28($sp) -/* AD8034 80060E94 8FB1002C */ lw $s1, 0x2c($sp) -/* AD8038 80060E98 8FB20030 */ lw $s2, 0x30($sp) -/* AD803C 80060E9C 8FB30034 */ lw $s3, 0x34($sp) -/* AD8040 80060EA0 8FB40038 */ lw $s4, 0x38($sp) -/* AD8044 80060EA4 8FB5003C */ lw $s5, 0x3c($sp) -/* AD8048 80060EA8 8FB60040 */ lw $s6, 0x40($sp) -/* AD804C 80060EAC 8FB70044 */ lw $s7, 0x44($sp) -/* AD8050 80060EB0 8FBE0048 */ lw $fp, 0x48($sp) -/* AD8054 80060EB4 03E00008 */ jr $ra -/* AD8058 80060EB8 27BD0088 */ addiu $sp, $sp, 0x88 - -/* AD805C 80060EBC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AD8060 80060EC0 AFBF001C */ sw $ra, 0x1c($sp) -/* AD8064 80060EC4 AFA40038 */ sw $a0, 0x38($sp) -/* AD8068 80060EC8 AFA5003C */ sw $a1, 0x3c($sp) -/* AD806C 80060ECC 8CCE0018 */ lw $t6, 0x18($a2) -/* AD8070 80060ED0 8CC2001C */ lw $v0, 0x1c($a2) -/* AD8074 80060ED4 00C03825 */ move $a3, $a2 -/* AD8078 80060ED8 000E7980 */ sll $t7, $t6, 6 -/* AD807C 80060EDC 004FC021 */ addu $t8, $v0, $t7 -/* AD8080 80060EE0 0058082B */ sltu $at, $v0, $t8 -/* AD8084 80060EE4 10200027 */ beqz $at, .L80060F84 -/* AD8088 80060EE8 00C02825 */ move $a1, $a2 -/* AD808C 80060EEC 90590016 */ lbu $t9, 0x16($v0) -.L80060EF0: -/* AD8090 80060EF0 33280080 */ andi $t0, $t9, 0x80 -/* AD8094 80060EF4 5100001C */ beql $t0, $zero, .L80060F68 -/* AD8098 80060EF8 8CAF0018 */ lw $t7, 0x18($a1) -/* AD809C 80060EFC 8C430024 */ lw $v1, 0x24($v0) -/* AD80A0 80060F00 50600019 */ beql $v1, $zero, .L80060F68 -/* AD80A4 80060F04 8CAF0018 */ lw $t7, 0x18($a1) -/* AD80A8 80060F08 90690015 */ lbu $t1, 0x15($v1) -/* AD80AC 80060F0C 312A0040 */ andi $t2, $t1, 0x40 -/* AD80B0 80060F10 15400014 */ bnez $t2, .L80060F64 -/* AD80B4 80060F14 27A40024 */ addiu $a0, $sp, 0x24 -/* AD80B8 80060F18 2445000E */ addiu $a1, $v0, 0xe -/* AD80BC 80060F1C AFA20030 */ sw $v0, 0x30($sp) -/* AD80C0 80060F20 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD80C4 80060F24 AFA70040 */ sw $a3, 0x40($sp) -/* AD80C8 80060F28 8FA20030 */ lw $v0, 0x30($sp) -/* AD80CC 80060F2C 27AB0024 */ addiu $t3, $sp, 0x24 -/* AD80D0 80060F30 8FA70040 */ lw $a3, 0x40($sp) -/* AD80D4 80060F34 8C45001C */ lw $a1, 0x1c($v0) -/* AD80D8 80060F38 8C460024 */ lw $a2, 0x24($v0) -/* AD80DC 80060F3C AFAB0014 */ sw $t3, 0x14($sp) -/* AD80E0 80060F40 8FA40038 */ lw $a0, 0x38($sp) -/* AD80E4 80060F44 0C017981 */ jal func_8005E604 -/* AD80E8 80060F48 AFA20010 */ sw $v0, 0x10($sp) -/* AD80EC 80060F4C 8FA20030 */ lw $v0, 0x30($sp) -/* AD80F0 80060F50 8C430024 */ lw $v1, 0x24($v0) -/* AD80F4 80060F54 906C0015 */ lbu $t4, 0x15($v1) -/* AD80F8 80060F58 358D0040 */ ori $t5, $t4, 0x40 -/* AD80FC 80060F5C 10000009 */ b .L80060F84 -/* AD8100 80060F60 A06D0015 */ sb $t5, 0x15($v1) -.L80060F64: -/* AD8104 80060F64 8CAF0018 */ lw $t7, 0x18($a1) -.L80060F68: -/* AD8108 80060F68 8CAE001C */ lw $t6, 0x1c($a1) -/* AD810C 80060F6C 24420040 */ addiu $v0, $v0, 0x40 -/* AD8110 80060F70 000FC180 */ sll $t8, $t7, 6 -/* AD8114 80060F74 01D8C821 */ addu $t9, $t6, $t8 -/* AD8118 80060F78 0059082B */ sltu $at, $v0, $t9 -/* AD811C 80060F7C 5420FFDC */ bnezl $at, .L80060EF0 -/* AD8120 80060F80 90590016 */ lbu $t9, 0x16($v0) -.L80060F84: -/* AD8124 80060F84 8FBF001C */ lw $ra, 0x1c($sp) -/* AD8128 80060F88 27BD0038 */ addiu $sp, $sp, 0x38 -/* AD812C 80060F8C 03E00008 */ jr $ra -/* AD8130 80060F90 00000000 */ nop - -/* AD8134 80060F94 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AD8138 80060F98 AFBF001C */ sw $ra, 0x1c($sp) -/* AD813C 80060F9C AFA40038 */ sw $a0, 0x38($sp) -/* AD8140 80060FA0 AFA5003C */ sw $a1, 0x3c($sp) -/* AD8144 80060FA4 90CE002E */ lbu $t6, 0x2e($a2) -/* AD8148 80060FA8 31CF0080 */ andi $t7, $t6, 0x80 -/* AD814C 80060FAC 51E0001B */ beql $t7, $zero, .L8006101C -/* AD8150 80060FB0 8FBF001C */ lw $ra, 0x1c($sp) -/* AD8154 80060FB4 8CC2003C */ lw $v0, 0x3c($a2) -/* AD8158 80060FB8 50400018 */ beql $v0, $zero, .L8006101C -/* AD815C 80060FBC 8FBF001C */ lw $ra, 0x1c($sp) -/* AD8160 80060FC0 90580015 */ lbu $t8, 0x15($v0) -/* AD8164 80060FC4 27A40028 */ addiu $a0, $sp, 0x28 -/* AD8168 80060FC8 24C50026 */ addiu $a1, $a2, 0x26 -/* AD816C 80060FCC 33190040 */ andi $t9, $t8, 0x40 -/* AD8170 80060FD0 57200012 */ bnezl $t9, .L8006101C -/* AD8174 80060FD4 8FBF001C */ lw $ra, 0x1c($sp) -/* AD8178 80060FD8 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD817C 80060FDC AFA60040 */ sw $a2, 0x40($sp) -/* AD8180 80060FE0 8FA70040 */ lw $a3, 0x40($sp) -/* AD8184 80060FE4 27A90028 */ addiu $t1, $sp, 0x28 -/* AD8188 80060FE8 8FA40038 */ lw $a0, 0x38($sp) -/* AD818C 80060FEC 8CE50034 */ lw $a1, 0x34($a3) -/* AD8190 80060FF0 8CE6003C */ lw $a2, 0x3c($a3) -/* AD8194 80060FF4 24E80018 */ addiu $t0, $a3, 0x18 -/* AD8198 80060FF8 AFA80010 */ sw $t0, 0x10($sp) -/* AD819C 80060FFC 0C017981 */ jal func_8005E604 -/* AD81A0 80061000 AFA90014 */ sw $t1, 0x14($sp) -/* AD81A4 80061004 8FA70040 */ lw $a3, 0x40($sp) -/* AD81A8 80061008 8CE2003C */ lw $v0, 0x3c($a3) -/* AD81AC 8006100C 904A0015 */ lbu $t2, 0x15($v0) -/* AD81B0 80061010 354B0040 */ ori $t3, $t2, 0x40 -/* AD81B4 80061014 A04B0015 */ sb $t3, 0x15($v0) -/* AD81B8 80061018 8FBF001C */ lw $ra, 0x1c($sp) -.L8006101C: -/* AD81BC 8006101C 27BD0038 */ addiu $sp, $sp, 0x38 -/* AD81C0 80061020 03E00008 */ jr $ra -/* AD81C4 80061024 00000000 */ nop - -/* AD81C8 80061028 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AD81CC 8006102C AFBF001C */ sw $ra, 0x1c($sp) -/* AD81D0 80061030 AFA40038 */ sw $a0, 0x38($sp) -/* AD81D4 80061034 AFA5003C */ sw $a1, 0x3c($sp) -/* AD81D8 80061038 8CCE0018 */ lw $t6, 0x18($a2) -/* AD81DC 8006103C 2407005C */ li $a3, 92 -/* AD81E0 80061040 8CC2001C */ lw $v0, 0x1c($a2) -/* AD81E4 80061044 01C70019 */ multu $t6, $a3 -/* AD81E8 80061048 00C02825 */ move $a1, $a2 -/* AD81EC 8006104C 00007812 */ mflo $t7 -/* AD81F0 80061050 004FC021 */ addu $t8, $v0, $t7 -/* AD81F4 80061054 0058082B */ sltu $at, $v0, $t8 -/* AD81F8 80061058 50200029 */ beql $at, $zero, .L80061100 -/* AD81FC 8006105C 8FBF001C */ lw $ra, 0x1c($sp) -/* AD8200 80061060 90590016 */ lbu $t9, 0x16($v0) -.L80061064: -/* AD8204 80061064 33280080 */ andi $t0, $t9, 0x80 -/* AD8208 80061068 5100001C */ beql $t0, $zero, .L800610DC -/* AD820C 8006106C 8CAF0018 */ lw $t7, 0x18($a1) -/* AD8210 80061070 8C430024 */ lw $v1, 0x24($v0) -/* AD8214 80061074 50600019 */ beql $v1, $zero, .L800610DC -/* AD8218 80061078 8CAF0018 */ lw $t7, 0x18($a1) -/* AD821C 8006107C 90690015 */ lbu $t1, 0x15($v1) -/* AD8220 80061080 312A0040 */ andi $t2, $t1, 0x40 -/* AD8224 80061084 15400014 */ bnez $t2, .L800610D8 -/* AD8228 80061088 27A40024 */ addiu $a0, $sp, 0x24 -/* AD822C 8006108C 2445000E */ addiu $a1, $v0, 0xe -/* AD8230 80061090 AFA20030 */ sw $v0, 0x30($sp) -/* AD8234 80061094 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD8238 80061098 AFA60040 */ sw $a2, 0x40($sp) -/* AD823C 8006109C 8FA20030 */ lw $v0, 0x30($sp) -/* AD8240 800610A0 27AB0024 */ addiu $t3, $sp, 0x24 -/* AD8244 800610A4 8FA40038 */ lw $a0, 0x38($sp) -/* AD8248 800610A8 8C45001C */ lw $a1, 0x1c($v0) -/* AD824C 800610AC 8C460024 */ lw $a2, 0x24($v0) -/* AD8250 800610B0 AFAB0014 */ sw $t3, 0x14($sp) -/* AD8254 800610B4 8FA70040 */ lw $a3, 0x40($sp) -/* AD8258 800610B8 0C017981 */ jal func_8005E604 -/* AD825C 800610BC AFA20010 */ sw $v0, 0x10($sp) -/* AD8260 800610C0 8FA20030 */ lw $v0, 0x30($sp) -/* AD8264 800610C4 8C430024 */ lw $v1, 0x24($v0) -/* AD8268 800610C8 906C0015 */ lbu $t4, 0x15($v1) -/* AD826C 800610CC 358D0040 */ ori $t5, $t4, 0x40 -/* AD8270 800610D0 1000000A */ b .L800610FC -/* AD8274 800610D4 A06D0015 */ sb $t5, 0x15($v1) -.L800610D8: -/* AD8278 800610D8 8CAF0018 */ lw $t7, 0x18($a1) -.L800610DC: -/* AD827C 800610DC 8CAE001C */ lw $t6, 0x1c($a1) -/* AD8280 800610E0 2442005C */ addiu $v0, $v0, 0x5c -/* AD8284 800610E4 01E70019 */ multu $t7, $a3 -/* AD8288 800610E8 0000C012 */ mflo $t8 -/* AD828C 800610EC 01D8C821 */ addu $t9, $t6, $t8 -/* AD8290 800610F0 0059082B */ sltu $at, $v0, $t9 -/* AD8294 800610F4 5420FFDB */ bnezl $at, .L80061064 -/* AD8298 800610F8 90590016 */ lbu $t9, 0x16($v0) -.L800610FC: -/* AD829C 800610FC 8FBF001C */ lw $ra, 0x1c($sp) -.L80061100: -/* AD82A0 80061100 27BD0038 */ addiu $sp, $sp, 0x38 -/* AD82A4 80061104 03E00008 */ jr $ra -/* AD82A8 80061108 00000000 */ nop - -/* AD82AC 8006110C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AD82B0 80061110 AFBF001C */ sw $ra, 0x1c($sp) -/* AD82B4 80061114 AFA40038 */ sw $a0, 0x38($sp) -/* AD82B8 80061118 AFA5003C */ sw $a1, 0x3c($sp) -/* AD82BC 8006111C 90CE002E */ lbu $t6, 0x2e($a2) -/* AD82C0 80061120 31CF0080 */ andi $t7, $t6, 0x80 -/* AD82C4 80061124 51E0001B */ beql $t7, $zero, .L80061194 -/* AD82C8 80061128 8FBF001C */ lw $ra, 0x1c($sp) -/* AD82CC 8006112C 8CC2003C */ lw $v0, 0x3c($a2) -/* AD82D0 80061130 50400018 */ beql $v0, $zero, .L80061194 -/* AD82D4 80061134 8FBF001C */ lw $ra, 0x1c($sp) -/* AD82D8 80061138 90580015 */ lbu $t8, 0x15($v0) -/* AD82DC 8006113C 27A40028 */ addiu $a0, $sp, 0x28 -/* AD82E0 80061140 24C50026 */ addiu $a1, $a2, 0x26 -/* AD82E4 80061144 33190040 */ andi $t9, $t8, 0x40 -/* AD82E8 80061148 57200012 */ bnezl $t9, .L80061194 -/* AD82EC 8006114C 8FBF001C */ lw $ra, 0x1c($sp) -/* AD82F0 80061150 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD82F4 80061154 AFA60040 */ sw $a2, 0x40($sp) -/* AD82F8 80061158 8FA70040 */ lw $a3, 0x40($sp) -/* AD82FC 8006115C 27A90028 */ addiu $t1, $sp, 0x28 -/* AD8300 80061160 8FA40038 */ lw $a0, 0x38($sp) -/* AD8304 80061164 8CE50034 */ lw $a1, 0x34($a3) -/* AD8308 80061168 8CE6003C */ lw $a2, 0x3c($a3) -/* AD830C 8006116C 24E80018 */ addiu $t0, $a3, 0x18 -/* AD8310 80061170 AFA80010 */ sw $t0, 0x10($sp) -/* AD8314 80061174 0C017981 */ jal func_8005E604 -/* AD8318 80061178 AFA90014 */ sw $t1, 0x14($sp) -/* AD831C 8006117C 8FA70040 */ lw $a3, 0x40($sp) -/* AD8320 80061180 8CE2003C */ lw $v0, 0x3c($a3) -/* AD8324 80061184 904A0015 */ lbu $t2, 0x15($v0) -/* AD8328 80061188 354B0040 */ ori $t3, $t2, 0x40 -/* AD832C 8006118C A04B0015 */ sb $t3, 0x15($v0) -/* AD8330 80061190 8FBF001C */ lw $ra, 0x1c($sp) -.L80061194: -/* AD8334 80061194 27BD0038 */ addiu $sp, $sp, 0x38 -/* AD8338 80061198 03E00008 */ jr $ra -/* AD833C 8006119C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_800611A0.s b/asm/non_matchings/code/z_collision_check/func_800611A0.s deleted file mode 100644 index 6a77493acc..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_800611A0.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_800611A0 -/* AD8340 800611A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD8344 800611A4 AFBF0024 */ sw $ra, 0x24($sp) -/* AD8348 800611A8 AFB30020 */ sw $s3, 0x20($sp) -/* AD834C 800611AC AFB2001C */ sw $s2, 0x1c($sp) -/* AD8350 800611B0 AFB10018 */ sw $s1, 0x18($sp) -/* AD8354 800611B4 AFB00014 */ sw $s0, 0x14($sp) -/* AD8358 800611B8 8CAE00CC */ lw $t6, 0xcc($a1) -/* AD835C 800611BC 24B000D0 */ addiu $s0, $a1, 0xd0 -/* AD8360 800611C0 00A08825 */ move $s1, $a1 -/* AD8364 800611C4 000E7880 */ sll $t7, $t6, 2 -/* AD8368 800611C8 00AF1821 */ addu $v1, $a1, $t7 -/* AD836C 800611CC 246300D0 */ addiu $v1, $v1, 0xd0 -/* AD8370 800611D0 0203082B */ sltu $at, $s0, $v1 -/* AD8374 800611D4 10200020 */ beqz $at, .L80061258 -/* AD8378 800611D8 00809825 */ move $s3, $a0 -/* AD837C 800611DC 3C128012 */ lui $s2, %hi(D_8011DF5C) # $s2, 0x8012 -/* AD8380 800611E0 2652DF5C */ addiu $s2, %lo(D_8011DF5C) # addiu $s2, $s2, -0x20a4 -/* AD8384 800611E4 8E060000 */ lw $a2, ($s0) -.L800611E8: -/* AD8388 800611E8 50C00018 */ beql $a2, $zero, .L8006124C -/* AD838C 800611EC 26100004 */ addiu $s0, $s0, 4 -/* AD8390 800611F0 90D80011 */ lbu $t8, 0x11($a2) -/* AD8394 800611F4 33190001 */ andi $t9, $t8, 1 -/* AD8398 800611F8 53200014 */ beql $t9, $zero, .L8006124C -/* AD839C 800611FC 26100004 */ addiu $s0, $s0, 4 -/* AD83A0 80061200 8CC20000 */ lw $v0, ($a2) -/* AD83A4 80061204 50400005 */ beql $v0, $zero, .L8006121C -/* AD83A8 80061208 90C90015 */ lbu $t1, 0x15($a2) -/* AD83AC 8006120C 8C480130 */ lw $t0, 0x130($v0) -/* AD83B0 80061210 5100000E */ beql $t0, $zero, .L8006124C -/* AD83B4 80061214 26100004 */ addiu $s0, $s0, 4 -/* AD83B8 80061218 90C90015 */ lbu $t1, 0x15($a2) -.L8006121C: -/* AD83BC 8006121C 02602025 */ move $a0, $s3 -/* AD83C0 80061220 02202825 */ move $a1, $s1 -/* AD83C4 80061224 00095080 */ sll $t2, $t1, 2 -/* AD83C8 80061228 024A5821 */ addu $t3, $s2, $t2 -/* AD83CC 8006122C 8D790000 */ lw $t9, ($t3) -/* AD83D0 80061230 0320F809 */ jalr $t9 -/* AD83D4 80061234 00000000 */ nop -/* AD83D8 80061238 8E2C00CC */ lw $t4, 0xcc($s1) -/* AD83DC 8006123C 000C6880 */ sll $t5, $t4, 2 -/* AD83E0 80061240 022D1821 */ addu $v1, $s1, $t5 -/* AD83E4 80061244 246300D0 */ addiu $v1, $v1, 0xd0 -/* AD83E8 80061248 26100004 */ addiu $s0, $s0, 4 -.L8006124C: -/* AD83EC 8006124C 0203082B */ sltu $at, $s0, $v1 -/* AD83F0 80061250 5420FFE5 */ bnezl $at, .L800611E8 -/* AD83F4 80061254 8E060000 */ lw $a2, ($s0) -.L80061258: -/* AD83F8 80061258 8FBF0024 */ lw $ra, 0x24($sp) -/* AD83FC 8006125C 8FB00014 */ lw $s0, 0x14($sp) -/* AD8400 80061260 8FB10018 */ lw $s1, 0x18($sp) -/* AD8404 80061264 8FB2001C */ lw $s2, 0x1c($sp) -/* AD8408 80061268 8FB30020 */ lw $s3, 0x20($sp) -/* AD840C 8006126C 03E00008 */ jr $ra -/* AD8410 80061270 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_collision_check/func_80061274.s b/asm/non_matchings/code/z_collision_check/func_80061274.s deleted file mode 100644 index 9d2b7b4230..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80061274.s +++ /dev/null @@ -1,82 +0,0 @@ -glabel func_80061274 -/* AD8414 80061274 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AD8418 80061278 AFBF002C */ sw $ra, 0x2c($sp) -/* AD841C 8006127C AFB40028 */ sw $s4, 0x28($sp) -/* AD8420 80061280 AFB30024 */ sw $s3, 0x24($sp) -/* AD8424 80061284 AFB20020 */ sw $s2, 0x20($sp) -/* AD8428 80061288 AFB1001C */ sw $s1, 0x1c($sp) -/* AD842C 8006128C AFB00018 */ sw $s0, 0x18($sp) -/* AD8430 80061290 8CAE00CC */ lw $t6, 0xcc($a1) -/* AD8434 80061294 24B100D0 */ addiu $s1, $a1, 0xd0 -/* AD8438 80061298 00C08025 */ move $s0, $a2 -/* AD843C 8006129C 000E7880 */ sll $t7, $t6, 2 -/* AD8440 800612A0 00AF4021 */ addu $t0, $a1, $t7 -/* AD8444 800612A4 250800D0 */ addiu $t0, $t0, 0xd0 -/* AD8448 800612A8 0228082B */ sltu $at, $s1, $t0 -/* AD844C 800612AC 00A09025 */ move $s2, $a1 -/* AD8450 800612B0 10200032 */ beqz $at, .L8006137C -/* AD8454 800612B4 00809825 */ move $s3, $a0 -/* AD8458 800612B8 3C148012 */ lui $s4, %hi(D_8011DF6C) # $s4, 0x8012 -/* AD845C 800612BC 2694DF6C */ addiu $s4, %lo(D_8011DF6C) # addiu $s4, $s4, -0x2094 -/* AD8460 800612C0 8E270000 */ lw $a3, ($s1) -.L800612C4: -/* AD8464 800612C4 50E0002A */ beql $a3, $zero, .L80061370 -/* AD8468 800612C8 26310004 */ addiu $s1, $s1, 4 -/* AD846C 800612CC 90E20011 */ lbu $v0, 0x11($a3) -/* AD8470 800612D0 30580001 */ andi $t8, $v0, 1 -/* AD8474 800612D4 53000026 */ beql $t8, $zero, .L80061370 -/* AD8478 800612D8 26310004 */ addiu $s1, $s1, 4 -/* AD847C 800612DC 8CE40000 */ lw $a0, ($a3) -/* AD8480 800612E0 50800005 */ beql $a0, $zero, .L800612F8 -/* AD8484 800612E4 92030010 */ lbu $v1, 0x10($s0) -/* AD8488 800612E8 8C990130 */ lw $t9, 0x130($a0) -/* AD848C 800612EC 53200020 */ beql $t9, $zero, .L80061370 -/* AD8490 800612F0 26310004 */ addiu $s1, $s1, 4 -/* AD8494 800612F4 92030010 */ lbu $v1, 0x10($s0) -.L800612F8: -/* AD8498 800612F8 00434824 */ and $t1, $v0, $v1 -/* AD849C 800612FC 312A0038 */ andi $t2, $t1, 0x38 -/* AD84A0 80061300 5140001B */ beql $t2, $zero, .L80061370 -/* AD84A4 80061304 26310004 */ addiu $s1, $s1, 4 -/* AD84A8 80061308 12070018 */ beq $s0, $a3, .L8006136C -/* AD84AC 8006130C 306B0040 */ andi $t3, $v1, 0x40 -/* AD84B0 80061310 55600007 */ bnezl $t3, .L80061330 -/* AD84B4 80061314 920C0015 */ lbu $t4, 0x15($s0) -/* AD84B8 80061318 8E020000 */ lw $v0, ($s0) -/* AD84BC 8006131C 50400004 */ beql $v0, $zero, .L80061330 -/* AD84C0 80061320 920C0015 */ lbu $t4, 0x15($s0) -/* AD84C4 80061324 50440012 */ beql $v0, $a0, .L80061370 -/* AD84C8 80061328 26310004 */ addiu $s1, $s1, 4 -/* AD84CC 8006132C 920C0015 */ lbu $t4, 0x15($s0) -.L80061330: -/* AD84D0 80061330 90EF0015 */ lbu $t7, 0x15($a3) -/* AD84D4 80061334 02602025 */ move $a0, $s3 -/* AD84D8 80061338 000C6900 */ sll $t5, $t4, 4 -/* AD84DC 8006133C 028D7021 */ addu $t6, $s4, $t5 -/* AD84E0 80061340 000FC080 */ sll $t8, $t7, 2 -/* AD84E4 80061344 01D8C821 */ addu $t9, $t6, $t8 -/* AD84E8 80061348 8F390000 */ lw $t9, ($t9) -/* AD84EC 8006134C 02402825 */ move $a1, $s2 -/* AD84F0 80061350 02003025 */ move $a2, $s0 -/* AD84F4 80061354 0320F809 */ jalr $t9 -/* AD84F8 80061358 00000000 */ nop -/* AD84FC 8006135C 8E4900CC */ lw $t1, 0xcc($s2) -/* AD8500 80061360 00095080 */ sll $t2, $t1, 2 -/* AD8504 80061364 024A4021 */ addu $t0, $s2, $t2 -/* AD8508 80061368 250800D0 */ addiu $t0, $t0, 0xd0 -.L8006136C: -/* AD850C 8006136C 26310004 */ addiu $s1, $s1, 4 -.L80061370: -/* AD8510 80061370 0228082B */ sltu $at, $s1, $t0 -/* AD8514 80061374 5420FFD3 */ bnezl $at, .L800612C4 -/* AD8518 80061378 8E270000 */ lw $a3, ($s1) -.L8006137C: -/* AD851C 8006137C 8FBF002C */ lw $ra, 0x2c($sp) -/* AD8520 80061380 8FB00018 */ lw $s0, 0x18($sp) -/* AD8524 80061384 8FB1001C */ lw $s1, 0x1c($sp) -/* AD8528 80061388 8FB20020 */ lw $s2, 0x20($sp) -/* AD852C 8006138C 8FB30024 */ lw $s3, 0x24($sp) -/* AD8530 80061390 8FB40028 */ lw $s4, 0x28($sp) -/* AD8534 80061394 03E00008 */ jr $ra -/* AD8538 80061398 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/z_collision_check/func_8006139C.s b/asm/non_matchings/code/z_collision_check/func_8006139C.s deleted file mode 100644 index 3492263a91..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8006139C.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_8006139C -/* AD853C 8006139C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD8540 800613A0 AFBF0024 */ sw $ra, 0x24($sp) -/* AD8544 800613A4 AFB20020 */ sw $s2, 0x20($sp) -/* AD8548 800613A8 AFB1001C */ sw $s1, 0x1c($sp) -/* AD854C 800613AC AFB00018 */ sw $s0, 0x18($sp) -/* AD8550 800613B0 84A60000 */ lh $a2, ($a1) -/* AD8554 800613B4 00A08825 */ move $s1, $a1 -/* AD8558 800613B8 00809025 */ move $s2, $a0 -/* AD855C 800613BC 50C00026 */ beql $a2, $zero, .L80061458 -/* AD8560 800613C0 8FBF0024 */ lw $ra, 0x24($sp) -/* AD8564 800613C4 8CAE00CC */ lw $t6, 0xcc($a1) -/* AD8568 800613C8 00067880 */ sll $t7, $a2, 2 -/* AD856C 800613CC 00AF1821 */ addu $v1, $a1, $t7 -/* AD8570 800613D0 11C00020 */ beqz $t6, .L80061454 -/* AD8574 800613D4 24B00004 */ addiu $s0, $a1, 4 -/* AD8578 800613D8 24630004 */ addiu $v1, $v1, 4 -/* AD857C 800613DC 0203082B */ sltu $at, $s0, $v1 -/* AD8580 800613E0 5020001A */ beql $at, $zero, .L8006144C -/* AD8584 800613E4 02402025 */ move $a0, $s2 -/* AD8588 800613E8 8E060000 */ lw $a2, ($s0) -.L800613EC: -/* AD858C 800613EC 50C00013 */ beql $a2, $zero, .L8006143C -/* AD8590 800613F0 26100004 */ addiu $s0, $s0, 4 -/* AD8594 800613F4 90D80010 */ lbu $t8, 0x10($a2) -/* AD8598 800613F8 33190001 */ andi $t9, $t8, 1 -/* AD859C 800613FC 5320000F */ beql $t9, $zero, .L8006143C -/* AD85A0 80061400 26100004 */ addiu $s0, $s0, 4 -/* AD85A4 80061404 8CC20000 */ lw $v0, ($a2) -/* AD85A8 80061408 02402025 */ move $a0, $s2 -/* AD85AC 8006140C 10400004 */ beqz $v0, .L80061420 -/* AD85B0 80061410 00000000 */ nop -/* AD85B4 80061414 8C480130 */ lw $t0, 0x130($v0) -/* AD85B8 80061418 51000008 */ beql $t0, $zero, .L8006143C -/* AD85BC 8006141C 26100004 */ addiu $s0, $s0, 4 -.L80061420: -/* AD85C0 80061420 0C01849D */ jal func_80061274 -/* AD85C4 80061424 02202825 */ move $a1, $s1 -/* AD85C8 80061428 86290000 */ lh $t1, ($s1) -/* AD85CC 8006142C 00095080 */ sll $t2, $t1, 2 -/* AD85D0 80061430 022A1821 */ addu $v1, $s1, $t2 -/* AD85D4 80061434 24630004 */ addiu $v1, $v1, 4 -/* AD85D8 80061438 26100004 */ addiu $s0, $s0, 4 -.L8006143C: -/* AD85DC 8006143C 0203082B */ sltu $at, $s0, $v1 -/* AD85E0 80061440 5420FFEA */ bnezl $at, .L800613EC -/* AD85E4 80061444 8E060000 */ lw $a2, ($s0) -/* AD85E8 80061448 02402025 */ move $a0, $s2 -.L8006144C: -/* AD85EC 8006144C 0C018468 */ jal func_800611A0 -/* AD85F0 80061450 02202825 */ move $a1, $s1 -.L80061454: -/* AD85F4 80061454 8FBF0024 */ lw $ra, 0x24($sp) -.L80061458: -/* AD85F8 80061458 8FB00018 */ lw $s0, 0x18($sp) -/* AD85FC 8006145C 8FB1001C */ lw $s1, 0x1c($sp) -/* AD8600 80061460 8FB20020 */ lw $s2, 0x20($sp) -/* AD8604 80061464 03E00008 */ jr $ra -/* AD8608 80061468 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_collision_check/func_8006146C.s b/asm/non_matchings/code/z_collision_check/func_8006146C.s deleted file mode 100644 index a21a876672..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8006146C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_8006146C -/* AD860C 8006146C 308200FF */ andi $v0, $a0, 0xff -/* AD8610 80061470 240100FF */ li $at, 255 -/* AD8614 80061474 14410003 */ bne $v0, $at, .L80061484 -/* AD8618 80061478 AFA40000 */ sw $a0, ($sp) -/* AD861C 8006147C 03E00008 */ jr $ra -/* AD8620 80061480 00001025 */ move $v0, $zero - -.L80061484: -/* AD8624 80061484 240100FE */ li $at, 254 -/* AD8628 80061488 54410004 */ bnel $v0, $at, .L8006149C -/* AD862C 8006148C 24020002 */ li $v0, 2 -/* AD8630 80061490 03E00008 */ jr $ra -/* AD8634 80061494 24020001 */ li $v0, 1 - -/* AD8638 80061498 24020002 */ li $v0, 2 -.L8006149C: -/* AD863C 8006149C 03E00008 */ jr $ra -/* AD8640 800614A0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_800614A4.s b/asm/non_matchings/code/z_collision_check/func_800614A4.s deleted file mode 100644 index 7c4c0ba720..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_800614A4.s +++ /dev/null @@ -1,355 +0,0 @@ -.late_rodata -glabel D_8013AD24 - .float 0.008 - -glabel D_8013AD28 - .float 0.008 - -.text -glabel func_800614A4 -/* AD8644 800614A4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* AD8648 800614A8 AFBF0014 */ sw $ra, 0x14($sp) -/* AD864C 800614AC AFA60058 */ sw $a2, 0x58($sp) -/* AD8650 800614B0 908E0012 */ lbu $t6, 0x12($a0) -/* AD8654 800614B4 8CE90000 */ lw $t1, ($a3) -/* AD8658 800614B8 8C880000 */ lw $t0, ($a0) -/* AD865C 800614BC 35CF0002 */ ori $t7, $t6, 2 -/* AD8660 800614C0 A08F0012 */ sb $t7, 0x12($a0) -/* AD8664 800614C4 AC89000C */ sw $t1, 0xc($a0) -/* AD8668 800614C8 90B80017 */ lbu $t8, 0x17($a1) -/* AD866C 800614CC 37190002 */ ori $t9, $t8, 2 -/* AD8670 800614D0 A0B90017 */ sb $t9, 0x17($a1) -/* AD8674 800614D4 90EA0013 */ lbu $t2, 0x13($a3) -/* AD8678 800614D8 314B0008 */ andi $t3, $t2, 8 -/* AD867C 800614DC 51600005 */ beql $t3, $zero, .L800614F4 -/* AD8680 800614E0 90EE0012 */ lbu $t6, 0x12($a3) -/* AD8684 800614E4 908C0013 */ lbu $t4, 0x13($a0) -/* AD8688 800614E8 358D0001 */ ori $t5, $t4, 1 -/* AD868C 800614EC A08D0013 */ sb $t5, 0x13($a0) -/* AD8690 800614F0 90EE0012 */ lbu $t6, 0x12($a3) -.L800614F4: -/* AD8694 800614F4 8FA20060 */ lw $v0, 0x60($sp) -/* AD8698 800614F8 ACE8000C */ sw $t0, 0xc($a3) -/* AD869C 800614FC 35CF0002 */ ori $t7, $t6, 2 -/* AD86A0 80061500 A0EF0012 */ sb $t7, 0x12($a3) -/* AD86A4 80061504 90580017 */ lbu $t8, 0x17($v0) -/* AD86A8 80061508 37190002 */ ori $t9, $t8, 2 -/* AD86AC 8006150C A0590017 */ sb $t9, 0x17($v0) -/* AD86B0 80061510 908A0013 */ lbu $t2, 0x13($a0) -/* AD86B4 80061514 314B0008 */ andi $t3, $t2, 8 -/* AD86B8 80061518 11600004 */ beqz $t3, .L8006152C -/* AD86BC 8006151C 00000000 */ nop -/* AD86C0 80061520 90EC0013 */ lbu $t4, 0x13($a3) -/* AD86C4 80061524 358D0001 */ ori $t5, $t4, 1 -/* AD86C8 80061528 A0ED0013 */ sb $t5, 0x13($a3) -.L8006152C: -/* AD86CC 8006152C 510000A6 */ beql $t0, $zero, .L800617C8 -/* AD86D0 80061530 8FBF0014 */ lw $ra, 0x14($sp) -/* AD86D4 80061534 512000A4 */ beql $t1, $zero, .L800617C8 -/* AD86D8 80061538 8FBF0014 */ lw $ra, 0x14($sp) -/* AD86DC 8006153C 908E0012 */ lbu $t6, 0x12($a0) -/* AD86E0 80061540 31CF0004 */ andi $t7, $t6, 4 -/* AD86E4 80061544 55E000A0 */ bnezl $t7, .L800617C8 -/* AD86E8 80061548 8FBF0014 */ lw $ra, 0x14($sp) -/* AD86EC 8006154C 90F80012 */ lbu $t8, 0x12($a3) -/* AD86F0 80061550 33190004 */ andi $t9, $t8, 4 -/* AD86F4 80061554 5720009C */ bnezl $t9, .L800617C8 -/* AD86F8 80061558 8FBF0014 */ lw $ra, 0x14($sp) -/* AD86FC 8006155C 910400AE */ lbu $a0, 0xae($t0) -/* AD8700 80061560 AFA90020 */ sw $t1, 0x20($sp) -/* AD8704 80061564 0C01851B */ jal func_8006146C -/* AD8708 80061568 AFA80024 */ sw $t0, 0x24($sp) -/* AD870C 8006156C 8FA90020 */ lw $t1, 0x20($sp) -/* AD8710 80061570 912400AE */ lbu $a0, 0xae($t1) -/* AD8714 80061574 0C01851B */ jal func_8006146C -/* AD8718 80061578 AFA20018 */ sw $v0, 0x18($sp) -/* AD871C 8006157C 8FA80024 */ lw $t0, 0x24($sp) -/* AD8720 80061580 8FA30018 */ lw $v1, 0x18($sp) -/* AD8724 80061584 8FA90020 */ lw $t1, 0x20($sp) -/* AD8728 80061588 910A00AE */ lbu $t2, 0xae($t0) -/* AD872C 8006158C 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* AD8730 80061590 448A2000 */ mtc1 $t2, $f4 -/* AD8734 80061594 05410004 */ bgez $t2, .L800615A8 -/* AD8738 80061598 468024A0 */ cvt.s.w $f18, $f4 -/* AD873C 8006159C 44813000 */ mtc1 $at, $f6 -/* AD8740 800615A0 00000000 */ nop -/* AD8744 800615A4 46069480 */ add.s $f18, $f18, $f6 -.L800615A8: -/* AD8748 800615A8 912B00AE */ lbu $t3, 0xae($t1) -/* AD874C 800615AC 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* AD8750 800615B0 448B4000 */ mtc1 $t3, $f8 -/* AD8754 800615B4 05610004 */ bgez $t3, .L800615C8 -/* AD8758 800615B8 468042A0 */ cvt.s.w $f10, $f8 -/* AD875C 800615BC 44812000 */ mtc1 $at, $f4 -/* AD8760 800615C0 00000000 */ nop -/* AD8764 800615C4 46045280 */ add.s $f10, $f10, $f4 -.L800615C8: -/* AD8768 800615C8 E7AA0038 */ swc1 $f10, 0x38($sp) -/* AD876C 800615CC C7A60038 */ lwc1 $f6, 0x38($sp) -/* AD8770 800615D0 3C018014 */ lui $at, %hi(D_8013AD24) -/* AD8774 800615D4 C428AD24 */ lwc1 $f8, %lo(D_8013AD24)($at) -/* AD8778 800615D8 46069080 */ add.s $f2, $f18, $f6 -/* AD877C 800615DC 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* AD8780 800615E0 46001005 */ abs.s $f0, $f2 -/* AD8784 800615E4 E7A20034 */ swc1 $f2, 0x34($sp) -/* AD8788 800615E8 4608003C */ c.lt.s $f0, $f8 -/* AD878C 800615EC 00000000 */ nop -/* AD8790 800615F0 45020007 */ bc1fl .L80061610 -/* AD8794 800615F4 8FA40064 */ lw $a0, 0x64($sp) -/* AD8798 800615F8 44819000 */ mtc1 $at, $f18 -/* AD879C 800615FC 3C014000 */ li $at, 0x40000000 # 0.000000 -/* AD87A0 80061600 44812000 */ mtc1 $at, $f4 -/* AD87A4 80061604 E7B20038 */ swc1 $f18, 0x38($sp) -/* AD87A8 80061608 E7A40034 */ swc1 $f4, 0x34($sp) -/* AD87AC 8006160C 8FA40064 */ lw $a0, 0x64($sp) -.L80061610: -/* AD87B0 80061610 8FA50058 */ lw $a1, 0x58($sp) -/* AD87B4 80061614 C48A0000 */ lwc1 $f10, ($a0) -/* AD87B8 80061618 C4A60000 */ lwc1 $f6, ($a1) -/* AD87BC 8006161C C4880008 */ lwc1 $f8, 8($a0) -/* AD87C0 80061620 C4A40008 */ lwc1 $f4, 8($a1) -/* AD87C4 80061624 46065381 */ sub.s $f14, $f10, $f6 -/* AD87C8 80061628 24040001 */ li $a0, 1 -/* AD87CC 8006162C 46044401 */ sub.s $f16, $f8, $f4 -/* AD87D0 80061630 460E7282 */ mul.s $f10, $f14, $f14 -/* AD87D4 80061634 00000000 */ nop -/* AD87D8 80061638 46108182 */ mul.s $f6, $f16, $f16 -/* AD87DC 8006163C 46065000 */ add.s $f0, $f10, $f6 -/* AD87E0 80061640 46000004 */ sqrt.s $f0, $f0 -/* AD87E4 80061644 14600007 */ bnez $v1, .L80061664 -/* AD87E8 80061648 E7A00040 */ swc1 $f0, 0x40($sp) -/* AD87EC 8006164C 1040005D */ beqz $v0, .L800617C4 -/* AD87F0 80061650 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* AD87F4 80061654 44801000 */ mtc1 $zero, $f2 -/* AD87F8 80061658 44816000 */ mtc1 $at, $f12 -/* AD87FC 8006165C 10000023 */ b .L800616EC -/* AD8800 80061660 C7A60040 */ lwc1 $f6, 0x40($sp) -.L80061664: -/* AD8804 80061664 14640011 */ bne $v1, $a0, .L800616AC -/* AD8808 80061668 24010002 */ li $at, 2 -/* AD880C 8006166C 14400005 */ bnez $v0, .L80061684 -/* AD8810 80061670 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* AD8814 80061674 44811000 */ mtc1 $at, $f2 -/* AD8818 80061678 44806000 */ mtc1 $zero, $f12 -/* AD881C 8006167C 1000001B */ b .L800616EC -/* AD8820 80061680 C7A60040 */ lwc1 $f6, 0x40($sp) -.L80061684: -/* AD8824 80061684 14440005 */ bne $v0, $a0, .L8006169C -/* AD8828 80061688 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* AD882C 8006168C 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* AD8830 80061690 44816000 */ mtc1 $at, $f12 -/* AD8834 80061694 10000014 */ b .L800616E8 -/* AD8838 80061698 46006086 */ mov.s $f2, $f12 -.L8006169C: -/* AD883C 8006169C 44801000 */ mtc1 $zero, $f2 -/* AD8840 800616A0 44816000 */ mtc1 $at, $f12 -/* AD8844 800616A4 10000011 */ b .L800616EC -/* AD8848 800616A8 C7A60040 */ lwc1 $f6, 0x40($sp) -.L800616AC: -/* AD884C 800616AC 1441000A */ bne $v0, $at, .L800616D8 -/* AD8850 800616B0 C7A40034 */ lwc1 $f4, 0x34($sp) -/* AD8854 800616B4 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* AD8858 800616B8 44814000 */ mtc1 $at, $f8 -/* AD885C 800616BC C7AA0038 */ lwc1 $f10, 0x38($sp) -/* AD8860 800616C0 46044003 */ div.s $f0, $f8, $f4 -/* AD8864 800616C4 46005082 */ mul.s $f2, $f10, $f0 -/* AD8868 800616C8 00000000 */ nop -/* AD886C 800616CC 46009302 */ mul.s $f12, $f18, $f0 -/* AD8870 800616D0 10000005 */ b .L800616E8 -/* AD8874 800616D4 00000000 */ nop -.L800616D8: -/* AD8878 800616D8 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* AD887C 800616DC 44811000 */ mtc1 $at, $f2 -/* AD8880 800616E0 44806000 */ mtc1 $zero, $f12 -/* AD8884 800616E4 00000000 */ nop -.L800616E8: -/* AD8888 800616E8 C7A60040 */ lwc1 $f6, 0x40($sp) -.L800616EC: -/* AD888C 800616EC 3C018014 */ lui $at, %hi(D_8013AD28) -/* AD8890 800616F0 C428AD28 */ lwc1 $f8, %lo(D_8013AD28)($at) -/* AD8894 800616F4 46003005 */ abs.s $f0, $f6 -/* AD8898 800616F8 C7B20068 */ lwc1 $f18, 0x68($sp) -/* AD889C 800616FC 4608003C */ c.lt.s $f0, $f8 -/* AD88A0 80061700 00000000 */ nop -/* AD88A4 80061704 4503001A */ bc1tl .L80061770 -/* AD88A8 80061708 44804000 */ mtc1 $zero, $f8 -/* AD88AC 8006170C C7B20068 */ lwc1 $f18, 0x68($sp) -/* AD88B0 80061710 C504009C */ lwc1 $f4, 0x9c($t0) -/* AD88B4 80061714 46069003 */ div.s $f0, $f18, $f6 -/* AD88B8 80061718 46007382 */ mul.s $f14, $f14, $f0 -/* AD88BC 8006171C 46007287 */ neg.s $f10, $f14 -/* AD88C0 80061720 46008402 */ mul.s $f16, $f16, $f0 -/* AD88C4 80061724 00000000 */ nop -/* AD88C8 80061728 46025202 */ mul.s $f8, $f10, $f2 -/* AD88CC 8006172C C50A00A4 */ lwc1 $f10, 0xa4($t0) -/* AD88D0 80061730 46082180 */ add.s $f6, $f4, $f8 -/* AD88D4 80061734 46008107 */ neg.s $f4, $f16 -/* AD88D8 80061738 E506009C */ swc1 $f6, 0x9c($t0) -/* AD88DC 8006173C 46022202 */ mul.s $f8, $f4, $f2 -/* AD88E0 80061740 46085180 */ add.s $f6, $f10, $f8 -/* AD88E4 80061744 460C7282 */ mul.s $f10, $f14, $f12 -/* AD88E8 80061748 E50600A4 */ swc1 $f6, 0xa4($t0) -/* AD88EC 8006174C C524009C */ lwc1 $f4, 0x9c($t1) -/* AD88F0 80061750 C52600A4 */ lwc1 $f6, 0xa4($t1) -/* AD88F4 80061754 460A2200 */ add.s $f8, $f4, $f10 -/* AD88F8 80061758 460C8102 */ mul.s $f4, $f16, $f12 -/* AD88FC 8006175C E528009C */ swc1 $f8, 0x9c($t1) -/* AD8900 80061760 46043280 */ add.s $f10, $f6, $f4 -/* AD8904 80061764 10000017 */ b .L800617C4 -/* AD8908 80061768 E52A00A4 */ swc1 $f10, 0xa4($t1) -/* AD890C 8006176C 44804000 */ mtc1 $zero, $f8 -.L80061770: -/* AD8910 80061770 00000000 */ nop -/* AD8914 80061774 46089032 */ c.eq.s $f18, $f8 -/* AD8918 80061778 00000000 */ nop -/* AD891C 8006177C 4503000C */ bc1tl .L800617B0 -/* AD8920 80061780 C508009C */ lwc1 $f8, 0x9c($t0) -/* AD8924 80061784 46009107 */ neg.s $f4, $f18 -/* AD8928 80061788 C506009C */ lwc1 $f6, 0x9c($t0) -/* AD892C 8006178C 46022282 */ mul.s $f10, $f4, $f2 -/* AD8930 80061790 460A3200 */ add.s $f8, $f6, $f10 -/* AD8934 80061794 460C9182 */ mul.s $f6, $f18, $f12 -/* AD8938 80061798 E508009C */ swc1 $f8, 0x9c($t0) -/* AD893C 8006179C C524009C */ lwc1 $f4, 0x9c($t1) -/* AD8940 800617A0 46062280 */ add.s $f10, $f4, $f6 -/* AD8944 800617A4 10000007 */ b .L800617C4 -/* AD8948 800617A8 E52A009C */ swc1 $f10, 0x9c($t1) -/* AD894C 800617AC C508009C */ lwc1 $f8, 0x9c($t0) -.L800617B0: -/* AD8950 800617B0 46024101 */ sub.s $f4, $f8, $f2 -/* AD8954 800617B4 E504009C */ swc1 $f4, 0x9c($t0) -/* AD8958 800617B8 C526009C */ lwc1 $f6, 0x9c($t1) -/* AD895C 800617BC 460C3280 */ add.s $f10, $f6, $f12 -/* AD8960 800617C0 E52A009C */ swc1 $f10, 0x9c($t1) -.L800617C4: -/* AD8964 800617C4 8FBF0014 */ lw $ra, 0x14($sp) -.L800617C8: -/* AD8968 800617C8 27BD0050 */ addiu $sp, $sp, 0x50 -/* AD896C 800617CC 03E00008 */ jr $ra -/* AD8970 800617D0 00000000 */ nop - -/* AD8974 800617D4 27BDFF78 */ addiu $sp, $sp, -0x88 -/* AD8978 800617D8 AFBF004C */ sw $ra, 0x4c($sp) -/* AD897C 800617DC AFBE0048 */ sw $fp, 0x48($sp) -/* AD8980 800617E0 AFB70044 */ sw $s7, 0x44($sp) -/* AD8984 800617E4 AFB60040 */ sw $s6, 0x40($sp) -/* AD8988 800617E8 AFB5003C */ sw $s5, 0x3c($sp) -/* AD898C 800617EC AFB40038 */ sw $s4, 0x38($sp) -/* AD8990 800617F0 AFB30034 */ sw $s3, 0x34($sp) -/* AD8994 800617F4 AFB20030 */ sw $s2, 0x30($sp) -/* AD8998 800617F8 AFB1002C */ sw $s1, 0x2c($sp) -/* AD899C 800617FC AFB00028 */ sw $s0, 0x28($sp) -/* AD89A0 80061800 AFA40088 */ sw $a0, 0x88($sp) -/* AD89A4 80061804 AFA5008C */ sw $a1, 0x8c($sp) -/* AD89A8 80061808 AFA60090 */ sw $a2, 0x90($sp) -/* AD89AC 8006180C AFA70094 */ sw $a3, 0x94($sp) -/* AD89B0 80061810 AFA60084 */ sw $a2, 0x84($sp) -/* AD89B4 80061814 8CC30018 */ lw $v1, 0x18($a2) -/* AD89B8 80061818 00E09825 */ move $s3, $a3 -/* AD89BC 8006181C 58600054 */ blezl $v1, .L80061970 -/* AD89C0 80061820 8FBF004C */ lw $ra, 0x4c($sp) -/* AD89C4 80061824 8CC2001C */ lw $v0, 0x1c($a2) -/* AD89C8 80061828 50400051 */ beql $v0, $zero, .L80061970 -/* AD89CC 8006182C 8FBF004C */ lw $ra, 0x4c($sp) -/* AD89D0 80061830 8CF80018 */ lw $t8, 0x18($a3) -/* AD89D4 80061834 5B00004E */ blezl $t8, .L80061970 -/* AD89D8 80061838 8FBF004C */ lw $ra, 0x4c($sp) -/* AD89DC 8006183C 8CF9001C */ lw $t9, 0x1c($a3) -/* AD89E0 80061840 00034180 */ sll $t0, $v1, 6 -/* AD89E4 80061844 00484821 */ addu $t1, $v0, $t0 -/* AD89E8 80061848 13200048 */ beqz $t9, .L8006196C -/* AD89EC 8006184C 0049082B */ sltu $at, $v0, $t1 -/* AD89F0 80061850 10200046 */ beqz $at, .L8006196C -/* AD89F4 80061854 0040A025 */ move $s4, $v0 -/* AD89F8 80061858 241E0001 */ li $fp, 1 -/* AD89FC 8006185C 27B70074 */ addiu $s7, $sp, 0x74 -/* AD8A00 80061860 27B6005C */ addiu $s6, $sp, 0x5c -/* AD8A04 80061864 27B50068 */ addiu $s5, $sp, 0x68 -/* AD8A08 80061868 928A0017 */ lbu $t2, 0x17($s4) -.L8006186C: -/* AD8A0C 8006186C 8FAC0084 */ lw $t4, 0x84($sp) -/* AD8A10 80061870 8FAF0094 */ lw $t7, 0x94($sp) -/* AD8A14 80061874 314B0001 */ andi $t3, $t2, 1 -/* AD8A18 80061878 55600007 */ bnezl $t3, .L80061898 -/* AD8A1C 8006187C 8DF90018 */ lw $t9, 0x18($t7) -/* AD8A20 80061880 8D8E0018 */ lw $t6, 0x18($t4) -/* AD8A24 80061884 8D8D001C */ lw $t5, 0x1c($t4) -/* AD8A28 80061888 000EC180 */ sll $t8, $t6, 6 -/* AD8A2C 8006188C 10000033 */ b .L8006195C -/* AD8A30 80061890 01B81021 */ addu $v0, $t5, $t8 -/* AD8A34 80061894 8DF90018 */ lw $t9, 0x18($t7) -.L80061898: -/* AD8A38 80061898 8DF0001C */ lw $s0, 0x1c($t7) -/* AD8A3C 8006189C 00194180 */ sll $t0, $t9, 6 -/* AD8A40 800618A0 02084821 */ addu $t1, $s0, $t0 -/* AD8A44 800618A4 0209082B */ sltu $at, $s0, $t1 -/* AD8A48 800618A8 50200028 */ beql $at, $zero, .L8006194C -/* AD8A4C 800618AC 8FA80084 */ lw $t0, 0x84($sp) -/* AD8A50 800618B0 920A0017 */ lbu $t2, 0x17($s0) -.L800618B4: -/* AD8A54 800618B4 26910030 */ addiu $s1, $s4, 0x30 -/* AD8A58 800618B8 02202025 */ move $a0, $s1 -/* AD8A5C 800618BC 314B0001 */ andi $t3, $t2, 1 -/* AD8A60 800618C0 15600006 */ bnez $t3, .L800618DC -/* AD8A64 800618C4 26120030 */ addiu $s2, $s0, 0x30 -/* AD8A68 800618C8 8E6E0018 */ lw $t6, 0x18($s3) -/* AD8A6C 800618CC 8E6C001C */ lw $t4, 0x1c($s3) -/* AD8A70 800618D0 000E6980 */ sll $t5, $t6, 6 -/* AD8A74 800618D4 10000018 */ b .L80061938 -/* AD8A78 800618D8 018D1021 */ addu $v0, $t4, $t5 -.L800618DC: -/* AD8A7C 800618DC 02402825 */ move $a1, $s2 -/* AD8A80 800618E0 0C033F23 */ jal Math3D_SpheresTouchingSurface -/* AD8A84 800618E4 02E03025 */ move $a2, $s7 -/* AD8A88 800618E8 145E000F */ bne $v0, $fp, .L80061928 -/* AD8A8C 800618EC 02A02025 */ move $a0, $s5 -/* AD8A90 800618F0 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD8A94 800618F4 02202825 */ move $a1, $s1 -/* AD8A98 800618F8 02C02025 */ move $a0, $s6 -/* AD8A9C 800618FC 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD8AA0 80061900 02402825 */ move $a1, $s2 -/* AD8AA4 80061904 C7A40074 */ lwc1 $f4, 0x74($sp) -/* AD8AA8 80061908 8FA40090 */ lw $a0, 0x90($sp) -/* AD8AAC 8006190C 02802825 */ move $a1, $s4 -/* AD8AB0 80061910 02A03025 */ move $a2, $s5 -/* AD8AB4 80061914 8FA70094 */ lw $a3, 0x94($sp) -/* AD8AB8 80061918 AFB00010 */ sw $s0, 0x10($sp) -/* AD8ABC 8006191C AFB60014 */ sw $s6, 0x14($sp) -/* AD8AC0 80061920 0C018529 */ jal func_800614A4 -/* AD8AC4 80061924 E7A40018 */ swc1 $f4, 0x18($sp) -.L80061928: -/* AD8AC8 80061928 8E6F0018 */ lw $t7, 0x18($s3) -/* AD8ACC 8006192C 8E78001C */ lw $t8, 0x1c($s3) -/* AD8AD0 80061930 000FC980 */ sll $t9, $t7, 6 -/* AD8AD4 80061934 03191021 */ addu $v0, $t8, $t9 -.L80061938: -/* AD8AD8 80061938 26100040 */ addiu $s0, $s0, 0x40 -/* AD8ADC 8006193C 0202082B */ sltu $at, $s0, $v0 -/* AD8AE0 80061940 5420FFDC */ bnezl $at, .L800618B4 -/* AD8AE4 80061944 920A0017 */ lbu $t2, 0x17($s0) -/* AD8AE8 80061948 8FA80084 */ lw $t0, 0x84($sp) -.L8006194C: -/* AD8AEC 8006194C 8D0A0018 */ lw $t2, 0x18($t0) -/* AD8AF0 80061950 8D09001C */ lw $t1, 0x1c($t0) -/* AD8AF4 80061954 000A5980 */ sll $t3, $t2, 6 -/* AD8AF8 80061958 012B1021 */ addu $v0, $t1, $t3 -.L8006195C: -/* AD8AFC 8006195C 26940040 */ addiu $s4, $s4, 0x40 -/* AD8B00 80061960 0282082B */ sltu $at, $s4, $v0 -/* AD8B04 80061964 5420FFC1 */ bnezl $at, .L8006186C -/* AD8B08 80061968 928A0017 */ lbu $t2, 0x17($s4) -.L8006196C: -/* AD8B0C 8006196C 8FBF004C */ lw $ra, 0x4c($sp) -.L80061970: -/* AD8B10 80061970 8FB00028 */ lw $s0, 0x28($sp) -/* AD8B14 80061974 8FB1002C */ lw $s1, 0x2c($sp) -/* AD8B18 80061978 8FB20030 */ lw $s2, 0x30($sp) -/* AD8B1C 8006197C 8FB30034 */ lw $s3, 0x34($sp) -/* AD8B20 80061980 8FB40038 */ lw $s4, 0x38($sp) -/* AD8B24 80061984 8FB5003C */ lw $s5, 0x3c($sp) -/* AD8B28 80061988 8FB60040 */ lw $s6, 0x40($sp) -/* AD8B2C 8006198C 8FB70044 */ lw $s7, 0x44($sp) -/* AD8B30 80061990 8FBE0048 */ lw $fp, 0x48($sp) -/* AD8B34 80061994 03E00008 */ jr $ra -/* AD8B38 80061998 27BD0088 */ addiu $sp, $sp, 0x88 - diff --git a/asm/non_matchings/code/z_collision_check/func_8006199C.s b/asm/non_matchings/code/z_collision_check/func_8006199C.s deleted file mode 100644 index 6d911c65a6..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8006199C.s +++ /dev/null @@ -1,162 +0,0 @@ -glabel func_8006199C -/* AD8B3C 8006199C 27BDFF78 */ addiu $sp, $sp, -0x88 -/* AD8B40 800619A0 AFBF004C */ sw $ra, 0x4c($sp) -/* AD8B44 800619A4 AFBE0048 */ sw $fp, 0x48($sp) -/* AD8B48 800619A8 AFB70044 */ sw $s7, 0x44($sp) -/* AD8B4C 800619AC AFB60040 */ sw $s6, 0x40($sp) -/* AD8B50 800619B0 AFB5003C */ sw $s5, 0x3c($sp) -/* AD8B54 800619B4 AFB40038 */ sw $s4, 0x38($sp) -/* AD8B58 800619B8 AFB30034 */ sw $s3, 0x34($sp) -/* AD8B5C 800619BC AFB20030 */ sw $s2, 0x30($sp) -/* AD8B60 800619C0 AFB1002C */ sw $s1, 0x2c($sp) -/* AD8B64 800619C4 AFB00028 */ sw $s0, 0x28($sp) -/* AD8B68 800619C8 AFA40088 */ sw $a0, 0x88($sp) -/* AD8B6C 800619CC AFA5008C */ sw $a1, 0x8c($sp) -/* AD8B70 800619D0 8CC30018 */ lw $v1, 0x18($a2) -/* AD8B74 800619D4 00E09025 */ move $s2, $a3 -/* AD8B78 800619D8 00C0F025 */ move $fp, $a2 -/* AD8B7C 800619DC 1860003A */ blez $v1, .L80061AC8 -/* AD8B80 800619E0 00C0A825 */ move $s5, $a2 -/* AD8B84 800619E4 8CC2001C */ lw $v0, 0x1c($a2) -/* AD8B88 800619E8 50400038 */ beql $v0, $zero, .L80061ACC -/* AD8B8C 800619EC 8FBF004C */ lw $ra, 0x4c($sp) -/* AD8B90 800619F0 90EE0012 */ lbu $t6, 0x12($a3) -/* AD8B94 800619F4 31CF0001 */ andi $t7, $t6, 1 -/* AD8B98 800619F8 51E00034 */ beql $t7, $zero, .L80061ACC -/* AD8B9C 800619FC 8FBF004C */ lw $ra, 0x4c($sp) -/* AD8BA0 80061A00 90F8002F */ lbu $t8, 0x2f($a3) -/* AD8BA4 80061A04 00034180 */ sll $t0, $v1, 6 -/* AD8BA8 80061A08 00484821 */ addu $t1, $v0, $t0 -/* AD8BAC 80061A0C 33190001 */ andi $t9, $t8, 1 -/* AD8BB0 80061A10 1320002D */ beqz $t9, .L80061AC8 -/* AD8BB4 80061A14 0049082B */ sltu $at, $v0, $t1 -/* AD8BB8 80061A18 1020002B */ beqz $at, .L80061AC8 -/* AD8BBC 80061A1C 00408025 */ move $s0, $v0 -/* AD8BC0 80061A20 27B70060 */ addiu $s7, $sp, 0x60 -/* AD8BC4 80061A24 27B6006C */ addiu $s6, $sp, 0x6c -/* AD8BC8 80061A28 920A0017 */ lbu $t2, 0x17($s0) -.L80061A2C: -/* AD8BCC 80061A2C 26110030 */ addiu $s1, $s0, 0x30 -/* AD8BD0 80061A30 02202025 */ move $a0, $s1 -/* AD8BD4 80061A34 314B0001 */ andi $t3, $t2, 1 -/* AD8BD8 80061A38 15600006 */ bnez $t3, .L80061A54 -/* AD8BDC 80061A3C 26450040 */ addiu $a1, $s2, 0x40 -/* AD8BE0 80061A40 8EAD0018 */ lw $t5, 0x18($s5) -/* AD8BE4 80061A44 8EAC001C */ lw $t4, 0x1c($s5) -/* AD8BE8 80061A48 000D7180 */ sll $t6, $t5, 6 -/* AD8BEC 80061A4C 1000001A */ b .L80061AB8 -/* AD8BF0 80061A50 018E1021 */ addu $v0, $t4, $t6 -.L80061A54: -/* AD8BF4 80061A54 0C033F61 */ jal func_800CFD84 -/* AD8BF8 80061A58 27A60078 */ addiu $a2, $sp, 0x78 -/* AD8BFC 80061A5C 24010001 */ li $at, 1 -/* AD8C00 80061A60 14410011 */ bne $v0, $at, .L80061AA8 -/* AD8C04 80061A64 02C02025 */ move $a0, $s6 -/* AD8C08 80061A68 02202825 */ move $a1, $s1 -/* AD8C0C 80061A6C 26530018 */ addiu $s3, $s2, 0x18 -/* AD8C10 80061A70 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD8C14 80061A74 26540046 */ addiu $s4, $s2, 0x46 -/* AD8C18 80061A78 02E02025 */ move $a0, $s7 -/* AD8C1C 80061A7C 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD8C20 80061A80 02802825 */ move $a1, $s4 -/* AD8C24 80061A84 C7A40078 */ lwc1 $f4, 0x78($sp) -/* AD8C28 80061A88 03C02025 */ move $a0, $fp -/* AD8C2C 80061A8C 02002825 */ move $a1, $s0 -/* AD8C30 80061A90 02C03025 */ move $a2, $s6 -/* AD8C34 80061A94 02403825 */ move $a3, $s2 -/* AD8C38 80061A98 AFB30010 */ sw $s3, 0x10($sp) -/* AD8C3C 80061A9C AFB70014 */ sw $s7, 0x14($sp) -/* AD8C40 80061AA0 0C018529 */ jal func_800614A4 -/* AD8C44 80061AA4 E7A40018 */ swc1 $f4, 0x18($sp) -.L80061AA8: -/* AD8C48 80061AA8 8EB80018 */ lw $t8, 0x18($s5) -/* AD8C4C 80061AAC 8EAF001C */ lw $t7, 0x1c($s5) -/* AD8C50 80061AB0 0018C980 */ sll $t9, $t8, 6 -/* AD8C54 80061AB4 01F91021 */ addu $v0, $t7, $t9 -.L80061AB8: -/* AD8C58 80061AB8 26100040 */ addiu $s0, $s0, 0x40 -/* AD8C5C 80061ABC 0202082B */ sltu $at, $s0, $v0 -/* AD8C60 80061AC0 5420FFDA */ bnezl $at, .L80061A2C -/* AD8C64 80061AC4 920A0017 */ lbu $t2, 0x17($s0) -.L80061AC8: -/* AD8C68 80061AC8 8FBF004C */ lw $ra, 0x4c($sp) -.L80061ACC: -/* AD8C6C 80061ACC 8FB00028 */ lw $s0, 0x28($sp) -/* AD8C70 80061AD0 8FB1002C */ lw $s1, 0x2c($sp) -/* AD8C74 80061AD4 8FB20030 */ lw $s2, 0x30($sp) -/* AD8C78 80061AD8 8FB30034 */ lw $s3, 0x34($sp) -/* AD8C7C 80061ADC 8FB40038 */ lw $s4, 0x38($sp) -/* AD8C80 80061AE0 8FB5003C */ lw $s5, 0x3c($sp) -/* AD8C84 80061AE4 8FB60040 */ lw $s6, 0x40($sp) -/* AD8C88 80061AE8 8FB70044 */ lw $s7, 0x44($sp) -/* AD8C8C 80061AEC 8FBE0048 */ lw $fp, 0x48($sp) -/* AD8C90 80061AF0 03E00008 */ jr $ra -/* AD8C94 80061AF4 27BD0088 */ addiu $sp, $sp, 0x88 - -/* AD8C98 80061AF8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD8C9C 80061AFC AFA70024 */ sw $a3, 0x24($sp) -/* AD8CA0 80061B00 00C03825 */ move $a3, $a2 -/* AD8CA4 80061B04 AFBF0014 */ sw $ra, 0x14($sp) -/* AD8CA8 80061B08 AFA60020 */ sw $a2, 0x20($sp) -/* AD8CAC 80061B0C 0C018667 */ jal func_8006199C -/* AD8CB0 80061B10 8FA60024 */ lw $a2, 0x24($sp) -/* AD8CB4 80061B14 8FBF0014 */ lw $ra, 0x14($sp) -/* AD8CB8 80061B18 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD8CBC 80061B1C 03E00008 */ jr $ra -/* AD8CC0 80061B20 00000000 */ nop - -/* AD8CC4 80061B24 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* AD8CC8 80061B28 AFBF002C */ sw $ra, 0x2c($sp) -/* AD8CCC 80061B2C AFB10028 */ sw $s1, 0x28($sp) -/* AD8CD0 80061B30 AFB00024 */ sw $s0, 0x24($sp) -/* AD8CD4 80061B34 AFA40058 */ sw $a0, 0x58($sp) -/* AD8CD8 80061B38 AFA5005C */ sw $a1, 0x5c($sp) -/* AD8CDC 80061B3C 90CE0012 */ lbu $t6, 0x12($a2) -/* AD8CE0 80061B40 00C08025 */ move $s0, $a2 -/* AD8CE4 80061B44 00E08825 */ move $s1, $a3 -/* AD8CE8 80061B48 31CF0001 */ andi $t7, $t6, 1 -/* AD8CEC 80061B4C 51E00025 */ beql $t7, $zero, .L80061BE4 -/* AD8CF0 80061B50 8FBF002C */ lw $ra, 0x2c($sp) -/* AD8CF4 80061B54 90F80012 */ lbu $t8, 0x12($a3) -/* AD8CF8 80061B58 33190001 */ andi $t9, $t8, 1 -/* AD8CFC 80061B5C 53200021 */ beql $t9, $zero, .L80061BE4 -/* AD8D00 80061B60 8FBF002C */ lw $ra, 0x2c($sp) -/* AD8D04 80061B64 90C8002F */ lbu $t0, 0x2f($a2) -/* AD8D08 80061B68 31090001 */ andi $t1, $t0, 1 -/* AD8D0C 80061B6C 5120001D */ beql $t1, $zero, .L80061BE4 -/* AD8D10 80061B70 8FBF002C */ lw $ra, 0x2c($sp) -/* AD8D14 80061B74 90EA002F */ lbu $t2, 0x2f($a3) -/* AD8D18 80061B78 24C40040 */ addiu $a0, $a2, 0x40 -/* AD8D1C 80061B7C 24E50040 */ addiu $a1, $a3, 0x40 -/* AD8D20 80061B80 314B0001 */ andi $t3, $t2, 1 -/* AD8D24 80061B84 51600017 */ beql $t3, $zero, .L80061BE4 -/* AD8D28 80061B88 8FBF002C */ lw $ra, 0x2c($sp) -/* AD8D2C 80061B8C 0C033FC5 */ jal Math3D_CylinderOutCylinder -/* AD8D30 80061B90 27A6004C */ addiu $a2, $sp, 0x4c -/* AD8D34 80061B94 24010001 */ li $at, 1 -/* AD8D38 80061B98 14410011 */ bne $v0, $at, .L80061BE0 -/* AD8D3C 80061B9C 27A40040 */ addiu $a0, $sp, 0x40 -/* AD8D40 80061BA0 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD8D44 80061BA4 26050046 */ addiu $a1, $s0, 0x46 -/* AD8D48 80061BA8 27A40034 */ addiu $a0, $sp, 0x34 -/* AD8D4C 80061BAC 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* AD8D50 80061BB0 26250046 */ addiu $a1, $s1, 0x46 -/* AD8D54 80061BB4 C7A4004C */ lwc1 $f4, 0x4c($sp) -/* AD8D58 80061BB8 262C0018 */ addiu $t4, $s1, 0x18 -/* AD8D5C 80061BBC 27AD0034 */ addiu $t5, $sp, 0x34 -/* AD8D60 80061BC0 AFAD0014 */ sw $t5, 0x14($sp) -/* AD8D64 80061BC4 AFAC0010 */ sw $t4, 0x10($sp) -/* AD8D68 80061BC8 02002025 */ move $a0, $s0 -/* AD8D6C 80061BCC 26050018 */ addiu $a1, $s0, 0x18 -/* AD8D70 80061BD0 27A60040 */ addiu $a2, $sp, 0x40 -/* AD8D74 80061BD4 02203825 */ move $a3, $s1 -/* AD8D78 80061BD8 0C018529 */ jal func_800614A4 -/* AD8D7C 80061BDC E7A40018 */ swc1 $f4, 0x18($sp) -.L80061BE0: -/* AD8D80 80061BE0 8FBF002C */ lw $ra, 0x2c($sp) -.L80061BE4: -/* AD8D84 80061BE4 8FB00024 */ lw $s0, 0x24($sp) -/* AD8D88 80061BE8 8FB10028 */ lw $s1, 0x28($sp) -/* AD8D8C 80061BEC 03E00008 */ jr $ra -/* AD8D90 80061BF0 27BD0058 */ addiu $sp, $sp, 0x58 - diff --git a/asm/non_matchings/code/z_collision_check/func_80061BF4.s b/asm/non_matchings/code/z_collision_check/func_80061BF4.s deleted file mode 100644 index 4f9fe2b3dc..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80061BF4.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80061BF4 -/* AD8D94 80061BF4 908E0012 */ lbu $t6, 0x12($a0) -/* AD8D98 80061BF8 00001025 */ move $v0, $zero -/* AD8D9C 80061BFC 31CF0001 */ andi $t7, $t6, 1 -/* AD8DA0 80061C00 15E00003 */ bnez $t7, .L80061C10 -/* AD8DA4 80061C04 00000000 */ nop -/* AD8DA8 80061C08 03E00008 */ jr $ra -/* AD8DAC 80061C0C 24020001 */ li $v0, 1 - -.L80061C10: -/* AD8DB0 80061C10 03E00008 */ jr $ra -/* AD8DB4 80061C14 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_80061C18.s b/asm/non_matchings/code/z_collision_check/func_80061C18.s deleted file mode 100644 index a88eff70dc..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80061C18.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80061C18 -/* AD8DB8 80061C18 90A20013 */ lbu $v0, 0x13($a1) -/* AD8DBC 80061C1C 908E0012 */ lbu $t6, 0x12($a0) -/* AD8DC0 80061C20 01C27824 */ and $t7, $t6, $v0 -/* AD8DC4 80061C24 31F80038 */ andi $t8, $t7, 0x38 -/* AD8DC8 80061C28 13000010 */ beqz $t8, .L80061C6C -/* AD8DCC 80061C2C 00000000 */ nop -/* AD8DD0 80061C30 90830013 */ lbu $v1, 0x13($a0) -/* AD8DD4 80061C34 90B90012 */ lbu $t9, 0x12($a1) -/* AD8DD8 80061C38 306A0002 */ andi $t2, $v1, 2 -/* AD8DDC 80061C3C 00794024 */ and $t0, $v1, $t9 -/* AD8DE0 80061C40 31090038 */ andi $t1, $t0, 0x38 -/* AD8DE4 80061C44 11200009 */ beqz $t1, .L80061C6C -/* AD8DE8 80061C48 00000000 */ nop -/* AD8DEC 80061C4C 11400002 */ beqz $t2, .L80061C58 -/* AD8DF0 80061C50 304B0004 */ andi $t3, $v0, 4 -/* AD8DF4 80061C54 15600005 */ bnez $t3, .L80061C6C -.L80061C58: -/* AD8DF8 80061C58 304C0002 */ andi $t4, $v0, 2 -/* AD8DFC 80061C5C 11800005 */ beqz $t4, .L80061C74 -/* AD8E00 80061C60 306D0004 */ andi $t5, $v1, 4 -/* AD8E04 80061C64 51A00004 */ beql $t5, $zero, .L80061C78 -/* AD8E08 80061C68 8CAE0000 */ lw $t6, ($a1) -.L80061C6C: -/* AD8E0C 80061C6C 03E00008 */ jr $ra -/* AD8E10 80061C70 24020001 */ li $v0, 1 - -.L80061C74: -/* AD8E14 80061C74 8CAE0000 */ lw $t6, ($a1) -.L80061C78: -/* AD8E18 80061C78 8C8F0000 */ lw $t7, ($a0) -/* AD8E1C 80061C7C 00001025 */ move $v0, $zero -/* AD8E20 80061C80 15CF0003 */ bne $t6, $t7, .L80061C90 -/* AD8E24 80061C84 00000000 */ nop -/* AD8E28 80061C88 03E00008 */ jr $ra -/* AD8E2C 80061C8C 24020001 */ li $v0, 1 - -.L80061C90: -/* AD8E30 80061C90 03E00008 */ jr $ra -/* AD8E34 80061C94 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_80061C98.s b/asm/non_matchings/code/z_collision_check/func_80061C98.s deleted file mode 100644 index bbe71c53e9..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80061C98.s +++ /dev/null @@ -1,128 +0,0 @@ -.rdata -glabel D_8013AC58 - .asciz "CollisionCheck_OC():未対応 %d, %d\n" - # EUC-JP: 未対応 | Not compatible - .balign 4 - -.text -glabel func_80061C98 -/* AD8E38 80061C98 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AD8E3C 80061C9C AFBF0034 */ sw $ra, 0x34($sp) -/* AD8E40 80061CA0 AFB70030 */ sw $s7, 0x30($sp) -/* AD8E44 80061CA4 AFB6002C */ sw $s6, 0x2c($sp) -/* AD8E48 80061CA8 AFB50028 */ sw $s5, 0x28($sp) -/* AD8E4C 80061CAC AFB40024 */ sw $s4, 0x24($sp) -/* AD8E50 80061CB0 AFB30020 */ sw $s3, 0x20($sp) -/* AD8E54 80061CB4 AFB2001C */ sw $s2, 0x1c($sp) -/* AD8E58 80061CB8 AFB10018 */ sw $s1, 0x18($sp) -/* AD8E5C 80061CBC AFB00014 */ sw $s0, 0x14($sp) -/* AD8E60 80061CC0 8CAE01C0 */ lw $t6, 0x1c0($a1) -/* AD8E64 80061CC4 24B201C4 */ addiu $s2, $a1, 0x1c4 -/* AD8E68 80061CC8 00A08825 */ move $s1, $a1 -/* AD8E6C 80061CCC 000E7880 */ sll $t7, $t6, 2 -/* AD8E70 80061CD0 00AF1021 */ addu $v0, $a1, $t7 -/* AD8E74 80061CD4 244201C4 */ addiu $v0, $v0, 0x1c4 -/* AD8E78 80061CD8 0242082B */ sltu $at, $s2, $v0 -/* AD8E7C 80061CDC 1020004F */ beqz $at, .L80061E1C -/* AD8E80 80061CE0 0080A025 */ move $s4, $a0 -/* AD8E84 80061CE4 3C168014 */ lui $s6, %hi(D_8013AC58) # $s6, 0x8014 -/* AD8E88 80061CE8 3C158012 */ lui $s5, %hi(D_8011DFAC) # $s5, 0x8012 -/* AD8E8C 80061CEC 26B5DFAC */ addiu $s5, %lo(D_8011DFAC) # addiu $s5, $s5, -0x2054 -/* AD8E90 80061CF0 26D6AC58 */ addiu $s6, %lo(D_8013AC58) # addiu $s6, $s6, -0x53a8 -/* AD8E94 80061CF4 24130001 */ li $s3, 1 -.L80061CF8: -/* AD8E98 80061CF8 8E460000 */ lw $a2, ($s2) -/* AD8E9C 80061CFC 10C00009 */ beqz $a2, .L80061D24 -/* AD8EA0 80061D00 00000000 */ nop -/* AD8EA4 80061D04 0C0186FD */ jal func_80061BF4 -/* AD8EA8 80061D08 00C02025 */ move $a0, $a2 -/* AD8EAC 80061D0C 54530008 */ bnel $v0, $s3, .L80061D30 -/* AD8EB0 80061D10 8E2901C0 */ lw $t1, 0x1c0($s1) -/* AD8EB4 80061D14 8E3801C0 */ lw $t8, 0x1c0($s1) -/* AD8EB8 80061D18 0018C880 */ sll $t9, $t8, 2 -/* AD8EBC 80061D1C 02391021 */ addu $v0, $s1, $t9 -/* AD8EC0 80061D20 244201C4 */ addiu $v0, $v0, 0x1c4 -.L80061D24: -/* AD8EC4 80061D24 1000003A */ b .L80061E10 -/* AD8EC8 80061D28 26570004 */ addiu $s7, $s2, 4 -/* AD8ECC 80061D2C 8E2901C0 */ lw $t1, 0x1c0($s1) -.L80061D30: -/* AD8ED0 80061D30 26570004 */ addiu $s7, $s2, 4 -/* AD8ED4 80061D34 02E08025 */ move $s0, $s7 -/* AD8ED8 80061D38 00095080 */ sll $t2, $t1, 2 -/* AD8EDC 80061D3C 022A1021 */ addu $v0, $s1, $t2 -/* AD8EE0 80061D40 244201C4 */ addiu $v0, $v0, 0x1c4 -/* AD8EE4 80061D44 02E2082B */ sltu $at, $s7, $v0 -/* AD8EE8 80061D48 50200032 */ beql $at, $zero, .L80061E14 -/* AD8EEC 80061D4C 02E2082B */ sltu $at, $s7, $v0 -/* AD8EF0 80061D50 8E070000 */ lw $a3, ($s0) -.L80061D54: -/* AD8EF4 80061D54 50E0000B */ beql $a3, $zero, .L80061D84 -/* AD8EF8 80061D58 8E2B01C0 */ lw $t3, 0x1c0($s1) -/* AD8EFC 80061D5C 0C0186FD */ jal func_80061BF4 -/* AD8F00 80061D60 00E02025 */ move $a0, $a3 -/* AD8F04 80061D64 50530007 */ beql $v0, $s3, .L80061D84 -/* AD8F08 80061D68 8E2B01C0 */ lw $t3, 0x1c0($s1) -/* AD8F0C 80061D6C 8E440000 */ lw $a0, ($s2) -/* AD8F10 80061D70 0C018706 */ jal func_80061C18 -/* AD8F14 80061D74 8E050000 */ lw $a1, ($s0) -/* AD8F18 80061D78 54530007 */ bnel $v0, $s3, .L80061D98 -/* AD8F1C 80061D7C 8E460000 */ lw $a2, ($s2) -/* AD8F20 80061D80 8E2B01C0 */ lw $t3, 0x1c0($s1) -.L80061D84: -/* AD8F24 80061D84 000B6080 */ sll $t4, $t3, 2 -/* AD8F28 80061D88 022C1021 */ addu $v0, $s1, $t4 -/* AD8F2C 80061D8C 1000001C */ b .L80061E00 -/* AD8F30 80061D90 244201C4 */ addiu $v0, $v0, 0x1c4 -/* AD8F34 80061D94 8E460000 */ lw $a2, ($s2) -.L80061D98: -/* AD8F38 80061D98 8E070000 */ lw $a3, ($s0) -/* AD8F3C 80061D9C 02802025 */ move $a0, $s4 -/* AD8F40 80061DA0 90C30015 */ lbu $v1, 0x15($a2) -/* AD8F44 80061DA4 90E80015 */ lbu $t0, 0x15($a3) -/* AD8F48 80061DA8 00036900 */ sll $t5, $v1, 4 -/* AD8F4C 80061DAC 02AD7021 */ addu $t6, $s5, $t5 -/* AD8F50 80061DB0 00087880 */ sll $t7, $t0, 2 -/* AD8F54 80061DB4 01CFC021 */ addu $t8, $t6, $t7 -/* AD8F58 80061DB8 8F020000 */ lw $v0, ($t8) -/* AD8F5C 80061DBC 00602825 */ move $a1, $v1 -/* AD8F60 80061DC0 14400009 */ bnez $v0, .L80061DE8 -/* AD8F64 80061DC4 00000000 */ nop -/* AD8F68 80061DC8 02C02025 */ move $a0, $s6 -/* AD8F6C 80061DCC 0C00084C */ jal osSyncPrintf -/* AD8F70 80061DD0 01003025 */ move $a2, $t0 -/* AD8F74 80061DD4 8E3901C0 */ lw $t9, 0x1c0($s1) -/* AD8F78 80061DD8 00194880 */ sll $t1, $t9, 2 -/* AD8F7C 80061DDC 02291021 */ addu $v0, $s1, $t1 -/* AD8F80 80061DE0 10000007 */ b .L80061E00 -/* AD8F84 80061DE4 244201C4 */ addiu $v0, $v0, 0x1c4 -.L80061DE8: -/* AD8F88 80061DE8 0040F809 */ jalr $v0 -/* AD8F8C 80061DEC 02202825 */ move $a1, $s1 -/* AD8F90 80061DF0 8E2A01C0 */ lw $t2, 0x1c0($s1) -/* AD8F94 80061DF4 000A5880 */ sll $t3, $t2, 2 -/* AD8F98 80061DF8 022B1021 */ addu $v0, $s1, $t3 -/* AD8F9C 80061DFC 244201C4 */ addiu $v0, $v0, 0x1c4 -.L80061E00: -/* AD8FA0 80061E00 26100004 */ addiu $s0, $s0, 4 -/* AD8FA4 80061E04 0202082B */ sltu $at, $s0, $v0 -/* AD8FA8 80061E08 5420FFD2 */ bnezl $at, .L80061D54 -/* AD8FAC 80061E0C 8E070000 */ lw $a3, ($s0) -.L80061E10: -/* AD8FB0 80061E10 02E2082B */ sltu $at, $s7, $v0 -.L80061E14: -/* AD8FB4 80061E14 1420FFB8 */ bnez $at, .L80061CF8 -/* AD8FB8 80061E18 02E09025 */ move $s2, $s7 -.L80061E1C: -/* AD8FBC 80061E1C 8FBF0034 */ lw $ra, 0x34($sp) -/* AD8FC0 80061E20 8FB00014 */ lw $s0, 0x14($sp) -/* AD8FC4 80061E24 8FB10018 */ lw $s1, 0x18($sp) -/* AD8FC8 80061E28 8FB2001C */ lw $s2, 0x1c($sp) -/* AD8FCC 80061E2C 8FB30020 */ lw $s3, 0x20($sp) -/* AD8FD0 80061E30 8FB40024 */ lw $s4, 0x24($sp) -/* AD8FD4 80061E34 8FB50028 */ lw $s5, 0x28($sp) -/* AD8FD8 80061E38 8FB6002C */ lw $s6, 0x2c($sp) -/* AD8FDC 80061E3C 8FB70030 */ lw $s7, 0x30($sp) -/* AD8FE0 80061E40 03E00008 */ jr $ra -/* AD8FE4 80061E44 27BD0038 */ addiu $sp, $sp, 0x38 - diff --git a/asm/non_matchings/code/z_collision_check/func_80061E48.s b/asm/non_matchings/code/z_collision_check/func_80061E48.s deleted file mode 100644 index 1415febc5c..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80061E48.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80061E48 -/* AD8FE8 80061E48 3C0E8012 */ lui $t6, %hi(D_8011DFEC) # $t6, 0x8012 -/* AD8FEC 80061E4C 25CEDFEC */ addiu $t6, %lo(D_8011DFEC) # addiu $t6, $t6, -0x2014 -/* AD8FF0 80061E50 8DD80000 */ lw $t8, ($t6) -/* AD8FF4 80061E54 AC980000 */ sw $t8, ($a0) -/* AD8FF8 80061E58 8DCF0004 */ lw $t7, 4($t6) -/* AD8FFC 80061E5C AC8F0004 */ sw $t7, 4($a0) -/* AD9000 80061E60 8DD80008 */ lw $t8, 8($t6) -/* AD9004 80061E64 AC980008 */ sw $t8, 8($a0) -/* AD9008 80061E68 8DCF000C */ lw $t7, 0xc($t6) -/* AD900C 80061E6C AC8F000C */ sw $t7, 0xc($a0) -/* AD9010 80061E70 8DD80010 */ lw $t8, 0x10($t6) -/* AD9014 80061E74 AC980010 */ sw $t8, 0x10($a0) -/* AD9018 80061E78 8DCF0014 */ lw $t7, 0x14($t6) -/* AD901C 80061E7C AC8F0014 */ sw $t7, 0x14($a0) -/* AD9020 80061E80 8DD80018 */ lw $t8, 0x18($t6) -/* AD9024 80061E84 03E00008 */ jr $ra -/* AD9028 80061E88 AC980018 */ sw $t8, 0x18($a0) - diff --git a/asm/non_matchings/code/z_collision_check/func_80061E8C.s b/asm/non_matchings/code/z_collision_check/func_80061E8C.s deleted file mode 100644 index 9f54905190..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80061E8C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80061E8C -/* AD902C 80061E8C 44800000 */ mtc1 $zero, $f0 -/* AD9030 80061E90 A0800018 */ sb $zero, 0x18($a0) -/* AD9034 80061E94 A0800019 */ sb $zero, 0x19($a0) -/* AD9038 80061E98 A080001A */ sb $zero, 0x1a($a0) -/* AD903C 80061E9C A080001B */ sb $zero, 0x1b($a0) -/* AD9040 80061EA0 E480000C */ swc1 $f0, 0xc($a0) -/* AD9044 80061EA4 E4800008 */ swc1 $f0, 8($a0) -/* AD9048 80061EA8 03E00008 */ jr $ra -/* AD904C 80061EAC E4800004 */ swc1 $f0, 4($a0) - -/* AD9050 80061EB0 90AE0000 */ lbu $t6, ($a1) -/* AD9054 80061EB4 A08E0017 */ sb $t6, 0x17($a0) -/* AD9058 80061EB8 84AF0002 */ lh $t7, 2($a1) -/* AD905C 80061EBC A48F0010 */ sh $t7, 0x10($a0) -/* AD9060 80061EC0 84B80004 */ lh $t8, 4($a1) -/* AD9064 80061EC4 A4980012 */ sh $t8, 0x12($a0) -/* AD9068 80061EC8 90B90006 */ lbu $t9, 6($a1) -/* AD906C 80061ECC 03E00008 */ jr $ra -/* AD9070 80061ED0 A0990016 */ sb $t9, 0x16($a0) - diff --git a/asm/non_matchings/code/z_collision_check/func_80061ED4.s b/asm/non_matchings/code/z_collision_check/func_80061ED4.s deleted file mode 100644 index d4923f2f9e..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80061ED4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80061ED4 -/* AD9074 80061ED4 90CE0000 */ lbu $t6, ($a2) -/* AD9078 80061ED8 AC850000 */ sw $a1, ($a0) -/* AD907C 80061EDC A08E0017 */ sb $t6, 0x17($a0) -/* AD9080 80061EE0 84CF0002 */ lh $t7, 2($a2) -/* AD9084 80061EE4 A48F0010 */ sh $t7, 0x10($a0) -/* AD9088 80061EE8 84D80004 */ lh $t8, 4($a2) -/* AD908C 80061EEC A4980012 */ sh $t8, 0x12($a0) -/* AD9090 80061EF0 90D90006 */ lbu $t9, 6($a2) -/* AD9094 80061EF4 03E00008 */ jr $ra -/* AD9098 80061EF8 A0990016 */ sb $t9, 0x16($a0) diff --git a/asm/non_matchings/code/z_collision_check/func_80061EFC.s b/asm/non_matchings/code/z_collision_check/func_80061EFC.s deleted file mode 100644 index 18b9091442..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80061EFC.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80061EFC -/* AD909C 80061EFC 90CE0000 */ lbu $t6, ($a2) -/* AD90A0 80061F00 AC850000 */ sw $a1, ($a0) -/* AD90A4 80061F04 A08E0017 */ sb $t6, 0x17($a0) -/* AD90A8 80061F08 84CF0002 */ lh $t7, 2($a2) -/* AD90AC 80061F0C A48F0010 */ sh $t7, 0x10($a0) -/* AD90B0 80061F10 84D80004 */ lh $t8, 4($a2) -/* AD90B4 80061F14 A4980012 */ sh $t8, 0x12($a0) -/* AD90B8 80061F18 84D90006 */ lh $t9, 6($a2) -/* AD90BC 80061F1C A4990014 */ sh $t9, 0x14($a0) -/* AD90C0 80061F20 90C80008 */ lbu $t0, 8($a2) -/* AD90C4 80061F24 03E00008 */ jr $ra -/* AD90C8 80061F28 A0880016 */ sb $t0, 0x16($a0) - -/* AD90CC 80061F2C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD90D0 80061F30 AFBF0014 */ sw $ra, 0x14($sp) -/* AD90D4 80061F34 AFA40018 */ sw $a0, 0x18($sp) -/* AD90D8 80061F38 AFA60020 */ sw $a2, 0x20($sp) -/* AD90DC 80061F3C 0C016C80 */ jal CollisionBtlTbl_Get -/* AD90E0 80061F40 00A02025 */ move $a0, $a1 -/* AD90E4 80061F44 8FA40018 */ lw $a0, 0x18($sp) -/* AD90E8 80061F48 00402825 */ move $a1, $v0 -/* AD90EC 80061F4C 0C0187BF */ jal func_80061EFC -/* AD90F0 80061F50 8FA60020 */ lw $a2, 0x20($sp) -/* AD90F4 80061F54 8FBF0014 */ lw $ra, 0x14($sp) -/* AD90F8 80061F58 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD90FC 80061F5C 03E00008 */ jr $ra -/* AD9100 80061F60 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_80061F64.s b/asm/non_matchings/code/z_collision_check/func_80061F64.s deleted file mode 100644 index 2a2a44b42b..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80061F64.s +++ /dev/null @@ -1,259 +0,0 @@ -.rdata -glabel D_8013AC7C - .asciz "pclobj_elem->ac_hit_elem != NULL" - .balign 4 - -glabel D_8013ACA0 - .asciz "../z_collision_check.c" - .balign 4 - -.text -glabel func_80061F64 -/* AD9104 80061F64 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD9108 80061F68 AFBF0014 */ sw $ra, 0x14($sp) -/* AD910C 80061F6C AFA40018 */ sw $a0, 0x18($sp) -/* AD9110 80061F70 AFA5001C */ sw $a1, 0x1c($sp) -/* AD9114 80061F74 AFA60020 */ sw $a2, 0x20($sp) -/* AD9118 80061F78 8CC80000 */ lw $t0, ($a2) -/* AD911C 80061F7C 51000078 */ beql $t0, $zero, .L80062160 -/* AD9120 80061F80 8FBF0014 */ lw $ra, 0x14($sp) -/* AD9124 80061F84 90CF0011 */ lbu $t7, 0x11($a2) -/* AD9128 80061F88 31F80002 */ andi $t8, $t7, 2 -/* AD912C 80061F8C 53000074 */ beql $t8, $zero, .L80062160 -/* AD9130 80061F90 8FBF0014 */ lw $ra, 0x14($sp) -/* AD9134 80061F94 90E20016 */ lbu $v0, 0x16($a3) -/* AD9138 80061F98 30590002 */ andi $t9, $v0, 2 -/* AD913C 80061F9C 1320006F */ beqz $t9, .L8006215C -/* AD9140 80061FA0 30490010 */ andi $t1, $v0, 0x10 -/* AD9144 80061FA4 5520006E */ bnezl $t1, .L80062160 -/* AD9148 80061FA8 8FBF0014 */ lw $ra, 0x14($sp) -/* AD914C 80061FAC 8CE40024 */ lw $a0, 0x24($a3) -/* AD9150 80061FB0 3C058014 */ lui $a1, %hi(D_8013ACA0) -/* AD9154 80061FB4 24A5ACA0 */ addiu $a1, %lo(D_8013ACA0) # addiu $a1, $a1, -0x5360 -/* AD9158 80061FB8 14800009 */ bnez $a0, .L80061FE0 -/* AD915C 80061FBC 2406195D */ li $a2, 6493 -/* AD9160 80061FC0 3C048014 */ lui $a0, %hi(D_8013AC7C) -/* AD9164 80061FC4 2484AC7C */ addiu $a0, %lo(D_8013AC7C) # addiu $a0, $a0, -0x5384 -/* AD9168 80061FC8 0C0007FC */ jal __assert -/* AD916C 80061FCC AFA70024 */ sw $a3, 0x24($sp) -/* AD9170 80061FD0 8FA70024 */ lw $a3, 0x24($sp) -/* AD9174 80061FD4 8FAA0020 */ lw $t2, 0x20($sp) -/* AD9178 80061FD8 8CE40024 */ lw $a0, 0x24($a3) -/* AD917C 80061FDC 8D480000 */ lw $t0, ($t2) -.L80061FE0: -/* AD9180 80061FE0 8D060098 */ lw $a2, 0x98($t0) -/* AD9184 80061FE4 00001825 */ move $v1, $zero -/* AD9188 80061FE8 24050020 */ li $a1, 32 -/* AD918C 80061FEC 54C0001B */ bnezl $a2, .L8006205C -/* AD9190 80061FF0 8C820000 */ lw $v0, ($a0) -/* AD9194 80061FF4 908B0005 */ lbu $t3, 5($a0) -/* AD9198 80061FF8 44801000 */ mtc1 $zero, $f2 -/* AD919C 80061FFC 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* AD91A0 80062000 448B2000 */ mtc1 $t3, $f4 -/* AD91A4 80062004 05610004 */ bgez $t3, .L80062018 -/* AD91A8 80062008 468021A0 */ cvt.s.w $f6, $f4 -/* AD91AC 8006200C 44814000 */ mtc1 $at, $f8 -/* AD91B0 80062010 00000000 */ nop -/* AD91B4 80062014 46083180 */ add.s $f6, $f6, $f8 -.L80062018: -/* AD91B8 80062018 90EC000D */ lbu $t4, 0xd($a3) -/* AD91BC 8006201C 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* AD91C0 80062020 448C5000 */ mtc1 $t4, $f10 -/* AD91C4 80062024 05810004 */ bgez $t4, .L80062038 -/* AD91C8 80062028 46805420 */ cvt.s.w $f16, $f10 -/* AD91CC 8006202C 44819000 */ mtc1 $at, $f18 -/* AD91D0 80062030 00000000 */ nop -/* AD91D4 80062034 46128400 */ add.s $f16, $f16, $f18 -.L80062038: -/* AD91D8 80062038 46103001 */ sub.s $f0, $f6, $f16 -/* AD91DC 8006203C 8FAD0020 */ lw $t5, 0x20($sp) -/* AD91E0 80062040 4602003C */ c.lt.s $f0, $f2 -/* AD91E4 80062044 91A50011 */ lbu $a1, 0x11($t5) -/* AD91E8 80062048 45020015 */ bc1fl .L800620A0 -/* AD91EC 8006204C 30AA0004 */ andi $t2, $a1, 4 -/* AD91F0 80062050 10000012 */ b .L8006209C -/* AD91F4 80062054 46001006 */ mov.s $f0, $f2 -/* AD91F8 80062058 8C820000 */ lw $v0, ($a0) -.L8006205C: -/* AD91FC 8006205C 24040001 */ li $a0, 1 -.L80062060: -/* AD9200 80062060 50440005 */ beql $v0, $a0, .L80062078 -/* AD9204 80062064 00C37021 */ addu $t6, $a2, $v1 -/* AD9208 80062068 24630001 */ addiu $v1, $v1, 1 -/* AD920C 8006206C 1465FFFC */ bne $v1, $a1, .L80062060 -/* AD9210 80062070 00021042 */ srl $v0, $v0, 1 -/* AD9214 80062074 00C37021 */ addu $t6, $a2, $v1 -.L80062078: -/* AD9218 80062078 91C20000 */ lbu $v0, ($t6) -/* AD921C 8006207C 0002C103 */ sra $t8, $v0, 4 -/* AD9220 80062080 3319000F */ andi $t9, $t8, 0xf -/* AD9224 80062084 A11900B1 */ sb $t9, 0xb1($t0) -/* AD9228 80062088 304F000F */ andi $t7, $v0, 0xf -/* AD922C 8006208C 448F2000 */ mtc1 $t7, $f4 -/* AD9230 80062090 8FA90020 */ lw $t1, 0x20($sp) -/* AD9234 80062094 46802020 */ cvt.s.w $f0, $f4 -/* AD9238 80062098 91250011 */ lbu $a1, 0x11($t1) -.L8006209C: -/* AD923C 8006209C 30AA0004 */ andi $t2, $a1, 4 -.L800620A0: -/* AD9240 800620A0 1540002E */ bnez $t2, .L8006215C -/* AD9244 800620A4 8FAB0020 */ lw $t3, 0x20($sp) -/* AD9248 800620A8 8D680000 */ lw $t0, ($t3) -/* AD924C 800620AC 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* AD9250 800620B0 910C00B0 */ lbu $t4, 0xb0($t0) -/* AD9254 800620B4 448C4000 */ mtc1 $t4, $f8 -/* AD9258 800620B8 05810004 */ bgez $t4, .L800620CC -/* AD925C 800620BC 468042A0 */ cvt.s.w $f10, $f8 -/* AD9260 800620C0 44819000 */ mtc1 $at, $f18 -/* AD9264 800620C4 00000000 */ nop -/* AD9268 800620C8 46125280 */ add.s $f10, $f10, $f18 -.L800620CC: -/* AD926C 800620CC 46005180 */ add.s $f6, $f10, $f0 -/* AD9270 800620D0 240E0001 */ li $t6, 1 -/* AD9274 800620D4 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* AD9278 800620D8 444DF800 */ cfc1 $t5, $31 -/* AD927C 800620DC 44CEF800 */ ctc1 $t6, $31 -/* AD9280 800620E0 00000000 */ nop -/* AD9284 800620E4 46003424 */ cvt.w.s $f16, $f6 -/* AD9288 800620E8 444EF800 */ cfc1 $t6, $31 -/* AD928C 800620EC 00000000 */ nop -/* AD9290 800620F0 31CE0078 */ andi $t6, $t6, 0x78 -/* AD9294 800620F4 51C00013 */ beql $t6, $zero, .L80062144 -/* AD9298 800620F8 440E8000 */ mfc1 $t6, $f16 -/* AD929C 800620FC 44818000 */ mtc1 $at, $f16 -/* AD92A0 80062100 240E0001 */ li $t6, 1 -/* AD92A4 80062104 46103401 */ sub.s $f16, $f6, $f16 -/* AD92A8 80062108 44CEF800 */ ctc1 $t6, $31 -/* AD92AC 8006210C 00000000 */ nop -/* AD92B0 80062110 46008424 */ cvt.w.s $f16, $f16 -/* AD92B4 80062114 444EF800 */ cfc1 $t6, $31 -/* AD92B8 80062118 00000000 */ nop -/* AD92BC 8006211C 31CE0078 */ andi $t6, $t6, 0x78 -/* AD92C0 80062120 15C00005 */ bnez $t6, .L80062138 -/* AD92C4 80062124 00000000 */ nop -/* AD92C8 80062128 440E8000 */ mfc1 $t6, $f16 -/* AD92CC 8006212C 3C018000 */ lui $at, 0x8000 -/* AD92D0 80062130 10000007 */ b .L80062150 -/* AD92D4 80062134 01C17025 */ or $t6, $t6, $at -.L80062138: -/* AD92D8 80062138 10000005 */ b .L80062150 -/* AD92DC 8006213C 240EFFFF */ li $t6, -1 -/* AD92E0 80062140 440E8000 */ mfc1 $t6, $f16 -.L80062144: -/* AD92E4 80062144 00000000 */ nop -/* AD92E8 80062148 05C0FFFB */ bltz $t6, .L80062138 -/* AD92EC 8006214C 00000000 */ nop -.L80062150: -/* AD92F0 80062150 44CDF800 */ ctc1 $t5, $31 -/* AD92F4 80062154 A10E00B0 */ sb $t6, 0xb0($t0) -/* AD92F8 80062158 00000000 */ nop -.L8006215C: -/* AD92FC 8006215C 8FBF0014 */ lw $ra, 0x14($sp) -.L80062160: -/* AD9300 80062160 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD9304 80062164 03E00008 */ jr $ra -/* AD9308 80062168 00000000 */ nop - -/* AD930C 8006216C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AD9310 80062170 AFBF002C */ sw $ra, 0x2c($sp) -/* AD9314 80062174 AFB50028 */ sw $s5, 0x28($sp) -/* AD9318 80062178 AFB40024 */ sw $s4, 0x24($sp) -/* AD931C 8006217C AFB30020 */ sw $s3, 0x20($sp) -/* AD9320 80062180 AFB2001C */ sw $s2, 0x1c($sp) -/* AD9324 80062184 AFB10018 */ sw $s1, 0x18($sp) -/* AD9328 80062188 AFB00014 */ sw $s0, 0x14($sp) -/* AD932C 8006218C 8CC20018 */ lw $v0, 0x18($a2) -/* AD9330 80062190 00C09025 */ move $s2, $a2 -/* AD9334 80062194 0080A025 */ move $s4, $a0 -/* AD9338 80062198 00A0A825 */ move $s5, $a1 -/* AD933C 8006219C 18400013 */ blez $v0, .L800621EC -/* AD9340 800621A0 00C09825 */ move $s3, $a2 -/* AD9344 800621A4 8CCE001C */ lw $t6, 0x1c($a2) -/* AD9348 800621A8 51C00011 */ beql $t6, $zero, .L800621F0 -/* AD934C 800621AC 8FBF002C */ lw $ra, 0x2c($sp) -/* AD9350 800621B0 1840000E */ blez $v0, .L800621EC -/* AD9354 800621B4 00008025 */ move $s0, $zero -/* AD9358 800621B8 00008825 */ move $s1, $zero -/* AD935C 800621BC 8E4F001C */ lw $t7, 0x1c($s2) -.L800621C0: -/* AD9360 800621C0 02802025 */ move $a0, $s4 -/* AD9364 800621C4 02A02825 */ move $a1, $s5 -/* AD9368 800621C8 02403025 */ move $a2, $s2 -/* AD936C 800621CC 0C0187D9 */ jal func_80061F64 -/* AD9370 800621D0 01F13821 */ addu $a3, $t7, $s1 -/* AD9374 800621D4 8E780018 */ lw $t8, 0x18($s3) -/* AD9378 800621D8 26100001 */ addiu $s0, $s0, 1 -/* AD937C 800621DC 26310040 */ addiu $s1, $s1, 0x40 -/* AD9380 800621E0 0218082A */ slt $at, $s0, $t8 -/* AD9384 800621E4 5420FFF6 */ bnezl $at, .L800621C0 -/* AD9388 800621E8 8E4F001C */ lw $t7, 0x1c($s2) -.L800621EC: -/* AD938C 800621EC 8FBF002C */ lw $ra, 0x2c($sp) -.L800621F0: -/* AD9390 800621F0 8FB00014 */ lw $s0, 0x14($sp) -/* AD9394 800621F4 8FB10018 */ lw $s1, 0x18($sp) -/* AD9398 800621F8 8FB2001C */ lw $s2, 0x1c($sp) -/* AD939C 800621FC 8FB30020 */ lw $s3, 0x20($sp) -/* AD93A0 80062200 8FB40024 */ lw $s4, 0x24($sp) -/* AD93A4 80062204 8FB50028 */ lw $s5, 0x28($sp) -/* AD93A8 80062208 03E00008 */ jr $ra -/* AD93AC 8006220C 27BD0030 */ addiu $sp, $sp, 0x30 - -/* AD93B0 80062210 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD93B4 80062214 AFBF0014 */ sw $ra, 0x14($sp) -/* AD93B8 80062218 0C0187D9 */ jal func_80061F64 -/* AD93BC 8006221C 24C70018 */ addiu $a3, $a2, 0x18 -/* AD93C0 80062220 8FBF0014 */ lw $ra, 0x14($sp) -/* AD93C4 80062224 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD93C8 80062228 03E00008 */ jr $ra -/* AD93CC 8006222C 00000000 */ nop - -/* AD93D0 80062230 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AD93D4 80062234 AFBF002C */ sw $ra, 0x2c($sp) -/* AD93D8 80062238 AFB50028 */ sw $s5, 0x28($sp) -/* AD93DC 8006223C AFB40024 */ sw $s4, 0x24($sp) -/* AD93E0 80062240 AFB30020 */ sw $s3, 0x20($sp) -/* AD93E4 80062244 AFB2001C */ sw $s2, 0x1c($sp) -/* AD93E8 80062248 AFB10018 */ sw $s1, 0x18($sp) -/* AD93EC 8006224C AFB00014 */ sw $s0, 0x14($sp) -/* AD93F0 80062250 8CCE0018 */ lw $t6, 0x18($a2) -/* AD93F4 80062254 00C09025 */ move $s2, $a2 -/* AD93F8 80062258 0080A025 */ move $s4, $a0 -/* AD93FC 8006225C 00A0A825 */ move $s5, $a1 -/* AD9400 80062260 00C09825 */ move $s3, $a2 -/* AD9404 80062264 19C0000E */ blez $t6, .L800622A0 -/* AD9408 80062268 00008025 */ move $s0, $zero -/* AD940C 8006226C 00008825 */ move $s1, $zero -/* AD9410 80062270 8E4F001C */ lw $t7, 0x1c($s2) -.L80062274: -/* AD9414 80062274 02802025 */ move $a0, $s4 -/* AD9418 80062278 02A02825 */ move $a1, $s5 -/* AD941C 8006227C 02403025 */ move $a2, $s2 -/* AD9420 80062280 0C0187D9 */ jal func_80061F64 -/* AD9424 80062284 01F13821 */ addu $a3, $t7, $s1 -/* AD9428 80062288 8E780018 */ lw $t8, 0x18($s3) -/* AD942C 8006228C 26100001 */ addiu $s0, $s0, 1 -/* AD9430 80062290 2631005C */ addiu $s1, $s1, 0x5c -/* AD9434 80062294 0218082A */ slt $at, $s0, $t8 -/* AD9438 80062298 5420FFF6 */ bnezl $at, .L80062274 -/* AD943C 8006229C 8E4F001C */ lw $t7, 0x1c($s2) -.L800622A0: -/* AD9440 800622A0 8FBF002C */ lw $ra, 0x2c($sp) -/* AD9444 800622A4 8FB00014 */ lw $s0, 0x14($sp) -/* AD9448 800622A8 8FB10018 */ lw $s1, 0x18($sp) -/* AD944C 800622AC 8FB2001C */ lw $s2, 0x1c($sp) -/* AD9450 800622B0 8FB30020 */ lw $s3, 0x20($sp) -/* AD9454 800622B4 8FB40024 */ lw $s4, 0x24($sp) -/* AD9458 800622B8 8FB50028 */ lw $s5, 0x28($sp) -/* AD945C 800622BC 03E00008 */ jr $ra -/* AD9460 800622C0 27BD0030 */ addiu $sp, $sp, 0x30 - -/* AD9464 800622C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD9468 800622C8 AFBF0014 */ sw $ra, 0x14($sp) -/* AD946C 800622CC 0C0187D9 */ jal func_80061F64 -/* AD9470 800622D0 24C70018 */ addiu $a3, $a2, 0x18 -/* AD9474 800622D4 8FBF0014 */ lw $ra, 0x14($sp) -/* AD9478 800622D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD947C 800622DC 03E00008 */ jr $ra -/* AD9480 800622E0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_800622E4.s b/asm/non_matchings/code/z_collision_check/func_800622E4.s deleted file mode 100644 index e9cc405e12..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_800622E4.s +++ /dev/null @@ -1,164 +0,0 @@ -glabel func_800622E4 -/* AD9484 800622E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD9488 800622E8 AFBF0024 */ sw $ra, 0x24($sp) -/* AD948C 800622EC AFB30020 */ sw $s3, 0x20($sp) -/* AD9490 800622F0 AFB2001C */ sw $s2, 0x1c($sp) -/* AD9494 800622F4 AFB10018 */ sw $s1, 0x18($sp) -/* AD9498 800622F8 AFB00014 */ sw $s0, 0x14($sp) -/* AD949C 800622FC 8CA300CC */ lw $v1, 0xcc($a1) -/* AD94A0 80062300 00A08025 */ move $s0, $a1 -/* AD94A4 80062304 00809025 */ move $s2, $a0 -/* AD94A8 80062308 1860001F */ blez $v1, .L80062388 -/* AD94AC 8006230C 00A08825 */ move $s1, $a1 -/* AD94B0 80062310 3C138012 */ lui $s3, %hi(D_8011E008) # $s3, 0x8012 -/* AD94B4 80062314 2673E008 */ addiu $s3, %lo(D_8011E008) # addiu $s3, $s3, -0x1ff8 -/* AD94B8 80062318 8E2600D0 */ lw $a2, 0xd0($s1) -.L8006231C: -/* AD94BC 8006231C 00037080 */ sll $t6, $v1, 2 -/* AD94C0 80062320 54C00004 */ bnezl $a2, .L80062334 -/* AD94C4 80062324 90CF0011 */ lbu $t7, 0x11($a2) -/* AD94C8 80062328 10000013 */ b .L80062378 -/* AD94CC 8006232C 01D01021 */ addu $v0, $t6, $s0 -/* AD94D0 80062330 90CF0011 */ lbu $t7, 0x11($a2) -.L80062334: -/* AD94D4 80062334 0003C880 */ sll $t9, $v1, 2 -/* AD94D8 80062338 31F80040 */ andi $t8, $t7, 0x40 -/* AD94DC 8006233C 53000004 */ beql $t8, $zero, .L80062350 -/* AD94E0 80062340 90C80015 */ lbu $t0, 0x15($a2) -/* AD94E4 80062344 1000000C */ b .L80062378 -/* AD94E8 80062348 03301021 */ addu $v0, $t9, $s0 -/* AD94EC 8006234C 90C80015 */ lbu $t0, 0x15($a2) -.L80062350: -/* AD94F0 80062350 02402025 */ move $a0, $s2 -/* AD94F4 80062354 02002825 */ move $a1, $s0 -/* AD94F8 80062358 00084880 */ sll $t1, $t0, 2 -/* AD94FC 8006235C 02695021 */ addu $t2, $s3, $t1 -/* AD9500 80062360 8D590000 */ lw $t9, ($t2) -/* AD9504 80062364 0320F809 */ jalr $t9 -/* AD9508 80062368 00000000 */ nop -/* AD950C 8006236C 8E0300CC */ lw $v1, 0xcc($s0) -/* AD9510 80062370 00035880 */ sll $t3, $v1, 2 -/* AD9514 80062374 01701021 */ addu $v0, $t3, $s0 -.L80062378: -/* AD9518 80062378 26310004 */ addiu $s1, $s1, 4 -/* AD951C 8006237C 0222082B */ sltu $at, $s1, $v0 -/* AD9520 80062380 5420FFE6 */ bnezl $at, .L8006231C -/* AD9524 80062384 8E2600D0 */ lw $a2, 0xd0($s1) -.L80062388: -/* AD9528 80062388 8FBF0024 */ lw $ra, 0x24($sp) -/* AD952C 8006238C 8FB00014 */ lw $s0, 0x14($sp) -/* AD9530 80062390 8FB10018 */ lw $s1, 0x18($sp) -/* AD9534 80062394 8FB2001C */ lw $s2, 0x1c($sp) -/* AD9538 80062398 8FB30020 */ lw $s3, 0x20($sp) -/* AD953C 8006239C 03E00008 */ jr $ra -/* AD9540 800623A0 27BD0028 */ addiu $sp, $sp, 0x28 - -/* AD9544 800623A4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AD9548 800623A8 AFBF0034 */ sw $ra, 0x34($sp) -/* AD954C 800623AC AFB70030 */ sw $s7, 0x30($sp) -/* AD9550 800623B0 AFB6002C */ sw $s6, 0x2c($sp) -/* AD9554 800623B4 AFB50028 */ sw $s5, 0x28($sp) -/* AD9558 800623B8 AFB40024 */ sw $s4, 0x24($sp) -/* AD955C 800623BC AFB30020 */ sw $s3, 0x20($sp) -/* AD9560 800623C0 AFB2001C */ sw $s2, 0x1c($sp) -/* AD9564 800623C4 AFB10018 */ sw $s1, 0x18($sp) -/* AD9568 800623C8 AFB00014 */ sw $s0, 0x14($sp) -/* AD956C 800623CC AFA40038 */ sw $a0, 0x38($sp) -/* AD9570 800623D0 AFA5003C */ sw $a1, 0x3c($sp) -/* AD9574 800623D4 8CCE0018 */ lw $t6, 0x18($a2) -/* AD9578 800623D8 00C09825 */ move $s3, $a2 -/* AD957C 800623DC 00E0A025 */ move $s4, $a3 -/* AD9580 800623E0 19C0002A */ blez $t6, .L8006248C -/* AD9584 800623E4 00C08825 */ move $s1, $a2 -/* AD9588 800623E8 3C168016 */ lui $s6, %hi(D_8015E61C) # $s6, 0x8016 -/* AD958C 800623EC 3C128016 */ lui $s2, %hi(D_8015E610) # $s2, 0x8016 -/* AD9590 800623F0 2652E610 */ addiu $s2, %lo(D_8015E610) # addiu $s2, $s2, -0x19f0 -/* AD9594 800623F4 26D6E61C */ addiu $s6, %lo(D_8015E61C) # addiu $s6, $s6, -0x19e4 -/* AD9598 800623F8 00008025 */ move $s0, $zero -/* AD959C 800623FC 24170001 */ li $s7, 1 -/* AD95A0 80062400 8FB50048 */ lw $s5, 0x48($sp) -/* AD95A4 80062404 8E6F001C */ lw $t7, 0x1c($s3) -.L80062408: -/* AD95A8 80062408 01F01021 */ addu $v0, $t7, $s0 -/* AD95AC 8006240C 90580017 */ lbu $t8, 0x17($v0) -/* AD95B0 80062410 33190001 */ andi $t9, $t8, 1 -/* AD95B4 80062414 57200005 */ bnezl $t9, .L8006242C -/* AD95B8 80062418 8E890000 */ lw $t1, ($s4) -/* AD95BC 8006241C 8E220018 */ lw $v0, 0x18($s1) -/* AD95C0 80062420 10000016 */ b .L8006247C -/* AD95C4 80062424 00021980 */ sll $v1, $v0, 6 -/* AD95C8 80062428 8E890000 */ lw $t1, ($s4) -.L8006242C: -/* AD95CC 8006242C 24440030 */ addiu $a0, $v0, 0x30 -/* AD95D0 80062430 02402825 */ move $a1, $s2 -/* AD95D4 80062434 AE490000 */ sw $t1, ($s2) -/* AD95D8 80062438 8E880004 */ lw $t0, 4($s4) -/* AD95DC 8006243C AE480004 */ sw $t0, 4($s2) -/* AD95E0 80062440 8E890008 */ lw $t1, 8($s4) -/* AD95E4 80062444 AE490008 */ sw $t1, 8($s2) -/* AD95E8 80062448 8EAB0000 */ lw $t3, ($s5) -/* AD95EC 8006244C AECB0000 */ sw $t3, ($s6) -/* AD95F0 80062450 8EAA0004 */ lw $t2, 4($s5) -/* AD95F4 80062454 AECA0004 */ sw $t2, 4($s6) -/* AD95F8 80062458 8EAB0008 */ lw $t3, 8($s5) -/* AD95FC 8006245C 0C033980 */ jal func_800CE600 -/* AD9600 80062460 AECB0008 */ sw $t3, 8($s6) -/* AD9604 80062464 54570004 */ bnel $v0, $s7, .L80062478 -/* AD9608 80062468 8E220018 */ lw $v0, 0x18($s1) -/* AD960C 8006246C 10000008 */ b .L80062490 -/* AD9610 80062470 24020001 */ li $v0, 1 -/* AD9614 80062474 8E220018 */ lw $v0, 0x18($s1) -.L80062478: -/* AD9618 80062478 00021980 */ sll $v1, $v0, 6 -.L8006247C: -/* AD961C 8006247C 26100040 */ addiu $s0, $s0, 0x40 -/* AD9620 80062480 0203082A */ slt $at, $s0, $v1 -/* AD9624 80062484 5420FFE0 */ bnezl $at, .L80062408 -/* AD9628 80062488 8E6F001C */ lw $t7, 0x1c($s3) -.L8006248C: -/* AD962C 8006248C 00001025 */ move $v0, $zero -.L80062490: -/* AD9630 80062490 8FBF0034 */ lw $ra, 0x34($sp) -/* AD9634 80062494 8FB00014 */ lw $s0, 0x14($sp) -/* AD9638 80062498 8FB10018 */ lw $s1, 0x18($sp) -/* AD963C 8006249C 8FB2001C */ lw $s2, 0x1c($sp) -/* AD9640 800624A0 8FB30020 */ lw $s3, 0x20($sp) -/* AD9644 800624A4 8FB40024 */ lw $s4, 0x24($sp) -/* AD9648 800624A8 8FB50028 */ lw $s5, 0x28($sp) -/* AD964C 800624AC 8FB6002C */ lw $s6, 0x2c($sp) -/* AD9650 800624B0 8FB70030 */ lw $s7, 0x30($sp) -/* AD9654 800624B4 03E00008 */ jr $ra -/* AD9658 800624B8 27BD0038 */ addiu $sp, $sp, 0x38 - -/* AD965C 800624BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD9660 800624C0 AFBF001C */ sw $ra, 0x1c($sp) -/* AD9664 800624C4 AFA40020 */ sw $a0, 0x20($sp) -/* AD9668 800624C8 AFA50024 */ sw $a1, 0x24($sp) -/* AD966C 800624CC AFA60028 */ sw $a2, 0x28($sp) -/* AD9670 800624D0 90CF002F */ lbu $t7, 0x2f($a2) -/* AD9674 800624D4 8FA40028 */ lw $a0, 0x28($sp) -/* AD9678 800624D8 00E02825 */ move $a1, $a3 -/* AD967C 800624DC 31F80001 */ andi $t8, $t7, 1 -/* AD9680 800624E0 17000003 */ bnez $t8, .L800624F0 -/* AD9684 800624E4 24840040 */ addiu $a0, $a0, 0x40 -/* AD9688 800624E8 1000000D */ b .L80062520 -/* AD968C 800624EC 00001025 */ move $v0, $zero -.L800624F0: -/* AD9690 800624F0 3C198016 */ lui $t9, %hi(D_8015E638) # $t9, 0x8016 -/* AD9694 800624F4 2739E638 */ addiu $t9, %lo(D_8015E638) # addiu $t9, $t9, -0x19c8 -/* AD9698 800624F8 3C078016 */ lui $a3, %hi(D_8015E628) # $a3, 0x8016 -/* AD969C 800624FC 24E7E628 */ addiu $a3, %lo(D_8015E628) # addiu $a3, $a3, -0x19d8 -/* AD96A0 80062500 AFB90010 */ sw $t9, 0x10($sp) -/* AD96A4 80062504 0C033B83 */ jal func_800CEE0C -/* AD96A8 80062508 8FA60030 */ lw $a2, 0x30($sp) -/* AD96AC 8006250C 50400004 */ beql $v0, $zero, .L80062520 -/* AD96B0 80062510 00001025 */ move $v0, $zero -/* AD96B4 80062514 10000002 */ b .L80062520 -/* AD96B8 80062518 24020001 */ li $v0, 1 -/* AD96BC 8006251C 00001025 */ move $v0, $zero -.L80062520: -/* AD96C0 80062520 8FBF001C */ lw $ra, 0x1c($sp) -/* AD96C4 80062524 27BD0020 */ addiu $sp, $sp, 0x20 -/* AD96C8 80062528 03E00008 */ jr $ra -/* AD96CC 8006252C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_80062530.s b/asm/non_matchings/code/z_collision_check/func_80062530.s deleted file mode 100644 index abdc5bf8aa..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80062530.s +++ /dev/null @@ -1,114 +0,0 @@ -.rdata -glabel D_8013ACB8 - .asciz "CollisionCheck_generalLineOcCheck():未対応 %dタイプ\n" - # EUC-JP: 未対応 %dタイプ | %d's type is not supported - .balign 4 - -.text -glabel func_80062530 -/* AD96D0 80062530 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AD96D4 80062534 AFBF0044 */ sw $ra, 0x44($sp) -/* AD96D8 80062538 AFBE0040 */ sw $fp, 0x40($sp) -/* AD96DC 8006253C AFB7003C */ sw $s7, 0x3c($sp) -/* AD96E0 80062540 AFB60038 */ sw $s6, 0x38($sp) -/* AD96E4 80062544 AFB50034 */ sw $s5, 0x34($sp) -/* AD96E8 80062548 AFB40030 */ sw $s4, 0x30($sp) -/* AD96EC 8006254C AFB3002C */ sw $s3, 0x2c($sp) -/* AD96F0 80062550 AFB20028 */ sw $s2, 0x28($sp) -/* AD96F4 80062554 AFB10024 */ sw $s1, 0x24($sp) -/* AD96F8 80062558 AFB00020 */ sw $s0, 0x20($sp) -/* AD96FC 8006255C 8CAE01C0 */ lw $t6, 0x1c0($a1) -/* AD9700 80062560 24B101C4 */ addiu $s1, $a1, 0x1c4 -/* AD9704 80062564 00A09025 */ move $s2, $a1 -/* AD9708 80062568 000E7880 */ sll $t7, $t6, 2 -/* AD970C 8006256C 00AFC021 */ addu $t8, $a1, $t7 -/* AD9710 80062570 271901C4 */ addiu $t9, $t8, 0x1c4 -/* AD9714 80062574 0239082B */ sltu $at, $s1, $t9 -/* AD9718 80062578 0080B025 */ move $s6, $a0 -/* AD971C 8006257C 00C0B825 */ move $s7, $a2 -/* AD9720 80062580 00E0F025 */ move $fp, $a3 -/* AD9724 80062584 10200034 */ beqz $at, .L80062658 -/* AD9728 80062588 0000A025 */ move $s4, $zero -/* AD972C 8006258C 8FB50058 */ lw $s5, 0x58($sp) -/* AD9730 80062590 24130001 */ li $s3, 1 -/* AD9734 80062594 8FB0005C */ lw $s0, 0x5c($sp) -.L80062598: -/* AD9738 80062598 0C0186FD */ jal func_80061BF4 -/* AD973C 8006259C 8E240000 */ lw $a0, ($s1) -/* AD9740 800625A0 10530025 */ beq $v0, $s3, .L80062638 -/* AD9744 800625A4 00002825 */ move $a1, $zero -/* AD9748 800625A8 1A00000C */ blez $s0, .L800625DC -/* AD974C 800625AC 00001025 */ move $v0, $zero -/* AD9750 800625B0 8E280000 */ lw $t0, ($s1) -/* AD9754 800625B4 02A01825 */ move $v1, $s5 -/* AD9758 800625B8 8D040000 */ lw $a0, ($t0) -.L800625BC: -/* AD975C 800625BC 8C690000 */ lw $t1, ($v1) -/* AD9760 800625C0 24420001 */ addiu $v0, $v0, 1 -/* AD9764 800625C4 14890003 */ bne $a0, $t1, .L800625D4 -/* AD9768 800625C8 00000000 */ nop -/* AD976C 800625CC 10000003 */ b .L800625DC -/* AD9770 800625D0 02602825 */ move $a1, $s3 -.L800625D4: -/* AD9774 800625D4 1450FFF9 */ bne $v0, $s0, .L800625BC -/* AD9778 800625D8 24630004 */ addiu $v1, $v1, 4 -.L800625DC: -/* AD977C 800625DC 50B30017 */ beql $a1, $s3, .L8006263C -/* AD9780 800625E0 8E4B01C0 */ lw $t3, 0x1c0($s2) -/* AD9784 800625E4 8E260000 */ lw $a2, ($s1) -/* AD9788 800625E8 3C028012 */ lui $v0, %hi(D_8011E018) -/* AD978C 800625EC 02C02025 */ move $a0, $s6 -/* AD9790 800625F0 90C30015 */ lbu $v1, 0x15($a2) -/* AD9794 800625F4 02402825 */ move $a1, $s2 -/* AD9798 800625F8 02E03825 */ move $a3, $s7 -/* AD979C 800625FC 00035080 */ sll $t2, $v1, 2 -/* AD97A0 80062600 004A1021 */ addu $v0, $v0, $t2 -/* AD97A4 80062604 8C42E018 */ lw $v0, %lo(D_8011E018)($v0) -/* AD97A8 80062608 14400007 */ bnez $v0, .L80062628 -/* AD97AC 8006260C 00000000 */ nop -/* AD97B0 80062610 3C048014 */ lui $a0, %hi(D_8013ACB8) # $a0, 0x8014 -/* AD97B4 80062614 2484ACB8 */ addiu $a0, %lo(D_8013ACB8) # addiu $a0, $a0, -0x5348 -/* AD97B8 80062618 0C00084C */ jal osSyncPrintf -/* AD97BC 8006261C 00602825 */ move $a1, $v1 -/* AD97C0 80062620 10000006 */ b .L8006263C -/* AD97C4 80062624 8E4B01C0 */ lw $t3, 0x1c0($s2) -.L80062628: -/* AD97C8 80062628 0040F809 */ jalr $v0 -/* AD97CC 8006262C AFBE0010 */ sw $fp, 0x10($sp) -/* AD97D0 80062630 14400009 */ bnez $v0, .L80062658 -/* AD97D4 80062634 0040A025 */ move $s4, $v0 -.L80062638: -/* AD97D8 80062638 8E4B01C0 */ lw $t3, 0x1c0($s2) -.L8006263C: -/* AD97DC 8006263C 26310004 */ addiu $s1, $s1, 4 -/* AD97E0 80062640 000B6080 */ sll $t4, $t3, 2 -/* AD97E4 80062644 024C6821 */ addu $t5, $s2, $t4 -/* AD97E8 80062648 25AE01C4 */ addiu $t6, $t5, 0x1c4 -/* AD97EC 8006264C 022E082B */ sltu $at, $s1, $t6 -/* AD97F0 80062650 1420FFD1 */ bnez $at, .L80062598 -/* AD97F4 80062654 00000000 */ nop -.L80062658: -/* AD97F8 80062658 8FBF0044 */ lw $ra, 0x44($sp) -/* AD97FC 8006265C 02801025 */ move $v0, $s4 -/* AD9800 80062660 8FB40030 */ lw $s4, 0x30($sp) -/* AD9804 80062664 8FB00020 */ lw $s0, 0x20($sp) -/* AD9808 80062668 8FB10024 */ lw $s1, 0x24($sp) -/* AD980C 8006266C 8FB20028 */ lw $s2, 0x28($sp) -/* AD9810 80062670 8FB3002C */ lw $s3, 0x2c($sp) -/* AD9814 80062674 8FB50034 */ lw $s5, 0x34($sp) -/* AD9818 80062678 8FB60038 */ lw $s6, 0x38($sp) -/* AD981C 8006267C 8FB7003C */ lw $s7, 0x3c($sp) -/* AD9820 80062680 8FBE0040 */ lw $fp, 0x40($sp) -/* AD9824 80062684 03E00008 */ jr $ra -/* AD9828 80062688 27BD0048 */ addiu $sp, $sp, 0x48 - -/* AD982C 8006268C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD9830 80062690 AFBF001C */ sw $ra, 0x1c($sp) -/* AD9834 80062694 AFA00010 */ sw $zero, 0x10($sp) -/* AD9838 80062698 0C01894C */ jal func_80062530 -/* AD983C 8006269C AFA00014 */ sw $zero, 0x14($sp) -/* AD9840 800626A0 8FBF001C */ lw $ra, 0x1c($sp) -/* AD9844 800626A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* AD9848 800626A8 03E00008 */ jr $ra -/* AD984C 800626AC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_800626B0.s b/asm/non_matchings/code/z_collision_check/func_800626B0.s deleted file mode 100644 index 54df78d0d7..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_800626B0.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800626B0 -/* AD9850 800626B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD9854 800626B4 8FAE0030 */ lw $t6, 0x30($sp) -/* AD9858 800626B8 8FAF0034 */ lw $t7, 0x34($sp) -/* AD985C 800626BC AFBF001C */ sw $ra, 0x1c($sp) -/* AD9860 800626C0 AFAE0010 */ sw $t6, 0x10($sp) -/* AD9864 800626C4 0C01894C */ jal func_80062530 -/* AD9868 800626C8 AFAF0014 */ sw $t7, 0x14($sp) -/* AD986C 800626CC 8FBF001C */ lw $ra, 0x1c($sp) -/* AD9870 800626D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* AD9874 800626D4 03E00008 */ jr $ra -/* AD9878 800626D8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_800626DC.s b/asm/non_matchings/code/z_collision_check/func_800626DC.s deleted file mode 100644 index cc05f34b16..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_800626DC.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel ActorCollider_Cylinder_Update -/* AD987C 800626DC C4840024 */ lwc1 $f4, 0x24($a0) -/* AD9880 800626E0 4600218D */ trunc.w.s $f6, $f4 -/* AD9884 800626E4 440F3000 */ mfc1 $t7, $f6 -/* AD9888 800626E8 00000000 */ nop -/* AD988C 800626EC A4AF0046 */ sh $t7, 0x46($a1) -/* AD9890 800626F0 C4880028 */ lwc1 $f8, 0x28($a0) -/* AD9894 800626F4 4600428D */ trunc.w.s $f10, $f8 -/* AD9898 800626F8 44195000 */ mfc1 $t9, $f10 -/* AD989C 800626FC 00000000 */ nop -/* AD98A0 80062700 A4B90048 */ sh $t9, 0x48($a1) -/* AD98A4 80062704 C490002C */ lwc1 $f16, 0x2c($a0) -/* AD98A8 80062708 4600848D */ trunc.w.s $f18, $f16 -/* AD98AC 8006270C 44099000 */ mfc1 $t1, $f18 -/* AD98B0 80062710 03E00008 */ jr $ra -/* AD98B4 80062714 A4A9004A */ sh $t1, 0x4a($a1) - -glabel func_80062718 -/* AD98B8 80062718 84AE0000 */ lh $t6, ($a1) -/* AD98BC 8006271C A48E0046 */ sh $t6, 0x46($a0) -/* AD98C0 80062720 84AF0002 */ lh $t7, 2($a1) -/* AD98C4 80062724 A48F0048 */ sh $t7, 0x48($a0) -/* AD98C8 80062728 84B80004 */ lh $t8, 4($a1) -/* AD98CC 8006272C 03E00008 */ jr $ra -/* AD98D0 80062730 A498004A */ sh $t8, 0x4a($a0) - diff --git a/asm/non_matchings/code/z_collision_check/func_80062734.s b/asm/non_matchings/code/z_collision_check/func_80062734.s deleted file mode 100644 index 82ffc2089c..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80062734.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80062734 -/* AD98D4 80062734 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD98D8 80062738 AFBF0014 */ sw $ra, 0x14($sp) -/* AD98DC 8006273C AFA40020 */ sw $a0, 0x20($sp) -/* AD98E0 80062740 AFA50024 */ sw $a1, 0x24($sp) -/* AD98E4 80062744 AFA60028 */ sw $a2, 0x28($sp) -/* AD98E8 80062748 00E02825 */ move $a1, $a3 -/* AD98EC 8006274C 0C01DF90 */ jal Math_Vec3f_Copy -/* AD98F0 80062750 24840058 */ addiu $a0, $a0, 0x58 -/* AD98F4 80062754 8FA40020 */ lw $a0, 0x20($sp) -/* AD98F8 80062758 8FA50030 */ lw $a1, 0x30($sp) -/* AD98FC 8006275C 0C01DF90 */ jal Math_Vec3f_Copy -/* AD9900 80062760 24840064 */ addiu $a0, $a0, 0x64 -/* AD9904 80062764 8FA40020 */ lw $a0, 0x20($sp) -/* AD9908 80062768 8FA50024 */ lw $a1, 0x24($sp) -/* AD990C 8006276C 24840040 */ addiu $a0, $a0, 0x40 -/* AD9910 80062770 0C01DF90 */ jal Math_Vec3f_Copy -/* AD9914 80062774 AFA4001C */ sw $a0, 0x1c($sp) -/* AD9918 80062778 8FA40020 */ lw $a0, 0x20($sp) -/* AD991C 8006277C 8FA50028 */ lw $a1, 0x28($sp) -/* AD9920 80062780 0C01DF90 */ jal Math_Vec3f_Copy -/* AD9924 80062784 2484004C */ addiu $a0, $a0, 0x4c -/* AD9928 80062788 0C0173B7 */ jal func_8005CEDC -/* AD992C 8006278C 8FA4001C */ lw $a0, 0x1c($sp) -/* AD9930 80062790 8FBF0014 */ lw $ra, 0x14($sp) -/* AD9934 80062794 27BD0020 */ addiu $sp, $sp, 0x20 -/* AD9938 80062798 03E00008 */ jr $ra -/* AD993C 8006279C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_800627A0.s b/asm/non_matchings/code/z_collision_check/func_800627A0.s deleted file mode 100644 index d761c56779..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_800627A0.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_800627A0 -/* AD9940 800627A0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AD9944 800627A4 0005C880 */ sll $t9, $a1, 2 -/* AD9948 800627A8 AFBF002C */ sw $ra, 0x2c($sp) -/* AD994C 800627AC AFB00028 */ sw $s0, 0x28($sp) -/* AD9950 800627B0 AFA40048 */ sw $a0, 0x48($sp) -/* AD9954 800627B4 AFA5004C */ sw $a1, 0x4c($sp) -/* AD9958 800627B8 AFA60050 */ sw $a2, 0x50($sp) -/* AD995C 800627BC AFA70054 */ sw $a3, 0x54($sp) -/* AD9960 800627C0 0325C823 */ subu $t9, $t9, $a1 -/* AD9964 800627C4 8C8F001C */ lw $t7, 0x1c($a0) -/* AD9968 800627C8 0019C8C0 */ sll $t9, $t9, 3 -/* AD996C 800627CC 0325C823 */ subu $t9, $t9, $a1 -/* AD9970 800627D0 0019C880 */ sll $t9, $t9, 2 -/* AD9974 800627D4 01F98021 */ addu $s0, $t7, $t9 -/* AD9978 800627D8 26040028 */ addiu $a0, $s0, 0x28 -/* AD997C 800627DC 0C01DF90 */ jal Math_Vec3f_Copy -/* AD9980 800627E0 00C02825 */ move $a1, $a2 -/* AD9984 800627E4 26040034 */ addiu $a0, $s0, 0x34 -/* AD9988 800627E8 0C01DF90 */ jal Math_Vec3f_Copy -/* AD998C 800627EC 8FA50054 */ lw $a1, 0x54($sp) -/* AD9990 800627F0 26040040 */ addiu $a0, $s0, 0x40 -/* AD9994 800627F4 0C01DF90 */ jal Math_Vec3f_Copy -/* AD9998 800627F8 8FA50058 */ lw $a1, 0x58($sp) -/* AD999C 800627FC 27A8003C */ addiu $t0, $sp, 0x3c -/* AD99A0 80062800 27A90038 */ addiu $t1, $sp, 0x38 -/* AD99A4 80062804 27AA0034 */ addiu $t2, $sp, 0x34 -/* AD99A8 80062808 AFAA0018 */ sw $t2, 0x18($sp) -/* AD99AC 8006280C AFA90014 */ sw $t1, 0x14($sp) -/* AD99B0 80062810 AFA80010 */ sw $t0, 0x10($sp) -/* AD99B4 80062814 8FA40050 */ lw $a0, 0x50($sp) -/* AD99B8 80062818 8FA50054 */ lw $a1, 0x54($sp) -/* AD99BC 8006281C 8FA60058 */ lw $a2, 0x58($sp) -/* AD99C0 80062820 0C03322D */ jal func_800CC8B4 -/* AD99C4 80062824 27A70040 */ addiu $a3, $sp, 0x40 -/* AD99C8 80062828 C7A40040 */ lwc1 $f4, 0x40($sp) -/* AD99CC 8006282C E604004C */ swc1 $f4, 0x4c($s0) -/* AD99D0 80062830 C7A6003C */ lwc1 $f6, 0x3c($sp) -/* AD99D4 80062834 E6060050 */ swc1 $f6, 0x50($s0) -/* AD99D8 80062838 C7A80038 */ lwc1 $f8, 0x38($sp) -/* AD99DC 8006283C E6080054 */ swc1 $f8, 0x54($s0) -/* AD99E0 80062840 C7AA0034 */ lwc1 $f10, 0x34($sp) -/* AD99E4 80062844 E60A0058 */ swc1 $f10, 0x58($s0) -/* AD99E8 80062848 8FBF002C */ lw $ra, 0x2c($sp) -/* AD99EC 8006284C 8FB00028 */ lw $s0, 0x28($sp) -/* AD99F0 80062850 27BD0048 */ addiu $sp, $sp, 0x48 -/* AD99F4 80062854 03E00008 */ jr $ra -/* AD99F8 80062858 00000000 */ nop - -/* AD99FC 8006285C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD9A00 80062860 0006C880 */ sll $t9, $a2, 2 -/* AD9A04 80062864 AFBF0014 */ sw $ra, 0x14($sp) -/* AD9A08 80062868 AFA5001C */ sw $a1, 0x1c($sp) -/* AD9A0C 8006286C AFA60020 */ sw $a2, 0x20($sp) -/* AD9A10 80062870 0326C823 */ subu $t9, $t9, $a2 -/* AD9A14 80062874 8CAF001C */ lw $t7, 0x1c($a1) -/* AD9A18 80062878 0019C8C0 */ sll $t9, $t9, 3 -/* AD9A1C 8006287C 0326C823 */ subu $t9, $t9, $a2 -/* AD9A20 80062880 0019C880 */ sll $t9, $t9, 2 -/* AD9A24 80062884 01F91021 */ addu $v0, $t7, $t9 -/* AD9A28 80062888 24450028 */ addiu $a1, $v0, 0x28 -/* AD9A2C 8006288C 0C017182 */ jal func_8005C608 -/* AD9A30 80062890 00E03025 */ move $a2, $a3 -/* AD9A34 80062894 8FBF0014 */ lw $ra, 0x14($sp) -/* AD9A38 80062898 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD9A3C 8006289C 03E00008 */ jr $ra -/* AD9A40 800628A0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_80062CD4.s b/asm/non_matchings/code/z_collision_check/func_80062CD4.s deleted file mode 100644 index a26e16bf7a..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80062CD4.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80062CD4 -/* AD9E74 80062CD4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD9E78 80062CD8 AFBF001C */ sw $ra, 0x1c($sp) -/* AD9E7C 80062CDC AFA5002C */ sw $a1, 0x2c($sp) -/* AD9E80 80062CE0 C4A40000 */ lwc1 $f4, ($a1) -/* AD9E84 80062CE4 3C018012 */ lui $at, %hi(D_8011E02E) # $at, 0x8012 -/* AD9E88 80062CE8 3C188012 */ lui $t8, %hi(D_8011E028) # $t8, 0x8012 -/* AD9E8C 80062CEC 4600218D */ trunc.w.s $f6, $f4 -/* AD9E90 80062CF0 2718E028 */ addiu $t8, %lo(D_8011E028) # addiu $t8, $t8, -0x1fd8 -/* AD9E94 80062CF4 24090001 */ li $t1, 1 -/* AD9E98 80062CF8 24060003 */ li $a2, 3 -/* AD9E9C 80062CFC 440C3000 */ mfc1 $t4, $f6 -/* AD9EA0 80062D00 00003825 */ move $a3, $zero -/* AD9EA4 80062D04 A42CE02A */ sh $t4, %lo(D_8011E02A)($at) -/* AD9EA8 80062D08 C4A80004 */ lwc1 $f8, 4($a1) -/* AD9EAC 80062D0C 4600428D */ trunc.w.s $f10, $f8 -/* AD9EB0 80062D10 440F5000 */ mfc1 $t7, $f10 -/* AD9EB4 80062D14 00000000 */ nop -/* AD9EB8 80062D18 A42FE02C */ sh $t7, %lo(D_8011E02C)($at) -/* AD9EBC 80062D1C C4B00008 */ lwc1 $f16, 8($a1) -/* AD9EC0 80062D20 AFB80014 */ sw $t8, 0x14($sp) -/* AD9EC4 80062D24 AFA90010 */ sw $t1, 0x10($sp) -/* AD9EC8 80062D28 4600848D */ trunc.w.s $f18, $f16 -/* AD9ECC 80062D2C 27A50024 */ addiu $a1, $sp, 0x24 -/* AD9ED0 80062D30 440E9000 */ mfc1 $t6, $f18 -/* AD9ED4 80062D34 00000000 */ nop -/* AD9ED8 80062D38 A42EE02E */ sh $t6, %lo(D_8011E02E)($at) -/* AD9EDC 80062D3C 3C018012 */ lui $at, %hi(D_8011E05A) # $at, 0x8012 -/* AD9EE0 80062D40 A42CE056 */ sh $t4, %lo(D_8011E056)($at) -/* AD9EE4 80062D44 A42FE058 */ sh $t7, %lo(D_8011E058)($at) -/* AD9EE8 80062D48 0C009B35 */ jal Effect_Add -/* AD9EEC 80062D4C A42EE05A */ sh $t6, %lo(D_8011E05A)($at) -/* AD9EF0 80062D50 8FBF001C */ lw $ra, 0x1c($sp) -/* AD9EF4 80062D54 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD9EF8 80062D58 03E00008 */ jr $ra -/* AD9EFC 80062D5C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_80062D60.s b/asm/non_matchings/code/z_collision_check/func_80062D60.s deleted file mode 100644 index ad5a69bdaf..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80062D60.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80062D60 -/* AD9F00 80062D60 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD9F04 80062D64 AFBF001C */ sw $ra, 0x1c($sp) -/* AD9F08 80062D68 0C018B35 */ jal func_80062CD4 -/* AD9F0C 80062D6C 00000000 */ nop -/* AD9F10 80062D70 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD9F14 80062D74 3C0E8013 */ lui $t6, %hi(D_801333E8) # $t6, 0x8013 -/* AD9F18 80062D78 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD9F1C 80062D7C 25CE33E8 */ addiu $t6, %lo(D_801333E8) # addiu $t6, $t6, 0x33e8 -/* AD9F20 80062D80 3C058013 */ lui $a1, %hi(D_801333D4) # $a1, 0x8013 -/* AD9F24 80062D84 24A533D4 */ addiu $a1, %lo(D_801333D4) # addiu $a1, $a1, 0x33d4 -/* AD9F28 80062D88 AFAE0014 */ sw $t6, 0x14($sp) -/* AD9F2C 80062D8C AFA70010 */ sw $a3, 0x10($sp) -/* AD9F30 80062D90 24041808 */ li $a0, 6152 -/* AD9F34 80062D94 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD9F38 80062D98 24060004 */ li $a2, 4 -/* AD9F3C 80062D9C 8FBF001C */ lw $ra, 0x1c($sp) -/* AD9F40 80062DA0 27BD0020 */ addiu $sp, $sp, 0x20 -/* AD9F44 80062DA4 03E00008 */ jr $ra -/* AD9F48 80062DA8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_80062DAC.s b/asm/non_matchings/code/z_collision_check/func_80062DAC.s deleted file mode 100644 index bd84e0baf2..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80062DAC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80062DAC -/* AD9F4C 80062DAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AD9F50 80062DB0 AFBF001C */ sw $ra, 0x1c($sp) -/* AD9F54 80062DB4 0C018B35 */ jal func_80062CD4 -/* AD9F58 80062DB8 AFA60028 */ sw $a2, 0x28($sp) -/* AD9F5C 80062DBC 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* AD9F60 80062DC0 3C0E8013 */ lui $t6, %hi(D_801333E8) # $t6, 0x8013 -/* AD9F64 80062DC4 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* AD9F68 80062DC8 25CE33E8 */ addiu $t6, %lo(D_801333E8) # addiu $t6, $t6, 0x33e8 -/* AD9F6C 80062DCC AFAE0014 */ sw $t6, 0x14($sp) -/* AD9F70 80062DD0 AFA70010 */ sw $a3, 0x10($sp) -/* AD9F74 80062DD4 24041808 */ li $a0, 6152 -/* AD9F78 80062DD8 8FA50028 */ lw $a1, 0x28($sp) -/* AD9F7C 80062DDC 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* AD9F80 80062DE0 24060004 */ li $a2, 4 -/* AD9F84 80062DE4 8FBF001C */ lw $ra, 0x1c($sp) -/* AD9F88 80062DE8 27BD0020 */ addiu $sp, $sp, 0x20 -/* AD9F8C 80062DEC 03E00008 */ jr $ra -/* AD9F90 80062DF0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_80062DF4.s b/asm/non_matchings/code/z_collision_check/func_80062DF4.s deleted file mode 100644 index 4e4f9e07ab..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80062DF4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80062DF4 -/* AD9F94 80062DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD9F98 80062DF8 AFBF0014 */ sw $ra, 0x14($sp) -/* AD9F9C 80062DFC 0C018B58 */ jal func_80062D60 -/* AD9FA0 80062E00 00000000 */ nop -/* AD9FA4 80062E04 8FBF0014 */ lw $ra, 0x14($sp) -/* AD9FA8 80062E08 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD9FAC 80062E0C 03E00008 */ jr $ra -/* AD9FB0 80062E10 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_80062E14.s b/asm/non_matchings/code/z_collision_check/func_80062E14.s deleted file mode 100644 index 276b7641ad..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_80062E14.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80062E14 -/* AD9FB4 80062E14 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD9FB8 80062E18 AFBF001C */ sw $ra, 0x1c($sp) -/* AD9FBC 80062E1C AFA5002C */ sw $a1, 0x2c($sp) -/* AD9FC0 80062E20 AFA60030 */ sw $a2, 0x30($sp) -/* AD9FC4 80062E24 C4A40000 */ lwc1 $f4, ($a1) -/* AD9FC8 80062E28 3C018012 */ lui $at, %hi(D_8011E06E) # $at, 0x8012 -/* AD9FCC 80062E2C 3C188012 */ lui $t8, %hi(D_8011E068) # $t8, 0x8012 -/* AD9FD0 80062E30 4600218D */ trunc.w.s $f6, $f4 -/* AD9FD4 80062E34 2718E068 */ addiu $t8, %lo(D_8011E068) # addiu $t8, $t8, -0x1f98 -/* AD9FD8 80062E38 24090001 */ li $t1, 1 -/* AD9FDC 80062E3C 24060003 */ li $a2, 3 -/* AD9FE0 80062E40 440C3000 */ mfc1 $t4, $f6 -/* AD9FE4 80062E44 00003825 */ move $a3, $zero -/* AD9FE8 80062E48 A42CE06A */ sh $t4, %lo(D_8011E06A)($at) -/* AD9FEC 80062E4C C4A80004 */ lwc1 $f8, 4($a1) -/* AD9FF0 80062E50 4600428D */ trunc.w.s $f10, $f8 -/* AD9FF4 80062E54 440F5000 */ mfc1 $t7, $f10 -/* AD9FF8 80062E58 00000000 */ nop -/* AD9FFC 80062E5C A42FE06C */ sh $t7, %lo(D_8011E06C)($at) -/* ADA000 80062E60 C4B00008 */ lwc1 $f16, 8($a1) -/* ADA004 80062E64 AFB80014 */ sw $t8, 0x14($sp) -/* ADA008 80062E68 AFA90010 */ sw $t1, 0x10($sp) -/* ADA00C 80062E6C 4600848D */ trunc.w.s $f18, $f16 -/* ADA010 80062E70 27A50024 */ addiu $a1, $sp, 0x24 -/* ADA014 80062E74 440E9000 */ mfc1 $t6, $f18 -/* ADA018 80062E78 00000000 */ nop -/* ADA01C 80062E7C A42EE06E */ sh $t6, %lo(D_8011E06E)($at) -/* ADA020 80062E80 3C018012 */ lui $at, %hi(D_8011E09A) # $at, 0x8012 -/* ADA024 80062E84 A42CE096 */ sh $t4, %lo(D_8011E096)($at) -/* ADA028 80062E88 A42FE098 */ sh $t7, %lo(D_8011E098)($at) -/* ADA02C 80062E8C 0C009B35 */ jal Effect_Add -/* ADA030 80062E90 A42EE09A */ sh $t6, %lo(D_8011E09A)($at) -/* ADA034 80062E94 3C078013 */ lui $a3, %hi(D_801333E0) # $a3, 0x8013 -/* ADA038 80062E98 3C0B8013 */ lui $t3, %hi(D_801333E8) # $t3, 0x8013 -/* ADA03C 80062E9C 24E733E0 */ addiu $a3, %lo(D_801333E0) # addiu $a3, $a3, 0x33e0 -/* ADA040 80062EA0 256B33E8 */ addiu $t3, %lo(D_801333E8) # addiu $t3, $t3, 0x33e8 -/* ADA044 80062EA4 AFAB0014 */ sw $t3, 0x14($sp) -/* ADA048 80062EA8 AFA70010 */ sw $a3, 0x10($sp) -/* ADA04C 80062EAC 24041837 */ li $a0, 6199 -/* ADA050 80062EB0 8FA50030 */ lw $a1, 0x30($sp) -/* ADA054 80062EB4 0C03DCE3 */ jal Audio_PlaySoundGeneral -/* ADA058 80062EB8 24060004 */ li $a2, 4 -/* ADA05C 80062EBC 8FBF001C */ lw $ra, 0x1c($sp) -/* ADA060 80062EC0 27BD0028 */ addiu $sp, $sp, 0x28 -/* ADA064 80062EC4 03E00008 */ jr $ra -/* ADA068 80062EC8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_collision_check/func_80062ECC.s b/asm/non_matchings/code/z_collision_check/func_80062ECC.s index 60ecb75ca3..25add84ca1 100644 --- a/asm/non_matchings/code/z_collision_check/func_80062ECC.s +++ b/asm/non_matchings/code/z_collision_check/func_80062ECC.s @@ -491,4 +491,3 @@ glabel func_80062ECC .L800635C8: /* ADA768 800635C8 03E00008 */ jr $ra /* ADA76C 800635CC 27BD0078 */ addiu $sp, $sp, 0x78 - diff --git a/asm/non_matchings/code/z_collision_check/func_800635D0.s b/asm/non_matchings/code/z_collision_check/func_800635D0.s deleted file mode 100644 index 018afcacc3..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_800635D0.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_800635D0 -/* ADA770 800635D0 3C010040 */ lui $at, (0x00400100 >> 16) # lui $at, 0x40 -/* ADA774 800635D4 34210100 */ ori $at, (0x00400100 & 0xFFFF) # ori $at, $at, 0x100 -/* ADA778 800635D8 00817024 */ and $t6, $a0, $at -/* ADA77C 800635DC 11C00003 */ beqz $t6, .L800635EC -/* ADA780 800635E0 00001825 */ move $v1, $zero -/* ADA784 800635E4 10000011 */ b .L8006362C -/* ADA788 800635E8 24030001 */ li $v1, 1 -.L800635EC: -/* ADA78C 800635EC 3C010300 */ lui $at, (0x03000242 >> 16) # lui $at, 0x300 -/* ADA790 800635F0 34210242 */ ori $at, (0x03000242 & 0xFFFF) # ori $at, $at, 0x242 -/* ADA794 800635F4 00817824 */ and $t7, $a0, $at -/* ADA798 800635F8 11E00003 */ beqz $t7, .L80063608 -/* ADA79C 800635FC 3C014880 */ lui $at, (0x48800400 >> 16) # lui $at, 0x4880 -/* ADA7A0 80063600 1000000A */ b .L8006362C -/* ADA7A4 80063604 24030002 */ li $v1, 2 -.L80063608: -/* ADA7A8 80063608 34210400 */ ori $at, (0x48800400 & 0xFFFF) # ori $at, $at, 0x400 -/* ADA7AC 8006360C 0081C024 */ and $t8, $a0, $at -/* ADA7B0 80063610 13000003 */ beqz $t8, .L80063620 -/* ADA7B4 80063614 0004C940 */ sll $t9, $a0, 5 -/* ADA7B8 80063618 10000004 */ b .L8006362C -/* ADA7BC 8006361C 24030004 */ li $v1, 4 -.L80063620: -/* ADA7C0 80063620 07210002 */ bgez $t9, .L8006362C -/* ADA7C4 80063624 00000000 */ nop -/* ADA7C8 80063628 24030008 */ li $v1, 8 -.L8006362C: -/* ADA7CC 8006362C 3C088016 */ lui $t0, %hi(gGameInfo) # $t0, 0x8016 -/* ADA7D0 80063630 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* ADA7D4 80063634 00601025 */ move $v0, $v1 -/* ADA7D8 80063638 03E00008 */ jr $ra -/* ADA7DC 8006363C A50309E2 */ sh $v1, 0x9e2($t0) - diff --git a/asm/non_matchings/code/z_en_a_keep/En_A_Obj_Init.s b/asm/non_matchings/code/z_en_a_keep/En_A_Obj_Init.s index c3639e3c22..d8758fffc3 100644 --- a/asm/non_matchings/code/z_en_a_keep/En_A_Obj_Init.s +++ b/asm/non_matchings/code/z_en_a_keep/En_A_Obj_Init.s @@ -191,13 +191,13 @@ glabel L8001D08C /* A94268 8001D0C8 E6060178 */ swc1 $f6, 0x178($s0) /* A9426C 8001D0CC 2605017C */ addiu $a1, $s0, 0x17c /* A94270 8001D0D0 AFA50024 */ sw $a1, 0x24($sp) -/* A94274 8001D0D4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* A94274 8001D0D4 0C0170D9 */ jal Collider_InitCylinder /* A94278 8001D0D8 8FA4003C */ lw $a0, 0x3c($sp) /* A9427C 8001D0DC 3C078011 */ lui $a3, %hi(D_80115440) # $a3, 0x8011 /* A94280 8001D0E0 8FA50024 */ lw $a1, 0x24($sp) /* A94284 8001D0E4 24E75440 */ addiu $a3, %lo(D_80115440) # addiu $a3, $a3, 0x5440 /* A94288 8001D0E8 8FA4003C */ lw $a0, 0x3c($sp) -/* A9428C 8001D0EC 0C01712B */ jal ActorCollider_InitCylinder +/* A9428C 8001D0EC 0C01712B */ jal Collider_SetCylinder /* A94290 8001D0F0 02003025 */ move $a2, $s0 /* A94294 8001D0F4 240E00FF */ li $t6, 255 /* A94298 8001D0F8 A20E00AE */ sb $t6, 0xae($s0) diff --git a/asm/non_matchings/code/z_en_item00/En_Item00_Init.s b/asm/non_matchings/code/z_en_item00/En_Item00_Init.s index d9cae6562c..1b6a3c35e8 100644 --- a/asm/non_matchings/code/z_en_item00/En_Item00_Init.s +++ b/asm/non_matchings/code/z_en_item00/En_Item00_Init.s @@ -154,13 +154,13 @@ glabel En_Item00_Init /* A94B5C 8001D9BC E7A20034 */ swc1 $f2, 0x34($sp) /* A94B60 8001D9C0 26050160 */ addiu $a1, $s0, 0x160 /* A94B64 8001D9C4 AFA50020 */ sw $a1, 0x20($sp) -/* A94B68 8001D9C8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* A94B68 8001D9C8 0C0170D9 */ jal Collider_InitCylinder /* A94B6C 8001D9CC 8FA40044 */ lw $a0, 0x44($sp) /* A94B70 8001D9D0 3C078011 */ lui $a3, %hi(D_801154E0) # $a3, 0x8011 /* A94B74 8001D9D4 8FA50020 */ lw $a1, 0x20($sp) /* A94B78 8001D9D8 24E754E0 */ addiu $a3, %lo(D_801154E0) # addiu $a3, $a3, 0x54e0 /* A94B7C 8001D9DC 8FA40044 */ lw $a0, 0x44($sp) -/* A94B80 8001D9E0 0C01712B */ jal ActorCollider_InitCylinder +/* A94B80 8001D9E0 0C01712B */ jal Collider_SetCylinder /* A94B84 8001D9E4 02003025 */ move $a2, $s0 /* A94B88 8001D9E8 9609001C */ lhu $t1, 0x1c($s0) /* A94B8C 8001D9EC C7A20034 */ lwc1 $f2, 0x34($sp) diff --git a/asm/non_matchings/code/z_en_item00/En_Item00_Update.s b/asm/non_matchings/code/z_en_item00/En_Item00_Update.s index b59319cc8f..1919f8d2a5 100644 --- a/asm/non_matchings/code/z_en_item00/En_Item00_Update.s +++ b/asm/non_matchings/code/z_en_item00/En_Item00_Update.s @@ -212,13 +212,13 @@ glabel En_Item00_Update .L8001E958: /* A95AF8 8001E958 00C02825 */ move $a1, $a2 /* A95AFC 8001E95C AFA60028 */ sw $a2, 0x28($sp) -/* A95B00 8001E960 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* A95B00 8001E960 0C0189B7 */ jal Collider_CylinderUpdate /* A95B04 8001E964 02002025 */ move $a0, $s0 /* A95B08 8001E968 3C010001 */ li $at, 0x00010000 # 0.000000 /* A95B0C 8001E96C 34211E60 */ ori $at, (0x00011E60 & 0xFFFF) # ori $at, $at, 0x1e60 /* A95B10 8001E970 8FA60028 */ lw $a2, 0x28($sp) /* A95B14 8001E974 02212821 */ addu $a1, $s1, $at -/* A95B18 8001E978 0C01767D */ jal Actor_CollisionCheck_SetAC +/* A95B18 8001E978 0C01767D */ jal CollisionCheck_SetAC /* A95B1C 8001E97C 02202025 */ move $a0, $s1 /* A95B20 8001E980 8603001C */ lh $v1, 0x1c($s0) /* A95B24 8001E984 24010015 */ li $at, 21 diff --git a/asm/non_matchings/code/z_play/Gameplay_Update.s b/asm/non_matchings/code/z_play/Gameplay_Update.s index 3ed5dc5a86..80a1b35057 100644 --- a/asm/non_matchings/code/z_play/Gameplay_Update.s +++ b/asm/non_matchings/code/z_play/Gameplay_Update.s @@ -1604,7 +1604,7 @@ glabel L800BE148 /* B35664 800BE4C4 24050001 */ li $a1, 1 .L800BE4C8: /* B35668 800BE4C8 02002025 */ move $a0, $s0 -/* B3566C 800BE4CC 0C018726 */ jal func_80061C98 +/* B3566C 800BE4CC 0C018726 */ jal CollisionCheck_OC /* B35670 800BE4D0 8FA50038 */ lw $a1, 0x38($sp) /* B35674 800BE4D4 3C198016 */ lui $t9, %hi(gGameInfo) # $t9, 0x8016 /* B35678 800BE4D8 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) @@ -1636,7 +1636,7 @@ glabel L800BE148 /* B356DC 800BE53C 24050001 */ li $a1, 1 .L800BE540: /* B356E0 800BE540 02002025 */ move $a0, $s0 -/* B356E4 800BE544 0C017503 */ jal func_8005D40C +/* B356E4 800BE544 0C017503 */ jal CollisionCheck_InitContext /* B356E8 800BE548 8FA50038 */ lw $a1, 0x38($sp) /* B356EC 800BE54C 3C0D8016 */ lui $t5, %hi(gGameInfo) # $t5, 0x8016 /* B356F0 800BE550 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) diff --git a/asm/non_matchings/code/z_player_lib/func_80090480.s b/asm/non_matchings/code/z_player_lib/func_80090480.s index 6f0a2b8073..feb7e1ae39 100644 --- a/asm/non_matchings/code/z_player_lib/func_80090480.s +++ b/asm/non_matchings/code/z_player_lib/func_80090480.s @@ -12,7 +12,7 @@ glabel func_80090480 /* B07648 800904A8 8FB80034 */ lw $t8, 0x34($sp) /* B0764C 800904AC 50A00004 */ beql $a1, $zero, .L800904C0 /* B07650 800904B0 26040004 */ addiu $a0, $s0, 4 -/* B07654 800904B4 0C017458 */ jal func_8005D160 +/* B07654 800904B4 0C017458 */ jal Collider_QuadSetAT /* B07658 800904B8 00000000 */ nop /* B0765C 800904BC 26040004 */ addiu $a0, $s0, 4 .L800904C0: @@ -65,7 +65,7 @@ glabel func_80090480 /* B07714 80090574 00000000 */ nop /* B07718 80090578 12200003 */ beqz $s1, .L80090588 /* B0771C 8009057C 8FA40028 */ lw $a0, 0x28($sp) -/* B07720 80090580 0C017458 */ jal func_8005D160 +/* B07720 80090580 0C017458 */ jal Collider_QuadSetAT /* B07724 80090584 02202825 */ move $a1, $s1 .L80090588: /* B07728 80090588 10000019 */ b .L800905F0 @@ -83,7 +83,7 @@ glabel func_80090480 /* B07754 800905B4 3C010001 */ lui $at, (0x00011E60 >> 16) # lui $at, 1 /* B07758 800905B8 34211E60 */ ori $at, (0x00011E60 & 0xFFFF) # ori $at, $at, 0x1e60 /* B0775C 800905BC 02203025 */ move $a2, $s1 -/* B07760 800905C0 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* B07760 800905C0 0C0175E7 */ jal CollisionCheck_SetAT /* B07764 800905C4 00812821 */ addu $a1, $a0, $at /* B07768 800905C8 8FA50038 */ lw $a1, 0x38($sp) .L800905CC: diff --git a/asm/non_matchings/code/z_player_lib/func_80090604.s b/asm/non_matchings/code/z_player_lib/func_80090604.s index 014e38ffd7..98f94ee4a5 100644 --- a/asm/non_matchings/code/z_player_lib/func_80090604.s +++ b/asm/non_matchings/code/z_player_lib/func_80090604.s @@ -41,11 +41,11 @@ glabel func_80090604 /* B07840 800906A0 34211E60 */ ori $at, (0x00011E60 & 0xFFFF) # ori $at, $at, 0x1e60 /* B07844 800906A4 00812821 */ addu $a1, $a0, $at /* B07848 800906A8 AFA50024 */ sw $a1, 0x24($sp) -/* B0784C 800906AC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* B0784C 800906AC 0C01767D */ jal CollisionCheck_SetAC /* B07850 800906B0 8FA60060 */ lw $a2, 0x60($sp) /* B07854 800906B4 8FA50024 */ lw $a1, 0x24($sp) /* B07858 800906B8 8FA40058 */ lw $a0, 0x58($sp) -/* B0785C 800906BC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* B0785C 800906BC 0C0175E7 */ jal CollisionCheck_SetAT /* B07860 800906C0 8FA60060 */ lw $a2, 0x60($sp) /* B07864 800906C4 8FBF001C */ lw $ra, 0x1c($sp) .L800906C8: diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Destroy.s index 4a79459344..53b1d560d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Destroy.s @@ -11,7 +11,7 @@ glabel ArmsHook_Destroy /* 000A4 80864FA4 01C17824 */ and $t7, $t6, $at /* 000A8 80864FA8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 .L80864FAC: -/* 000AC 80864FAC 0C017418 */ jal func_8005D060 +/* 000AC 80864FAC 0C017418 */ jal Collider_DestroyQuad /* 000B0 80864FB0 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 000B4 80864FB4 8FBF0014 */ lw $ra, 0x0014($sp) /* 000B8 80864FB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Init.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Init.s index e294000e73..a101fe2063 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Init.s @@ -6,13 +6,13 @@ glabel ArmsHook_Init /* 00018 80864F18 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0001C 80864F1C AFBF001C */ sw $ra, 0x001C($sp) /* 00020 80864F20 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00024 80864F24 0C017406 */ jal func_8005D018 +/* 00024 80864F24 0C017406 */ jal Collider_InitQuad /* 00028 80864F28 AFA50020 */ sw $a1, 0x0020($sp) /* 0002C 80864F2C 3C078086 */ lui $a3, %hi(D_80865B00) ## $a3 = 80860000 /* 00030 80864F30 8FA50020 */ lw $a1, 0x0020($sp) /* 00034 80864F34 24E75B00 */ addiu $a3, $a3, %lo(D_80865B00) ## $a3 = 80865B00 /* 00038 80864F38 8FA4002C */ lw $a0, 0x002C($sp) -/* 0003C 80864F3C 0C017441 */ jal func_8005D104 +/* 0003C 80864F3C 0C017441 */ jal Collider_SetQuad /* 00040 80864F40 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00044 80864F44 3C058086 */ lui $a1, %hi(func_80864FC4) ## $a1 = 80860000 /* 00048 80864F48 24A54FC4 */ addiu $a1, $a1, %lo(func_80864FC4) ## $a1 = 80864FC4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s index c234949605..5a44507fb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Init.s @@ -59,7 +59,7 @@ glabel BgBombwall_Init /* 00180 8086E950 02E02825 */ or $a1, $s7, $zero ## $a1 = 00000164 /* 00184 8086E954 35CF0002 */ ori $t7, $t6, 0x0002 ## $t7 = 00000002 /* 00188 8086E958 A26F02A2 */ sb $t7, 0x02A2($s3) ## 000002A2 -/* 0018C 8086E95C 0C0171F8 */ jal func_8005C7E0 +/* 0018C 8086E95C 0C0171F8 */ jal Collider_InitTris /* 00190 8086E960 8FA400BC */ lw $a0, 0x00BC($sp) /* 00194 8086E964 3C148087 */ lui $s4, %hi(D_8086EFD4) ## $s4 = 80870000 /* 00198 8086E968 2694EFD4 */ addiu $s4, $s4, %lo(D_8086EFD4) ## $s4 = 8086EFD4 @@ -68,7 +68,7 @@ glabel BgBombwall_Init /* 001A4 8086E974 02803825 */ or $a3, $s4, $zero ## $a3 = 8086EFD4 /* 001A8 8086E978 8FA400BC */ lw $a0, 0x00BC($sp) /* 001AC 8086E97C 02E02825 */ or $a1, $s7, $zero ## $a1 = 00000164 -/* 001B0 8086E980 0C0172EB */ jal func_8005CBAC +/* 001B0 8086E980 0C0172EB */ jal Collider_SetTris /* 001B4 8086E984 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 001B8 8086E988 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 001BC 8086E98C 4481A000 */ mtc1 $at, $f20 ## $f20 = 2.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EAC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EAC0.s index 57283a2099..a6850805c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EAC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086EAC0.s @@ -22,7 +22,7 @@ glabel func_8086EAC0 /* 00338 8086EB08 11000008 */ beq $t0, $zero, .L8086EB2C /* 0033C 8086EB0C 8FA4001C */ lw $a0, 0x001C($sp) /* 00340 8086EB10 24E50164 */ addiu $a1, $a3, 0x0164 ## $a1 = 00000164 -/* 00344 8086EB14 0C017232 */ jal func_8005C8C8 +/* 00344 8086EB14 0C017232 */ jal Collider_DestroyTris /* 00348 8086EB18 AFA70018 */ sw $a3, 0x0018($sp) /* 0034C 8086EB1C 8FA70018 */ lw $a3, 0x0018($sp) /* 00350 8086EB20 90E902A2 */ lbu $t1, 0x02A2($a3) ## 000002A2 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED70.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED70.s index 43f75a9f07..26e7f4199e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED70.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/func_8086ED70.s @@ -30,7 +30,7 @@ glabel func_8086ED70 /* 00608 8086EDD8 00812821 */ addu $a1, $a0, $at /* 0060C 8086EDDC 45020004 */ bc1fl .L8086EDF0 /* 00610 8086EDE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00614 8086EDE4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00614 8086EDE4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00618 8086EDE8 24E60164 */ addiu $a2, $a3, 0x0164 ## $a2 = 00000164 /* 0061C 8086EDEC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Init.s index c1354f3bf9..c9eda1cde5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/BgBreakwall_Init.s @@ -62,13 +62,13 @@ glabel BgBreakwall_Init /* 000DC 8086FCBC 00000000 */ nop /* 000E0 8086FCC0 2605016C */ addiu $a1, $s0, 0x016C ## $a1 = 0000016C /* 000E4 8086FCC4 AFA50024 */ sw $a1, 0x0024($sp) -/* 000E8 8086FCC8 0C017406 */ jal func_8005D018 +/* 000E8 8086FCC8 0C017406 */ jal Collider_InitQuad /* 000EC 8086FCCC 8FA4003C */ lw $a0, 0x003C($sp) /* 000F0 8086FCD0 3C078087 */ lui $a3, %hi(D_80870760) ## $a3 = 80870000 /* 000F4 8086FCD4 8FA50024 */ lw $a1, 0x0024($sp) /* 000F8 8086FCD8 24E70760 */ addiu $a3, $a3, %lo(D_80870760) ## $a3 = 80870760 /* 000FC 8086FCDC 8FA4003C */ lw $a0, 0x003C($sp) -/* 00100 8086FCE0 0C017441 */ jal func_8005D104 +/* 00100 8086FCE0 0C017441 */ jal Collider_SetQuad /* 00104 8086FCE4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00108 8086FCE8 10000006 */ beq $zero, $zero, .L8086FD04 /* 0010C 8086FCEC 8FA20028 */ lw $v0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s index 71728daff3..41617cdf21 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s @@ -86,7 +86,7 @@ glabel func_808705D8 /* 00B0C 808706EC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00B10 808706F0 02A12821 */ addu $a1, $s5, $at /* 00B14 808706F4 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 00B18 808706F8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00B18 808706F8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00B1C 808706FC 02003025 */ or $a2, $s0, $zero ## $a2 = 0000016C .L80870700: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Destroy.s index 882c100847..ccc46deca0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Destroy.s @@ -12,7 +12,7 @@ glabel BgDdanKd_Destroy /* 00120 80871210 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 00124 80871214 8FA50018 */ lw $a1, 0x0018($sp) /* 00128 80871218 8FA4001C */ lw $a0, 0x001C($sp) -/* 0012C 8087121C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0012C 8087121C 0C0170EB */ jal Collider_DestroyCylinder /* 00130 80871220 24A50178 */ addiu $a1, $a1, 0x0178 ## $a1 = 00000178 /* 00134 80871224 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Init.s index 03ad58232e..aff4dd8d7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Init.s @@ -17,14 +17,14 @@ glabel BgDdanKd_Init /* 0003C 8087112C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00040 80871130 26050178 */ addiu $a1, $s0, 0x0178 ## $a1 = 00000178 /* 00044 80871134 AFA50020 */ sw $a1, 0x0020($sp) -/* 00048 80871138 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00048 80871138 0C0170D9 */ jal Collider_InitCylinder /* 0004C 8087113C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00050 80871140 3C078087 */ lui $a3, %hi(D_808718C0) ## $a3 = 80870000 /* 00054 80871144 8FA50020 */ lw $a1, 0x0020($sp) /* 00058 80871148 24E718C0 */ addiu $a3, $a3, %lo(D_808718C0) ## $a3 = 808718C0 /* 0005C 8087114C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00060 80871150 0C01712B */ jal ActorCollider_InitCylinder +/* 00060 80871150 0C01712B */ jal Collider_SetCylinder /* 00064 80871154 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00068 80871158 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871234.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871234.s index 6187c874a4..4b967fe8ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871234.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/func_80871234.s @@ -75,14 +75,14 @@ glabel func_80871234 /* 00238 80871328 8C68002C */ lw $t0, 0x002C($v1) ## 0000002C /* 0023C 8087132C AE080174 */ sw $t0, 0x0174($s0) ## 00000174 .L80871330: -/* 00240 80871330 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00240 80871330 0C0189B7 */ jal Collider_CylinderUpdate /* 00244 80871334 8FA50028 */ lw $a1, 0x0028($sp) /* 00248 80871338 8FA40034 */ lw $a0, 0x0034($sp) /* 0024C 8087133C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00250 80871340 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00254 80871344 8FA60028 */ lw $a2, 0x0028($sp) -/* 00258 80871348 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00258 80871348 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0025C 8087134C 00812821 */ addu $a1, $a0, $at /* 00260 80871350 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Destroy.s index 5f0546e8ae..6c92e6c73e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Destroy.s @@ -12,17 +12,17 @@ glabel BgDodoago_Destroy /* 002AC 80871CAC 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C /* 002B0 80871CB0 8FA50020 */ lw $a1, 0x0020($sp) /* 002B4 80871CB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002B8 80871CB8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002B8 80871CB8 0C0170EB */ jal Collider_DestroyCylinder /* 002BC 80871CBC 24A50168 */ addiu $a1, $a1, 0x0168 ## $a1 = 00000168 /* 002C0 80871CC0 8FA50020 */ lw $a1, 0x0020($sp) /* 002C4 80871CC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002C8 80871CC8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002C8 80871CC8 0C0170EB */ jal Collider_DestroyCylinder /* 002CC 80871CCC 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 /* 002D0 80871CD0 8FA50020 */ lw $a1, 0x0020($sp) /* 002D4 80871CD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002D8 80871CD8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002D8 80871CD8 0C0170EB */ jal Collider_DestroyCylinder /* 002DC 80871CDC 24A50200 */ addiu $a1, $a1, 0x0200 ## $a1 = 00000200 /* 002E0 80871CE0 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Init.s index ef85405bb1..a26e628ef0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Init.s @@ -55,38 +55,38 @@ glabel BgDodoago_Init /* 001E4 80871BE4 A4581D30 */ sh $t8, 0x1D30($v0) ## 00001D30 .L80871BE8: /* 001E8 80871BE8 26050168 */ addiu $a1, $s0, 0x0168 ## $a1 = 00000168 -/* 001EC 80871BEC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 001EC 80871BEC 0C0170D9 */ jal Collider_InitCylinder /* 001F0 80871BF0 AFA50020 */ sw $a1, 0x0020($sp) /* 001F4 80871BF4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 001F8 80871BF8 AFA50024 */ sw $a1, 0x0024($sp) -/* 001FC 80871BFC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 001FC 80871BFC 0C0170D9 */ jal Collider_InitCylinder /* 00200 80871C00 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00204 80871C04 26050200 */ addiu $a1, $s0, 0x0200 ## $a1 = 00000200 /* 00208 80871C08 AFA50028 */ sw $a1, 0x0028($sp) -/* 0020C 80871C0C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0020C 80871C0C 0C0170D9 */ jal Collider_InitCylinder /* 00210 80871C10 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00214 80871C14 3C078087 */ lui $a3, %hi(D_80872540) ## $a3 = 80870000 /* 00218 80871C18 24E72540 */ addiu $a3, $a3, %lo(D_80872540) ## $a3 = 80872540 /* 0021C 80871C1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00220 80871C20 8FA50020 */ lw $a1, 0x0020($sp) -/* 00224 80871C24 0C01712B */ jal ActorCollider_InitCylinder +/* 00224 80871C24 0C01712B */ jal Collider_SetCylinder /* 00228 80871C28 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0022C 80871C2C 3C078087 */ lui $a3, %hi(D_8087256C) ## $a3 = 80870000 /* 00230 80871C30 24E7256C */ addiu $a3, $a3, %lo(D_8087256C) ## $a3 = 8087256C /* 00234 80871C34 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00238 80871C38 8FA50024 */ lw $a1, 0x0024($sp) -/* 0023C 80871C3C 0C01712B */ jal ActorCollider_InitCylinder +/* 0023C 80871C3C 0C01712B */ jal Collider_SetCylinder /* 00240 80871C40 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00244 80871C44 3C078087 */ lui $a3, %hi(D_8087256C) ## $a3 = 80870000 /* 00248 80871C48 24E7256C */ addiu $a3, $a3, %lo(D_8087256C) ## $a3 = 8087256C /* 0024C 80871C4C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00250 80871C50 8FA50028 */ lw $a1, 0x0028($sp) -/* 00254 80871C54 0C01712B */ jal ActorCollider_InitCylinder +/* 00254 80871C54 0C01712B */ jal Collider_SetCylinder /* 00258 80871C58 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0025C 80871C5C 3C058087 */ lui $a1, %hi(func_80871CF4) ## $a1 = 80870000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s index f5ec5b88b5..b226783474 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/func_80871CF4.s @@ -145,17 +145,17 @@ glabel func_80871CF4 /* 004F4 80871EF4 240400B0 */ addiu $a0, $zero, 0x00B0 ## $a0 = 000000B0 /* 004F8 80871EF8 1040002A */ beq $v0, $zero, .L80871FA4 /* 004FC 80871EFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00500 80871F00 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00500 80871F00 0C0189B7 */ jal Collider_CylinderUpdate /* 00504 80871F04 8FA50038 */ lw $a1, 0x0038($sp) /* 00508 80871F08 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 0050C 80871F0C AFA50034 */ sw $a1, 0x0034($sp) -/* 00510 80871F10 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00510 80871F10 0C0189B7 */ jal Collider_CylinderUpdate /* 00514 80871F14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00518 80871F18 26050200 */ addiu $a1, $s0, 0x0200 ## $a1 = 00000200 /* 0051C 80871F1C AFA50030 */ sw $a1, 0x0030($sp) -/* 00520 80871F20 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00520 80871F20 0C0189B7 */ jal Collider_CylinderUpdate /* 00524 80871F24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00528 80871F28 860C01B2 */ lh $t4, 0x01B2($s0) ## 000001B2 @@ -178,18 +178,18 @@ glabel func_80871CF4 /* 0056C 80871F6C 02212821 */ addu $a1, $s1, $at /* 00570 80871F70 AFA5002C */ sw $a1, 0x002C($sp) /* 00574 80871F74 8FA60038 */ lw $a2, 0x0038($sp) -/* 00578 80871F78 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00578 80871F78 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0057C 80871F7C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00580 80871F80 8FB0002C */ lw $s0, 0x002C($sp) /* 00584 80871F84 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00588 80871F88 8FA60034 */ lw $a2, 0x0034($sp) -/* 0058C 80871F8C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0058C 80871F8C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00590 80871F90 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00594 80871F94 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00598 80871F98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0059C 80871F9C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0059C 80871F9C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 005A0 80871FA0 8FA60030 */ lw $a2, 0x0030($sp) .L80871FA4: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Destroy.s index bc4f73b53e..bd53b6f2b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Destroy.s @@ -7,7 +7,7 @@ glabel BgGndSoulmeiro_Destroy /* 00154 8087AF14 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 /* 00158 8087AF18 55E00004 */ bnel $t7, $zero, .L8087AF2C /* 0015C 8087AF1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00160 8087AF20 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00160 8087AF20 0C0170EB */ jal Collider_DestroyCylinder /* 00164 8087AF24 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 00168 8087AF28 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Init.s index d832de72af..f845cf73c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Init.s @@ -24,14 +24,14 @@ glabel BgGndSoulmeiro_Init /* 00054 8087AE14 10000036 */ beq $zero, $zero, .L8087AEF0 /* 00058 8087AE18 8FBF0034 */ lw $ra, 0x0034($sp) .L8087AE1C: -/* 0005C 8087AE1C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0005C 8087AE1C 0C0170D9 */ jal Collider_InitCylinder /* 00060 8087AE20 AFA50038 */ sw $a1, 0x0038($sp) /* 00064 8087AE24 3C078088 */ lui $a3, %hi(D_8087B530) ## $a3 = 80880000 /* 00068 8087AE28 8FA50038 */ lw $a1, 0x0038($sp) /* 0006C 8087AE2C 24E7B530 */ addiu $a3, $a3, %lo(D_8087B530) ## $a3 = 8087B530 /* 00070 8087AE30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00074 8087AE34 0C01712B */ jal ActorCollider_InitCylinder +/* 00074 8087AE34 0C01712B */ jal Collider_SetCylinder /* 00078 8087AE38 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0007C 8087AE3C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B284.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B284.s index 4f3c7ca465..bd7549d726 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B284.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087B284.s @@ -40,14 +40,14 @@ glabel func_8087B284 /* 00550 8087B310 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 00554 8087B314 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C /* 00558 8087B318 AFA60028 */ sw $a2, 0x0028($sp) -/* 0055C 8087B31C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0055C 8087B31C 0C0189B7 */ jal Collider_CylinderUpdate /* 00560 8087B320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00564 8087B324 8FA40034 */ lw $a0, 0x0034($sp) /* 00568 8087B328 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0056C 8087B32C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00570 8087B330 8FA60028 */ lw $a2, 0x0028($sp) -/* 00574 8087B334 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00574 8087B334 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00578 8087B338 00812821 */ addu $a1, $a0, $at .L8087B33C: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Destroy.s index 3259615c47..bc12d69be3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Destroy.s @@ -13,11 +13,11 @@ glabel BgHakaSgami_Destroy /* 002D0 8087E7B0 8DE50158 */ lw $a1, 0x0158($t7) ## 00000158 /* 002D4 8087E7B4 8FA50018 */ lw $a1, 0x0018($sp) /* 002D8 8087E7B8 8FA4001C */ lw $a0, 0x001C($sp) -/* 002DC 8087E7BC 0C017232 */ jal func_8005C8C8 +/* 002DC 8087E7BC 0C017232 */ jal Collider_DestroyTris /* 002E0 8087E7C0 24A501A8 */ addiu $a1, $a1, 0x01A8 ## $a1 = 000001A8 /* 002E4 8087E7C4 8FA50018 */ lw $a1, 0x0018($sp) /* 002E8 8087E7C8 8FA4001C */ lw $a0, 0x001C($sp) -/* 002EC 8087E7CC 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002EC 8087E7CC 0C0170EB */ jal Collider_DestroyCylinder /* 002F0 8087E7D0 24A5015C */ addiu $a1, $a1, 0x015C ## $a1 = 0000015C /* 002F4 8087E7D4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Init.s index 8036c15782..3c2c88e3bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Init.s @@ -23,7 +23,7 @@ glabel BgHakaSgami_Init /* 00050 8087E530 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 .L8087E534: /* 00054 8087E534 260501A8 */ addiu $a1, $s0, 0x01A8 ## $a1 = 000001A8 -/* 00058 8087E538 0C0171F8 */ jal func_8005C7E0 +/* 00058 8087E538 0C0171F8 */ jal Collider_InitTris /* 0005C 8087E53C AFA50028 */ sw $a1, 0x0028($sp) /* 00060 8087E540 3C078088 */ lui $a3, %hi(D_8087EF50) ## $a3 = 80880000 /* 00064 8087E544 260C01C8 */ addiu $t4, $s0, 0x01C8 ## $t4 = 000001C8 @@ -31,18 +31,18 @@ glabel BgHakaSgami_Init /* 0006C 8087E54C AFAC0010 */ sw $t4, 0x0010($sp) /* 00070 8087E550 24E7EF50 */ addiu $a3, $a3, %lo(D_8087EF50) ## $a3 = 8087EF50 /* 00074 8087E554 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00078 8087E558 0C0172EB */ jal func_8005CBAC +/* 00078 8087E558 0C0172EB */ jal Collider_SetTris /* 0007C 8087E55C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00080 8087E560 2605015C */ addiu $a1, $s0, 0x015C ## $a1 = 0000015C /* 00084 8087E564 AFA50028 */ sw $a1, 0x0028($sp) -/* 00088 8087E568 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00088 8087E568 0C0170D9 */ jal Collider_InitCylinder /* 0008C 8087E56C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00090 8087E570 3C078088 */ lui $a3, %hi(D_8087EF60) ## $a3 = 80880000 /* 00094 8087E574 8FA50028 */ lw $a1, 0x0028($sp) /* 00098 8087E578 24E7EF60 */ addiu $a3, $a3, %lo(D_8087EF60) ## $a3 = 8087EF60 /* 0009C 8087E57C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000A0 8087E580 0C01712B */ jal ActorCollider_InitCylinder +/* 000A0 8087E580 0C01712B */ jal Collider_SetCylinder /* 000A4 8087E584 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000A8 8087E588 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E858.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E858.s index ed24719263..0ccc2254db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E858.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E858.s @@ -323,12 +323,12 @@ glabel func_8087E858 /* 00820 8087ED00 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00824 8087ED04 00818821 */ addu $s1, $a0, $at /* 00828 8087ED08 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFF8 -/* 0082C 8087ED0C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0082C 8087ED0C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00830 8087ED10 02C03025 */ or $a2, $s6, $zero ## $a2 = 000001A8 /* 00834 8087ED14 8FA400BC */ lw $a0, 0x00BC($sp) /* 00838 8087ED18 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFF8 -/* 0083C 8087ED1C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0083C 8087ED1C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00840 8087ED20 2606015C */ addiu $a2, $s0, 0x015C ## $a2 = 0000015C /* 00844 8087ED24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Destroy.s index 2072d6a626..bc2307e723 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Destroy.s @@ -22,12 +22,12 @@ glabel BgHakaTrap_Destroy /* 002E8 8087FF88 54410004 */ bnel $v0, $at, .L8087FF9C /* 002EC 8087FF8C 8FA40024 */ lw $a0, 0x0024($sp) .L8087FF90: -/* 002F0 8087FF90 0C017232 */ jal func_8005C8C8 +/* 002F0 8087FF90 0C017232 */ jal Collider_DestroyTris /* 002F4 8087FF94 260501C4 */ addiu $a1, $s0, 0x01C4 ## $a1 = 000001C4 .L8087FF98: /* 002F8 8087FF98 8FA40024 */ lw $a0, 0x0024($sp) .L8087FF9C: -/* 002FC 8087FF9C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002FC 8087FF9C 0C0170EB */ jal Collider_DestroyCylinder /* 00300 8087FFA0 26050178 */ addiu $a1, $s0, 0x0178 ## $a1 = 00000178 .L8087FFA4: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Init.s index 8492d368d5..cb524f7375 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Init.s @@ -25,14 +25,14 @@ glabel BgHakaTrap_Init /* 00044 8087FCE4 13010086 */ beq $t8, $at, .L8087FF00 /* 00048 8087FCE8 256B09B0 */ addiu $t3, $t3, %lo(func_808809B0) ## $t3 = 808809B0 /* 0004C 8087FCEC 26050178 */ addiu $a1, $s0, 0x0178 ## $a1 = 00000178 -/* 00050 8087FCF0 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00050 8087FCF0 0C0170D9 */ jal Collider_InitCylinder /* 00054 8087FCF4 AFA50028 */ sw $a1, 0x0028($sp) /* 00058 8087FCF8 3C078088 */ lui $a3, %hi(D_80880F54) ## $a3 = 80880000 /* 0005C 8087FCFC 8FA50028 */ lw $a1, 0x0028($sp) /* 00060 8087FD00 24E70F54 */ addiu $a3, $a3, %lo(D_80880F54) ## $a3 = 80880F54 /* 00064 8087FD04 8FA4003C */ lw $a0, 0x003C($sp) -/* 00068 8087FD08 0C01712B */ jal ActorCollider_InitCylinder +/* 00068 8087FD08 0C01712B */ jal Collider_SetCylinder /* 0006C 8087FD0C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00070 8087FD10 8603001C */ lh $v1, 0x001C($s0) ## 0000001C @@ -143,7 +143,7 @@ glabel BgHakaTrap_Init .L8087FE88: /* 001E8 8087FE88 260501C4 */ addiu $a1, $s0, 0x01C4 ## $a1 = 000001C4 /* 001EC 8087FE8C AFA50028 */ sw $a1, 0x0028($sp) -/* 001F0 8087FE90 0C0171F8 */ jal func_8005C7E0 +/* 001F0 8087FE90 0C0171F8 */ jal Collider_InitTris /* 001F4 8087FE94 8FA4003C */ lw $a0, 0x003C($sp) /* 001F8 8087FE98 3C078088 */ lui $a3, %hi(D_80880FF8) ## $a3 = 80880000 /* 001FC 8087FE9C 260D01E4 */ addiu $t5, $s0, 0x01E4 ## $t5 = 000001E4 @@ -151,7 +151,7 @@ glabel BgHakaTrap_Init /* 00204 8087FEA4 AFAD0010 */ sw $t5, 0x0010($sp) /* 00208 8087FEA8 24E70FF8 */ addiu $a3, $a3, %lo(D_80880FF8) ## $a3 = 80880FF8 /* 0020C 8087FEAC 8FA4003C */ lw $a0, 0x003C($sp) -/* 00210 8087FEB0 0C0172EB */ jal func_8005CBAC +/* 00210 8087FEB0 0C0172EB */ jal Collider_SetTris /* 00214 8087FEB4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00218 8087FEB8 921901A5 */ lbu $t9, 0x01A5($s0) ## 000001A5 /* 0021C 8087FEBC 3C098088 */ lui $t1, %hi(func_808801B8) ## $t1 = 80880000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Update.s index 9d579c82a6..ab9b3afd5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Update.s @@ -29,12 +29,12 @@ glabel BgHakaTrap_Update /* 01048 80880CE8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0104C 80880CEC 02212821 */ addu $a1, $s1, $at /* 01050 80880CF0 AFA50024 */ sw $a1, 0x0024($sp) -/* 01054 80880CF4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01054 80880CF4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01058 80880CF8 AFA60020 */ sw $a2, 0x0020($sp) /* 0105C 80880CFC 8FA50024 */ lw $a1, 0x0024($sp) /* 01060 80880D00 8FA60020 */ lw $a2, 0x0020($sp) -/* 01064 80880D04 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01064 80880D04 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01068 80880D08 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0106C 80880D0C 10000012 */ beq $zero, $zero, .L80880D58 @@ -48,7 +48,7 @@ glabel BgHakaTrap_Update /* 01088 80880D28 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0108C 80880D2C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01090 80880D30 02212821 */ addu $a1, $s1, $at -/* 01094 80880D34 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01094 80880D34 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01098 80880D38 260601C4 */ addiu $a2, $s0, 0x01C4 ## $a2 = 000001C4 .L80880D3C: @@ -56,7 +56,7 @@ glabel BgHakaTrap_Update /* 010A0 80880D40 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 010A4 80880D44 02212821 */ addu $a1, $s1, $at /* 010A8 80880D48 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 010AC 80880D4C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 010AC 80880D4C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 010B0 80880D50 26060178 */ addiu $a2, $s0, 0x0178 ## $a2 = 00000178 .L80880D54: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880484.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880484.s index b19d5354e3..e9a711bf68 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880484.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/func_80880484.s @@ -83,7 +83,7 @@ glabel func_80880484 /* 008F8 80880598 15800004 */ bne $t4, $zero, .L808805AC /* 008FC 8088059C 8FA4002C */ lw $a0, 0x002C($sp) /* 00900 808805A0 00812821 */ addu $a1, $a0, $at -/* 00904 808805A4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00904 808805A4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00908 808805A8 26060178 */ addiu $a2, $s0, 0x0178 ## $a2 = 00000178 .L808805AC: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Destroy.s index 01c0c58b22..2344e194a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Destroy.s @@ -12,12 +12,12 @@ glabel BgHakaTubo_Destroy /* 0011C 8088136C 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 00120 80881370 8FA50018 */ lw $a1, 0x0018($sp) /* 00124 80881374 8FA4001C */ lw $a0, 0x001C($sp) -/* 00128 80881378 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00128 80881378 0C0170EB */ jal Collider_DestroyCylinder /* 0012C 8088137C 24A5016C */ addiu $a1, $a1, 0x016C ## $a1 = 0000016C /* 00130 80881380 8FA50018 */ lw $a1, 0x0018($sp) /* 00134 80881384 8FA4001C */ lw $a0, 0x001C($sp) -/* 00138 80881388 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00138 80881388 0C0170EB */ jal Collider_DestroyCylinder /* 0013C 8088138C 24A501B8 */ addiu $a1, $a1, 0x01B8 ## $a1 = 000001B8 /* 00140 80881390 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Init.s index ba9f7af4f6..efd181ad3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Init.s @@ -28,26 +28,26 @@ glabel BgHakaTubo_Init /* 00058 808812A8 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 0005C 808812AC 2605016C */ addiu $a1, $s0, 0x016C ## $a1 = 0000016C /* 00060 808812B0 AFA50020 */ sw $a1, 0x0020($sp) -/* 00064 808812B4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00064 808812B4 0C0170D9 */ jal Collider_InitCylinder /* 00068 808812B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0006C 808812BC 3C078088 */ lui $a3, %hi(D_80881B60) ## $a3 = 80880000 /* 00070 808812C0 8FA50020 */ lw $a1, 0x0020($sp) /* 00074 808812C4 24E71B60 */ addiu $a3, $a3, %lo(D_80881B60) ## $a3 = 80881B60 /* 00078 808812C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0007C 808812CC 0C01712B */ jal ActorCollider_InitCylinder +/* 0007C 808812CC 0C01712B */ jal Collider_SetCylinder /* 00080 808812D0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00084 808812D4 260501B8 */ addiu $a1, $s0, 0x01B8 ## $a1 = 000001B8 /* 00088 808812D8 AFA50020 */ sw $a1, 0x0020($sp) -/* 0008C 808812DC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0008C 808812DC 0C0170D9 */ jal Collider_InitCylinder /* 00090 808812E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00094 808812E4 3C078088 */ lui $a3, %hi(D_80881B8C) ## $a3 = 80880000 /* 00098 808812E8 8FA50020 */ lw $a1, 0x0020($sp) /* 0009C 808812EC 24E71B8C */ addiu $a3, $a3, %lo(D_80881B8C) ## $a3 = 80881B8C /* 000A0 808812F0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000A4 808812F4 0C01712B */ jal ActorCollider_InitCylinder +/* 000A4 808812F4 0C01712B */ jal Collider_SetCylinder /* 000A8 808812F8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000AC 808812FC 0C03F66B */ jal Math_Rand_ZeroOne diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_808813A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_808813A0.s index 12d6106715..ea1f56b18a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_808813A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_808813A0.s @@ -140,13 +140,13 @@ glabel func_808813A0 /* 00344 80881594 10000017 */ beq $zero, $zero, .L808815F4 /* 00348 80881598 AE0B0164 */ sw $t3, 0x0164($s0) ## 00000164 .L8088159C: -/* 0034C 8088159C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0034C 8088159C 0C0189B7 */ jal Collider_CylinderUpdate /* 00350 808815A0 AFA50040 */ sw $a1, 0x0040($sp) /* 00354 808815A4 2606016C */ addiu $a2, $s0, 0x016C ## $a2 = 0000016C /* 00358 808815A8 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000016C /* 0035C 808815AC AFA6003C */ sw $a2, 0x003C($sp) -/* 00360 808815B0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00360 808815B0 0C0189B7 */ jal Collider_CylinderUpdate /* 00364 808815B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00368 808815B8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -154,17 +154,17 @@ glabel func_808813A0 /* 00370 808815C0 02218021 */ addu $s0, $s1, $at /* 00374 808815C4 8FA6003C */ lw $a2, 0x003C($sp) /* 00378 808815C8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0037C 808815CC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0037C 808815CC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00380 808815D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00384 808815D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00388 808815D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0038C 808815DC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0038C 808815DC 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00390 808815E0 8FA60040 */ lw $a2, 0x0040($sp) /* 00394 808815E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00398 808815E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0039C 808815EC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0039C 808815EC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 003A0 808815F0 8FA60040 */ lw $a2, 0x0040($sp) .L808815F4: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Destroy.s index b330a597a8..10a71d296b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Destroy.s @@ -14,7 +14,7 @@ glabel BgHakaZou_Destroy /* 00310 808828D0 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 00314 808828D4 8FA70018 */ lw $a3, 0x0018($sp) /* 00318 808828D8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0031C 808828DC 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0031C 808828DC 0C0170EB */ jal Collider_DestroyCylinder /* 00320 808828E0 24E5016C */ addiu $a1, $a3, 0x016C ## $a1 = 0000016C .L808828E4: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s index bae7ed3138..e6c326eeb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/BgHakaZou_Init.s @@ -122,18 +122,18 @@ glabel BgHakaZou_Init /* 00188 80882748 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L8088274C: /* 0018C 8088274C 2605016C */ addiu $a1, $s0, 0x016C ## $a1 = 0000016C -/* 00190 80882750 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00190 80882750 0C0170D9 */ jal Collider_InitCylinder /* 00194 80882754 AFA50020 */ sw $a1, 0x0020($sp) /* 00198 80882758 3C078088 */ lui $a3, %hi(D_808835F0) ## $a3 = 80880000 /* 0019C 8088275C 24E735F0 */ addiu $a3, $a3, %lo(D_808835F0) ## $a3 = 808835F0 /* 001A0 80882760 8FA4003C */ lw $a0, 0x003C($sp) /* 001A4 80882764 8FA50020 */ lw $a1, 0x0020($sp) -/* 001A8 80882768 0C01712B */ jal ActorCollider_InitCylinder +/* 001A8 80882768 0C01712B */ jal Collider_SetCylinder /* 001AC 8088276C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001B0 80882770 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001B4 80882774 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 001B4 80882774 0C0189B7 */ jal Collider_CylinderUpdate /* 001B8 80882778 8FA50020 */ lw $a1, 0x0020($sp) /* 001BC 8088277C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883000.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883000.s index 23e2b8ef9f..b34a4bf3f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883000.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883000.s @@ -63,7 +63,7 @@ glabel func_80883000 /* 00B1C 808830DC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00B20 808830E0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00B24 808830E4 02212821 */ addu $a1, $s1, $at -/* 00B28 808830E8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00B28 808830E8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00B2C 808830EC 2606016C */ addiu $a2, $s0, 0x016C ## $a2 = 0000016C .L808830F0: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Destroy.s index 020326614b..7023d911ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Destroy.s @@ -3,7 +3,7 @@ glabel BgHidanCurtain_Destroy /* 00270 80885410 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00274 80885414 AFBF0014 */ sw $ra, 0x0014($sp) /* 00278 80885418 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0027C 8088541C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0027C 8088541C 0C0170EB */ jal Collider_DestroyCylinder /* 00280 80885420 24C50158 */ addiu $a1, $a2, 0x0158 ## $a1 = 00000158 /* 00284 80885424 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Init.s index 6252c8d23b..8fb3fd963f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Init.s @@ -100,14 +100,14 @@ glabel BgHidanCurtain_Init /* 00100 808852A0 8F250004 */ lw $a1, 0x0004($t9) ## 00000004 /* 00104 808852A4 26050158 */ addiu $a1, $s0, 0x0158 ## $a1 = 00000158 /* 00108 808852A8 AFA50020 */ sw $a1, 0x0020($sp) -/* 0010C 808852AC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0010C 808852AC 0C0170D9 */ jal Collider_InitCylinder /* 00110 808852B0 8FA40034 */ lw $a0, 0x0034($sp) /* 00114 808852B4 3C078088 */ lui $a3, %hi(D_80885B70) ## $a3 = 80880000 /* 00118 808852B8 24E75B70 */ addiu $a3, $a3, %lo(D_80885B70) ## $a3 = 80885B70 /* 0011C 808852BC 8FA40034 */ lw $a0, 0x0034($sp) /* 00120 808852C0 8FA50020 */ lw $a1, 0x0020($sp) -/* 00124 808852C4 0C01712B */ jal ActorCollider_InitCylinder +/* 00124 808852C4 0C01712B */ jal Collider_SetCylinder /* 00128 808852C8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0012C 808852CC C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 @@ -128,7 +128,7 @@ glabel BgHidanCurtain_Init /* 00168 80885308 A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 /* 0016C 8088530C 846F0002 */ lh $t7, 0x0002($v1) ## 00000002 /* 00170 80885310 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A -/* 00174 80885314 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00174 80885314 0C0189B7 */ jal Collider_CylinderUpdate /* 00178 80885318 8FA50020 */ lw $a1, 0x0020($sp) /* 0017C 8088531C 3C068088 */ lui $a2, %hi(D_80885B9C) ## $a2 = 80880000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s index 0e7d547313..73c1161ea2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s @@ -139,12 +139,12 @@ glabel BgHidanCurtain_Update /* 007B4 80885954 00000000 */ nop /* 007B8 80885958 A608019A */ sh $t0, 0x019A($s0) ## 0000019A /* 007BC 8088595C AFA60028 */ sw $a2, 0x0028($sp) -/* 007C0 80885960 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 007C0 80885960 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 007C4 80885964 AFA5002C */ sw $a1, 0x002C($sp) /* 007C8 80885968 8FA5002C */ lw $a1, 0x002C($sp) /* 007CC 8088596C 8FA60028 */ lw $a2, 0x0028($sp) -/* 007D0 80885970 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 007D0 80885970 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 007D4 80885974 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 007D8 80885978 3C098016 */ lui $t1, %hi(gSaveContext+0x1360) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Destroy.s index a1f644a50c..04c26efabc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Destroy.s @@ -12,7 +12,7 @@ glabel BgHidanDalm_Destroy /* 00108 80885F28 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 0010C 80885F2C 8FA50018 */ lw $a1, 0x0018($sp) /* 00110 80885F30 8FA4001C */ lw $a0, 0x001C($sp) -/* 00114 80885F34 0C017232 */ jal func_8005C8C8 +/* 00114 80885F34 0C017232 */ jal Collider_DestroyTris /* 00118 80885F38 24A5016C */ addiu $a1, $a1, 0x016C ## $a1 = 0000016C /* 0011C 80885F3C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00120 80885F40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Init.s index 2869fa7d3e..9b0bb5ca20 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Init.s @@ -28,7 +28,7 @@ glabel BgHidanDalm_Init /* 00058 80885E78 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 0005C 80885E7C 2605016C */ addiu $a1, $s0, 0x016C ## $a1 = 0000016C /* 00060 80885E80 AFA50028 */ sw $a1, 0x0028($sp) -/* 00064 80885E84 0C0171F8 */ jal func_8005C7E0 +/* 00064 80885E84 0C0171F8 */ jal Collider_InitTris /* 00068 80885E88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0006C 80885E8C 3C078088 */ lui $a3, %hi(D_80886590) ## $a3 = 80880000 /* 00070 80885E90 260E018C */ addiu $t6, $s0, 0x018C ## $t6 = 0000018C @@ -36,7 +36,7 @@ glabel BgHidanDalm_Init /* 00078 80885E98 AFAE0010 */ sw $t6, 0x0010($sp) /* 0007C 80885E9C 24E76590 */ addiu $a3, $a3, %lo(D_80886590) ## $a3 = 80886590 /* 00080 80885EA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00084 80885EA4 0C0172EB */ jal func_8005CBAC +/* 00084 80885EA4 0C0172EB */ jal Collider_SetTris /* 00088 80885EA8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0008C 80885EAC 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 00090 80885EB0 8608001C */ lh $t0, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_80885F4C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_80885F4C.s index 98a5d6ec31..14bd7738d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_80885F4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_80885F4C.s @@ -98,7 +98,7 @@ glabel func_80885F4C /* 00284 808860A4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00288 808860A8 02212821 */ addu $a1, $s1, $at /* 0028C 808860AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00290 808860B0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00290 808860B0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00294 808860B4 2606016C */ addiu $a2, $s0, 0x016C ## $a2 = 0000016C /* 00298 808860B8 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Destroy.s index f0311acb3d..9d0b0ba26d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Destroy.s @@ -3,7 +3,7 @@ glabel BgHidanFwbig_Destroy /* 0019C 8088748C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 001A0 80887490 AFBF0014 */ sw $ra, 0x0014($sp) /* 001A4 80887494 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001A8 80887498 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001A8 80887498 0C0170EB */ jal Collider_DestroyCylinder /* 001AC 8088749C 24C50154 */ addiu $a1, $a2, 0x0154 ## $a1 = 00000154 /* 001B0 808874A0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Init.s index 924de00e26..413f24e89e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Init.s @@ -12,14 +12,14 @@ glabel BgHidanFwbig_Init /* 00024 80887314 AFAF0024 */ sw $t7, 0x0024($sp) /* 00028 80887318 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 0002C 8088731C AFA50020 */ sw $a1, 0x0020($sp) -/* 00030 80887320 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00030 80887320 0C0170D9 */ jal Collider_InitCylinder /* 00034 80887324 8FA40034 */ lw $a0, 0x0034($sp) /* 00038 80887328 3C078088 */ lui $a3, %hi(D_80887ED0) ## $a3 = 80880000 /* 0003C 8088732C 8FA50020 */ lw $a1, 0x0020($sp) /* 00040 80887330 24E77ED0 */ addiu $a3, $a3, %lo(D_80887ED0) ## $a3 = 80887ED0 /* 00044 80887334 8FA40034 */ lw $a0, 0x0034($sp) -/* 00048 80887338 0C01712B */ jal ActorCollider_InitCylinder +/* 00048 80887338 0C01712B */ jal Collider_SetCylinder /* 0004C 8088733C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00050 80887340 8619001C */ lh $t9, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s index 8749259ff1..6ff8bed745 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Update.s @@ -88,12 +88,12 @@ glabel BgHidanFwbig_Update /* 008A8 80887B98 26060154 */ addiu $a2, $s0, 0x0154 ## $a2 = 00000154 /* 008AC 80887B9C AFA60028 */ sw $a2, 0x0028($sp) /* 008B0 80887BA0 AFA5002C */ sw $a1, 0x002C($sp) -/* 008B4 80887BA4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 008B4 80887BA4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 008B8 80887BA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 008BC 80887BAC 8FA5002C */ lw $a1, 0x002C($sp) /* 008C0 80887BB0 8FA60028 */ lw $a2, 0x0028($sp) -/* 008C4 80887BB4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 008C4 80887BB4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 008C8 80887BB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 008CC 80887BBC 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Destroy.s index 90095a242d..74c9b1d43b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Destroy.s @@ -15,7 +15,7 @@ glabel BgHidanHamstep_Destroy /* 00464 808884A4 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 /* 00468 808884A8 57000004 */ bnel $t8, $zero, .L808884BC /* 0046C 808884AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00470 808884B0 0C017232 */ jal func_8005C8C8 +/* 00470 808884B0 0C017232 */ jal Collider_DestroyTris /* 00474 808884B4 24E50164 */ addiu $a1, $a3, 0x0164 ## $a1 = 00000164 /* 00478 808884B8 8FBF0014 */ lw $ra, 0x0014($sp) .L808884BC: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s index 60e5a3943b..8813fa8302 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s @@ -43,7 +43,7 @@ glabel BgHidanHamstep_Init /* 001DC 8088821C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 /* 001E0 80888220 14400030 */ bne $v0, $zero, .L808882E4 /* 001E4 80888224 00000000 */ nop -/* 001E8 80888228 0C0171F8 */ jal func_8005C7E0 +/* 001E8 80888228 0C0171F8 */ jal Collider_InitTris /* 001EC 8088822C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000164 /* 001F0 80888230 3C078089 */ lui $a3, %hi(D_80888DFC) ## $a3 = 80890000 /* 001F4 80888234 260E0184 */ addiu $t6, $s0, 0x0184 ## $t6 = 00000184 @@ -51,7 +51,7 @@ glabel BgHidanHamstep_Init /* 001FC 8088823C 24E78DFC */ addiu $a3, $a3, %lo(D_80888DFC) ## $a3 = 80888DFC /* 00200 80888240 8FA4007C */ lw $a0, 0x007C($sp) /* 00204 80888244 02402825 */ or $a1, $s2, $zero ## $a1 = 00000164 -/* 00208 80888248 0C0172EB */ jal func_8005CBAC +/* 00208 80888248 0C0172EB */ jal Collider_SetTris /* 0020C 8088824C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00210 80888250 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 00214 80888254 27A8006C */ addiu $t0, $sp, 0x006C ## $t0 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808887C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808887C4.s index 8efaa71a24..44f8ed0eb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808887C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808887C4.s @@ -34,7 +34,7 @@ glabel func_808887C4 .L8088883C: /* 007FC 8088883C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00001E60 /* 00800 80888840 00812821 */ addu $a1, $a0, $at -/* 00804 80888844 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00804 80888844 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00808 80888848 26060164 */ addiu $a2, $s0, 0x0164 ## $a2 = 00000164 /* 0080C 8088884C 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Destroy.s index 36216c35c0..f595c234db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Destroy.s @@ -12,7 +12,7 @@ glabel BgHidanHrock_Destroy /* 00350 80889480 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 00354 80889484 8FA50018 */ lw $a1, 0x0018($sp) /* 00358 80889488 8FA4001C */ lw $a0, 0x001C($sp) -/* 0035C 8088948C 0C017232 */ jal func_8005C8C8 +/* 0035C 8088948C 0C017232 */ jal Collider_DestroyTris /* 00360 80889490 24A5016C */ addiu $a1, $a1, 0x016C ## $a1 = 0000016C /* 00364 80889494 8FBF0014 */ lw $ra, 0x0014($sp) /* 00368 80889498 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s index 29ea76607b..a7124e3cf8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Init.s @@ -35,7 +35,7 @@ glabel BgHidanHrock_Init /* 00064 80889194 A20F016A */ sb $t7, 0x016A($s0) ## 0000016A /* 00068 80889198 A608001C */ sh $t0, 0x001C($s0) ## 0000001C /* 0006C 8088919C 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 00070 808891A0 0C0171F8 */ jal func_8005C7E0 +/* 00070 808891A0 0C0171F8 */ jal Collider_InitTris /* 00074 808891A4 03C02825 */ or $a1, $s8, $zero ## $a1 = 0000016C /* 00078 808891A8 3C078089 */ lui $a3, %hi(D_80889898) ## $a3 = 80890000 /* 0007C 808891AC 2609018C */ addiu $t1, $s0, 0x018C ## $t1 = 0000018C @@ -43,7 +43,7 @@ glabel BgHidanHrock_Init /* 00084 808891B4 24E79898 */ addiu $a3, $a3, %lo(D_80889898) ## $a3 = 80889898 /* 00088 808891B8 8FA400B4 */ lw $a0, 0x00B4($sp) /* 0008C 808891BC 03C02825 */ or $a1, $s8, $zero ## $a1 = 0000016C -/* 00090 808891C0 0C0172EB */ jal func_8005CBAC +/* 00090 808891C0 0C0172EB */ jal Collider_SetTris /* 00094 808891C4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00098 808891C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0009C 808891CC 0C010D20 */ jal DynaPolyInfo_SetActorMove diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808896B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808896B8.s index 7351bc012b..09430b9173 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808896B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/func_808896B8.s @@ -33,7 +33,7 @@ glabel func_808896B8 /* 005F8 80889728 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00001E60 /* 005FC 8088972C 00E12821 */ addu $a1, $a3, $at /* 00600 80889730 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00604 80889734 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00604 80889734 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00608 80889738 2606016C */ addiu $a2, $s0, 0x016C ## $a2 = 0000016C .L8088973C: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Destroy.s index c4c802174b..9af7190212 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Destroy.s @@ -12,7 +12,7 @@ glabel BgHidanKowarerukabe_Destroy /* 0024C 8088A26C 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 00250 8088A270 8FA50018 */ lw $a1, 0x0018($sp) /* 00254 8088A274 8FA4001C */ lw $a0, 0x001C($sp) -/* 00258 8088A278 0C016F32 */ jal func_8005BCC8 +/* 00258 8088A278 0C016F32 */ jal Collider_DestroyJntSph /* 0025C 8088A27C 24A50164 */ addiu $a1, $a1, 0x0164 ## $a1 = 00000164 /* 00260 8088A280 8FBF0014 */ lw $ra, 0x0014($sp) /* 00264 8088A284 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Update.s index 172525c719..15dc9757c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Update.s @@ -51,7 +51,7 @@ glabel BgHidanKowarerukabe_Update /* 00CB4 8088ACD4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00CB8 8088ACD8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00CBC 8088ACDC 02012821 */ addu $a1, $s0, $at -/* 00CC0 8088ACE0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00CC0 8088ACE0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00CC4 8088ACE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00CC8 8088ACE8 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A0B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A0B8.s index 34edbf87be..6f440ffd3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A0B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A0B8.s @@ -6,7 +6,7 @@ glabel func_8088A0B8 /* 000A8 8088A0C8 AFBF001C */ sw $ra, 0x001C($sp) /* 000AC 8088A0CC 24C50164 */ addiu $a1, $a2, 0x0164 ## $a1 = 00000164 /* 000B0 8088A0D0 AFA50020 */ sw $a1, 0x0020($sp) -/* 000B4 8088A0D4 0C016EFE */ jal func_8005BBF8 +/* 000B4 8088A0D4 0C016EFE */ jal Collider_InitJntSph /* 000B8 8088A0D8 AFA60028 */ sw $a2, 0x0028($sp) /* 000BC 8088A0DC 8FA60028 */ lw $a2, 0x0028($sp) /* 000C0 8088A0E0 3C078089 */ lui $a3, %hi(D_8088AE40) ## $a3 = 80890000 @@ -14,7 +14,7 @@ glabel func_8088A0B8 /* 000C8 8088A0E8 24CE0184 */ addiu $t6, $a2, 0x0184 ## $t6 = 00000184 /* 000CC 8088A0EC AFAE0010 */ sw $t6, 0x0010($sp) /* 000D0 8088A0F0 24E7AE40 */ addiu $a3, $a3, %lo(D_8088AE40) ## $a3 = 8088AE40 -/* 000D4 8088A0F4 0C017014 */ jal func_8005C050 +/* 000D4 8088A0F4 0C017014 */ jal Collider_SetJntSph /* 000D8 8088A0F8 8FA4002C */ lw $a0, 0x002C($sp) /* 000DC 8088A0FC 8FA60028 */ lw $a2, 0x0028($sp) /* 000E0 8088A100 3C088089 */ lui $t0, %hi(D_8088AE5C) ## $t0 = 80890000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Destroy.s index d2bf3f104f..834f57f2ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Destroy.s @@ -12,7 +12,7 @@ glabel BgHidanRock_Destroy /* 0019C 8088B21C 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 001A0 8088B220 8FA50018 */ lw $a1, 0x0018($sp) /* 001A4 8088B224 8FA4001C */ lw $a0, 0x001C($sp) -/* 001A8 8088B228 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001A8 8088B228 0C0170EB */ jal Collider_DestroyCylinder /* 001AC 8088B22C 24A5017C */ addiu $a1, $a1, 0x017C ## $a1 = 0000017C /* 001B0 8088B230 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Init.s index c0322cd9f6..7cd0e84026 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Init.s @@ -23,14 +23,14 @@ glabel BgHidanRock_Init /* 0004C 8088B0CC 2605017C */ addiu $a1, $s0, 0x017C ## $a1 = 0000017C /* 00050 8088B0D0 A20F0168 */ sb $t7, 0x0168($s0) ## 00000168 /* 00054 8088B0D4 AFA50020 */ sw $a1, 0x0020($sp) -/* 00058 8088B0D8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00058 8088B0D8 0C0170D9 */ jal Collider_InitCylinder /* 0005C 8088B0DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00060 8088B0E0 3C078089 */ lui $a3, %hi(D_8088BF8C) ## $a3 = 80890000 /* 00064 8088B0E4 8FA50020 */ lw $a1, 0x0020($sp) /* 00068 8088B0E8 24E7BF8C */ addiu $a3, $a3, %lo(D_8088BF8C) ## $a3 = 8088BF8C /* 0006C 8088B0EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00070 8088B0F0 0C01712B */ jal ActorCollider_InitCylinder +/* 00070 8088B0F0 0C01712B */ jal Collider_SetCylinder /* 00074 8088B0F4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00078 8088B0F8 92090168 */ lbu $t1, 0x0168($s0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Update.s index 67385b4686..a05e3207d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Update.s @@ -44,7 +44,7 @@ glabel BgHidanRock_Update /* 00B98 8088BC18 00000000 */ nop /* 00B9C 8088BC1C A60A01BE */ sh $t2, 0x01BE($s0) ## 000001BE /* 00BA0 8088BC20 8FA4002C */ lw $a0, 0x002C($sp) -/* 00BA4 8088BC24 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00BA4 8088BC24 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00BA8 8088BC28 00812821 */ addu $a1, $a0, $at /* 00BAC 8088BC2C 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Destroy.s index f6a9c805d0..89e33e51af 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Destroy.s @@ -12,7 +12,7 @@ glabel BgHidanRsekizou_Destroy /* 00128 8088C328 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 0012C 8088C32C 8FA50018 */ lw $a1, 0x0018($sp) /* 00130 8088C330 8FA4001C */ lw $a0, 0x001C($sp) -/* 00134 8088C334 0C016F32 */ jal func_8005BCC8 +/* 00134 8088C334 0C016F32 */ jal Collider_DestroyJntSph /* 00138 8088C338 24A50168 */ addiu $a1, $a1, 0x0168 ## $a1 = 00000168 /* 0013C 8088C33C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00140 8088C340 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Init.s index 6d329b1568..0e4538412e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Init.s @@ -27,7 +27,7 @@ glabel BgHidanRsekizou_Init /* 00054 8088C254 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 00058 8088C258 26050168 */ addiu $a1, $s0, 0x0168 ## $a1 = 00000168 /* 0005C 8088C25C AFA5002C */ sw $a1, 0x002C($sp) -/* 00060 8088C260 0C016EFE */ jal func_8005BBF8 +/* 00060 8088C260 0C016EFE */ jal Collider_InitJntSph /* 00064 8088C264 8FA40044 */ lw $a0, 0x0044($sp) /* 00068 8088C268 3C078089 */ lui $a3, %hi(D_8088CD58) ## $a3 = 80890000 /* 0006C 8088C26C 260E0188 */ addiu $t6, $s0, 0x0188 ## $t6 = 00000188 @@ -35,7 +35,7 @@ glabel BgHidanRsekizou_Init /* 00074 8088C274 AFAE0010 */ sw $t6, 0x0010($sp) /* 00078 8088C278 24E7CD58 */ addiu $a3, $a3, %lo(D_8088CD58) ## $a3 = 8088CD58 /* 0007C 8088C27C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00080 8088C280 0C017014 */ jal func_8005C050 +/* 00080 8088C280 0C017014 */ jal Collider_SetJntSph /* 00084 8088C284 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00088 8088C288 8E020184 */ lw $v0, 0x0184($s0) ## 00000184 /* 0008C 8088C28C 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Update.s index 2550163bf8..9f31df4fb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Update.s @@ -234,7 +234,7 @@ glabel BgHidanRsekizou_Update /* 004D8 8088C6D8 00000000 */ nop /* 004DC 8088C6DC A4580034 */ sh $t8, 0x0034($v0) ## 000001F4 /* 004E0 8088C6E0 8FA4003C */ lw $a0, 0x003C($sp) -/* 004E4 8088C6E4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 004E4 8088C6E4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 004E8 8088C6E8 00812821 */ addu $a1, $a0, $at /* 004EC 8088C6EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Destroy.s index c4eaf9b6f3..0ef54e7206 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Destroy.s @@ -12,7 +12,7 @@ glabel BgHidanSekizou_Destroy /* 00550 8088D410 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 00554 8088D414 8FA50018 */ lw $a1, 0x0018($sp) /* 00558 8088D418 8FA4001C */ lw $a0, 0x001C($sp) -/* 0055C 8088D41C 0C016F32 */ jal func_8005BCC8 +/* 0055C 8088D41C 0C016F32 */ jal Collider_DestroyJntSph /* 00560 8088D420 24A50174 */ addiu $a1, $a1, 0x0174 ## $a1 = 00000174 /* 00564 8088D424 8FBF0014 */ lw $ra, 0x0014($sp) /* 00568 8088D428 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Init.s index 55cbf01b2f..871e50b815 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Init.s @@ -17,7 +17,7 @@ glabel BgHidanSekizou_Init /* 003F0 8088D2B0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003F4 8088D2B4 26300174 */ addiu $s0, $s1, 0x0174 ## $s0 = 00000174 /* 003F8 8088D2B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000174 -/* 003FC 8088D2BC 0C016EFE */ jal func_8005BBF8 +/* 003FC 8088D2BC 0C016EFE */ jal Collider_InitJntSph /* 00400 8088D2C0 8FA40054 */ lw $a0, 0x0054($sp) /* 00404 8088D2C4 3C078089 */ lui $a3, %hi(D_8088E258) ## $a3 = 80890000 /* 00408 8088D2C8 262E0194 */ addiu $t6, $s1, 0x0194 ## $t6 = 00000194 @@ -25,7 +25,7 @@ glabel BgHidanSekizou_Init /* 00410 8088D2D0 24E7E258 */ addiu $a3, $a3, %lo(D_8088E258) ## $a3 = 8088E258 /* 00414 8088D2D4 8FA40054 */ lw $a0, 0x0054($sp) /* 00418 8088D2D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000174 -/* 0041C 8088D2DC 0C017014 */ jal func_8005C050 +/* 0041C 8088D2DC 0C017014 */ jal Collider_SetJntSph /* 00420 8088D2E0 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00424 8088D2E4 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L8088D2E8: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Update.s index 024bd0332c..2e8485e85a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Update.s @@ -40,12 +40,12 @@ glabel BgHidanSekizou_Update /* 00A84 8088D944 02212821 */ addu $a1, $s1, $at /* 00A88 8088D948 26060174 */ addiu $a2, $s0, 0x0174 ## $a2 = 00000174 /* 00A8C 8088D94C AFA60020 */ sw $a2, 0x0020($sp) -/* 00A90 8088D950 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00A90 8088D950 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00A94 8088D954 AFA50024 */ sw $a1, 0x0024($sp) /* 00A98 8088D958 8FA50024 */ lw $a1, 0x0024($sp) /* 00A9C 8088D95C 8FA60020 */ lw $a2, 0x0020($sp) -/* 00AA0 8088D960 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00AA0 8088D960 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00AA4 8088D964 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00AA8 8088D968 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -72,12 +72,12 @@ glabel BgHidanSekizou_Update .L8088D9B4: /* 00AF4 8088D9B4 26060174 */ addiu $a2, $s0, 0x0174 ## $a2 = 00000174 /* 00AF8 8088D9B8 AFA60020 */ sw $a2, 0x0020($sp) -/* 00AFC 8088D9BC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00AFC 8088D9BC 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00B00 8088D9C0 AFA50024 */ sw $a1, 0x0024($sp) /* 00B04 8088D9C4 8FA50024 */ lw $a1, 0x0024($sp) /* 00B08 8088D9C8 8FA60020 */ lw $a2, 0x0020($sp) -/* 00B0C 8088D9CC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00B0C 8088D9CC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00B10 8088D9D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B14 8088D9D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Destroy.s index afc8f8ba10..a89674c830 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Destroy.s @@ -12,7 +12,7 @@ glabel BgHidanSima_Destroy /* 00124 8088E4F4 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 00128 8088E4F8 8FA50018 */ lw $a1, 0x0018($sp) /* 0012C 8088E4FC 8FA4001C */ lw $a0, 0x001C($sp) -/* 00130 8088E500 0C016F32 */ jal func_8005BCC8 +/* 00130 8088E500 0C016F32 */ jal Collider_DestroyJntSph /* 00134 8088E504 24A5016C */ addiu $a1, $a1, 0x016C ## $a1 = 0000016C /* 00138 8088E508 8FBF0014 */ lw $ra, 0x0014($sp) /* 0013C 8088E50C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Init.s index b45d27e927..3ac6f8435a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Init.s @@ -38,7 +38,7 @@ glabel BgHidanSima_Init /* 00074 8088E444 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 00078 8088E448 2605016C */ addiu $a1, $s0, 0x016C ## $a1 = 0000016C /* 0007C 8088E44C AFA5002C */ sw $a1, 0x002C($sp) -/* 00080 8088E450 0C016EFE */ jal func_8005BBF8 +/* 00080 8088E450 0C016EFE */ jal Collider_InitJntSph /* 00084 8088E454 8FA40044 */ lw $a0, 0x0044($sp) /* 00088 8088E458 3C078089 */ lui $a3, %hi(D_8088F1E8) ## $a3 = 80890000 /* 0008C 8088E45C 260F018C */ addiu $t7, $s0, 0x018C ## $t7 = 0000018C @@ -46,7 +46,7 @@ glabel BgHidanSima_Init /* 00094 8088E464 AFAF0010 */ sw $t7, 0x0010($sp) /* 00098 8088E468 24E7F1E8 */ addiu $a3, $a3, %lo(D_8088F1E8) ## $a3 = 8088F1E8 /* 0009C 8088E46C 8FA40044 */ lw $a0, 0x0044($sp) -/* 000A0 8088E470 0C017014 */ jal func_8005C050 +/* 000A0 8088E470 0C017014 */ jal Collider_SetJntSph /* 000A4 8088E474 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000A8 8088E478 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 000AC 8088E47C 24040080 */ addiu $a0, $zero, 0x0080 ## $a0 = 00000080 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Update.s index 28fe9d02f5..b94cad513b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Update.s @@ -59,7 +59,7 @@ glabel BgHidanSima_Update /* 0075C 8088EB2C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00760 8088EB30 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00764 8088EB34 2606016C */ addiu $a2, $s0, 0x016C ## $a2 = 0000016C -/* 00768 8088EB38 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00768 8088EB38 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 0076C 8088EB3C 00812821 */ addu $a1, $a0, $at .L8088EB40: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Destroy.s index 231eadb3c8..66726f195c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Destroy.s @@ -35,14 +35,14 @@ glabel L80890B40 glabel L80890B5C /* 0041C 80890B5C 8FA50018 */ lw $a1, 0x0018($sp) /* 00420 80890B60 8FA4001C */ lw $a0, 0x001C($sp) -/* 00424 80890B64 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00424 80890B64 0C0170EB */ jal Collider_DestroyCylinder /* 00428 80890B68 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 .L80890B6C: /* 0042C 80890B6C 8FA50018 */ lw $a1, 0x0018($sp) .L80890B70: /* 00430 80890B70 8FA4001C */ lw $a0, 0x001C($sp) -/* 00434 80890B74 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00434 80890B74 0C0170EB */ jal Collider_DestroyCylinder /* 00438 80890B78 24A50168 */ addiu $a1, $a1, 0x0168 ## $a1 = 00000168 /* 0043C 80890B7C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890740.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890740.s index d28da8bef1..2aaa7fc416 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890740.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_80890740.s @@ -10,18 +10,18 @@ glabel func_80890740 /* 00020 80890760 31F80007 */ andi $t8, $t7, 0x0007 ## $t8 = 00000000 /* 00024 80890764 26050168 */ addiu $a1, $s0, 0x0168 ## $a1 = 00000168 /* 00028 80890768 AFB80030 */ sw $t8, 0x0030($sp) -/* 0002C 8089076C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0002C 8089076C 0C0170D9 */ jal Collider_InitCylinder /* 00030 80890770 AFA5002C */ sw $a1, 0x002C($sp) /* 00034 80890774 3C078089 */ lui $a3, %hi(D_8089170C) ## $a3 = 80890000 /* 00038 80890778 24E7170C */ addiu $a3, $a3, %lo(D_8089170C) ## $a3 = 8089170C /* 0003C 8089077C 8FA4003C */ lw $a0, 0x003C($sp) /* 00040 80890780 8FA5002C */ lw $a1, 0x002C($sp) -/* 00044 80890784 0C01712B */ jal ActorCollider_InitCylinder +/* 00044 80890784 0C01712B */ jal Collider_SetCylinder /* 00048 80890788 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0004C 8089078C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00050 80890790 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00050 80890790 0C0189B7 */ jal Collider_CylinderUpdate /* 00054 80890794 8FA5002C */ lw $a1, 0x002C($sp) /* 00058 80890798 8FA40030 */ lw $a0, 0x0030($sp) @@ -48,18 +48,18 @@ glabel func_80890740 /* 000A8 808907E8 AFA50024 */ sw $a1, 0x0024($sp) /* 000AC 808907EC 8FA4003C */ lw $a0, 0x003C($sp) /* 000B0 808907F0 AFA30028 */ sw $v1, 0x0028($sp) -/* 000B4 808907F4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000B4 808907F4 0C0170D9 */ jal Collider_InitCylinder /* 000B8 808907F8 AFA6002C */ sw $a2, 0x002C($sp) /* 000BC 808907FC 3C078089 */ lui $a3, %hi(D_80891738) ## $a3 = 80890000 /* 000C0 80890800 24E71738 */ addiu $a3, $a3, %lo(D_80891738) ## $a3 = 80891738 /* 000C4 80890804 8FA4003C */ lw $a0, 0x003C($sp) /* 000C8 80890808 8FA50024 */ lw $a1, 0x0024($sp) -/* 000CC 8089080C 0C01712B */ jal ActorCollider_InitCylinder +/* 000CC 8089080C 0C01712B */ jal Collider_SetCylinder /* 000D0 80890810 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000D4 80890814 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000D8 80890818 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 000D8 80890818 0C0189B7 */ jal Collider_CylinderUpdate /* 000DC 8089081C 8FA50024 */ lw $a1, 0x0024($sp) /* 000E0 80890820 8FAD002C */ lw $t5, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_8089107C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_8089107C.s index d2b1195936..fdca12e33b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_8089107C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_8089107C.s @@ -69,19 +69,19 @@ glabel func_8089107C /* 00A30 80891170 00812821 */ addu $a1, $a0, $at /* 00A34 80891174 AFA50028 */ sw $a1, 0x0028($sp) /* 00A38 80891178 00E03025 */ or $a2, $a3, $zero ## $a2 = 00000168 -/* 00A3C 8089117C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00A3C 8089117C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00A40 80891180 AFA70024 */ sw $a3, 0x0024($sp) /* 00A44 80891184 8FA50028 */ lw $a1, 0x0028($sp) /* 00A48 80891188 8FA4003C */ lw $a0, 0x003C($sp) -/* 00A4C 8089118C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00A4C 8089118C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00A50 80891190 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 /* 00A54 80891194 8FA50028 */ lw $a1, 0x0028($sp) /* 00A58 80891198 8FA70024 */ lw $a3, 0x0024($sp) .L8089119C: /* 00A5C 8089119C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00A60 808911A0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00A60 808911A0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00A64 808911A4 00E03025 */ or $a2, $a3, $zero ## $a2 = 00000000 /* 00A68 808911A8 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808911D4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808911D4.s index f454706214..0201a22353 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808911D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/func_808911D4.s @@ -63,12 +63,12 @@ glabel func_808911D4 /* 00B60 808912A0 00812821 */ addu $a1, $a0, $at /* 00B64 808912A4 AFA5002C */ sw $a1, 0x002C($sp) /* 00B68 808912A8 26060168 */ addiu $a2, $s0, 0x0168 ## $a2 = 00000168 -/* 00B6C 808912AC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00B6C 808912AC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00B70 808912B0 AFA30028 */ sw $v1, 0x0028($sp) /* 00B74 808912B4 8FA5002C */ lw $a1, 0x002C($sp) /* 00B78 808912B8 8FA40044 */ lw $a0, 0x0044($sp) -/* 00B7C 808912BC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00B7C 808912BC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00B80 808912C0 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 /* 00B84 808912C4 8FA30028 */ lw $v1, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Destroy.s index 856c717306..d7d985fa23 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Destroy.s @@ -12,7 +12,7 @@ glabel BgIceTurara_Destroy /* 000FC 8089201C 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 00100 80892020 8FA50018 */ lw $a1, 0x0018($sp) /* 00104 80892024 8FA4001C */ lw $a0, 0x001C($sp) -/* 00108 80892028 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00108 80892028 0C0170EB */ jal Collider_DestroyCylinder /* 0010C 8089202C 24A5016C */ addiu $a1, $a1, 0x016C ## $a1 = 0000016C /* 00110 80892030 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Init.s index 25daa84646..d01df898fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Init.s @@ -20,18 +20,18 @@ glabel BgIceTurara_Init /* 0003C 80891F5C 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 /* 00040 80891F60 2605016C */ addiu $a1, $s0, 0x016C ## $a1 = 0000016C /* 00044 80891F64 AFA50020 */ sw $a1, 0x0020($sp) -/* 00048 80891F68 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00048 80891F68 0C0170D9 */ jal Collider_InitCylinder /* 0004C 80891F6C 8FA40034 */ lw $a0, 0x0034($sp) /* 00050 80891F70 3C078089 */ lui $a3, %hi(D_80892620) ## $a3 = 80890000 /* 00054 80891F74 24E72620 */ addiu $a3, $a3, %lo(D_80892620) ## $a3 = 80892620 /* 00058 80891F78 8FA40034 */ lw $a0, 0x0034($sp) /* 0005C 80891F7C 8FA50020 */ lw $a1, 0x0020($sp) -/* 00060 80891F80 0C01712B */ jal ActorCollider_InitCylinder +/* 00060 80891F80 0C01712B */ jal Collider_SetCylinder /* 00064 80891F84 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00068 80891F88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0006C 80891F8C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0006C 80891F8C 0C0189B7 */ jal Collider_CylinderUpdate /* 00070 80891F90 8FA50020 */ lw $a1, 0x0020($sp) /* 00074 80891F94 8FA40034 */ lw $a0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892220.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892220.s index 5e2b98c81b..b423cee0cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892220.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892220.s @@ -19,7 +19,7 @@ glabel func_80892220 .L80892260: /* 00340 80892260 8FA4001C */ lw $a0, 0x001C($sp) /* 00344 80892264 24E6016C */ addiu $a2, $a3, 0x016C ## $a2 = 0000016C -/* 00348 80892268 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00348 80892268 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0034C 8089226C 00812821 */ addu $a1, $a0, $at /* 00350 80892270 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_808922B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_808922B8.s index 87917837be..82833cacd2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_808922B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_808922B8.s @@ -32,14 +32,14 @@ glabel func_808922B8 /* 00400 80892320 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 /* 00404 80892324 E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C /* 00408 80892328 AFA60024 */ sw $a2, 0x0024($sp) -/* 0040C 8089232C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0040C 8089232C 0C0189B7 */ jal Collider_CylinderUpdate /* 00410 80892330 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000016C /* 00414 80892334 8FA40034 */ lw $a0, 0x0034($sp) /* 00418 80892338 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0041C 8089233C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00420 80892340 8FA60024 */ lw $a2, 0x0024($sp) -/* 00424 80892344 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00424 80892344 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00428 80892348 00812821 */ addu $a1, $a0, $at /* 0042C 8089234C 8FA40034 */ lw $a0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892424.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892424.s index a6e1dec822..e24d93c6a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892424.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892424.s @@ -76,14 +76,14 @@ glabel func_80892424 /* 00614 80892534 46083281 */ sub.s $f10, $f6, $f8 /* 00618 80892538 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0061C 8089253C E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 00620 80892540 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00620 80892540 0C0189B7 */ jal Collider_CylinderUpdate /* 00624 80892544 AFA6002C */ sw $a2, 0x002C($sp) /* 00628 80892548 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0062C 8089254C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00630 80892550 8FA6002C */ lw $a2, 0x002C($sp) /* 00634 80892554 02212821 */ addu $a1, $s1, $at -/* 00638 80892558 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00638 80892558 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 0063C 8089255C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80892560: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Destroy.s index 8ccfa9adb5..1fd9cc4393 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Destroy.s @@ -9,7 +9,7 @@ glabel BgJya1flift_Destroy /* 00218 80892D78 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0021C 80892D7C A02030E0 */ sb $zero, %lo(D_808930E0)($at) /* 00220 80892D80 24E50164 */ addiu $a1, $a3, 0x0164 ## $a1 = 00000164 -/* 00224 80892D84 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00224 80892D84 0C0170EB */ jal Collider_DestroyCylinder /* 00228 80892D88 AFA70018 */ sw $a3, 0x0018($sp) /* 0022C 80892D8C 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Update.s index b57825732d..6dedeb91b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Update.s @@ -58,14 +58,14 @@ glabel BgJya1flift_Update /* 004F8 80893058 26060164 */ addiu $a2, $s0, 0x0164 ## $a2 = 00000164 /* 004FC 8089305C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000164 /* 00500 80893060 AFA60020 */ sw $a2, 0x0020($sp) -/* 00504 80893064 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00504 80893064 0C0189B7 */ jal Collider_CylinderUpdate /* 00508 80893068 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0050C 8089306C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00510 80893070 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00514 80893074 8FA60020 */ lw $a2, 0x0020($sp) /* 00518 80893078 02212821 */ addu $a1, $s1, $at -/* 0051C 8089307C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0051C 8089307C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00520 80893080 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00524 80893084 10000004 */ beq $zero, $zero, .L80893098 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892BE8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892BE8.s index f214e2d1bc..d9cefdd6f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892BE8.s @@ -6,14 +6,14 @@ glabel func_80892BE8 /* 00098 80892BF8 8FA50020 */ lw $a1, 0x0020($sp) /* 0009C 80892BFC AFBF0014 */ sw $ra, 0x0014($sp) /* 000A0 80892C00 24A50164 */ addiu $a1, $a1, 0x0164 ## $a1 = 00000164 -/* 000A4 80892C04 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000A4 80892C04 0C0170D9 */ jal Collider_InitCylinder /* 000A8 80892C08 AFA50018 */ sw $a1, 0x0018($sp) /* 000AC 80892C0C 3C078089 */ lui $a3, %hi(D_80893104) ## $a3 = 80890000 /* 000B0 80892C10 8FA50018 */ lw $a1, 0x0018($sp) /* 000B4 80892C14 8FA60020 */ lw $a2, 0x0020($sp) /* 000B8 80892C18 24E73104 */ addiu $a3, $a3, %lo(D_80893104) ## $a3 = 80893104 -/* 000BC 80892C1C 0C01712B */ jal ActorCollider_InitCylinder +/* 000BC 80892C1C 0C01712B */ jal Collider_SetCylinder /* 000C0 80892C20 8FA40024 */ lw $a0, 0x0024($sp) /* 000C4 80892C24 8FAF0020 */ lw $t7, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Destroy.s index f44930bcab..13239db4ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Destroy.s @@ -3,7 +3,7 @@ glabel BgJyaBombchuiwa_Destroy /* 000F0 80894590 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 000F4 80894594 AFBF0014 */ sw $ra, 0x0014($sp) /* 000F8 80894598 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000FC 8089459C 0C016F32 */ jal func_8005BCC8 +/* 000FC 8089459C 0C016F32 */ jal Collider_DestroyJntSph /* 00100 808945A0 24E50150 */ addiu $a1, $a3, 0x0150 ## $a1 = 00000150 /* 00104 808945A4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00108 808945A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944A0.s index 9ebac8b945..98d164b357 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808944A0.s @@ -6,7 +6,7 @@ glabel func_808944A0 /* 00010 808944B0 AFBF001C */ sw $ra, 0x001C($sp) /* 00014 808944B4 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 00018 808944B8 AFA50020 */ sw $a1, 0x0020($sp) -/* 0001C 808944BC 0C016EFE */ jal func_8005BBF8 +/* 0001C 808944BC 0C016EFE */ jal Collider_InitJntSph /* 00020 808944C0 AFA60028 */ sw $a2, 0x0028($sp) /* 00024 808944C4 8FA60028 */ lw $a2, 0x0028($sp) /* 00028 808944C8 3C078089 */ lui $a3, %hi(D_80894F64) ## $a3 = 80890000 @@ -14,7 +14,7 @@ glabel func_808944A0 /* 00030 808944D0 24CE0170 */ addiu $t6, $a2, 0x0170 ## $t6 = 00000170 /* 00034 808944D4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00038 808944D8 24E74F64 */ addiu $a3, $a3, %lo(D_80894F64) ## $a3 = 80894F64 -/* 0003C 808944DC 0C017014 */ jal func_8005C050 +/* 0003C 808944DC 0C017014 */ jal Collider_SetJntSph /* 00040 808944E0 8FA4002C */ lw $a0, 0x002C($sp) /* 00044 808944E4 8FBF001C */ lw $ra, 0x001C($sp) /* 00048 808944E8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_8089487C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_8089487C.s index 4fdc9e4c53..462aad157d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_8089487C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_8089487C.s @@ -49,12 +49,12 @@ glabel func_8089487C /* 00488 80894928 02212821 */ addu $a1, $s1, $at /* 0048C 8089492C 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 /* 00490 80894930 AFA60028 */ sw $a2, 0x0028($sp) -/* 00494 80894934 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00494 80894934 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00498 80894938 AFA5002C */ sw $a1, 0x002C($sp) /* 0049C 8089493C 8FA5002C */ lw $a1, 0x002C($sp) /* 004A0 80894940 8FA60028 */ lw $a2, 0x0028($sp) -/* 004A4 80894944 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 004A4 80894944 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 004A8 80894948 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 004AC 8089494C 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Destroy.s index 6a94426e85..a1f792e549 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Destroy.s @@ -12,7 +12,7 @@ glabel BgJyaBombiwa_Destroy /* 001D8 80895378 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 001DC 8089537C 8FA50018 */ lw $a1, 0x0018($sp) /* 001E0 80895380 8FA4001C */ lw $a0, 0x001C($sp) -/* 001E4 80895384 0C016F32 */ jal func_8005BCC8 +/* 001E4 80895384 0C016F32 */ jal Collider_DestroyJntSph /* 001E8 80895388 24A50168 */ addiu $a1, $a1, 0x0168 ## $a1 = 00000168 /* 001EC 8089538C 8FBF0014 */ lw $ra, 0x0014($sp) /* 001F0 80895390 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Update.s index 2566f4176d..16bfda1bbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Update.s @@ -31,7 +31,7 @@ glabel BgJyaBombiwa_Update /* 004F4 80895694 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00001E60 /* 004F8 80895698 02012821 */ addu $a1, $s0, $at /* 004FC 8089569C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00500 808956A0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00500 808956A0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00504 808956A4 26260168 */ addiu $a2, $s1, 0x0168 ## $a2 = 00000168 /* 00508 808956A8 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_80895228.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_80895228.s index 1adda40e0a..d743719150 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_80895228.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_80895228.s @@ -6,7 +6,7 @@ glabel func_80895228 /* 00098 80895238 AFBF001C */ sw $ra, 0x001C($sp) /* 0009C 8089523C 24C50168 */ addiu $a1, $a2, 0x0168 ## $a1 = 00000168 /* 000A0 80895240 AFA50020 */ sw $a1, 0x0020($sp) -/* 000A4 80895244 0C016EFE */ jal func_8005BBF8 +/* 000A4 80895244 0C016EFE */ jal Collider_InitJntSph /* 000A8 80895248 AFA60028 */ sw $a2, 0x0028($sp) /* 000AC 8089524C 8FA60028 */ lw $a2, 0x0028($sp) /* 000B0 80895250 3C078089 */ lui $a3, %hi(D_80895744) ## $a3 = 80890000 @@ -14,7 +14,7 @@ glabel func_80895228 /* 000B8 80895258 24CE0188 */ addiu $t6, $a2, 0x0188 ## $t6 = 00000188 /* 000BC 8089525C AFAE0010 */ sw $t6, 0x0010($sp) /* 000C0 80895260 24E75744 */ addiu $a3, $a3, %lo(D_80895744) ## $a3 = 80895744 -/* 000C4 80895264 0C017014 */ jal func_8005C050 +/* 000C4 80895264 0C017014 */ jal Collider_SetJntSph /* 000C8 80895268 8FA4002C */ lw $a0, 0x002C($sp) /* 000CC 8089526C 8FBF001C */ lw $ra, 0x001C($sp) /* 000D0 80895270 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Destroy.s index c1ea021f0f..ebe5a0c414 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Destroy.s @@ -3,7 +3,7 @@ glabel BgJyaGoroiwa_Destroy /* 00188 80897AF8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0018C 80897AFC AFBF0014 */ sw $ra, 0x0014($sp) /* 00190 80897B00 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00194 80897B04 0C016F32 */ jal func_8005BCC8 +/* 00194 80897B04 0C016F32 */ jal Collider_DestroyJntSph /* 00198 80897B08 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 0019C 80897B0C 8FBF0014 */ lw $ra, 0x0014($sp) /* 001A0 80897B10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Update.s index 45f599b74f..e2724db592 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Update.s @@ -43,7 +43,7 @@ glabel BgJyaGoroiwa_Update /* 00574 80897EE4 11200004 */ beq $t1, $zero, .L80897EF8 /* 00578 80897EE8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0057C 80897EEC 02212821 */ addu $a1, $s1, $at -/* 00580 80897EF0 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00580 80897EF0 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00584 80897EF4 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 .L80897EF8: @@ -51,7 +51,7 @@ glabel BgJyaGoroiwa_Update /* 0058C 80897EFC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00590 80897F00 02212821 */ addu $a1, $s1, $at /* 00594 80897F04 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00598 80897F08 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00598 80897F08 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0059C 80897F0C 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 /* 005A0 80897F10 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_808979C0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_808979C0.s index 76b68893b6..49a1386f11 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_808979C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/func_808979C0.s @@ -6,7 +6,7 @@ glabel func_808979C0 /* 00060 808979D0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00064 808979D4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00068 808979D8 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 0006C 808979DC 0C016EFE */ jal func_8005BBF8 +/* 0006C 808979DC 0C016EFE */ jal Collider_InitJntSph /* 00070 808979E0 AFA50028 */ sw $a1, 0x0028($sp) /* 00074 808979E4 3C078089 */ lui $a3, %hi(D_80897F94) ## $a3 = 80890000 /* 00078 808979E8 260E0170 */ addiu $t6, $s0, 0x0170 ## $t6 = 00000170 @@ -14,7 +14,7 @@ glabel func_808979C0 /* 00080 808979F0 AFAE0010 */ sw $t6, 0x0010($sp) /* 00084 808979F4 24E77F94 */ addiu $a3, $a3, %lo(D_80897F94) ## $a3 = 80897F94 /* 00088 808979F8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0008C 808979FC 0C017014 */ jal func_8005C050 +/* 0008C 808979FC 0C017014 */ jal Collider_SetJntSph /* 00090 80897A00 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00094 80897A04 0C225E5C */ jal func_80897970 /* 00098 80897A08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Destroy.s index f5e3413aa8..a9046b8c0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Destroy.s @@ -6,7 +6,7 @@ glabel BgJyaHaheniron_Destroy /* 00358 80898418 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0035C 8089841C 55C00004 */ bnel $t6, $zero, .L80898430 /* 00360 80898420 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00364 80898424 0C016F32 */ jal func_8005BCC8 +/* 00364 80898424 0C016F32 */ jal Collider_DestroyJntSph /* 00368 80898428 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 0036C 8089842C 8FBF0014 */ lw $ra, 0x0014($sp) .L80898430: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_808980C0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_808980C0.s index 70fb53972b..2c5d9edf8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_808980C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_808980C0.s @@ -6,7 +6,7 @@ glabel func_808980C0 /* 00010 808980D0 AFBF001C */ sw $ra, 0x001C($sp) /* 00014 808980D4 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 00018 808980D8 AFA50020 */ sw $a1, 0x0020($sp) -/* 0001C 808980DC 0C016EFE */ jal func_8005BBF8 +/* 0001C 808980DC 0C016EFE */ jal Collider_InitJntSph /* 00020 808980E0 AFA60028 */ sw $a2, 0x0028($sp) /* 00024 808980E4 8FA60028 */ lw $a2, 0x0028($sp) /* 00028 808980E8 3C07808A */ lui $a3, %hi(D_80898764) ## $a3 = 808A0000 @@ -14,7 +14,7 @@ glabel func_808980C0 /* 00030 808980F0 24CE0170 */ addiu $t6, $a2, 0x0170 ## $t6 = 00000170 /* 00034 808980F4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00038 808980F8 24E78764 */ addiu $a3, $a3, %lo(D_80898764) ## $a3 = 80898764 -/* 0003C 808980FC 0C017014 */ jal func_8005C050 +/* 0003C 808980FC 0C017014 */ jal Collider_SetJntSph /* 00040 80898100 8FA4002C */ lw $a0, 0x002C($sp) /* 00044 80898104 8FBF001C */ lw $ra, 0x001C($sp) /* 00048 80898108 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089844C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089844C.s index 0dec6c7cf1..b66bef6293 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089844C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_8089844C.s @@ -74,7 +74,7 @@ glabel func_8089844C /* 0048C 8089854C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 .L80898550: /* 00490 80898550 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00494 80898554 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00494 80898554 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00498 80898558 00812821 */ addu $a1, $a0, $at /* 0049C 8089855C 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Destroy.s index 6cc9cc5c85..bf54425c97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Destroy.s @@ -6,7 +6,7 @@ glabel BgJyaIronobj_Destroy /* 00A00 808992A0 8FA50018 */ lw $a1, 0x0018($sp) /* 00A04 808992A4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00A08 808992A8 AFA7001C */ sw $a3, 0x001C($sp) -/* 00A0C 808992AC 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00A0C 808992AC 0C0170EB */ jal Collider_DestroyCylinder /* 00A10 808992B0 24A50168 */ addiu $a1, $a1, 0x0168 ## $a1 = 00000168 /* 00A14 808992B4 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808988A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808988A0.s index e154d26982..9fd98be316 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808988A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808988A0.s @@ -6,14 +6,14 @@ glabel func_808988A0 /* 00010 808988B0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00014 808988B4 24C50168 */ addiu $a1, $a2, 0x0168 ## $a1 = 00000168 /* 00018 808988B8 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 808988BC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0001C 808988BC 0C0170D9 */ jal Collider_InitCylinder /* 00020 808988C0 AFA60020 */ sw $a2, 0x0020($sp) /* 00024 808988C4 3C07808A */ lui $a3, %hi(D_808994AC) ## $a3 = 808A0000 /* 00028 808988C8 8FA60020 */ lw $a2, 0x0020($sp) /* 0002C 808988CC 24E794AC */ addiu $a3, $a3, %lo(D_808994AC) ## $a3 = 808994AC /* 00030 808988D0 8FA40024 */ lw $a0, 0x0024($sp) -/* 00034 808988D4 0C01712B */ jal ActorCollider_InitCylinder +/* 00034 808988D4 0C01712B */ jal Collider_SetCylinder /* 00038 808988D8 8FA50018 */ lw $a1, 0x0018($sp) /* 0003C 808988DC 8FA60020 */ lw $a2, 0x0020($sp) @@ -28,7 +28,7 @@ glabel func_808988A0 /* 00060 80898900 A4D801A8 */ sh $t8, 0x01A8($a2) ## 000001A8 /* 00064 80898904 A4D901AA */ sh $t9, 0x01AA($a2) ## 000001AA .L80898908: -/* 00068 80898908 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00068 80898908 0C0189B7 */ jal Collider_CylinderUpdate /* 0006C 8089890C 8FA50018 */ lw $a1, 0x0018($sp) /* 00070 80898910 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808992E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808992E8.s index 5f5b4a8f72..915e2b7e46 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808992E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_808992E8.s @@ -71,7 +71,7 @@ glabel func_808992E8 /* 00B48 808993E8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00001E60 /* 00B4C 808993EC 02612821 */ addu $a1, $s3, $at /* 00B50 808993F0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00B54 808993F4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00B54 808993F4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00B58 808993F8 26860168 */ addiu $a2, $s4, 0x0168 ## $a2 = 00000168 /* 00B5C 808993FC 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Destroy.s index 0366887360..5a9178170c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/BgJyaMegami_Destroy.s @@ -12,7 +12,7 @@ glabel BgJyaMegami_Destroy /* 00498 8089A5C8 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 0049C 8089A5CC 8FA50018 */ lw $a1, 0x0018($sp) /* 004A0 8089A5D0 8FA4001C */ lw $a0, 0x001C($sp) -/* 004A4 8089A5D4 0C016F32 */ jal func_8005BCC8 +/* 004A4 8089A5D4 0C016F32 */ jal Collider_DestroyJntSph /* 004A8 8089A5D8 24A50168 */ addiu $a1, $a1, 0x0168 ## $a1 = 00000168 /* 004AC 8089A5DC 8FBF0014 */ lw $ra, 0x0014($sp) /* 004B0 8089A5E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A188.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A188.s index 179a980c03..a14c5ab973 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A188.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A188.s @@ -6,7 +6,7 @@ glabel func_8089A188 /* 00068 8089A198 AFBF001C */ sw $ra, 0x001C($sp) /* 0006C 8089A19C 24C50168 */ addiu $a1, $a2, 0x0168 ## $a1 = 00000168 /* 00070 8089A1A0 AFA50020 */ sw $a1, 0x0020($sp) -/* 00074 8089A1A4 0C016EFE */ jal func_8005BBF8 +/* 00074 8089A1A4 0C016EFE */ jal Collider_InitJntSph /* 00078 8089A1A8 AFA60028 */ sw $a2, 0x0028($sp) /* 0007C 8089A1AC 8FA60028 */ lw $a2, 0x0028($sp) /* 00080 8089A1B0 3C07808A */ lui $a3, %hi(D_8089B004) ## $a3 = 808A0000 @@ -14,7 +14,7 @@ glabel func_8089A188 /* 00088 8089A1B8 24CE0188 */ addiu $t6, $a2, 0x0188 ## $t6 = 00000188 /* 0008C 8089A1BC AFAE0010 */ sw $t6, 0x0010($sp) /* 00090 8089A1C0 24E7B004 */ addiu $a3, $a3, %lo(D_8089B004) ## $a3 = 8089B004 -/* 00094 8089A1C4 0C017014 */ jal func_8005C050 +/* 00094 8089A1C4 0C017014 */ jal Collider_SetJntSph /* 00098 8089A1C8 8FA4002C */ lw $a0, 0x002C($sp) /* 0009C 8089A1CC 8FBF001C */ lw $ra, 0x001C($sp) /* 000A0 8089A1D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A604.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A604.s index 71ea3e28d7..29298cc51b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A604.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A604.s @@ -109,7 +109,7 @@ glabel func_8089A604 /* 00634 8089A764 8FA4002C */ lw $a0, 0x002C($sp) /* 00638 8089A768 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0063C 8089A76C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00640 8089A770 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00640 8089A770 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00644 8089A774 00812821 */ addu $a1, $a0, $at /* 00648 8089A778 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Destroy.s index d3b7fe82bc..a65dc33f93 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Destroy.s @@ -3,7 +3,7 @@ glabel BgMenkuriEye_Destroy /* 000DC 8089BD4C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 000E0 8089BD50 AFBF0014 */ sw $ra, 0x0014($sp) /* 000E4 8089BD54 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000E8 8089BD58 0C016F32 */ jal func_8005BCC8 +/* 000E8 8089BD58 0C016F32 */ jal Collider_DestroyJntSph /* 000EC 8089BD5C 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 000F0 8089BD60 8FBF0014 */ lw $ra, 0x0014($sp) /* 000F4 8089BD64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Init.s index 0be8f5393d..638f60fe4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Init.s @@ -10,7 +10,7 @@ glabel BgMenkuriEye_Init /* 0001C 8089BC8C 24A5C0C4 */ addiu $a1, $a1, %lo(D_8089C0C4) ## $a1 = 8089C0C4 /* 00020 8089BC90 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 00024 8089BC94 AFA5002C */ sw $a1, 0x002C($sp) -/* 00028 8089BC98 0C016EFE */ jal func_8005BBF8 +/* 00028 8089BC98 0C016EFE */ jal Collider_InitJntSph /* 0002C 8089BC9C 8FA4003C */ lw $a0, 0x003C($sp) /* 00030 8089BCA0 3C07808A */ lui $a3, %hi(D_8089C0B4) ## $a3 = 808A0000 /* 00034 8089BCA4 260E0170 */ addiu $t6, $s0, 0x0170 ## $t6 = 00000170 @@ -18,7 +18,7 @@ glabel BgMenkuriEye_Init /* 0003C 8089BCAC AFAE0010 */ sw $t6, 0x0010($sp) /* 00040 8089BCB0 24E7C0B4 */ addiu $a3, $a3, %lo(D_8089C0B4) ## $a3 = 8089C0B4 /* 00044 8089BCB4 8FA4003C */ lw $a0, 0x003C($sp) -/* 00048 8089BCB8 0C017014 */ jal func_8005C050 +/* 00048 8089BCB8 0C017014 */ jal Collider_SetJntSph /* 0004C 8089BCBC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00050 8089BCC0 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 00054 8089BCC4 8E19016C */ lw $t9, 0x016C($s0) ## 0000016C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Update.s index 5006fdbf4c..2c9af6940b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Update.s @@ -91,7 +91,7 @@ glabel BgMenkuriEye_Update /* 0023C 8089BEAC 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 /* 00240 8089BEB0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00244 8089BEB4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00248 8089BEB8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00248 8089BEB8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0024C 8089BEBC 00812821 */ addu $a1, $a0, $at .L8089BEC0: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Destroy.s index d45db020ab..d027c2fa36 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Destroy.s @@ -12,7 +12,7 @@ glabel BgMizuBwall_Destroy /* 00960 8089CDE0 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 00964 8089CDE4 8FA50018 */ lw $a1, 0x0018($sp) /* 00968 8089CDE8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0096C 8089CDEC 0C017232 */ jal func_8005C8C8 +/* 0096C 8089CDEC 0C017232 */ jal Collider_DestroyTris /* 00970 8089CDF0 24A50164 */ addiu $a1, $a1, 0x0164 ## $a1 = 00000164 /* 00974 8089CDF4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00978 8089CDF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Init.s index b5872702fa..360d6e3da4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Init.s @@ -129,7 +129,7 @@ glabel L8089C5B0 /* 00168 8089C5E8 AE4C0298 */ sw $t4, 0x0298($s2) ## 00000298 .L8089C5EC: /* 0016C 8089C5EC 265E0164 */ addiu $s8, $s2, 0x0164 ## $s8 = 00000164 -/* 00170 8089C5F0 0C0171F8 */ jal func_8005C7E0 +/* 00170 8089C5F0 0C0171F8 */ jal Collider_InitTris /* 00174 8089C5F4 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000164 /* 00178 8089C5F8 3C13808A */ lui $s3, %hi(D_8089D738) ## $s3 = 808A0000 /* 0017C 8089C5FC 2673D738 */ addiu $s3, $s3, %lo(D_8089D738) ## $s3 = 8089D738 @@ -138,7 +138,7 @@ glabel L8089C5B0 /* 00188 8089C608 02603825 */ or $a3, $s3, $zero ## $a3 = 8089D738 /* 0018C 8089C60C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00190 8089C610 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000164 -/* 00194 8089C614 0C0172EB */ jal func_8005CBAC +/* 00194 8089C614 0C0172EB */ jal Collider_SetTris /* 00198 8089C618 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 0019C 8089C61C 1440000B */ bne $v0, $zero, .L8089C64C /* 001A0 8089C620 3C04808A */ lui $a0, %hi(D_8089D870) ## $a0 = 808A0000 @@ -239,7 +239,7 @@ glabel L8089C740 /* 002F8 8089C778 AE4A0298 */ sw $t2, 0x0298($s2) ## 00000298 .L8089C77C: /* 002FC 8089C77C 265E0164 */ addiu $s8, $s2, 0x0164 ## $s8 = 00000164 -/* 00300 8089C780 0C0171F8 */ jal func_8005C7E0 +/* 00300 8089C780 0C0171F8 */ jal Collider_InitTris /* 00304 8089C784 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000164 /* 00308 8089C788 3C16808A */ lui $s6, %hi(D_8089D784) ## $s6 = 808A0000 /* 0030C 8089C78C 26D6D784 */ addiu $s6, $s6, %lo(D_8089D784) ## $s6 = 8089D784 @@ -248,7 +248,7 @@ glabel L8089C740 /* 00318 8089C798 02C03825 */ or $a3, $s6, $zero ## $a3 = 8089D784 /* 0031C 8089C79C 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFFC0 /* 00320 8089C7A0 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000164 -/* 00324 8089C7A4 0C0172EB */ jal func_8005CBAC +/* 00324 8089C7A4 0C0172EB */ jal Collider_SetTris /* 00328 8089C7A8 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 0032C 8089C7AC 1440000B */ bne $v0, $zero, .L8089C7DC /* 00330 8089C7B0 3C04808A */ lui $a0, %hi(D_8089D8C4) ## $a0 = 808A0000 @@ -350,7 +350,7 @@ glabel L8089C8D4 /* 0048C 8089C90C AE480298 */ sw $t0, 0x0298($s2) ## 00000298 .L8089C910: /* 00490 8089C910 265E0164 */ addiu $s8, $s2, 0x0164 ## $s8 = 00000164 -/* 00494 8089C914 0C0171F8 */ jal func_8005C7E0 +/* 00494 8089C914 0C0171F8 */ jal Collider_InitTris /* 00498 8089C918 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000164 /* 0049C 8089C91C 3C07808A */ lui $a3, %hi(D_8089D80C) ## $a3 = 808A0000 /* 004A0 8089C920 26490184 */ addiu $t1, $s2, 0x0184 ## $t1 = 00000184 @@ -358,7 +358,7 @@ glabel L8089C8D4 /* 004A8 8089C928 24E7D80C */ addiu $a3, $a3, %lo(D_8089D80C) ## $a3 = 8089D80C /* 004AC 8089C92C 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFF80 /* 004B0 8089C930 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000164 -/* 004B4 8089C934 0C0172EB */ jal func_8005CBAC +/* 004B4 8089C934 0C0172EB */ jal Collider_SetTris /* 004B8 8089C938 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 004BC 8089C93C 1440000B */ bne $v0, $zero, .L8089C96C /* 004C0 8089C940 3C04808A */ lui $a0, %hi(D_8089D918) ## $a0 = 808A0000 @@ -458,7 +458,7 @@ glabel L8089CA5C /* 00614 8089CA94 AE580298 */ sw $t8, 0x0298($s2) ## 00000298 .L8089CA98: /* 00618 8089CA98 265E0164 */ addiu $s8, $s2, 0x0164 ## $s8 = 00000164 -/* 0061C 8089CA9C 0C0171F8 */ jal func_8005C7E0 +/* 0061C 8089CA9C 0C0171F8 */ jal Collider_InitTris /* 00620 8089CAA0 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000164 /* 00624 8089CAA4 3C07808A */ lui $a3, %hi(D_8089D81C) ## $a3 = 808A0000 /* 00628 8089CAA8 26590184 */ addiu $t9, $s2, 0x0184 ## $t9 = 00000184 @@ -466,7 +466,7 @@ glabel L8089CA5C /* 00630 8089CAB0 24E7D81C */ addiu $a3, $a3, %lo(D_8089D81C) ## $a3 = 8089D81C /* 00634 8089CAB4 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFF40 /* 00638 8089CAB8 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000164 -/* 0063C 8089CABC 0C0172EB */ jal func_8005CBAC +/* 0063C 8089CABC 0C0172EB */ jal Collider_SetTris /* 00640 8089CAC0 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00644 8089CAC4 1440000B */ bne $v0, $zero, .L8089CAF4 /* 00648 8089CAC8 3C04808A */ lui $a0, %hi(D_8089D96C) ## $a0 = 808A0000 @@ -569,7 +569,7 @@ glabel L8089CBF0 /* 007A8 8089CC28 AE4E0298 */ sw $t6, 0x0298($s2) ## 00000298 .L8089CC2C: /* 007AC 8089CC2C 265E0164 */ addiu $s8, $s2, 0x0164 ## $s8 = 00000164 -/* 007B0 8089CC30 0C0171F8 */ jal func_8005C7E0 +/* 007B0 8089CC30 0C0171F8 */ jal Collider_InitTris /* 007B4 8089CC34 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000164 /* 007B8 8089CC38 3C07808A */ lui $a3, %hi(D_8089D81C) ## $a3 = 808A0000 /* 007BC 8089CC3C 264F0184 */ addiu $t7, $s2, 0x0184 ## $t7 = 00000184 @@ -577,7 +577,7 @@ glabel L8089CBF0 /* 007C4 8089CC44 24E7D81C */ addiu $a3, $a3, %lo(D_8089D81C) ## $a3 = 8089D81C /* 007C8 8089CC48 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFF00 /* 007CC 8089CC4C 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000164 -/* 007D0 8089CC50 0C0172EB */ jal func_8005CBAC +/* 007D0 8089CC50 0C0172EB */ jal Collider_SetTris /* 007D4 8089CC54 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 007D8 8089CC58 1440000B */ bne $v0, $zero, .L8089CC88 /* 007DC 8089CC5C 3C04808A */ lui $a0, %hi(D_8089D9C0) ## $a0 = 808A0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D258.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D258.s index 6111b7ca4a..9df2e82f59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D258.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/func_8089D258.s @@ -58,7 +58,7 @@ glabel func_8089D258 /* 00EA8 8089D328 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00EAC 8089D32C 45020004 */ bc1fl .L8089D340 /* 00EB0 8089D330 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00EB4 8089D334 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00EB4 8089D334 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00EB8 8089D338 26060164 */ addiu $a2, $s0, 0x0164 ## $a2 = 00000164 .L8089D33C: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Destroy.s index 3aa255bbed..88530e5e4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Destroy.s @@ -17,7 +17,7 @@ glabel BgMoriHashigo_Destroy /* 003F4 808A2954 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 003F8 808A2958 14410003 */ bne $v0, $at, .L808A2968 /* 003FC 808A295C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00400 808A2960 0C016F32 */ jal func_8005BCC8 +/* 00400 808A2960 0C016F32 */ jal Collider_DestroyJntSph /* 00404 808A2964 24E50164 */ addiu $a1, $a3, 0x0164 ## $a1 = 00000164 .L808A2968: /* 00408 808A2968 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A25E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A25E8.s index 254c1342b8..327c4eea9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A25E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A25E8.s @@ -6,7 +6,7 @@ glabel func_808A25E8 /* 00098 808A25F8 AFBF001C */ sw $ra, 0x001C($sp) /* 0009C 808A25FC 24C50164 */ addiu $a1, $a2, 0x0164 ## $a1 = 00000164 /* 000A0 808A2600 AFA50020 */ sw $a1, 0x0020($sp) -/* 000A4 808A2604 0C016EFE */ jal func_8005BBF8 +/* 000A4 808A2604 0C016EFE */ jal Collider_InitJntSph /* 000A8 808A2608 AFA60028 */ sw $a2, 0x0028($sp) /* 000AC 808A260C 8FA60028 */ lw $a2, 0x0028($sp) /* 000B0 808A2610 3C07808A */ lui $a3, %hi(D_808A2DC4) ## $a3 = 808A0000 @@ -14,7 +14,7 @@ glabel func_808A25E8 /* 000B8 808A2618 24CE0184 */ addiu $t6, $a2, 0x0184 ## $t6 = 00000184 /* 000BC 808A261C AFAE0010 */ sw $t6, 0x0010($sp) /* 000C0 808A2620 24E72DC4 */ addiu $a3, $a3, %lo(D_808A2DC4) ## $a3 = 808A2DC4 -/* 000C4 808A2624 0C017014 */ jal func_8005C050 +/* 000C4 808A2624 0C017014 */ jal Collider_SetJntSph /* 000C8 808A2628 8FA4002C */ lw $a0, 0x002C($sp) /* 000CC 808A262C 8FA60028 */ lw $a2, 0x0028($sp) /* 000D0 808A2630 C4C40024 */ lwc1 $f4, 0x0024($a2) ## 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A14.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A14.s index 8e678ab3df..4bc7987228 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A14.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A14.s @@ -19,7 +19,7 @@ glabel func_808A2A14 .L808A2A58: /* 004F8 808A2A58 8FA4001C */ lw $a0, 0x001C($sp) /* 004FC 808A2A5C 24E60164 */ addiu $a2, $a3, 0x0164 ## $a2 = 00000164 -/* 00500 808A2A60 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00500 808A2A60 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00504 808A2A64 00812821 */ addu $a1, $a0, $at .L808A2A68: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s index 50a4f7a07f..04c17b21b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s @@ -9,7 +9,7 @@ glabel BgPoEvent_Destroy /* 00654 808A6864 54200007 */ bnel $at, $zero, .L808A6884 /* 00658 808A6868 8CE6014C */ lw $a2, 0x014C($a3) ## 0000014C /* 0065C 808A686C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00660 808A6870 0C017232 */ jal func_8005C8C8 +/* 00660 808A6870 0C017232 */ jal Collider_DestroyTris /* 00664 808A6874 24E50170 */ addiu $a1, $a3, 0x0170 ## $a1 = 00000170 /* 00668 808A6878 10000012 */ beq $zero, $zero, .L808A68C4 /* 0066C 808A687C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Init.s index 537b95eb07..c46a71c9b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Init.s @@ -25,7 +25,7 @@ glabel BgPoEvent_Init /* 00584 808A6794 A60B001C */ sh $t3, 0x001C($s0) ## 0000001C /* 00588 808A6798 26050170 */ addiu $a1, $s0, 0x0170 ## $a1 = 00000170 /* 0058C 808A679C AFA5002C */ sw $a1, 0x002C($sp) -/* 00590 808A67A0 0C0171F8 */ jal func_8005C7E0 +/* 00590 808A67A0 0C0171F8 */ jal Collider_InitTris /* 00594 808A67A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00598 808A67A8 3C07808A */ lui $a3, %hi(D_808A7D48) ## $a3 = 808A0000 /* 0059C 808A67AC 260D0190 */ addiu $t5, $s0, 0x0190 ## $t5 = 00000190 @@ -33,7 +33,7 @@ glabel BgPoEvent_Init /* 005A4 808A67B4 AFAD0010 */ sw $t5, 0x0010($sp) /* 005A8 808A67B8 24E77D48 */ addiu $a3, $a3, %lo(D_808A7D48) ## $a3 = 808A7D48 /* 005AC 808A67BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005B0 808A67C0 0C0172EB */ jal func_8005CBAC +/* 005B0 808A67C0 0C0172EB */ jal Collider_SetTris /* 005B4 808A67C4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 005B8 808A67C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005BC 808A67CC 0C00B2D0 */ jal Flags_GetSwitch diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Update.s index 33442fb499..5bb9ae61f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Update.s @@ -19,7 +19,7 @@ glabel BgPoEvent_Update /* 017E8 808A79F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 017EC 808A79FC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 017F0 808A7A00 00812821 */ addu $a1, $a0, $at -/* 017F4 808A7A04 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 017F4 808A7A04 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 017F8 808A7A08 24E60170 */ addiu $a2, $a3, 0x0170 ## $a2 = 00000170 .L808A7A0C: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Destroy.s index e3e6ae4b7e..e315207659 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Destroy.s @@ -11,7 +11,7 @@ glabel BgPoSyokudai_Destroy /* 002C0 808A8370 24A507A8 */ addiu $a1, $a1, 0x07A8 ## $a1 = 000007A8 /* 002C4 808A8374 8FA50018 */ lw $a1, 0x0018($sp) /* 002C8 808A8378 8FA4001C */ lw $a0, 0x001C($sp) -/* 002CC 808A837C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002CC 808A837C 0C0170EB */ jal Collider_DestroyCylinder /* 002D0 808A8380 24A50164 */ addiu $a1, $a1, 0x0164 ## $a1 = 00000164 /* 002D4 808A8384 8FA7001C */ lw $a3, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Init.s index e457298dc3..1d85462429 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Init.s @@ -54,14 +54,14 @@ glabel BgPoSyokudai_Init /* 000B8 808A8168 8FA4003C */ lw $a0, 0x003C($sp) /* 000BC 808A816C 26050164 */ addiu $a1, $s0, 0x0164 ## $a1 = 00000164 /* 000C0 808A8170 AFA5003C */ sw $a1, 0x003C($sp) -/* 000C4 808A8174 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000C4 808A8174 0C0170D9 */ jal Collider_InitCylinder /* 000C8 808A8178 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000CC 808A817C 3C07808B */ lui $a3, %hi(D_808A8960) ## $a3 = 808B0000 /* 000D0 808A8180 8FA5003C */ lw $a1, 0x003C($sp) /* 000D4 808A8184 24E78960 */ addiu $a3, $a3, %lo(D_808A8960) ## $a3 = 808A8960 /* 000D8 808A8188 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000DC 808A818C 0C01712B */ jal ActorCollider_InitCylinder +/* 000DC 808A818C 0C01712B */ jal Collider_SetCylinder /* 000E0 808A8190 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000E4 808A8194 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Update.s index 9ad71336de..3bfbce1ab3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Update.s @@ -11,12 +11,12 @@ glabel BgPoSyokudai_Update /* 00330 808A83E0 26060164 */ addiu $a2, $s0, 0x0164 ## $a2 = 00000164 /* 00334 808A83E4 AFA60020 */ sw $a2, 0x0020($sp) /* 00338 808A83E8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0033C 808A83EC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0033C 808A83EC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00340 808A83F0 AFA70034 */ sw $a3, 0x0034($sp) /* 00344 808A83F4 8FA50024 */ lw $a1, 0x0024($sp) /* 00348 808A83F8 8FA60020 */ lw $a2, 0x0020($sp) -/* 0034C 808A83FC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0034C 808A83FC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00350 808A8400 8FA40034 */ lw $a0, 0x0034($sp) /* 00354 808A8404 8FA40034 */ lw $a0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Destroy.s index e670d4e938..dca8dd2f60 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Destroy.s @@ -21,7 +21,7 @@ glabel BgSpot06Objects_Destroy /* 00420 808AEBA0 10000004 */ beq $zero, $zero, .L808AEBB4 /* 00424 808AEBA4 8FBF0014 */ lw $ra, 0x0014($sp) .L808AEBA8: -/* 00428 808AEBA8 0C016F32 */ jal func_8005BCC8 +/* 00428 808AEBA8 0C016F32 */ jal Collider_DestroyJntSph /* 0042C 808AEBAC 8FA4001C */ lw $a0, 0x001C($sp) .L808AEBB0: /* 00430 808AEBB0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Init.s index d8c16122a8..c1f2f7fc33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Init.s @@ -100,7 +100,7 @@ glabel BgSpot06Objects_Init /* 00118 808AE898 24A5F964 */ addiu $a1, $a1, %lo(D_808AF964) ## $a1 = 808AF964 /* 0011C 808AE89C 26050170 */ addiu $a1, $s0, 0x0170 ## $a1 = 00000170 /* 00120 808AE8A0 AFA5002C */ sw $a1, 0x002C($sp) -/* 00124 808AE8A4 0C016EFE */ jal func_8005BBF8 +/* 00124 808AE8A4 0C016EFE */ jal Collider_InitJntSph /* 00128 808AE8A8 8FA40044 */ lw $a0, 0x0044($sp) /* 0012C 808AE8AC 3C07808B */ lui $a3, %hi(D_808AF954) ## $a3 = 808B0000 /* 00130 808AE8B0 260A0190 */ addiu $t2, $s0, 0x0190 ## $t2 = 00000190 @@ -108,7 +108,7 @@ glabel BgSpot06Objects_Init /* 00138 808AE8B8 AFAA0010 */ sw $t2, 0x0010($sp) /* 0013C 808AE8BC 24E7F954 */ addiu $a3, $a3, %lo(D_808AF954) ## $a3 = 808AF954 /* 00140 808AE8C0 8FA40044 */ lw $a0, 0x0044($sp) -/* 00144 808AE8C4 0C017014 */ jal func_8005C050 +/* 00144 808AE8C4 0C017014 */ jal Collider_SetJntSph /* 00148 808AE8C8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0014C 808AE8CC 3C038016 */ lui $v1, %hi(gSaveContext) /* 00150 808AE8D0 2463E660 */ addiu $v1, %lo(gSaveContext) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Update.s index ab6f385adb..5880ef3a7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Update.s @@ -14,7 +14,7 @@ glabel BgSpot06Objects_Update /* 00D80 808AF500 15C10004 */ bne $t6, $at, .L808AF514 /* 00D84 808AF504 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00D88 808AF508 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00D8C 808AF50C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00D8C 808AF50C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00D90 808AF510 00812821 */ addu $a1, $a0, $at .L808AF514: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s index 2ef46733a2..bfa7351d13 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s @@ -138,7 +138,7 @@ glabel func_808AEEFC /* 0095C 808AF0DC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00001E60 /* 00960 808AF0E0 02412821 */ addu $a1, $s2, $at /* 00964 808AF0E4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00968 808AF0E8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00968 808AF0E8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0096C 808AF0EC 26260170 */ addiu $a2, $s1, 0x0170 ## $a2 = 00000170 /* 00970 808AF0F0 8FBF0054 */ lw $ra, 0x0054($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Destroy.s index d62aa6e92d..664c815600 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Destroy.s @@ -12,7 +12,7 @@ glabel BgSpot08Bakudankabe_Destroy /* 0040C 808B06DC 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 00410 808B06E0 8FA50018 */ lw $a1, 0x0018($sp) /* 00414 808B06E4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00418 808B06E8 0C016F32 */ jal func_8005BCC8 +/* 00418 808B06E8 0C016F32 */ jal Collider_DestroyJntSph /* 0041C 808B06EC 24A50164 */ addiu $a1, $a1, 0x0164 ## $a1 = 00000164 /* 00420 808B06F0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00424 808B06F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Update.s index b1918bc5d4..36f3412577 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Update.s @@ -39,7 +39,7 @@ glabel BgSpot08Bakudankabe_Update /* 004B4 808B0784 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 004B8 808B0788 45020004 */ bc1fl .L808B079C /* 004BC 808B078C 8FBF001C */ lw $ra, 0x001C($sp) -/* 004C0 808B0790 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 004C0 808B0790 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 004C4 808B0794 26060164 */ addiu $a2, $s0, 0x0164 ## $a2 = 00000164 /* 004C8 808B0798 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B02D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B02D0.s index f197e40994..1c38a88508 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B02D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B02D0.s @@ -6,7 +6,7 @@ glabel func_808B02D0 /* 00010 808B02E0 AFBF001C */ sw $ra, 0x001C($sp) /* 00014 808B02E4 24C50164 */ addiu $a1, $a2, 0x0164 ## $a1 = 00000164 /* 00018 808B02E8 AFA50020 */ sw $a1, 0x0020($sp) -/* 0001C 808B02EC 0C016EFE */ jal func_8005BBF8 +/* 0001C 808B02EC 0C016EFE */ jal Collider_InitJntSph /* 00020 808B02F0 AFA60028 */ sw $a2, 0x0028($sp) /* 00024 808B02F4 8FA60028 */ lw $a2, 0x0028($sp) /* 00028 808B02F8 3C07808B */ lui $a3, %hi(D_808B089C) ## $a3 = 808B0000 @@ -14,7 +14,7 @@ glabel func_808B02D0 /* 00030 808B0300 24CE0184 */ addiu $t6, $a2, 0x0184 ## $t6 = 00000184 /* 00034 808B0304 AFAE0010 */ sw $t6, 0x0010($sp) /* 00038 808B0308 24E7089C */ addiu $a3, $a3, %lo(D_808B089C) ## $a3 = 808B089C -/* 0003C 808B030C 0C017014 */ jal func_8005C050 +/* 0003C 808B030C 0C017014 */ jal Collider_SetJntSph /* 00040 808B0310 8FA4002C */ lw $a0, 0x002C($sp) /* 00044 808B0314 8FBF001C */ lw $ra, 0x001C($sp) /* 00048 808B0318 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Destroy.s index 2b6d87dcc3..ad6bd959f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Destroy.s @@ -12,7 +12,7 @@ glabel BgSpot11Bakudankabe_Destroy /* 00478 808B25F8 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 0047C 808B25FC 8FA50018 */ lw $a1, 0x0018($sp) /* 00480 808B2600 8FA4001C */ lw $a0, 0x001C($sp) -/* 00484 808B2604 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00484 808B2604 0C0170EB */ jal Collider_DestroyCylinder /* 00488 808B2608 24A50164 */ addiu $a1, $a1, 0x0164 ## $a1 = 00000164 /* 0048C 808B260C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Update.s index 9091d9ede6..fed1eded9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Update.s @@ -34,7 +34,7 @@ glabel BgSpot11Bakudankabe_Update /* 0050C 808B268C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00001E60 /* 00510 808B2690 02012821 */ addu $a1, $s0, $at /* 00514 808B2694 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00518 808B2698 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00518 808B2698 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0051C 808B269C 26260164 */ addiu $a2, $s1, 0x0164 ## $a2 = 00000164 /* 00520 808B26A0 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2180.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2180.s index a301838b19..bce11791b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2180.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2180.s @@ -6,14 +6,14 @@ glabel func_808B2180 /* 00010 808B2190 AFBF0014 */ sw $ra, 0x0014($sp) /* 00014 808B2194 24C50164 */ addiu $a1, $a2, 0x0164 ## $a1 = 00000164 /* 00018 808B2198 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 808B219C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0001C 808B219C 0C0170D9 */ jal Collider_InitCylinder /* 00020 808B21A0 AFA60020 */ sw $a2, 0x0020($sp) /* 00024 808B21A4 3C07808B */ lui $a3, %hi(D_808B2700) ## $a3 = 808B0000 /* 00028 808B21A8 8FA50018 */ lw $a1, 0x0018($sp) /* 0002C 808B21AC 8FA60020 */ lw $a2, 0x0020($sp) /* 00030 808B21B0 24E72700 */ addiu $a3, $a3, %lo(D_808B2700) ## $a3 = 808B2700 -/* 00034 808B21B4 0C01712B */ jal ActorCollider_InitCylinder +/* 00034 808B21B4 0C01712B */ jal Collider_SetCylinder /* 00038 808B21B8 8FA40024 */ lw $a0, 0x0024($sp) /* 0003C 808B21BC 8FA60020 */ lw $a2, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Destroy.s index be9d4b49fe..62115eda33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Destroy.s @@ -8,11 +8,11 @@ glabel BgSpot16Bombstone_Destroy /* 00544 808B5174 15C10008 */ bne $t6, $at, .L808B5198 /* 00548 808B5178 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0054C 808B517C 24C50164 */ addiu $a1, $a2, 0x0164 ## $a1 = 00000164 -/* 00550 808B5180 0C016F32 */ jal func_8005BCC8 +/* 00550 808B5180 0C016F32 */ jal Collider_DestroyJntSph /* 00554 808B5184 AFA60018 */ sw $a2, 0x0018($sp) /* 00558 808B5188 8FA60018 */ lw $a2, 0x0018($sp) /* 0055C 808B518C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00560 808B5190 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00560 808B5190 0C0170EB */ jal Collider_DestroyCylinder /* 00564 808B5194 24C501C4 */ addiu $a1, $a2, 0x01C4 ## $a1 = 000001C4 .L808B5198: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C4C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C4C.s index 93c408c8e3..434183c90c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C4C.s @@ -6,7 +6,7 @@ glabel func_808B4C4C /* 0002C 808B4C5C AFBF001C */ sw $ra, 0x001C($sp) /* 00030 808B4C60 24C50164 */ addiu $a1, $a2, 0x0164 ## $a1 = 00000164 /* 00034 808B4C64 AFA50020 */ sw $a1, 0x0020($sp) -/* 00038 808B4C68 0C016EFE */ jal func_8005BBF8 +/* 00038 808B4C68 0C016EFE */ jal Collider_InitJntSph /* 0003C 808B4C6C AFA60028 */ sw $a2, 0x0028($sp) /* 00040 808B4C70 8FA60028 */ lw $a2, 0x0028($sp) /* 00044 808B4C74 3C07808B */ lui $a3, %hi(D_808B5E74) ## $a3 = 808B0000 @@ -14,7 +14,7 @@ glabel func_808B4C4C /* 0004C 808B4C7C 24CE0184 */ addiu $t6, $a2, 0x0184 ## $t6 = 00000184 /* 00050 808B4C80 AFAE0010 */ sw $t6, 0x0010($sp) /* 00054 808B4C84 24E75E74 */ addiu $a3, $a3, %lo(D_808B5E74) ## $a3 = 808B5E74 -/* 00058 808B4C88 0C017014 */ jal func_8005C050 +/* 00058 808B4C88 0C017014 */ jal Collider_SetJntSph /* 0005C 808B4C8C 8FA4002C */ lw $a0, 0x002C($sp) /* 00060 808B4C90 8FA60028 */ lw $a2, 0x0028($sp) /* 00064 808B4C94 3C014248 */ lui $at, 0x4248 ## $at = 42480000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D04.s index 6a8292dfae..199d5e8b65 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D04.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D04.s @@ -6,14 +6,14 @@ glabel func_808B4D04 /* 000E4 808B4D14 AFBF0014 */ sw $ra, 0x0014($sp) /* 000E8 808B4D18 24C501C4 */ addiu $a1, $a2, 0x01C4 ## $a1 = 000001C4 /* 000EC 808B4D1C AFA50018 */ sw $a1, 0x0018($sp) -/* 000F0 808B4D20 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000F0 808B4D20 0C0170D9 */ jal Collider_InitCylinder /* 000F4 808B4D24 AFA60020 */ sw $a2, 0x0020($sp) /* 000F8 808B4D28 3C07808B */ lui $a3, %hi(D_808B5E84) ## $a3 = 808B0000 /* 000FC 808B4D2C 8FA50018 */ lw $a1, 0x0018($sp) /* 00100 808B4D30 8FA60020 */ lw $a2, 0x0020($sp) /* 00104 808B4D34 24E75E84 */ addiu $a3, $a3, %lo(D_808B5E84) ## $a3 = 808B5E84 -/* 00108 808B4D38 0C01712B */ jal ActorCollider_InitCylinder +/* 00108 808B4D38 0C01712B */ jal Collider_SetCylinder /* 0010C 808B4D3C 8FA40024 */ lw $a0, 0x0024($sp) /* 00110 808B4D40 8FA60020 */ lw $a2, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s index b324abe249..cba5607102 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s @@ -42,18 +42,18 @@ glabel func_808B5950 .L808B59EC: /* 00DBC 808B59EC 02012821 */ addu $a1, $s0, $at /* 00DC0 808B59F0 AFA50030 */ sw $a1, 0x0030($sp) -/* 00DC4 808B59F4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00DC4 808B59F4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00DC8 808B59F8 262601C4 */ addiu $a2, $s1, 0x01C4 ## $a2 = 000001C4 /* 00DCC 808B59FC 26260164 */ addiu $a2, $s1, 0x0164 ## $a2 = 00000164 /* 00DD0 808B5A00 AFA6002C */ sw $a2, 0x002C($sp) /* 00DD4 808B5A04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DD8 808B5A08 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00DD8 808B5A08 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00DDC 808B5A0C 8FA50030 */ lw $a1, 0x0030($sp) /* 00DE0 808B5A10 8FA6002C */ lw $a2, 0x002C($sp) /* 00DE4 808B5A14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DE8 808B5A18 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00DE8 808B5A18 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00DEC 808B5A1C 8FA50030 */ lw $a1, 0x0030($sp) .L808B5A20: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Destroy.s index 8bebc37eb6..8e7b1cd62f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Destroy.s @@ -12,7 +12,7 @@ glabel BgSpot18Basket_Destroy /* 003B8 808B7AC8 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 003BC 808B7ACC 8FA50018 */ lw $a1, 0x0018($sp) /* 003C0 808B7AD0 8FA4001C */ lw $a0, 0x001C($sp) -/* 003C4 808B7AD4 0C016F32 */ jal func_8005BCC8 +/* 003C4 808B7AD4 0C016F32 */ jal Collider_DestroyJntSph /* 003C8 808B7AD8 24A50164 */ addiu $a1, $a1, 0x0164 ## $a1 = 00000164 /* 003CC 808B7ADC 8FBF0014 */ lw $ra, 0x0014($sp) /* 003D0 808B7AE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Update.s index 540f16083d..7262aadebf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Update.s @@ -29,7 +29,7 @@ glabel BgSpot18Basket_Update /* 00D90 808B84A0 26060164 */ addiu $a2, $s0, 0x0164 ## $a2 = 00000164 /* 00D94 808B84A4 AFA6002C */ sw $a2, 0x002C($sp) /* 00D98 808B84A8 AFA50030 */ sw $a1, 0x0030($sp) -/* 00D9C 808B84AC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00D9C 808B84AC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00DA0 808B84B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DA4 808B84B4 8E0B0204 */ lw $t3, 0x0204($s0) ## 00000204 @@ -41,7 +41,7 @@ glabel BgSpot18Basket_Update /* 00DBC 808B84CC 920C0175 */ lbu $t4, 0x0175($s0) ## 00000175 /* 00DC0 808B84D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DC4 808B84D4 318DFFFD */ andi $t5, $t4, 0xFFFD ## $t5 = 00000000 -/* 00DC8 808B84D8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00DC8 808B84D8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00DCC 808B84DC A20D0175 */ sb $t5, 0x0175($s0) ## 00000175 .L808B84E0: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7710.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7710.s index 535f09d7ba..ab943e4b60 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7710.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/func_808B7710.s @@ -6,7 +6,7 @@ glabel func_808B7710 /* 00010 808B7720 AFBF001C */ sw $ra, 0x001C($sp) /* 00014 808B7724 24C50164 */ addiu $a1, $a2, 0x0164 ## $a1 = 00000164 /* 00018 808B7728 AFA50020 */ sw $a1, 0x0020($sp) -/* 0001C 808B772C 0C016EFE */ jal func_8005BBF8 +/* 0001C 808B772C 0C016EFE */ jal Collider_InitJntSph /* 00020 808B7730 AFA60028 */ sw $a2, 0x0028($sp) /* 00024 808B7734 8FA60028 */ lw $a2, 0x0028($sp) /* 00028 808B7738 3C07808C */ lui $a3, %hi(D_808B85B8) ## $a3 = 808C0000 @@ -14,7 +14,7 @@ glabel func_808B7710 /* 00030 808B7740 24CE0184 */ addiu $t6, $a2, 0x0184 ## $t6 = 00000184 /* 00034 808B7744 AFAE0010 */ sw $t6, 0x0010($sp) /* 00038 808B7748 24E785B8 */ addiu $a3, $a3, %lo(D_808B85B8) ## $a3 = 808B85B8 -/* 0003C 808B774C 0C017014 */ jal func_8005C050 +/* 0003C 808B774C 0C017014 */ jal Collider_SetJntSph /* 00040 808B7750 8FA4002C */ lw $a0, 0x002C($sp) /* 00044 808B7754 8FA60028 */ lw $a2, 0x0028($sp) /* 00048 808B7758 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Destroy.s index 30bb88ce46..7fb6e1a97a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Destroy.s @@ -5,7 +5,7 @@ glabel BgYdanMaruta_Destroy /* 0026C 808BEFAC AFA5001C */ sw $a1, 0x001C($sp) /* 00270 808BEFB0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00274 808BEFB4 24E5016C */ addiu $a1, $a3, 0x016C ## $a1 = 0000016C -/* 00278 808BEFB8 0C017232 */ jal func_8005C8C8 +/* 00278 808BEFB8 0C017232 */ jal Collider_DestroyTris /* 0027C 808BEFBC AFA70018 */ sw $a3, 0x0018($sp) /* 00280 808BEFC0 8FA70018 */ lw $a3, 0x0018($sp) /* 00284 808BEFC4 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Init.s index d58bb51b46..fb4199311a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Init.s @@ -12,7 +12,7 @@ glabel BgYdanMaruta_Init /* 00024 808BED64 24A5F388 */ addiu $a1, $a1, %lo(D_808BF388) ## $a1 = 808BF388 /* 00028 808BED68 2605016C */ addiu $a1, $s0, 0x016C ## $a1 = 0000016C /* 0002C 808BED6C AFA5002C */ sw $a1, 0x002C($sp) -/* 00030 808BED70 0C0171F8 */ jal func_8005C7E0 +/* 00030 808BED70 0C0171F8 */ jal Collider_InitTris /* 00034 808BED74 8FA4007C */ lw $a0, 0x007C($sp) /* 00038 808BED78 3C07808C */ lui $a3, %hi(D_808BF378) ## $a3 = 808C0000 /* 0003C 808BED7C 260E018C */ addiu $t6, $s0, 0x018C ## $t6 = 0000018C @@ -20,7 +20,7 @@ glabel BgYdanMaruta_Init /* 00044 808BED84 24E7F378 */ addiu $a3, $a3, %lo(D_808BF378) ## $a3 = 808BF378 /* 00048 808BED88 8FA4007C */ lw $a0, 0x007C($sp) /* 0004C 808BED8C 8FA5002C */ lw $a1, 0x002C($sp) -/* 00050 808BED90 0C0172EB */ jal func_8005CBAC +/* 00050 808BED90 0C0172EB */ jal Collider_SetTris /* 00054 808BED94 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00058 808BED98 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 0005C 808BED9C 8618001C */ lh $t8, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BEFF4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BEFF4.s index 720e99d4af..6f1a9b4190 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BEFF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BEFF4.s @@ -23,7 +23,7 @@ glabel func_808BEFF4 /* 00304 808BF044 A61900B4 */ sh $t9, 0x00B4($s0) ## 000000B4 /* 00308 808BF048 8FA4002C */ lw $a0, 0x002C($sp) /* 0030C 808BF04C 2606016C */ addiu $a2, $s0, 0x016C ## $a2 = 0000016C -/* 00310 808BF050 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00310 808BF050 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00314 808BF054 00812821 */ addu $a1, $a0, $at /* 00318 808BF058 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF078.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF078.s index 5a3fe5d8a0..ff2473dfbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF078.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/func_808BF078.s @@ -31,7 +31,7 @@ glabel func_808BF078 .L808BF0E8: /* 003A8 808BF0E8 8FA40024 */ lw $a0, 0x0024($sp) /* 003AC 808BF0EC 24E6016C */ addiu $a2, $a3, 0x016C ## $a2 = 0000016C -/* 003B0 808BF0F0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 003B0 808BF0F0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 003B4 808BF0F4 00812821 */ addu $a1, $a0, $at /* 003B8 808BF0F8 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Destroy.s index d264055c02..839837c287 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Destroy.s @@ -12,7 +12,7 @@ glabel BgYdanSp_Destroy /* 00408 808BF818 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 0040C 808BF81C 8FA50018 */ lw $a1, 0x0018($sp) /* 00410 808BF820 8FA4001C */ lw $a0, 0x001C($sp) -/* 00414 808BF824 0C017232 */ jal func_8005C8C8 +/* 00414 808BF824 0C017232 */ jal Collider_DestroyTris /* 00418 808BF828 24A50170 */ addiu $a1, $a1, 0x0170 ## $a1 = 00000170 /* 0041C 808BF82C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00420 808BF830 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s index 745ce0410a..4e81177abb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s @@ -26,7 +26,7 @@ glabel BgYdanSp_Init /* 00058 808BF468 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0005C 808BF46C 26050170 */ addiu $a1, $s0, 0x0170 ## $a1 = 00000170 /* 00060 808BF470 AFA50030 */ sw $a1, 0x0030($sp) -/* 00064 808BF474 0C0171F8 */ jal func_8005C7E0 +/* 00064 808BF474 0C0171F8 */ jal Collider_InitTris /* 00068 808BF478 8FA40084 */ lw $a0, 0x0084($sp) /* 0006C 808BF47C 3C07808C */ lui $a3, %hi(D_808C09A8) ## $a3 = 808C0000 /* 00070 808BF480 260C0190 */ addiu $t4, $s0, 0x0190 ## $t4 = 00000190 @@ -34,7 +34,7 @@ glabel BgYdanSp_Init /* 00078 808BF488 24E709A8 */ addiu $a3, $a3, %lo(D_808C09A8) ## $a3 = 808C09A8 /* 0007C 808BF48C 8FA40084 */ lw $a0, 0x0084($sp) /* 00080 808BF490 8FA50030 */ lw $a1, 0x0030($sp) -/* 00084 808BF494 0C0172EB */ jal func_8005CBAC +/* 00084 808BF494 0C0172EB */ jal Collider_SetTris /* 00088 808BF498 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0008C 808BF49C 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 00090 808BF4A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s index 1ead3df5e4..72498795e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s @@ -201,7 +201,7 @@ glabel func_808BFE50 /* 00CF4 808C0104 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00CF8 808C0108 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00CFC 808C010C 26060170 */ addiu $a2, $s0, 0x0170 ## $a2 = 00000170 -/* 00D00 808C0110 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00D00 808C0110 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00D04 808C0114 00812821 */ addu $a1, $a0, $at .L808C0118: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C0464.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C0464.s index edf1cea2cc..d6c87ac4d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C0464.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C0464.s @@ -78,7 +78,7 @@ glabel func_808C0464 /* 0116C 808C057C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01170 808C0580 02212821 */ addu $a1, $s1, $at /* 01174 808C0584 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01178 808C0588 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01178 808C0588 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0117C 808C058C 26060170 */ addiu $a2, $s0, 0x0170 ## $a2 = 00000170 /* 01180 808C0590 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s index 249aa866a5..a4d9d56e09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s @@ -7,7 +7,7 @@ glabel BossDodongo_Destroy /* 00ACC 808C1C5C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00AD0 808C1C60 8FA50018 */ lw $a1, 0x0018($sp) /* 00AD4 808C1C64 8FA4001C */ lw $a0, 0x001C($sp) -/* 00AD8 808C1C68 0C016F32 */ jal func_8005BCC8 +/* 00AD8 808C1C68 0C016F32 */ jal Collider_DestroyJntSph /* 00ADC 808C1C6C 24A50440 */ addiu $a1, $a1, 0x0440 ## $a1 = 00000440 /* 00AE0 808C1C70 8FBF0014 */ lw $ra, 0x0014($sp) /* 00AE4 808C1C74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s index 45289b2b9d..eeeb9c6dca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s @@ -89,7 +89,7 @@ glabel BossDodongo_Init /* 008D8 808C1A68 26110440 */ addiu $s1, $s0, 0x0440 ## $s1 = 00000440 /* 008DC 808C1A6C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000440 /* 008E0 808C1A70 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 008E4 808C1A74 0C016EFE */ jal func_8005BBF8 +/* 008E4 808C1A74 0C016EFE */ jal Collider_InitJntSph /* 008E8 808C1A78 E6100228 */ swc1 $f16, 0x0228($s0) ## 00000228 /* 008EC 808C1A7C 3C07808C */ lui $a3, %hi(D_808C73AC) ## $a3 = 808C0000 /* 008F0 808C1A80 26190460 */ addiu $t9, $s0, 0x0460 ## $t9 = 00000460 @@ -97,7 +97,7 @@ glabel BossDodongo_Init /* 008F8 808C1A88 24E773AC */ addiu $a3, $a3, %lo(D_808C73AC) ## $a3 = 808C73AC /* 008FC 808C1A8C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00900 808C1A90 02202825 */ or $a1, $s1, $zero ## $a1 = 00000440 -/* 00904 808C1A94 0C017014 */ jal func_8005C050 +/* 00904 808C1A94 0C017014 */ jal Collider_SetJntSph /* 00908 808C1A98 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0090C 808C1A9C 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 /* 00910 808C1AA0 00B32821 */ addu $a1, $a1, $s3 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s index 1d67b15e61..85693ef3de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s @@ -922,7 +922,7 @@ glabel BossDodongo_Update /* 035A4 808C4734 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 035A8 808C4738 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 035AC 808C473C 00812821 */ addu $a1, $a0, $at -/* 035B0 808C4740 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 035B0 808C4740 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 035B4 808C4744 26260440 */ addiu $a2, $s1, 0x0440 ## $a2 = 00000440 .L808C4748: @@ -932,7 +932,7 @@ glabel BossDodongo_Update /* 035C4 808C4754 26260440 */ addiu $a2, $s1, 0x0440 ## $a2 = 00000440 /* 035C8 808C4758 00818021 */ addu $s0, $a0, $at /* 035CC 808C475C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 -/* 035D0 808C4760 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 035D0 808C4760 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 035D4 808C4764 AFA60034 */ sw $a2, 0x0034($sp) /* 035D8 808C4768 8E2F0190 */ lw $t7, 0x0190($s1) ## 00000190 @@ -941,7 +941,7 @@ glabel BossDodongo_Update /* 035E4 808C4774 146F0004 */ bne $v1, $t7, .L808C4788 /* 035E8 808C4778 8FA60034 */ lw $a2, 0x0034($sp) /* 035EC 808C477C 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 035F0 808C4780 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 035F0 808C4780 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 035F4 808C4784 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 .L808C4788: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s index e0b073b790..5655bdf9f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s @@ -15,7 +15,7 @@ glabel BossFd_Destroy /* 00898 808CB658 248401D4 */ addiu $a0, $a0, 0x01D4 ## $a0 = 000001D4 /* 0089C 808CB65C 8FA50018 */ lw $a1, 0x0018($sp) /* 008A0 808CB660 8FA4001C */ lw $a0, 0x001C($sp) -/* 008A4 808CB664 0C016F32 */ jal func_8005BCC8 +/* 008A4 808CB664 0C016F32 */ jal Collider_DestroyJntSph /* 008A8 808CB668 24A51490 */ addiu $a1, $a1, 0x1490 ## $a1 = 00001490 /* 008AC 808CB66C 8FBF0014 */ lw $ra, 0x0014($sp) /* 008B0 808CB670 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Init.s index 385ac5ac94..e08a7663f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Init.s @@ -97,7 +97,7 @@ glabel BossFd_Init /* 00698 808CB458 E6000024 */ swc1 $f0, 0x0024($s0) ## 00000024 /* 0069C 808CB45C E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 006A0 808CB460 AFA50044 */ sw $a1, 0x0044($sp) -/* 006A4 808CB464 0C016EFE */ jal func_8005BBF8 +/* 006A4 808CB464 0C016EFE */ jal Collider_InitJntSph /* 006A8 808CB468 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 006AC 808CB46C 3C07808D */ lui $a3, %hi(D_808D190C) ## $a3 = 808D0000 /* 006B0 808CB470 261914B0 */ addiu $t9, $s0, 0x14B0 ## $t9 = 000014B0 @@ -105,7 +105,7 @@ glabel BossFd_Init /* 006B8 808CB478 AFB90010 */ sw $t9, 0x0010($sp) /* 006BC 808CB47C 24E7190C */ addiu $a3, $a3, %lo(D_808D190C) ## $a3 = 808D190C /* 006C0 808CB480 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 006C4 808CB484 0C017014 */ jal func_8005C050 +/* 006C4 808CB484 0C017014 */ jal Collider_SetJntSph /* 006C8 808CB488 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 006CC 808CB48C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 006D0 808CB490 2404000C */ addiu $a0, $zero, 0x000C ## $a0 = 0000000C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s index e6112561cd..95bf3f26e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Update.s @@ -97,12 +97,12 @@ glabel BossFd_Update /* 04020 808CEDE0 26711490 */ addiu $s1, $s3, 0x1490 ## $s1 = 00001490 /* 04024 808CEDE4 00818021 */ addu $s0, $a0, $at /* 04028 808CEDE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0402C 808CEDEC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0402C 808CEDEC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 04030 808CEDF0 02203025 */ or $a2, $s1, $zero ## $a2 = 00001490 /* 04034 808CEDF4 8FA400DC */ lw $a0, 0x00DC($sp) /* 04038 808CEDF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0403C 808CEDFC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0403C 808CEDFC 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 04040 808CEE00 02203025 */ or $a2, $s1, $zero ## $a2 = 00001490 /* 04044 808CEE04 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s index f575868f7b..1c84010e9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s @@ -7,7 +7,7 @@ glabel BossFd2_Destroy /* 0053C 808D2BAC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00540 808D2BB0 8FA50018 */ lw $a1, 0x0018($sp) /* 00544 808D2BB4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00548 808D2BB8 0C016F32 */ jal func_8005BCC8 +/* 00548 808D2BB8 0C016F32 */ jal Collider_DestroyJntSph /* 0054C 808D2BBC 24A5141C */ addiu $a1, $a1, 0x141C ## $a1 = 0000141C /* 00550 808D2BC0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00554 808D2BC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s index 4d75e83683..6131a1991a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s @@ -56,7 +56,7 @@ glabel BossFd2_Init /* 004E4 808D2B54 2605141C */ addiu $a1, $s0, 0x141C ## $a1 = 0000141C .L808D2B58: /* 004E8 808D2B58 AFA50034 */ sw $a1, 0x0034($sp) -/* 004EC 808D2B5C 0C016EFE */ jal func_8005BBF8 +/* 004EC 808D2B5C 0C016EFE */ jal Collider_InitJntSph /* 004F0 808D2B60 8FA40044 */ lw $a0, 0x0044($sp) /* 004F4 808D2B64 3C07808D */ lui $a3, %hi(D_808D6114) ## $a3 = 808D0000 /* 004F8 808D2B68 2618143C */ addiu $t8, $s0, 0x143C ## $t8 = 0000143C @@ -64,7 +64,7 @@ glabel BossFd2_Init /* 00500 808D2B70 AFB80010 */ sw $t8, 0x0010($sp) /* 00504 808D2B74 24E76114 */ addiu $a3, $a3, %lo(D_808D6114) ## $a3 = 808D6114 /* 00508 808D2B78 8FA40044 */ lw $a0, 0x0044($sp) -/* 0050C 808D2B7C 0C017014 */ jal func_8005C050 +/* 0050C 808D2B7C 0C017014 */ jal Collider_SetJntSph /* 00510 808D2B80 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00514 808D2B84 8FBF002C */ lw $ra, 0x002C($sp) /* 00518 808D2B88 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Update.s index 53ef6ab364..8b84ca3ca6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Update.s @@ -71,12 +71,12 @@ glabel BossFd2_Update /* 02848 808D4EB8 2606141C */ addiu $a2, $s0, 0x141C ## $a2 = 0000141C /* 0284C 808D4EBC AFA60024 */ sw $a2, 0x0024($sp) /* 02850 808D4EC0 AFA50028 */ sw $a1, 0x0028($sp) -/* 02854 808D4EC4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02854 808D4EC4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02858 808D4EC8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0285C 808D4ECC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02860 808D4ED0 8FA50028 */ lw $a1, 0x0028($sp) -/* 02864 808D4ED4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02864 808D4ED4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02868 808D4ED8 8FA60024 */ lw $a2, 0x0024($sp) /* 0286C 808D4EDC 92180194 */ lbu $t8, 0x0194($s0) ## 00000194 @@ -84,7 +84,7 @@ glabel BossFd2_Update /* 02874 808D4EE4 8FA50028 */ lw $a1, 0x0028($sp) /* 02878 808D4EE8 57000004 */ bnel $t8, $zero, .L808D4EFC /* 0287C 808D4EEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02880 808D4EF0 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 02880 808D4EF0 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 02884 808D4EF4 8FA60024 */ lw $a2, 0x0024($sp) /* 02888 808D4EF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s index 1899e52bd8..108712062a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s @@ -12,7 +12,7 @@ glabel BossGanon_Destroy /* 00EF0 808D7760 54200006 */ bnel $at, $zero, .L808D777C /* 00EF4 808D7764 28410064 */ slti $at, $v0, 0x0064 .L808D7768: -/* 00EF8 808D7768 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00EF8 808D7768 0C0170EB */ jal Collider_DestroyCylinder /* 00EFC 808D776C AFA60018 */ sw $a2, 0x0018($sp) /* 00F00 808D7770 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s index 290c17029c..16c8f4cba0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s @@ -63,14 +63,14 @@ glabel BossGanon_Init /* 00A08 808D7278 AFA00018 */ sw $zero, 0x0018($sp) /* 00A0C 808D727C 26050610 */ addiu $a1, $s0, 0x0610 ## $a1 = 00000610 /* 00A10 808D7280 AFA50044 */ sw $a1, 0x0044($sp) -/* 00A14 808D7284 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00A14 808D7284 0C0170D9 */ jal Collider_InitCylinder /* 00A18 808D7288 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A1C 808D728C 3C07808E */ lui $a3, %hi(D_808E4C00) ## $a3 = 808E0000 /* 00A20 808D7290 8FA50044 */ lw $a1, 0x0044($sp) /* 00A24 808D7294 24E74C00 */ addiu $a3, $a3, %lo(D_808E4C00) ## $a3 = 808E4C00 /* 00A28 808D7298 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A2C 808D729C 0C01712B */ jal ActorCollider_InitCylinder +/* 00A2C 808D729C 0C01712B */ jal Collider_SetCylinder /* 00A30 808D72A0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00A34 808D72A4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C @@ -220,14 +220,14 @@ glabel BossGanon_Init /* 00C40 808D74B0 A60A01B8 */ sh $t2, 0x01B8($s0) ## 000001B8 /* 00C44 808D74B4 26050610 */ addiu $a1, $s0, 0x0610 ## $a1 = 00000610 /* 00C48 808D74B8 AFA50044 */ sw $a1, 0x0044($sp) -/* 00C4C 808D74BC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00C4C 808D74BC 0C0170D9 */ jal Collider_InitCylinder /* 00C50 808D74C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00C54 808D74C4 3C07808E */ lui $a3, %hi(D_808E4C2C) ## $a3 = 808E0000 /* 00C58 808D74C8 8FA50044 */ lw $a1, 0x0044($sp) /* 00C5C 808D74CC 24E74C2C */ addiu $a3, $a3, %lo(D_808E4C2C) ## $a3 = 808E4C2C /* 00C60 808D74D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00C64 808D74D4 0C01712B */ jal ActorCollider_InitCylinder +/* 00C64 808D74D4 0C01712B */ jal Collider_SetCylinder /* 00C68 808D74D8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00C6C 808D74DC 10000092 */ beq $zero, $zero, .L808D7728 @@ -383,14 +383,14 @@ glabel BossGanon_Init /* 00E88 808D76F8 A60F01B8 */ sh $t7, 0x01B8($s0) ## 000001B8 /* 00E8C 808D76FC 26050610 */ addiu $a1, $s0, 0x0610 ## $a1 = 00000610 /* 00E90 808D7700 AFA50044 */ sw $a1, 0x0044($sp) -/* 00E94 808D7704 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00E94 808D7704 0C0170D9 */ jal Collider_InitCylinder /* 00E98 808D7708 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E9C 808D770C 3C07808E */ lui $a3, %hi(D_808E4C2C) ## $a3 = 808E0000 /* 00EA0 808D7710 8FA50044 */ lw $a1, 0x0044($sp) /* 00EA4 808D7714 24E74C2C */ addiu $a3, $a3, %lo(D_808E4C2C) ## $a3 = 808E4C2C /* 00EA8 808D7718 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00EAC 808D771C 0C01712B */ jal ActorCollider_InitCylinder +/* 00EAC 808D771C 0C01712B */ jal Collider_SetCylinder /* 00EB0 808D7720 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 .L808D7724: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s index 14cc616d2f..145e45220e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s @@ -225,7 +225,7 @@ glabel BossGanon_Update /* 07078 808DD8E8 02C18821 */ addu $s1, $s6, $at /* 0707C 808DD8EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000001 /* 07080 808DD8F0 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 07084 808DD8F4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 07084 808DD8F4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 07088 808DD8F8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000610 /* 0708C 808DD8FC 86AA02D4 */ lh $t2, 0x02D4($s5) ## 000002D4 @@ -233,7 +233,7 @@ glabel BossGanon_Update /* 07094 808DD904 02202825 */ or $a1, $s1, $zero ## $a1 = 00000001 /* 07098 808DD908 55400012 */ bnel $t2, $zero, .L808DD954 /* 0709C 808DD90C 92AE0199 */ lbu $t6, 0x0199($s5) ## 00000199 -/* 070A0 808DD910 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 070A0 808DD910 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 070A4 808DD914 02003025 */ or $a2, $s0, $zero ## $a2 = 00000610 /* 070A8 808DD918 8EA30194 */ lw $v1, 0x0194($s5) ## 00000194 @@ -248,7 +248,7 @@ glabel BossGanon_Update /* 070CC 808DD93C 11A30004 */ beq $t5, $v1, .L808DD950 /* 070D0 808DD940 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 070D4 808DD944 02202825 */ or $a1, $s1, $zero ## $a1 = 00000001 -/* 070D8 808DD948 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 070D8 808DD948 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 070DC 808DD94C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000610 .L808DD950: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s index fbde775e39..c3947f5ffa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s @@ -535,7 +535,7 @@ glabel L808E176C .L808E17B4: /* 0AF44 808E17B4 26300610 */ addiu $s0, $s1, 0x0610 ## $s0 = 00000610 /* 0AF48 808E17B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000610 -/* 0AF4C 808E17BC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0AF4C 808E17BC 0C0189B7 */ jal Collider_CylinderUpdate /* 0AF50 808E17C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0AF54 808E17C4 862F01B8 */ lh $t7, 0x01B8($s1) ## 000001B8 @@ -544,7 +544,7 @@ glabel L808E176C /* 0AF60 808E17D0 15E00004 */ bne $t7, $zero, .L808E17E4 /* 0AF64 808E17D4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0AF68 808E17D8 00812821 */ addu $a1, $a0, $at -/* 0AF6C 808E17DC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0AF6C 808E17DC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0AF70 808E17E0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000610 .L808E17E4: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s index ffd2e5a184..19b0b52437 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s @@ -538,7 +538,7 @@ glabel L808E29A8 /* 0C4BC 808E2D2C 26300610 */ addiu $s0, $s1, 0x0610 ## $s0 = 00000610 .L808E2D30: /* 0C4C0 808E2D30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000610 -/* 0C4C4 808E2D34 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0C4C4 808E2D34 0C0189B7 */ jal Collider_CylinderUpdate /* 0C4C8 808E2D38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0C4CC 808E2D3C 862A01B8 */ lh $t2, 0x01B8($s1) ## 000001B8 @@ -547,7 +547,7 @@ glabel L808E29A8 /* 0C4D8 808E2D48 15400004 */ bne $t2, $zero, .L808E2D5C /* 0C4DC 808E2D4C 8FA400A4 */ lw $a0, 0x00A4($sp) /* 0C4E0 808E2D50 00812821 */ addu $a1, $a0, $at -/* 0C4E4 808E2D54 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0C4E4 808E2D54 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0C4E8 808E2D58 02003025 */ or $a2, $s0, $zero ## $a2 = 00000610 .L808E2D5C: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s index f891fc0469..97557f7620 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s @@ -7,11 +7,11 @@ glabel BossGanon2_Destroy /* 00560 808FD4A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00564 808FD4A4 8FA50018 */ lw $a1, 0x0018($sp) /* 00568 808FD4A8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0056C 808FD4AC 0C016F32 */ jal func_8005BCC8 +/* 0056C 808FD4AC 0C016F32 */ jal Collider_DestroyJntSph /* 00570 808FD4B0 24A50424 */ addiu $a1, $a1, 0x0424 ## $a1 = 00000424 /* 00574 808FD4B4 8FA50018 */ lw $a1, 0x0018($sp) /* 00578 808FD4B8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0057C 808FD4BC 0C016F32 */ jal func_8005BCC8 +/* 0057C 808FD4BC 0C016F32 */ jal Collider_DestroyJntSph /* 00580 808FD4C0 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 00000444 /* 00584 808FD4C4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00588 808FD4C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s index 4e808fb72c..df650efa5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s @@ -28,7 +28,7 @@ glabel BossGanon2_Init /* 00480 808FD3C0 A21900AF */ sb $t9, 0x00AF($s0) ## 000000AF /* 00484 808FD3C4 26050424 */ addiu $a1, $s0, 0x0424 ## $a1 = 00000424 /* 00488 808FD3C8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0048C 808FD3CC 0C016EFE */ jal func_8005BBF8 +/* 0048C 808FD3CC 0C016EFE */ jal Collider_InitJntSph /* 00490 808FD3D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00494 808FD3D4 3C078090 */ lui $a3, %hi(D_80906FBC) ## $a3 = 80900000 /* 00498 808FD3D8 26080464 */ addiu $t0, $s0, 0x0464 ## $t0 = 00000464 @@ -36,11 +36,11 @@ glabel BossGanon2_Init /* 004A0 808FD3E0 AFA80010 */ sw $t0, 0x0010($sp) /* 004A4 808FD3E4 24E76FBC */ addiu $a3, $a3, %lo(D_80906FBC) ## $a3 = 80906FBC /* 004A8 808FD3E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004AC 808FD3EC 0C017014 */ jal func_8005C050 +/* 004AC 808FD3EC 0C017014 */ jal Collider_SetJntSph /* 004B0 808FD3F0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 004B4 808FD3F4 26050444 */ addiu $a1, $s0, 0x0444 ## $a1 = 00000444 /* 004B8 808FD3F8 AFA50030 */ sw $a1, 0x0030($sp) -/* 004BC 808FD3FC 0C016EFE */ jal func_8005BBF8 +/* 004BC 808FD3FC 0C016EFE */ jal Collider_InitJntSph /* 004C0 808FD400 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 004C4 808FD404 3C078090 */ lui $a3, %hi(D_80907014) ## $a3 = 80900000 /* 004C8 808FD408 26090864 */ addiu $t1, $s0, 0x0864 ## $t1 = 00000864 @@ -48,7 +48,7 @@ glabel BossGanon2_Init /* 004D0 808FD410 AFA90010 */ sw $t1, 0x0010($sp) /* 004D4 808FD414 24E77014 */ addiu $a3, $a3, %lo(D_80907014) ## $a3 = 80907014 /* 004D8 808FD418 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004DC 808FD41C 0C017014 */ jal func_8005C050 +/* 004DC 808FD41C 0C017014 */ jal Collider_SetJntSph /* 004E0 808FD420 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 004E4 808FD424 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004E8 808FD428 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Update.s index b78540fa86..40382df79b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Update.s @@ -470,7 +470,7 @@ glabel BossGanon2_Update /* 05E60 80902DA0 26260424 */ addiu $a2, $s1, 0x0424 ## $a2 = 00000424 /* 05E64 80902DA4 AFA60034 */ sw $a2, 0x0034($sp) /* 05E68 80902DA8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 -/* 05E6C 80902DAC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 05E6C 80902DAC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 05E70 80902DB0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05E74 80902DB4 8E380190 */ lw $t8, 0x0190($s1) ## 00000190 @@ -483,18 +483,18 @@ glabel BossGanon2_Update /* 05E90 80902DD0 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 05E94 80902DD4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05E98 80902DD8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 -/* 05E9C 80902DDC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 05E9C 80902DDC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 05EA0 80902DE0 8FA60034 */ lw $a2, 0x0034($sp) /* 05EA4 80902DE4 26260444 */ addiu $a2, $s1, 0x0444 ## $a2 = 00000444 /* 05EA8 80902DE8 AFA60034 */ sw $a2, 0x0034($sp) /* 05EAC 80902DEC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 05EB0 80902DF0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 05EB0 80902DF0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 05EB4 80902DF4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 /* 05EB8 80902DF8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05EBC 80902DFC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 -/* 05EC0 80902E00 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 05EC0 80902E00 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 05EC4 80902E04 8FA60034 */ lw $a2, 0x0034($sp) /* 05EC8 80902E08 862D039E */ lh $t5, 0x039E($s1) ## 0000039E @@ -502,7 +502,7 @@ glabel BossGanon2_Update /* 05ED0 80902E10 55A00005 */ bnel $t5, $zero, .L80902E28 /* 05ED4 80902E14 86220332 */ lh $v0, 0x0332($s1) ## 00000332 /* 05ED8 80902E18 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 05EDC 80902E1C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 05EDC 80902E1C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 05EE0 80902E20 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 /* 05EE4 80902E24 86220332 */ lh $v0, 0x0332($s1) ## 00000332 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s index 4afa9a20aa..848d93dc87 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s @@ -13,11 +13,11 @@ glabel BossGanondrof_Destroy /* 006E4 80910D24 0C0295BC */ jal SkelAnime_Free /* 006E8 80910D28 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 006EC 80910D2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 006F0 80910D30 0C0170EB */ jal ActorCollider_FreeCylinder +/* 006F0 80910D30 0C0170EB */ jal Collider_DestroyCylinder /* 006F4 80910D34 260504E0 */ addiu $a1, $s0, 0x04E0 ## $a1 = 000004E0 /* 006F8 80910D38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 006FC 80910D3C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 006FC 80910D3C 0C0170EB */ jal Collider_DestroyCylinder /* 00700 80910D40 2605052C */ addiu $a1, $s0, 0x052C ## $a1 = 0000052C /* 00704 80910D44 860E001C */ lh $t6, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Init.s index 8d28f8fde5..cdab547921 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Init.s @@ -84,26 +84,26 @@ glabel BossGanondrof_Init /* 0055C 80910B9C 260504E0 */ addiu $a1, $s0, 0x04E0 ## $a1 = 000004E0 .L80910BA0: /* 00560 80910BA0 AFA50040 */ sw $a1, 0x0040($sp) -/* 00564 80910BA4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00564 80910BA4 0C0170D9 */ jal Collider_InitCylinder /* 00568 80910BA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0056C 80910BAC 2605052C */ addiu $a1, $s0, 0x052C ## $a1 = 0000052C /* 00570 80910BB0 AFA50044 */ sw $a1, 0x0044($sp) -/* 00574 80910BB4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00574 80910BB4 0C0170D9 */ jal Collider_InitCylinder /* 00578 80910BB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0057C 80910BBC 3C078091 */ lui $a3, %hi(D_80914CD0) ## $a3 = 80910000 /* 00580 80910BC0 24E74CD0 */ addiu $a3, $a3, %lo(D_80914CD0) ## $a3 = 80914CD0 /* 00584 80910BC4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00588 80910BC8 8FA50040 */ lw $a1, 0x0040($sp) -/* 0058C 80910BCC 0C01712B */ jal ActorCollider_InitCylinder +/* 0058C 80910BCC 0C01712B */ jal Collider_SetCylinder /* 00590 80910BD0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00594 80910BD4 3C078091 */ lui $a3, %hi(D_80914CFC) ## $a3 = 80910000 /* 00598 80910BD8 24E74CFC */ addiu $a3, $a3, %lo(D_80914CFC) ## $a3 = 80914CFC /* 0059C 80910BDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005A0 80910BE0 8FA50044 */ lw $a1, 0x0044($sp) -/* 005A4 80910BE4 0C01712B */ jal ActorCollider_InitCylinder +/* 005A4 80910BE4 0C01712B */ jal Collider_SetCylinder /* 005A8 80910BE8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 005AC 80910BEC 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s index e9402dd1b9..2c5a8559ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s @@ -94,7 +94,7 @@ glabel BossGanondrof_Update /* 03994 80913FD4 15000004 */ bne $t0, $zero, .L80913FE8 /* 03998 80913FD8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0399C 80913FDC 02412821 */ addu $a1, $s2, $at -/* 039A0 80913FE0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 039A0 80913FE0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 039A4 80913FE4 8FA6003C */ lw $a2, 0x003C($sp) .L80913FE8: @@ -112,12 +112,12 @@ glabel BossGanondrof_Update /* 039D4 80914014 2B210002 */ slti $at, $t9, 0x0002 /* 039D8 80914018 14200009 */ bne $at, $zero, .L80914040 /* 039DC 8091401C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 039E0 80914020 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 039E0 80914020 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 039E4 80914024 8FA6003C */ lw $a2, 0x003C($sp) /* 039E8 80914028 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 039EC 8091402C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 039F0 80914030 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 039F0 80914030 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 039F4 80914034 8FA6003C */ lw $a2, 0x003C($sp) /* 039F8 80914038 1000001A */ beq $zero, $zero, .L809140A4 @@ -128,7 +128,7 @@ glabel BossGanondrof_Update /* 03A08 80914048 3C0B8091 */ lui $t3, %hi(func_80912594) ## $t3 = 80910000 /* 03A0C 8091404C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03A10 80914050 02432821 */ addu $a1, $s2, $v1 -/* 03A14 80914054 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 03A14 80914054 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 03A18 80914058 8FA6003C */ lw $a2, 0x003C($sp) /* 03A1C 8091405C 10000011 */ beq $zero, $zero, .L809140A4 @@ -139,17 +139,17 @@ glabel BossGanondrof_Update /* 03A2C 8091406C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03A30 80914070 02438021 */ addu $s0, $s2, $v1 /* 03A34 80914074 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03A38 80914078 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 03A38 80914078 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 03A3C 8091407C 8FA6003C */ lw $a2, 0x003C($sp) /* 03A40 80914080 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03A44 80914084 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03A48 80914088 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 03A48 80914088 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 03A4C 8091408C 8FA6003C */ lw $a2, 0x003C($sp) /* 03A50 80914090 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03A54 80914094 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03A58 80914098 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 03A58 80914098 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 03A5C 8091409C 8FA60040 */ lw $a2, 0x0040($sp) .L809140A0: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s index 356cc7ab8a..ad7d98e990 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s @@ -7,7 +7,7 @@ glabel BossGoma_Destroy /* 00504 80915F14 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00508 80915F18 8FA50018 */ lw $a1, 0x0018($sp) /* 0050C 80915F1C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00510 80915F20 0C016F32 */ jal func_8005BCC8 +/* 00510 80915F20 0C016F32 */ jal Collider_DestroyJntSph /* 00514 80915F24 24A507BC */ addiu $a1, $a1, 0x07BC ## $a1 = 000007BC /* 00518 80915F28 8FBF0014 */ lw $ra, 0x0014($sp) /* 0051C 80915F2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s index 935ef20c9f..22620c4a31 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s @@ -56,7 +56,7 @@ glabel BossGoma_Init /* 00300 80915D10 A21800AE */ sb $t8, 0x00AE($s0) ## 000000AE /* 00304 80915D14 260507BC */ addiu $a1, $s0, 0x07BC ## $a1 = 000007BC /* 00308 80915D18 AFA50044 */ sw $a1, 0x0044($sp) -/* 0030C 80915D1C 0C016EFE */ jal func_8005BBF8 +/* 0030C 80915D1C 0C016EFE */ jal Collider_InitJntSph /* 00310 80915D20 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00314 80915D24 3C078092 */ lui $a3, %hi(D_8091B034) ## $a3 = 80920000 /* 00318 80915D28 261907DC */ addiu $t9, $s0, 0x07DC ## $t9 = 000007DC @@ -64,7 +64,7 @@ glabel BossGoma_Init /* 00320 80915D30 AFB90010 */ sw $t9, 0x0010($sp) /* 00324 80915D34 24E7B034 */ addiu $a3, $a3, %lo(D_8091B034) ## $a3 = 8091B034 /* 00328 80915D38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0032C 80915D3C 0C017014 */ jal func_8005C050 +/* 0032C 80915D3C 0C017014 */ jal Collider_SetJntSph /* 00330 80915D40 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00334 80915D44 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 /* 00338 80915D48 00B12821 */ addu $a1, $a1, $s1 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Update.s index e930db82a3..1665c30fc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Update.s @@ -95,12 +95,12 @@ glabel BossGoma_Update /* 04AD4 8091A4E4 260607BC */ addiu $a2, $s0, 0x07BC ## $a2 = 000007BC /* 04AD8 8091A4E8 00812821 */ addu $a1, $a0, $at /* 04ADC 8091A4EC AFA5002C */ sw $a1, 0x002C($sp) -/* 04AE0 8091A4F0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 04AE0 8091A4F0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 04AE4 8091A4F4 AFA60028 */ sw $a2, 0x0028($sp) /* 04AE8 8091A4F8 8FA4003C */ lw $a0, 0x003C($sp) /* 04AEC 8091A4FC 8FA5002C */ lw $a1, 0x002C($sp) -/* 04AF0 8091A500 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 04AF0 8091A500 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 04AF4 8091A504 8FA60028 */ lw $a2, 0x0028($sp) /* 04AF8 8091A508 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 @@ -119,7 +119,7 @@ glabel BossGoma_Update /* 04B2C 8091A53C 8FBF0024 */ lw $ra, 0x0024($sp) .L8091A540: /* 04B30 8091A540 8FA5002C */ lw $a1, 0x002C($sp) -/* 04B34 8091A544 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 04B34 8091A544 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 04B38 8091A548 8FA60028 */ lw $a2, 0x0028($sp) .L8091A54C: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Destroy.s index 13cd5d148e..93572ad227 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Destroy.s @@ -8,12 +8,12 @@ glabel BossMo_Destroy /* 009AC 8091C4AC 14200006 */ bne $at, $zero, .L8091C4C8 /* 009B0 8091C4B0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 009B4 8091C4B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 009B8 8091C4B8 0C016F32 */ jal func_8005BCC8 +/* 009B8 8091C4B8 0C016F32 */ jal Collider_DestroyJntSph /* 009BC 8091C4BC 24C5101C */ addiu $a1, $a2, 0x101C ## $a1 = 0000101C /* 009C0 8091C4C0 10000004 */ beq $zero, $zero, .L8091C4D4 /* 009C4 8091C4C4 8FBF0014 */ lw $ra, 0x0014($sp) .L8091C4C8: -/* 009C8 8091C4C8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 009C8 8091C4C8 0C0170EB */ jal Collider_DestroyCylinder /* 009CC 8091C4CC 24C514FC */ addiu $a1, $a2, 0x14FC ## $a1 = 000014FC /* 009D0 8091C4D0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s index da35d6be7a..e3b040f7c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Init.s @@ -85,14 +85,14 @@ glabel BossMo_Init /* 006E8 8091C1E8 AFA60044 */ sw $a2, 0x0044($sp) /* 006EC 8091C1EC 260514FC */ addiu $a1, $s0, 0x14FC ## $a1 = 000014FC /* 006F0 8091C1F0 AFA50048 */ sw $a1, 0x0048($sp) -/* 006F4 8091C1F4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 006F4 8091C1F4 0C0170D9 */ jal Collider_InitCylinder /* 006F8 8091C1F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 006FC 8091C1FC 3C078092 */ lui $a3, %hi(D_8092603C) ## $a3 = 80920000 /* 00700 8091C200 8FA50048 */ lw $a1, 0x0048($sp) /* 00704 8091C204 24E7603C */ addiu $a3, $a3, %lo(D_8092603C) ## $a3 = 8092603C /* 00708 8091C208 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0070C 8091C20C 0C01712B */ jal ActorCollider_InitCylinder +/* 0070C 8091C20C 0C01712B */ jal Collider_SetCylinder /* 00710 8091C210 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00714 8091C214 8FA90044 */ lw $t1, 0x0044($sp) @@ -248,7 +248,7 @@ glabel BossMo_Init /* 0093C 8091C43C AE080104 */ sw $t0, 0x0104($s0) ## 00000104 /* 00940 8091C440 8C590008 */ lw $t9, 0x0008($v0) ## FFFFFFEC /* 00944 8091C444 AE190108 */ sw $t9, 0x0108($s0) ## 00000108 -/* 00948 8091C448 0C016EFE */ jal func_8005BBF8 +/* 00948 8091C448 0C016EFE */ jal Collider_InitJntSph /* 0094C 8091C44C AFA50048 */ sw $a1, 0x0048($sp) /* 00950 8091C450 3C078092 */ lui $a3, %hi(D_8092602C) ## $a3 = 80920000 /* 00954 8091C454 260A103C */ addiu $t2, $s0, 0x103C ## $t2 = 0000103C @@ -256,7 +256,7 @@ glabel BossMo_Init /* 0095C 8091C45C AFAA0010 */ sw $t2, 0x0010($sp) /* 00960 8091C460 24E7602C */ addiu $a3, $a3, %lo(D_8092602C) ## $a3 = 8092602C /* 00964 8091C464 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00968 8091C468 0C017014 */ jal func_8005C050 +/* 00968 8091C468 0C017014 */ jal Collider_SetJntSph /* 0096C 8091C46C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00970 8091C470 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00974 8091C474 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Update.s index b6c6d4a9b2..77f1adb615 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Update.s @@ -559,12 +559,12 @@ glabel BossMo_Update /* 07C10 80923710 00818021 */ addu $s0, $a0, $at /* 07C14 80923714 2651101C */ addiu $s1, $s2, 0x101C ## $s1 = 0000101C /* 07C18 80923718 02203025 */ or $a2, $s1, $zero ## $a2 = 0000101C -/* 07C1C 8092371C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 07C1C 8092371C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 07C20 80923720 02002825 */ or $a1, $s0, $zero ## $a1 = 00000024 /* 07C24 80923724 8FA400BC */ lw $a0, 0x00BC($sp) /* 07C28 80923728 02002825 */ or $a1, $s0, $zero ## $a1 = 00000024 -/* 07C2C 8092372C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 07C2C 8092372C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 07C30 80923730 02203025 */ or $a2, $s1, $zero ## $a2 = 0000101C .L80923734: @@ -575,7 +575,7 @@ glabel BossMo_Update /* 07C40 80923740 17000004 */ bne $t8, $zero, .L80923754 /* 07C44 80923744 8FA400BC */ lw $a0, 0x00BC($sp) /* 07C48 80923748 00812821 */ addu $a1, $a0, $at -/* 07C4C 8092374C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 07C4C 8092374C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 07C50 80923750 2646101C */ addiu $a2, $s2, 0x101C ## $a2 = 0000101C .L80923754: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80922D30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80922D30.s index b108c957f9..f875872ef4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80922D30.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80922D30.s @@ -108,7 +108,7 @@ glabel func_80922D30 /* 073A4 80922EA4 260614FC */ addiu $a2, $s0, 0x14FC ## $a2 = 000014FC /* 073A8 80922EA8 00C02825 */ or $a1, $a2, $zero ## $a1 = 000014FC /* 073AC 80922EAC AFA60020 */ sw $a2, 0x0020($sp) -/* 073B0 80922EB0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 073B0 80922EB0 0C0189B7 */ jal Collider_CylinderUpdate /* 073B4 80922EB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 073B8 80922EB8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -116,7 +116,7 @@ glabel func_80922D30 /* 073C0 80922EC0 02212821 */ addu $a1, $s1, $at /* 073C4 80922EC4 8FA60020 */ lw $a2, 0x0020($sp) /* 073C8 80922EC8 AFA50024 */ sw $a1, 0x0024($sp) -/* 073CC 80922ECC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 073CC 80922ECC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 073D0 80922ED0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 073D4 80922ED4 860F0158 */ lh $t7, 0x0158($s0) ## 00000158 @@ -136,13 +136,13 @@ glabel func_80922D30 /* 0740C 80922F0C 45000005 */ bc1f .L80922F24 /* 07410 80922F10 00000000 */ nop .L80922F14: -/* 07414 80922F14 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 07414 80922F14 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 07418 80922F18 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0741C 80922F1C 10000004 */ beq $zero, $zero, .L80922F30 /* 07420 80922F20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80922F24: -/* 07424 80922F24 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 07424 80922F24 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 07428 80922F28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0742C 80922F2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Destroy.s index ef27af7321..41d5cbba63 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Destroy.s @@ -5,11 +5,11 @@ glabel BossSst_Destroy /* 00490 8092CA60 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00494 8092CA64 8FA50018 */ lw $a1, 0x0018($sp) /* 00498 8092CA68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0049C 8092CA6C 0C016F32 */ jal func_8005BCC8 +/* 0049C 8092CA6C 0C016F32 */ jal Collider_DestroyJntSph /* 004A0 8092CA70 24A503D4 */ addiu $a1, $a1, 0x03D4 ## $a1 = 000003D4 /* 004A4 8092CA74 8FA50018 */ lw $a1, 0x0018($sp) /* 004A8 8092CA78 8FA4001C */ lw $a0, 0x001C($sp) -/* 004AC 8092CA7C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 004AC 8092CA7C 0C0170EB */ jal Collider_DestroyCylinder /* 004B0 8092CA80 24A506B4 */ addiu $a1, $a1, 0x06B4 ## $a1 = 000006B4 /* 004B4 8092CA84 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s index 275e32444f..087a645cc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s @@ -20,12 +20,12 @@ glabel BossSst_Init /* 00020 8092C5F0 24A5788C */ addiu $a1, $a1, %lo(D_8093788C) ## $a1 = 8093788C /* 00024 8092C5F4 260506B4 */ addiu $a1, $s0, 0x06B4 ## $a1 = 000006B4 /* 00028 8092C5F8 AFA50044 */ sw $a1, 0x0044($sp) -/* 0002C 8092C5FC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0002C 8092C5FC 0C0170D9 */ jal Collider_InitCylinder /* 00030 8092C600 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00034 8092C604 260503D4 */ addiu $a1, $s0, 0x03D4 ## $a1 = 000003D4 /* 00038 8092C608 AFA50040 */ sw $a1, 0x0040($sp) -/* 0003C 8092C60C 0C016EFE */ jal func_8005BBF8 +/* 0003C 8092C60C 0C016EFE */ jal Collider_InitJntSph /* 00040 8092C610 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00044 8092C614 3C058093 */ lui $a1, %hi(D_8093782C) ## $a1 = 80930000 /* 00048 8092C618 3C068093 */ lui $a2, %hi(D_80937824) ## $a2 = 80930000 @@ -88,13 +88,13 @@ glabel BossSst_Init /* 00120 8092C6F0 24E777BC */ addiu $a3, $a3, %lo(D_809377BC) ## $a3 = 809377BC /* 00124 8092C6F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00128 8092C6F8 8FA50040 */ lw $a1, 0x0040($sp) -/* 0012C 8092C6FC 0C017014 */ jal func_8005C050 +/* 0012C 8092C6FC 0C017014 */ jal Collider_SetJntSph /* 00130 8092C700 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00134 8092C704 3C078093 */ lui $a3, %hi(D_809377CC) ## $a3 = 80930000 /* 00138 8092C708 24E777CC */ addiu $a3, $a3, %lo(D_809377CC) ## $a3 = 809377CC /* 0013C 8092C70C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00140 8092C710 8FA50044 */ lw $a1, 0x0044($sp) -/* 00144 8092C714 0C01712B */ jal ActorCollider_InitCylinder +/* 00144 8092C714 0C01712B */ jal Collider_SetCylinder /* 00148 8092C718 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0014C 8092C71C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -243,13 +243,13 @@ glabel BossSst_Init /* 00364 8092C934 260D03F4 */ addiu $t5, $s0, 0x03F4 ## $t5 = 000003F4 /* 00368 8092C938 AFAD0010 */ sw $t5, 0x0010($sp) /* 0036C 8092C93C 24E77620 */ addiu $a3, $a3, %lo(D_80937620) ## $a3 = 80937620 -/* 00370 8092C940 0C017014 */ jal func_8005C050 +/* 00370 8092C940 0C017014 */ jal Collider_SetJntSph /* 00374 8092C944 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00378 8092C948 3C078093 */ lui $a3, %hi(D_809377F8) ## $a3 = 80930000 /* 0037C 8092C94C 24E777F8 */ addiu $a3, $a3, %lo(D_809377F8) ## $a3 = 809377F8 /* 00380 8092C950 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00384 8092C954 8FA50044 */ lw $a1, 0x0044($sp) -/* 00388 8092C958 0C01712B */ jal ActorCollider_InitCylinder +/* 00388 8092C958 0C01712B */ jal Collider_SetCylinder /* 0038C 8092C95C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00390 8092C960 860E001C */ lh $t6, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s index 116101d5b4..abfed3a9ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s @@ -92,7 +92,7 @@ glabel BossSst_Update /* 07B98 80934168 11E00004 */ beq $t7, $zero, .L8093417C /* 07B9C 8093416C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 07BA0 80934170 02212821 */ addu $a1, $s1, $at -/* 07BA4 80934174 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 07BA4 80934174 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 07BA8 80934178 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4 .L8093417C: @@ -114,7 +114,7 @@ glabel BossSst_Update /* 07BE8 809341B8 11600004 */ beq $t3, $zero, .L809341CC /* 07BEC 809341BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 07BF0 809341C0 02212821 */ addu $a1, $s1, $at -/* 07BF4 809341C4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 07BF4 809341C4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 07BF8 809341C8 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4 .L809341CC: @@ -126,7 +126,7 @@ glabel BossSst_Update /* 07C0C 809341DC 13200004 */ beq $t9, $zero, .L809341F0 /* 07C10 809341E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 07C14 809341E4 02212821 */ addu $a1, $s1, $at -/* 07C18 809341E8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 07C18 809341E8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 07C1C 809341EC 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4 .L809341F0: @@ -137,7 +137,7 @@ glabel BossSst_Update /* 07C30 80934200 11C00004 */ beq $t6, $zero, .L80934214 /* 07C34 80934204 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 07C38 80934208 02212821 */ addu $a1, $s1, $at -/* 07C3C 8093420C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 07C3C 8093420C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 07C40 80934210 260606B4 */ addiu $a2, $s0, 0x06B4 ## $a2 = 000006B4 .L80934214: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s index b9259a8d2a..43b46ca13a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s @@ -81,7 +81,7 @@ glabel func_80930934 /* 04478 80930A48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0447C 80930A4C 260506B4 */ addiu $a1, $s0, 0x06B4 ## $a1 = 000006B4 /* 04480 80930A50 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 04484 80930A54 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 04484 80930A54 0C0189B7 */ jal Collider_CylinderUpdate /* 04488 80930A58 A20D06C4 */ sb $t5, 0x06C4($s0) ## 000006C4 /* 0448C 80930A5C 3C0E8093 */ lui $t6, %hi(D_80937818) ## $t6 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s index 8208cd8efd..e71239139f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s @@ -69,7 +69,7 @@ glabel func_80934338 /* 07E64 80934434 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 /* 07E68 80934438 51600004 */ beql $t3, $zero, .L8093444C /* 07E6C 8093443C 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 07E70 80934440 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 07E70 80934440 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 07E74 80934444 02212821 */ addu $a1, $s1, $at /* 07E78 80934448 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 @@ -90,14 +90,14 @@ glabel func_80934338 /* 07EB0 80934480 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 07EB4 80934484 260606B4 */ addiu $a2, $s0, 0x06B4 ## $a2 = 000006B4 /* 07EB8 80934488 AFA50024 */ sw $a1, 0x0024($sp) -/* 07EBC 8093448C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 07EBC 8093448C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 07EC0 80934490 AFA70020 */ sw $a3, 0x0020($sp) /* 07EC4 80934494 8FA50024 */ lw $a1, 0x0024($sp) /* 07EC8 80934498 8FA70020 */ lw $a3, 0x0020($sp) .L8093449C: /* 07ECC 8093449C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 07ED0 809344A0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 07ED0 809344A0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 07ED4 809344A4 00E03025 */ or $a2, $a3, $zero ## $a2 = 00000000 .L809344A8: @@ -108,7 +108,7 @@ glabel func_80934338 /* 07EE8 809344B8 13000004 */ beq $t8, $zero, .L809344CC /* 07EEC 809344BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 07EF0 809344C0 02212821 */ addu $a1, $s1, $at -/* 07EF4 809344C4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 07EF4 809344C4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 07EF8 809344C8 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4 .L809344CC: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s index 3760a0b687..6bc96ca1c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s @@ -5,7 +5,7 @@ glabel BossTw_Destroy /* 01214 80939EE4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01218 80939EE8 8FA50018 */ lw $a1, 0x0018($sp) /* 0121C 80939EEC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01220 80939EF0 0C0170EB */ jal ActorCollider_FreeCylinder +/* 01220 80939EF0 0C0170EB */ jal Collider_DestroyCylinder /* 01224 80939EF4 24A505AC */ addiu $a1, $a1, 0x05AC ## $a1 = 000005AC /* 01228 80939EF8 8FA30018 */ lw $v1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s index 5eaa80dd32..78782a40b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s @@ -45,14 +45,14 @@ glabel BossTw_Init /* 00A7C 8093974C AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 /* 00A80 80939750 260505AC */ addiu $a1, $s0, 0x05AC ## $a1 = 000005AC /* 00A84 80939754 AFA50044 */ sw $a1, 0x0044($sp) -/* 00A88 80939758 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00A88 80939758 0C0170D9 */ jal Collider_InitCylinder /* 00A8C 8093975C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A90 80939760 3C078095 */ lui $a3, %hi(D_8094A7E8) ## $a3 = 80950000 /* 00A94 80939764 8FA50044 */ lw $a1, 0x0044($sp) /* 00A98 80939768 24E7A7E8 */ addiu $a3, $a3, %lo(D_8094A7E8) ## $a3 = 8094A7E8 /* 00A9C 8093976C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00AA0 80939770 0C01712B */ jal ActorCollider_InitCylinder +/* 00AA0 80939770 0C01712B */ jal Collider_SetCylinder /* 00AA4 80939774 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00AA8 80939778 8603001C */ lh $v1, 0x001C($s0) ## 0000001C @@ -117,7 +117,7 @@ glabel BossTw_Init /* 00B74 80939844 A20000AF */ sb $zero, 0x00AF($s0) ## 000000AF /* 00B78 80939848 260505AC */ addiu $a1, $s0, 0x05AC ## $a1 = 000005AC /* 00B7C 8093984C AFA50044 */ sw $a1, 0x0044($sp) -/* 00B80 80939850 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00B80 80939850 0C0170D9 */ jal Collider_InitCylinder /* 00B84 80939854 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B88 80939858 3C198095 */ lui $t9, %hi(D_8094A89C) ## $t9 = 80950000 @@ -267,7 +267,7 @@ glabel BossTw_Init /* 00DB0 80939A80 14600030 */ bne $v1, $zero, .L80939B44 /* 00DB4 80939A84 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00DB8 80939A88 3C078095 */ lui $a3, %hi(D_8094A814) ## $a3 = 80950000 -/* 00DBC 80939A8C 0C01712B */ jal ActorCollider_InitCylinder +/* 00DBC 80939A8C 0C01712B */ jal Collider_SetCylinder /* 00DC0 80939A90 24E7A814 */ addiu $a3, $a3, %lo(D_8094A814) ## $a3 = 8094A814 /* 00DC4 80939A94 240E0033 */ addiu $t6, $zero, 0x0033 ## $t6 = 00000033 @@ -323,7 +323,7 @@ glabel BossTw_Init /* 00E7C 80939B4C 3C078095 */ lui $a3, %hi(D_8094A814) ## $a3 = 80950000 /* 00E80 80939B50 24E7A814 */ addiu $a3, $a3, %lo(D_8094A814) ## $a3 = 8094A814 /* 00E84 80939B54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E88 80939B58 0C01712B */ jal ActorCollider_InitCylinder +/* 00E88 80939B58 0C01712B */ jal Collider_SetCylinder /* 00E8C 80939B5C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00E90 80939B60 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 @@ -372,7 +372,7 @@ glabel BossTw_Init .L80939C04: /* 00F34 80939C04 3C078095 */ lui $a3, %hi(D_8094A840) ## $a3 = 80950000 /* 00F38 80939C08 24E7A840 */ addiu $a3, $a3, %lo(D_8094A840) ## $a3 = 8094A840 -/* 00F3C 80939C0C 0C01712B */ jal ActorCollider_InitCylinder +/* 00F3C 80939C0C 0C01712B */ jal Collider_SetCylinder /* 00F40 80939C10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00F44 80939C14 3C188094 */ lui $t8, %hi(func_80940D48) ## $t8 = 80940000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Update.s index 18146ba207..6a3d18588c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Update.s @@ -207,7 +207,7 @@ glabel BossTw_Update /* 07CC4 80940994 3048FFFD */ andi $t0, $v0, 0xFFFD ## $t0 = 00000000 /* 07CC8 80940998 A22805BD */ sb $t0, 0x05BD($s1) ## 000005BD .L8094099C: -/* 07CCC 8094099C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 07CCC 8094099C 0C0189B7 */ jal Collider_CylinderUpdate /* 07CD0 809409A0 02002825 */ or $a1, $s0, $zero ## $a1 = 000005AC /* 07CD4 809409A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -215,12 +215,12 @@ glabel BossTw_Update /* 07CDC 809409AC 02619021 */ addu $s2, $s3, $at /* 07CE0 809409B0 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 07CE4 809409B4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 07CE8 809409B8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 07CE8 809409B8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 07CEC 809409BC 02003025 */ or $a2, $s0, $zero ## $a2 = 000005AC /* 07CF0 809409C0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 07CF4 809409C4 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 07CF8 809409C8 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 07CF8 809409C8 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 07CFC 809409CC 02003025 */ or $a2, $s0, $zero ## $a2 = 000005AC .L809409D0: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80940D48.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80940D48.s index ef568cb8b0..aa03fc86e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80940D48.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80940D48.s @@ -432,7 +432,7 @@ glabel func_80940D48 /* 08614 809412E4 A64E05F0 */ sh $t6, 0x05F0($s2) ## 000005F0 /* 08618 809412E8 264505AC */ addiu $a1, $s2, 0x05AC ## $a1 = 000005AC /* 0861C 809412EC AFA5004C */ sw $a1, 0x004C($sp) -/* 08620 809412F0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 08620 809412F0 0C0189B7 */ jal Collider_CylinderUpdate /* 08624 809412F4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 08628 809412F8 8648015A */ lh $t0, 0x015A($s2) ## 0000015A @@ -513,7 +513,7 @@ glabel func_80940D48 /* 08734 80941404 02618021 */ addu $s0, $s3, $at /* 08738 80941408 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 /* 0873C 8094140C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 08740 80941410 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 08740 80941410 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 08744 80941414 8FA6004C */ lw $a2, 0x004C($sp) /* 08748 80941418 3C048095 */ lui $a0, %hi(D_8094AA60) ## $a0 = 80950000 @@ -522,7 +522,7 @@ glabel func_80940D48 /* 08750 80941420 2484AA60 */ addiu $a0, $a0, %lo(D_8094AA60) ## $a0 = 8094AA60 /* 08754 80941424 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 08758 80941428 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 -/* 0875C 8094142C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0875C 8094142C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 08760 80941430 8FA6004C */ lw $a2, 0x004C($sp) /* 08764 80941434 3C010001 */ lui $at, 0x0001 ## $at = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946B00.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946B00.s index 0555b05de9..4c729cdedb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946B00.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946B00.s @@ -70,7 +70,7 @@ glabel func_80946B00 /* 0DF2C 80946BFC AE09003C */ sw $t1, 0x003C($s0) ## 0000003C /* 0DF30 80946C00 8CCA0008 */ lw $t2, 0x0008($a2) ## 00000008 /* 0DF34 80946C04 AE0A0040 */ sw $t2, 0x0040($s0) ## 00000040 -/* 0DF38 80946C08 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0DF38 80946C08 0C0189B7 */ jal Collider_CylinderUpdate /* 0DF3C 80946C0C AFA50024 */ sw $a1, 0x0024($sp) /* 0DF40 80946C10 920B0565 */ lbu $t3, 0x0565($s0) ## 00000565 @@ -88,12 +88,12 @@ glabel func_80946B00 /* 0DF70 80946C40 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0DF74 80946C44 00812821 */ addu $a1, $a0, $at /* 0DF78 80946C48 AFA50028 */ sw $a1, 0x0028($sp) -/* 0DF7C 80946C4C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0DF7C 80946C4C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0DF80 80946C50 8FA60024 */ lw $a2, 0x0024($sp) /* 0DF84 80946C54 8FA50028 */ lw $a1, 0x0028($sp) /* 0DF88 80946C58 8FA4003C */ lw $a0, 0x003C($sp) -/* 0DF8C 80946C5C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0DF8C 80946C5C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 0DF90 80946C60 8FA60024 */ lw $a2, 0x0024($sp) .L80946C64: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s index d1e67d8ea1..92099a5bbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s @@ -7,11 +7,11 @@ glabel BossVa_Destroy /* 013FC 809506BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01400 809506C0 8FA50018 */ lw $a1, 0x0018($sp) /* 01404 809506C4 8FA4001C */ lw $a0, 0x001C($sp) -/* 01408 809506C8 0C016F32 */ jal func_8005BCC8 +/* 01408 809506C8 0C016F32 */ jal Collider_DestroyJntSph /* 0140C 809506CC 24A502D8 */ addiu $a1, $a1, 0x02D8 ## $a1 = 000002D8 /* 01410 809506D0 8FA50018 */ lw $a1, 0x0018($sp) /* 01414 809506D4 8FA4001C */ lw $a0, 0x001C($sp) -/* 01418 809506D8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 01418 809506D8 0C0170EB */ jal Collider_DestroyCylinder /* 0141C 809506DC 24A5028C */ addiu $a1, $a1, 0x028C ## $a1 = 0000028C /* 01420 809506E0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s index 207ed4f98e..8298861158 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s @@ -415,14 +415,14 @@ glabel L80950024 /* 010F4 809503B4 2670028C */ addiu $s0, $s3, 0x028C ## $s0 = 0000028C /* 010F8 809503B8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C /* 010FC 809503BC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01100 809503C0 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 01100 809503C0 0C0170D9 */ jal Collider_InitCylinder /* 01104 809503C4 E66001CC */ swc1 $f0, 0x01CC($s3) ## 000001CC /* 01108 809503C8 3C078096 */ lui $a3, %hi(D_8095BF60) ## $a3 = 80960000 /* 0110C 809503CC 24E7BF60 */ addiu $a3, $a3, %lo(D_8095BF60) ## $a3 = 8095BF60 /* 01110 809503D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01114 809503D4 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C -/* 01118 809503D8 0C01712B */ jal ActorCollider_InitCylinder +/* 01118 809503D8 0C01712B */ jal Collider_SetCylinder /* 0111C 809503DC 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 01120 809503E0 3C108096 */ lui $s0, %hi(D_8095C080) ## $s0 = 80960000 @@ -489,7 +489,7 @@ glabel L80950024 glabel L809504C4 /* 01204 809504C4 267002D8 */ addiu $s0, $s3, 0x02D8 ## $s0 = 000002D8 /* 01208 809504C8 02002825 */ or $a1, $s0, $zero ## $a1 = 000002D8 -/* 0120C 809504CC 0C016EFE */ jal func_8005BBF8 +/* 0120C 809504CC 0C016EFE */ jal Collider_InitJntSph /* 01210 809504D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01214 809504D4 3C078096 */ lui $a3, %hi(D_8095BFB0) ## $a3 = 80960000 /* 01218 809504D8 267802F8 */ addiu $t8, $s3, 0x02F8 ## $t8 = 000002F8 @@ -497,7 +497,7 @@ glabel L809504C4 /* 01220 809504E0 24E7BFB0 */ addiu $a3, $a3, %lo(D_8095BFB0) ## $a3 = 8095BFB0 /* 01224 809504E4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01228 809504E8 02002825 */ or $a1, $s0, $zero ## $a1 = 000002D8 -/* 0122C 809504EC 0C017014 */ jal func_8005C050 +/* 0122C 809504EC 0C017014 */ jal Collider_SetJntSph /* 01230 809504F0 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 01234 809504F4 3C198096 */ lui $t9, %hi(D_809668D2) ## $t9 = 80960000 /* 01238 809504F8 833968D2 */ lb $t9, %lo(D_809668D2)($t9) @@ -521,13 +521,13 @@ glabel L809504C4 glabel L80950538 /* 01278 80950538 26700338 */ addiu $s0, $s3, 0x0338 ## $s0 = 00000338 /* 0127C 8095053C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000338 -/* 01280 80950540 0C017406 */ jal func_8005D018 +/* 01280 80950540 0C017406 */ jal Collider_InitQuad /* 01284 80950544 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01288 80950548 3C078096 */ lui $a3, %hi(D_8095BFF4) ## $a3 = 80960000 /* 0128C 8095054C 24E7BFF4 */ addiu $a3, $a3, %lo(D_8095BFF4) ## $a3 = 8095BFF4 /* 01290 80950550 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01294 80950554 02002825 */ or $a1, $s0, $zero ## $a1 = 00000338 -/* 01298 80950558 0C017441 */ jal func_8005D104 +/* 01298 80950558 0C017441 */ jal Collider_SetQuad /* 0129C 8095055C 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 012A0 80950560 3C0B8096 */ lui $t3, %hi(D_809668D2) ## $t3 = 80960000 /* 012A4 80950564 816B68D2 */ lb $t3, %lo(D_809668D2)($t3) @@ -561,7 +561,7 @@ glabel L809505C4 .L809505C4: /* 01304 809505C4 267002D8 */ addiu $s0, $s3, 0x02D8 ## $s0 = 000002D8 /* 01308 809505C8 02002825 */ or $a1, $s0, $zero ## $a1 = 000002D8 -/* 0130C 809505CC 0C016EFE */ jal func_8005BBF8 +/* 0130C 809505CC 0C016EFE */ jal Collider_InitJntSph /* 01310 809505D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01314 809505D4 3C078096 */ lui $a3, %hi(D_8095BFE4) ## $a3 = 80960000 /* 01318 809505D8 266C02F8 */ addiu $t4, $s3, 0x02F8 ## $t4 = 000002F8 @@ -569,17 +569,17 @@ glabel L809505C4 /* 01320 809505E0 24E7BFE4 */ addiu $a3, $a3, %lo(D_8095BFE4) ## $a3 = 8095BFE4 /* 01324 809505E4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01328 809505E8 02002825 */ or $a1, $s0, $zero ## $a1 = 000002D8 -/* 0132C 809505EC 0C017014 */ jal func_8005C050 +/* 0132C 809505EC 0C017014 */ jal Collider_SetJntSph /* 01330 809505F0 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 01334 809505F4 26700338 */ addiu $s0, $s3, 0x0338 ## $s0 = 00000338 /* 01338 809505F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000338 -/* 0133C 809505FC 0C017406 */ jal func_8005D018 +/* 0133C 809505FC 0C017406 */ jal Collider_InitQuad /* 01340 80950600 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01344 80950604 3C078096 */ lui $a3, %hi(D_8095BFF4) ## $a3 = 80960000 /* 01348 80950608 24E7BFF4 */ addiu $a3, $a3, %lo(D_8095BFF4) ## $a3 = 8095BFF4 /* 0134C 8095060C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01350 80950610 02002825 */ or $a1, $s0, $zero ## $a1 = 00000338 -/* 01354 80950614 0C017441 */ jal func_8005D104 +/* 01354 80950614 0C017441 */ jal Collider_SetQuad /* 01358 80950618 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 0135C 8095061C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01360 80950620 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951844.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951844.s index 326e143dc3..8ba9302f82 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951844.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951844.s @@ -169,7 +169,7 @@ glabel func_80951844 /* 027B8 80951A78 2605028C */ addiu $a1, $s0, 0x028C ## $a1 = 0000028C .L80951A7C: /* 027BC 80951A7C AFA50040 */ sw $a1, 0x0040($sp) -/* 027C0 80951A80 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 027C0 80951A80 0C0189B7 */ jal Collider_CylinderUpdate /* 027C4 80951A84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 027C8 80951A88 8FA4004C */ lw $a0, 0x004C($sp) @@ -177,12 +177,12 @@ glabel func_80951844 /* 027D0 80951A90 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 027D4 80951A94 00812821 */ addu $a1, $a0, $at /* 027D8 80951A98 AFA5003C */ sw $a1, 0x003C($sp) -/* 027DC 80951A9C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 027DC 80951A9C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 027E0 80951AA0 8FA60040 */ lw $a2, 0x0040($sp) /* 027E4 80951AA4 8FA5003C */ lw $a1, 0x003C($sp) /* 027E8 80951AA8 8FA4004C */ lw $a0, 0x004C($sp) -/* 027EC 80951AAC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 027EC 80951AAC 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 027F0 80951AB0 8FA60040 */ lw $a2, 0x0040($sp) /* 027F4 80951AB4 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951C04.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951C04.s index 063b52bcc5..69f3b63b66 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951C04.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80951C04.s @@ -313,7 +313,7 @@ glabel func_80951C04 /* 02D80 80952040 46109180 */ add.s $f6, $f18, $f16 /* 02D84 80952044 AE0D0040 */ sw $t5, 0x0040($s0) ## 00000040 /* 02D88 80952048 E606003C */ swc1 $f6, 0x003C($s0) ## 0000003C -/* 02D8C 8095204C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 02D8C 8095204C 0C0189B7 */ jal Collider_CylinderUpdate /* 02D90 80952050 AFA50040 */ sw $a1, 0x0040($sp) /* 02D94 80952054 8FA4005C */ lw $a0, 0x005C($sp) @@ -321,7 +321,7 @@ glabel func_80951C04 /* 02D9C 8095205C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02DA0 80952060 00812821 */ addu $a1, $a0, $at /* 02DA4 80952064 AFA5003C */ sw $a1, 0x003C($sp) -/* 02DA8 80952068 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02DA8 80952068 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02DAC 8095206C 8FA60040 */ lw $a2, 0x0040($sp) /* 02DB0 80952070 92030114 */ lbu $v1, 0x0114($s0) ## 00000114 @@ -329,7 +329,7 @@ glabel func_80951C04 /* 02DB8 80952078 8FA5003C */ lw $a1, 0x003C($sp) /* 02DBC 8095207C 14600004 */ bne $v1, $zero, .L80952090 /* 02DC0 80952080 00000000 */ nop -/* 02DC4 80952084 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 02DC4 80952084 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 02DC8 80952088 8FA60040 */ lw $a2, 0x0040($sp) /* 02DCC 8095208C 92030114 */ lbu $v1, 0x0114($s0) ## 00000114 @@ -342,7 +342,7 @@ glabel func_80951C04 /* 02DE4 809520A4 860901F8 */ lh $t1, 0x01F8($s0) ## 000001F8 .L809520A8: /* 02DE8 809520A8 8FA5003C */ lw $a1, 0x003C($sp) -/* 02DEC 809520AC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02DEC 809520AC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02DF0 809520B0 8FA60040 */ lw $a2, 0x0040($sp) /* 02DF4 809520B4 860901F8 */ lh $t1, 0x01F8($s0) ## 000001F8 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s index 064dfd143c..f5c6a88322 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095213C.s @@ -427,7 +427,7 @@ glabel func_8095213C /* 03434 809526F4 2670028C */ addiu $s0, $s3, 0x028C ## $s0 = 0000028C .L809526F8: /* 03438 809526F8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C -/* 0343C 809526FC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0343C 809526FC 0C0189B7 */ jal Collider_CylinderUpdate /* 03440 80952700 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 03444 80952704 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -435,12 +435,12 @@ glabel func_8095213C /* 0344C 8095270C 02818821 */ addu $s1, $s4, $at /* 03450 80952710 02202825 */ or $a1, $s1, $zero ## $a1 = 8095C1D0 /* 03454 80952714 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 03458 80952718 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 03458 80952718 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0345C 8095271C 02003025 */ or $a2, $s0, $zero ## $a2 = 0000028C /* 03460 80952720 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 03464 80952724 02202825 */ or $a1, $s1, $zero ## $a1 = 8095C1D0 -/* 03468 80952728 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 03468 80952728 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 0346C 8095272C 02003025 */ or $a2, $s0, $zero ## $a2 = 0000028C /* 03470 80952730 8E680198 */ lw $t0, 0x0198($s3) ## 00000198 @@ -448,7 +448,7 @@ glabel func_8095213C /* 03478 80952738 02202825 */ or $a1, $s1, $zero ## $a1 = 8095C1D0 /* 0347C 8095273C 55000004 */ bnel $t0, $zero, .L80952750 /* 03480 80952740 866901F8 */ lh $t1, 0x01F8($s3) ## 000001F8 -/* 03484 80952744 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 03484 80952744 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 03488 80952748 02003025 */ or $a2, $s0, $zero ## $a2 = 0000028C /* 0348C 8095274C 866901F8 */ lh $t1, 0x01F8($s3) ## 000001F8 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952858.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952858.s index 6140a12870..1420380ac5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952858.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80952858.s @@ -718,7 +718,7 @@ glabel func_80952858 /* 03F88 80953248 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 03F8C 8095324C 2605028C */ addiu $a1, $s0, 0x028C ## $a1 = 0000028C /* 03F90 80953250 AFA5003C */ sw $a1, 0x003C($sp) -/* 03F94 80953254 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 03F94 80953254 0C0189B7 */ jal Collider_CylinderUpdate /* 03F98 80953258 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03F9C 8095325C 8FA4005C */ lw $a0, 0x005C($sp) @@ -726,7 +726,7 @@ glabel func_80952858 /* 03FA4 80953264 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 03FA8 80953268 00812821 */ addu $a1, $a0, $at /* 03FAC 8095326C AFA50038 */ sw $a1, 0x0038($sp) -/* 03FB0 80953270 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 03FB0 80953270 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 03FB4 80953274 8FA6003C */ lw $a2, 0x003C($sp) /* 03FB8 80953278 820B0196 */ lb $t3, 0x0196($s0) ## 00000196 @@ -734,7 +734,7 @@ glabel func_80952858 /* 03FC0 80953280 8FA50038 */ lw $a1, 0x0038($sp) /* 03FC4 80953284 55600004 */ bnel $t3, $zero, .L80953298 /* 03FC8 80953288 860301F8 */ lh $v1, 0x01F8($s0) ## 000001F8 -/* 03FCC 8095328C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 03FCC 8095328C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 03FD0 80953290 8FA6003C */ lw $a2, 0x003C($sp) /* 03FD4 80953294 860301F8 */ lh $v1, 0x01F8($s0) ## 000001F8 @@ -751,7 +751,7 @@ glabel func_80952858 /* 03FFC 809532BC 45020005 */ bc1fl .L809532D4 /* 04000 809532C0 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 .L809532C4: -/* 04004 809532C4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 04004 809532C4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 04008 809532C8 8FA6003C */ lw $a2, 0x003C($sp) /* 0400C 809532CC 860301F8 */ lh $v1, 0x01F8($s0) ## 000001F8 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s index c542c57b85..861fb3429e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s @@ -127,7 +127,7 @@ glabel func_80954168 /* 05048 80954308 15A00004 */ bne $t5, $zero, .L8095431C /* 0504C 8095430C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 05050 80954310 00812821 */ addu $a1, $a0, $at -/* 05054 80954314 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 05054 80954314 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 05058 80954318 260602D8 */ addiu $a2, $s0, 0x02D8 ## $a2 = 000002D8 .L8095431C: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s index 53f7d2665a..bf9df3d606 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954C20.s @@ -671,12 +671,12 @@ glabel func_80954C20 /* 0628C 8095554C 26060338 */ addiu $a2, $s0, 0x0338 ## $a2 = 00000338 /* 06290 80955550 00812821 */ addu $a1, $a0, $at /* 06294 80955554 AFA5003C */ sw $a1, 0x003C($sp) -/* 06298 80955558 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 06298 80955558 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 0629C 8095555C AFA60038 */ sw $a2, 0x0038($sp) /* 062A0 80955560 8FA5003C */ lw $a1, 0x003C($sp) /* 062A4 80955564 8FA60038 */ lw $a2, 0x0038($sp) -/* 062A8 80955568 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 062A8 80955568 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 062AC 8095556C 8FA400AC */ lw $a0, 0x00AC($sp) /* 062B0 80955570 1000002D */ beq $zero, $zero, .L80955628 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955EEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955EEC.s index 9b56e1c52f..b47d4609f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955EEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955EEC.s @@ -460,12 +460,12 @@ glabel func_80955EEC /* 07278 80956538 26060338 */ addiu $a2, $s0, 0x0338 ## $a2 = 00000338 /* 0727C 8095653C 00812821 */ addu $a1, $a0, $at /* 07280 80956540 AFA50040 */ sw $a1, 0x0040($sp) -/* 07284 80956544 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 07284 80956544 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 07288 80956548 AFA6003C */ sw $a2, 0x003C($sp) /* 0728C 8095654C 8FA50040 */ lw $a1, 0x0040($sp) /* 07290 80956550 8FA6003C */ lw $a2, 0x003C($sp) -/* 07294 80956554 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 07294 80956554 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 07298 80956558 8FA4007C */ lw $a0, 0x007C($sp) /* 0729C 8095655C 1000002D */ beq $zero, $zero, .L80956614 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956EE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956EE0.s index 7af634089e..b767a59278 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956EE0.s @@ -217,7 +217,7 @@ glabel func_80956EE0 /* 07F1C 809571DC 00812821 */ addu $a1, $a0, $at /* 07F20 809571E0 AFA50040 */ sw $a1, 0x0040($sp) /* 07F24 809571E4 00E03025 */ or $a2, $a3, $zero ## $a2 = 000002D8 -/* 07F28 809571E8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 07F28 809571E8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 07F2C 809571EC AFA7003C */ sw $a3, 0x003C($sp) /* 07F30 809571F0 3C018096 */ lui $at, %hi(D_80966936) ## $at = 80960000 @@ -236,12 +236,12 @@ glabel func_80956EE0 /* 07F5C 8095721C 8FA4006C */ lw $a0, 0x006C($sp) /* 07F60 80957220 26060338 */ addiu $a2, $s0, 0x0338 ## $a2 = 00000338 /* 07F64 80957224 AFA50040 */ sw $a1, 0x0040($sp) -/* 07F68 80957228 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 07F68 80957228 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 07F6C 8095722C AFA7003C */ sw $a3, 0x003C($sp) /* 07F70 80957230 8FA50040 */ lw $a1, 0x0040($sp) /* 07F74 80957234 8FA6003C */ lw $a2, 0x003C($sp) -/* 07F78 80957238 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 07F78 80957238 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 07F7C 8095723C 8FA4006C */ lw $a0, 0x006C($sp) /* 07F80 80957240 8FB90044 */ lw $t9, 0x0044($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957384.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957384.s index 28abe71820..3d5f347576 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957384.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957384.s @@ -279,12 +279,12 @@ glabel func_80957384 /* 084B4 80957774 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 084B8 80957778 00812821 */ addu $a1, $a0, $at /* 084BC 8095777C AFA5003C */ sw $a1, 0x003C($sp) -/* 084C0 80957780 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 084C0 80957780 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 084C4 80957784 26060338 */ addiu $a2, $s0, 0x0338 ## $a2 = 00000338 /* 084C8 80957788 8FA4006C */ lw $a0, 0x006C($sp) /* 084CC 8095778C 8FA5003C */ lw $a1, 0x003C($sp) -/* 084D0 80957790 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 084D0 80957790 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 084D4 80957794 260602D8 */ addiu $a2, $s0, 0x02D8 ## $a2 = 000002D8 /* 084D8 80957798 10000035 */ beq $zero, $zero, .L80957870 @@ -364,7 +364,7 @@ glabel func_80957384 /* 085DC 8095789C AFA00010 */ sw $zero, 0x0010($sp) /* 085E0 809578A0 8FA4006C */ lw $a0, 0x006C($sp) /* 085E4 809578A4 8FA5003C */ lw $a1, 0x003C($sp) -/* 085E8 809578A8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 085E8 809578A8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 085EC 809578AC 8FA60038 */ lw $a2, 0x0038($sp) /* 085F0 809578B0 8FAD0040 */ lw $t5, 0x0040($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809579F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809579F4.s index 00b82dd5e5..e4cb8b3976 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809579F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809579F4.s @@ -59,7 +59,7 @@ glabel func_809579F4 /* 08808 80957AC8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0880C 80957ACC 260602D8 */ addiu $a2, $s0, 0x02D8 ## $a2 = 000002D8 /* 08810 80957AD0 46049200 */ add.s $f8, $f18, $f4 -/* 08814 80957AD4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 08814 80957AD4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 08818 80957AD8 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 0881C 80957ADC 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097895C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097895C.s index 6dc91e39ab..db52e93959 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097895C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097895C.s @@ -6,13 +6,13 @@ glabel func_8097895C /* 0003C 8097896C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00040 80978970 AFA60020 */ sw $a2, 0x0020($sp) /* 00044 80978974 AFA70024 */ sw $a3, 0x0024($sp) -/* 00048 80978978 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00048 80978978 0C0170D9 */ jal Collider_InitCylinder /* 0004C 8097897C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 /* 00050 80978980 8FA4001C */ lw $a0, 0x001C($sp) /* 00054 80978984 8FA50020 */ lw $a1, 0x0020($sp) /* 00058 80978988 8FA60018 */ lw $a2, 0x0018($sp) -/* 0005C 8097898C 0C017114 */ jal func_8005C450 +/* 0005C 8097898C 0C017114 */ jal Collider_SetCylinder_Set3 /* 00060 80978990 8FA70024 */ lw $a3, 0x0024($sp) /* 00064 80978994 8FBF0014 */ lw $ra, 0x0014($sp) /* 00068 80978998 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789D8.s index 15abd08259..681c2e70d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_809789D8.s @@ -18,35 +18,35 @@ glabel func_809789D8 /* 000E8 80978A18 10000018 */ beq $zero, $zero, .L80978A7C /* 000EC 80978A1C 8FBF001C */ lw $ra, 0x001C($sp) .L80978A20: -/* 000F0 80978A20 0C0170EB */ jal ActorCollider_FreeCylinder +/* 000F0 80978A20 0C0170EB */ jal Collider_DestroyCylinder /* 000F4 80978A24 26050184 */ addiu $a1, $s0, 0x0184 ## $a1 = 00000184 /* 000F8 80978A28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000FC 80978A2C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 000FC 80978A2C 0C0170EB */ jal Collider_DestroyCylinder /* 00100 80978A30 260501D0 */ addiu $a1, $s0, 0x01D0 ## $a1 = 000001D0 /* 00104 80978A34 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00108 80978A38 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00108 80978A38 0C0170EB */ jal Collider_DestroyCylinder /* 0010C 80978A3C 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C /* 00110 80978A40 1000000E */ beq $zero, $zero, .L80978A7C /* 00114 80978A44 8FBF001C */ lw $ra, 0x001C($sp) .L80978A48: -/* 00118 80978A48 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00118 80978A48 0C0170EB */ jal Collider_DestroyCylinder /* 0011C 80978A4C 26050184 */ addiu $a1, $s0, 0x0184 ## $a1 = 00000184 /* 00120 80978A50 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00124 80978A54 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00124 80978A54 0C0170EB */ jal Collider_DestroyCylinder /* 00128 80978A58 260501D0 */ addiu $a1, $s0, 0x01D0 ## $a1 = 000001D0 /* 0012C 80978A5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00130 80978A60 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00130 80978A60 0C0170EB */ jal Collider_DestroyCylinder /* 00134 80978A64 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C /* 00138 80978A68 10000004 */ beq $zero, $zero, .L80978A7C /* 0013C 80978A6C 8FBF001C */ lw $ra, 0x001C($sp) .L80978A70: -/* 00140 80978A70 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00140 80978A70 0C0170EB */ jal Collider_DestroyCylinder /* 00144 80978A74 26050184 */ addiu $a1, $s0, 0x0184 ## $a1 = 00000184 /* 00148 80978A78 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B080.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B080.s index 48dde65292..e5f2f2cab4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B080.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B080.s @@ -10,19 +10,19 @@ glabel func_8097B080 /* 02770 8097B0A0 00A12821 */ addu $a1, $a1, $at /* 02774 8097B0A4 AFA5001C */ sw $a1, 0x001C($sp) /* 02778 8097B0A8 AFA70044 */ sw $a3, 0x0044($sp) -/* 0277C 8097B0AC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0277C 8097B0AC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02780 8097B0B0 24C60184 */ addiu $a2, $a2, 0x0184 ## $a2 = 00000184 /* 02784 8097B0B4 8FA60040 */ lw $a2, 0x0040($sp) /* 02788 8097B0B8 8FA40044 */ lw $a0, 0x0044($sp) /* 0278C 8097B0BC 8FA5001C */ lw $a1, 0x001C($sp) -/* 02790 8097B0C0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02790 8097B0C0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02794 8097B0C4 24C601D0 */ addiu $a2, $a2, 0x01D0 ## $a2 = 000001D0 /* 02798 8097B0C8 8FA60040 */ lw $a2, 0x0040($sp) /* 0279C 8097B0CC 8FA40044 */ lw $a0, 0x0044($sp) /* 027A0 8097B0D0 8FA5001C */ lw $a1, 0x001C($sp) -/* 027A4 8097B0D4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 027A4 8097B0D4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 027A8 8097B0D8 24C6021C */ addiu $a2, $a2, 0x021C ## $a2 = 0000021C /* 027AC 8097B0DC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B5A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B5A4.s index c03389363c..ce606a5cfe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B5A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B5A4.s @@ -10,19 +10,19 @@ glabel func_8097B5A4 /* 02C94 8097B5C4 00A12821 */ addu $a1, $a1, $at /* 02C98 8097B5C8 AFA5001C */ sw $a1, 0x001C($sp) /* 02C9C 8097B5CC AFA70044 */ sw $a3, 0x0044($sp) -/* 02CA0 8097B5D0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02CA0 8097B5D0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02CA4 8097B5D4 24C60184 */ addiu $a2, $a2, 0x0184 ## $a2 = 00000184 /* 02CA8 8097B5D8 8FA60040 */ lw $a2, 0x0040($sp) /* 02CAC 8097B5DC 8FA40044 */ lw $a0, 0x0044($sp) /* 02CB0 8097B5E0 8FA5001C */ lw $a1, 0x001C($sp) -/* 02CB4 8097B5E4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02CB4 8097B5E4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02CB8 8097B5E8 24C601D0 */ addiu $a2, $a2, 0x01D0 ## $a2 = 000001D0 /* 02CBC 8097B5EC 8FA60040 */ lw $a2, 0x0040($sp) /* 02CC0 8097B5F0 8FA40044 */ lw $a0, 0x0044($sp) /* 02CC4 8097B5F4 8FA5001C */ lw $a1, 0x001C($sp) -/* 02CC8 8097B5F8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02CC8 8097B5F8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02CCC 8097B5FC 24C6021C */ addiu $a2, $a2, 0x021C ## $a2 = 0000021C /* 02CD0 8097B600 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BA48.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BA48.s index 6ed6366d38..ced127babf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BA48.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BA48.s @@ -68,14 +68,14 @@ glabel func_8097BA48 .L8097BB3C: /* 0320C 8097BB3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8097BB40: -/* 03210 8097BB40 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 03210 8097BB40 0C0189B7 */ jal Collider_CylinderUpdate /* 03214 8097BB44 02402825 */ or $a1, $s2, $zero ## $a1 = 00000184 /* 03218 8097BB48 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0321C 8097BB4C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 03220 8097BB50 02212821 */ addu $a1, $s1, $at /* 03224 8097BB54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03228 8097BB58 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 03228 8097BB58 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0322C 8097BB5C 02403025 */ or $a2, $s2, $zero ## $a2 = 00000184 /* 03230 8097BB60 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D00.s index e12d1a3edb..bded04b92b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D00.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D00.s @@ -6,14 +6,14 @@ glabel func_80984D00 /* 00130 80984D10 AFBF0014 */ sw $ra, 0x0014($sp) /* 00134 80984D14 24C50284 */ addiu $a1, $a2, 0x0284 ## $a1 = 00000284 /* 00138 80984D18 AFA50018 */ sw $a1, 0x0018($sp) -/* 0013C 80984D1C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0013C 80984D1C 0C0170D9 */ jal Collider_InitCylinder /* 00140 80984D20 AFA60020 */ sw $a2, 0x0020($sp) /* 00144 80984D24 3C078098 */ lui $a3, %hi(D_80987840) ## $a3 = 80980000 /* 00148 80984D28 8FA50018 */ lw $a1, 0x0018($sp) /* 0014C 80984D2C 8FA60020 */ lw $a2, 0x0020($sp) /* 00150 80984D30 24E77840 */ addiu $a3, $a3, %lo(D_80987840) ## $a3 = 80987840 -/* 00154 80984D34 0C017114 */ jal func_8005C450 +/* 00154 80984D34 0C017114 */ jal Collider_SetCylinder_Set3 /* 00158 80984D38 8FA40024 */ lw $a0, 0x0024($sp) /* 0015C 80984D3C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00160 80984D40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D4C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D4C.s index 11f3ac4bf6..5a2f7e5b42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D4C.s @@ -3,7 +3,7 @@ glabel func_80984D4C /* 00170 80984D50 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00174 80984D54 AFBF0014 */ sw $ra, 0x0014($sp) /* 00178 80984D58 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0017C 80984D5C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0017C 80984D5C 0C0170EB */ jal Collider_DestroyCylinder /* 00180 80984D60 24C50284 */ addiu $a1, $a2, 0x0284 ## $a1 = 00000284 /* 00184 80984D64 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D74.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D74.s index e17d36f839..bb968c3df7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D74.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80984D74.s @@ -4,14 +4,14 @@ glabel func_80984D74 /* 0019C 80984D7C AFA50034 */ sw $a1, 0x0034($sp) /* 001A0 80984D80 24860284 */ addiu $a2, $a0, 0x0284 ## $a2 = 00000284 /* 001A4 80984D84 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000284 -/* 001A8 80984D88 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 001A8 80984D88 0C0189B7 */ jal Collider_CylinderUpdate /* 001AC 80984D8C AFA60018 */ sw $a2, 0x0018($sp) /* 001B0 80984D90 8FA40034 */ lw $a0, 0x0034($sp) /* 001B4 80984D94 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 001B8 80984D98 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 001BC 80984D9C 8FA60018 */ lw $a2, 0x0018($sp) -/* 001C0 80984DA0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 001C0 80984DA0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 001C4 80984DA4 00812821 */ addu $a1, $a0, $at /* 001C8 80984DA8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Destroy.s index 39bb91e37d..e77958f609 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Destroy.s @@ -5,12 +5,12 @@ glabel DemoKekkai_Destroy /* 0027C 8098D24C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00280 8098D250 8FA50018 */ lw $a1, 0x0018($sp) /* 00284 8098D254 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00288 8098D258 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00288 8098D258 0C0170EB */ jal Collider_DestroyCylinder /* 0028C 8098D25C 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C /* 00290 8098D260 8FA50018 */ lw $a1, 0x0018($sp) /* 00294 8098D264 8FA4001C */ lw $a0, 0x001C($sp) -/* 00298 8098D268 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00298 8098D268 0C0170EB */ jal Collider_DestroyCylinder /* 0029C 8098D26C 24A50198 */ addiu $a1, $a1, 0x0198 ## $a1 = 00000198 /* 002A0 8098D270 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Init.s index 58586cf7d2..7cabb0a268 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Init.s @@ -31,34 +31,34 @@ glabel DemoKekkai_Init /* 00078 8098D048 A20E00AE */ sb $t6, 0x00AE($s0) ## 000000AE /* 0007C 8098D04C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00080 8098D050 AFA50020 */ sw $a1, 0x0020($sp) -/* 00084 8098D054 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00084 8098D054 0C0170D9 */ jal Collider_InitCylinder /* 00088 8098D058 8FA40034 */ lw $a0, 0x0034($sp) /* 0008C 8098D05C 3C078099 */ lui $a3, %hi(D_8098E0B0) ## $a3 = 80990000 /* 00090 8098D060 24E7E0B0 */ addiu $a3, $a3, %lo(D_8098E0B0) ## $a3 = 8098E0B0 /* 00094 8098D064 8FA40034 */ lw $a0, 0x0034($sp) /* 00098 8098D068 8FA50020 */ lw $a1, 0x0020($sp) -/* 0009C 8098D06C 0C01712B */ jal ActorCollider_InitCylinder +/* 0009C 8098D06C 0C01712B */ jal Collider_SetCylinder /* 000A0 8098D070 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000A4 8098D074 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 000A8 8098D078 AFA50024 */ sw $a1, 0x0024($sp) -/* 000AC 8098D07C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000AC 8098D07C 0C0170D9 */ jal Collider_InitCylinder /* 000B0 8098D080 8FA40034 */ lw $a0, 0x0034($sp) /* 000B4 8098D084 3C078099 */ lui $a3, %hi(D_8098E0B0) ## $a3 = 80990000 /* 000B8 8098D088 24E7E0B0 */ addiu $a3, $a3, %lo(D_8098E0B0) ## $a3 = 8098E0B0 /* 000BC 8098D08C 8FA40034 */ lw $a0, 0x0034($sp) /* 000C0 8098D090 8FA50024 */ lw $a1, 0x0024($sp) -/* 000C4 8098D094 0C01712B */ jal ActorCollider_InitCylinder +/* 000C4 8098D094 0C01712B */ jal Collider_SetCylinder /* 000C8 8098D098 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000CC 8098D09C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000D0 8098D0A0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 000D0 8098D0A0 0C0189B7 */ jal Collider_CylinderUpdate /* 000D4 8098D0A4 8FA50020 */ lw $a1, 0x0020($sp) /* 000D8 8098D0A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000DC 8098D0AC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 000DC 8098D0AC 0C0189B7 */ jal Collider_CylinderUpdate /* 000E0 8098D0B0 8FA50024 */ lw $a1, 0x0024($sp) /* 000E4 8098D0B4 8604001C */ lh $a0, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Update.s index 0ba38535f4..bea5bcbd42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Update.s @@ -42,23 +42,23 @@ glabel DemoKekkai_Update /* 006A4 8098D674 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 006A8 8098D678 AFA60030 */ sw $a2, 0x0030($sp) /* 006AC 8098D67C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 006B0 8098D680 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 006B0 8098D680 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 006B4 8098D684 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 006B8 8098D688 8FA60030 */ lw $a2, 0x0030($sp) /* 006BC 8098D68C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 006C0 8098D690 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 006C0 8098D690 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 006C4 8098D694 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 006C8 8098D698 26060198 */ addiu $a2, $s0, 0x0198 ## $a2 = 00000198 /* 006CC 8098D69C AFA60030 */ sw $a2, 0x0030($sp) /* 006D0 8098D6A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 006D4 8098D6A4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 006D4 8098D6A4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 006D8 8098D6A8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 006DC 8098D6AC 8FA60030 */ lw $a2, 0x0030($sp) /* 006E0 8098D6B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 006E4 8098D6B4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 006E4 8098D6B4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 006E8 8098D6B8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 006EC 8098D6BC 8E1901F8 */ lw $t9, 0x01F8($s0) ## 000001F8 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D87C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D87C.s index bce49b413e..95667f0d8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D87C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D87C.s @@ -37,12 +37,12 @@ glabel func_8098D87C /* 008FC 8098D8CC 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 00900 8098D8D0 AFA60028 */ sw $a2, 0x0028($sp) /* 00904 8098D8D4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00908 8098D8D8 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00908 8098D8D8 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 0090C 8098D8DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00910 8098D8E0 8FA60028 */ lw $a2, 0x0028($sp) /* 00914 8098D8E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00918 8098D8E8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00918 8098D8E8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0091C 8098D8EC 8FA5002C */ lw $a1, 0x002C($sp) /* 00920 8098D8F0 921801A9 */ lbu $t8, 0x01A9($s0) ## 000001A9 @@ -90,7 +90,7 @@ glabel func_8098D87C /* 009C0 8098D990 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L8098D994: /* 009C4 8098D994 8FA5002C */ lw $a1, 0x002C($sp) -/* 009C8 8098D998 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 009C8 8098D998 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 009CC 8098D99C 26060198 */ addiu $a2, $s0, 0x0198 ## $a2 = 00000198 /* 009D0 8098D9A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Destroy.s index 06d53ebed9..aa90ffd74f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Destroy.s @@ -8,12 +8,12 @@ glabel DoorKiller_Destroy /* 0039C 80994FEC 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 /* 003A0 80994FF0 15E00007 */ bne $t7, $zero, .L80995010 /* 003A4 80994FF4 24C501C8 */ addiu $a1, $a2, 0x01C8 ## $a1 = 000001C8 -/* 003A8 80994FF8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 003A8 80994FF8 0C0170EB */ jal Collider_DestroyCylinder /* 003AC 80994FFC AFA60018 */ sw $a2, 0x0018($sp) /* 003B0 80995000 8FA60018 */ lw $a2, 0x0018($sp) /* 003B4 80995004 8FA4001C */ lw $a0, 0x001C($sp) -/* 003B8 80995008 0C016F32 */ jal func_8005BCC8 +/* 003B8 80995008 0C016F32 */ jal Collider_DestroyJntSph /* 003BC 8099500C 24C50220 */ addiu $a1, $a2, 0x0220 ## $a1 = 00000220 .L80995010: /* 003C0 80995010 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s index 91aee3d6c1..fb09456848 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s @@ -112,19 +112,19 @@ glabel L80994D4C /* 0014C 80994D9C 265001C8 */ addiu $s0, $s2, 0x01C8 ## $s0 = 000001C8 /* 00150 80994DA0 02002825 */ or $a1, $s0, $zero ## $a1 = 000001C8 /* 00154 80994DA4 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 00158 80994DA8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00158 80994DA8 0C0170D9 */ jal Collider_InitCylinder /* 0015C 80994DAC A64D0198 */ sh $t5, 0x0198($s2) ## 00000198 /* 00160 80994DB0 3C078099 */ lui $a3, %hi(D_80995FB0) ## $a3 = 80990000 /* 00164 80994DB4 24E75FB0 */ addiu $a3, $a3, %lo(D_80995FB0) ## $a3 = 80995FB0 /* 00168 80994DB8 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 0016C 80994DBC 02002825 */ or $a1, $s0, $zero ## $a1 = 000001C8 -/* 00170 80994DC0 0C01712B */ jal ActorCollider_InitCylinder +/* 00170 80994DC0 0C01712B */ jal Collider_SetCylinder /* 00174 80994DC4 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00178 80994DC8 26500220 */ addiu $s0, $s2, 0x0220 ## $s0 = 00000220 /* 0017C 80994DCC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000220 -/* 00180 80994DD0 0C016EFE */ jal func_8005BBF8 +/* 00180 80994DD0 0C016EFE */ jal Collider_InitJntSph /* 00184 80994DD4 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 00188 80994DD8 3C078099 */ lui $a3, %hi(D_80996000) ## $a3 = 80990000 /* 0018C 80994DDC 264E0240 */ addiu $t6, $s2, 0x0240 ## $t6 = 00000240 @@ -132,7 +132,7 @@ glabel L80994D4C /* 00194 80994DE4 24E76000 */ addiu $a3, $a3, %lo(D_80996000) ## $a3 = 80996000 /* 00198 80994DE8 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 0019C 80994DEC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000220 -/* 001A0 80994DF0 0C017014 */ jal func_8005C050 +/* 001A0 80994DF0 0C017014 */ jal Collider_SetJntSph /* 001A4 80994DF4 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 001A8 80994DF8 8E58023C */ lw $t8, 0x023C($s2) ## 0000023C /* 001AC 80994DFC 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809952B8.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809952B8.s index d91f434cbb..863005637f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809952B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_809952B8.s @@ -5,7 +5,7 @@ glabel func_809952B8 /* 00674 809952C4 248601C8 */ addiu $a2, $a0, 0x01C8 ## $a2 = 000001C8 /* 00678 809952C8 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001C8 /* 0067C 809952CC AFA6001C */ sw $a2, 0x001C($sp) -/* 00680 809952D0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00680 809952D0 0C0189B7 */ jal Collider_CylinderUpdate /* 00684 809952D4 AFA40020 */ sw $a0, 0x0020($sp) /* 00688 809952D8 8FA40024 */ lw $a0, 0x0024($sp) @@ -13,13 +13,13 @@ glabel func_809952B8 /* 00690 809952E0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00694 809952E4 00812821 */ addu $a1, $a0, $at /* 00698 809952E8 8FA6001C */ lw $a2, 0x001C($sp) -/* 0069C 809952EC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0069C 809952EC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 006A0 809952F0 AFA50018 */ sw $a1, 0x0018($sp) /* 006A4 809952F4 8FA60020 */ lw $a2, 0x0020($sp) /* 006A8 809952F8 8FA50018 */ lw $a1, 0x0018($sp) /* 006AC 809952FC 8FA40024 */ lw $a0, 0x0024($sp) -/* 006B0 80995300 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 006B0 80995300 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 006B4 80995304 24C60220 */ addiu $a2, $a2, 0x0220 ## $a2 = 00000220 /* 006B8 80995308 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Destroy.s index d25f53d45a..d772704b9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Destroy.s @@ -12,12 +12,12 @@ glabel EnAm_Destroy /* 0031C 809AE23C 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 00320 809AE240 8FA50018 */ lw $a1, 0x0018($sp) /* 00324 809AE244 8FA4001C */ lw $a0, 0x001C($sp) -/* 00328 809AE248 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00328 809AE248 0C0170EB */ jal Collider_DestroyCylinder /* 0032C 809AE24C 24A50274 */ addiu $a1, $a1, 0x0274 ## $a1 = 00000274 /* 00330 809AE250 8FA50018 */ lw $a1, 0x0018($sp) /* 00334 809AE254 8FA4001C */ lw $a0, 0x001C($sp) -/* 00338 809AE258 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00338 809AE258 0C0170EB */ jal Collider_DestroyCylinder /* 0033C 809AE25C 24A502C0 */ addiu $a1, $a1, 0x02C0 ## $a1 = 000002C0 /* 00340 809AE260 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Init.s index 243e05fd24..22c77b798c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Init.s @@ -42,19 +42,19 @@ glabel EnAm_Init /* 001BC 809AE0DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 001C0 809AE0E0 26050274 */ addiu $a1, $s0, 0x0274 ## $a1 = 00000274 /* 001C4 809AE0E4 AFA50034 */ sw $a1, 0x0034($sp) -/* 001C8 809AE0E8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 001C8 809AE0E8 0C0170D9 */ jal Collider_InitCylinder /* 001CC 809AE0EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001D0 809AE0F0 260502C0 */ addiu $a1, $s0, 0x02C0 ## $a1 = 000002C0 /* 001D4 809AE0F4 AFA50038 */ sw $a1, 0x0038($sp) -/* 001D8 809AE0F8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 001D8 809AE0F8 0C0170D9 */ jal Collider_InitCylinder /* 001DC 809AE0FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001E0 809AE100 3C07809B */ lui $a3, %hi(D_809AFF80) ## $a3 = 809B0000 /* 001E4 809AE104 24E7FF80 */ addiu $a3, $a3, %lo(D_809AFF80) ## $a3 = 809AFF80 /* 001E8 809AE108 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001EC 809AE10C 8FA50034 */ lw $a1, 0x0034($sp) -/* 001F0 809AE110 0C01712B */ jal ActorCollider_InitCylinder +/* 001F0 809AE110 0C01712B */ jal Collider_SetCylinder /* 001F4 809AE114 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001F8 809AE118 8619001C */ lh $t9, 0x001C($s0) ## 0000001C @@ -68,7 +68,7 @@ glabel EnAm_Init /* 00218 809AE138 24E7FF80 */ addiu $a3, $a3, %lo(D_809AFF80) ## $a3 = 809AFF80 /* 0021C 809AE13C 8FA50038 */ lw $a1, 0x0038($sp) /* 00220 809AE140 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00224 809AE144 0C01712B */ jal ActorCollider_InitCylinder +/* 00224 809AE144 0C01712B */ jal Collider_SetCylinder /* 00228 809AE148 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0022C 809AE14C 24090035 */ addiu $t1, $zero, 0x0035 ## $t1 = 00000035 @@ -99,18 +99,18 @@ glabel EnAm_Init /* 00284 809AE1A4 240D00FE */ addiu $t5, $zero, 0x00FE ## $t5 = 000000FE .L809AE1A8: /* 00288 809AE1A8 3C07809B */ lui $a3, %hi(D_809AFFAC) ## $a3 = 809B0000 -/* 0028C 809AE1AC 0C01712B */ jal ActorCollider_InitCylinder +/* 0028C 809AE1AC 0C01712B */ jal Collider_SetCylinder /* 00290 809AE1B0 24E7FFAC */ addiu $a3, $a3, %lo(D_809AFFAC) ## $a3 = 809AFFAC /* 00294 809AE1B4 2605030C */ addiu $a1, $s0, 0x030C ## $a1 = 0000030C /* 00298 809AE1B8 AFA50038 */ sw $a1, 0x0038($sp) -/* 0029C 809AE1BC 0C017406 */ jal func_8005D018 +/* 0029C 809AE1BC 0C017406 */ jal Collider_InitQuad /* 002A0 809AE1C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002A4 809AE1C4 3C07809B */ lui $a3, %hi(D_809AFFD8) ## $a3 = 809B0000 /* 002A8 809AE1C8 8FA50038 */ lw $a1, 0x0038($sp) /* 002AC 809AE1CC 24E7FFD8 */ addiu $a3, $a3, %lo(D_809AFFD8) ## $a3 = 809AFFD8 /* 002B0 809AE1D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002B4 809AE1D4 0C017441 */ jal func_8005D104 +/* 002B4 809AE1D4 0C017441 */ jal Collider_SetQuad /* 002B8 809AE1D8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002BC 809AE1DC 3C0C809B */ lui $t4, %hi(D_809B0028) ## $t4 = 809B0000 /* 002C0 809AE1E0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Update.s index 4f2240fb8a..cb05242bc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Update.s @@ -172,12 +172,12 @@ glabel EnAm_Update /* 01D34 809AFC54 26510274 */ addiu $s1, $s2, 0x0274 ## $s1 = 00000274 .L809AFC58: /* 01D38 809AFC58 02202825 */ or $a1, $s1, $zero ## $a1 = 00000274 -/* 01D3C 809AFC5C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01D3C 809AFC5C 0C0189B7 */ jal Collider_CylinderUpdate /* 01D40 809AFC60 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01D44 809AFC64 265002C0 */ addiu $s0, $s2, 0x02C0 ## $s0 = 000002C0 /* 01D48 809AFC68 02002825 */ or $a1, $s0, $zero ## $a1 = 000002C0 -/* 01D4C 809AFC6C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01D4C 809AFC6C 0C0189B7 */ jal Collider_CylinderUpdate /* 01D50 809AFC70 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01D54 809AFC74 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -185,7 +185,7 @@ glabel EnAm_Update /* 01D5C 809AFC7C 02612821 */ addu $a1, $s3, $at /* 01D60 809AFC80 AFA5005C */ sw $a1, 0x005C($sp) /* 01D64 809AFC84 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01D68 809AFC88 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01D68 809AFC88 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01D6C 809AFC8C 02203025 */ or $a2, $s1, $zero ## $a2 = 00000274 /* 01D70 809AFC90 864A001C */ lh $t2, 0x001C($s2) ## 0000001C @@ -206,13 +206,13 @@ glabel EnAm_Update /* 01DA8 809AFCC8 8FA5005C */ lw $a1, 0x005C($sp) /* 01DAC 809AFCCC 55600004 */ bnel $t3, $zero, .L809AFCE0 /* 01DB0 809AFCD0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01DB4 809AFCD4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01DB4 809AFCD4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01DB8 809AFCD8 02003025 */ or $a2, $s0, $zero ## $a2 = 000002C0 /* 01DBC 809AFCDC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 .L809AFCE0: /* 01DC0 809AFCE0 8FA5005C */ lw $a1, 0x005C($sp) -/* 01DC4 809AFCE4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01DC4 809AFCE4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01DC8 809AFCE8 02203025 */ or $a2, $s1, $zero ## $a2 = 00000274 /* 01DCC 809AFCEC 8E4C01A8 */ lw $t4, 0x01A8($s2) ## 000001A8 @@ -241,7 +241,7 @@ glabel EnAm_Update /* 01E24 809AFD44 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 .L809AFD48: /* 01E28 809AFD48 8FA5005C */ lw $a1, 0x005C($sp) -/* 01E2C 809AFD4C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01E2C 809AFD4C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01E30 809AFD50 2646030C */ addiu $a2, $s2, 0x030C ## $a2 = 0000030C /* 01E34 809AFD54 10000009 */ beq $zero, $zero, .L809AFD7C @@ -253,7 +253,7 @@ glabel EnAm_Update /* 01E48 809AFD68 10000004 */ beq $zero, $zero, .L809AFD7C /* 01E4C 809AFD6C 8FBF004C */ lw $ra, 0x004C($sp) .L809AFD70: -/* 01E50 809AFD70 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01E50 809AFD70 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01E54 809AFD74 02003025 */ or $a2, $s0, $zero ## $a2 = 000002C0 /* 01E58 809AFD78 8FBF004C */ lw $ra, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Destroy.s index f5aef9694d..ab29471598 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Destroy.s @@ -4,7 +4,7 @@ glabel EnAnubice_Destroy /* 002BC 809B13DC AFBF0014 */ sw $ra, 0x0014($sp) /* 002C0 809B13E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 002C4 809B13E4 24C502C8 */ addiu $a1, $a2, 0x02C8 ## $a1 = 000002C8 -/* 002C8 809B13E8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002C8 809B13E8 0C0170EB */ jal Collider_DestroyCylinder /* 002CC 809B13EC AFA60018 */ sw $a2, 0x0018($sp) /* 002D0 809B13F0 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Init.s index 1e898b6cfc..928a5e6d59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Init.s @@ -51,14 +51,14 @@ glabel EnAnubice_Init /* 00200 809B1320 A2190117 */ sb $t9, 0x0117($s0) ## 00000117 /* 00204 809B1324 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8 /* 00208 809B1328 AFA50030 */ sw $a1, 0x0030($sp) -/* 0020C 809B132C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0020C 809B132C 0C0170D9 */ jal Collider_InitCylinder /* 00210 809B1330 8FA4003C */ lw $a0, 0x003C($sp) /* 00214 809B1334 3C07809B */ lui $a3, %hi(D_809B22D0) ## $a3 = 809B0000 /* 00218 809B1338 8FA50030 */ lw $a1, 0x0030($sp) /* 0021C 809B133C 24E722D0 */ addiu $a3, $a3, %lo(D_809B22D0) ## $a3 = 809B22D0 /* 00220 809B1340 8FA4003C */ lw $a0, 0x003C($sp) -/* 00224 809B1344 0C01712B */ jal ActorCollider_InitCylinder +/* 00224 809B1344 0C01712B */ jal Collider_SetCylinder /* 00228 809B1348 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0022C 809B134C 3C053C75 */ lui $a1, 0x3C75 ## $a1 = 3C750000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Update.s index 4671df41a6..740ab9e5fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/EnAnubice_Update.s @@ -251,7 +251,7 @@ glabel EnAnubice_Update /* 00F6C 809B208C 8E05027C */ lw $a1, 0x027C($s0) ## 0000027C /* 00F70 809B2090 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8 /* 00F74 809B2094 AFA50030 */ sw $a1, 0x0030($sp) -/* 00F78 809B2098 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00F78 809B2098 0C0189B7 */ jal Collider_CylinderUpdate /* 00F7C 809B209C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F80 809B20A0 8FA40064 */ lw $a0, 0x0064($sp) @@ -259,7 +259,7 @@ glabel EnAnubice_Update /* 00F88 809B20A8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00F8C 809B20AC 00812821 */ addu $a1, $a0, $at /* 00F90 809B20B0 AFA50034 */ sw $a1, 0x0034($sp) -/* 00F94 809B20B4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00F94 809B20B4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00F98 809B20B8 8FA60030 */ lw $a2, 0x0030($sp) /* 00F9C 809B20BC 860D0262 */ lh $t5, 0x0262($s0) ## 00000262 @@ -273,7 +273,7 @@ glabel EnAnubice_Update /* 00FBC 809B20DC 00000000 */ nop /* 00FC0 809B20E0 45020004 */ bc1fl .L809B20F4 /* 00FC4 809B20E4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00FC8 809B20E8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00FC8 809B20E8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00FCC 809B20EC 8FA60030 */ lw $a2, 0x0030($sp) .L809B20F0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Destroy.s index 3bc7ac79fc..0c735123a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Destroy.s @@ -3,7 +3,7 @@ glabel EnAnubiceFire_Destroy /* 00128 809B26C8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0012C 809B26CC AFBF0014 */ sw $ra, 0x0014($sp) /* 00130 809B26D0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00134 809B26D4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00134 809B26D4 0C0170EB */ jal Collider_DestroyCylinder /* 00138 809B26D8 24C501A8 */ addiu $a1, $a2, 0x01A8 ## $a1 = 000001A8 /* 0013C 809B26DC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Init.s index 2d60b66824..1f9fe0e9e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Init.s @@ -6,14 +6,14 @@ glabel EnAnubiceFire_Init /* 00010 809B25B0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00014 809B25B4 24C501A8 */ addiu $a1, $a2, 0x01A8 ## $a1 = 000001A8 /* 00018 809B25B8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0001C 809B25BC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0001C 809B25BC 0C0170D9 */ jal Collider_InitCylinder /* 00020 809B25C0 AFA60028 */ sw $a2, 0x0028($sp) /* 00024 809B25C4 3C07809B */ lui $a3, %hi(D_809B31E0) ## $a3 = 809B0000 /* 00028 809B25C8 8FA5001C */ lw $a1, 0x001C($sp) /* 0002C 809B25CC 8FA60028 */ lw $a2, 0x0028($sp) /* 00030 809B25D0 24E731E0 */ addiu $a3, $a3, %lo(D_809B31E0) ## $a3 = 809B31E0 -/* 00034 809B25D4 0C01712B */ jal ActorCollider_InitCylinder +/* 00034 809B25D4 0C01712B */ jal Collider_SetCylinder /* 00038 809B25D8 8FA4002C */ lw $a0, 0x002C($sp) /* 0003C 809B25DC 8FA60028 */ lw $a2, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Update.s index 3595580217..61475861f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Update.s @@ -100,7 +100,7 @@ glabel EnAnubiceFire_Update /* 008B8 809B2E58 44189000 */ mfc1 $t8, $f18 /* 008BC 809B2E5C 1120000E */ beq $t1, $zero, .L809B2E98 /* 008C0 809B2E60 A61801EC */ sh $t8, 0x01EC($s0) ## 000001EC -/* 008C4 809B2E64 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 008C4 809B2E64 0C0189B7 */ jal Collider_CylinderUpdate /* 008C8 809B2E68 AFA50028 */ sw $a1, 0x0028($sp) /* 008CC 809B2E6C 8FA4004C */ lw $a0, 0x004C($sp) @@ -108,12 +108,12 @@ glabel EnAnubiceFire_Update /* 008D4 809B2E74 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 008D8 809B2E78 00812821 */ addu $a1, $a0, $at /* 008DC 809B2E7C AFA50034 */ sw $a1, 0x0034($sp) -/* 008E0 809B2E80 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 008E0 809B2E80 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 008E4 809B2E84 8FA60028 */ lw $a2, 0x0028($sp) /* 008E8 809B2E88 8FA50034 */ lw $a1, 0x0034($sp) /* 008EC 809B2E8C 8FA4004C */ lw $a0, 0x004C($sp) -/* 008F0 809B2E90 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 008F0 809B2E90 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 008F4 809B2E94 8FA60028 */ lw $a2, 0x0028($sp) .L809B2E98: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s index afdf20b2b3..eb697bb989 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s @@ -16,7 +16,7 @@ glabel EnArrow_Destroy /* 00260 809B3B80 0C0295BC */ jal SkelAnime_Free /* 00264 809B3B84 8FA50024 */ lw $a1, 0x0024($sp) /* 00268 809B3B88 8FA40024 */ lw $a0, 0x0024($sp) -/* 0026C 809B3B8C 0C017418 */ jal func_8005D060 +/* 0026C 809B3B8C 0C017418 */ jal Collider_DestroyQuad /* 00270 809B3B90 26050190 */ addiu $a1, $s0, 0x0190 ## $a1 = 00000190 /* 00274 809B3B94 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C /* 00278 809B3B98 5040000A */ beql $v0, $zero, .L809B3BC4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s index bc43bb5c76..24cd374c69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Init.s @@ -116,13 +116,13 @@ glabel EnArrow_Init /* 00170 809B3A90 26050190 */ addiu $a1, $s0, 0x0190 ## $a1 = 00000190 .L809B3A94: /* 00174 809B3A94 AFA50030 */ sw $a1, 0x0030($sp) -/* 00178 809B3A98 0C017406 */ jal func_8005D018 +/* 00178 809B3A98 0C017406 */ jal Collider_InitQuad /* 0017C 809B3A9C 8FA4003C */ lw $a0, 0x003C($sp) /* 00180 809B3AA0 3C07809B */ lui $a3, %hi(D_809B4D50) ## $a3 = 809B0000 /* 00184 809B3AA4 8FA50030 */ lw $a1, 0x0030($sp) /* 00188 809B3AA8 24E74D50 */ addiu $a3, $a3, %lo(D_809B4D50) ## $a3 = 809B4D50 /* 0018C 809B3AAC 8FA4003C */ lw $a0, 0x003C($sp) -/* 00190 809B3AB0 0C017441 */ jal func_8005D104 +/* 00190 809B3AB0 0C017441 */ jal Collider_SetQuad /* 00194 809B3AB4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00198 809B3AB8 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 0019C 809B3ABC 240F0011 */ addiu $t7, $zero, 0x0011 ## $t7 = 00000011 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Destroy.s index 5519973c76..97114f22f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Destroy.s @@ -3,7 +3,7 @@ glabel EnBa_Destroy /* 001F4 809B6544 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 001F8 809B6548 AFBF0014 */ sw $ra, 0x0014($sp) /* 001FC 809B654C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00200 809B6550 0C016F32 */ jal func_8005BCC8 +/* 00200 809B6550 0C016F32 */ jal Collider_DestroyJntSph /* 00204 809B6554 24C50320 */ addiu $a1, $a2, 0x0320 ## $a1 = 00000320 /* 00208 809B6558 8FBF0014 */ lw $ra, 0x0014($sp) /* 0020C 809B655C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Init.s index a4e16aa9e8..4b5d0ec76a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Init.s @@ -105,7 +105,7 @@ glabel EnBa_Init /* 00188 809B64D8 A20F00AE */ sb $t7, 0x00AE($s0) ## 000000AE /* 0018C 809B64DC 26050320 */ addiu $a1, $s0, 0x0320 ## $a1 = 00000320 /* 00190 809B64E0 AFA5002C */ sw $a1, 0x002C($sp) -/* 00194 809B64E4 0C016EFE */ jal func_8005BBF8 +/* 00194 809B64E4 0C016EFE */ jal Collider_InitJntSph /* 00198 809B64E8 8FA4004C */ lw $a0, 0x004C($sp) /* 0019C 809B64EC 3C07809C */ lui $a3, %hi(D_809B80D4) ## $a3 = 809C0000 /* 001A0 809B64F0 26180340 */ addiu $t8, $s0, 0x0340 ## $t8 = 00000340 @@ -113,7 +113,7 @@ glabel EnBa_Init /* 001A8 809B64F8 AFB80010 */ sw $t8, 0x0010($sp) /* 001AC 809B64FC 24E780D4 */ addiu $a3, $a3, %lo(D_809B80D4) ## $a3 = 809B80D4 /* 001B0 809B6500 8FA4004C */ lw $a0, 0x004C($sp) -/* 001B4 809B6504 0C017014 */ jal func_8005C050 +/* 001B4 809B6504 0C017014 */ jal Collider_SetJntSph /* 001B8 809B6508 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001BC 809B650C 10000008 */ beq $zero, $zero, .L809B6530 /* 001C0 809B6510 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Update.s index 280ab808d2..0094299b2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Update.s @@ -50,7 +50,7 @@ glabel EnBa_Update /* 018B0 809B7C00 14200004 */ bne $at, $zero, .L809B7C14 /* 018B4 809B7C04 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 018B8 809B7C08 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 018BC 809B7C0C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 018BC 809B7C0C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 018C0 809B7C10 00812821 */ addu $a1, $a0, $at .L809B7C14: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s index d2a79a7b09..f51d73de22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s @@ -385,7 +385,7 @@ glabel func_809B6B58 /* 00D88 809B70D8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00D8C 809B70DC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00D90 809B70E0 26660320 */ addiu $a2, $s3, 0x0320 ## $a2 = 00000320 -/* 00D94 809B70E4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00D94 809B70E4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00D98 809B70E8 00812821 */ addu $a1, $a0, $at /* 00D9C 809B70EC 10000016 */ beq $zero, $zero, .L809B7148 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Destroy.s index 3a6c3abeb7..afcc33e015 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Destroy.s @@ -3,7 +3,7 @@ glabel EnBb_Destroy /* 0062C 809B890C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00630 809B8910 AFBF0014 */ sw $ra, 0x0014($sp) /* 00634 809B8914 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00638 809B8918 0C016F32 */ jal func_8005BCC8 +/* 00638 809B8918 0C016F32 */ jal Collider_DestroyJntSph /* 0063C 809B891C 24C502AC */ addiu $a1, $a2, 0x02AC ## $a1 = 000002AC /* 00640 809B8920 8FBF0014 */ lw $ra, 0x0014($sp) /* 00644 809B8924 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Init.s index 2b1437bf4b..dba14bc969 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Init.s @@ -36,7 +36,7 @@ glabel EnBb_Init /* 002DC 809B85BC A21900AF */ sb $t9, 0x00AF($s0) ## 000000AF /* 002E0 809B85C0 260502AC */ addiu $a1, $s0, 0x02AC ## $a1 = 000002AC /* 002E4 809B85C4 AFA50030 */ sw $a1, 0x0030($sp) -/* 002E8 809B85C8 0C016EFE */ jal func_8005BBF8 +/* 002E8 809B85C8 0C016EFE */ jal Collider_InitJntSph /* 002EC 809B85CC 8FA401EC */ lw $a0, 0x01EC($sp) /* 002F0 809B85D0 3C07809C */ lui $a3, %hi(D_809BBB24) ## $a3 = 809C0000 /* 002F4 809B85D4 260802CC */ addiu $t0, $s0, 0x02CC ## $t0 = 000002CC @@ -44,7 +44,7 @@ glabel EnBb_Init /* 002FC 809B85DC AFA80010 */ sw $t0, 0x0010($sp) /* 00300 809B85E0 24E7BB24 */ addiu $a3, $a3, %lo(D_809BBB24) ## $a3 = 809BBB24 /* 00304 809B85E4 8FA401EC */ lw $a0, 0x01EC($sp) -/* 00308 809B85E8 0C017014 */ jal func_8005C050 +/* 00308 809B85E8 0C017014 */ jal Collider_SetJntSph /* 0030C 809B85EC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00310 809B85F0 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 00314 809B85F4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Update.s index 8f8ce19498..fcd254bcda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Update.s @@ -131,7 +131,7 @@ glabel EnBb_Update /* 03188 809BB468 3C010001 */ lui $at, 0x0001 ## $at = 00010000 .L809BB46C: /* 0318C 809BB46C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 03190 809BB470 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 03190 809BB470 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 03194 809BB474 02212821 */ addu $a1, $s1, $at /* 03198 809BB478 8E020250 */ lw $v0, 0x0250($s0) ## 00000250 @@ -157,12 +157,12 @@ glabel EnBb_Update /* 031DC 809BB4BC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 031E0 809BB4C0 02212821 */ addu $a1, $s1, $at /* 031E4 809BB4C4 AFA50030 */ sw $a1, 0x0030($sp) -/* 031E8 809BB4C8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 031E8 809BB4C8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 031EC 809BB4CC AFA6002C */ sw $a2, 0x002C($sp) /* 031F0 809BB4D0 8FA50030 */ lw $a1, 0x0030($sp) /* 031F4 809BB4D4 8FA6002C */ lw $a2, 0x002C($sp) -/* 031F8 809BB4D8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 031F8 809BB4D8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 031FC 809BB4DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L809BB4E0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Destroy.s index 738ff41d3b..076c4e1bce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Destroy.s @@ -9,14 +9,14 @@ glabel EnBigokuta_Destroy /* 00184 809BCDE4 AFB40028 */ sw $s4, 0x0028($sp) /* 00188 809BCDE8 AFB1001C */ sw $s1, 0x001C($sp) /* 0018C 809BCDEC AFB00018 */ sw $s0, 0x0018($sp) -/* 00190 809BCDF0 0C016F32 */ jal func_8005BCC8 +/* 00190 809BCDF0 0C016F32 */ jal Collider_DestroyJntSph /* 00194 809BCDF4 2645028C */ addiu $a1, $s2, 0x028C ## $a1 = 0000028C /* 00198 809BCDF8 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 0019C 809BCDFC 265102EC */ addiu $s1, $s2, 0x02EC ## $s1 = 000002EC /* 001A0 809BCE00 24140098 */ addiu $s4, $zero, 0x0098 ## $s4 = 00000098 .L809BCE04: /* 001A4 809BCE04 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 001A8 809BCE08 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001A8 809BCE08 0C0170EB */ jal Collider_DestroyCylinder /* 001AC 809BCE0C 02202825 */ or $a1, $s1, $zero ## $a1 = 000002EC /* 001B0 809BCE10 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s index 85b5c24f1f..a53a7272aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s @@ -32,7 +32,7 @@ glabel EnBigokuta_Init /* 00060 809BCCC0 2645014C */ addiu $a1, $s2, 0x014C ## $a1 = 0000014C /* 00064 809BCCC4 2650028C */ addiu $s0, $s2, 0x028C ## $s0 = 0000028C /* 00068 809BCCC8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C -/* 0006C 809BCCCC 0C016EFE */ jal func_8005BBF8 +/* 0006C 809BCCCC 0C016EFE */ jal Collider_InitJntSph /* 00070 809BCCD0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00074 809BCCD4 3C07809C */ lui $a3, %hi(D_809BF3F8) ## $a3 = 809C0000 /* 00078 809BCCD8 265902AC */ addiu $t9, $s2, 0x02AC ## $t9 = 000002AC @@ -40,7 +40,7 @@ glabel EnBigokuta_Init /* 00080 809BCCE0 24E7F3F8 */ addiu $a3, $a3, %lo(D_809BF3F8) ## $a3 = 809BF3F8 /* 00084 809BCCE4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00088 809BCCE8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C -/* 0008C 809BCCEC 0C017014 */ jal func_8005C050 +/* 0008C 809BCCEC 0C017014 */ jal Collider_SetJntSph /* 00090 809BCCF0 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00094 809BCCF4 8E4202A8 */ lw $v0, 0x02A8($s2) ## 000002A8 /* 00098 809BCCF8 3C10809C */ lui $s0, %hi(D_809BF408) ## $s0 = 809C0000 @@ -52,13 +52,13 @@ glabel EnBigokuta_Init /* 000B0 809BCD10 A4480036 */ sh $t0, 0x0036($v0) ## 00000036 .L809BCD14: /* 000B4 809BCD14 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 000B8 809BCD18 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000B8 809BCD18 0C0170D9 */ jal Collider_InitCylinder /* 000BC 809BCD1C 02202825 */ or $a1, $s1, $zero ## $a1 = 000002EC /* 000C0 809BCD20 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 000C4 809BCD24 02202825 */ or $a1, $s1, $zero ## $a1 = 000002EC /* 000C8 809BCD28 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -/* 000CC 809BCD2C 0C01712B */ jal ActorCollider_InitCylinder +/* 000CC 809BCD2C 0C01712B */ jal Collider_SetCylinder /* 000D0 809BCD30 02003825 */ or $a3, $s0, $zero ## $a3 = 809BF408 /* 000D4 809BCD34 2610002C */ addiu $s0, $s0, 0x002C ## $s0 = 809BF434 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s index 56251c48c7..332d1f1814 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s @@ -46,7 +46,7 @@ glabel EnBigokuta_Update .L809BEA7C: /* 01E1C 809BEA7C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01E20 809BEA80 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 01E24 809BEA84 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01E24 809BEA84 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01E28 809BEA88 02203025 */ or $a2, $s1, $zero ## $a2 = 000002EC /* 01E2C 809BEA8C 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C @@ -66,7 +66,7 @@ glabel EnBigokuta_Update .L809BEAC0: /* 01E60 809BEAC0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01E64 809BEAC4 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 01E68 809BEAC8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01E68 809BEAC8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01E6C 809BEACC 02203025 */ or $a2, $s1, $zero ## $a2 = 000002EC /* 01E70 809BEAD0 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 00000098 @@ -79,7 +79,7 @@ glabel EnBigokuta_Update .L809BEAE8: /* 01E88 809BEAE8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01E8C 809BEAEC 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 01E90 809BEAF0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01E90 809BEAF0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01E94 809BEAF4 02203025 */ or $a2, $s1, $zero ## $a2 = 000002EC /* 01E98 809BEAF8 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C @@ -91,7 +91,7 @@ glabel EnBigokuta_Update /* 01EB0 809BEB10 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 /* 01EB4 809BEB14 51800004 */ beql $t4, $zero, .L809BEB28 /* 01EB8 809BEB18 928D029D */ lbu $t5, 0x029D($s4) ## 0000029D -/* 01EBC 809BEB1C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01EBC 809BEB1C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01EC0 809BEB20 2686028C */ addiu $a2, $s4, 0x028C ## $a2 = 0000028C /* 01EC4 809BEB24 928D029D */ lbu $t5, 0x029D($s4) ## 0000029D @@ -103,14 +103,14 @@ glabel EnBigokuta_Update /* 01ED8 809BEB38 13200006 */ beq $t9, $zero, .L809BEB54 /* 01EDC 809BEB3C 2686028C */ addiu $a2, $s4, 0x028C ## $a2 = 0000028C /* 01EE0 809BEB40 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01EE4 809BEB44 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01EE4 809BEB44 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01EE8 809BEB48 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 01EEC 809BEB4C 10000005 */ beq $zero, $zero, .L809BEB64 /* 01EF0 809BEB50 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 .L809BEB54: /* 01EF4 809BEB54 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01EF8 809BEB58 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01EF8 809BEB58 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01EFC 809BEB5C 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 01F00 809BEB60 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Destroy.s index 0f53367813..194ccafed7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Destroy.s @@ -3,7 +3,7 @@ glabel EnBili_Destroy /* 000F8 809BF998 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 000FC 809BF99C AFBF0014 */ sw $ra, 0x0014($sp) /* 00100 809BF9A0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00104 809BF9A4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00104 809BF9A4 0C0170EB */ jal Collider_DestroyCylinder /* 00108 809BF9A8 24C501D4 */ addiu $a1, $a2, 0x01D4 ## $a1 = 000001D4 /* 0010C 809BF9AC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Init.s index 0725b8dd63..3a0edc075e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Init.s @@ -33,14 +33,14 @@ glabel EnBili_Init /* 00070 809BF910 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00074 809BF914 260501D4 */ addiu $a1, $s0, 0x01D4 ## $a1 = 000001D4 /* 00078 809BF918 AFA50030 */ sw $a1, 0x0030($sp) -/* 0007C 809BF91C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0007C 809BF91C 0C0170D9 */ jal Collider_InitCylinder /* 00080 809BF920 8FA4003C */ lw $a0, 0x003C($sp) /* 00084 809BF924 3C07809C */ lui $a3, %hi(D_809C1640) ## $a3 = 809C0000 /* 00088 809BF928 8FA50030 */ lw $a1, 0x0030($sp) /* 0008C 809BF92C 24E71640 */ addiu $a3, $a3, %lo(D_809C1640) ## $a3 = 809C1640 /* 00090 809BF930 8FA4003C */ lw $a0, 0x003C($sp) -/* 00094 809BF934 0C01712B */ jal ActorCollider_InitCylinder +/* 00094 809BF934 0C01712B */ jal Collider_SetCylinder /* 00098 809BF938 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0009C 809BF93C 3C05809C */ lui $a1, %hi(D_809C1678) ## $a1 = 809C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Update.s index c2235449f4..013de8a2ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Update.s @@ -90,7 +90,7 @@ glabel EnBili_Update /* 014D8 809C0D78 E7A80010 */ swc1 $f8, 0x0010($sp) /* 014DC 809C0D7C 260501D4 */ addiu $a1, $s0, 0x01D4 ## $a1 = 000001D4 /* 014E0 809C0D80 AFA50028 */ sw $a1, 0x0028($sp) -/* 014E4 809C0D84 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 014E4 809C0D84 0C0189B7 */ jal Collider_CylinderUpdate /* 014E8 809C0D88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 014EC 809C0D8C 920A01E4 */ lbu $t2, 0x01E4($s0) ## 000001E4 @@ -100,7 +100,7 @@ glabel EnBili_Update /* 014FC 809C0D9C 11600004 */ beq $t3, $zero, .L809C0DB0 /* 01500 809C0DA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01504 809C0DA4 02212821 */ addu $a1, $s1, $at -/* 01508 809C0DA8 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01508 809C0DA8 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 0150C 809C0DAC 8FA60028 */ lw $a2, 0x0028($sp) .L809C0DB0: @@ -112,13 +112,13 @@ glabel EnBili_Update /* 01524 809C0DC4 02212821 */ addu $a1, $s1, $at /* 01528 809C0DC8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0152C 809C0DCC 8FA60028 */ lw $a2, 0x0028($sp) -/* 01530 809C0DD0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01530 809C0DD0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01534 809C0DD4 AFA5002C */ sw $a1, 0x002C($sp) /* 01538 809C0DD8 8FA5002C */ lw $a1, 0x002C($sp) .L809C0DDC: /* 0153C 809C0DDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01540 809C0DE0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01540 809C0DE0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01544 809C0DE4 8FA60028 */ lw $a2, 0x0028($sp) /* 01548 809C0DE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Destroy.s index 3266988c49..71a8c17092 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Destroy.s @@ -5,11 +5,11 @@ glabel EnBom_Destroy /* 00128 809C27F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0012C 809C27FC 8FA50018 */ lw $a1, 0x0018($sp) /* 00130 809C2800 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00134 809C2804 0C016F32 */ jal func_8005BCC8 +/* 00134 809C2804 0C016F32 */ jal Collider_DestroyJntSph /* 00138 809C2808 24A50198 */ addiu $a1, $a1, 0x0198 ## $a1 = 00000198 /* 0013C 809C280C 8FA50018 */ lw $a1, 0x0018($sp) /* 00140 809C2810 8FA4001C */ lw $a0, 0x001C($sp) -/* 00144 809C2814 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00144 809C2814 0C0170EB */ jal Collider_DestroyCylinder /* 00148 809C2818 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C /* 0014C 809C281C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Init.s index a887fd0cee..d59dee0850 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Init.s @@ -27,18 +27,18 @@ glabel EnBom_Init /* 00064 809C2734 A60801FA */ sh $t0, 0x01FA($s0) ## 000001FA /* 00068 809C2738 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0006C 809C273C AFA5002C */ sw $a1, 0x002C($sp) -/* 00070 809C2740 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00070 809C2740 0C0170D9 */ jal Collider_InitCylinder /* 00074 809C2744 8FA4003C */ lw $a0, 0x003C($sp) /* 00078 809C2748 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 0007C 809C274C AFA50030 */ sw $a1, 0x0030($sp) -/* 00080 809C2750 0C016EFE */ jal func_8005BBF8 +/* 00080 809C2750 0C016EFE */ jal Collider_InitJntSph /* 00084 809C2754 8FA4003C */ lw $a0, 0x003C($sp) /* 00088 809C2758 3C07809C */ lui $a3, %hi(D_809C3430) ## $a3 = 809C0000 /* 0008C 809C275C 24E73430 */ addiu $a3, $a3, %lo(D_809C3430) ## $a3 = 809C3430 /* 00090 809C2760 8FA4003C */ lw $a0, 0x003C($sp) /* 00094 809C2764 8FA5002C */ lw $a1, 0x002C($sp) -/* 00098 809C2768 0C01712B */ jal ActorCollider_InitCylinder +/* 00098 809C2768 0C01712B */ jal Collider_SetCylinder /* 0009C 809C276C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000A0 809C2770 3C07809C */ lui $a3, %hi(D_809C3480) ## $a3 = 809C0000 @@ -47,7 +47,7 @@ glabel EnBom_Init /* 000AC 809C277C 24E73480 */ addiu $a3, $a3, %lo(D_809C3480) ## $a3 = 809C3480 /* 000B0 809C2780 8FA4003C */ lw $a0, 0x003C($sp) /* 000B4 809C2784 8FA50030 */ lw $a1, 0x0030($sp) -/* 000B8 809C2788 0C017014 */ jal func_8005C050 +/* 000B8 809C2788 0C017014 */ jal Collider_SetJntSph /* 000BC 809C278C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000C0 809C2790 860F00B8 */ lh $t7, 0x00B8($s0) ## 000000B8 /* 000C4 809C2794 860B00B8 */ lh $t3, 0x00B8($s0) ## 000000B8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Update.s index b223dd080a..993414ee1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Update.s @@ -401,7 +401,7 @@ glabel EnBom_Update /* 00A44 809C3114 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00A48 809C3118 1DA00016 */ bgtz $t5, .L809C3174 /* 00A4C 809C311C 00000000 */ nop -/* 00A50 809C3120 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00A50 809C3120 0C0189B7 */ jal Collider_CylinderUpdate /* 00A54 809C3124 AFA50038 */ sw $a1, 0x0038($sp) /* 00A58 809C3128 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -415,7 +415,7 @@ glabel EnBom_Update /* 00A78 809C3148 11C00004 */ beq $t6, $zero, .L809C315C /* 00A7C 809C314C 8FA40094 */ lw $a0, 0x0094($sp) /* 00A80 809C3150 00812821 */ addu $a1, $a0, $at -/* 00A84 809C3154 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00A84 809C3154 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00A88 809C3158 8FA60038 */ lw $a2, 0x0038($sp) .L809C315C: @@ -424,7 +424,7 @@ glabel EnBom_Update /* 00A90 809C3160 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00A94 809C3164 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00A98 809C3168 8FA60038 */ lw $a2, 0x0038($sp) -/* 00A9C 809C316C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00A9C 809C316C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00AA0 809C3170 00812821 */ addu $a1, $a0, $at .L809C3174: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C2A38.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C2A38.s index 1c0d06a5ff..c1d54f1967 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C2A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/func_809C2A38.s @@ -30,7 +30,7 @@ glabel func_809C2A38 /* 003D4 809C2AA4 15610004 */ bne $t3, $at, .L809C2AB8 /* 003D8 809C2AA8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 003DC 809C2AAC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 003E0 809C2AB0 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 003E0 809C2AB0 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 003E4 809C2AB4 00812821 */ addu $a1, $a0, $at .L809C2AB8: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Destroy.s index 86c56461fc..57f8fed498 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Destroy.s @@ -13,7 +13,7 @@ glabel EnBomChu_Destroy /* 001C8 809C59F8 8DE50180 */ lw $a1, 0x0180($t7) ## 00000180 /* 001CC 809C59FC 8FA50018 */ lw $a1, 0x0018($sp) /* 001D0 809C5A00 8FA4001C */ lw $a0, 0x001C($sp) -/* 001D4 809C5A04 0C016F32 */ jal func_8005BCC8 +/* 001D4 809C5A04 0C016F32 */ jal Collider_DestroyJntSph /* 001D8 809C5A08 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 00000184 /* 001DC 809C5A0C 8FBF0014 */ lw $ra, 0x0014($sp) /* 001E0 809C5A10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Init.s index 449a4ca4a0..2005726ae0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Init.s @@ -10,7 +10,7 @@ glabel EnBomChu_Init /* 0001C 809C584C 24A56D64 */ addiu $a1, $a1, %lo(D_809C6D64) ## $a1 = 809C6D64 /* 00020 809C5850 26050184 */ addiu $a1, $s0, 0x0184 ## $a1 = 00000184 /* 00024 809C5854 AFA5002C */ sw $a1, 0x002C($sp) -/* 00028 809C5858 0C016EFE */ jal func_8005BBF8 +/* 00028 809C5858 0C016EFE */ jal Collider_InitJntSph /* 0002C 809C585C 8FA401DC */ lw $a0, 0x01DC($sp) /* 00030 809C5860 3C07809C */ lui $a3, %hi(D_809C6D54) ## $a3 = 809C0000 /* 00034 809C5864 260E01A4 */ addiu $t6, $s0, 0x01A4 ## $t6 = 000001A4 @@ -18,7 +18,7 @@ glabel EnBomChu_Init /* 0003C 809C586C AFAE0010 */ sw $t6, 0x0010($sp) /* 00040 809C5870 24E76D54 */ addiu $a3, $a3, %lo(D_809C6D54) ## $a3 = 809C6D54 /* 00044 809C5874 8FA401DC */ lw $a0, 0x01DC($sp) -/* 00048 809C5878 0C017014 */ jal func_8005C050 +/* 00048 809C5878 0C017014 */ jal Collider_SetJntSph /* 0004C 809C587C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00050 809C5880 8E0201A0 */ lw $v0, 0x01A0($s0) ## 000001A0 /* 00054 809C5884 3C0A809C */ lui $t2, %hi(D_809C6D6D) ## $t2 = 809C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s index 81c28381b1..79f7266d16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s @@ -96,7 +96,7 @@ glabel EnBomChu_Update /* 00F0C 809C673C 00000000 */ nop /* 00F10 809C6740 A5EE0034 */ sh $t6, 0x0034($t7) ## 00000034 /* 00F14 809C6744 AFA6002C */ sw $a2, 0x002C($sp) -/* 00F18 809C6748 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00F18 809C6748 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00F1C 809C674C AFA50030 */ sw $a1, 0x0030($sp) /* 00F20 809C6750 8E18014C */ lw $t8, 0x014C($s0) ## 0000014C @@ -105,7 +105,7 @@ glabel EnBomChu_Update /* 00F2C 809C675C 8FA50030 */ lw $a1, 0x0030($sp) /* 00F30 809C6760 13380003 */ beq $t9, $t8, .L809C6770 /* 00F34 809C6764 8FA6002C */ lw $a2, 0x002C($sp) -/* 00F38 809C6768 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00F38 809C6768 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00F3C 809C676C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L809C6770: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Destroy.s index b32b250039..0168fb0ccd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Destroy.s @@ -5,12 +5,12 @@ glabel EnBombf_Destroy /* 001EC 809C714C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 001F0 809C7150 8FA50018 */ lw $a1, 0x0018($sp) /* 001F4 809C7154 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001F8 809C7158 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001F8 809C7158 0C0170EB */ jal Collider_DestroyCylinder /* 001FC 809C715C 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C /* 00200 809C7160 8FA50018 */ lw $a1, 0x0018($sp) /* 00204 809C7164 8FA4001C */ lw $a0, 0x001C($sp) -/* 00208 809C7168 0C016F32 */ jal func_8005BCC8 +/* 00208 809C7168 0C016F32 */ jal Collider_DestroyJntSph /* 0020C 809C716C 24A50198 */ addiu $a1, $a1, 0x0198 ## $a1 = 00000198 /* 00210 809C7170 8FBF0014 */ lw $ra, 0x0014($sp) /* 00214 809C7174 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Init.s index 80e34c074c..1c2aa98fc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Init.s @@ -23,18 +23,18 @@ glabel EnBombf_Init /* 00038 809C6F98 AE0E0200 */ sw $t6, 0x0200($s0) ## 00000200 /* 0003C 809C6F9C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00040 809C6FA0 AFA5002C */ sw $a1, 0x002C($sp) -/* 00044 809C6FA4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00044 809C6FA4 0C0170D9 */ jal Collider_InitCylinder /* 00048 809C6FA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0004C 809C6FAC 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00050 809C6FB0 AFA50030 */ sw $a1, 0x0030($sp) -/* 00054 809C6FB4 0C016EFE */ jal func_8005BBF8 +/* 00054 809C6FB4 0C016EFE */ jal Collider_InitJntSph /* 00058 809C6FB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0005C 809C6FBC 3C07809D */ lui $a3, %hi(D_809C8260) ## $a3 = 809D0000 /* 00060 809C6FC0 24E78260 */ addiu $a3, $a3, %lo(D_809C8260) ## $a3 = 809C8260 /* 00064 809C6FC4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00068 809C6FC8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0006C 809C6FCC 0C01712B */ jal ActorCollider_InitCylinder +/* 0006C 809C6FCC 0C01712B */ jal Collider_SetCylinder /* 00070 809C6FD0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00074 809C6FD4 3C07809D */ lui $a3, %hi(D_809C82B0) ## $a3 = 809D0000 @@ -43,7 +43,7 @@ glabel EnBombf_Init /* 00080 809C6FE0 24E782B0 */ addiu $a3, $a3, %lo(D_809C82B0) ## $a3 = 809C82B0 /* 00084 809C6FE4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00088 809C6FE8 8FA50030 */ lw $a1, 0x0030($sp) -/* 0008C 809C6FEC 0C017014 */ jal func_8005C050 +/* 0008C 809C6FEC 0C017014 */ jal Collider_SetJntSph /* 00090 809C6FF0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00094 809C6FF4 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 00098 809C6FF8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Update.s index d73ded5eb2..c3e84281b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Update.s @@ -473,7 +473,7 @@ glabel EnBombf_Update /* 00EB8 809C7E18 E608003C */ swc1 $f8, 0x003C($s0) ## 0000003C /* 00EBC 809C7E1C 1DA00018 */ bgtz $t5, .L809C7E80 /* 00EC0 809C7E20 AE0C0040 */ sw $t4, 0x0040($s0) ## 00000040 -/* 00EC4 809C7E24 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00EC4 809C7E24 0C0189B7 */ jal Collider_CylinderUpdate /* 00EC8 809C7E28 AFA5003C */ sw $a1, 0x003C($sp) /* 00ECC 809C7E2C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -489,7 +489,7 @@ glabel EnBombf_Update /* 00EF4 809C7E54 11C00004 */ beq $t6, $zero, .L809C7E68 /* 00EF8 809C7E58 8FA4009C */ lw $a0, 0x009C($sp) /* 00EFC 809C7E5C 00812821 */ addu $a1, $a0, $at -/* 00F00 809C7E60 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00F00 809C7E60 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00F04 809C7E64 8FA6003C */ lw $a2, 0x003C($sp) .L809C7E68: @@ -498,7 +498,7 @@ glabel EnBombf_Update /* 00F0C 809C7E6C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00F10 809C7E70 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00F14 809C7E74 8FA6003C */ lw $a2, 0x003C($sp) -/* 00F18 809C7E78 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00F18 809C7E78 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00F1C 809C7E7C 00812821 */ addu $a1, $a0, $at .L809C7E80: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7624.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7624.s index 07e88bf479..76a8d650e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/func_809C7624.s @@ -31,7 +31,7 @@ glabel func_809C7624 /* 00734 809C7694 15010004 */ bne $t0, $at, .L809C76A8 /* 00738 809C7698 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0073C 809C769C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00740 809C76A0 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00740 809C76A0 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00744 809C76A4 00812821 */ addu $a1, $a0, $at .L809C76A8: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Destroy.s index a8131c134d..3fc773ee76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Destroy.s @@ -12,12 +12,12 @@ glabel EnBrob_Destroy /* 00298 809CADA8 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 /* 0029C 809CADAC 8FA50018 */ lw $a1, 0x0018($sp) /* 002A0 809CADB0 8FA4001C */ lw $a0, 0x001C($sp) -/* 002A4 809CADB4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002A4 809CADB4 0C0170EB */ jal Collider_DestroyCylinder /* 002A8 809CADB8 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 00000228 /* 002AC 809CADBC 8FA50018 */ lw $a1, 0x0018($sp) /* 002B0 809CADC0 8FA4001C */ lw $a0, 0x001C($sp) -/* 002B4 809CADC4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002B4 809CADC4 0C0170EB */ jal Collider_DestroyCylinder /* 002B8 809CADC8 24A50274 */ addiu $a1, $a1, 0x0274 ## $a1 = 00000274 /* 002BC 809CADCC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s index 16d4f17278..fefb5f7d9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s @@ -46,26 +46,26 @@ glabel EnBrob_Init /* 00080 809CAB90 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 00084 809CAB94 26050228 */ addiu $a1, $s0, 0x0228 ## $a1 = 00000228 /* 00088 809CAB98 AFA50030 */ sw $a1, 0x0030($sp) -/* 0008C 809CAB9C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0008C 809CAB9C 0C0170D9 */ jal Collider_InitCylinder /* 00090 809CABA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00094 809CABA4 3C07809D */ lui $a3, %hi(D_809CBA80) ## $a3 = 809D0000 /* 00098 809CABA8 8FA50030 */ lw $a1, 0x0030($sp) /* 0009C 809CABAC 24E7BA80 */ addiu $a3, $a3, %lo(D_809CBA80) ## $a3 = 809CBA80 /* 000A0 809CABB0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000A4 809CABB4 0C01712B */ jal ActorCollider_InitCylinder +/* 000A4 809CABB4 0C01712B */ jal Collider_SetCylinder /* 000A8 809CABB8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000AC 809CABBC 26050274 */ addiu $a1, $s0, 0x0274 ## $a1 = 00000274 /* 000B0 809CABC0 AFA50030 */ sw $a1, 0x0030($sp) -/* 000B4 809CABC4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000B4 809CABC4 0C0170D9 */ jal Collider_InitCylinder /* 000B8 809CABC8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000BC 809CABCC 3C07809D */ lui $a3, %hi(D_809CBA80) ## $a3 = 809D0000 /* 000C0 809CABD0 8FA50030 */ lw $a1, 0x0030($sp) /* 000C4 809CABD4 24E7BA80 */ addiu $a3, $a3, %lo(D_809CBA80) ## $a3 = 809CBA80 /* 000C8 809CABD8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000CC 809CABDC 0C01712B */ jal ActorCollider_InitCylinder +/* 000CC 809CABDC 0C01712B */ jal Collider_SetCylinder /* 000D0 809CABE0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000D4 809CABE4 3C06809D */ lui $a2, %hi(D_809CBAAC) ## $a2 = 809D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Update.s index a7646ccde8..d293c91dbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Update.s @@ -140,13 +140,13 @@ glabel EnBrob_Update /* 00D5C 809CB86C 26060228 */ addiu $a2, $s0, 0x0228 ## $a2 = 00000228 /* 00D60 809CB870 AFA6002C */ sw $a2, 0x002C($sp) /* 00D64 809CB874 AFA50034 */ sw $a1, 0x0034($sp) -/* 00D68 809CB878 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00D68 809CB878 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00D6C 809CB87C AFA30038 */ sw $v1, 0x0038($sp) /* 00D70 809CB880 26060274 */ addiu $a2, $s0, 0x0274 ## $a2 = 00000274 /* 00D74 809CB884 AFA60030 */ sw $a2, 0x0030($sp) /* 00D78 809CB888 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00D7C 809CB88C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00D7C 809CB88C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00D80 809CB890 8FA50034 */ lw $a1, 0x0034($sp) /* 00D84 809CB894 8FA30038 */ lw $v1, 0x0038($sp) @@ -155,12 +155,12 @@ glabel EnBrob_Update /* 00D90 809CB8A0 8FA50034 */ lw $a1, 0x0034($sp) /* 00D94 809CB8A4 506C0008 */ beql $v1, $t4, .L809CB8C8 /* 00D98 809CB8A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00D9C 809CB8AC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00D9C 809CB8AC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00DA0 809CB8B0 8FA6002C */ lw $a2, 0x002C($sp) /* 00DA4 809CB8B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DA8 809CB8B8 8FA50034 */ lw $a1, 0x0034($sp) -/* 00DAC 809CB8BC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00DAC 809CB8BC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00DB0 809CB8C0 8FA60030 */ lw $a2, 0x0030($sp) .L809CB8C4: @@ -172,12 +172,12 @@ glabel EnBrob_Update /* 00DC4 809CB8D4 AFAD0030 */ sw $t5, 0x0030($sp) /* 00DC8 809CB8D8 AFA50034 */ sw $a1, 0x0034($sp) /* 00DCC 809CB8DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00DD0 809CB8E0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00DD0 809CB8E0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00DD4 809CB8E4 26060228 */ addiu $a2, $s0, 0x0228 ## $a2 = 00000228 /* 00DD8 809CB8E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DDC 809CB8EC 8FA50034 */ lw $a1, 0x0034($sp) -/* 00DE0 809CB8F0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00DE0 809CB8F0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00DE4 809CB8F4 8FA60030 */ lw $a2, 0x0030($sp) .L809CB8F8: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Destroy.s index 0d2248106c..06174288ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Destroy.s @@ -3,7 +3,7 @@ glabel EnBubble_Destroy /* 00D90 809CC990 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00D94 809CC994 AFBF0014 */ sw $ra, 0x0014($sp) /* 00D98 809CC998 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00D9C 809CC99C 0C016F32 */ jal func_8005BCC8 +/* 00D9C 809CC99C 0C016F32 */ jal Collider_DestroyJntSph /* 00DA0 809CC9A0 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 00DA4 809CC9A4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00DA8 809CC9A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s index 537f5cd0d5..64dc0af461 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Init.s @@ -14,7 +14,7 @@ glabel EnBubble_Init /* 00CB8 809CC8B8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00CBC 809CC8BC 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 00CC0 809CC8C0 AFA50028 */ sw $a1, 0x0028($sp) -/* 00CC4 809CC8C4 0C016EFE */ jal func_8005BBF8 +/* 00CC4 809CC8C4 0C016EFE */ jal Collider_InitJntSph /* 00CC8 809CC8C8 8FA4003C */ lw $a0, 0x003C($sp) /* 00CCC 809CC8CC 3C07809D */ lui $a3, %hi(D_809CCE78) ## $a3 = 809D0000 /* 00CD0 809CC8D0 260E0170 */ addiu $t6, $s0, 0x0170 ## $t6 = 00000170 @@ -22,9 +22,9 @@ glabel EnBubble_Init /* 00CD8 809CC8D8 AFAE0010 */ sw $t6, 0x0010($sp) /* 00CDC 809CC8DC 24E7CE78 */ addiu $a3, $a3, %lo(D_809CCE78) ## $a3 = 809CCE78 /* 00CE0 809CC8E0 8FA4003C */ lw $a0, 0x003C($sp) -/* 00CE4 809CC8E4 0C017014 */ jal func_8005C050 +/* 00CE4 809CC8E4 0C017014 */ jal Collider_SetJntSph /* 00CE8 809CC8E8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00CEC 809CC8EC 0C016C80 */ jal CollisionBtlTbl_Get +/* 00CEC 809CC8EC 0C016C80 */ jal DamageTable_Get /* 00CF0 809CC8F0 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 /* 00CF4 809CC8F4 3C06809D */ lui $a2, %hi(D_809CCE88) ## $a2 = 809D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC9B4.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC9B4.s index ed93af0520..6d088c3f62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CC9B4.s @@ -32,12 +32,12 @@ glabel func_809CC9B4 /* 00E28 809CCA28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E2C 809CCA2C E61000BC */ swc1 $f16, 0x00BC($s0) ## 000000BC /* 00E30 809CCA30 AFA60020 */ sw $a2, 0x0020($sp) -/* 00E34 809CCA34 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00E34 809CCA34 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00E38 809CCA38 AFA50024 */ sw $a1, 0x0024($sp) /* 00E3C 809CCA3C 8FA50024 */ lw $a1, 0x0024($sp) /* 00E40 809CCA40 8FA60020 */ lw $a2, 0x0020($sp) -/* 00E44 809CCA44 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00E44 809CCA44 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00E48 809CCA48 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L809CCA4C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAF0.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAF0.s index 3c28469eb6..ddc001d649 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CCAF0.s @@ -16,12 +16,12 @@ glabel func_809CCAF0 /* 00F24 809CCB24 24E60150 */ addiu $a2, $a3, 0x0150 ## $a2 = 00000150 /* 00F28 809CCB28 00812821 */ addu $a1, $a0, $at /* 00F2C 809CCB2C AFA5001C */ sw $a1, 0x001C($sp) -/* 00F30 809CCB30 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00F30 809CCB30 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00F34 809CCB34 AFA60018 */ sw $a2, 0x0018($sp) /* 00F38 809CCB38 8FA5001C */ lw $a1, 0x001C($sp) /* 00F3C 809CCB3C 8FA60018 */ lw $a2, 0x0018($sp) -/* 00F40 809CCB40 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00F40 809CCB40 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00F44 809CCB44 8FA40024 */ lw $a0, 0x0024($sp) /* 00F48 809CCB48 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Destroy.s index 77ae3b9018..95bfcb2139 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Destroy.s @@ -3,7 +3,7 @@ glabel EnButte_Destroy /* 004D8 809CD548 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 004DC 809CD54C AFBF0014 */ sw $ra, 0x0014($sp) /* 004E0 809CD550 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 004E4 809CD554 0C016F32 */ jal func_8005BCC8 +/* 004E4 809CD554 0C016F32 */ jal Collider_DestroyJntSph /* 004E8 809CD558 24E5014C */ addiu $a1, $a3, 0x014C ## $a1 = 0000014C /* 004EC 809CD55C 8FBF0014 */ lw $ra, 0x0014($sp) /* 004F0 809CD560 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Init.s index f6affddfdf..f831d775ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Init.s @@ -54,7 +54,7 @@ glabel EnButte_Init /* 003D4 809CD444 AFA50038 */ sw $a1, 0x0038($sp) /* 003D8 809CD448 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 003DC 809CD44C AFA50034 */ sw $a1, 0x0034($sp) -/* 003E0 809CD450 0C016EFE */ jal func_8005BBF8 +/* 003E0 809CD450 0C016EFE */ jal Collider_InitJntSph /* 003E4 809CD454 8FA40044 */ lw $a0, 0x0044($sp) /* 003E8 809CD458 3C07809D */ lui $a3, %hi(D_809CE314) ## $a3 = 809D0000 /* 003EC 809CD45C 260A016C */ addiu $t2, $s0, 0x016C ## $t2 = 0000016C @@ -62,7 +62,7 @@ glabel EnButte_Init /* 003F4 809CD464 AFAA0010 */ sw $t2, 0x0010($sp) /* 003F8 809CD468 24E7E314 */ addiu $a3, $a3, %lo(D_809CE314) ## $a3 = 809CE314 /* 003FC 809CD46C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00400 809CD470 0C017014 */ jal func_8005C050 +/* 00400 809CD470 0C017014 */ jal Collider_SetJntSph /* 00404 809CD474 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00408 809CD478 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Update.s index fa5c700be4..4beba75576 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Update.s @@ -75,7 +75,7 @@ glabel EnButte_Update /* 011A8 809CE218 00812821 */ addu $a1, $a0, $at /* 011AC 809CE21C 45020004 */ bc1fl .L809CE230 /* 011B0 809CE220 C60800BC */ lwc1 $f8, 0x00BC($s0) ## 000000BC -/* 011B4 809CE224 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 011B4 809CE224 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 011B8 809CE228 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 011BC 809CE22C C60800BC */ lwc1 $f8, 0x00BC($s0) ## 000000BC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Destroy.s index a999824014..9a17eac0cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Destroy.s @@ -5,12 +5,12 @@ glabel EnBw_Destroy /* 00170 809CE850 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00174 809CE854 8FA50018 */ lw $a1, 0x0018($sp) /* 00178 809CE858 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0017C 809CE85C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0017C 809CE85C 0C0170EB */ jal Collider_DestroyCylinder /* 00180 809CE860 24A50294 */ addiu $a1, $a1, 0x0294 ## $a1 = 00000294 /* 00184 809CE864 8FA50018 */ lw $a1, 0x0018($sp) /* 00188 809CE868 8FA4001C */ lw $a0, 0x001C($sp) -/* 0018C 809CE86C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0018C 809CE86C 0C0170EB */ jal Collider_DestroyCylinder /* 00190 809CE870 24A502E0 */ addiu $a1, $a1, 0x02E0 ## $a1 = 000002E0 /* 00194 809CE874 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Init.s index 6636dbad6f..2ac19419cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Init.s @@ -66,21 +66,21 @@ glabel EnBw_Init /* 000E8 809CE7C8 26050294 */ addiu $a1, $s0, 0x0294 ## $a1 = 00000294 /* 000EC 809CE7CC E6060248 */ swc1 $f6, 0x0248($s0) ## 00000248 /* 000F0 809CE7D0 AFA50030 */ sw $a1, 0x0030($sp) -/* 000F4 809CE7D4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000F4 809CE7D4 0C0170D9 */ jal Collider_InitCylinder /* 000F8 809CE7D8 8FA4003C */ lw $a0, 0x003C($sp) /* 000FC 809CE7DC 3C07809D */ lui $a3, %hi(D_809D1450) ## $a3 = 809D0000 /* 00100 809CE7E0 8FA50030 */ lw $a1, 0x0030($sp) /* 00104 809CE7E4 24E71450 */ addiu $a3, $a3, %lo(D_809D1450) ## $a3 = 809D1450 /* 00108 809CE7E8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0010C 809CE7EC 0C01712B */ jal ActorCollider_InitCylinder +/* 0010C 809CE7EC 0C01712B */ jal Collider_SetCylinder /* 00110 809CE7F0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00114 809CE7F4 3C07809D */ lui $a3, %hi(D_809D147C) ## $a3 = 809D0000 /* 00118 809CE7F8 24E7147C */ addiu $a3, $a3, %lo(D_809D147C) ## $a3 = 809D147C /* 0011C 809CE7FC 8FA4003C */ lw $a0, 0x003C($sp) /* 00120 809CE800 260502E0 */ addiu $a1, $s0, 0x02E0 ## $a1 = 000002E0 -/* 00124 809CE804 0C01712B */ jal ActorCollider_InitCylinder +/* 00124 809CE804 0C01712B */ jal Collider_SetCylinder /* 00128 809CE808 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0012C 809CE80C 86190032 */ lh $t9, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Update.s index 6d7b88586e..c4c6a81850 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Update.s @@ -258,7 +258,7 @@ glabel EnBw_Update /* 02534 809D0C14 26080024 */ addiu $t0, $s0, 0x0024 ## $t0 = 00000024 /* 02538 809D0C18 AFA80040 */ sw $t0, 0x0040($sp) /* 0253C 809D0C1C AFA50038 */ sw $a1, 0x0038($sp) -/* 02540 809D0C20 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 02540 809D0C20 0C0189B7 */ jal Collider_CylinderUpdate /* 02544 809D0C24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02548 809D0C28 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -266,7 +266,7 @@ glabel EnBw_Update /* 02550 809D0C30 02212821 */ addu $a1, $s1, $at /* 02554 809D0C34 AFA5003C */ sw $a1, 0x003C($sp) /* 02558 809D0C38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0255C 809D0C3C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0255C 809D0C3C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02560 809D0C40 8FA60038 */ lw $a2, 0x0038($sp) /* 02564 809D0C44 92090220 */ lbu $t1, 0x0220($s0) ## 00000220 @@ -282,7 +282,7 @@ glabel EnBw_Update /* 0258C 809D0C6C 55800004 */ bnel $t4, $zero, .L809D0C80 /* 02590 809D0C70 920D0221 */ lbu $t5, 0x0221($s0) ## 00000221 .L809D0C74: -/* 02594 809D0C74 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02594 809D0C74 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02598 809D0C78 8FA60038 */ lw $a2, 0x0038($sp) /* 0259C 809D0C7C 920D0221 */ lbu $t5, 0x0221($s0) ## 00000221 @@ -302,12 +302,12 @@ glabel EnBw_Update /* 025D0 809D0CB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 025D4 809D0CB4 45020008 */ bc1fl .L809D0CD8 /* 025D8 809D0CB8 8FAF0040 */ lw $t7, 0x0040($sp) -/* 025DC 809D0CBC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 025DC 809D0CBC 0C0189B7 */ jal Collider_CylinderUpdate /* 025E0 809D0CC0 AFA60038 */ sw $a2, 0x0038($sp) /* 025E4 809D0CC4 8FA60038 */ lw $a2, 0x0038($sp) /* 025E8 809D0CC8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 025EC 809D0CCC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 025EC 809D0CCC 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 025F0 809D0CD0 8FA5003C */ lw $a1, 0x003C($sp) .L809D0CD4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Destroy.s index eed51e663c..cff0c09497 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Destroy.s @@ -3,7 +3,7 @@ glabel EnBx_Destroy /* 00208 809D1CE8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0020C 809D1CEC AFBF0014 */ sw $ra, 0x0014($sp) /* 00210 809D1CF0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00214 809D1CF4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00214 809D1CF4 0C0170EB */ jal Collider_DestroyCylinder /* 00218 809D1CF8 24C501CC */ addiu $a1, $a2, 0x01CC ## $a1 = 000001CC /* 0021C 809D1CFC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Init.s index 102276b71c..1923023dd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Init.s @@ -99,25 +99,25 @@ glabel EnBx_Init /* 00154 809D1C34 3C074240 */ lui $a3, 0x4240 ## $a3 = 42400000 /* 00158 809D1C38 260501CC */ addiu $a1, $s0, 0x01CC ## $a1 = 000001CC /* 0015C 809D1C3C AFA50030 */ sw $a1, 0x0030($sp) -/* 00160 809D1C40 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00160 809D1C40 0C0170D9 */ jal Collider_InitCylinder /* 00164 809D1C44 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00168 809D1C48 3C07809D */ lui $a3, %hi(D_809D2490) ## $a3 = 809D0000 /* 0016C 809D1C4C 8FA50030 */ lw $a1, 0x0030($sp) /* 00170 809D1C50 24E72490 */ addiu $a3, $a3, %lo(D_809D2490) ## $a3 = 809D2490 /* 00174 809D1C54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00178 809D1C58 0C01712B */ jal ActorCollider_InitCylinder +/* 00178 809D1C58 0C01712B */ jal Collider_SetCylinder /* 0017C 809D1C5C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00180 809D1C60 26050218 */ addiu $a1, $s0, 0x0218 ## $a1 = 00000218 /* 00184 809D1C64 AFA50030 */ sw $a1, 0x0030($sp) -/* 00188 809D1C68 0C017406 */ jal func_8005D018 +/* 00188 809D1C68 0C017406 */ jal Collider_InitQuad /* 0018C 809D1C6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00190 809D1C70 3C07809D */ lui $a3, %hi(D_809D24BC) ## $a3 = 809D0000 /* 00194 809D1C74 8FA50030 */ lw $a1, 0x0030($sp) /* 00198 809D1C78 24E724BC */ addiu $a3, $a3, %lo(D_809D24BC) ## $a3 = 809D24BC /* 0019C 809D1C7C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001A0 809D1C80 0C017441 */ jal func_8005D104 +/* 001A0 809D1C80 0C017441 */ jal Collider_SetQuad /* 001A4 809D1C84 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001A8 809D1C88 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 001AC 809D1C8C 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Update.s index 38c9564bf1..7b38e58d13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Update.s @@ -186,7 +186,7 @@ glabel EnBx_Update /* 00598 809D2078 02202825 */ or $a1, $s1, $zero ## $a1 = 000001CC /* 0059C 809D207C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 005A0 809D2080 AE78003C */ sw $t8, 0x003C($s3) ## 0000003C -/* 005A4 809D2084 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 005A4 809D2084 0C0189B7 */ jal Collider_CylinderUpdate /* 005A8 809D2088 AE790040 */ sw $t9, 0x0040($s3) ## 00000040 /* 005AC 809D208C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -194,12 +194,12 @@ glabel EnBx_Update /* 005B4 809D2094 02818021 */ addu $s0, $s4, $at /* 005B8 809D2098 02002825 */ or $a1, $s0, $zero ## $a1 = 00000002 /* 005BC 809D209C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 005C0 809D20A0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 005C0 809D20A0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 005C4 809D20A4 02203025 */ or $a2, $s1, $zero ## $a2 = 000001CC /* 005C8 809D20A8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 005CC 809D20AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000002 -/* 005D0 809D20B0 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 005D0 809D20B0 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 005D4 809D20B4 02203025 */ or $a2, $s1, $zero ## $a2 = 000001CC /* 005D8 809D20B8 8668001C */ lh $t0, 0x001C($s3) ## 0000001C @@ -208,7 +208,7 @@ glabel EnBx_Update /* 005E4 809D20C4 31090080 */ andi $t1, $t0, 0x0080 ## $t1 = 00000000 /* 005E8 809D20C8 51200004 */ beql $t1, $zero, .L809D20DC /* 005EC 809D20CC 8FBF0044 */ lw $ra, 0x0044($sp) -/* 005F0 809D20D0 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 005F0 809D20D0 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 005F4 809D20D4 26660218 */ addiu $a2, $s3, 0x0218 ## $a2 = 00000218 /* 005F8 809D20D8 8FBF0044 */ lw $ra, 0x0044($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Destroy.s index c673962a44..c547d10edc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Destroy.s @@ -3,7 +3,7 @@ glabel EnClearTag_Destroy /* 003E8 809D3998 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 003EC 809D399C AFBF0014 */ sw $ra, 0x0014($sp) /* 003F0 809D39A0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003F4 809D39A4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 003F4 809D39A4 0C0170EB */ jal Collider_DestroyCylinder /* 003F8 809D39A8 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 003FC 809D39AC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Init.s index bc0bb95f1d..a6f4a7364d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Init.s @@ -12,7 +12,7 @@ glabel EnClearTag_Init /* 00420 809D39D0 AFBF001C */ sw $ra, 0x001C($sp) /* 00424 809D39D4 26250194 */ addiu $a1, $s1, 0x0194 ## $a1 = 00000194 /* 00428 809D39D8 AFB00014 */ sw $s0, 0x0014($sp) -/* 0042C 809D39DC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0042C 809D39DC 0C0170D9 */ jal Collider_InitCylinder /* 00430 809D39E0 AFA50020 */ sw $a1, 0x0020($sp) /* 00434 809D39E4 862E001C */ lh $t6, 0x001C($s1) ## 0000001C @@ -57,7 +57,7 @@ glabel EnClearTag_Init /* 004CC 809D3A7C 24E75C6C */ addiu $a3, $a3, %lo(D_809D5C6C) ## $a3 = 809D5C6C /* 004D0 809D3A80 8FA40034 */ lw $a0, 0x0034($sp) /* 004D4 809D3A84 8FA50020 */ lw $a1, 0x0020($sp) -/* 004D8 809D3A88 0C01712B */ jal ActorCollider_InitCylinder +/* 004D8 809D3A88 0C01712B */ jal Collider_SetCylinder /* 004DC 809D3A8C 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 004E0 809D3A90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -74,7 +74,7 @@ glabel EnClearTag_Init /* 00504 809D3AB4 AE2A0004 */ sw $t2, 0x0004($s1) ## 00000004 /* 00508 809D3AB8 8FA50020 */ lw $a1, 0x0020($sp) /* 0050C 809D3ABC 8FA40034 */ lw $a0, 0x0034($sp) -/* 00510 809D3AC0 0C01712B */ jal ActorCollider_InitCylinder +/* 00510 809D3AC0 0C01712B */ jal Collider_SetCylinder /* 00514 809D3AC4 24E75C40 */ addiu $a3, $a3, %lo(D_809D5C40) ## $a3 = 809D5C40 /* 00518 809D3AC8 862D001C */ lh $t5, 0x001C($s1) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s index 3a0ead27cd..570378f708 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s @@ -584,7 +584,7 @@ glabel EnClearTag_Update /* 00E34 809D43E4 A63801D6 */ sh $t8, 0x01D6($s1) ## 000001D6 /* 00E38 809D43E8 A63901D8 */ sh $t9, 0x01D8($s1) ## 000001D8 /* 00E3C 809D43EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000194 -/* 00E40 809D43F0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00E40 809D43F0 0C0189B7 */ jal Collider_CylinderUpdate /* 00E44 809D43F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E48 809D43F8 8FA400CC */ lw $a0, 0x00CC($sp) @@ -592,12 +592,12 @@ glabel EnClearTag_Update /* 00E50 809D4400 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00E54 809D4404 00812821 */ addu $a1, $a0, $at /* 00E58 809D4408 AFA5003C */ sw $a1, 0x003C($sp) -/* 00E5C 809D440C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00E5C 809D440C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00E60 809D4410 02003025 */ or $a2, $s0, $zero ## $a2 = 00000194 /* 00E64 809D4414 8FA5003C */ lw $a1, 0x003C($sp) /* 00E68 809D4418 8FA400CC */ lw $a0, 0x00CC($sp) -/* 00E6C 809D441C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00E6C 809D441C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00E70 809D4420 02003025 */ or $a2, $s0, $zero ## $a2 = 00000194 /* 00E74 809D4424 86290154 */ lh $t1, 0x0154($s1) ## 00000154 @@ -680,14 +680,14 @@ glabel EnClearTag_Update /* 00F8C 809D453C A63801D6 */ sh $t8, 0x01D6($s1) ## 000001D6 /* 00F90 809D4540 A63901D8 */ sh $t9, 0x01D8($s1) ## 000001D8 /* 00F94 809D4544 02002825 */ or $a1, $s0, $zero ## $a1 = 00000194 -/* 00F98 809D4548 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00F98 809D4548 0C0189B7 */ jal Collider_CylinderUpdate /* 00F9C 809D454C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00FA0 809D4550 8FA400CC */ lw $a0, 0x00CC($sp) /* 00FA4 809D4554 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00FA8 809D4558 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00FAC 809D455C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000194 -/* 00FB0 809D4560 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00FB0 809D4560 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00FB4 809D4564 00812821 */ addu $a1, $a0, $at /* 00FB8 809D4568 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Destroy.s index 418879a0f0..3b73391527 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Destroy.s @@ -7,12 +7,12 @@ glabel EnCow_Destroy /* 00660 809DF460 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00664 809DF464 15C00007 */ bne $t6, $zero, .L809DF484 /* 00668 809DF468 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C -/* 0066C 809DF46C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0066C 809DF46C 0C0170EB */ jal Collider_DestroyCylinder /* 00670 809DF470 AFA60018 */ sw $a2, 0x0018($sp) /* 00674 809DF474 8FA60018 */ lw $a2, 0x0018($sp) /* 00678 809DF478 8FA4001C */ lw $a0, 0x001C($sp) -/* 0067C 809DF47C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0067C 809DF47C 0C0170EB */ jal Collider_DestroyCylinder /* 00680 809DF480 24C50198 */ addiu $a1, $a2, 0x0198 ## $a1 = 00000198 .L809DF484: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s index ffdc993e8b..abf0a6e81a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s @@ -39,26 +39,26 @@ glabel EnCow_Init /* 002A0 809DF0A0 8FA40040 */ lw $a0, 0x0040($sp) /* 002A4 809DF0A4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 002A8 809DF0A8 AFA50040 */ sw $a1, 0x0040($sp) -/* 002AC 809DF0AC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 002AC 809DF0AC 0C0170D9 */ jal Collider_InitCylinder /* 002B0 809DF0B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002B4 809DF0B4 3C07809E */ lui $a3, %hi(D_809E00E0) ## $a3 = 809E0000 /* 002B8 809DF0B8 8FA50040 */ lw $a1, 0x0040($sp) /* 002BC 809DF0BC 24E700E0 */ addiu $a3, $a3, %lo(D_809E00E0) ## $a3 = 809E00E0 /* 002C0 809DF0C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002C4 809DF0C4 0C01712B */ jal ActorCollider_InitCylinder +/* 002C4 809DF0C4 0C01712B */ jal Collider_SetCylinder /* 002C8 809DF0C8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002CC 809DF0CC 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 002D0 809DF0D0 AFA50040 */ sw $a1, 0x0040($sp) -/* 002D4 809DF0D4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 002D4 809DF0D4 0C0170D9 */ jal Collider_InitCylinder /* 002D8 809DF0D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002DC 809DF0DC 3C07809E */ lui $a3, %hi(D_809E00E0) ## $a3 = 809E0000 /* 002E0 809DF0E0 8FA50040 */ lw $a1, 0x0040($sp) /* 002E4 809DF0E4 24E700E0 */ addiu $a3, $a3, %lo(D_809E00E0) ## $a3 = 809E00E0 /* 002E8 809DF0E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002EC 809DF0EC 0C01712B */ jal ActorCollider_InitCylinder +/* 002EC 809DF0EC 0C01712B */ jal Collider_SetCylinder /* 002F0 809DF0F0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002F4 809DF0F4 0C277BA7 */ jal func_809DEE9C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s index 25ea7bc45a..7e4e0bb7aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s @@ -12,12 +12,12 @@ glabel EnCow_Update /* 00E44 809DFC44 AFA50034 */ sw $a1, 0x0034($sp) /* 00E48 809DFC48 AFA70054 */ sw $a3, 0x0054($sp) /* 00E4C 809DFC4C 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C -/* 00E50 809DFC50 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00E50 809DFC50 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00E54 809DFC54 AFAE0040 */ sw $t6, 0x0040($sp) /* 00E58 809DFC58 8FA40054 */ lw $a0, 0x0054($sp) /* 00E5C 809DFC5C 8FA50034 */ lw $a1, 0x0034($sp) -/* 00E60 809DFC60 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00E60 809DFC60 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00E64 809DFC64 26060198 */ addiu $a2, $s0, 0x0198 ## $a2 = 00000198 /* 00E68 809DFC68 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Destroy.s index f8108d440b..bd5c04d7f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Destroy.s @@ -3,7 +3,7 @@ glabel EnCrow_Destroy /* 000F0 809E0330 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 000F4 809E0334 AFBF0014 */ sw $ra, 0x0014($sp) /* 000F8 809E0338 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000FC 809E033C 0C016F32 */ jal func_8005BCC8 +/* 000FC 809E033C 0C016F32 */ jal Collider_DestroyJntSph /* 00100 809E0340 24C50238 */ addiu $a1, $a2, 0x0238 ## $a1 = 00000238 /* 00104 809E0344 8FBF0014 */ lw $ra, 0x0014($sp) /* 00108 809E0348 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s index 6a6ce714f3..d3feffb313 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s @@ -23,7 +23,7 @@ glabel EnCrow_Init /* 00050 809E0290 2605017C */ addiu $a1, $s0, 0x017C ## $a1 = 0000017C /* 00054 809E0294 26050238 */ addiu $a1, $s0, 0x0238 ## $a1 = 00000238 /* 00058 809E0298 AFA50030 */ sw $a1, 0x0030($sp) -/* 0005C 809E029C 0C016EFE */ jal func_8005BBF8 +/* 0005C 809E029C 0C016EFE */ jal Collider_InitJntSph /* 00060 809E02A0 8FA4003C */ lw $a0, 0x003C($sp) /* 00064 809E02A4 3C07809E */ lui $a3, %hi(D_809E1690) ## $a3 = 809E0000 /* 00068 809E02A8 26190258 */ addiu $t9, $s0, 0x0258 ## $t9 = 00000258 @@ -31,7 +31,7 @@ glabel EnCrow_Init /* 00070 809E02B0 AFB90010 */ sw $t9, 0x0010($sp) /* 00074 809E02B4 24E71690 */ addiu $a3, $a3, %lo(D_809E1690) ## $a3 = 809E1690 /* 00078 809E02B8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0007C 809E02BC 0C017014 */ jal func_8005C050 +/* 0007C 809E02BC 0C017014 */ jal Collider_SetJntSph /* 00080 809E02C0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00084 809E02C4 3C08809E */ lui $t0, %hi(D_809E169C) ## $t0 = 809E0000 /* 00088 809E02C8 8D08169C */ lw $t0, %lo(D_809E169C)($t0) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Update.s index 38610f3be1..0edfe36d28 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Update.s @@ -99,7 +99,7 @@ glabel EnCrow_Update /* 01150 809E1390 8E0C01C0 */ lw $t4, 0x01C0($s0) ## 000001C0 /* 01154 809E1394 556C0004 */ bnel $t3, $t4, .L809E13A8 /* 01158 809E1398 920D0249 */ lbu $t5, 0x0249($s0) ## 00000249 -/* 0115C 809E139C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0115C 809E139C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01160 809E13A0 26060238 */ addiu $a2, $s0, 0x0238 ## $a2 = 00000238 /* 01164 809E13A4 920D0249 */ lbu $t5, 0x0249($s0) ## 00000249 @@ -110,7 +110,7 @@ glabel EnCrow_Update /* 01174 809E13B4 13200004 */ beq $t9, $zero, .L809E13C8 /* 01178 809E13B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0117C 809E13BC 02212821 */ addu $a1, $s1, $at -/* 01180 809E13C0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01180 809E13C0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01184 809E13C4 26060238 */ addiu $a2, $s0, 0x0238 ## $a2 = 00000238 .L809E13C8: @@ -121,7 +121,7 @@ glabel EnCrow_Update /* 01198 809E13D8 11CF0004 */ beq $t6, $t7, .L809E13EC /* 0119C 809E13DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 011A0 809E13E0 02212821 */ addu $a1, $s1, $at -/* 011A4 809E13E4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 011A4 809E13E4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 011A8 809E13E8 26060238 */ addiu $a2, $s0, 0x0238 ## $a2 = 00000238 .L809E13EC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Destroy.s index 0cd54a3bb9..e4c4f39143 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Destroy.s @@ -3,7 +3,7 @@ glabel EnCs_Destroy /* 002B8 809E1B68 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 002BC 809E1B6C AFBF0014 */ sw $ra, 0x0014($sp) /* 002C0 809E1B70 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002C4 809E1B74 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002C4 809E1B74 0C0170EB */ jal Collider_DestroyCylinder /* 002C8 809E1B78 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 002CC 809E1B7C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s index f0c629935b..ccffe3b84a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s @@ -35,14 +35,14 @@ glabel EnCs_Init /* 00198 809E1A48 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0019C 809E1A4C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 001A0 809E1A50 AFA50034 */ sw $a1, 0x0034($sp) -/* 001A4 809E1A54 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 001A4 809E1A54 0C0170D9 */ jal Collider_InitCylinder /* 001A8 809E1A58 8FA4004C */ lw $a0, 0x004C($sp) /* 001AC 809E1A5C 3C07809E */ lui $a3, %hi(D_809E28C0) ## $a3 = 809E0000 /* 001B0 809E1A60 8FA50034 */ lw $a1, 0x0034($sp) /* 001B4 809E1A64 24E728C0 */ addiu $a3, $a3, %lo(D_809E28C0) ## $a3 = 809E28C0 /* 001B8 809E1A68 8FA4004C */ lw $a0, 0x004C($sp) -/* 001BC 809E1A6C 0C01712B */ jal ActorCollider_InitCylinder +/* 001BC 809E1A6C 0C01712B */ jal Collider_SetCylinder /* 001C0 809E1A70 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001C4 809E1A74 3C05809E */ lui $a1, %hi(D_809E28F8) ## $a1 = 809E0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Update.s index e46fb4bbdf..ef0765d552 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Update.s @@ -62,14 +62,14 @@ glabel EnCs_Update .L809E24F8: /* 00C48 809E24F8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 00C4C 809E24FC AFA60024 */ sw $a2, 0x0024($sp) -/* 00C50 809E2500 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00C50 809E2500 0C0189B7 */ jal Collider_CylinderUpdate /* 00C54 809E2504 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00C58 809E2508 8FA40034 */ lw $a0, 0x0034($sp) /* 00C5C 809E250C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00C60 809E2510 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00C64 809E2514 8FA60024 */ lw $a2, 0x0024($sp) -/* 00C68 809E2518 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00C68 809E2518 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00C6C 809E251C 00812821 */ addu $a1, $a0, $at /* 00C70 809E2520 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Destroy.s index 2f1acc4ac3..510fd68737 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Destroy.s @@ -3,7 +3,7 @@ glabel EnDaiku_Destroy /* 003FC 809E2F2C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00400 809E2F30 AFBF0014 */ sw $ra, 0x0014($sp) /* 00404 809E2F34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00408 809E2F38 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00408 809E2F38 0C0170EB */ jal Collider_DestroyCylinder /* 0040C 809E2F3C 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 00410 809E2F40 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s index b442eb2f3c..aa4b20ec22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s @@ -105,14 +105,14 @@ glabel EnDaiku_Init /* 00220 809E2D50 10000071 */ beq $zero, $zero, .L809E2F18 /* 00224 809E2D54 8FBF002C */ lw $ra, 0x002C($sp) .L809E2D58: -/* 00228 809E2D58 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00228 809E2D58 0C0170D9 */ jal Collider_InitCylinder /* 0022C 809E2D5C AFA50034 */ sw $a1, 0x0034($sp) /* 00230 809E2D60 3C07809E */ lui $a3, %hi(D_809E4060) ## $a3 = 809E0000 /* 00234 809E2D64 8FA50034 */ lw $a1, 0x0034($sp) /* 00238 809E2D68 24E74060 */ addiu $a3, $a3, %lo(D_809E4060) ## $a3 = 809E4060 /* 0023C 809E2D6C 8FA40054 */ lw $a0, 0x0054($sp) -/* 00240 809E2D70 0C01712B */ jal ActorCollider_InitCylinder +/* 00240 809E2D70 0C01712B */ jal Collider_SetCylinder /* 00244 809E2D74 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00248 809E2D78 3C05809E */ lui $a1, %hi(D_809E4098) ## $a1 = 809E0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Update.s index 3a24ea3d09..9a8b18fd61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Update.s @@ -28,14 +28,14 @@ glabel EnDaiku_Update .L809E3CF4: /* 011C4 809E3CF4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 011C8 809E3CF8 AFA60020 */ sw $a2, 0x0020($sp) -/* 011CC 809E3CFC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 011CC 809E3CFC 0C0189B7 */ jal Collider_CylinderUpdate /* 011D0 809E3D00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 011D4 809E3D04 8FA40034 */ lw $a0, 0x0034($sp) /* 011D8 809E3D08 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 011DC 809E3D0C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 011E0 809E3D10 8FA60020 */ lw $a2, 0x0020($sp) -/* 011E4 809E3D14 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 011E4 809E3D14 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 011E8 809E3D18 00812821 */ addu $a1, $a0, $at /* 011EC 809E3D1C 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Destroy.s index 4901f07a33..df61b9943d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Destroy.s @@ -3,7 +3,7 @@ glabel EnDaikuKakariko_Destroy /* 00408 809E4728 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0040C 809E472C AFBF0014 */ sw $ra, 0x0014($sp) /* 00410 809E4730 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00414 809E4734 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00414 809E4734 0C0170EB */ jal Collider_DestroyCylinder /* 00418 809E4738 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 0041C 809E473C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s index b3112a8a2c..cb2b437f30 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s @@ -94,14 +94,14 @@ glabel EnDaikuKakariko_Init /* 001F8 809E4518 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 001FC 809E451C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00200 809E4520 AFA50030 */ sw $a1, 0x0030($sp) -/* 00204 809E4524 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00204 809E4524 0C0170D9 */ jal Collider_InitCylinder /* 00208 809E4528 8FA4004C */ lw $a0, 0x004C($sp) /* 0020C 809E452C 3C07809E */ lui $a3, %hi(D_809E54B0) ## $a3 = 809E0000 /* 00210 809E4530 8FA50030 */ lw $a1, 0x0030($sp) /* 00214 809E4534 24E754B0 */ addiu $a3, $a3, %lo(D_809E54B0) ## $a3 = 809E54B0 /* 00218 809E4538 8FA4004C */ lw $a0, 0x004C($sp) -/* 0021C 809E453C 0C01712B */ jal ActorCollider_InitCylinder +/* 0021C 809E453C 0C01712B */ jal Collider_SetCylinder /* 00220 809E4540 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00224 809E4544 3C05809E */ lui $a1, %hi(D_809E54E8) ## $a1 = 809E0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s index acc3471248..cc2066ef1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Update.s @@ -28,7 +28,7 @@ glabel EnDaikuKakariko_Update .L809E4FA0: /* 00C80 809E4FA0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 00C84 809E4FA4 AFA6002C */ sw $a2, 0x002C($sp) -/* 00C88 809E4FA8 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00C88 809E4FA8 0C0189B7 */ jal Collider_CylinderUpdate /* 00C8C 809E4FAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00C90 809E4FB0 96080200 */ lhu $t0, 0x0200($s0) ## 00000200 @@ -47,7 +47,7 @@ glabel EnDaikuKakariko_Update .L809E4FE4: /* 00CC4 809E4FE4 8FA40044 */ lw $a0, 0x0044($sp) /* 00CC8 809E4FE8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00CCC 809E4FEC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00CCC 809E4FEC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00CD0 809E4FF0 00812821 */ addu $a1, $a0, $at /* 00CD4 809E4FF4 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Destroy.s index 4d6913fae1..02729626b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Destroy.s @@ -3,7 +3,7 @@ glabel EnDekubaba_Destroy /* 00244 809E5A14 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00248 809E5A18 AFBF0014 */ sw $ra, 0x0014($sp) /* 0024C 809E5A1C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00250 809E5A20 0C016F32 */ jal func_8005BCC8 +/* 00250 809E5A20 0C016F32 */ jal Collider_DestroyJntSph /* 00254 809E5A24 24C50238 */ addiu $a1, $a2, 0x0238 ## $a1 = 00000238 /* 00258 809E5A28 8FBF0014 */ lw $ra, 0x0014($sp) /* 0025C 809E5A2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Init.s index da268d5654..40cacfcd88 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Init.s @@ -31,7 +31,7 @@ glabel EnDekubaba_Init /* 00068 809E5838 2605017C */ addiu $a1, $s0, 0x017C ## $a1 = 0000017C /* 0006C 809E583C 26050238 */ addiu $a1, $s0, 0x0238 ## $a1 = 00000238 /* 00070 809E5840 AFA50030 */ sw $a1, 0x0030($sp) -/* 00074 809E5844 0C016EFE */ jal func_8005BBF8 +/* 00074 809E5844 0C016EFE */ jal Collider_InitJntSph /* 00078 809E5848 8FA40044 */ lw $a0, 0x0044($sp) /* 0007C 809E584C 3C07809F */ lui $a3, %hi(D_809E8FC8) ## $a3 = 809F0000 /* 00080 809E5850 26190258 */ addiu $t9, $s0, 0x0258 ## $t9 = 00000258 @@ -39,7 +39,7 @@ glabel EnDekubaba_Init /* 00088 809E5858 8FA50030 */ lw $a1, 0x0030($sp) /* 0008C 809E585C AFB90010 */ sw $t9, 0x0010($sp) /* 00090 809E5860 8FA40044 */ lw $a0, 0x0044($sp) -/* 00094 809E5864 0C017014 */ jal func_8005C050 +/* 00094 809E5864 0C017014 */ jal Collider_SetJntSph /* 00098 809E5868 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0009C 809E586C 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 000A0 809E5870 3C07809F */ lui $a3, %hi(D_809E8FC8) ## $a3 = 809F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Update.s index 38ba4d2ca7..1eaa28382f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Update.s @@ -76,7 +76,7 @@ glabel EnDekubaba_Update /* 02D34 809E8504 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02D38 809E8508 02212821 */ addu $a1, $s1, $at /* 02D3C 809E850C 26060238 */ addiu $a2, $s0, 0x0238 ## $a2 = 00000238 -/* 02D40 809E8510 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 02D40 809E8510 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 02D44 809E8514 AFA3002C */ sw $v1, 0x002C($sp) /* 02D48 809E8518 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 @@ -93,7 +93,7 @@ glabel EnDekubaba_Update /* 02D70 809E8540 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02D74 809E8544 02212821 */ addu $a1, $s1, $at /* 02D78 809E8548 26060238 */ addiu $a2, $s0, 0x0238 ## $a2 = 00000238 -/* 02D7C 809E854C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02D7C 809E854C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02D80 809E8550 AFA3002C */ sw $v1, 0x002C($sp) /* 02D84 809E8554 8FA3002C */ lw $v1, 0x002C($sp) @@ -104,7 +104,7 @@ glabel EnDekubaba_Update /* 02D94 809E8564 10680004 */ beq $v1, $t0, .L809E8578 /* 02D98 809E8568 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02D9C 809E856C 02212821 */ addu $a1, $s1, $at -/* 02DA0 809E8570 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02DA0 809E8570 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02DA4 809E8574 26060238 */ addiu $a2, $s0, 0x0238 ## $a2 = 00000238 .L809E8578: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Destroy.s index 3af77e69b8..5e5331179a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Destroy.s @@ -6,7 +6,7 @@ glabel EnDekunuts_Destroy /* 00178 809E96D8 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 0017C 809E96DC 11C10003 */ beq $t6, $at, .L809E96EC /* 00180 809E96E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00184 809E96E4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00184 809E96E4 0C0170EB */ jal Collider_DestroyCylinder /* 00188 809E96E8 24C502C8 */ addiu $a1, $a2, 0x02C8 ## $a1 = 000002C8 .L809E96EC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s index 3c2b3583a1..e6b234ebd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Init.s @@ -41,14 +41,14 @@ glabel EnDekunuts_Init /* 0008C 809E95EC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00090 809E95F0 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8 /* 00094 809E95F4 AFA50044 */ sw $a1, 0x0044($sp) -/* 00098 809E95F8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00098 809E95F8 0C0170D9 */ jal Collider_InitCylinder /* 0009C 809E95FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000A0 809E9600 3C07809F */ lui $a3, %hi(D_809EAB50) ## $a3 = 809F0000 /* 000A4 809E9604 8FA50044 */ lw $a1, 0x0044($sp) /* 000A8 809E9608 24E7AB50 */ addiu $a3, $a3, %lo(D_809EAB50) ## $a3 = 809EAB50 /* 000AC 809E960C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000B0 809E9610 0C01712B */ jal ActorCollider_InitCylinder +/* 000B0 809E9610 0C01712B */ jal Collider_SetCylinder /* 000B4 809E9614 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B8 809E9618 3C05809F */ lui $a1, %hi(D_809EAB84) ## $a1 = 809F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Update.s index c75bfff273..e42cc6c5b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Update.s @@ -34,7 +34,7 @@ glabel EnDekunuts_Update /* 01348 809EA8A8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0134C 809EA8AC 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8 /* 01350 809EA8B0 AFA50028 */ sw $a1, 0x0028($sp) -/* 01354 809EA8B4 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01354 809EA8B4 0C0189B7 */ jal Collider_CylinderUpdate /* 01358 809EA8B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0135C 809EA8BC 920902D9 */ lbu $t1, 0x02D9($s0) ## 000002D9 @@ -44,7 +44,7 @@ glabel EnDekunuts_Update /* 0136C 809EA8CC 11400004 */ beq $t2, $zero, .L809EA8E0 /* 01370 809EA8D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01374 809EA8D4 02212821 */ addu $a1, $s1, $at -/* 01378 809EA8D8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01378 809EA8D8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0137C 809EA8DC 8FA60028 */ lw $a2, 0x0028($sp) .L809EA8E0: @@ -52,7 +52,7 @@ glabel EnDekunuts_Update /* 01384 809EA8E4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01388 809EA8E8 02212821 */ addu $a1, $s1, $at /* 0138C 809EA8EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01390 809EA8F0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01390 809EA8F0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01394 809EA8F4 8FA60028 */ lw $a2, 0x0028($sp) /* 01398 809EA8F8 8E030190 */ lw $v1, 0x0190($s0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Destroy.s index 0abe5b7fa6..4f314ac02e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Destroy.s @@ -6,12 +6,12 @@ glabel EnDh_Destroy /* 00150 809EAE90 AFA5001C */ sw $a1, 0x001C($sp) /* 00154 809EAE94 8FA50018 */ lw $a1, 0x0018($sp) /* 00158 809EAE98 8FA4001C */ lw $a0, 0x001C($sp) -/* 0015C 809EAE9C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0015C 809EAE9C 0C0170EB */ jal Collider_DestroyCylinder /* 00160 809EAEA0 24A50260 */ addiu $a1, $a1, 0x0260 ## $a1 = 00000260 /* 00164 809EAEA4 8FA50018 */ lw $a1, 0x0018($sp) /* 00168 809EAEA8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0016C 809EAEAC 0C016F32 */ jal func_8005BCC8 +/* 0016C 809EAEAC 0C016F32 */ jal Collider_DestroyJntSph /* 00170 809EAEB0 24A502AC */ addiu $a1, $a1, 0x02AC ## $a1 = 000002AC /* 00174 809EAEB4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00178 809EAEB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s index fdfa41dd58..158f808bd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s @@ -54,19 +54,19 @@ glabel EnDh_Init /* 000C8 809EAE08 01C17824 */ and $t7, $t6, $at /* 000CC 809EAE0C AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 000D0 809EAE10 26050260 */ addiu $a1, $s0, 0x0260 ## $a1 = 00000260 -/* 000D4 809EAE14 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000D4 809EAE14 0C0170D9 */ jal Collider_InitCylinder /* 000D8 809EAE18 AFA50030 */ sw $a1, 0x0030($sp) /* 000DC 809EAE1C 3C07809F */ lui $a3, %hi(D_809EC5C0) ## $a3 = 809F0000 /* 000E0 809EAE20 8FA50030 */ lw $a1, 0x0030($sp) /* 000E4 809EAE24 24E7C5C0 */ addiu $a3, $a3, %lo(D_809EC5C0) ## $a3 = 809EC5C0 /* 000E8 809EAE28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000EC 809EAE2C 0C01712B */ jal ActorCollider_InitCylinder +/* 000EC 809EAE2C 0C01712B */ jal Collider_SetCylinder /* 000F0 809EAE30 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000F4 809EAE34 260502AC */ addiu $a1, $s0, 0x02AC ## $a1 = 000002AC /* 000F8 809EAE38 AFA50030 */ sw $a1, 0x0030($sp) -/* 000FC 809EAE3C 0C016EFE */ jal func_8005BBF8 +/* 000FC 809EAE3C 0C016EFE */ jal Collider_InitJntSph /* 00100 809EAE40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00104 809EAE44 3C07809F */ lui $a3, %hi(D_809EC610) ## $a3 = 809F0000 /* 00108 809EAE48 261802CC */ addiu $t8, $s0, 0x02CC ## $t8 = 000002CC @@ -74,7 +74,7 @@ glabel EnDh_Init /* 00110 809EAE50 AFB80010 */ sw $t8, 0x0010($sp) /* 00114 809EAE54 24E7C610 */ addiu $a3, $a3, %lo(D_809EC610) ## $a3 = 809EC610 /* 00118 809EAE58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0011C 809EAE5C 0C017014 */ jal func_8005C050 +/* 0011C 809EAE5C 0C017014 */ jal Collider_SetJntSph /* 00120 809EAE60 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00124 809EAE64 0C27AC17 */ jal func_809EB05C /* 00128 809EAE68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Update.s index 52241b226d..fd4a11a1cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Update.s @@ -35,7 +35,7 @@ glabel EnDh_Update /* 01338 809EC078 AE18003C */ sw $t8, 0x003C($s0) ## 0000003C /* 0133C 809EC07C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01340 809EC080 AE080040 */ sw $t0, 0x0040($s0) ## 00000040 -/* 01344 809EC084 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01344 809EC084 0C0189B7 */ jal Collider_CylinderUpdate /* 01348 809EC088 AFA50034 */ sw $a1, 0x0034($sp) /* 0134C 809EC08C 920900AF */ lbu $t1, 0x00AF($s0) ## 000000AF @@ -53,7 +53,7 @@ glabel EnDh_Update /* 0137C 809EC0BC 02219021 */ addu $s2, $s1, $at /* 01380 809EC0C0 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01384 809EC0C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01388 809EC0C8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01388 809EC0C8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0138C 809EC0CC 8FA60034 */ lw $a2, 0x0034($sp) /* 01390 809EC0D0 10000006 */ beq $zero, $zero, .L809EC0EC @@ -61,7 +61,7 @@ glabel EnDh_Update .L809EC0D8: /* 01398 809EC0D8 02219021 */ addu $s2, $s1, $at /* 0139C 809EC0DC 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 013A0 809EC0E0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 013A0 809EC0E0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 013A4 809EC0E4 8FA60034 */ lw $a2, 0x0034($sp) /* 013A8 809EC0E8 920B025B */ lbu $t3, 0x025B($s0) ## 0000025B @@ -87,17 +87,17 @@ glabel EnDh_Update .L809EC130: /* 013F0 809EC130 AFA60038 */ sw $a2, 0x0038($sp) /* 013F4 809EC134 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 013F8 809EC138 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 013F8 809EC138 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 013FC 809EC13C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01400 809EC140 8FA60038 */ lw $a2, 0x0038($sp) /* 01404 809EC144 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01408 809EC148 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01408 809EC148 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 0140C 809EC14C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01410 809EC150 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01414 809EC154 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01418 809EC158 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01418 809EC158 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 0141C 809EC15C 8FA60034 */ lw $a2, 0x0034($sp) /* 01420 809EC160 1000000A */ beq $zero, $zero, .L809EC18C @@ -105,12 +105,12 @@ glabel EnDh_Update .L809EC168: /* 01428 809EC168 02219021 */ addu $s2, $s1, $at /* 0142C 809EC16C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01430 809EC170 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01430 809EC170 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01434 809EC174 8FA60034 */ lw $a2, 0x0034($sp) /* 01438 809EC178 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0143C 809EC17C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01440 809EC180 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01440 809EC180 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01444 809EC184 260602AC */ addiu $a2, $s0, 0x02AC ## $a2 = 000002AC .L809EC188: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Destroy.s index 2b9d7ce5d5..a658cf7331 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Destroy.s @@ -3,7 +3,7 @@ glabel EnDha_Destroy /* 00124 809EC9A4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00128 809EC9A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0012C 809EC9AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00130 809EC9B0 0C016F32 */ jal func_8005BCC8 +/* 00130 809EC9B0 0C016F32 */ jal Collider_DestroyJntSph /* 00134 809EC9B4 24C50200 */ addiu $a1, $a2, 0x0200 ## $a1 = 00000200 /* 00138 809EC9B8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0013C 809EC9BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s index 6fdec72ba1..3f64ae71ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s @@ -50,7 +50,7 @@ glabel EnDha_Init /* 000C0 809EC940 26050200 */ addiu $a1, $s0, 0x0200 ## $a1 = 00000200 /* 000C4 809EC944 AE090040 */ sw $t1, 0x0040($s0) ## 00000040 /* 000C8 809EC948 AFA50030 */ sw $a1, 0x0030($sp) -/* 000CC 809EC94C 0C016EFE */ jal func_8005BBF8 +/* 000CC 809EC94C 0C016EFE */ jal Collider_InitJntSph /* 000D0 809EC950 8FA4003C */ lw $a0, 0x003C($sp) /* 000D4 809EC954 3C07809F */ lui $a3, %hi(D_809ED724) ## $a3 = 809F0000 /* 000D8 809EC958 260D0220 */ addiu $t5, $s0, 0x0220 ## $t5 = 00000220 @@ -58,7 +58,7 @@ glabel EnDha_Init /* 000E0 809EC960 AFAD0010 */ sw $t5, 0x0010($sp) /* 000E4 809EC964 24E7D724 */ addiu $a3, $a3, %lo(D_809ED724) ## $a3 = 809ED724 /* 000E8 809EC968 8FA4003C */ lw $a0, 0x003C($sp) -/* 000EC 809EC96C 0C017014 */ jal func_8005C050 +/* 000EC 809EC96C 0C017014 */ jal Collider_SetJntSph /* 000F0 809EC970 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000F4 809EC974 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 000F8 809EC978 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Update.s index 5cfdbb76cc..42f43cc569 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Update.s @@ -37,12 +37,12 @@ glabel EnDha_Update /* 00B5C 809ED3DC 26060200 */ addiu $a2, $s0, 0x0200 ## $a2 = 00000200 /* 00B60 809ED3E0 AFA60028 */ sw $a2, 0x0028($sp) /* 00B64 809ED3E4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00B68 809ED3E8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00B68 809ED3E8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00B6C 809ED3EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B70 809ED3F0 8FA5002C */ lw $a1, 0x002C($sp) /* 00B74 809ED3F4 8FA60028 */ lw $a2, 0x0028($sp) -/* 00B78 809ED3F8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00B78 809ED3F8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00B7C 809ED3FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B80 809ED400 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s index 07d66c371f..02a25cf602 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Destroy.s @@ -9,7 +9,7 @@ glabel EnDivingGame_Destroy /* 00150 809ED9C0 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) /* 00154 809ED9C4 A420FA2E */ sh $zero, %lo(gSaveContext+0x13ce)($at) .L809ED9C8: -/* 00158 809ED9C8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00158 809ED9C8 0C0170EB */ jal Collider_DestroyCylinder /* 0015C 809ED9CC 24C5034C */ addiu $a1, $a2, 0x034C ## $a1 = 0000034C /* 00160 809ED9D0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s index 0389f3f910..d0dbe56cd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s @@ -52,14 +52,14 @@ glabel EnDivingGame_Init /* 00068 809ED8D8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0006C 809ED8DC 2605034C */ addiu $a1, $s0, 0x034C ## $a1 = 0000034C /* 00070 809ED8E0 AFA50030 */ sw $a1, 0x0030($sp) -/* 00074 809ED8E4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00074 809ED8E4 0C0170D9 */ jal Collider_InitCylinder /* 00078 809ED8E8 8FA4003C */ lw $a0, 0x003C($sp) /* 0007C 809ED8EC 3C07809F */ lui $a3, %hi(D_809EF0B4) ## $a3 = 809F0000 /* 00080 809ED8F0 8FA50030 */ lw $a1, 0x0030($sp) /* 00084 809ED8F4 24E7F0B4 */ addiu $a3, $a3, %lo(D_809EF0B4) ## $a3 = 809EF0B4 /* 00088 809ED8F8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0008C 809ED8FC 0C01712B */ jal ActorCollider_InitCylinder +/* 0008C 809ED8FC 0C01712B */ jal Collider_SetCylinder /* 00090 809ED900 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00094 809ED904 3C04809F */ lui $a0, %hi(D_809EF0F0) ## $a0 = 809F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s index 7ace7d3c3e..c1eac7b48b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s @@ -134,14 +134,14 @@ glabel EnDivingGame_Update /* 01508 809EED78 2606034C */ addiu $a2, $s0, 0x034C ## $a2 = 0000034C /* 0150C 809EED7C 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000034C /* 01510 809EED80 AFA6002C */ sw $a2, 0x002C($sp) -/* 01514 809EED84 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01514 809EED84 0C0189B7 */ jal Collider_CylinderUpdate /* 01518 809EED88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0151C 809EED8C 8FA4004C */ lw $a0, 0x004C($sp) /* 01520 809EED90 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01524 809EED94 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01528 809EED98 8FA6002C */ lw $a2, 0x002C($sp) -/* 0152C 809EED9C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0152C 809EED9C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01530 809EEDA0 00812821 */ addu $a1, $a0, $at /* 01534 809EEDA4 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Destroy.s index 482ae10393..41244b3441 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Destroy.s @@ -3,7 +3,7 @@ glabel EnDns_Destroy /* 001A8 809EF4F8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 001AC 809EF4FC AFBF0014 */ sw $ra, 0x0014($sp) /* 001B0 809EF500 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001B4 809EF504 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001B4 809EF504 0C0170EB */ jal Collider_DestroyCylinder /* 001B8 809EF508 24C5026C */ addiu $a1, $a2, 0x026C ## $a1 = 0000026C /* 001BC 809EF50C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s index d53e08bf03..2c634b8be4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s @@ -116,14 +116,14 @@ glabel EnDns_Init /* 000D0 809EF420 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 000D4 809EF424 2605026C */ addiu $a1, $s0, 0x026C ## $a1 = 0000026C /* 000D8 809EF428 AFA50034 */ sw $a1, 0x0034($sp) -/* 000DC 809EF42C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000DC 809EF42C 0C0170D9 */ jal Collider_InitCylinder /* 000E0 809EF430 8FA40044 */ lw $a0, 0x0044($sp) /* 000E4 809EF434 3C07809F */ lui $a3, %hi(D_809F03E0) ## $a3 = 809F0000 /* 000E8 809EF438 8FA50034 */ lw $a1, 0x0034($sp) /* 000EC 809EF43C 24E703E0 */ addiu $a3, $a3, %lo(D_809F03E0) ## $a3 = 809F03E0 /* 000F0 809EF440 8FA40044 */ lw $a0, 0x0044($sp) -/* 000F4 809EF444 0C017114 */ jal func_8005C450 +/* 000F4 809EF444 0C017114 */ jal Collider_SetCylinder_Set3 /* 000F8 809EF448 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000FC 809EF44C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 00100 809EF450 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Update.s index cb92d32019..05a2bc400b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Update.s @@ -50,14 +50,14 @@ glabel EnDns_Update /* 00FDC 809F032C 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000026C /* 00FE0 809F0330 11600009 */ beq $t3, $zero, .L809F0358 /* 00FE4 809F0334 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FE8 809F0338 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00FE8 809F0338 0C0189B7 */ jal Collider_CylinderUpdate /* 00FEC 809F033C AFA6002C */ sw $a2, 0x002C($sp) /* 00FF0 809F0340 8FA4003C */ lw $a0, 0x003C($sp) /* 00FF4 809F0344 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00FF8 809F0348 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00FFC 809F034C 8FA6002C */ lw $a2, 0x002C($sp) -/* 01000 809F0350 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01000 809F0350 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01004 809F0354 00812821 */ addu $a1, $a0, $at .L809F0358: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s index a3ce998fae..ad997e236c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s @@ -3,7 +3,7 @@ glabel EnDntJiji_Destroy /* 00100 809F1BE0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00104 809F1BE4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00108 809F1BE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0010C 809F1BEC 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0010C 809F1BEC 0C0170EB */ jal Collider_DestroyCylinder /* 00110 809F1BF0 24C5025C */ addiu $a1, $a2, 0x025C ## $a1 = 0000025C /* 00114 809F1BF4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s index 1bb6f0a978..838dfa5ece 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s @@ -38,14 +38,14 @@ glabel EnDntJiji_Init /* 00060 809F1B40 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00064 809F1B44 2605025C */ addiu $a1, $s0, 0x025C ## $a1 = 0000025C /* 00068 809F1B48 AFA50030 */ sw $a1, 0x0030($sp) -/* 0006C 809F1B4C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0006C 809F1B4C 0C0170D9 */ jal Collider_InitCylinder /* 00070 809F1B50 8FA4003C */ lw $a0, 0x003C($sp) /* 00074 809F1B54 3C07809F */ lui $a3, %hi(D_809F2FA0) ## $a3 = 809F0000 /* 00078 809F1B58 8FA50030 */ lw $a1, 0x0030($sp) /* 0007C 809F1B5C 24E72FA0 */ addiu $a3, $a3, %lo(D_809F2FA0) ## $a3 = 809F2FA0 /* 00080 809F1B60 8FA4003C */ lw $a0, 0x003C($sp) -/* 00084 809F1B64 0C01712B */ jal ActorCollider_InitCylinder +/* 00084 809F1B64 0C01712B */ jal Collider_SetCylinder /* 00088 809F1B68 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0008C 809F1B6C 8E190118 */ lw $t9, 0x0118($s0) ## 00000118 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s index 7998332078..e1a213ae44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s @@ -135,7 +135,7 @@ glabel EnDntJiji_Update /* 012D8 809F2DB8 2606025C */ addiu $a2, $s0, 0x025C ## $a2 = 0000025C /* 012DC 809F2DBC 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000025C /* 012E0 809F2DC0 AFA60028 */ sw $a2, 0x0028($sp) -/* 012E4 809F2DC4 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 012E4 809F2DC4 0C0189B7 */ jal Collider_CylinderUpdate /* 012E8 809F2DC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 012EC 809F2DCC 9208023C */ lbu $t0, 0x023C($s0) ## 0000023C @@ -144,7 +144,7 @@ glabel EnDntJiji_Update /* 012F8 809F2DD8 11000004 */ beq $t0, $zero, .L809F2DEC /* 012FC 809F2DDC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01300 809F2DE0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01304 809F2DE4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01304 809F2DE4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01308 809F2DE8 00812821 */ addu $a1, $a0, $at .L809F2DEC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s index 9c9889ef6a..7cdd4e075b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s @@ -7,12 +7,12 @@ glabel EnDntNomal_Destroy /* 0018C 809F344C 15C00006 */ bne $t6, $zero, .L809F3468 /* 00190 809F3450 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00194 809F3454 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00198 809F3458 0C017418 */ jal func_8005D060 +/* 00198 809F3458 0C017418 */ jal Collider_DestroyQuad /* 0019C 809F345C 24C50294 */ addiu $a1, $a2, 0x0294 ## $a1 = 00000294 /* 001A0 809F3460 10000004 */ beq $zero, $zero, .L809F3474 /* 001A4 809F3464 8FBF0014 */ lw $ra, 0x0014($sp) .L809F3468: -/* 001A8 809F3468 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001A8 809F3468 0C0170EB */ jal Collider_DestroyCylinder /* 001AC 809F346C 24C50314 */ addiu $a1, $a2, 0x0314 ## $a1 = 00000314 /* 001B0 809F3470 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s index 9a656006c2..52f238c770 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s @@ -57,13 +57,13 @@ glabel EnDntNomal_Init /* 00068 809F3328 24845EB4 */ addiu $a0, $a0, %lo(D_809F5EB4) ## $a0 = 809F5EB4 /* 0006C 809F332C 26050294 */ addiu $a1, $s0, 0x0294 ## $a1 = 00000294 /* 00070 809F3330 AFA50020 */ sw $a1, 0x0020($sp) -/* 00074 809F3334 0C017406 */ jal func_8005D018 +/* 00074 809F3334 0C017406 */ jal Collider_InitQuad /* 00078 809F3338 8FA40034 */ lw $a0, 0x0034($sp) /* 0007C 809F333C 3C07809F */ lui $a3, %hi(D_809F5DFC) ## $a3 = 809F0000 /* 00080 809F3340 8FA50020 */ lw $a1, 0x0020($sp) /* 00084 809F3344 24E75DFC */ addiu $a3, $a3, %lo(D_809F5DFC) ## $a3 = 809F5DFC /* 00088 809F3348 8FA40034 */ lw $a0, 0x0034($sp) -/* 0008C 809F334C 0C017441 */ jal func_8005D104 +/* 0008C 809F334C 0C017441 */ jal Collider_SetQuad /* 00090 809F3350 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00094 809F3354 8603008A */ lh $v1, 0x008A($s0) ## 0000008A /* 00098 809F3358 24090164 */ addiu $t1, $zero, 0x0164 ## $t1 = 00000164 @@ -82,14 +82,14 @@ glabel EnDntNomal_Init /* 000C0 809F3380 24845EEC */ addiu $a0, $a0, %lo(D_809F5EEC) ## $a0 = 809F5EEC /* 000C4 809F3384 26050314 */ addiu $a1, $s0, 0x0314 ## $a1 = 00000314 /* 000C8 809F3388 AFA50020 */ sw $a1, 0x0020($sp) -/* 000CC 809F338C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000CC 809F338C 0C0170D9 */ jal Collider_InitCylinder /* 000D0 809F3390 8FA40034 */ lw $a0, 0x0034($sp) /* 000D4 809F3394 3C07809F */ lui $a3, %hi(D_809F5DD0) ## $a3 = 809F0000 /* 000D8 809F3398 8FA50020 */ lw $a1, 0x0020($sp) /* 000DC 809F339C 24E75DD0 */ addiu $a3, $a3, %lo(D_809F5DD0) ## $a3 = 809F5DD0 /* 000E0 809F33A0 8FA40034 */ lw $a0, 0x0034($sp) -/* 000E4 809F33A4 0C01712B */ jal ActorCollider_InitCylinder +/* 000E4 809F33A4 0C01712B */ jal Collider_SetCylinder /* 000E8 809F33A8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000EC 809F33AC 240A0172 */ addiu $t2, $zero, 0x0172 ## $t2 = 00000172 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s index f89fa7d995..9156f550bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s @@ -190,13 +190,13 @@ glabel L809F57B0 /* 025CC 809F588C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 025D0 809F5890 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 025D4 809F5894 8FA6002C */ lw $a2, 0x002C($sp) -/* 025D8 809F5898 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 025D8 809F5898 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 025DC 809F589C 00812821 */ addu $a1, $a0, $at /* 025E0 809F58A0 1000000C */ beq $zero, $zero, .L809F58D4 /* 025E4 809F58A4 8FBF0024 */ lw $ra, 0x0024($sp) .L809F58A8: -/* 025E8 809F58A8 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 025E8 809F58A8 0C0189B7 */ jal Collider_CylinderUpdate /* 025EC 809F58AC AFA6002C */ sw $a2, 0x002C($sp) /* 025F0 809F58B0 920B0218 */ lbu $t3, 0x0218($s0) ## 00000218 @@ -205,7 +205,7 @@ glabel L809F57B0 /* 025FC 809F58BC 11600004 */ beq $t3, $zero, .L809F58D0 /* 02600 809F58C0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02604 809F58C4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02608 809F58C8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02608 809F58C8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0260C 809F58CC 00812821 */ addu $a1, $a0, $at .L809F58D0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s index ba1c2a8634..5dc319613e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s @@ -3,7 +3,7 @@ glabel EnDodojr_Destroy /* 000EC 809F64AC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 000F0 809F64B0 AFBF0014 */ sw $ra, 0x0014($sp) /* 000F4 809F64B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000F8 809F64B8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 000F8 809F64B8 0C0170EB */ jal Collider_DestroyCylinder /* 000FC 809F64BC 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 00100 809F64C0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s index 3b9965c1ad..4552ed4c85 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s @@ -26,17 +26,17 @@ glabel EnDodojr_Init /* 00058 809F6418 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0005C 809F641C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00060 809F6420 AFA50034 */ sw $a1, 0x0034($sp) -/* 00064 809F6424 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00064 809F6424 0C0170D9 */ jal Collider_InitCylinder /* 00068 809F6428 8FA40044 */ lw $a0, 0x0044($sp) /* 0006C 809F642C 3C07809F */ lui $a3, %hi(D_809F7EB0) ## $a3 = 809F0000 /* 00070 809F6430 8FA50034 */ lw $a1, 0x0034($sp) /* 00074 809F6434 24E77EB0 */ addiu $a3, $a3, %lo(D_809F7EB0) ## $a3 = 809F7EB0 /* 00078 809F6438 8FA40044 */ lw $a0, 0x0044($sp) -/* 0007C 809F643C 0C01712B */ jal ActorCollider_InitCylinder +/* 0007C 809F643C 0C01712B */ jal Collider_SetCylinder /* 00080 809F6440 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00084 809F6444 0C016C80 */ jal CollisionBtlTbl_Get +/* 00084 809F6444 0C016C80 */ jal DamageTable_Get /* 00088 809F6448 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 /* 0008C 809F644C 3C06809F */ lui $a2, %hi(D_809F7EDC) ## $a2 = 809F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s index 4b04c1a1a0..d8cff6b09f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s @@ -4,7 +4,7 @@ glabel func_809F72A4 /* 00EEC 809F72AC AFBF0014 */ sw $ra, 0x0014($sp) /* 00EF0 809F72B0 24850194 */ addiu $a1, $a0, 0x0194 ## $a1 = 00000194 /* 00EF4 809F72B4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00EF8 809F72B8 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00EF8 809F72B8 0C0189B7 */ jal Collider_CylinderUpdate /* 00EFC 809F72BC AFA40028 */ sw $a0, 0x0028($sp) /* 00F00 809F72C0 8FA70028 */ lw $a3, 0x0028($sp) @@ -33,7 +33,7 @@ glabel func_809F72A4 /* 00F58 809F7318 8FA60024 */ lw $a2, 0x0024($sp) /* 00F5C 809F731C AFA3001C */ sw $v1, 0x001C($sp) /* 00F60 809F7320 AFA70028 */ sw $a3, 0x0028($sp) -/* 00F64 809F7324 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00F64 809F7324 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00F68 809F7328 00812821 */ addu $a1, $a0, $at /* 00F6C 809F732C 8FA70028 */ lw $a3, 0x0028($sp) @@ -60,13 +60,13 @@ glabel func_809F72A4 /* 00FBC 809F737C 00000000 */ nop .L809F7380: /* 00FC0 809F7380 8FA60024 */ lw $a2, 0x0024($sp) -/* 00FC4 809F7384 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00FC4 809F7384 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00FC8 809F7388 AFA50018 */ sw $a1, 0x0018($sp) /* 00FCC 809F738C 8FA50018 */ lw $a1, 0x0018($sp) /* 00FD0 809F7390 8FA4002C */ lw $a0, 0x002C($sp) .L809F7394: -/* 00FD4 809F7394 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00FD4 809F7394 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00FD8 809F7398 8FA60024 */ lw $a2, 0x0024($sp) .L809F739C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Destroy.s index 1f880aeec8..0b39fe342c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Destroy.s @@ -9,15 +9,15 @@ glabel EnDodongo_Destroy /* 00738 809F8988 8DC503D0 */ lw $a1, 0x03D0($t6) ## 000003D0 /* 0073C 809F898C 8FA50018 */ lw $a1, 0x0018($sp) /* 00740 809F8990 8FA4001C */ lw $a0, 0x001C($sp) -/* 00744 809F8994 0C017232 */ jal func_8005C8C8 +/* 00744 809F8994 0C017232 */ jal Collider_DestroyTris /* 00748 809F8998 24A50454 */ addiu $a1, $a1, 0x0454 ## $a1 = 00000454 /* 0074C 809F899C 8FA50018 */ lw $a1, 0x0018($sp) /* 00750 809F89A0 8FA4001C */ lw $a0, 0x001C($sp) -/* 00754 809F89A4 0C016F32 */ jal func_8005BCC8 +/* 00754 809F89A4 0C016F32 */ jal Collider_DestroyJntSph /* 00758 809F89A8 24A50588 */ addiu $a1, $a1, 0x0588 ## $a1 = 00000588 /* 0075C 809F89AC 8FA50018 */ lw $a1, 0x0018($sp) /* 00760 809F89B0 8FA4001C */ lw $a0, 0x001C($sp) -/* 00764 809F89B4 0C017418 */ jal func_8005D060 +/* 00764 809F89B4 0C017418 */ jal Collider_DestroyQuad /* 00768 809F89B8 24A503D4 */ addiu $a1, $a1, 0x03D4 ## $a1 = 000003D4 /* 0076C 809F89BC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00770 809F89C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Init.s index 76e5391d74..91e55f47cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Init.s @@ -60,21 +60,21 @@ glabel EnDodongo_Init /* 005D0 809F8820 AE0F0098 */ sw $t7, 0x0098($s0) ## 00000098 /* 005D4 809F8824 260503D4 */ addiu $a1, $s0, 0x03D4 ## $a1 = 000003D4 /* 005D8 809F8828 AFA50034 */ sw $a1, 0x0034($sp) -/* 005DC 809F882C 0C017406 */ jal func_8005D018 +/* 005DC 809F882C 0C017406 */ jal Collider_InitQuad /* 005E0 809F8830 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005E4 809F8834 26050454 */ addiu $a1, $s0, 0x0454 ## $a1 = 00000454 /* 005E8 809F8838 AFA50038 */ sw $a1, 0x0038($sp) -/* 005EC 809F883C 0C0171F8 */ jal func_8005C7E0 +/* 005EC 809F883C 0C0171F8 */ jal Collider_InitTris /* 005F0 809F8840 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005F4 809F8844 26050588 */ addiu $a1, $s0, 0x0588 ## $a1 = 00000588 /* 005F8 809F8848 AFA5003C */ sw $a1, 0x003C($sp) -/* 005FC 809F884C 0C016EFE */ jal func_8005BBF8 +/* 005FC 809F884C 0C016EFE */ jal Collider_InitJntSph /* 00600 809F8850 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00604 809F8854 3C0780A0 */ lui $a3, %hi(D_809FA98C) ## $a3 = 80A00000 /* 00608 809F8858 24E7A98C */ addiu $a3, $a3, %lo(D_809FA98C) ## $a3 = 809FA98C /* 0060C 809F885C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00610 809F8860 8FA50034 */ lw $a1, 0x0034($sp) -/* 00614 809F8864 0C017441 */ jal func_8005D104 +/* 00614 809F8864 0C017441 */ jal Collider_SetQuad /* 00618 809F8868 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0061C 809F886C 3C0780A0 */ lui $a3, %hi(D_809FA97C) ## $a3 = 80A00000 /* 00620 809F8870 26180474 */ addiu $t8, $s0, 0x0474 ## $t8 = 00000474 @@ -82,7 +82,7 @@ glabel EnDodongo_Init /* 00628 809F8878 24E7A97C */ addiu $a3, $a3, %lo(D_809FA97C) ## $a3 = 809FA97C /* 0062C 809F887C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00630 809F8880 8FA50038 */ lw $a1, 0x0038($sp) -/* 00634 809F8884 0C0172EB */ jal func_8005CBAC +/* 00634 809F8884 0C0172EB */ jal Collider_SetTris /* 00638 809F8888 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0063C 809F888C 3C0780A0 */ lui $a3, %hi(D_809FA8B8) ## $a3 = 80A00000 /* 00640 809F8890 261905A8 */ addiu $t9, $s0, 0x05A8 ## $t9 = 000005A8 @@ -90,7 +90,7 @@ glabel EnDodongo_Init /* 00648 809F8898 24E7A8B8 */ addiu $a3, $a3, %lo(D_809FA8B8) ## $a3 = 809FA8B8 /* 0064C 809F889C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00650 809F88A0 8FA5003C */ lw $a1, 0x003C($sp) -/* 00654 809F88A4 0C017014 */ jal func_8005C050 +/* 00654 809F88A4 0C017014 */ jal Collider_SetJntSph /* 00658 809F88A8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0065C 809F88AC 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 00660 809F88B0 24090040 */ addiu $t1, $zero, 0x0040 ## $t1 = 00000040 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Update.s index 6862b2c73a..c720aa716e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Update.s @@ -43,7 +43,7 @@ glabel EnDodongo_Update /* 01D7C 809F9FCC 26060588 */ addiu $a2, $s0, 0x0588 ## $a2 = 00000588 /* 01D80 809F9FD0 AFA6002C */ sw $a2, 0x002C($sp) /* 01D84 809F9FD4 AFA50034 */ sw $a1, 0x0034($sp) -/* 01D88 809F9FD8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01D88 809F9FD8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01D8C 809F9FDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01D90 809F9FE0 8E030304 */ lw $v1, 0x0304($s0) ## 00000304 @@ -51,7 +51,7 @@ glabel EnDodongo_Update /* 01D98 809F9FE8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01D9C 809F9FEC 10610004 */ beq $v1, $at, .L809FA000 /* 01DA0 809F9FF0 8FA50034 */ lw $a1, 0x0034($sp) -/* 01DA4 809F9FF4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01DA4 809F9FF4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01DA8 809F9FF8 26060454 */ addiu $a2, $s0, 0x0454 ## $a2 = 00000454 /* 01DAC 809F9FFC 8E030304 */ lw $v1, 0x0304($s0) ## 00000304 @@ -60,7 +60,7 @@ glabel EnDodongo_Update /* 01DB4 809FA004 14200005 */ bne $at, $zero, .L809FA01C /* 01DB8 809FA008 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01DBC 809FA00C 8FA50034 */ lw $a1, 0x0034($sp) -/* 01DC0 809FA010 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01DC0 809FA010 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01DC4 809FA014 8FA6002C */ lw $a2, 0x002C($sp) /* 01DC8 809FA018 8E030304 */ lw $v1, 0x0304($s0) ## 00000304 @@ -94,7 +94,7 @@ glabel EnDodongo_Update /* 01E2C 809FA07C 00000000 */ nop /* 01E30 809FA080 45000003 */ bc1f .L809FA090 /* 01E34 809FA084 00000000 */ nop -/* 01E38 809FA088 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01E38 809FA088 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01E3C 809FA08C 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4 .L809FA090: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s index 43794b0982..74aff74c2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s @@ -181,7 +181,7 @@ glabel func_809F97C0 /* 01808 809F9A58 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0180C 809F9A5C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01810 809F9A60 26060588 */ addiu $a2, $s0, 0x0588 ## $a2 = 00000588 -/* 01814 809F9A64 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01814 809F9A64 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01818 809F9A68 00812821 */ addu $a1, $a0, $at .L809F9A6C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s index ac77f15396..ca391c5992 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s @@ -7,7 +7,7 @@ glabel EnDu_Destroy /* 00760 809FE390 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00764 809FE394 8FA50018 */ lw $a1, 0x0018($sp) /* 00768 809FE398 8FA4001C */ lw $a0, 0x001C($sp) -/* 0076C 809FE39C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0076C 809FE39C 0C0170EB */ jal Collider_DestroyCylinder /* 00770 809FE3A0 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 /* 00774 809FE3A4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s index a8086a99a1..711620b67c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s @@ -23,17 +23,17 @@ glabel EnDu_Init /* 005CC 809FE1FC AFA00018 */ sw $zero, 0x0018($sp) /* 005D0 809FE200 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 005D4 809FE204 AFA50034 */ sw $a1, 0x0034($sp) -/* 005D8 809FE208 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 005D8 809FE208 0C0170D9 */ jal Collider_InitCylinder /* 005DC 809FE20C 8FA4004C */ lw $a0, 0x004C($sp) /* 005E0 809FE210 3C0780A0 */ lui $a3, %hi(D_809FF230) ## $a3 = 80A00000 /* 005E4 809FE214 8FA50034 */ lw $a1, 0x0034($sp) /* 005E8 809FE218 24E7F230 */ addiu $a3, $a3, %lo(D_809FF230) ## $a3 = 809FF230 /* 005EC 809FE21C 8FA4004C */ lw $a0, 0x004C($sp) -/* 005F0 809FE220 0C01712B */ jal ActorCollider_InitCylinder +/* 005F0 809FE220 0C01712B */ jal Collider_SetCylinder /* 005F4 809FE224 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 005F8 809FE228 0C016C80 */ jal CollisionBtlTbl_Get +/* 005F8 809FE228 0C016C80 */ jal DamageTable_Get /* 005FC 809FE22C 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 00600 809FE230 3C0680A0 */ lui $a2, %hi(D_809FF25C) ## $a2 = 80A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s index 338a5c2afa..2a1c24a9a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s @@ -7,14 +7,14 @@ glabel EnDu_Update /* 01100 809FED30 AFBF0024 */ sw $ra, 0x0024($sp) /* 01104 809FED34 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 01108 809FED38 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 0110C 809FED3C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0110C 809FED3C 0C0189B7 */ jal Collider_CylinderUpdate /* 01110 809FED40 AFA6002C */ sw $a2, 0x002C($sp) /* 01114 809FED44 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01118 809FED48 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0111C 809FED4C 8FA6002C */ lw $a2, 0x002C($sp) /* 01120 809FED50 02212821 */ addu $a1, $s1, $at -/* 01124 809FED54 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01124 809FED54 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01128 809FED58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0112C 809FED5C 8E0F0154 */ lw $t7, 0x0154($s0) ## 00000154 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Destroy.s index f2239ec4ba..390b90f3dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Destroy.s @@ -3,7 +3,7 @@ glabel EnEiyer_Destroy /* 001E0 80A00180 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 001E4 80A00184 AFBF0014 */ sw $ra, 0x0014($sp) /* 001E8 80A00188 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001EC 80A0018C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001EC 80A0018C 0C0170EB */ jal Collider_DestroyCylinder /* 001F0 80A00190 24C50288 */ addiu $a1, $a2, 0x0288 ## $a1 = 00000288 /* 001F4 80A00194 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s index a8a65d3f3b..15775d1074 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Init.s @@ -32,14 +32,14 @@ glabel EnEiyer_Init /* 0006C 80A0000C 2625014C */ addiu $a1, $s1, 0x014C ## $a1 = 0000014C /* 00070 80A00010 26250288 */ addiu $a1, $s1, 0x0288 ## $a1 = 00000288 /* 00074 80A00014 AFA50044 */ sw $a1, 0x0044($sp) -/* 00078 80A00018 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00078 80A00018 0C0170D9 */ jal Collider_InitCylinder /* 0007C 80A0001C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00080 80A00020 3C0780A0 */ lui $a3, %hi(D_80A01970) ## $a3 = 80A00000 /* 00084 80A00024 8FA50044 */ lw $a1, 0x0044($sp) /* 00088 80A00028 24E71970 */ addiu $a3, $a3, %lo(D_80A01970) ## $a3 = 80A01970 /* 0008C 80A0002C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00090 80A00030 0C01712B */ jal ActorCollider_InitCylinder +/* 00090 80A00030 0C01712B */ jal Collider_SetCylinder /* 00094 80A00034 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00098 80A00038 3C0580A0 */ lui $a1, %hi(D_80A019A4) ## $a1 = 80A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Update.s index fd03afdb61..e4ea0b6afd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Update.s @@ -87,7 +87,7 @@ glabel EnEiyer_Update /* 01700 80A016A0 1483001F */ bne $a0, $v1, .L80A01720 /* 01704 80A016A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A016A8: -/* 01708 80A016A8 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01708 80A016A8 0C0189B7 */ jal Collider_CylinderUpdate /* 0170C 80A016AC AFA5002C */ sw $a1, 0x002C($sp) /* 01710 80A016B0 92090298 */ lbu $t1, 0x0298($s0) ## 00000298 @@ -97,7 +97,7 @@ glabel EnEiyer_Update /* 01720 80A016C0 11400004 */ beq $t2, $zero, .L80A016D4 /* 01724 80A016C4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01728 80A016C8 00812821 */ addu $a1, $a0, $at -/* 0172C 80A016CC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0172C 80A016CC 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01730 80A016D0 8FA6002C */ lw $a2, 0x002C($sp) .L80A016D4: @@ -108,7 +108,7 @@ glabel EnEiyer_Update /* 01744 80A016E4 11800004 */ beq $t4, $zero, .L80A016F8 /* 01748 80A016E8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0174C 80A016EC 00812821 */ addu $a1, $a0, $at -/* 01750 80A016F0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01750 80A016F0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01754 80A016F4 8FA6002C */ lw $a2, 0x002C($sp) .L80A016F8: @@ -120,7 +120,7 @@ glabel EnEiyer_Update /* 0176C 80A0170C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01770 80A01710 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01774 80A01714 00812821 */ addu $a1, $a0, $at -/* 01778 80A01718 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01778 80A01718 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0177C 80A0171C 8FA6002C */ lw $a2, 0x002C($sp) .L80A01720: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Destroy.s index 50df030809..7bb29b279b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Destroy.s @@ -3,7 +3,7 @@ glabel EnFd_Destroy /* 00C2C 80A0C2EC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00C30 80A0C2F0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00C34 80A0C2F4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00C38 80A0C2F8 0C016F32 */ jal func_8005BCC8 +/* 00C38 80A0C2F8 0C016F32 */ jal Collider_DestroyJntSph /* 00C3C 80A0C2FC 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 00C40 80A0C300 8FBF0014 */ lw $ra, 0x0014($sp) /* 00C44 80A0C304 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s index 586f150359..f5e05aa290 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s @@ -25,7 +25,7 @@ glabel EnFd_Init /* 00B44 80A0C204 3C074200 */ lui $a3, 0x4200 ## $a3 = 42000000 /* 00B48 80A0C208 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00B4C 80A0C20C AFA50034 */ sw $a1, 0x0034($sp) -/* 00B50 80A0C210 0C016EFE */ jal func_8005BBF8 +/* 00B50 80A0C210 0C016EFE */ jal Collider_InitJntSph /* 00B54 80A0C214 8FA40044 */ lw $a0, 0x0044($sp) /* 00B58 80A0C218 3C0780A1 */ lui $a3, %hi(D_80A0DFD0) ## $a3 = 80A10000 /* 00B5C 80A0C21C 261901B4 */ addiu $t9, $s0, 0x01B4 ## $t9 = 000001B4 @@ -33,9 +33,9 @@ glabel EnFd_Init /* 00B64 80A0C224 AFB90010 */ sw $t9, 0x0010($sp) /* 00B68 80A0C228 24E7DFD0 */ addiu $a3, $a3, %lo(D_80A0DFD0) ## $a3 = 80A0DFD0 /* 00B6C 80A0C22C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00B70 80A0C230 0C017014 */ jal func_8005C050 +/* 00B70 80A0C230 0C017014 */ jal Collider_SetJntSph /* 00B74 80A0C234 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00B78 80A0C238 0C016C80 */ jal CollisionBtlTbl_Get +/* 00B78 80A0C238 0C016C80 */ jal DamageTable_Get /* 00B7C 80A0C23C 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F /* 00B80 80A0C240 3C0680A1 */ lui $a2, %hi(D_80A0DFE0) ## $a2 = 80A10000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Update.s index fd9e7ec68f..e34d8622eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Update.s @@ -108,7 +108,7 @@ glabel EnFd_Update /* 01584 80A0CC44 15800005 */ bne $t4, $zero, .L80A0CC5C /* 01588 80A0CC48 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0158C 80A0CC4C 02212821 */ addu $a1, $s1, $at -/* 01590 80A0CC50 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01590 80A0CC50 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01594 80A0CC54 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 01598 80A0CC58 8E030190 */ lw $v1, 0x0190($s0) ## 00000190 @@ -127,13 +127,13 @@ glabel EnFd_Update .L80A0CC84: /* 015C4 80A0CC84 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 015C8 80A0CC88 AFA50034 */ sw $a1, 0x0034($sp) -/* 015CC 80A0CC8C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 015CC 80A0CC8C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 015D0 80A0CC90 AFA6002C */ sw $a2, 0x002C($sp) /* 015D4 80A0CC94 8FA50034 */ lw $a1, 0x0034($sp) /* 015D8 80A0CC98 8FA6002C */ lw $a2, 0x002C($sp) .L80A0CC9C: -/* 015DC 80A0CC9C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 015DC 80A0CC9C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 015E0 80A0CCA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80A0CCA4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Destroy.s index d24933edb1..e092ec903a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Destroy.s @@ -3,7 +3,7 @@ glabel EnFdFire_Destroy /* 00238 80A0E6E8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0023C 80A0E6EC AFBF0014 */ sw $ra, 0x0014($sp) /* 00240 80A0E6F0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00244 80A0E6F4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00244 80A0E6F4 0C0170EB */ jal Collider_DestroyCylinder /* 00248 80A0E6F8 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 0024C 80A0E6FC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Init.s index e61bbbf79c..ad0c29731b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Init.s @@ -20,14 +20,14 @@ glabel EnFdFire_Init /* 0015C 80A0E60C AFAF0024 */ sw $t7, 0x0024($sp) /* 00160 80A0E610 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 00164 80A0E614 AFA50020 */ sw $a1, 0x0020($sp) -/* 00168 80A0E618 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00168 80A0E618 0C0170D9 */ jal Collider_InitCylinder /* 0016C 80A0E61C 8FA40034 */ lw $a0, 0x0034($sp) /* 00170 80A0E620 3C0780A1 */ lui $a3, %hi(D_80A0F030) ## $a3 = 80A10000 /* 00174 80A0E624 8FA50020 */ lw $a1, 0x0020($sp) /* 00178 80A0E628 24E7F030 */ addiu $a3, $a3, %lo(D_80A0F030) ## $a3 = 80A0F030 /* 0017C 80A0E62C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00180 80A0E630 0C01712B */ jal ActorCollider_InitCylinder +/* 00180 80A0E630 0C01712B */ jal Collider_SetCylinder /* 00184 80A0E634 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00188 80A0E638 3C0580A1 */ lui $a1, %hi(D_80A0F068) ## $a1 = 80A10000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Update.s index 665815c843..5c3662b9cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Update.s @@ -45,7 +45,7 @@ glabel EnFdFire_Update /* 006DC 80A0EB8C 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 006E0 80A0EB90 514B000F */ beql $t2, $t3, .L80A0EBD0 /* 006E4 80A0EB94 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006E8 80A0EB98 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 006E8 80A0EB98 0C0189B7 */ jal Collider_CylinderUpdate /* 006EC 80A0EB9C AFA50028 */ sw $a1, 0x0028($sp) /* 006F0 80A0EBA0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -53,12 +53,12 @@ glabel EnFdFire_Update /* 006F8 80A0EBA8 02212821 */ addu $a1, $s1, $at /* 006FC 80A0EBAC AFA5002C */ sw $a1, 0x002C($sp) /* 00700 80A0EBB0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00704 80A0EBB4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00704 80A0EBB4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00708 80A0EBB8 8FA60028 */ lw $a2, 0x0028($sp) /* 0070C 80A0EBBC 8FA5002C */ lw $a1, 0x002C($sp) /* 00710 80A0EBC0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00714 80A0EBC4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00714 80A0EBC4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00718 80A0EBC8 8FA60028 */ lw $a2, 0x0028($sp) /* 0071C 80A0EBCC 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Destroy.s index 67972da0a3..191c6efbbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Destroy.s @@ -13,7 +13,7 @@ glabel EnFhgFire_Destroy /* 00458 80A0F6B8 14410005 */ bne $v0, $at, .L80A0F6D0 .L80A0F6BC: /* 0045C 80A0F6BC 24E501B0 */ addiu $a1, $a3, 0x01B0 ## $a1 = 000001B0 -/* 00460 80A0F6C0 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00460 80A0F6C0 0C0170EB */ jal Collider_DestroyCylinder /* 00464 80A0F6C4 AFA70018 */ sw $a3, 0x0018($sp) /* 00468 80A0F6C8 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s index d0b4cb9e6e..c1e8b68945 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s @@ -43,14 +43,14 @@ glabel EnFhgFire_Init /* 00060 80A0F2C0 5441000A */ bnel $v0, $at, .L80A0F2EC /* 00064 80A0F2C4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 .L80A0F2C8: -/* 00068 80A0F2C8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00068 80A0F2C8 0C0170D9 */ jal Collider_InitCylinder /* 0006C 80A0F2CC AFA50034 */ sw $a1, 0x0034($sp) /* 00070 80A0F2D0 3C0780A1 */ lui $a3, %hi(D_80A11790) ## $a3 = 80A10000 /* 00074 80A0F2D4 8FA50034 */ lw $a1, 0x0034($sp) /* 00078 80A0F2D8 24E71790 */ addiu $a3, $a3, %lo(D_80A11790) ## $a3 = 80A11790 /* 0007C 80A0F2DC 8FA4005C */ lw $a0, 0x005C($sp) -/* 00080 80A0F2E0 0C01712B */ jal ActorCollider_InitCylinder +/* 00080 80A0F2E0 0C01712B */ jal Collider_SetCylinder /* 00084 80A0F2E4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00088 80A0F2E8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FC48.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FC48.s index 309ccbe865..eee2e43e0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FC48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FC48.s @@ -50,7 +50,7 @@ glabel func_80A0FC48 /* 00A94 80A0FCF4 260601B0 */ addiu $a2, $s0, 0x01B0 ## $a2 = 000001B0 /* 00A98 80A0FCF8 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B0 /* 00A9C 80A0FCFC AFA6002C */ sw $a2, 0x002C($sp) -/* 00AA0 80A0FD00 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00AA0 80A0FD00 0C0189B7 */ jal Collider_CylinderUpdate /* 00AA4 80A0FD04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00AA8 80A0FD08 8FA9003C */ lw $t1, 0x003C($sp) @@ -61,7 +61,7 @@ glabel func_80A0FC48 /* 00ABC 80A0FD1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00AC0 80A0FD20 55400004 */ bnel $t2, $zero, .L80A0FD34 /* 00AC4 80A0FD24 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00AC8 80A0FD28 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00AC8 80A0FD28 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00ACC 80A0FD2C 02212821 */ addu $a1, $s1, $at /* 00AD0 80A0FD30 3C014248 */ lui $at, 0x4248 ## $at = 42480000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s index 226196152c..260d03b758 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A0FD8C.s @@ -96,7 +96,7 @@ glabel func_80A0FD8C /* 00C78 80A0FED8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00C7C 80A0FEDC 4502000E */ bc1fl .L80A0FF18 /* 00C80 80A0FEE0 86190150 */ lh $t9, 0x0150($s0) ## 00000150 -/* 00C84 80A0FEE4 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00C84 80A0FEE4 0C0189B7 */ jal Collider_CylinderUpdate /* 00C88 80A0FEE8 AFA60024 */ sw $a2, 0x0024($sp) /* 00C8C 80A0FEEC 8FAF002C */ lw $t7, 0x002C($sp) @@ -107,7 +107,7 @@ glabel func_80A0FD8C /* 00CA0 80A0FF00 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00CA4 80A0FF04 57000004 */ bnel $t8, $zero, .L80A0FF18 /* 00CA8 80A0FF08 86190150 */ lh $t9, 0x0150($s0) ## 00000150 -/* 00CAC 80A0FF0C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00CAC 80A0FF0C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00CB0 80A0FF10 02212821 */ addu $a1, $s1, $at /* 00CB4 80A0FF14 86190150 */ lh $t9, 0x0150($s0) ## 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s index f2ce32eb3f..bade13c4a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s @@ -883,7 +883,7 @@ glabel func_80A10220 /* 01BC4 80A10E24 8FBF0044 */ lw $ra, 0x0044($sp) .L80A10E28: /* 01BC8 80A10E28 260501B0 */ addiu $a1, $s0, 0x01B0 ## $a1 = 000001B0 -/* 01BCC 80A10E2C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01BCC 80A10E2C 0C0189B7 */ jal Collider_CylinderUpdate /* 01BD0 80A10E30 AFA50050 */ sw $a1, 0x0050($sp) /* 01BD4 80A10E34 3C0480A1 */ lui $a0, %hi(D_80A118CC) ## $a0 = 80A10000 @@ -895,7 +895,7 @@ glabel func_80A10220 /* 01BE8 80A10E48 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01BEC 80A10E4C 02212821 */ addu $a1, $s1, $at /* 01BF0 80A10E50 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01BF4 80A10E54 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01BF4 80A10E54 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01BF8 80A10E58 8FA60050 */ lw $a2, 0x0050($sp) /* 01BFC 80A10E5C 3C0480A1 */ lui $a0, %hi(D_80A118E0) ## $a0 = 80A10000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Destroy.s index edd300c7eb..e9f4e9acf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Destroy.s @@ -51,7 +51,7 @@ glabel EnFireRock_Destroy .L80A120B0: /* 00490 80A120B0 8FA40024 */ lw $a0, 0x0024($sp) .L80A120B4: -/* 00494 80A120B4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00494 80A120B4 0C0170EB */ jal Collider_DestroyCylinder /* 00498 80A120B8 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 0049C 80A120BC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s index 6c205747d4..d9a5a87b91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Init.s @@ -118,14 +118,14 @@ glabel L80A11D14 /* 00100 80A11D20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00104 80A11D24 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00108 80A11D28 AFA50024 */ sw $a1, 0x0024($sp) -/* 0010C 80A11D2C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0010C 80A11D2C 0C0170D9 */ jal Collider_InitCylinder /* 00110 80A11D30 8FA4003C */ lw $a0, 0x003C($sp) /* 00114 80A11D34 3C0780A1 */ lui $a3, %hi(D_80A12CCC) ## $a3 = 80A10000 /* 00118 80A11D38 8FA50024 */ lw $a1, 0x0024($sp) /* 0011C 80A11D3C 24E72CCC */ addiu $a3, $a3, %lo(D_80A12CCC) ## $a3 = 80A12CCC /* 00120 80A11D40 8FA4003C */ lw $a0, 0x003C($sp) -/* 00124 80A11D44 0C01712B */ jal ActorCollider_InitCylinder +/* 00124 80A11D44 0C01712B */ jal Collider_SetCylinder /* 00128 80A11D48 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0012C 80A11D4C 3C0480A1 */ lui $a0, %hi(D_80A12D2C) ## $a0 = 80A10000 @@ -187,14 +187,14 @@ glabel L80A11DD8 /* 001EC 80A11E0C E602016C */ swc1 $f2, 0x016C($s0) ## 0000016C /* 001F0 80A11E10 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 001F4 80A11E14 AFA50024 */ sw $a1, 0x0024($sp) -/* 001F8 80A11E18 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 001F8 80A11E18 0C0170D9 */ jal Collider_InitCylinder /* 001FC 80A11E1C 8FA4003C */ lw $a0, 0x003C($sp) /* 00200 80A11E20 3C0780A1 */ lui $a3, %hi(D_80A12CA0) ## $a3 = 80A10000 /* 00204 80A11E24 8FA50024 */ lw $a1, 0x0024($sp) /* 00208 80A11E28 24E72CA0 */ addiu $a3, $a3, %lo(D_80A12CA0) ## $a3 = 80A12CA0 /* 0020C 80A11E2C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00210 80A11E30 0C01712B */ jal ActorCollider_InitCylinder +/* 00210 80A11E30 0C01712B */ jal Collider_SetCylinder /* 00214 80A11E34 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00218 80A11E38 3C0180A1 */ lui $at, %hi(D_80A12EB4) ## $at = 80A10000 @@ -250,14 +250,14 @@ glabel L80A11E70 /* 002C8 80A11EE8 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 002CC 80A11EEC E610006C */ swc1 $f16, 0x006C($s0) ## 0000006C /* 002D0 80A11EF0 AFA50024 */ sw $a1, 0x0024($sp) -/* 002D4 80A11EF4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 002D4 80A11EF4 0C0170D9 */ jal Collider_InitCylinder /* 002D8 80A11EF8 8FA4003C */ lw $a0, 0x003C($sp) /* 002DC 80A11EFC 3C0780A1 */ lui $a3, %hi(D_80A12CA0) ## $a3 = 80A10000 /* 002E0 80A11F00 8FA50024 */ lw $a1, 0x0024($sp) /* 002E4 80A11F04 24E72CA0 */ addiu $a3, $a3, %lo(D_80A12CA0) ## $a3 = 80A12CA0 /* 002E8 80A11F08 8FA4003C */ lw $a0, 0x003C($sp) -/* 002EC 80A11F0C 0C01712B */ jal ActorCollider_InitCylinder +/* 002EC 80A11F0C 0C01712B */ jal Collider_SetCylinder /* 002F0 80A11F10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002F4 80A11F14 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Update.s index 8960e5e361..83f5961936 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Update.s @@ -182,7 +182,7 @@ glabel EnFireRock_Update /* 00E5C 80A12A7C 1040000F */ beq $v0, $zero, .L80A12ABC /* 00E60 80A12A80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E64 80A12A84 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00E68 80A12A88 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00E68 80A12A88 0C0189B7 */ jal Collider_CylinderUpdate /* 00E6C 80A12A8C AFA5002C */ sw $a1, 0x002C($sp) /* 00E70 80A12A90 8FA4004C */ lw $a0, 0x004C($sp) @@ -190,12 +190,12 @@ glabel EnFireRock_Update /* 00E78 80A12A98 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00E7C 80A12A9C 00812821 */ addu $a1, $a0, $at /* 00E80 80A12AA0 AFA50030 */ sw $a1, 0x0030($sp) -/* 00E84 80A12AA4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00E84 80A12AA4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00E88 80A12AA8 8FA6002C */ lw $a2, 0x002C($sp) /* 00E8C 80A12AAC 8FA50030 */ lw $a1, 0x0030($sp) /* 00E90 80A12AB0 8FA4004C */ lw $a0, 0x004C($sp) -/* 00E94 80A12AB4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00E94 80A12AB4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00E98 80A12AB8 8FA6002C */ lw $a2, 0x002C($sp) .L80A12ABC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Destroy.s index 593f0eb08a..6fef29cddd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Destroy.s @@ -3,7 +3,7 @@ glabel EnFirefly_Destroy /* 00260 80A132D0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00264 80A132D4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00268 80A132D8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0026C 80A132DC 0C016F32 */ jal func_8005BCC8 +/* 0026C 80A132DC 0C016F32 */ jal Collider_DestroyJntSph /* 00270 80A132E0 24C50314 */ addiu $a1, $a2, 0x0314 ## $a1 = 00000314 /* 00274 80A132E4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00278 80A132E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Init.s index e334a5b58a..91a314c1a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Init.s @@ -31,7 +31,7 @@ glabel EnFirefly_Init /* 000CC 80A1313C 26050170 */ addiu $a1, $s0, 0x0170 ## $a1 = 00000170 /* 000D0 80A13140 26050314 */ addiu $a1, $s0, 0x0314 ## $a1 = 00000314 /* 000D4 80A13144 AFA50030 */ sw $a1, 0x0030($sp) -/* 000D8 80A13148 0C016EFE */ jal func_8005BBF8 +/* 000D8 80A13148 0C016EFE */ jal Collider_InitJntSph /* 000DC 80A1314C 8FA4003C */ lw $a0, 0x003C($sp) /* 000E0 80A13150 3C0780A1 */ lui $a3, %hi(D_80A14F54) ## $a3 = 80A10000 /* 000E4 80A13154 26190334 */ addiu $t9, $s0, 0x0334 ## $t9 = 00000334 @@ -39,7 +39,7 @@ glabel EnFirefly_Init /* 000EC 80A1315C AFB90010 */ sw $t9, 0x0010($sp) /* 000F0 80A13160 24E74F54 */ addiu $a3, $a3, %lo(D_80A14F54) ## $a3 = 80A14F54 /* 000F4 80A13164 8FA4003C */ lw $a0, 0x003C($sp) -/* 000F8 80A13168 0C017014 */ jal func_8005C050 +/* 000F8 80A13168 0C017014 */ jal Collider_SetJntSph /* 000FC 80A1316C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00100 80A13170 3C0580A1 */ lui $a1, %hi(D_80A14F6C) ## $a1 = 80A10000 /* 00104 80A13174 3C0680A1 */ lui $a2, %hi(D_80A14F64) ## $a2 = 80A10000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Update.s index 6a0ac7ba22..95f01e07ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Update.s @@ -110,7 +110,7 @@ glabel EnFirefly_Update /* 017D4 80A14844 57220004 */ bnel $t9, $v0, .L80A14858 /* 017D8 80A14848 8FA40044 */ lw $a0, 0x0044($sp) .L80A1484C: -/* 017DC 80A1484C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 017DC 80A1484C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 017E0 80A14850 26060314 */ addiu $a2, $s0, 0x0314 ## $a2 = 00000314 /* 017E4 80A14854 8FA40044 */ lw $a0, 0x0044($sp) @@ -125,7 +125,7 @@ glabel EnFirefly_Update /* 01804 80A14874 01202825 */ or $a1, $t1, $zero ## $a1 = 00000000 /* 01808 80A14878 5160000D */ beql $t3, $zero, .L80A148B0 /* 0180C 80A1487C 8FA40044 */ lw $a0, 0x0044($sp) -/* 01810 80A14880 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01810 80A14880 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01814 80A14884 01403025 */ or $a2, $t2, $zero ## $a2 = 00000314 /* 01818 80A14888 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 @@ -142,7 +142,7 @@ glabel EnFirefly_Update /* 0183C 80A148AC 8FA40044 */ lw $a0, 0x0044($sp) .L80A148B0: /* 01840 80A148B0 8FA50030 */ lw $a1, 0x0030($sp) -/* 01844 80A148B4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01844 80A148B4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01848 80A148B8 8FA6002C */ lw $a2, 0x002C($sp) /* 0184C 80A148BC 0C01DE1C */ jal Math_Sins diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Destroy.s index 0e8f6a7ac9..5238fbb004 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Destroy.s @@ -3,7 +3,7 @@ glabel EnFish_Destroy /* 0032C 80A155AC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00330 80A155B0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00334 80A155B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00338 80A155B8 0C016F32 */ jal func_8005BCC8 +/* 00338 80A155B8 0C016F32 */ jal Collider_DestroyJntSph /* 0033C 80A155BC 24E5014C */ addiu $a1, $a3, 0x014C ## $a1 = 0000014C /* 00340 80A155C0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00344 80A155C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s index 7bb41998c5..ed6f5cb89b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s @@ -32,7 +32,7 @@ glabel EnFish_Init /* 00240 80A154C0 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC /* 00244 80A154C4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00248 80A154C8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0024C 80A154CC 0C016EFE */ jal func_8005BBF8 +/* 0024C 80A154CC 0C016EFE */ jal Collider_InitJntSph /* 00250 80A154D0 8FA40044 */ lw $a0, 0x0044($sp) /* 00254 80A154D4 3C0780A1 */ lui $a3, %hi(D_80A17040) ## $a3 = 80A10000 /* 00258 80A154D8 2608016C */ addiu $t0, $s0, 0x016C ## $t0 = 0000016C @@ -40,7 +40,7 @@ glabel EnFish_Init /* 00260 80A154E0 AFA80010 */ sw $t0, 0x0010($sp) /* 00264 80A154E4 24E77040 */ addiu $a3, $a3, %lo(D_80A17040) ## $a3 = 80A17040 /* 00268 80A154E8 8FA40044 */ lw $a0, 0x0044($sp) -/* 0026C 80A154EC 0C017014 */ jal func_8005C050 +/* 0026C 80A154EC 0C017014 */ jal Collider_SetJntSph /* 00270 80A154F0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00274 80A154F4 24090032 */ addiu $t1, $zero, 0x0032 ## $t1 = 00000032 /* 00278 80A154F8 0C03F66B */ jal Math_Rand_ZeroOne diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16C68.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16C68.s index 8ac340aff4..48f961eeb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16C68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A16C68.s @@ -64,7 +64,7 @@ glabel func_80A16C68 /* 01AB4 80A16D34 00812821 */ addu $a1, $a0, $at /* 01AB8 80A16D38 45000003 */ bc1f .L80A16D48 /* 01ABC 80A16D3C 00000000 */ nop -/* 01AC0 80A16D40 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01AC0 80A16D40 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01AC4 80A16D44 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C .L80A16D48: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Destroy.s index 8f411d2efb..f5b3a6887e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Destroy.s @@ -3,7 +3,7 @@ glabel EnFloormas_Destroy /* 00214 80A17724 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00218 80A17728 AFBF0014 */ sw $ra, 0x0014($sp) /* 0021C 80A1772C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00220 80A17730 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00220 80A17730 0C0170EB */ jal Collider_DestroyCylinder /* 00224 80A17734 24C502C8 */ addiu $a1, $a2, 0x02C8 ## $a1 = 000002C8 /* 00228 80A17738 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s index 0034637f82..f2c8c06b6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s @@ -31,14 +31,14 @@ glabel EnFloormas_Init /* 0006C 80A1757C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00070 80A17580 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8 /* 00074 80A17584 AFA5003C */ sw $a1, 0x003C($sp) -/* 00078 80A17588 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00078 80A17588 0C0170D9 */ jal Collider_InitCylinder /* 0007C 80A1758C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00080 80A17590 3C0780A2 */ lui $a3, %hi(D_80A1A470) ## $a3 = 80A20000 /* 00084 80A17594 8FA5003C */ lw $a1, 0x003C($sp) /* 00088 80A17598 24E7A470 */ addiu $a3, $a3, %lo(D_80A1A470) ## $a3 = 80A1A470 /* 0008C 80A1759C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00090 80A175A0 0C01712B */ jal ActorCollider_InitCylinder +/* 00090 80A175A0 0C01712B */ jal Collider_SetCylinder /* 00094 80A175A4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00098 80A175A8 3C0580A2 */ lui $a1, %hi(D_80A1A4A4) ## $a1 = 80A20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Update.s index e2f139ebe0..07d6a485b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Update.s @@ -86,7 +86,7 @@ glabel EnFloormas_Update /* 02AD0 80A19FE0 00000000 */ nop /* 02AD4 80A19FE4 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8 /* 02AD8 80A19FE8 AFA50028 */ sw $a1, 0x0028($sp) -/* 02ADC 80A19FEC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 02ADC 80A19FEC 0C0189B7 */ jal Collider_CylinderUpdate /* 02AE0 80A19FF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02AE4 80A19FF4 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 @@ -102,7 +102,7 @@ glabel EnFloormas_Update /* 02B0C 80A1A01C AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 /* 02B10 80A1A020 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02B14 80A1A024 8FA60028 */ lw $a2, 0x0028($sp) -/* 02B18 80A1A028 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 02B18 80A1A028 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 02B1C 80A1A02C 00812821 */ addu $a1, $a0, $at /* 02B20 80A1A030 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 @@ -122,7 +122,7 @@ glabel EnFloormas_Update /* 02B54 80A1A064 15000005 */ bne $t0, $zero, .L80A1A07C /* 02B58 80A1A068 8FA40044 */ lw $a0, 0x0044($sp) /* 02B5C 80A1A06C 00812821 */ addu $a1, $a0, $at -/* 02B60 80A1A070 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02B60 80A1A070 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02B64 80A1A074 8FA60028 */ lw $a2, 0x0028($sp) /* 02B68 80A1A078 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 @@ -143,7 +143,7 @@ glabel EnFloormas_Update /* 02B9C 80A1A0AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02BA0 80A1A0B0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02BA4 80A1A0B4 8FA60028 */ lw $a2, 0x0028($sp) -/* 02BA8 80A1A0B8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02BA8 80A1A0B8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02BAC 80A1A0BC 00812821 */ addu $a1, $a0, $at .L80A1A0C0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Destroy.s index 7310b492e4..97690926ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Destroy.s @@ -3,7 +3,7 @@ glabel EnFu_Destroy /* 00118 80A1D928 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0011C 80A1D92C AFBF0014 */ sw $ra, 0x0014($sp) /* 00120 80A1D930 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00124 80A1D934 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00124 80A1D934 0C0170EB */ jal Collider_DestroyCylinder /* 00128 80A1D938 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 0012C 80A1D93C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s index cf8762277e..48bddbebc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s @@ -31,14 +31,14 @@ glabel EnFu_Init /* 00070 80A1D880 8FA40034 */ lw $a0, 0x0034($sp) /* 00074 80A1D884 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00078 80A1D888 AFA50034 */ sw $a1, 0x0034($sp) -/* 0007C 80A1D88C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0007C 80A1D88C 0C0170D9 */ jal Collider_InitCylinder /* 00080 80A1D890 8FA40044 */ lw $a0, 0x0044($sp) /* 00084 80A1D894 3C0780A2 */ lui $a3, %hi(D_80A1E420) ## $a3 = 80A20000 /* 00088 80A1D898 8FA50034 */ lw $a1, 0x0034($sp) /* 0008C 80A1D89C 24E7E420 */ addiu $a3, $a3, %lo(D_80A1E420) ## $a3 = 80A1E420 /* 00090 80A1D8A0 8FA40044 */ lw $a0, 0x0044($sp) -/* 00094 80A1D8A4 0C01712B */ jal ActorCollider_InitCylinder +/* 00094 80A1D8A4 0C01712B */ jal Collider_SetCylinder /* 00098 80A1D8A8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0009C 80A1D8AC 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Update.s index 8c97e50c9d..e2d8ef6ff6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Update.s @@ -6,14 +6,14 @@ glabel EnFu_Update /* 0076C 80A1DF7C AFA50044 */ sw $a1, 0x0044($sp) /* 00770 80A1DF80 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 00774 80A1DF84 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 00778 80A1DF88 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00778 80A1DF88 0C0189B7 */ jal Collider_CylinderUpdate /* 0077C 80A1DF8C AFA60030 */ sw $a2, 0x0030($sp) /* 00780 80A1DF90 8FA40044 */ lw $a0, 0x0044($sp) /* 00784 80A1DF94 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00788 80A1DF98 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0078C 80A1DF9C 8FA60030 */ lw $a2, 0x0030($sp) -/* 00790 80A1DFA0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00790 80A1DFA0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00794 80A1DFA4 00812821 */ addu $a1, $a0, $at /* 00798 80A1DFA8 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Destroy.s index 221a507281..944dc7b10c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Destroy.s @@ -3,7 +3,7 @@ glabel EnFw_Destroy /* 006AC 80A1EC4C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 006B0 80A1EC50 AFBF0014 */ sw $ra, 0x0014($sp) /* 006B4 80A1EC54 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 006B8 80A1EC58 0C016F32 */ jal func_8005BCC8 +/* 006B8 80A1EC58 0C016F32 */ jal Collider_DestroyJntSph /* 006BC 80A1EC5C 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 006C0 80A1EC60 8FBF0014 */ lw $ra, 0x0014($sp) /* 006C4 80A1EC64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s index 183e0cafc4..7099cbaa6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s @@ -31,7 +31,7 @@ glabel EnFw_Init /* 00610 80A1EBB0 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 00614 80A1EBB4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00618 80A1EBB8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0061C 80A1EBBC 0C016EFE */ jal func_8005BBF8 +/* 0061C 80A1EBBC 0C016EFE */ jal Collider_InitJntSph /* 00620 80A1EBC0 8FA40044 */ lw $a0, 0x0044($sp) /* 00624 80A1EBC4 3C0780A2 */ lui $a3, %hi(D_80A1FB84) ## $a3 = 80A20000 /* 00628 80A1EBC8 261901B4 */ addiu $t9, $s0, 0x01B4 ## $t9 = 000001B4 @@ -39,9 +39,9 @@ glabel EnFw_Init /* 00630 80A1EBD0 AFB90010 */ sw $t9, 0x0010($sp) /* 00634 80A1EBD4 24E7FB84 */ addiu $a3, $a3, %lo(D_80A1FB84) ## $a3 = 80A1FB84 /* 00638 80A1EBD8 8FA40044 */ lw $a0, 0x0044($sp) -/* 0063C 80A1EBDC 0C017014 */ jal func_8005C050 +/* 0063C 80A1EBDC 0C017014 */ jal Collider_SetJntSph /* 00640 80A1EBE0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00644 80A1EBE4 0C016C80 */ jal CollisionBtlTbl_Get +/* 00644 80A1EBE4 0C016C80 */ jal DamageTable_Get /* 00648 80A1EBE8 24040010 */ addiu $a0, $zero, 0x0010 ## $a0 = 00000010 /* 0064C 80A1EBEC 3C0680A2 */ lui $a2, %hi(D_80A1FB94) ## $a2 = 80A20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Update.s index 4ca0526caa..551990b2d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Update.s @@ -44,7 +44,7 @@ glabel EnFw_Update /* 00F4C 80A1F4EC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00F50 80A1F4F0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00F54 80A1F4F4 02212821 */ addu $a1, $s1, $at -/* 00F58 80A1F4F8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00F58 80A1F4F8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00F5C 80A1F4FC 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 .L80A1F500: @@ -53,7 +53,7 @@ glabel EnFw_Update /* 00F64 80A1F504 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00F68 80A1F508 02212821 */ addu $a1, $s1, $at /* 00F6C 80A1F50C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F70 80A1F510 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00F70 80A1F510 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00F74 80A1F514 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 00F78 80A1F518 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Destroy.s index fedf92796e..1f0b4f21fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Destroy.s @@ -5,17 +5,17 @@ glabel EnFz_Destroy /* 00188 80A1FF48 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0018C 80A1FF4C 8FA50018 */ lw $a1, 0x0018($sp) /* 00190 80A1FF50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00194 80A1FF54 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00194 80A1FF54 0C0170EB */ jal Collider_DestroyCylinder /* 00198 80A1FF58 24A50150 */ addiu $a1, $a1, 0x0150 ## $a1 = 00000150 /* 0019C 80A1FF5C 8FA50018 */ lw $a1, 0x0018($sp) /* 001A0 80A1FF60 8FA4001C */ lw $a0, 0x001C($sp) -/* 001A4 80A1FF64 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001A4 80A1FF64 0C0170EB */ jal Collider_DestroyCylinder /* 001A8 80A1FF68 24A5019C */ addiu $a1, $a1, 0x019C ## $a1 = 0000019C /* 001AC 80A1FF6C 8FA50018 */ lw $a1, 0x0018($sp) /* 001B0 80A1FF70 8FA4001C */ lw $a0, 0x001C($sp) -/* 001B4 80A1FF74 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001B4 80A1FF74 0C0170EB */ jal Collider_DestroyCylinder /* 001B8 80A1FF78 24A501E8 */ addiu $a1, $a1, 0x01E8 ## $a1 = 000001E8 /* 001BC 80A1FF7C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Init.s index 6f775e3c2a..fd1b51ea00 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Init.s @@ -16,36 +16,36 @@ glabel EnFz_Init /* 00034 80A1FDF4 A20F00AF */ sb $t7, 0x00AF($s0) ## 000000AF /* 00038 80A1FDF8 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 0003C 80A1FDFC AFA50020 */ sw $a1, 0x0020($sp) -/* 00040 80A1FE00 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00040 80A1FE00 0C0170D9 */ jal Collider_InitCylinder /* 00044 80A1FE04 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00048 80A1FE08 3C0780A2 */ lui $a3, %hi(D_80A21B90) ## $a3 = 80A20000 /* 0004C 80A1FE0C 8FA50020 */ lw $a1, 0x0020($sp) /* 00050 80A1FE10 24E71B90 */ addiu $a3, $a3, %lo(D_80A21B90) ## $a3 = 80A21B90 /* 00054 80A1FE14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00058 80A1FE18 0C017114 */ jal func_8005C450 +/* 00058 80A1FE18 0C017114 */ jal Collider_SetCylinder_Set3 /* 0005C 80A1FE1C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00060 80A1FE20 2605019C */ addiu $a1, $s0, 0x019C ## $a1 = 0000019C /* 00064 80A1FE24 AFA50020 */ sw $a1, 0x0020($sp) -/* 00068 80A1FE28 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00068 80A1FE28 0C0170D9 */ jal Collider_InitCylinder /* 0006C 80A1FE2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00070 80A1FE30 3C0780A2 */ lui $a3, %hi(D_80A21BBC) ## $a3 = 80A20000 /* 00074 80A1FE34 8FA50020 */ lw $a1, 0x0020($sp) /* 00078 80A1FE38 24E71BBC */ addiu $a3, $a3, %lo(D_80A21BBC) ## $a3 = 80A21BBC /* 0007C 80A1FE3C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00080 80A1FE40 0C017114 */ jal func_8005C450 +/* 00080 80A1FE40 0C017114 */ jal Collider_SetCylinder_Set3 /* 00084 80A1FE44 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00088 80A1FE48 260501E8 */ addiu $a1, $s0, 0x01E8 ## $a1 = 000001E8 /* 0008C 80A1FE4C AFA50020 */ sw $a1, 0x0020($sp) -/* 00090 80A1FE50 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00090 80A1FE50 0C0170D9 */ jal Collider_InitCylinder /* 00094 80A1FE54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00098 80A1FE58 3C0780A2 */ lui $a3, %hi(D_80A21BE8) ## $a3 = 80A20000 /* 0009C 80A1FE5C 8FA50020 */ lw $a1, 0x0020($sp) /* 000A0 80A1FE60 24E71BE8 */ addiu $a3, $a3, %lo(D_80A21BE8) ## $a3 = 80A21BE8 /* 000A4 80A1FE64 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000A8 80A1FE68 0C017114 */ jal func_8005C450 +/* 000A8 80A1FE68 0C017114 */ jal Collider_SetCylinder_Set3 /* 000AC 80A1FE6C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B0 80A1FE70 3C053C03 */ lui $a1, 0x3C03 ## $a1 = 3C030000 /* 000B4 80A1FE74 34A5126F */ ori $a1, $a1, 0x126F ## $a1 = 3C03126F diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s index 467b4515d3..afa377b6ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Update.s @@ -40,12 +40,12 @@ glabel EnFz_Update /* 01384 80A21144 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 01388 80A21148 5520001E */ bnel $t1, $zero, .L80A211C4 /* 0138C 80A2114C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 01390 80A21150 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01390 80A21150 0C0189B7 */ jal Collider_CylinderUpdate /* 01394 80A21154 AFA50030 */ sw $a1, 0x0030($sp) /* 01398 80A21158 2605019C */ addiu $a1, $s0, 0x019C ## $a1 = 0000019C /* 0139C 80A2115C AFA5002C */ sw $a1, 0x002C($sp) -/* 013A0 80A21160 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 013A0 80A21160 0C0189B7 */ jal Collider_CylinderUpdate /* 013A4 80A21164 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 013A8 80A21168 920A0248 */ lbu $t2, 0x0248($s0) ## 00000248 @@ -58,12 +58,12 @@ glabel EnFz_Update /* 013C4 80A21184 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 013C8 80A21188 02212821 */ addu $a1, $s1, $at /* 013CC 80A2118C AFA50034 */ sw $a1, 0x0034($sp) -/* 013D0 80A21190 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 013D0 80A21190 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 013D4 80A21194 8FA60030 */ lw $a2, 0x0030($sp) /* 013D8 80A21198 8FA50034 */ lw $a1, 0x0034($sp) /* 013DC 80A2119C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 013E0 80A211A0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 013E0 80A211A0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 013E4 80A211A4 8FA6002C */ lw $a2, 0x002C($sp) .L80A211A8: @@ -71,7 +71,7 @@ glabel EnFz_Update /* 013EC 80A211AC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 013F0 80A211B0 02212821 */ addu $a1, $s1, $at /* 013F4 80A211B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 013F8 80A211B8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 013F8 80A211B8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 013FC 80A211BC 8FA60030 */ lw $a2, 0x0030($sp) /* 01400 80A211C0 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s index df54ee49bb..90cbad8561 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A215BC.s @@ -156,7 +156,7 @@ glabel func_80A215BC /* 01A34 80A217F4 C60A000C */ lwc1 $f10, 0x000C($s0) ## 00000280 /* 01A38 80A217F8 4600540D */ trunc.w.s $f16, $f10 /* 01A3C 80A217FC 44098000 */ mfc1 $t1, $f16 -/* 01A40 80A21800 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01A40 80A21800 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01A44 80A21804 A6290232 */ sh $t1, 0x0232($s1) ## 00000232 /* 01A48 80A21808 C6120004 */ lwc1 $f18, 0x0004($s0) ## 00000278 diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Destroy.s index 94f9ac9585..93fe6bfc5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Destroy.s @@ -3,7 +3,7 @@ glabel EnGSwitch_Destroy /* 0036C 80A2222C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00370 80A22230 AFBF0014 */ sw $ra, 0x0014($sp) /* 00374 80A22234 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00378 80A22238 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00378 80A22238 0C0170EB */ jal Collider_DestroyCylinder /* 0037C 80A2223C 24C5017C */ addiu $a1, $a2, 0x017C ## $a1 = 0000017C /* 00380 80A22240 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Init.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Init.s index 66d782ba3b..e21130510b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Init.s @@ -170,14 +170,14 @@ glabel EnGSwitch_Init /* 00148 80A22008 A60E015C */ sh $t6, 0x015C($s0) ## 0000015C /* 0014C 80A2200C 2605017C */ addiu $a1, $s0, 0x017C ## $a1 = 0000017C /* 00150 80A22010 AFA50020 */ sw $a1, 0x0020($sp) -/* 00154 80A22014 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00154 80A22014 0C0170D9 */ jal Collider_InitCylinder /* 00158 80A22018 8FA40034 */ lw $a0, 0x0034($sp) /* 0015C 80A2201C 3C0780A2 */ lui $a3, %hi(D_80A236E4) ## $a3 = 80A20000 /* 00160 80A22020 8FA50020 */ lw $a1, 0x0020($sp) /* 00164 80A22024 24E736E4 */ addiu $a3, $a3, %lo(D_80A236E4) ## $a3 = 80A236E4 /* 00168 80A22028 8FA40034 */ lw $a0, 0x0034($sp) -/* 0016C 80A2202C 0C01712B */ jal ActorCollider_InitCylinder +/* 0016C 80A2202C 0C01712B */ jal Collider_SetCylinder /* 00170 80A22030 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00174 80A22034 3C01442F */ lui $at, 0x442F ## $at = 442F0000 @@ -232,14 +232,14 @@ glabel EnGSwitch_Init /* 00214 80A220D4 00000000 */ nop /* 00218 80A220D8 A6080158 */ sh $t0, 0x0158($s0) ## 00000158 /* 0021C 80A220DC AFA50020 */ sw $a1, 0x0020($sp) -/* 00220 80A220E0 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00220 80A220E0 0C0170D9 */ jal Collider_InitCylinder /* 00224 80A220E4 8FA40034 */ lw $a0, 0x0034($sp) /* 00228 80A220E8 3C0780A2 */ lui $a3, %hi(D_80A236E4) ## $a3 = 80A20000 /* 0022C 80A220EC 8FA50020 */ lw $a1, 0x0020($sp) /* 00230 80A220F0 24E736E4 */ addiu $a3, $a3, %lo(D_80A236E4) ## $a3 = 80A236E4 /* 00234 80A220F4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00238 80A220F8 0C01712B */ jal ActorCollider_InitCylinder +/* 00238 80A220F8 0C01712B */ jal Collider_SetCylinder /* 0023C 80A220FC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00240 80A22100 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 @@ -298,14 +298,14 @@ glabel EnGSwitch_Init /* 002F8 80A221B8 E61000BC */ swc1 $f16, 0x00BC($s0) ## 000000BC /* 002FC 80A221BC 2605017C */ addiu $a1, $s0, 0x017C ## $a1 = 0000017C /* 00300 80A221C0 AFA50020 */ sw $a1, 0x0020($sp) -/* 00304 80A221C4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00304 80A221C4 0C0170D9 */ jal Collider_InitCylinder /* 00308 80A221C8 8FA40034 */ lw $a0, 0x0034($sp) /* 0030C 80A221CC 3C0780A2 */ lui $a3, %hi(D_80A236E4) ## $a3 = 80A20000 /* 00310 80A221D0 8FA50020 */ lw $a1, 0x0020($sp) /* 00314 80A221D4 24E736E4 */ addiu $a3, $a3, %lo(D_80A236E4) ## $a3 = 80A236E4 /* 00318 80A221D8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0031C 80A221DC 0C01712B */ jal ActorCollider_InitCylinder +/* 0031C 80A221DC 0C01712B */ jal Collider_SetCylinder /* 00320 80A221E0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00324 80A221E4 3C0F80A2 */ lui $t7, %hi(func_80A230A8) ## $t7 = 80A20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Update.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Update.s index 2e0a2375e2..28ede5a379 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/EnGSwitch_Update.s @@ -68,14 +68,14 @@ glabel EnGSwitch_Update /* 0105C 80A22F1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01060 80A22F20 2606017C */ addiu $a2, $s0, 0x017C ## $a2 = 0000017C /* 01064 80A22F24 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000017C -/* 01068 80A22F28 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01068 80A22F28 0C0189B7 */ jal Collider_CylinderUpdate /* 0106C 80A22F2C AFA60054 */ sw $a2, 0x0054($sp) /* 01070 80A22F30 8FA40064 */ lw $a0, 0x0064($sp) /* 01074 80A22F34 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01078 80A22F38 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0107C 80A22F3C 8FA60054 */ lw $a2, 0x0054($sp) -/* 01080 80A22F40 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01080 80A22F40 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01084 80A22F44 00812821 */ addu $a1, $a0, $at .L80A22F48: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Destroy.s index 5e69054aa4..7f6d859125 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Destroy.s @@ -6,7 +6,7 @@ glabel EnGb_Destroy /* 0043C 80A2F5BC 8FA50018 */ lw $a1, 0x0018($sp) /* 00440 80A2F5C0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00444 80A2F5C4 AFA7001C */ sw $a3, 0x001C($sp) -/* 00448 80A2F5C8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00448 80A2F5C8 0C0170EB */ jal Collider_DestroyCylinder /* 0044C 80A2F5CC 24A5023C */ addiu $a1, $a1, 0x023C ## $a1 = 0000023C /* 00450 80A2F5D0 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s index 5d7770f332..6cc0565db6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s @@ -49,14 +49,14 @@ glabel EnGb_Init /* 000DC 80A2F25C 26450164 */ addiu $a1, $s2, 0x0164 ## $a1 = 00000164 /* 000E0 80A2F260 2650023C */ addiu $s0, $s2, 0x023C ## $s0 = 0000023C /* 000E4 80A2F264 02002825 */ or $a1, $s0, $zero ## $a1 = 0000023C -/* 000E8 80A2F268 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000E8 80A2F268 0C0170D9 */ jal Collider_InitCylinder /* 000EC 80A2F26C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 000F0 80A2F270 3C0780A3 */ lui $a3, %hi(D_80A30690) ## $a3 = 80A30000 /* 000F4 80A2F274 24E70690 */ addiu $a3, $a3, %lo(D_80A30690) ## $a3 = 80A30690 /* 000F8 80A2F278 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 000FC 80A2F27C 02002825 */ or $a1, $s0, $zero ## $a1 = 0000023C -/* 00100 80A2F280 0C017114 */ jal func_8005C450 +/* 00100 80A2F280 0C017114 */ jal Collider_SetCylinder_Set3 /* 00104 80A2F284 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00108 80A2F288 3C1080A3 */ lui $s0, %hi(D_80A306BC) ## $s0 = 80A30000 /* 0010C 80A2F28C 3C1480A3 */ lui $s4, %hi(D_80A30740) ## $s4 = 80A30000 @@ -65,13 +65,13 @@ glabel EnGb_Init /* 00118 80A2F298 26510288 */ addiu $s1, $s2, 0x0288 ## $s1 = 00000288 .L80A2F29C: /* 0011C 80A2F29C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00120 80A2F2A0 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00120 80A2F2A0 0C0170D9 */ jal Collider_InitCylinder /* 00124 80A2F2A4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000288 /* 00128 80A2F2A8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0012C 80A2F2AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000288 /* 00130 80A2F2B0 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -/* 00134 80A2F2B4 0C017114 */ jal func_8005C450 +/* 00134 80A2F2B4 0C017114 */ jal Collider_SetCylinder_Set3 /* 00138 80A2F2B8 02003825 */ or $a3, $s0, $zero ## $a3 = 80A306BC /* 0013C 80A2F2BC 2610002C */ addiu $s0, $s0, 0x002C ## $s0 = 80A306E8 /* 00140 80A2F2C0 0214082B */ sltu $at, $s0, $s4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Update.s index ab01bfa4f8..ae8b7f890c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Update.s @@ -29,7 +29,7 @@ glabel EnGb_Update /* 00C5C 80A2FDDC 0261A021 */ addu $s4, $s3, $at /* 00C60 80A2FDE0 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 00C64 80A2FDE4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00C68 80A2FDE8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00C68 80A2FDE8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00C6C 80A2FDEC 2646023C */ addiu $a2, $s2, 0x023C ## $a2 = 0000023C /* 00C70 80A2FDF0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 @@ -38,7 +38,7 @@ glabel EnGb_Update .L80A2FDFC: /* 00C7C 80A2FDFC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00C80 80A2FE00 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 00C84 80A2FE04 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00C84 80A2FE04 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00C88 80A2FE08 02203025 */ or $a2, $s1, $zero ## $a2 = 00000288 /* 00C8C 80A2FE0C 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Destroy.s index fe35227ca8..916051572c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Destroy.s @@ -3,7 +3,7 @@ glabel EnGe1_Destroy /* 002DC 80A30C4C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 002E0 80A30C50 AFBF0014 */ sw $ra, 0x0014($sp) /* 002E4 80A30C54 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002E8 80A30C58 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002E8 80A30C58 0C0170EB */ jal Collider_DestroyCylinder /* 002EC 80A30C5C 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 002F0 80A30C60 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s index 3d94f03cca..e29936ec22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s @@ -41,14 +41,14 @@ glabel EnGe1_Init /* 00070 80A309E0 8FA40030 */ lw $a0, 0x0030($sp) /* 00074 80A309E4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00078 80A309E8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0007C 80A309EC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0007C 80A309EC 0C0170D9 */ jal Collider_InitCylinder /* 00080 80A309F0 8FA40044 */ lw $a0, 0x0044($sp) /* 00084 80A309F4 3C0780A3 */ lui $a3, %hi(D_80A32770) ## $a3 = 80A30000 /* 00088 80A309F8 8FA50030 */ lw $a1, 0x0030($sp) /* 0008C 80A309FC 24E72770 */ addiu $a3, $a3, %lo(D_80A32770) ## $a3 = 80A32770 /* 00090 80A30A00 8FA40044 */ lw $a0, 0x0044($sp) -/* 00094 80A30A04 0C01712B */ jal ActorCollider_InitCylinder +/* 00094 80A30A04 0C01712B */ jal Collider_SetCylinder /* 00098 80A30A08 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0009C 80A30A0C 3C080600 */ lui $t0, 0x0600 ## $t0 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Update.s index 38a77551e2..efe08b7ede 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Update.s @@ -7,14 +7,14 @@ glabel EnGe1_Update /* 01910 80A32280 AFBF0024 */ sw $ra, 0x0024($sp) /* 01914 80A32284 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 01918 80A32288 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 0191C 80A3228C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0191C 80A3228C 0C0189B7 */ jal Collider_CylinderUpdate /* 01920 80A32290 AFA6002C */ sw $a2, 0x002C($sp) /* 01924 80A32294 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01928 80A32298 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0192C 80A3229C 8FA6002C */ lw $a2, 0x002C($sp) /* 01930 80A322A0 02212821 */ addu $a1, $s1, $at -/* 01934 80A322A4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01934 80A322A4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01938 80A322A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0193C 80A322AC 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30F48.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30F48.s index 6a0b031008..03d72c331c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30F48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30F48.s @@ -43,7 +43,7 @@ glabel func_80A30F48 /* 0066C 80A30FDC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00670 80A30FE0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00674 80A30FE4 24E6014C */ addiu $a2, $a3, 0x014C ## $a2 = 0000014C -/* 00678 80A30FE8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00678 80A30FE8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0067C 80A30FEC 00812821 */ addu $a1, $a0, $at /* 00680 80A30FF0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A310C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A310C4.s index efa5f140c5..09c7ed88b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A310C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A310C4.s @@ -47,7 +47,7 @@ glabel func_80A310C4 /* 007F8 80A31168 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 007FC 80A3116C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00800 80A31170 24E6014C */ addiu $a2, $a3, 0x014C ## $a2 = 0000014C -/* 00804 80A31174 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00804 80A31174 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00808 80A31178 00812821 */ addu $a1, $a0, $at /* 0080C 80A3117C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Destroy.s index 443b410e85..c2e09a02f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Destroy.s @@ -3,7 +3,7 @@ glabel EnGe2_Destroy /* 002D8 80A32EA8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 002DC 80A32EAC AFBF0014 */ sw $ra, 0x0014($sp) /* 002E0 80A32EB0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002E4 80A32EB4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002E4 80A32EB4 0C0170EB */ jal Collider_DestroyCylinder /* 002E8 80A32EB8 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 002EC 80A32EBC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s index e0ed8d5c33..81df931e7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s @@ -40,14 +40,14 @@ glabel EnGe2_Init /* 00110 80A32CE0 8FA40030 */ lw $a0, 0x0030($sp) /* 00114 80A32CE4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00118 80A32CE8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0011C 80A32CEC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0011C 80A32CEC 0C0170D9 */ jal Collider_InitCylinder /* 00120 80A32CF0 8FA40044 */ lw $a0, 0x0044($sp) /* 00124 80A32CF4 3C0780A3 */ lui $a3, %hi(D_80A34310) ## $a3 = 80A30000 /* 00128 80A32CF8 8FA50030 */ lw $a1, 0x0030($sp) /* 0012C 80A32CFC 24E74310 */ addiu $a3, $a3, %lo(D_80A34310) ## $a3 = 80A34310 /* 00130 80A32D00 8FA40044 */ lw $a0, 0x0044($sp) -/* 00134 80A32D04 0C01712B */ jal ActorCollider_InitCylinder +/* 00134 80A32D04 0C01712B */ jal Collider_SetCylinder /* 00138 80A32D08 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0013C 80A32D0C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Update.s index f3b4f62d1e..9b1d4443fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Update.s @@ -124,7 +124,7 @@ glabel EnGe2_Update .L80A33FCC: /* 013FC 80A33FCC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01400 80A33FD0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01404 80A33FD4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01404 80A33FD4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01408 80A33FD8 00812821 */ addu $a1, $a0, $at .L80A33FDC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33BE8.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33BE8.s index 67184b44c3..635080b80e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A33BE8.s @@ -6,14 +6,14 @@ glabel func_80A33BE8 /* 01028 80A33BF8 AFA5003C */ sw $a1, 0x003C($sp) /* 0102C 80A33BFC 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 01030 80A33C00 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 01034 80A33C04 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01034 80A33C04 0C0189B7 */ jal Collider_CylinderUpdate /* 01038 80A33C08 AFA6002C */ sw $a2, 0x002C($sp) /* 0103C 80A33C0C 8FA4003C */ lw $a0, 0x003C($sp) /* 01040 80A33C10 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01044 80A33C14 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01048 80A33C18 8FA6002C */ lw $a2, 0x002C($sp) -/* 0104C 80A33C1C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0104C 80A33C1C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01050 80A33C20 00812821 */ addu $a1, $a0, $at /* 01054 80A33C24 3C014220 */ lui $at, 0x4220 ## $at = 42200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3402C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3402C.s index 99ecec401e..88e446051d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3402C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3402C.s @@ -6,7 +6,7 @@ glabel func_80A3402C /* 0146C 80A3403C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01470 80A34040 AFBF0024 */ sw $ra, 0x0024($sp) /* 01474 80A34044 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01478 80A34048 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01478 80A34048 0C0189B7 */ jal Collider_CylinderUpdate /* 0147C 80A3404C AFA5002C */ sw $a1, 0x002C($sp) /* 01480 80A34050 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -14,7 +14,7 @@ glabel func_80A3402C /* 01488 80A34058 02212821 */ addu $a1, $s1, $at /* 0148C 80A3405C AFA50028 */ sw $a1, 0x0028($sp) /* 01490 80A34060 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01494 80A34064 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01494 80A34064 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01498 80A34068 8FA6002C */ lw $a2, 0x002C($sp) /* 0149C 80A3406C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -57,7 +57,7 @@ glabel func_80A3402C /* 01528 80A340F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80A340FC: /* 0152C 80A340FC 8FA50028 */ lw $a1, 0x0028($sp) -/* 01530 80A34100 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01530 80A34100 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01534 80A34104 8FA6002C */ lw $a2, 0x002C($sp) /* 01538 80A34108 0C28CC28 */ jal func_80A330A0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Destroy.s index ffbfe5f5fa..264ec99b1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Destroy.s @@ -3,7 +3,7 @@ glabel EnGe3_Destroy /* 001B0 80A347D0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 001B4 80A347D4 AFBF0014 */ sw $ra, 0x0014($sp) /* 001B8 80A347D8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001BC 80A347DC 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001BC 80A347DC 0C0170EB */ jal Collider_DestroyCylinder /* 001C0 80A347E0 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 001C4 80A347E4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s index 5bbc115089..fb549e78c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s @@ -30,14 +30,14 @@ glabel EnGe3_Init /* 00110 80A34730 8FA40034 */ lw $a0, 0x0034($sp) /* 00114 80A34734 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00118 80A34738 AFA50034 */ sw $a1, 0x0034($sp) -/* 0011C 80A3473C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0011C 80A3473C 0C0170D9 */ jal Collider_InitCylinder /* 00120 80A34740 8FA40044 */ lw $a0, 0x0044($sp) /* 00124 80A34744 3C0780A3 */ lui $a3, %hi(D_80A35190) ## $a3 = 80A30000 /* 00128 80A34748 8FA50034 */ lw $a1, 0x0034($sp) /* 0012C 80A3474C 24E75190 */ addiu $a3, $a3, %lo(D_80A35190) ## $a3 = 80A35190 /* 00130 80A34750 8FA40044 */ lw $a0, 0x0044($sp) -/* 00134 80A34754 0C01712B */ jal ActorCollider_InitCylinder +/* 00134 80A34754 0C01712B */ jal Collider_SetCylinder /* 00138 80A34758 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0013C 80A3475C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34C40.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34C40.s index e52d9236b5..083167afdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34C40.s @@ -6,14 +6,14 @@ glabel func_80A34C40 /* 00630 80A34C50 AFA5003C */ sw $a1, 0x003C($sp) /* 00634 80A34C54 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 00638 80A34C58 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 0063C 80A34C5C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0063C 80A34C5C 0C0189B7 */ jal Collider_CylinderUpdate /* 00640 80A34C60 AFA6002C */ sw $a2, 0x002C($sp) /* 00644 80A34C64 8FA4003C */ lw $a0, 0x003C($sp) /* 00648 80A34C68 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0064C 80A34C6C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00650 80A34C70 8FA6002C */ lw $a2, 0x002C($sp) -/* 00654 80A34C74 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00654 80A34C74 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00658 80A34C78 00812821 */ addu $a1, $a0, $at /* 0065C 80A34C7C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Destroy.s index 311a0c4e53..6510d33433 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Destroy.s @@ -10,16 +10,16 @@ glabel EnGeldB_Destroy /* 00248 80A35558 8DC5031C */ lw $a1, 0x031C($t6) ## 0000031C /* 0024C 80A3555C 8FA50018 */ lw $a1, 0x0018($sp) /* 00250 80A35560 8FA4001C */ lw $a0, 0x001C($sp) -/* 00254 80A35564 0C017232 */ jal func_8005C8C8 +/* 00254 80A35564 0C017232 */ jal Collider_DestroyTris /* 00258 80A35568 24A503EC */ addiu $a1, $a1, 0x03EC ## $a1 = 000003EC /* 0025C 80A3556C 8FA50018 */ lw $a1, 0x0018($sp) /* 00260 80A35570 8FA4001C */ lw $a0, 0x001C($sp) -/* 00264 80A35574 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00264 80A35574 0C0170EB */ jal Collider_DestroyCylinder /* 00268 80A35578 24A50320 */ addiu $a1, $a1, 0x0320 ## $a1 = 00000320 /* 0026C 80A3557C 8FA50018 */ lw $a1, 0x0018($sp) /* 00270 80A35580 8FA4001C */ lw $a0, 0x001C($sp) -/* 00274 80A35584 0C017418 */ jal func_8005D060 +/* 00274 80A35584 0C017418 */ jal Collider_DestroyQuad /* 00278 80A35588 24A5036C */ addiu $a1, $a1, 0x036C ## $a1 = 0000036C /* 0027C 80A3558C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00280 80A35590 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s index 0073d87910..b442ff60e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s @@ -55,19 +55,19 @@ glabel EnGeldB_Init /* 000D4 80A353E4 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 /* 000D8 80A353E8 26050320 */ addiu $a1, $s0, 0x0320 ## $a1 = 00000320 /* 000DC 80A353EC AFA50030 */ sw $a1, 0x0030($sp) -/* 000E0 80A353F0 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000E0 80A353F0 0C0170D9 */ jal Collider_InitCylinder /* 000E4 80A353F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000E8 80A353F8 3C0780A4 */ lui $a3, %hi(D_80A39FE0) ## $a3 = 80A40000 /* 000EC 80A353FC 8FA50030 */ lw $a1, 0x0030($sp) /* 000F0 80A35400 24E79FE0 */ addiu $a3, $a3, %lo(D_80A39FE0) ## $a3 = 80A39FE0 /* 000F4 80A35404 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000F8 80A35408 0C01712B */ jal ActorCollider_InitCylinder +/* 000F8 80A35408 0C01712B */ jal Collider_SetCylinder /* 000FC 80A3540C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00100 80A35410 260503EC */ addiu $a1, $s0, 0x03EC ## $a1 = 000003EC /* 00104 80A35414 AFA50030 */ sw $a1, 0x0030($sp) -/* 00108 80A35418 0C0171F8 */ jal func_8005C7E0 +/* 00108 80A35418 0C0171F8 */ jal Collider_InitTris /* 0010C 80A3541C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00110 80A35420 3C0780A4 */ lui $a3, %hi(D_80A3A084) ## $a3 = 80A40000 /* 00114 80A35424 260B040C */ addiu $t3, $s0, 0x040C ## $t3 = 0000040C @@ -75,17 +75,17 @@ glabel EnGeldB_Init /* 0011C 80A3542C AFAB0010 */ sw $t3, 0x0010($sp) /* 00120 80A35430 24E7A084 */ addiu $a3, $a3, %lo(D_80A3A084) ## $a3 = 80A3A084 /* 00124 80A35434 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00128 80A35438 0C0172EB */ jal func_8005CBAC +/* 00128 80A35438 0C0172EB */ jal Collider_SetTris /* 0012C 80A3543C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00130 80A35440 2605036C */ addiu $a1, $s0, 0x036C ## $a1 = 0000036C /* 00134 80A35444 AFA50030 */ sw $a1, 0x0030($sp) -/* 00138 80A35448 0C017406 */ jal func_8005D018 +/* 00138 80A35448 0C017406 */ jal Collider_InitQuad /* 0013C 80A3544C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00140 80A35450 3C0780A4 */ lui $a3, %hi(D_80A3A094) ## $a3 = 80A40000 /* 00144 80A35454 8FA50030 */ lw $a1, 0x0030($sp) /* 00148 80A35458 24E7A094 */ addiu $a3, $a3, %lo(D_80A3A094) ## $a3 = 80A3A094 /* 0014C 80A3545C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00150 80A35460 0C017441 */ jal func_8005D104 +/* 00150 80A35460 0C017441 */ jal Collider_SetQuad /* 00154 80A35464 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00158 80A35468 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF /* 0015C 80A3546C 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Update.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Update.s index 37b360d85b..79c814fd02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Update.s @@ -50,7 +50,7 @@ glabel EnGeldB_Update /* 0423C 80A3954C 26050320 */ addiu $a1, $s0, 0x0320 ## $a1 = 00000320 .L80A39550: /* 04240 80A39550 AFA5002C */ sw $a1, 0x002C($sp) -/* 04244 80A39554 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 04244 80A39554 0C0189B7 */ jal Collider_CylinderUpdate /* 04248 80A39558 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0424C 80A3955C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -58,7 +58,7 @@ glabel EnGeldB_Update /* 04254 80A39564 02212821 */ addu $a1, $s1, $at /* 04258 80A39568 AFA50034 */ sw $a1, 0x0034($sp) /* 0425C 80A3956C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 04260 80A39570 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 04260 80A39570 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 04264 80A39574 8FA6002C */ lw $a2, 0x002C($sp) /* 04268 80A39578 8E0202EC */ lw $v0, 0x02EC($s0) ## 000002EC @@ -79,7 +79,7 @@ glabel EnGeldB_Update /* 042A4 80A395B4 55800005 */ bnel $t4, $zero, .L80A395CC /* 042A8 80A395B8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 .L80A395BC: -/* 042AC 80A395BC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 042AC 80A395BC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 042B0 80A395C0 8FA6002C */ lw $a2, 0x002C($sp) /* 042B4 80A395C4 8E0202EC */ lw $v0, 0x02EC($s0) ## 000002EC @@ -95,7 +95,7 @@ glabel EnGeldB_Update /* 042D8 80A395E8 00000000 */ nop /* 042DC 80A395EC 45020004 */ bc1fl .L80A39600 /* 042E0 80A395F0 860D0310 */ lh $t5, 0x0310($s0) ## 00000310 -/* 042E4 80A395F4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 042E4 80A395F4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 042E8 80A395F8 260603EC */ addiu $a2, $s0, 0x03EC ## $a2 = 000003EC /* 042EC 80A395FC 860D0310 */ lh $t5, 0x0310($s0) ## 00000310 @@ -104,7 +104,7 @@ glabel EnGeldB_Update /* 042F4 80A39604 8FA50034 */ lw $a1, 0x0034($sp) /* 042F8 80A39608 59A00004 */ blezl $t5, .L80A3961C /* 042FC 80A3960C 9202031A */ lbu $v0, 0x031A($s0) ## 0000031A -/* 04300 80A39610 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 04300 80A39610 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 04304 80A39614 2606036C */ addiu $a2, $s0, 0x036C ## $a2 = 0000036C /* 04308 80A39618 9202031A */ lbu $v0, 0x031A($s0) ## 0000031A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Destroy.s index 5660cc22a5..3faeab2c33 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/EnGm_Destroy.s @@ -3,7 +3,7 @@ glabel EnGm_Destroy /* 000C4 80A3D7A4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 000C8 80A3D7A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 000CC 80A3D7AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000D0 80A3D7B0 0C0170EB */ jal ActorCollider_FreeCylinder +/* 000D0 80A3D7B0 0C0170EB */ jal Collider_DestroyCylinder /* 000D4 80A3D7B4 24C50270 */ addiu $a1, $a2, 0x0270 ## $a1 = 00000270 /* 000D8 80A3D7B8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s index 24f6894b51..3ccedca561 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s @@ -63,14 +63,14 @@ glabel func_80A3D838 /* 00240 80A3D920 AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 /* 00244 80A3D924 26050270 */ addiu $a1, $s0, 0x0270 ## $a1 = 00000270 /* 00248 80A3D928 AFA50030 */ sw $a1, 0x0030($sp) -/* 0024C 80A3D92C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0024C 80A3D92C 0C0170D9 */ jal Collider_InitCylinder /* 00250 80A3D930 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00254 80A3D934 3C0780A4 */ lui $a3, %hi(D_80A3E350) ## $a3 = 80A40000 /* 00258 80A3D938 8FA50030 */ lw $a1, 0x0030($sp) /* 0025C 80A3D93C 24E7E350 */ addiu $a3, $a3, %lo(D_80A3E350) ## $a3 = 80A3E350 /* 00260 80A3D940 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00264 80A3D944 0C017114 */ jal func_8005C450 +/* 00264 80A3D944 0C017114 */ jal Collider_SetCylinder_Set3 /* 00268 80A3D948 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0026C 80A3D94C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 00270 80A3D950 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DFBC.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DFBC.s index ed2b584c6d..9e87c19678 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DFBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3DFBC.s @@ -37,7 +37,7 @@ glabel func_80A3DFBC /* 00964 80A3E044 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00968 80A3E048 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0096C 80A3E04C 26060270 */ addiu $a2, $s0, 0x0270 ## $a2 = 00000270 -/* 00970 80A3E050 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00970 80A3E050 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00974 80A3E054 00812821 */ addu $a1, $a0, $at /* 00978 80A3E058 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s index 7521e1f95a..78bdd349f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s @@ -7,7 +7,7 @@ glabel EnGo_Destroy /* 01920 80A3FE90 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01924 80A3FE94 8FA50018 */ lw $a1, 0x0018($sp) /* 01928 80A3FE98 8FA4001C */ lw $a0, 0x001C($sp) -/* 0192C 80A3FE9C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0192C 80A3FE9C 0C0170EB */ jal Collider_DestroyCylinder /* 01930 80A3FEA0 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 /* 01934 80A3FEA4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s index ace2459645..76e304f5ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s @@ -40,17 +40,17 @@ glabel EnGo_Init /* 01650 80A3FBC0 AFA00018 */ sw $zero, 0x0018($sp) /* 01654 80A3FBC4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 01658 80A3FBC8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0165C 80A3FBCC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0165C 80A3FBCC 0C0170D9 */ jal Collider_InitCylinder /* 01660 80A3FBD0 8FA4005C */ lw $a0, 0x005C($sp) /* 01664 80A3FBD4 3C0780A4 */ lui $a3, %hi(D_80A41B00) ## $a3 = 80A40000 /* 01668 80A3FBD8 8FA50030 */ lw $a1, 0x0030($sp) /* 0166C 80A3FBDC 24E71B00 */ addiu $a3, $a3, %lo(D_80A41B00) ## $a3 = 80A41B00 /* 01670 80A3FBE0 8FA4005C */ lw $a0, 0x005C($sp) -/* 01674 80A3FBE4 0C01712B */ jal ActorCollider_InitCylinder +/* 01674 80A3FBE4 0C01712B */ jal Collider_SetCylinder /* 01678 80A3FBE8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0167C 80A3FBEC 0C016C80 */ jal CollisionBtlTbl_Get +/* 0167C 80A3FBEC 0C016C80 */ jal DamageTable_Get /* 01680 80A3FBF0 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 01684 80A3FBF4 3C0680A4 */ lui $a2, %hi(D_80A41B2C) ## $a2 = 80A40000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Update.s index 48f1a1305e..30dc24e402 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Update.s @@ -7,14 +7,14 @@ glabel EnGo_Update /* 028F0 80A40E60 AFBF0024 */ sw $ra, 0x0024($sp) /* 028F4 80A40E64 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 028F8 80A40E68 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 028FC 80A40E6C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 028FC 80A40E6C 0C0189B7 */ jal Collider_CylinderUpdate /* 02900 80A40E70 AFA6002C */ sw $a2, 0x002C($sp) /* 02904 80A40E74 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02908 80A40E78 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0290C 80A40E7C 8FA6002C */ lw $a2, 0x002C($sp) /* 02910 80A40E80 02212821 */ addu $a1, $s1, $at -/* 02914 80A40E84 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02914 80A40E84 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02918 80A40E88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0291C 80A40E8C 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s index 39e77b0bce..c9568a1702 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s @@ -26,14 +26,14 @@ glabel EnGo2_Init /* 037F8 80A46528 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 037FC 80A4652C 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC /* 03800 80A46530 AFA50030 */ sw $a1, 0x0030($sp) -/* 03804 80A46534 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 03804 80A46534 0C0170D9 */ jal Collider_InitCylinder /* 03808 80A46538 8FA40044 */ lw $a0, 0x0044($sp) /* 0380C 80A4653C 3C0780A5 */ lui $a3, %hi(D_80A48114) ## $a3 = 80A50000 /* 03810 80A46540 8FA50030 */ lw $a1, 0x0030($sp) /* 03814 80A46544 24E78114 */ addiu $a3, $a3, %lo(D_80A48114) ## $a3 = 80A48114 /* 03818 80A46548 8FA40044 */ lw $a0, 0x0044($sp) -/* 0381C 80A4654C 0C01712B */ jal ActorCollider_InitCylinder +/* 0381C 80A4654C 0C01712B */ jal Collider_SetCylinder /* 03820 80A46550 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 03824 80A46554 3C0680A5 */ lui $a2, %hi(D_80A48140) ## $a2 = 80A50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s index b1ccb16f46..576bd25b11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44940.s @@ -78,12 +78,12 @@ glabel func_80A44940 /* 01D38 80A44A68 95AF0004 */ lhu $t7, 0x0004($t5) ## FFFFFFFC /* 01D3C 80A44A6C A4EF0206 */ sh $t7, 0x0206($a3) ## 00000206 /* 01D40 80A44A70 AFA60018 */ sw $a2, 0x0018($sp) -/* 01D44 80A44A74 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01D44 80A44A74 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01D48 80A44A78 AFA5001C */ sw $a1, 0x001C($sp) /* 01D4C 80A44A7C 8FA5001C */ lw $a1, 0x001C($sp) /* 01D50 80A44A80 8FA60018 */ lw $a2, 0x0018($sp) -/* 01D54 80A44A84 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01D54 80A44A84 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01D58 80A44A88 8FA40034 */ lw $a0, 0x0034($sp) /* 01D5C 80A44A8C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Destroy.s index 045ad2a590..3b8cb4ae07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Destroy.s @@ -8,12 +8,12 @@ glabel EnGoma_Destroy /* 003A0 80A49260 29C1000A */ slti $at, $t6, 0x000A /* 003A4 80A49264 10200007 */ beq $at, $zero, .L80A49284 /* 003A8 80A49268 24C5030C */ addiu $a1, $a2, 0x030C ## $a1 = 0000030C -/* 003AC 80A4926C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 003AC 80A4926C 0C0170EB */ jal Collider_DestroyCylinder /* 003B0 80A49270 AFA60018 */ sw $a2, 0x0018($sp) /* 003B4 80A49274 8FA60018 */ lw $a2, 0x0018($sp) /* 003B8 80A49278 8FA4001C */ lw $a0, 0x001C($sp) -/* 003BC 80A4927C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 003BC 80A4927C 0C0170EB */ jal Collider_DestroyCylinder /* 003C0 80A49280 24C50358 */ addiu $a1, $a2, 0x0358 ## $a1 = 00000358 .L80A49284: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s index 0f87051a65..f26b516030 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s @@ -255,26 +255,26 @@ glabel EnGoma_Init /* 00320 80A491E0 2605030C */ addiu $a1, $s0, 0x030C ## $a1 = 0000030C /* 00324 80A491E4 E61002D8 */ swc1 $f16, 0x02D8($s0) ## 000002D8 /* 00328 80A491E8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0032C 80A491EC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0032C 80A491EC 0C0170D9 */ jal Collider_InitCylinder /* 00330 80A491F0 8FA40044 */ lw $a0, 0x0044($sp) /* 00334 80A491F4 3C0780A5 */ lui $a3, %hi(D_80A4B7A0) ## $a3 = 80A50000 /* 00338 80A491F8 8FA50034 */ lw $a1, 0x0034($sp) /* 0033C 80A491FC 24E7B7A0 */ addiu $a3, $a3, %lo(D_80A4B7A0) ## $a3 = 80A4B7A0 /* 00340 80A49200 8FA40044 */ lw $a0, 0x0044($sp) -/* 00344 80A49204 0C01712B */ jal ActorCollider_InitCylinder +/* 00344 80A49204 0C01712B */ jal Collider_SetCylinder /* 00348 80A49208 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0034C 80A4920C 26050358 */ addiu $a1, $s0, 0x0358 ## $a1 = 00000358 /* 00350 80A49210 AFA50034 */ sw $a1, 0x0034($sp) -/* 00354 80A49214 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00354 80A49214 0C0170D9 */ jal Collider_InitCylinder /* 00358 80A49218 8FA40044 */ lw $a0, 0x0044($sp) /* 0035C 80A4921C 3C0780A5 */ lui $a3, %hi(D_80A4B7CC) ## $a3 = 80A50000 /* 00360 80A49220 8FA50034 */ lw $a1, 0x0034($sp) /* 00364 80A49224 24E7B7CC */ addiu $a3, $a3, %lo(D_80A4B7CC) ## $a3 = 80A4B7CC /* 00368 80A49228 8FA40044 */ lw $a0, 0x0044($sp) -/* 0036C 80A4922C 0C01712B */ jal ActorCollider_InitCylinder +/* 0036C 80A4922C 0C01712B */ jal Collider_SetCylinder /* 00370 80A49230 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 .L80A49234: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Update.s index a04e85cf0b..e1120ec397 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Update.s @@ -142,12 +142,12 @@ glabel EnGoma_Update /* 01D8C 80A4AC4C 2605030C */ addiu $a1, $s0, 0x030C ## $a1 = 0000030C /* 01D90 80A4AC50 55000017 */ bnel $t0, $zero, .L80A4ACB0 /* 01D94 80A4AC54 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01D98 80A4AC58 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01D98 80A4AC58 0C0189B7 */ jal Collider_CylinderUpdate /* 01D9C 80A4AC5C AFA5002C */ sw $a1, 0x002C($sp) /* 01DA0 80A4AC60 26050358 */ addiu $a1, $s0, 0x0358 ## $a1 = 00000358 /* 01DA4 80A4AC64 AFA50028 */ sw $a1, 0x0028($sp) -/* 01DA8 80A4AC68 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01DA8 80A4AC68 0C0189B7 */ jal Collider_CylinderUpdate /* 01DAC 80A4AC6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01DB0 80A4AC70 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -155,17 +155,17 @@ glabel EnGoma_Update /* 01DB8 80A4AC78 02212821 */ addu $a1, $s1, $at /* 01DBC 80A4AC7C AFA50030 */ sw $a1, 0x0030($sp) /* 01DC0 80A4AC80 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01DC4 80A4AC84 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01DC4 80A4AC84 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01DC8 80A4AC88 8FA6002C */ lw $a2, 0x002C($sp) /* 01DCC 80A4AC8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01DD0 80A4AC90 8FA50030 */ lw $a1, 0x0030($sp) -/* 01DD4 80A4AC94 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01DD4 80A4AC94 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01DD8 80A4AC98 8FA60028 */ lw $a2, 0x0028($sp) /* 01DDC 80A4AC9C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01DE0 80A4ACA0 8FA50030 */ lw $a1, 0x0030($sp) -/* 01DE4 80A4ACA4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01DE4 80A4ACA4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01DE8 80A4ACA8 8FA6002C */ lw $a2, 0x002C($sp) .L80A4ACAC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Destroy.s index 6b70f4d69e..d10bc89f8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Destroy.s @@ -3,7 +3,7 @@ glabel EnGoroiwa_Destroy /* 0191C 80A4D5BC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01920 80A4D5C0 AFBF0014 */ sw $ra, 0x0014($sp) /* 01924 80A4D5C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01928 80A4D5C8 0C016F32 */ jal func_8005BCC8 +/* 01928 80A4D5C8 0C016F32 */ jal Collider_DestroyJntSph /* 0192C 80A4D5CC 24E50150 */ addiu $a1, $a3, 0x0150 ## $a1 = 00000150 /* 01930 80A4D5D0 8FBF0014 */ lw $ra, 0x0014($sp) /* 01934 80A4D5D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Update.s index 0a573ed3b0..3ad149204c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Update.s @@ -72,7 +72,7 @@ glabel EnGoroiwa_Update /* 02130 80A4DDD0 1D600005 */ bgtz $t3, .L80A4DDE8 /* 02134 80A4DDD4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02138 80A4DDD8 02212821 */ addu $a1, $s1, $at -/* 0213C 80A4DDDC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0213C 80A4DDDC 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 02140 80A4DDE0 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 /* 02144 80A4DDE4 920201D3 */ lbu $v0, 0x01D3($s0) ## 000001D3 @@ -87,7 +87,7 @@ glabel EnGoroiwa_Update /* 02160 80A4DE00 1DA00004 */ bgtz $t5, .L80A4DE14 /* 02164 80A4DE04 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02168 80A4DE08 02212821 */ addu $a1, $s1, $at -/* 0216C 80A4DE0C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0216C 80A4DE0C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02170 80A4DE10 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 .L80A4DE14: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD04.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD04.s index 60e9a15e50..d94e86364e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD04.s @@ -6,7 +6,7 @@ glabel func_80A4BD04 /* 00074 80A4BD14 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00078 80A4BD18 AFBF0024 */ sw $ra, 0x0024($sp) /* 0007C 80A4BD1C 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00080 80A4BD20 0C016EFE */ jal func_8005BBF8 +/* 00080 80A4BD20 0C016EFE */ jal Collider_InitJntSph /* 00084 80A4BD24 AFA50028 */ sw $a1, 0x0028($sp) /* 00088 80A4BD28 3C0780A5 */ lui $a3, %hi(D_80A4DEA4) ## $a3 = 80A50000 /* 0008C 80A4BD2C 260E0170 */ addiu $t6, $s0, 0x0170 ## $t6 = 00000170 @@ -14,7 +14,7 @@ glabel func_80A4BD04 /* 00094 80A4BD34 AFAE0010 */ sw $t6, 0x0010($sp) /* 00098 80A4BD38 24E7DEA4 */ addiu $a3, $a3, %lo(D_80A4DEA4) ## $a3 = 80A4DEA4 /* 0009C 80A4BD3C 8FA40034 */ lw $a0, 0x0034($sp) -/* 000A0 80A4BD40 0C017014 */ jal func_8005C050 +/* 000A0 80A4BD40 0C017014 */ jal Collider_SetJntSph /* 000A4 80A4BD44 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000A8 80A4BD48 0C292F28 */ jal func_80A4BCA0 /* 000AC 80A4BD4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Init.s index 7e95cb75ad..c75ec2adab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Init.s @@ -10,14 +10,14 @@ glabel EnGs_Init /* 0001C 80A4E33C 24A5FDF8 */ addiu $a1, $a1, %lo(D_80A4FDF8) ## $a1 = 80A4FDF8 /* 00020 80A4E340 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00024 80A4E344 AFA50020 */ sw $a1, 0x0020($sp) -/* 00028 80A4E348 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00028 80A4E348 0C0170D9 */ jal Collider_InitCylinder /* 0002C 80A4E34C 8FA4002C */ lw $a0, 0x002C($sp) /* 00030 80A4E350 3C0780A5 */ lui $a3, %hi(D_80A4FDA0) ## $a3 = 80A50000 /* 00034 80A4E354 8FA50020 */ lw $a1, 0x0020($sp) /* 00038 80A4E358 24E7FDA0 */ addiu $a3, $a3, %lo(D_80A4FDA0) ## $a3 = 80A4FDA0 /* 0003C 80A4E35C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00040 80A4E360 0C01712B */ jal ActorCollider_InitCylinder +/* 00040 80A4E360 0C01712B */ jal Collider_SetCylinder /* 00044 80A4E364 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00048 80A4E368 3C0580A5 */ lui $a1, %hi(D_80A4FDD8) ## $a1 = 80A50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Update.s index 8ea70aa8ea..034d3968d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Update.s @@ -91,7 +91,7 @@ glabel L80A4F8F8 /* 015F8 80A4F918 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C .L80A4F91C: /* 015FC 80A4F91C AFA50020 */ sw $a1, 0x0020($sp) -/* 01600 80A4F920 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01600 80A4F920 0C0189B7 */ jal Collider_CylinderUpdate /* 01604 80A4F924 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01608 80A4F928 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -99,12 +99,12 @@ glabel L80A4F8F8 /* 01610 80A4F930 02212821 */ addu $a1, $s1, $at /* 01614 80A4F934 AFA50024 */ sw $a1, 0x0024($sp) /* 01618 80A4F938 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0161C 80A4F93C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0161C 80A4F93C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01620 80A4F940 8FA60020 */ lw $a2, 0x0020($sp) /* 01624 80A4F944 8FA50024 */ lw $a1, 0x0024($sp) /* 01628 80A4F948 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0162C 80A4F94C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0162C 80A4F94C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01630 80A4F950 8FA60020 */ lw $a2, 0x0020($sp) /* 01634 80A4F954 8E190198 */ lw $t9, 0x0198($s0) ## 00000198 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Destroy.s index c51e7f066f..3b9a906ab2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Destroy.s @@ -3,7 +3,7 @@ glabel EnGuest_Destroy /* 000B8 80A502D8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 000BC 80A502DC AFBF0014 */ sw $ra, 0x0014($sp) /* 000C0 80A502E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000C4 80A502E4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 000C4 80A502E4 0C0170EB */ jal Collider_DestroyCylinder /* 000C8 80A502E8 24C50254 */ addiu $a1, $a2, 0x0254 ## $a1 = 00000254 /* 000CC 80A502EC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s index e7cd263a58..1039422954 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s @@ -71,14 +71,14 @@ glabel EnGuest_Update /* 001E0 80A50400 AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 /* 001E4 80A50404 26050254 */ addiu $a1, $s0, 0x0254 ## $a1 = 00000254 /* 001E8 80A50408 AFA50030 */ sw $a1, 0x0030($sp) -/* 001EC 80A5040C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 001EC 80A5040C 0C0170D9 */ jal Collider_InitCylinder /* 001F0 80A50410 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001F4 80A50414 3C0780A5 */ lui $a3, %hi(D_80A50B70) ## $a3 = 80A50000 /* 001F8 80A50418 8FA50030 */ lw $a1, 0x0030($sp) /* 001FC 80A5041C 24E70B70 */ addiu $a3, $a3, %lo(D_80A50B70) ## $a3 = 80A50B70 /* 00200 80A50420 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00204 80A50424 0C017114 */ jal func_8005C450 +/* 00204 80A50424 0C017114 */ jal Collider_SetCylinder_Set3 /* 00208 80A50428 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0020C 80A5042C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00210 80A50430 0C00B56E */ jal Actor_SetHeight diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A505CC.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A505CC.s index 7e328d5ad2..8340aa9f9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A505CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A505CC.s @@ -69,14 +69,14 @@ glabel func_80A505CC /* 004A8 80A506C8 26060254 */ addiu $a2, $s0, 0x0254 ## $a2 = 00000254 /* 004AC 80A506CC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000254 /* 004B0 80A506D0 AFA60020 */ sw $a2, 0x0020($sp) -/* 004B4 80A506D4 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 004B4 80A506D4 0C0189B7 */ jal Collider_CylinderUpdate /* 004B8 80A506D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004BC 80A506DC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 004C0 80A506E0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 004C4 80A506E4 8FA60020 */ lw $a2, 0x0020($sp) /* 004C8 80A506E8 02212821 */ addu $a1, $s1, $at -/* 004CC 80A506EC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 004CC 80A506EC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 004D0 80A506F0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 004D4 80A506F4 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Destroy.s index 5a69d51b20..4c00cc7963 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Destroy.s @@ -10,7 +10,7 @@ glabel EnHeishi2_Destroy /* 0030C 80A531AC 51E00004 */ beql $t7, $zero, .L80A531C0 /* 00310 80A531B0 8FBF0014 */ lw $ra, 0x0014($sp) .L80A531B4: -/* 00314 80A531B4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00314 80A531B4 0C0170EB */ jal Collider_DestroyCylinder /* 00318 80A531B8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 0031C 80A531BC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s index 823e2722a7..1825d9be33 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s @@ -112,7 +112,7 @@ glabel EnHeishi2_Init /* 00114 80A52FB4 AE0C0278 */ sw $t4, 0x0278($s0) ## 00000278 /* 00118 80A52FB8 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 /* 0011C 80A52FBC 8FA40044 */ lw $a0, 0x0044($sp) -/* 00120 80A52FC0 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00120 80A52FC0 0C0170EB */ jal Collider_DestroyCylinder /* 00124 80A52FC4 26050398 */ addiu $a1, $s0, 0x0398 ## $a1 = 00000398 /* 00128 80A52FC8 8FA40044 */ lw $a0, 0x0044($sp) @@ -152,14 +152,14 @@ glabel EnHeishi2_Init /* 001A4 80A53044 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 001A8 80A53048 26050398 */ addiu $a1, $s0, 0x0398 ## $a1 = 00000398 /* 001AC 80A5304C AFA50030 */ sw $a1, 0x0030($sp) -/* 001B0 80A53050 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 001B0 80A53050 0C0170D9 */ jal Collider_InitCylinder /* 001B4 80A53054 8FA40044 */ lw $a0, 0x0044($sp) /* 001B8 80A53058 3C0780A5 */ lui $a3, %hi(D_80A54F10) ## $a3 = 80A50000 /* 001BC 80A5305C 24E74F10 */ addiu $a3, $a3, %lo(D_80A54F10) ## $a3 = 80A54F10 /* 001C0 80A53060 8FA40044 */ lw $a0, 0x0044($sp) /* 001C4 80A53064 8FA50030 */ lw $a1, 0x0030($sp) -/* 001C8 80A53068 0C01712B */ jal ActorCollider_InitCylinder +/* 001C8 80A53068 0C01712B */ jal Collider_SetCylinder /* 001CC 80A5306C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001D0 80A53070 860202FE */ lh $v0, 0x02FE($s0) ## 000002FE @@ -203,7 +203,7 @@ glabel EnHeishi2_Init /* 00258 80A530F8 24844F80 */ addiu $a0, $a0, %lo(D_80A54F80) ## $a0 = 80A54F80 /* 0025C 80A530FC 8FA40044 */ lw $a0, 0x0044($sp) -/* 00260 80A53100 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00260 80A53100 0C0170EB */ jal Collider_DestroyCylinder /* 00264 80A53104 8FA50030 */ lw $a1, 0x0030($sp) /* 00268 80A53108 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Update.s index 4c650c9d47..7b5b220eb3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Update.s @@ -75,14 +75,14 @@ glabel EnHeishi2_Update /* 01CE0 80A54B80 26060398 */ addiu $a2, $s0, 0x0398 ## $a2 = 00000398 /* 01CE4 80A54B84 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000398 /* 01CE8 80A54B88 AFA60034 */ sw $a2, 0x0034($sp) -/* 01CEC 80A54B8C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01CEC 80A54B8C 0C0189B7 */ jal Collider_CylinderUpdate /* 01CF0 80A54B90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01CF4 80A54B94 8FA4004C */ lw $a0, 0x004C($sp) /* 01CF8 80A54B98 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01CFC 80A54B9C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01D00 80A54BA0 8FA60034 */ lw $a2, 0x0034($sp) -/* 01D04 80A54BA4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01D04 80A54BA4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01D08 80A54BA8 00812821 */ addu $a1, $a0, $at .L80A54BAC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Destroy.s index 031d4c6a16..6869808e31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Destroy.s @@ -3,7 +3,7 @@ glabel EnHeishi3_Destroy /* 0013C 80A5577C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00140 80A55780 AFBF0014 */ sw $ra, 0x0014($sp) /* 00144 80A55784 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00148 80A55788 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00148 80A55788 0C0170EB */ jal Collider_DestroyCylinder /* 0014C 80A5578C 24C5027C */ addiu $a1, $a2, 0x027C ## $a1 = 0000027C /* 00150 80A55790 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Init.s index 969f7be2d8..c932efe070 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Init.s @@ -60,14 +60,14 @@ glabel EnHeishi3_Init /* 000BC 80A556FC A20B001F */ sb $t3, 0x001F($s0) ## 0000001F /* 000C0 80A55700 2605027C */ addiu $a1, $s0, 0x027C ## $a1 = 0000027C /* 000C4 80A55704 AFA50030 */ sw $a1, 0x0030($sp) -/* 000C8 80A55708 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000C8 80A55708 0C0170D9 */ jal Collider_InitCylinder /* 000CC 80A5570C 8FA4003C */ lw $a0, 0x003C($sp) /* 000D0 80A55710 3C0780A5 */ lui $a3, %hi(D_80A55F64) ## $a3 = 80A50000 /* 000D4 80A55714 8FA50030 */ lw $a1, 0x0030($sp) /* 000D8 80A55718 24E75F64 */ addiu $a3, $a3, %lo(D_80A55F64) ## $a3 = 80A55F64 /* 000DC 80A5571C 8FA4003C */ lw $a0, 0x003C($sp) -/* 000E0 80A55720 0C01712B */ jal ActorCollider_InitCylinder +/* 000E0 80A55720 0C01712B */ jal Collider_SetCylinder /* 000E4 80A55724 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000E8 80A55728 3C0480A5 */ lui $a0, %hi(D_80A55F90) ## $a0 = 80A50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Update.s index c173aa82b9..a147d08ea5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/EnHeishi3_Update.s @@ -44,14 +44,14 @@ glabel EnHeishi3_Update /* 00808 80A55E48 2606027C */ addiu $a2, $s0, 0x027C ## $a2 = 0000027C /* 0080C 80A55E4C 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000027C /* 00810 80A55E50 AFA6002C */ sw $a2, 0x002C($sp) -/* 00814 80A55E54 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00814 80A55E54 0C0189B7 */ jal Collider_CylinderUpdate /* 00818 80A55E58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0081C 80A55E5C 8FA4003C */ lw $a0, 0x003C($sp) /* 00820 80A55E60 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00824 80A55E64 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00828 80A55E68 8FA6002C */ lw $a2, 0x002C($sp) -/* 0082C 80A55E6C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0082C 80A55E6C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00830 80A55E70 00812821 */ addu $a1, $a0, $at /* 00834 80A55E74 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Destroy.s index 690af7b118..111a581089 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Destroy.s @@ -3,7 +3,7 @@ glabel EnHeishi4_Destroy /* 00234 80A56304 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00238 80A56308 AFBF0014 */ sw $ra, 0x0014($sp) /* 0023C 80A5630C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00240 80A56310 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00240 80A56310 0C0170EB */ jal Collider_DestroyCylinder /* 00244 80A56314 24C502BC */ addiu $a1, $a2, 0x02BC ## $a1 = 000002BC /* 00248 80A56318 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Init.s index 8d63694942..18b026ac7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Init.s @@ -101,14 +101,14 @@ glabel EnHeishi4_Init /* 0011C 80A561EC 260502BC */ addiu $a1, $s0, 0x02BC ## $a1 = 000002BC .L80A561F0: /* 00120 80A561F0 AFA50034 */ sw $a1, 0x0034($sp) -/* 00124 80A561F4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00124 80A561F4 0C0170D9 */ jal Collider_InitCylinder /* 00128 80A561F8 8FA40044 */ lw $a0, 0x0044($sp) /* 0012C 80A561FC 3C0780A5 */ lui $a3, %hi(D_80A56EF8) ## $a3 = 80A50000 /* 00130 80A56200 8FA50034 */ lw $a1, 0x0034($sp) /* 00134 80A56204 24E76EF8 */ addiu $a3, $a3, %lo(D_80A56EF8) ## $a3 = 80A56EF8 /* 00138 80A56208 8FA40044 */ lw $a0, 0x0044($sp) -/* 0013C 80A5620C 0C01712B */ jal ActorCollider_InitCylinder +/* 0013C 80A5620C 0C01712B */ jal Collider_SetCylinder /* 00140 80A56210 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00144 80A56214 86020280 */ lh $v0, 0x0280($s0) ## 00000280 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Update.s index 0cf2bf28c9..0fd55e239b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/EnHeishi4_Update.s @@ -78,14 +78,14 @@ glabel EnHeishi4_Update /* 00D04 80A56DD4 260602BC */ addiu $a2, $s0, 0x02BC ## $a2 = 000002BC /* 00D08 80A56DD8 00C02825 */ or $a1, $a2, $zero ## $a1 = 000002BC /* 00D0C 80A56DDC AFA60028 */ sw $a2, 0x0028($sp) -/* 00D10 80A56DE0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00D10 80A56DE0 0C0189B7 */ jal Collider_CylinderUpdate /* 00D14 80A56DE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00D18 80A56DE8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00D1C 80A56DEC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00D20 80A56DF0 8FA60028 */ lw $a2, 0x0028($sp) /* 00D24 80A56DF4 02212821 */ addu $a1, $s1, $at -/* 00D28 80A56DF8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00D28 80A56DF8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00D2C 80A56DFC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00D30 80A56E00 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Destroy.s index a168e93766..d19a5383a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Destroy.s @@ -6,7 +6,7 @@ glabel EnHintnuts_Destroy /* 001AC 80A573AC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 001B0 80A573B0 11C10003 */ beq $t6, $at, .L80A573C0 /* 001B4 80A573B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001B8 80A573B8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001B8 80A573B8 0C0170EB */ jal Collider_DestroyCylinder /* 001BC 80A573BC 24C50214 */ addiu $a1, $a2, 0x0214 ## $a1 = 00000214 .L80A573C0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s index 01ac7c7d93..58efe2c71e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s @@ -41,14 +41,14 @@ glabel EnHintnuts_Init /* 0008C 80A5728C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00090 80A57290 26050214 */ addiu $a1, $s0, 0x0214 ## $a1 = 00000214 /* 00094 80A57294 AFA50044 */ sw $a1, 0x0044($sp) -/* 00098 80A57298 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00098 80A57298 0C0170D9 */ jal Collider_InitCylinder /* 0009C 80A5729C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000A0 80A572A0 3C0780A6 */ lui $a3, %hi(D_80A58A00) ## $a3 = 80A60000 /* 000A4 80A572A4 8FA50044 */ lw $a1, 0x0044($sp) /* 000A8 80A572A8 24E78A00 */ addiu $a3, $a3, %lo(D_80A58A00) ## $a3 = 80A58A00 /* 000AC 80A572AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000B0 80A572B0 0C01712B */ jal ActorCollider_InitCylinder +/* 000B0 80A572B0 0C01712B */ jal Collider_SetCylinder /* 000B4 80A572B4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B8 80A572B8 3C0680A6 */ lui $a2, %hi(D_80A58A2C) ## $a2 = 80A60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Update.s index c8d66218ae..8dab100e19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Update.s @@ -44,7 +44,7 @@ glabel EnHintnuts_Update /* 01558 80A58758 26050214 */ addiu $a1, $s0, 0x0214 ## $a1 = 00000214 .L80A5875C: /* 0155C 80A5875C AFA50028 */ sw $a1, 0x0028($sp) -/* 01560 80A58760 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01560 80A58760 0C0189B7 */ jal Collider_CylinderUpdate /* 01564 80A58764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01568 80A58768 920B0225 */ lbu $t3, 0x0225($s0) ## 00000225 @@ -54,7 +54,7 @@ glabel EnHintnuts_Update /* 01578 80A58778 11800004 */ beq $t4, $zero, .L80A5878C /* 0157C 80A5877C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01580 80A58780 02212821 */ addu $a1, $s1, $at -/* 01584 80A58784 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01584 80A58784 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01588 80A58788 8FA60028 */ lw $a2, 0x0028($sp) .L80A5878C: @@ -62,7 +62,7 @@ glabel EnHintnuts_Update /* 01590 80A58790 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01594 80A58794 02212821 */ addu $a1, $s1, $at /* 01598 80A58798 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0159C 80A5879C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0159C 80A5879C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 015A0 80A587A0 8FA60028 */ lw $a2, 0x0028($sp) /* 015A4 80A587A4 8E030190 */ lw $v1, 0x0190($s0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Destroy.s index d0983e641f..7f0c4e2e50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Destroy.s @@ -7,12 +7,12 @@ glabel EnHonotrap_Destroy /* 00480 80A5A0B0 15C00006 */ bne $t6, $zero, .L80A5A0CC /* 00484 80A5A0B4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00488 80A5A0B8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0048C 80A5A0BC 0C017232 */ jal func_8005C8C8 +/* 0048C 80A5A0BC 0C017232 */ jal Collider_DestroyTris /* 00490 80A5A0C0 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 00494 80A5A0C4 10000004 */ beq $zero, $zero, .L80A5A0D8 /* 00498 80A5A0C8 8FBF0014 */ lw $ra, 0x0014($sp) .L80A5A0CC: -/* 0049C 80A5A0CC 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0049C 80A5A0CC 0C0170EB */ jal Collider_DestroyCylinder /* 004A0 80A5A0D0 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 004A4 80A5A0D4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Update.s index cac2d7b864..2c876886ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/EnHonotrap_Update.s @@ -83,7 +83,7 @@ glabel EnHonotrap_Update /* 00FA4 80A5ABD4 8FA4002C */ lw $a0, 0x002C($sp) /* 00FA8 80A5ABD8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00FAC 80A5ABDC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00FB0 80A5ABE0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00FB0 80A5ABE0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00FB4 80A5ABE4 00812821 */ addu $a1, $a0, $at /* 00FB8 80A5ABE8 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59C30.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59C30.s index 5a83d9e031..6818a90e98 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59C30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59C30.s @@ -6,7 +6,7 @@ glabel func_80A59C30 /* 00010 80A59C40 AFBF001C */ sw $ra, 0x001C($sp) /* 00014 80A59C44 AFA5003C */ sw $a1, 0x003C($sp) /* 00018 80A59C48 26110150 */ addiu $s1, $s0, 0x0150 ## $s1 = 00000150 -/* 0001C 80A59C4C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0001C 80A59C4C 0C0189B7 */ jal Collider_CylinderUpdate /* 00020 80A59C50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000150 /* 00024 80A59C54 8FA4003C */ lw $a0, 0x003C($sp) @@ -14,17 +14,17 @@ glabel func_80A59C30 /* 0002C 80A59C5C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00030 80A59C60 00812821 */ addu $a1, $a0, $at /* 00034 80A59C64 AFA50024 */ sw $a1, 0x0024($sp) -/* 00038 80A59C68 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00038 80A59C68 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 0003C 80A59C6C 02203025 */ or $a2, $s1, $zero ## $a2 = 00000150 /* 00040 80A59C70 8FA4003C */ lw $a0, 0x003C($sp) /* 00044 80A59C74 8FA50024 */ lw $a1, 0x0024($sp) -/* 00048 80A59C78 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00048 80A59C78 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0004C 80A59C7C 02203025 */ or $a2, $s1, $zero ## $a2 = 00000150 /* 00050 80A59C80 8FA4003C */ lw $a0, 0x003C($sp) /* 00054 80A59C84 8FA50024 */ lw $a1, 0x0024($sp) -/* 00058 80A59C88 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00058 80A59C88 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0005C 80A59C8C 02203025 */ or $a2, $s1, $zero ## $a2 = 00000150 /* 00060 80A59C90 920E0240 */ lbu $t6, 0x0240($s0) ## 00000240 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59D70.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59D70.s index 37924a5b45..8d9d7c70f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59D70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59D70.s @@ -28,7 +28,7 @@ glabel func_80A59D70 /* 0019C 80A59DCC 27D70150 */ addiu $s7, $s8, 0x0150 ## $s7 = 00000150 /* 001A0 80A59DD0 46000506 */ mov.s $f20, $f0 /* 001A4 80A59DD4 02E02825 */ or $a1, $s7, $zero ## $a1 = 00000150 -/* 001A8 80A59DD8 0C0171F8 */ jal func_8005C7E0 +/* 001A8 80A59DD8 0C0171F8 */ jal Collider_InitTris /* 001AC 80A59DDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001B0 80A59DE0 3C1480A6 */ lui $s4, %hi(D_80A5AFF8) ## $s4 = 80A60000 /* 001B4 80A59DE4 2694AFF8 */ addiu $s4, $s4, %lo(D_80A5AFF8) ## $s4 = 80A5AFF8 @@ -37,7 +37,7 @@ glabel func_80A59D70 /* 001C0 80A59DF0 02803825 */ or $a3, $s4, $zero ## $a3 = 80A5AFF8 /* 001C4 80A59DF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001C8 80A59DF8 02E02825 */ or $a1, $s7, $zero ## $a1 = 00000150 -/* 001CC 80A59DFC 0C0172EB */ jal func_8005CBAC +/* 001CC 80A59DFC 0C0172EB */ jal Collider_SetTris /* 001D0 80A59E00 03C03025 */ or $a2, $s8, $zero ## $a2 = 00000000 /* 001D4 80A59E04 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 /* 001D8 80A59E08 27D30024 */ addiu $s3, $s8, 0x0024 ## $s3 = 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s index 516e0c5458..e997c84812 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A59F08.s @@ -15,18 +15,18 @@ glabel func_80A59F08 /* 002F4 80A59F24 34A5B717 */ ori $a1, $a1, 0xB717 ## $a1 = 38D1B717 /* 002F8 80A59F28 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 002FC 80A59F2C AFA50024 */ sw $a1, 0x0024($sp) -/* 00300 80A59F30 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00300 80A59F30 0C0170D9 */ jal Collider_InitCylinder /* 00304 80A59F34 8FA40034 */ lw $a0, 0x0034($sp) /* 00308 80A59F38 3C0780A6 */ lui $a3, %hi(D_80A5B008) ## $a3 = 80A60000 /* 0030C 80A59F3C 24E7B008 */ addiu $a3, $a3, %lo(D_80A5B008) ## $a3 = 80A5B008 /* 00310 80A59F40 8FA40034 */ lw $a0, 0x0034($sp) /* 00314 80A59F44 8FA50024 */ lw $a1, 0x0024($sp) -/* 00318 80A59F48 0C01712B */ jal ActorCollider_InitCylinder +/* 00318 80A59F48 0C01712B */ jal Collider_SetCylinder /* 0031C 80A59F4C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00320 80A59F50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00324 80A59F54 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00324 80A59F54 0C0189B7 */ jal Collider_CylinderUpdate /* 00328 80A59F58 8FA50024 */ lw $a1, 0x0024($sp) /* 0032C 80A59F5C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Destroy.s index e492dfcec7..77e165b51f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Destroy.s @@ -15,15 +15,15 @@ glabel EnHorse_Destroy /* 01558 80A5C848 0C029A22 */ jal func_800A6888 /* 0155C 80A5C84C 26050160 */ addiu $a1, $s0, 0x0160 ## $a1 = 00000160 /* 01560 80A5C850 8FA40024 */ lw $a0, 0x0024($sp) -/* 01564 80A5C854 0C0170EB */ jal ActorCollider_FreeCylinder +/* 01564 80A5C854 0C0170EB */ jal Collider_DestroyCylinder /* 01568 80A5C858 26050278 */ addiu $a1, $s0, 0x0278 ## $a1 = 00000278 /* 0156C 80A5C85C 8FA40024 */ lw $a0, 0x0024($sp) -/* 01570 80A5C860 0C0170EB */ jal ActorCollider_FreeCylinder +/* 01570 80A5C860 0C0170EB */ jal Collider_DestroyCylinder /* 01574 80A5C864 260502C4 */ addiu $a1, $s0, 0x02C4 ## $a1 = 000002C4 /* 01578 80A5C868 8FA40024 */ lw $a0, 0x0024($sp) -/* 0157C 80A5C86C 0C016F32 */ jal func_8005BCC8 +/* 0157C 80A5C86C 0C016F32 */ jal Collider_DestroyJntSph /* 01580 80A5C870 26050310 */ addiu $a1, $s0, 0x0310 ## $a1 = 00000310 /* 01584 80A5C874 8FBF001C */ lw $ra, 0x001C($sp) /* 01588 80A5C878 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s index f4af5f1b18..12c4a44f49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s @@ -225,31 +225,31 @@ glabel EnHorse_Init /* 010BC 80A5C3AC 26050278 */ addiu $a1, $s0, 0x0278 ## $a1 = 00000278 /* 010C0 80A5C3B0 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 010C4 80A5C3B4 AFA50040 */ sw $a1, 0x0040($sp) -/* 010C8 80A5C3B8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 010C8 80A5C3B8 0C0170D9 */ jal Collider_InitCylinder /* 010CC 80A5C3BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 010D0 80A5C3C0 3C0780A6 */ lui $a3, %hi(D_80A65EAC) ## $a3 = 80A60000 /* 010D4 80A5C3C4 8FA50040 */ lw $a1, 0x0040($sp) /* 010D8 80A5C3C8 24E75EAC */ addiu $a3, $a3, %lo(D_80A65EAC) ## $a3 = 80A65EAC /* 010DC 80A5C3CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 010E0 80A5C3D0 0C01712B */ jal ActorCollider_InitCylinder +/* 010E0 80A5C3D0 0C01712B */ jal Collider_SetCylinder /* 010E4 80A5C3D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 010E8 80A5C3D8 260502C4 */ addiu $a1, $s0, 0x02C4 ## $a1 = 000002C4 /* 010EC 80A5C3DC AFA50040 */ sw $a1, 0x0040($sp) -/* 010F0 80A5C3E0 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 010F0 80A5C3E0 0C0170D9 */ jal Collider_InitCylinder /* 010F4 80A5C3E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 010F8 80A5C3E8 3C0780A6 */ lui $a3, %hi(D_80A65ED8) ## $a3 = 80A60000 /* 010FC 80A5C3EC 8FA50040 */ lw $a1, 0x0040($sp) /* 01100 80A5C3F0 24E75ED8 */ addiu $a3, $a3, %lo(D_80A65ED8) ## $a3 = 80A65ED8 /* 01104 80A5C3F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01108 80A5C3F8 0C01712B */ jal ActorCollider_InitCylinder +/* 01108 80A5C3F8 0C01712B */ jal Collider_SetCylinder /* 0110C 80A5C3FC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 01110 80A5C400 26050310 */ addiu $a1, $s0, 0x0310 ## $a1 = 00000310 /* 01114 80A5C404 AFA50040 */ sw $a1, 0x0040($sp) -/* 01118 80A5C408 0C016EFE */ jal func_8005BBF8 +/* 01118 80A5C408 0C016EFE */ jal Collider_InitJntSph /* 0111C 80A5C40C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01120 80A5C410 3C0780A6 */ lui $a3, %hi(D_80A65F28) ## $a3 = 80A60000 /* 01124 80A5C414 26190330 */ addiu $t9, $s0, 0x0330 ## $t9 = 00000330 @@ -257,9 +257,9 @@ glabel EnHorse_Init /* 0112C 80A5C41C AFB90010 */ sw $t9, 0x0010($sp) /* 01130 80A5C420 24E75F28 */ addiu $a3, $a3, %lo(D_80A65F28) ## $a3 = 80A65F28 /* 01134 80A5C424 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01138 80A5C428 0C017014 */ jal func_8005C050 +/* 01138 80A5C428 0C017014 */ jal Collider_SetJntSph /* 0113C 80A5C42C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 01140 80A5C430 0C016C80 */ jal CollisionBtlTbl_Get +/* 01140 80A5C430 0C016C80 */ jal DamageTable_Get /* 01144 80A5C434 2404000B */ addiu $a0, $zero, 0x000B ## $a0 = 0000000B /* 01148 80A5C438 3C0680A6 */ lui $a2, %hi(D_80A65F38) ## $a2 = 80A60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s index c6bcca941c..56fcdca3df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Update.s @@ -207,12 +207,12 @@ glabel EnHorse_Update .L80A64998: /* 096A8 80A64998 26050278 */ addiu $a1, $s0, 0x0278 ## $a1 = 00000278 /* 096AC 80A6499C AFA50030 */ sw $a1, 0x0030($sp) -/* 096B0 80A649A0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 096B0 80A649A0 0C0189B7 */ jal Collider_CylinderUpdate /* 096B4 80A649A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 096B8 80A649A8 260502C4 */ addiu $a1, $s0, 0x02C4 ## $a1 = 000002C4 /* 096BC 80A649AC AFA50034 */ sw $a1, 0x0034($sp) -/* 096C0 80A649B0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 096C0 80A649B0 0C0189B7 */ jal Collider_CylinderUpdate /* 096C4 80A649B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 096C8 80A649B8 0C01DE1C */ jal Math_Sins @@ -268,17 +268,17 @@ glabel EnHorse_Update /* 09780 80A64A70 01B97021 */ addu $t6, $t5, $t9 /* 09784 80A64A74 A60E030E */ sh $t6, 0x030E($s0) ## 0000030E /* 09788 80A64A78 AFA50038 */ sw $a1, 0x0038($sp) -/* 0978C 80A64A7C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0978C 80A64A7C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 09790 80A64A80 8FA60030 */ lw $a2, 0x0030($sp) /* 09794 80A64A84 8FA40074 */ lw $a0, 0x0074($sp) /* 09798 80A64A88 8FA50038 */ lw $a1, 0x0038($sp) -/* 0979C 80A64A8C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0979C 80A64A8C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 097A0 80A64A90 8FA60030 */ lw $a2, 0x0030($sp) /* 097A4 80A64A94 8FA40074 */ lw $a0, 0x0074($sp) /* 097A8 80A64A98 8FA50038 */ lw $a1, 0x0038($sp) -/* 097AC 80A64A9C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 097AC 80A64A9C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 097B0 80A64AA0 8FA60034 */ lw $a2, 0x0034($sp) /* 097B4 80A64AA4 8FA3004C */ lw $v1, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s index 89808dd787..745422a4a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65108.s @@ -755,12 +755,12 @@ glabel func_80A65108 /* 0A8D8 80A65BC8 26060310 */ addiu $a2, $s0, 0x0310 ## $a2 = 00000310 /* 0A8DC 80A65BCC 00812821 */ addu $a1, $a0, $at /* 0A8E0 80A65BD0 AFA50024 */ sw $a1, 0x0024($sp) -/* 0A8E4 80A65BD4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0A8E4 80A65BD4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0A8E8 80A65BD8 AFA60020 */ sw $a2, 0x0020($sp) /* 0A8EC 80A65BDC 8FA50024 */ lw $a1, 0x0024($sp) /* 0A8F0 80A65BE0 8FA60020 */ lw $a2, 0x0020($sp) -/* 0A8F4 80A65BE4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0A8F4 80A65BE4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0A8F8 80A65BE8 8FA400AC */ lw $a0, 0x00AC($sp) /* 0A8FC 80A65BEC 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Destroy.s index 006620b892..c599df8b91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Destroy.s @@ -9,12 +9,12 @@ glabel EnHorseGanon_Destroy /* 00430 80A68A90 24A50154 */ addiu $a1, $a1, 0x0154 ## $a1 = 00000154 /* 00434 80A68A94 8FA50018 */ lw $a1, 0x0018($sp) /* 00438 80A68A98 8FA4001C */ lw $a0, 0x001C($sp) -/* 0043C 80A68A9C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0043C 80A68A9C 0C0170EB */ jal Collider_DestroyCylinder /* 00440 80A68AA0 24A501FC */ addiu $a1, $a1, 0x01FC ## $a1 = 000001FC /* 00444 80A68AA4 8FA50018 */ lw $a1, 0x0018($sp) /* 00448 80A68AA8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0044C 80A68AAC 0C016F32 */ jal func_8005BCC8 +/* 0044C 80A68AAC 0C016F32 */ jal Collider_DestroyJntSph /* 00450 80A68AB0 24A50248 */ addiu $a1, $a1, 0x0248 ## $a1 = 00000248 /* 00454 80A68AB4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00458 80A68AB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s index 03ec6f990e..cbbe5263a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s @@ -52,19 +52,19 @@ glabel EnHorseGanon_Init /* 00388 80A689E8 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 0038C 80A689EC 260501FC */ addiu $a1, $s0, 0x01FC ## $a1 = 000001FC /* 00390 80A689F0 AFA50028 */ sw $a1, 0x0028($sp) -/* 00394 80A689F4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00394 80A689F4 0C0170D9 */ jal Collider_InitCylinder /* 00398 80A689F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0039C 80A689FC 3C0780A7 */ lui $a3, %hi(D_80A691E0) ## $a3 = 80A70000 /* 003A0 80A68A00 8FA50028 */ lw $a1, 0x0028($sp) /* 003A4 80A68A04 24E791E0 */ addiu $a3, $a3, %lo(D_80A691E0) ## $a3 = 80A691E0 /* 003A8 80A68A08 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 003AC 80A68A0C 0C01712B */ jal ActorCollider_InitCylinder +/* 003AC 80A68A0C 0C01712B */ jal Collider_SetCylinder /* 003B0 80A68A10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 003B4 80A68A14 26050248 */ addiu $a1, $s0, 0x0248 ## $a1 = 00000248 /* 003B8 80A68A18 AFA50028 */ sw $a1, 0x0028($sp) -/* 003BC 80A68A1C 0C016EFE */ jal func_8005BBF8 +/* 003BC 80A68A1C 0C016EFE */ jal Collider_InitJntSph /* 003C0 80A68A20 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 003C4 80A68A24 3C0780A7 */ lui $a3, %hi(D_80A69230) ## $a3 = 80A70000 /* 003C8 80A68A28 26180268 */ addiu $t8, $s0, 0x0268 ## $t8 = 00000268 @@ -72,7 +72,7 @@ glabel EnHorseGanon_Init /* 003D0 80A68A30 AFB80010 */ sw $t8, 0x0010($sp) /* 003D4 80A68A34 24E79230 */ addiu $a3, $a3, %lo(D_80A69230) ## $a3 = 80A69230 /* 003D8 80A68A38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 003DC 80A68A3C 0C017014 */ jal func_8005C050 +/* 003DC 80A68A3C 0C017014 */ jal Collider_SetJntSph /* 003E0 80A68A40 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 003E4 80A68A44 3C0680A7 */ lui $a2, %hi(D_80A69240) ## $a2 = 80A70000 /* 003E8 80A68A48 24C69240 */ addiu $a2, $a2, %lo(D_80A69240) ## $a2 = 80A69240 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Update.s index 6363bf02e3..1cf9caddef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Update.s @@ -38,14 +38,14 @@ glabel EnHorseGanon_Update /* 00908 80A68F68 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001FC /* 0090C 80A68F6C E60A003C */ swc1 $f10, 0x003C($s0) ## 0000003C /* 00910 80A68F70 AFA6002C */ sw $a2, 0x002C($sp) -/* 00914 80A68F74 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00914 80A68F74 0C0189B7 */ jal Collider_CylinderUpdate /* 00918 80A68F78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0091C 80A68F7C 8FA4003C */ lw $a0, 0x003C($sp) /* 00920 80A68F80 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00924 80A68F84 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00928 80A68F88 8FA6002C */ lw $a2, 0x002C($sp) -/* 0092C 80A68F8C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0092C 80A68F8C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00930 80A68F90 00812821 */ addu $a1, $a0, $at /* 00934 80A68F94 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68FA8.s index 05efd167db..4aa31c9041 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68FA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68FA8.s @@ -89,7 +89,7 @@ glabel func_80A68FA8 /* 00A9C 80A690FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00AA0 80A69100 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00AA4 80A69104 26260248 */ addiu $a2, $s1, 0x0248 ## $a2 = 00000248 -/* 00AA8 80A69108 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00AA8 80A69108 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00AAC 80A6910C 00812821 */ addu $a1, $a0, $at /* 00AB0 80A69110 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Destroy.s index e986904c01..f70c34f38b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Destroy.s @@ -9,12 +9,12 @@ glabel EnHorseLinkChild_Destroy /* 00488 80A69858 24A50154 */ addiu $a1, $a1, 0x0154 ## $a1 = 00000154 /* 0048C 80A6985C 8FA50018 */ lw $a1, 0x0018($sp) /* 00490 80A69860 8FA4001C */ lw $a0, 0x001C($sp) -/* 00494 80A69864 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00494 80A69864 0C0170EB */ jal Collider_DestroyCylinder /* 00498 80A69868 24A501F4 */ addiu $a1, $a1, 0x01F4 ## $a1 = 000001F4 /* 0049C 80A6986C 8FA50018 */ lw $a1, 0x0018($sp) /* 004A0 80A69870 8FA4001C */ lw $a0, 0x001C($sp) -/* 004A4 80A69874 0C016F32 */ jal func_8005BCC8 +/* 004A4 80A69874 0C016F32 */ jal Collider_DestroyJntSph /* 004A8 80A69878 24A50240 */ addiu $a1, $a1, 0x0240 ## $a1 = 00000240 /* 004AC 80A6987C 8FBF0014 */ lw $ra, 0x0014($sp) /* 004B0 80A69880 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s index 7b5574987b..d5c3bc5028 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s @@ -52,18 +52,18 @@ glabel EnHorseLinkChild_Init /* 00354 80A69724 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 00358 80A69728 260501F4 */ addiu $a1, $s0, 0x01F4 ## $a1 = 000001F4 /* 0035C 80A6972C AFA50028 */ sw $a1, 0x0028($sp) -/* 00360 80A69730 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00360 80A69730 0C0170D9 */ jal Collider_InitCylinder /* 00364 80A69734 8FA4003C */ lw $a0, 0x003C($sp) /* 00368 80A69738 3C0780A7 */ lui $a3, %hi(D_80A6AEF4) ## $a3 = 80A70000 /* 0036C 80A6973C 8FA50028 */ lw $a1, 0x0028($sp) /* 00370 80A69740 24E7AEF4 */ addiu $a3, $a3, %lo(D_80A6AEF4) ## $a3 = 80A6AEF4 /* 00374 80A69744 8FA4003C */ lw $a0, 0x003C($sp) -/* 00378 80A69748 0C017114 */ jal func_8005C450 +/* 00378 80A69748 0C017114 */ jal Collider_SetCylinder_Set3 /* 0037C 80A6974C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00380 80A69750 26050240 */ addiu $a1, $s0, 0x0240 ## $a1 = 00000240 /* 00384 80A69754 AFA50028 */ sw $a1, 0x0028($sp) -/* 00388 80A69758 0C016EFE */ jal func_8005BBF8 +/* 00388 80A69758 0C016EFE */ jal Collider_InitJntSph /* 0038C 80A6975C 8FA4003C */ lw $a0, 0x003C($sp) /* 00390 80A69760 3C0780A7 */ lui $a3, %hi(D_80A6AF44) ## $a3 = 80A70000 /* 00394 80A69764 26190260 */ addiu $t9, $s0, 0x0260 ## $t9 = 00000260 @@ -71,7 +71,7 @@ glabel EnHorseLinkChild_Init /* 0039C 80A6976C AFB90010 */ sw $t9, 0x0010($sp) /* 003A0 80A69770 24E7AF44 */ addiu $a3, $a3, %lo(D_80A6AF44) ## $a3 = 80A6AF44 /* 003A4 80A69774 8FA4003C */ lw $a0, 0x003C($sp) -/* 003A8 80A69778 0C017014 */ jal func_8005C050 +/* 003A8 80A69778 0C017014 */ jal Collider_SetJntSph /* 003AC 80A6977C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 003B0 80A69780 3C0680A7 */ lui $a2, %hi(D_80A6AF54) ## $a2 = 80A70000 /* 003B4 80A69784 24C6AF54 */ addiu $a2, $a2, %lo(D_80A6AF54) ## $a2 = 80A6AF54 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Update.s index b516b82933..bc3b5f0142 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Update.s @@ -80,14 +80,14 @@ glabel EnHorseLinkChild_Update /* 017E4 80A6ABB4 A20C01EC */ sb $t4, 0x01EC($s0) ## 000001EC /* 017E8 80A6ABB8 A20001EC */ sb $zero, 0x01EC($s0) ## 000001EC .L80A6ABBC: -/* 017EC 80A6ABBC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 017EC 80A6ABBC 0C0189B7 */ jal Collider_CylinderUpdate /* 017F0 80A6ABC0 AFA6002C */ sw $a2, 0x002C($sp) /* 017F4 80A6ABC4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 017F8 80A6ABC8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 017FC 80A6ABCC 8FA6002C */ lw $a2, 0x002C($sp) /* 01800 80A6ABD0 02212821 */ addu $a1, $s1, $at -/* 01804 80A6ABD4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01804 80A6ABD4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01808 80A6ABD8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0180C 80A6ABDC 0C29A523 */ jal func_80A6948C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6ABF8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6ABF8.s index f99dd1e511..aedceb9154 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6ABF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6ABF8.s @@ -89,7 +89,7 @@ glabel func_80A6ABF8 /* 0197C 80A6AD4C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01980 80A6AD50 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01984 80A6AD54 26260240 */ addiu $a2, $s1, 0x0240 ## $a2 = 00000240 -/* 01988 80A6AD58 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01988 80A6AD58 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0198C 80A6AD5C 00812821 */ addu $a1, $a0, $at /* 01990 80A6AD60 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Destroy.s index 12bda73241..3931b86dc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Destroy.s @@ -9,17 +9,17 @@ glabel EnHorseNormal_Destroy /* 00688 80A6B8D8 24A50154 */ addiu $a1, $a1, 0x0154 ## $a1 = 00000154 /* 0068C 80A6B8DC 8FA50018 */ lw $a1, 0x0018($sp) /* 00690 80A6B8E0 8FA4001C */ lw $a0, 0x001C($sp) -/* 00694 80A6B8E4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00694 80A6B8E4 0C0170EB */ jal Collider_DestroyCylinder /* 00698 80A6B8E8 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 00000228 /* 0069C 80A6B8EC 8FA50018 */ lw $a1, 0x0018($sp) /* 006A0 80A6B8F0 8FA4001C */ lw $a0, 0x001C($sp) -/* 006A4 80A6B8F4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 006A4 80A6B8F4 0C0170EB */ jal Collider_DestroyCylinder /* 006A8 80A6B8F8 24A502D4 */ addiu $a1, $a1, 0x02D4 ## $a1 = 000002D4 /* 006AC 80A6B8FC 8FA50018 */ lw $a1, 0x0018($sp) /* 006B0 80A6B900 8FA4001C */ lw $a0, 0x001C($sp) -/* 006B4 80A6B904 0C016F32 */ jal func_8005BCC8 +/* 006B4 80A6B904 0C016F32 */ jal Collider_DestroyJntSph /* 006B8 80A6B908 24A50274 */ addiu $a1, $a1, 0x0274 ## $a1 = 00000274 /* 006BC 80A6B90C 8FBF0014 */ lw $ra, 0x0014($sp) /* 006C0 80A6B910 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s index 4ed95be3ba..8d6fbfd527 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s @@ -269,7 +269,7 @@ glabel EnHorseNormal_Draw /* 01FBC 80A6D20C C7A8006C */ lwc1 $f8, 0x006C($sp) /* 01FC0 80A6D210 4600428D */ trunc.w.s $f10, $f8 /* 01FC4 80A6D214 440A5000 */ mfc1 $t2, $f10 -/* 01FC8 80A6D218 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01FC8 80A6D218 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01FCC 80A6D21C A60A031E */ sh $t2, 0x031E($s0) ## 0000031E /* 01FD0 80A6D220 0C025011 */ jal func_80094044 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s index d3e0035383..af8d4746cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s @@ -55,19 +55,19 @@ glabel EnHorseNormal_Init /* 0020C 80A6B45C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 00210 80A6B460 AE0F0040 */ sw $t7, 0x0040($s0) ## 00000040 /* 00214 80A6B464 AFA50028 */ sw $a1, 0x0028($sp) -/* 00218 80A6B468 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00218 80A6B468 0C0170D9 */ jal Collider_InitCylinder /* 0021C 80A6B46C 8FA4003C */ lw $a0, 0x003C($sp) /* 00220 80A6B470 3C0780A7 */ lui $a3, %hi(D_80A6D394) ## $a3 = 80A70000 /* 00224 80A6B474 8FA50028 */ lw $a1, 0x0028($sp) /* 00228 80A6B478 24E7D394 */ addiu $a3, $a3, %lo(D_80A6D394) ## $a3 = 80A6D394 /* 0022C 80A6B47C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00230 80A6B480 0C01712B */ jal ActorCollider_InitCylinder +/* 00230 80A6B480 0C01712B */ jal Collider_SetCylinder /* 00234 80A6B484 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00238 80A6B488 26050274 */ addiu $a1, $s0, 0x0274 ## $a1 = 00000274 /* 0023C 80A6B48C AFA50028 */ sw $a1, 0x0028($sp) -/* 00240 80A6B490 0C016EFE */ jal func_8005BBF8 +/* 00240 80A6B490 0C016EFE */ jal Collider_InitJntSph /* 00244 80A6B494 8FA4003C */ lw $a0, 0x003C($sp) /* 00248 80A6B498 3C0780A7 */ lui $a3, %hi(D_80A6D410) ## $a3 = 80A70000 /* 0024C 80A6B49C 26180294 */ addiu $t8, $s0, 0x0294 ## $t8 = 00000294 @@ -75,18 +75,18 @@ glabel EnHorseNormal_Init /* 00254 80A6B4A4 AFB80010 */ sw $t8, 0x0010($sp) /* 00258 80A6B4A8 24E7D410 */ addiu $a3, $a3, %lo(D_80A6D410) ## $a3 = 80A6D410 /* 0025C 80A6B4AC 8FA4003C */ lw $a0, 0x003C($sp) -/* 00260 80A6B4B0 0C017014 */ jal func_8005C050 +/* 00260 80A6B4B0 0C017014 */ jal Collider_SetJntSph /* 00264 80A6B4B4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00268 80A6B4B8 260502D4 */ addiu $a1, $s0, 0x02D4 ## $a1 = 000002D4 /* 0026C 80A6B4BC AFA50028 */ sw $a1, 0x0028($sp) -/* 00270 80A6B4C0 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00270 80A6B4C0 0C0170D9 */ jal Collider_InitCylinder /* 00274 80A6B4C4 8FA4003C */ lw $a0, 0x003C($sp) /* 00278 80A6B4C8 3C0780A7 */ lui $a3, %hi(D_80A6D3C0) ## $a3 = 80A70000 /* 0027C 80A6B4CC 8FA50028 */ lw $a1, 0x0028($sp) /* 00280 80A6B4D0 24E7D3C0 */ addiu $a3, $a3, %lo(D_80A6D3C0) ## $a3 = 80A6D3C0 /* 00284 80A6B4D4 8FA4003C */ lw $a0, 0x003C($sp) -/* 00288 80A6B4D8 0C01712B */ jal ActorCollider_InitCylinder +/* 00288 80A6B4D8 0C01712B */ jal Collider_SetCylinder /* 0028C 80A6B4DC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00290 80A6B4E0 3C0680A7 */ lui $a2, %hi(D_80A6D420) ## $a2 = 80A70000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Update.s index 04807aba5f..2c71b75dbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Update.s @@ -63,14 +63,14 @@ glabel EnHorseNormal_Update /* 01840 80A6CA90 AE0A0040 */ sw $t2, 0x0040($s0) ## 00000040 /* 01844 80A6CA94 AE0C020C */ sw $t4, 0x020C($s0) ## 0000020C /* 01848 80A6CA98 AFA6002C */ sw $a2, 0x002C($sp) -/* 0184C 80A6CA9C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0184C 80A6CA9C 0C0189B7 */ jal Collider_CylinderUpdate /* 01850 80A6CAA0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000228 /* 01854 80A6CAA4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01858 80A6CAA8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0185C 80A6CAAC 8FA6002C */ lw $a2, 0x002C($sp) /* 01860 80A6CAB0 02212821 */ addu $a1, $s1, $at -/* 01864 80A6CAB4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01864 80A6CAB4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01868 80A6CAB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0186C 80A6CABC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CAFC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CAFC.s index 6c941c7cac..e02fb9ba97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CAFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6CAFC.s @@ -89,7 +89,7 @@ glabel func_80A6CAFC /* 01A00 80A6CC50 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01A04 80A6CC54 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01A08 80A6CC58 26260274 */ addiu $a2, $s1, 0x0274 ## $a2 = 00000274 -/* 01A0C 80A6CC5C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01A0C 80A6CC5C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01A10 80A6CC60 00812821 */ addu $a1, $a0, $at /* 01A14 80A6CC64 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Destroy.s index 8576746b42..999e518c69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Destroy.s @@ -5,12 +5,12 @@ glabel EnHorseZelda_Destroy /* 00368 80A6DC38 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0036C 80A6DC3C 8FA50018 */ lw $a1, 0x0018($sp) /* 00370 80A6DC40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00374 80A6DC44 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00374 80A6DC44 0C0170EB */ jal Collider_DestroyCylinder /* 00378 80A6DC48 24A501FC */ addiu $a1, $a1, 0x01FC ## $a1 = 000001FC /* 0037C 80A6DC4C 8FA50018 */ lw $a1, 0x0018($sp) /* 00380 80A6DC50 8FA4001C */ lw $a0, 0x001C($sp) -/* 00384 80A6DC54 0C016F32 */ jal func_8005BCC8 +/* 00384 80A6DC54 0C016F32 */ jal Collider_DestroyJntSph /* 00388 80A6DC58 24A50248 */ addiu $a1, $a1, 0x0248 ## $a1 = 00000248 /* 0038C 80A6DC5C 8FA50018 */ lw $a1, 0x0018($sp) /* 00390 80A6DC60 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s index a9f81b0741..8f725868f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s @@ -52,18 +52,18 @@ glabel EnHorseZelda_Init /* 002CC 80A6DB9C 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 002D0 80A6DBA0 260501FC */ addiu $a1, $s0, 0x01FC ## $a1 = 000001FC /* 002D4 80A6DBA4 AFA50028 */ sw $a1, 0x0028($sp) -/* 002D8 80A6DBA8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 002D8 80A6DBA8 0C0170D9 */ jal Collider_InitCylinder /* 002DC 80A6DBAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002E0 80A6DBB0 3C0780A7 */ lui $a3, %hi(D_80A6E1D8) ## $a3 = 80A70000 /* 002E4 80A6DBB4 8FA50028 */ lw $a1, 0x0028($sp) /* 002E8 80A6DBB8 24E7E1D8 */ addiu $a3, $a3, %lo(D_80A6E1D8) ## $a3 = 80A6E1D8 /* 002EC 80A6DBBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002F0 80A6DBC0 0C017114 */ jal func_8005C450 +/* 002F0 80A6DBC0 0C017114 */ jal Collider_SetCylinder_Set3 /* 002F4 80A6DBC4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002F8 80A6DBC8 26050248 */ addiu $a1, $s0, 0x0248 ## $a1 = 00000248 /* 002FC 80A6DBCC AFA50028 */ sw $a1, 0x0028($sp) -/* 00300 80A6DBD0 0C016EFE */ jal func_8005BBF8 +/* 00300 80A6DBD0 0C016EFE */ jal Collider_InitJntSph /* 00304 80A6DBD4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00308 80A6DBD8 3C0780A7 */ lui $a3, %hi(D_80A6E228) ## $a3 = 80A70000 /* 0030C 80A6DBDC 26180268 */ addiu $t8, $s0, 0x0268 ## $t8 = 00000268 @@ -71,7 +71,7 @@ glabel EnHorseZelda_Init /* 00314 80A6DBE4 AFB80010 */ sw $t8, 0x0010($sp) /* 00318 80A6DBE8 24E7E228 */ addiu $a3, $a3, %lo(D_80A6E228) ## $a3 = 80A6E228 /* 0031C 80A6DBEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00320 80A6DBF0 0C017014 */ jal func_8005C050 +/* 00320 80A6DBF0 0C017014 */ jal Collider_SetJntSph /* 00324 80A6DBF4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00328 80A6DBF8 3C0680A7 */ lui $a2, %hi(D_80A6E238) ## $a2 = 80A70000 /* 0032C 80A6DBFC 24C6E238 */ addiu $a2, $a2, %lo(D_80A6E238) ## $a2 = 80A6E238 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Update.s index 635e64f955..4e4b6ae21c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Update.s @@ -40,14 +40,14 @@ glabel EnHorseZelda_Update /* 006C4 80A6DF94 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001FC /* 006C8 80A6DF98 E610003C */ swc1 $f16, 0x003C($s0) ## 0000003C /* 006CC 80A6DF9C AFA6002C */ sw $a2, 0x002C($sp) -/* 006D0 80A6DFA0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 006D0 80A6DFA0 0C0189B7 */ jal Collider_CylinderUpdate /* 006D4 80A6DFA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006D8 80A6DFA8 8FA4003C */ lw $a0, 0x003C($sp) /* 006DC 80A6DFAC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 006E0 80A6DFB0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 006E4 80A6DFB4 8FA6002C */ lw $a2, 0x002C($sp) -/* 006E8 80A6DFB8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 006E8 80A6DFB8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 006EC 80A6DFBC 00812821 */ addu $a1, $a0, $at /* 006F0 80A6DFC0 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DFD4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DFD4.s index 7a5ab0a39c..4d13924d8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DFD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DFD4.s @@ -89,7 +89,7 @@ glabel func_80A6DFD4 /* 00858 80A6E128 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0085C 80A6E12C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00860 80A6E130 26260248 */ addiu $a2, $s1, 0x0248 ## $a2 = 00000248 -/* 00864 80A6E134 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00864 80A6E134 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00868 80A6E138 00812821 */ addu $a1, $a0, $at /* 0086C 80A6E13C 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Destroy.s index 34bbcec851..9ac9c73242 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Destroy.s @@ -3,7 +3,7 @@ glabel EnHs_Destroy /* 00178 80A6E518 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0017C 80A6E51C AFBF0014 */ sw $ra, 0x0014($sp) /* 00180 80A6E520 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00184 80A6E524 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00184 80A6E524 0C0170EB */ jal Collider_DestroyCylinder /* 00188 80A6E528 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 0018C 80A6E52C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s index 21892b7d19..73e552c6f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s @@ -45,14 +45,14 @@ glabel EnHs_Init /* 00078 80A6E418 8FA40034 */ lw $a0, 0x0034($sp) /* 0007C 80A6E41C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00080 80A6E420 AFA50034 */ sw $a1, 0x0034($sp) -/* 00084 80A6E424 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00084 80A6E424 0C0170D9 */ jal Collider_InitCylinder /* 00088 80A6E428 8FA40044 */ lw $a0, 0x0044($sp) /* 0008C 80A6E42C 3C0780A7 */ lui $a3, %hi(D_80A6EDD0) ## $a3 = 80A70000 /* 00090 80A6E430 8FA50034 */ lw $a1, 0x0034($sp) /* 00094 80A6E434 24E7EDD0 */ addiu $a3, $a3, %lo(D_80A6EDD0) ## $a3 = 80A6EDD0 /* 00098 80A6E438 8FA40044 */ lw $a0, 0x0044($sp) -/* 0009C 80A6E43C 0C01712B */ jal ActorCollider_InitCylinder +/* 0009C 80A6E43C 0C01712B */ jal Collider_SetCylinder /* 000A0 80A6E440 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000A4 80A6E444 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Update.s index bbde39a68a..481e91d1f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Update.s @@ -7,14 +7,14 @@ glabel EnHs_Update /* 00764 80A6EB04 AFBF002C */ sw $ra, 0x002C($sp) /* 00768 80A6EB08 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 0076C 80A6EB0C 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 00770 80A6EB10 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00770 80A6EB10 0C0189B7 */ jal Collider_CylinderUpdate /* 00774 80A6EB14 AFA60034 */ sw $a2, 0x0034($sp) /* 00778 80A6EB18 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0077C 80A6EB1C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00780 80A6EB20 8FA60034 */ lw $a2, 0x0034($sp) /* 00784 80A6EB24 02212821 */ addu $a1, $s1, $at -/* 00788 80A6EB28 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00788 80A6EB28 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0078C 80A6EB2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00790 80A6EB30 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Destroy.s index daaf91a710..e56cd62043 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Destroy.s @@ -3,7 +3,7 @@ glabel EnHs2_Destroy /* 000F0 80A6F090 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 000F4 80A6F094 AFBF0014 */ sw $ra, 0x0014($sp) /* 000F8 80A6F098 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000FC 80A6F09C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 000FC 80A6F09C 0C0170EB */ jal Collider_DestroyCylinder /* 00100 80A6F0A0 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 00104 80A6F0A4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s index 61b5bc5f4f..41b92e1cca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s @@ -37,14 +37,14 @@ glabel EnHs2_Init /* 00070 80A6F010 8FA40034 */ lw $a0, 0x0034($sp) /* 00074 80A6F014 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00078 80A6F018 AFA50034 */ sw $a1, 0x0034($sp) -/* 0007C 80A6F01C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0007C 80A6F01C 0C0170D9 */ jal Collider_InitCylinder /* 00080 80A6F020 8FA40044 */ lw $a0, 0x0044($sp) /* 00084 80A6F024 3C0780A7 */ lui $a3, %hi(D_80A6F4A0) ## $a3 = 80A70000 /* 00088 80A6F028 8FA50034 */ lw $a1, 0x0034($sp) /* 0008C 80A6F02C 24E7F4A0 */ addiu $a3, $a3, %lo(D_80A6F4A0) ## $a3 = 80A6F4A0 /* 00090 80A6F030 8FA40044 */ lw $a0, 0x0044($sp) -/* 00094 80A6F034 0C01712B */ jal ActorCollider_InitCylinder +/* 00094 80A6F034 0C01712B */ jal Collider_SetCylinder /* 00098 80A6F038 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0009C 80A6F03C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Update.s index ae23f173d5..64a1073b5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Update.s @@ -7,14 +7,14 @@ glabel EnHs2_Update /* 00264 80A6F204 AFBF002C */ sw $ra, 0x002C($sp) /* 00268 80A6F208 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 0026C 80A6F20C 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 00270 80A6F210 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00270 80A6F210 0C0189B7 */ jal Collider_CylinderUpdate /* 00274 80A6F214 AFA60034 */ sw $a2, 0x0034($sp) /* 00278 80A6F218 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0027C 80A6F21C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00280 80A6F220 8FA60034 */ lw $a2, 0x0034($sp) /* 00284 80A6F224 02212821 */ addu $a1, $s1, $at -/* 00288 80A6F228 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00288 80A6F228 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0028C 80A6F22C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00290 80A6F230 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Destroy.s index d8bc853e42..db85d6e5cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Destroy.s @@ -3,7 +3,7 @@ glabel EnHy_Destroy /* 01860 80A70E10 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 01864 80A70E14 AFBF0014 */ sw $ra, 0x0014($sp) /* 01868 80A70E18 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0186C 80A70E1C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0186C 80A70E1C 0C0170EB */ jal Collider_DestroyCylinder /* 01870 80A70E20 24C5019C */ addiu $a1, $a2, 0x019C ## $a1 = 0000019C /* 01874 80A70E24 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70734.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70734.s index 11a98ec897..3739f19aaf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70734.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70734.s @@ -57,7 +57,7 @@ glabel func_80A70734 /* 01260 80A70810 972E0004 */ lhu $t6, 0x0004($t9) ## FFFFFFFC /* 01264 80A70814 A48E01E6 */ sh $t6, 0x01E6($a0) ## 000001E6 /* 01268 80A70818 8FA40024 */ lw $a0, 0x0024($sp) -/* 0126C 80A7081C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0126C 80A7081C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01270 80A70820 00812821 */ addu $a1, $a0, $at /* 01274 80A70824 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s index bf50d40db1..8fd7e45953 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s @@ -94,14 +94,14 @@ glabel func_80A70E34 /* 0198C 80A70F3C 01616021 */ addu $t4, $t3, $at /* 01990 80A70F40 3C018016 */ lui $at, %hi(gSegments+0x18) /* 01994 80A70F44 AC2C6FC0 */ sw $t4, %lo(gSegments+0x18)($at) -/* 01998 80A70F48 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 01998 80A70F48 0C0170D9 */ jal Collider_InitCylinder /* 0199C 80A70F4C AFA50030 */ sw $a1, 0x0030($sp) /* 019A0 80A70F50 3C0780A7 */ lui $a3, %hi(D_80A71EC0) ## $a3 = 80A70000 /* 019A4 80A70F54 8FA50030 */ lw $a1, 0x0030($sp) /* 019A8 80A70F58 24E71EC0 */ addiu $a3, $a3, %lo(D_80A71EC0) ## $a3 = 80A71EC0 /* 019AC 80A70F5C 8FA4003C */ lw $a0, 0x003C($sp) -/* 019B0 80A70F60 0C01712B */ jal ActorCollider_InitCylinder +/* 019B0 80A70F60 0C01712B */ jal Collider_SetCylinder /* 019B4 80A70F64 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 019B8 80A70F68 0C29C198 */ jal func_80A70660 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Destroy.s index ef9d0cfdd0..93b3e2b57c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Destroy.s @@ -17,7 +17,7 @@ glabel EnIceHono_Destroy /* 003D4 80A733C4 248507A8 */ addiu $a1, $a0, 0x07A8 ## $a1 = 000007A8 /* 003D8 80A733C8 8FA70018 */ lw $a3, 0x0018($sp) /* 003DC 80A733CC 8FA4001C */ lw $a0, 0x001C($sp) -/* 003E0 80A733D0 0C0170EB */ jal ActorCollider_FreeCylinder +/* 003E0 80A733D0 0C0170EB */ jal Collider_DestroyCylinder /* 003E4 80A733D4 24E5015C */ addiu $a1, $a3, 0x015C ## $a1 = 0000015C /* 003E8 80A733D8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A7301C.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A7301C.s index ef459cf719..815070c6b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A7301C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A7301C.s @@ -22,18 +22,18 @@ glabel func_80A7301C /* 00070 80A73060 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 00074 80A73064 2605015C */ addiu $a1, $s0, 0x015C ## $a1 = 0000015C /* 00078 80A73068 AFA50020 */ sw $a1, 0x0020($sp) -/* 0007C 80A7306C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0007C 80A7306C 0C0170D9 */ jal Collider_InitCylinder /* 00080 80A73070 8FA4002C */ lw $a0, 0x002C($sp) /* 00084 80A73074 3C0780A7 */ lui $a3, %hi(D_80A74010) ## $a3 = 80A70000 /* 00088 80A73078 24E74010 */ addiu $a3, $a3, %lo(D_80A74010) ## $a3 = 80A74010 /* 0008C 80A7307C 8FA4002C */ lw $a0, 0x002C($sp) /* 00090 80A73080 8FA50020 */ lw $a1, 0x0020($sp) -/* 00094 80A73084 0C01712B */ jal ActorCollider_InitCylinder +/* 00094 80A73084 0C01712B */ jal Collider_SetCylinder /* 00098 80A73088 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0009C 80A7308C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000A0 80A73090 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 000A0 80A73090 0C0189B7 */ jal Collider_CylinderUpdate /* 000A4 80A73094 8FA50020 */ lw $a1, 0x0020($sp) /* 000A8 80A73098 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A730BC.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A730BC.s index cba8edd616..3c608b0591 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A730BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A730BC.s @@ -41,18 +41,18 @@ glabel func_80A730BC /* 00138 80A73128 A60200B4 */ sh $v0, 0x00B4($s0) ## 000000B4 /* 0013C 80A7312C E6060070 */ swc1 $f6, 0x0070($s0) ## 00000070 /* 00140 80A73130 AFA50024 */ sw $a1, 0x0024($sp) -/* 00144 80A73134 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00144 80A73134 0C0170D9 */ jal Collider_InitCylinder /* 00148 80A73138 8FA4003C */ lw $a0, 0x003C($sp) /* 0014C 80A7313C 3C0780A7 */ lui $a3, %hi(D_80A7403C) ## $a3 = 80A70000 /* 00150 80A73140 24E7403C */ addiu $a3, $a3, %lo(D_80A7403C) ## $a3 = 80A7403C /* 00154 80A73144 8FA4003C */ lw $a0, 0x003C($sp) /* 00158 80A73148 8FA50024 */ lw $a1, 0x0024($sp) -/* 0015C 80A7314C 0C01712B */ jal ActorCollider_InitCylinder +/* 0015C 80A7314C 0C01712B */ jal Collider_SetCylinder /* 00160 80A73150 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00164 80A73154 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00168 80A73158 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00168 80A73158 0C0189B7 */ jal Collider_CylinderUpdate /* 0016C 80A7315C 8FA50024 */ lw $a1, 0x0024($sp) /* 00170 80A73160 3C0180A7 */ lui $at, %hi(D_80A7411C) ## $at = 80A70000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s index c8604f941d..ccdb2241e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s @@ -33,7 +33,7 @@ glabel func_80A734F8 /* 0057C 80A7356C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00580 80A73570 45020004 */ bc1fl .L80A73584 /* 00584 80A73574 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00588 80A73578 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00588 80A73578 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0058C 80A7357C 2606015C */ addiu $a2, $s0, 0x015C ## $a2 = 0000015C /* 00590 80A73580 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735C0.s index ae4581029b..0b4b72b4ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735C0.s @@ -89,7 +89,7 @@ glabel func_80A735C0 /* 006F4 80A736E4 00000000 */ nop /* 006F8 80A736E8 2630015C */ addiu $s0, $s1, 0x015C ## $s0 = 0000015C /* 006FC 80A736EC 02002825 */ or $a1, $s0, $zero ## $a1 = 0000015C -/* 00700 80A736F0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00700 80A736F0 0C0189B7 */ jal Collider_CylinderUpdate /* 00704 80A736F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00708 80A736F8 3C01457A */ lui $at, 0x457A ## $at = 457A0000 @@ -110,7 +110,7 @@ glabel func_80A735C0 /* 00744 80A73734 440B2000 */ mfc1 $t3, $f4 /* 00748 80A73738 440D8000 */ mfc1 $t5, $f16 /* 0074C 80A7373C A62B019C */ sh $t3, 0x019C($s1) ## 0000019C -/* 00750 80A73740 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00750 80A73740 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00754 80A73744 A62D019E */ sh $t5, 0x019E($s1) ## 0000019E /* 00758 80A73748 862E0152 */ lh $t6, 0x0152($s1) ## 00000152 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A737A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A737A0.s index d4ca73f2d3..adf1a5ce11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A737A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A737A0.s @@ -102,7 +102,7 @@ glabel func_80A737A0 /* 008F0 80A738E0 10200019 */ beq $at, $zero, .L80A73948 /* 008F4 80A738E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 008F8 80A738E8 2630015C */ addiu $s0, $s1, 0x015C ## $s0 = 0000015C -/* 008FC 80A738EC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 008FC 80A738EC 0C0189B7 */ jal Collider_CylinderUpdate /* 00900 80A738F0 02002825 */ or $a1, $s0, $zero ## $a1 = 0000015C /* 00904 80A738F4 3C0180A7 */ lui $at, %hi(D_80A74144) ## $at = 80A70000 @@ -123,7 +123,7 @@ glabel func_80A737A0 /* 00940 80A73930 440A4000 */ mfc1 $t2, $f8 /* 00944 80A73934 440C2000 */ mfc1 $t4, $f4 /* 00948 80A73938 A62A019C */ sh $t2, 0x019C($s1) ## 0000019C -/* 0094C 80A7393C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0094C 80A7393C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00950 80A73940 A62C019E */ sh $t4, 0x019E($s1) ## 0000019E /* 00954 80A73944 86220152 */ lh $v0, 0x0152($s1) ## 00000152 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Destroy.s index 1429b4c354..6e753d0580 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Destroy.s @@ -19,16 +19,16 @@ glabel EnIk_Destroy /* 00040 80A74350 8FA50020 */ lw $a1, 0x0020($sp) .L80A74354: /* 00044 80A74354 8FA40024 */ lw $a0, 0x0024($sp) -/* 00048 80A74358 0C017232 */ jal func_8005C8C8 +/* 00048 80A74358 0C017232 */ jal Collider_DestroyTris /* 0004C 80A7435C 24A503EC */ addiu $a1, $a1, 0x03EC ## $a1 = 000003EC /* 00050 80A74360 8FA50020 */ lw $a1, 0x0020($sp) /* 00054 80A74364 8FA40024 */ lw $a0, 0x0024($sp) -/* 00058 80A74368 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00058 80A74368 0C0170EB */ jal Collider_DestroyCylinder /* 0005C 80A7436C 24A50320 */ addiu $a1, $a1, 0x0320 ## $a1 = 00000320 /* 00060 80A74370 8FA50020 */ lw $a1, 0x0020($sp) /* 00064 80A74374 8FA40024 */ lw $a0, 0x0024($sp) -/* 00068 80A74378 0C017418 */ jal func_8005D060 +/* 00068 80A74378 0C017418 */ jal Collider_DestroyQuad /* 0006C 80A7437C 24A5036C */ addiu $a1, $a1, 0x036C ## $a1 = 0000036C /* 00070 80A74380 8FBF001C */ lw $ra, 0x001C($sp) /* 00074 80A74384 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74398.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74398.s index 90fa495f25..61f49ad86e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74398.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74398.s @@ -16,19 +16,19 @@ glabel func_80A74398 /* 000C0 80A743D0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 000C4 80A743D4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 000C8 80A743D8 26050320 */ addiu $a1, $s0, 0x0320 ## $a1 = 00000320 -/* 000CC 80A743DC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000CC 80A743DC 0C0170D9 */ jal Collider_InitCylinder /* 000D0 80A743E0 AFA5002C */ sw $a1, 0x002C($sp) /* 000D4 80A743E4 3C0780A8 */ lui $a3, %hi(D_80A78340) ## $a3 = 80A80000 /* 000D8 80A743E8 8FA5002C */ lw $a1, 0x002C($sp) /* 000DC 80A743EC 24E78340 */ addiu $a3, $a3, %lo(D_80A78340) ## $a3 = 80A78340 /* 000E0 80A743F0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000E4 80A743F4 0C01712B */ jal ActorCollider_InitCylinder +/* 000E4 80A743F4 0C01712B */ jal Collider_SetCylinder /* 000E8 80A743F8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000EC 80A743FC 260503EC */ addiu $a1, $s0, 0x03EC ## $a1 = 000003EC /* 000F0 80A74400 AFA5002C */ sw $a1, 0x002C($sp) -/* 000F4 80A74404 0C0171F8 */ jal func_8005C7E0 +/* 000F4 80A74404 0C0171F8 */ jal Collider_InitTris /* 000F8 80A74408 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000FC 80A7440C 3C0780A8 */ lui $a3, %hi(D_80A783E4) ## $a3 = 80A80000 /* 00100 80A74410 260A040C */ addiu $t2, $s0, 0x040C ## $t2 = 0000040C @@ -36,17 +36,17 @@ glabel func_80A74398 /* 00108 80A74418 AFAA0010 */ sw $t2, 0x0010($sp) /* 0010C 80A7441C 24E783E4 */ addiu $a3, $a3, %lo(D_80A783E4) ## $a3 = 80A783E4 /* 00110 80A74420 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00114 80A74424 0C0172EB */ jal func_8005CBAC +/* 00114 80A74424 0C0172EB */ jal Collider_SetTris /* 00118 80A74428 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0011C 80A7442C 2605036C */ addiu $a1, $s0, 0x036C ## $a1 = 0000036C /* 00120 80A74430 AFA5002C */ sw $a1, 0x002C($sp) -/* 00124 80A74434 0C017406 */ jal func_8005D018 +/* 00124 80A74434 0C017406 */ jal Collider_InitQuad /* 00128 80A74438 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0012C 80A7443C 3C0780A8 */ lui $a3, %hi(D_80A783F4) ## $a3 = 80A80000 /* 00130 80A74440 8FA5002C */ lw $a1, 0x002C($sp) /* 00134 80A74444 24E783F4 */ addiu $a3, $a3, %lo(D_80A783F4) ## $a3 = 80A783F4 /* 00138 80A74448 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0013C 80A7444C 0C017441 */ jal func_8005D104 +/* 0013C 80A7444C 0C017441 */ jal Collider_SetQuad /* 00140 80A74450 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00144 80A74454 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 00148 80A74458 860E001C */ lh $t6, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7567C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7567C.s index f473c8da5a..b4851e3ff8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7567C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7567C.s @@ -8,7 +8,7 @@ glabel func_80A7567C /* 01384 80A75694 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01388 80A75698 00A12821 */ addu $a1, $a1, $at /* 0138C 80A7569C 24E603EC */ addiu $a2, $a3, 0x03EC ## $a2 = 000003EC -/* 01390 80A756A0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01390 80A756A0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01394 80A756A4 AFA70018 */ sw $a3, 0x0018($sp) /* 01398 80A756A8 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75FA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75FA0.s index a5cfdd3e99..6e478abc28 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75FA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75FA0.s @@ -94,7 +94,7 @@ glabel func_80A75FA0 /* 01DEC 80A760FC AE0F0040 */ sw $t7, 0x0040($s0) ## 00000040 /* 01DF0 80A76100 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01DF4 80A76104 E608003C */ swc1 $f8, 0x003C($s0) ## 0000003C -/* 01DF8 80A76108 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01DF8 80A76108 0C0189B7 */ jal Collider_CylinderUpdate /* 01DFC 80A7610C AFA50028 */ sw $a1, 0x0028($sp) /* 01E00 80A76110 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -102,7 +102,7 @@ glabel func_80A75FA0 /* 01E08 80A76118 02212821 */ addu $a1, $s1, $at /* 01E0C 80A7611C AFA5002C */ sw $a1, 0x002C($sp) /* 01E10 80A76120 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01E14 80A76124 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01E14 80A76124 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01E18 80A76128 8FA60028 */ lw $a2, 0x0028($sp) /* 01E1C 80A7612C 921800AF */ lbu $t8, 0x00AF($s0) ## 000000AF @@ -117,7 +117,7 @@ glabel func_80A75FA0 /* 01E40 80A76150 29210002 */ slti $at, $t1, 0x0002 /* 01E44 80A76154 54200004 */ bnel $at, $zero, .L80A76168 /* 01E48 80A76158 820A02FE */ lb $t2, 0x02FE($s0) ## 000002FE -/* 01E4C 80A7615C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01E4C 80A7615C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01E50 80A76160 8FA60028 */ lw $a2, 0x0028($sp) /* 01E54 80A76164 820A02FE */ lb $t2, 0x02FE($s0) ## 000002FE @@ -126,7 +126,7 @@ glabel func_80A75FA0 /* 01E5C 80A7616C 8FA5002C */ lw $a1, 0x002C($sp) /* 01E60 80A76170 59400004 */ blezl $t2, .L80A76184 /* 01E64 80A76174 921902F8 */ lbu $t9, 0x02F8($s0) ## 000002F8 -/* 01E68 80A76178 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01E68 80A76178 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01E6C 80A7617C 2606036C */ addiu $a2, $s0, 0x036C ## $a2 = 0000036C /* 01E70 80A76180 921902F8 */ lbu $t9, 0x02F8($s0) ## 000002F8 @@ -135,7 +135,7 @@ glabel func_80A75FA0 /* 01E78 80A76188 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01E7C 80A7618C 17210003 */ bne $t9, $at, .L80A7619C /* 01E80 80A76190 8FA5002C */ lw $a1, 0x002C($sp) -/* 01E84 80A76194 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01E84 80A76194 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01E88 80A76198 260603EC */ addiu $a2, $s0, 0x03EC ## $a2 = 000003EC .L80A7619C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Destroy.s index 5a4a205810..38e8bd4ca0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Destroy.s @@ -8,7 +8,7 @@ glabel EnIn_Destroy /* 00FDC 80A79F8C 25CE9FB0 */ addiu $t6, $t6, %lo(func_80A79FB0) ## $t6 = 80A79FB0 /* 00FE0 80A79F90 11C20003 */ beq $t6, $v0, .L80A79FA0 /* 00FE4 80A79F94 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00FE8 80A79F98 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00FE8 80A79F98 0C0170EB */ jal Collider_DestroyCylinder /* 00FEC 80A79F9C 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 .L80A79FA0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Update.s b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Update.s index ef47a86564..c53d33acac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Update.s @@ -17,14 +17,14 @@ glabel EnIn_Update /* 02198 80A7B148 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 0219C 80A7B14C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 021A0 80A7B150 AFA60030 */ sw $a2, 0x0030($sp) -/* 021A4 80A7B154 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 021A4 80A7B154 0C0189B7 */ jal Collider_CylinderUpdate /* 021A8 80A7B158 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 021AC 80A7B15C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 021B0 80A7B160 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 021B4 80A7B164 8FA60030 */ lw $a2, 0x0030($sp) /* 021B8 80A7B168 02212821 */ addu $a1, $s1, $at -/* 021BC 80A7B16C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 021BC 80A7B16C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 021C0 80A7B170 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 021C4 80A7B174 3C0F80A8 */ lui $t7, %hi(func_80A7A304) ## $t7 = 80A80000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s index ae4bfc1504..6c6689182b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s @@ -58,14 +58,14 @@ glabel func_80A79FB0 /* 01080 80A7A030 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01084 80A7A034 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 01088 80A7A038 AFA50034 */ sw $a1, 0x0034($sp) -/* 0108C 80A7A03C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0108C 80A7A03C 0C0170D9 */ jal Collider_InitCylinder /* 01090 80A7A040 8FA40044 */ lw $a0, 0x0044($sp) /* 01094 80A7A044 3C0780A8 */ lui $a3, %hi(D_80A7B840) ## $a3 = 80A80000 /* 01098 80A7A048 8FA50034 */ lw $a1, 0x0034($sp) /* 0109C 80A7A04C 24E7B840 */ addiu $a3, $a3, %lo(D_80A7B840) ## $a3 = 80A7B840 /* 010A0 80A7A050 8FA40044 */ lw $a0, 0x0044($sp) -/* 010A4 80A7A054 0C01712B */ jal ActorCollider_InitCylinder +/* 010A4 80A7A054 0C01712B */ jal Collider_SetCylinder /* 010A8 80A7A058 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 010AC 80A7A05C 3C0680A8 */ lui $a2, %hi(D_80A7B86C) ## $a2 = 80A80000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Destroy.s index ec7a73b345..78d2a659a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Destroy.s @@ -8,7 +8,7 @@ glabel EnInsect_Destroy /* 0052C 80A7C34C 00021400 */ sll $v0, $v0, 16 /* 00530 80A7C350 00021403 */ sra $v0, $v0, 16 /* 00534 80A7C354 A7A2001E */ sh $v0, 0x001E($sp) -/* 00538 80A7C358 0C016F32 */ jal func_8005BCC8 +/* 00538 80A7C358 0C016F32 */ jal Collider_DestroyJntSph /* 0053C 80A7C35C 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 00540 80A7C360 87A2001E */ lh $v0, 0x001E($sp) /* 00544 80A7C364 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Init.s index b0caa7b8cc..6db21836ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Init.s @@ -44,7 +44,7 @@ glabel EnInsect_Init /* 00344 80A7C164 262501AC */ addiu $a1, $s1, 0x01AC ## $a1 = 000001AC /* 00348 80A7C168 2630014C */ addiu $s0, $s1, 0x014C ## $s0 = 0000014C /* 0034C 80A7C16C 02002825 */ or $a1, $s0, $zero ## $a1 = 0000014C -/* 00350 80A7C170 0C016EFE */ jal func_8005BBF8 +/* 00350 80A7C170 0C016EFE */ jal Collider_InitJntSph /* 00354 80A7C174 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00358 80A7C178 3C0780A8 */ lui $a3, %hi(D_80A7DF00) ## $a3 = 80A80000 /* 0035C 80A7C17C 2639016C */ addiu $t9, $s1, 0x016C ## $t9 = 0000016C @@ -52,7 +52,7 @@ glabel EnInsect_Init /* 00364 80A7C184 24E7DF00 */ addiu $a3, $a3, %lo(D_80A7DF00) ## $a3 = 80A7DF00 /* 00368 80A7C188 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0036C 80A7C18C 02002825 */ or $a1, $s0, $zero ## $a1 = 0000014C -/* 00370 80A7C190 0C017014 */ jal func_8005C050 +/* 00370 80A7C190 0C017014 */ jal Collider_SetJntSph /* 00374 80A7C194 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00378 80A7C198 96230314 */ lhu $v1, 0x0314($s1) ## 00000314 /* 0037C 80A7C19C 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Update.s index b0677c6166..fe88c24816 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/EnInsect_Update.s @@ -123,7 +123,7 @@ glabel EnInsect_Update /* 01F8C 80A7DDAC 10200005 */ beq $at, $zero, .L80A7DDC4 /* 01F90 80A7DDB0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01F94 80A7DDB4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01F98 80A7DDB8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01F98 80A7DDB8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01F9C 80A7DDBC 00812821 */ addu $a1, $a0, $at /* 01FA0 80A7DDC0 96030314 */ lhu $v1, 0x0314($s0) ## 00000314 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Destroy.s index 7ef39fccb8..75658f8c70 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Destroy.s @@ -3,7 +3,7 @@ glabel EnIshi_Destroy /* 00C14 80A7F074 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00C18 80A7F078 AFBF0014 */ sw $ra, 0x0014($sp) /* 00C1C 80A7F07C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00C20 80A7F080 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00C20 80A7F080 0C0170EB */ jal Collider_DestroyCylinder /* 00C24 80A7F084 24E50150 */ addiu $a1, $a3, 0x0150 ## $a1 = 00000150 /* 00C28 80A7F088 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E460.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E460.s index cc1b420c04..7062ce5f2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E460.s @@ -6,7 +6,7 @@ glabel func_80A7E460 /* 00010 80A7E470 AFBF0014 */ sw $ra, 0x0014($sp) /* 00014 80A7E474 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 00018 80A7E478 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80A7E47C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0001C 80A7E47C 0C0170D9 */ jal Collider_InitCylinder /* 00020 80A7E480 AFA60020 */ sw $a2, 0x0020($sp) /* 00024 80A7E484 8FA60020 */ lw $a2, 0x0020($sp) @@ -21,11 +21,11 @@ glabel func_80A7E460 /* 00048 80A7E4A8 0018C080 */ sll $t8, $t8, 2 /* 0004C 80A7E4AC 030FC023 */ subu $t8, $t8, $t7 /* 00050 80A7E4B0 0018C080 */ sll $t8, $t8, 2 -/* 00054 80A7E4B4 0C01712B */ jal ActorCollider_InitCylinder +/* 00054 80A7E4B4 0C01712B */ jal Collider_SetCylinder /* 00058 80A7E4B8 03193821 */ addu $a3, $t8, $t9 /* 0005C 80A7E4BC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00060 80A7E4C0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00060 80A7E4C0 0C0189B7 */ jal Collider_CylinderUpdate /* 00064 80A7E4C4 8FA50018 */ lw $a1, 0x0018($sp) /* 00068 80A7E4C8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s index 3830b21fcd..825fdc49ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s @@ -96,7 +96,7 @@ glabel func_80A7F0A8 /* 00DAC 80A7F20C 00000000 */ nop /* 00DB0 80A7F210 45020035 */ bc1fl .L80A7F2E8 /* 00DB4 80A7F214 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00DB8 80A7F218 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00DB8 80A7F218 0C0189B7 */ jal Collider_CylinderUpdate /* 00DBC 80A7F21C AFA5002C */ sw $a1, 0x002C($sp) /* 00DC0 80A7F220 92080161 */ lbu $t0, 0x0161($s0) ## 00000161 @@ -107,7 +107,7 @@ glabel func_80A7F0A8 /* 00DD4 80A7F234 02212821 */ addu $a1, $s1, $at /* 00DD8 80A7F238 AFA50028 */ sw $a1, 0x0028($sp) /* 00DDC 80A7F23C 8FA6002C */ lw $a2, 0x002C($sp) -/* 00DE0 80A7F240 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00DE0 80A7F240 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00DE4 80A7F244 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DE8 80A7F248 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 @@ -119,7 +119,7 @@ glabel func_80A7F0A8 /* 00E00 80A7F260 00000000 */ nop /* 00E04 80A7F264 45020020 */ bc1fl .L80A7F2E8 /* 00E08 80A7F268 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00E0C 80A7F26C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00E0C 80A7F26C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00E10 80A7F270 8FA6002C */ lw $a2, 0x002C($sp) /* 00E14 80A7F274 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s index d8be9c5609..523d6e939b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s @@ -214,14 +214,14 @@ glabel func_80A7F514 /* 013DC 80A7F83C 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 /* 013E0 80A7F840 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000150 /* 013E4 80A7F844 AFA60030 */ sw $a2, 0x0030($sp) -/* 013E8 80A7F848 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 013E8 80A7F848 0C0189B7 */ jal Collider_CylinderUpdate /* 013EC 80A7F84C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 013F0 80A7F850 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 013F4 80A7F854 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 013F8 80A7F858 8FA60030 */ lw $a2, 0x0030($sp) /* 013FC 80A7F85C 02212821 */ addu $a1, $s1, $at -/* 01400 80A7F860 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01400 80A7F860 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01404 80A7F864 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01408 80A7F868 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Destroy.s index 9dc9c61a0e..f6bc2a4e83 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Destroy.s @@ -22,7 +22,7 @@ glabel EnJj_Destroy /* 002DC 80A87ADC 24E50810 */ addiu $a1, $a3, 0x0810 ## $a1 = 00000810 /* 002E0 80A87AE0 8FA50018 */ lw $a1, 0x0018($sp) /* 002E4 80A87AE4 8FA4001C */ lw $a0, 0x001C($sp) -/* 002E8 80A87AE8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002E8 80A87AE8 0C0170EB */ jal Collider_DestroyCylinder /* 002EC 80A87AEC 24A502B0 */ addiu $a1, $a1, 0x02B0 ## $a1 = 000002B0 /* 002F0 80A87AF0 10000007 */ beq $zero, $zero, .L80A87B10 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s index b69c3c1ae6..5c2c172373 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s @@ -108,14 +108,14 @@ glabel EnJj_Init /* 0018C 80A8798C AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 00190 80A87990 260502B0 */ addiu $a1, $s0, 0x02B0 ## $a1 = 000002B0 /* 00194 80A87994 AFA50044 */ sw $a1, 0x0044($sp) -/* 00198 80A87998 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00198 80A87998 0C0170D9 */ jal Collider_InitCylinder /* 0019C 80A8799C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001A0 80A879A0 3C0780A9 */ lui $a3, %hi(D_80A88CB4) ## $a3 = 80A90000 /* 001A4 80A879A4 8FA50044 */ lw $a1, 0x0044($sp) /* 001A8 80A879A8 24E78CB4 */ addiu $a3, $a3, %lo(D_80A88CB4) ## $a3 = 80A88CB4 /* 001AC 80A879AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001B0 80A879B0 0C01712B */ jal ActorCollider_InitCylinder +/* 001B0 80A879B0 0C01712B */ jal Collider_SetCylinder /* 001B4 80A879B4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001B8 80A879B8 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87C30.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87C30.s index 79e231d8a9..cf4317833b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87C30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/func_80A87C30.s @@ -42,7 +42,7 @@ glabel func_80A87C30 /* 004C4 80A87CC4 A60802FA */ sh $t0, 0x02FA($s0) ## 000002FA /* 004C8 80A87CC8 02212821 */ addu $a1, $s1, $at /* 004CC 80A87CCC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004D0 80A87CD0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 004D0 80A87CD0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 004D4 80A87CD4 260602B0 */ addiu $a2, $s0, 0x02B0 ## $a2 = 000002B0 /* 004D8 80A87CD8 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Destroy.s index 6831bccdaf..58b1cbbad4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Destroy.s @@ -3,7 +3,7 @@ glabel EnJs_Destroy /* 00130 80A88F40 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00134 80A88F44 AFBF0014 */ sw $ra, 0x0014($sp) /* 00138 80A88F48 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0013C 80A88F4C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0013C 80A88F4C 0C0170EB */ jal Collider_DestroyCylinder /* 00140 80A88F50 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 00144 80A88F54 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s index 8355526837..e69eeddd32 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s @@ -31,14 +31,14 @@ glabel EnJs_Init /* 00078 80A88E88 8FA40044 */ lw $a0, 0x0044($sp) /* 0007C 80A88E8C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00080 80A88E90 AFA50044 */ sw $a1, 0x0044($sp) -/* 00084 80A88E94 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00084 80A88E94 0C0170D9 */ jal Collider_InitCylinder /* 00088 80A88E98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0008C 80A88E9C 3C0780A9 */ lui $a3, %hi(D_80A896B0) ## $a3 = 80A90000 /* 00090 80A88EA0 8FA50044 */ lw $a1, 0x0044($sp) /* 00094 80A88EA4 24E796B0 */ addiu $a3, $a3, %lo(D_80A896B0) ## $a3 = 80A896B0 /* 00098 80A88EA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0009C 80A88EAC 0C01712B */ jal ActorCollider_InitCylinder +/* 0009C 80A88EAC 0C01712B */ jal Collider_SetCylinder /* 000A0 80A88EB0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000A4 80A88EB4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Update.s index 6c8b70c094..4b013c1d2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Update.s @@ -6,14 +6,14 @@ glabel EnJs_Update /* 00538 80A89348 AFA5004C */ sw $a1, 0x004C($sp) /* 0053C 80A8934C 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 00540 80A89350 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 00544 80A89354 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00544 80A89354 0C0189B7 */ jal Collider_CylinderUpdate /* 00548 80A89358 AFA60034 */ sw $a2, 0x0034($sp) /* 0054C 80A8935C 8FA4004C */ lw $a0, 0x004C($sp) /* 00550 80A89360 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00554 80A89364 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00558 80A89368 8FA60034 */ lw $a2, 0x0034($sp) -/* 0055C 80A8936C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0055C 80A8936C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00560 80A89370 00812821 */ addu $a1, $a0, $at /* 00564 80A89374 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Destroy.s index 8b684f6a1f..d9121ad8de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Destroy.s @@ -3,7 +3,7 @@ glabel EnKakasi_Destroy /* 00004 80A8F174 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00008 80A8F178 AFBF0014 */ sw $ra, 0x0014($sp) /* 0000C 80A8F17C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 80A8F180 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00010 80A8F180 0C0170EB */ jal Collider_DestroyCylinder /* 00014 80A8F184 24C501BC */ addiu $a1, $a2, 0x01BC ## $a1 = 000001BC /* 00018 80A8F188 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s index acb8b10fa4..17f98730bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s @@ -29,14 +29,14 @@ glabel EnKakasi_Init /* 00064 80A8F1D4 00000000 */ nop /* 00068 80A8F1D8 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC /* 0006C 80A8F1DC AFA50030 */ sw $a1, 0x0030($sp) -/* 00070 80A8F1E0 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00070 80A8F1E0 0C0170D9 */ jal Collider_InitCylinder /* 00074 80A8F1E4 8FA4003C */ lw $a0, 0x003C($sp) /* 00078 80A8F1E8 3C0780A9 */ lui $a3, %hi(D_80A8FDE0) ## $a3 = 80A90000 /* 0007C 80A8F1EC 8FA50030 */ lw $a1, 0x0030($sp) /* 00080 80A8F1F0 24E7FDE0 */ addiu $a3, $a3, %lo(D_80A8FDE0) ## $a3 = 80A8FDE0 /* 00084 80A8F1F4 8FA4003C */ lw $a0, 0x003C($sp) -/* 00088 80A8F1F8 0C01712B */ jal ActorCollider_InitCylinder +/* 00088 80A8F1F8 0C01712B */ jal Collider_SetCylinder /* 0008C 80A8F1FC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00090 80A8F200 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Update.s index 9bd266ea9a..193a75281b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Update.s @@ -55,14 +55,14 @@ glabel EnKakasi_Update /* 00BA0 80A8FD10 260601BC */ addiu $a2, $s0, 0x01BC ## $a2 = 000001BC /* 00BA4 80A8FD14 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001BC /* 00BA8 80A8FD18 AFA60028 */ sw $a2, 0x0028($sp) -/* 00BAC 80A8FD1C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00BAC 80A8FD1C 0C0189B7 */ jal Collider_CylinderUpdate /* 00BB0 80A8FD20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00BB4 80A8FD24 8FA4003C */ lw $a0, 0x003C($sp) /* 00BB8 80A8FD28 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00BBC 80A8FD2C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00BC0 80A8FD30 8FA60028 */ lw $a2, 0x0028($sp) -/* 00BC4 80A8FD34 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00BC4 80A8FD34 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00BC8 80A8FD38 00812821 */ addu $a1, $a0, $at /* 00BCC 80A8FD3C 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s index ff93e47d32..b866a2e85d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s @@ -3,7 +3,7 @@ glabel EnKakasi2_Destroy /* 00230 80A90240 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00234 80A90244 AFBF0014 */ sw $ra, 0x0014($sp) /* 00238 80A90248 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0023C 80A9024C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0023C 80A9024C 0C0170EB */ jal Collider_DestroyCylinder /* 00240 80A90250 24C501AC */ addiu $a1, $a2, 0x01AC ## $a1 = 000001AC /* 00244 80A90254 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s index 4c9ad834bf..507de23798 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s @@ -155,14 +155,14 @@ glabel EnKakasi2_Init /* 0019C 80A901AC AE0F0134 */ sw $t7, 0x0134($s0) ## 00000134 /* 001A0 80A901B0 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC /* 001A4 80A901B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 001A8 80A901B8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 001A8 80A901B8 0C0170D9 */ jal Collider_InitCylinder /* 001AC 80A901BC 8FA4004C */ lw $a0, 0x004C($sp) /* 001B0 80A901C0 3C0780A9 */ lui $a3, %hi(D_80A909A0) ## $a3 = 80A90000 /* 001B4 80A901C4 8FA50034 */ lw $a1, 0x0034($sp) /* 001B8 80A901C8 24E709A0 */ addiu $a3, $a3, %lo(D_80A909A0) ## $a3 = 80A909A0 /* 001BC 80A901CC 8FA4004C */ lw $a0, 0x004C($sp) -/* 001C0 80A901D0 0C01712B */ jal ActorCollider_InitCylinder +/* 001C0 80A901D0 0C01712B */ jal Collider_SetCylinder /* 001C4 80A901D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001C8 80A901D8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s index 6a535e1b1a..7e1146f94d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s @@ -44,7 +44,7 @@ glabel EnKakasi2_Update /* 00788 80A90798 00000000 */ nop /* 0078C 80A9079C 4500000E */ bc1f .L80A907D8 /* 00790 80A907A0 00000000 */ nop -/* 00794 80A907A4 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00794 80A907A4 0C0189B7 */ jal Collider_CylinderUpdate /* 00798 80A907A8 AFA50050 */ sw $a1, 0x0050($sp) /* 0079C 80A907AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -52,12 +52,12 @@ glabel EnKakasi2_Update /* 007A4 80A907B4 02212821 */ addu $a1, $s1, $at /* 007A8 80A907B8 AFA50054 */ sw $a1, 0x0054($sp) /* 007AC 80A907BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007B0 80A907C0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 007B0 80A907C0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 007B4 80A907C4 8FA60050 */ lw $a2, 0x0050($sp) /* 007B8 80A907C8 8FA50054 */ lw $a1, 0x0054($sp) /* 007BC 80A907CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007C0 80A907D0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 007C0 80A907D0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 007C4 80A907D4 8FA60050 */ lw $a2, 0x0050($sp) .L80A907D8: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s index a33cdc7cae..27c87bcf3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s @@ -44,14 +44,14 @@ glabel func_80A90264 /* 002D4 80A902E4 AC880134 */ sw $t0, 0x0134($a0) ## 00000134 /* 002D8 80A902E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 002DC 80A902EC 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC -/* 002E0 80A902F0 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 002E0 80A902F0 0C0170D9 */ jal Collider_InitCylinder /* 002E4 80A902F4 AFA50030 */ sw $a1, 0x0030($sp) /* 002E8 80A902F8 3C0780A9 */ lui $a3, %hi(D_80A909A0) ## $a3 = 80A90000 /* 002EC 80A902FC 8FA50030 */ lw $a1, 0x0030($sp) /* 002F0 80A90300 24E709A0 */ addiu $a3, $a3, %lo(D_80A909A0) ## $a3 = 80A909A0 /* 002F4 80A90304 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002F8 80A90308 0C01712B */ jal ActorCollider_InitCylinder +/* 002F8 80A90308 0C01712B */ jal Collider_SetCylinder /* 002FC 80A9030C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00300 80A90310 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -139,14 +139,14 @@ glabel func_80A90264 /* 0042C 80A9043C AE180134 */ sw $t8, 0x0134($s0) ## 00000134 /* 00430 80A90440 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC /* 00434 80A90444 AFA50030 */ sw $a1, 0x0030($sp) -/* 00438 80A90448 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00438 80A90448 0C0170D9 */ jal Collider_InitCylinder /* 0043C 80A9044C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00440 80A90450 3C0780A9 */ lui $a3, %hi(D_80A909A0) ## $a3 = 80A90000 /* 00444 80A90454 8FA50030 */ lw $a1, 0x0030($sp) /* 00448 80A90458 24E709A0 */ addiu $a3, $a3, %lo(D_80A909A0) ## $a3 = 80A909A0 /* 0044C 80A9045C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00450 80A90460 0C01712B */ jal ActorCollider_InitCylinder +/* 00450 80A90460 0C01712B */ jal Collider_SetCylinder /* 00454 80A90464 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00458 80A90468 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Destroy.s index 2da88f8ac6..909f2eafcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Destroy.s @@ -3,7 +3,7 @@ glabel EnKakasi3_Destroy /* 00004 80A90D24 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00008 80A90D28 AFBF0014 */ sw $ra, 0x0014($sp) /* 0000C 80A90D2C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 80A90D30 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00010 80A90D30 0C0170EB */ jal Collider_DestroyCylinder /* 00014 80A90D34 24C501BC */ addiu $a1, $a2, 0x01BC ## $a1 = 000001BC /* 00018 80A90D38 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s index 68cf1a3be4..fd673e91fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s @@ -26,14 +26,14 @@ glabel EnKakasi3_Init /* 00058 80A90D78 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F /* 0005C 80A90D7C 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC /* 00060 80A90D80 AFA50030 */ sw $a1, 0x0030($sp) -/* 00064 80A90D84 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00064 80A90D84 0C0170D9 */ jal Collider_InitCylinder /* 00068 80A90D88 8FA4003C */ lw $a0, 0x003C($sp) /* 0006C 80A90D8C 3C0780A9 */ lui $a3, %hi(D_80A91D10) ## $a3 = 80A90000 /* 00070 80A90D90 8FA50030 */ lw $a1, 0x0030($sp) /* 00074 80A90D94 24E71D10 */ addiu $a3, $a3, %lo(D_80A91D10) ## $a3 = 80A91D10 /* 00078 80A90D98 8FA4003C */ lw $a0, 0x003C($sp) -/* 0007C 80A90D9C 0C01712B */ jal ActorCollider_InitCylinder +/* 0007C 80A90D9C 0C01712B */ jal Collider_SetCylinder /* 00080 80A90DA0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00084 80A90DA4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s index f3c781ccfb..6d90d5a565 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s @@ -78,14 +78,14 @@ glabel EnKakasi3_Update /* 00F58 80A91C78 260601BC */ addiu $a2, $s0, 0x01BC ## $a2 = 000001BC /* 00F5C 80A91C7C 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001BC /* 00F60 80A91C80 AFA60028 */ sw $a2, 0x0028($sp) -/* 00F64 80A91C84 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00F64 80A91C84 0C0189B7 */ jal Collider_CylinderUpdate /* 00F68 80A91C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F6C 80A91C8C 8FA4003C */ lw $a0, 0x003C($sp) /* 00F70 80A91C90 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00F74 80A91C94 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00F78 80A91C98 8FA60028 */ lw $a2, 0x0028($sp) -/* 00F7C 80A91C9C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00F7C 80A91C9C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00F80 80A91CA0 00812821 */ addu $a1, $a0, $at /* 00F84 80A91CA4 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Destroy.s index 933632a41c..8c679bfa6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Destroy.s @@ -6,7 +6,7 @@ glabel EnKanban_Destroy /* 001FC 80A9219C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00200 80A921A0 55C00004 */ bnel $t6, $zero, .L80A921B4 /* 00204 80A921A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00208 80A921A8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00208 80A921A8 0C0170EB */ jal Collider_DestroyCylinder /* 0020C 80A921AC 24C501A0 */ addiu $a1, $a2, 0x01A0 ## $a1 = 000001A0 /* 00210 80A921B0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Init.s index 5987c7a279..7d12d0f404 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Init.s @@ -24,14 +24,14 @@ glabel EnKanban_Init /* 000F4 80A92094 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 /* 000F8 80A92098 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 /* 000FC 80A9209C AFA50028 */ sw $a1, 0x0028($sp) -/* 00100 80A920A0 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00100 80A920A0 0C0170D9 */ jal Collider_InitCylinder /* 00104 80A920A4 8FA40034 */ lw $a0, 0x0034($sp) /* 00108 80A920A8 3C0780A9 */ lui $a3, %hi(D_80A94490) ## $a3 = 80A90000 /* 0010C 80A920AC 8FA50028 */ lw $a1, 0x0028($sp) /* 00110 80A920B0 24E74490 */ addiu $a3, $a3, %lo(D_80A94490) ## $a3 = 80A94490 /* 00114 80A920B4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00118 80A920B8 0C01712B */ jal ActorCollider_InitCylinder +/* 00118 80A920B8 0C01712B */ jal Collider_SetCylinder /* 0011C 80A920BC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00120 80A920C0 3C0480A9 */ lui $a0, %hi(D_80A94FE0) ## $a0 = 80A90000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s index dec1db8e71..1f42598de4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s @@ -559,7 +559,7 @@ glabel L80A922CC /* 009AC 80A9294C 02002825 */ or $a1, $s0, $zero ## $a1 = 000001A0 /* 009B0 80A92950 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 009B4 80A92954 E626003C */ swc1 $f6, 0x003C($s1) ## 0000003C -/* 009B8 80A92958 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 009B8 80A92958 0C0189B7 */ jal Collider_CylinderUpdate /* 009BC 80A9295C AE2A0040 */ sw $t2, 0x0040($s1) ## 00000040 /* 009C0 80A92960 8FA40104 */ lw $a0, 0x0104($sp) @@ -567,12 +567,12 @@ glabel L80A922CC /* 009C8 80A92968 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 009CC 80A9296C 00812821 */ addu $a1, $a0, $at /* 009D0 80A92970 AFA50054 */ sw $a1, 0x0054($sp) -/* 009D4 80A92974 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 009D4 80A92974 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 009D8 80A92978 02003025 */ or $a2, $s0, $zero ## $a2 = 000001A0 /* 009DC 80A9297C 8FA50054 */ lw $a1, 0x0054($sp) /* 009E0 80A92980 8FA40104 */ lw $a0, 0x0104($sp) -/* 009E4 80A92984 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 009E4 80A92984 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 009E8 80A92988 02003025 */ or $a2, $s0, $zero ## $a2 = 000001A0 /* 009EC 80A9298C 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Destroy.s index 51dc72791b..ff431833c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Destroy.s @@ -5,12 +5,12 @@ glabel EnKarebaba_Destroy /* 0013C 80A9548C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00140 80A95490 8FA50018 */ lw $a1, 0x0018($sp) /* 00144 80A95494 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00148 80A95498 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00148 80A95498 0C0170EB */ jal Collider_DestroyCylinder /* 0014C 80A9549C 24A50244 */ addiu $a1, $a1, 0x0244 ## $a1 = 00000244 /* 00150 80A954A0 8FA50018 */ lw $a1, 0x0018($sp) /* 00154 80A954A4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00158 80A954A8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00158 80A954A8 0C0170EB */ jal Collider_DestroyCylinder /* 0015C 80A954AC 24A501F8 */ addiu $a1, $a1, 0x01F8 ## $a1 = 000001F8 /* 00160 80A954B0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Init.s index e40ea64ca5..f542389666 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Init.s @@ -32,37 +32,37 @@ glabel EnKarebaba_Init /* 0006C 80A953BC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00070 80A953C0 26050244 */ addiu $a1, $s0, 0x0244 ## $a1 = 00000244 /* 00074 80A953C4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00078 80A953C8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00078 80A953C8 0C0170D9 */ jal Collider_InitCylinder /* 0007C 80A953CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00080 80A953D0 3C0780A9 */ lui $a3, %hi(D_80A969F0) ## $a3 = 80A90000 /* 00084 80A953D4 24E769F0 */ addiu $a3, $a3, %lo(D_80A969F0) ## $a3 = 80A969F0 /* 00088 80A953D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0008C 80A953DC 8FA50034 */ lw $a1, 0x0034($sp) -/* 00090 80A953E0 0C01712B */ jal ActorCollider_InitCylinder +/* 00090 80A953E0 0C01712B */ jal Collider_SetCylinder /* 00094 80A953E4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00098 80A953E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0009C 80A953EC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0009C 80A953EC 0C0189B7 */ jal Collider_CylinderUpdate /* 000A0 80A953F0 8FA50034 */ lw $a1, 0x0034($sp) /* 000A4 80A953F4 260501F8 */ addiu $a1, $s0, 0x01F8 ## $a1 = 000001F8 /* 000A8 80A953F8 AFA50034 */ sw $a1, 0x0034($sp) -/* 000AC 80A953FC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000AC 80A953FC 0C0170D9 */ jal Collider_InitCylinder /* 000B0 80A95400 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000B4 80A95404 3C0780A9 */ lui $a3, %hi(D_80A96A1C) ## $a3 = 80A90000 /* 000B8 80A95408 24E76A1C */ addiu $a3, $a3, %lo(D_80A96A1C) ## $a3 = 80A96A1C /* 000BC 80A9540C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000C0 80A95410 8FA50034 */ lw $a1, 0x0034($sp) -/* 000C4 80A95414 0C01712B */ jal ActorCollider_InitCylinder +/* 000C4 80A95414 0C01712B */ jal Collider_SetCylinder /* 000C8 80A95418 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000CC 80A9541C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000D0 80A95420 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 000D0 80A95420 0C0189B7 */ jal Collider_CylinderUpdate /* 000D4 80A95424 8FA50034 */ lw $a1, 0x0034($sp) -/* 000D8 80A95428 0C016C80 */ jal CollisionBtlTbl_Get +/* 000D8 80A95428 0C016C80 */ jal DamageTable_Get /* 000DC 80A9542C 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 000E0 80A95430 3C0680A9 */ lui $a2, %hi(D_80A96A48) ## $a2 = 80A90000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Update.s index d727f69aae..9edf086ab5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Update.s @@ -70,12 +70,12 @@ glabel EnKarebaba_Update /* 01040 80A96390 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01044 80A96394 02212821 */ addu $a1, $s1, $at /* 01048 80A96398 AFA50030 */ sw $a1, 0x0030($sp) -/* 0104C 80A9639C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0104C 80A9639C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01050 80A963A0 260601F8 */ addiu $a2, $s0, 0x01F8 ## $a2 = 000001F8 /* 01054 80A963A4 8FA50030 */ lw $a1, 0x0030($sp) /* 01058 80A963A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0105C 80A963AC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0105C 80A963AC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01060 80A963B0 26060244 */ addiu $a2, $s0, 0x0244 ## $a2 = 00000244 .L80A963B4: @@ -83,7 +83,7 @@ glabel EnKarebaba_Update /* 01068 80A963B8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0106C 80A963BC 02212821 */ addu $a1, $s1, $at /* 01070 80A963C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01074 80A963C4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01074 80A963C4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01078 80A963C8 260601F8 */ addiu $a2, $s0, 0x01F8 ## $a2 = 000001F8 /* 0107C 80A963CC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Destroy.s index befe141a4e..91c0c61645 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Destroy.s @@ -3,7 +3,7 @@ glabel EnKo_Destroy /* 02274 80A99024 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 02278 80A99028 AFBF0014 */ sw $ra, 0x0014($sp) /* 0227C 80A9902C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02280 80A99030 0C0170EB */ jal ActorCollider_FreeCylinder +/* 02280 80A99030 0C0170EB */ jal Collider_DestroyCylinder /* 02284 80A99034 24C50198 */ addiu $a1, $a2, 0x0198 ## $a1 = 00000198 /* 02288 80A99038 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Update.s index 5bc22e6964..5e6cf1fc04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Update.s @@ -82,14 +82,14 @@ glabel EnKo_Update /* 02A74 80A99824 26060198 */ addiu $a2, $s0, 0x0198 ## $a2 = 00000198 /* 02A78 80A99828 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000198 /* 02A7C 80A9982C AFA60028 */ sw $a2, 0x0028($sp) -/* 02A80 80A99830 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 02A80 80A99830 0C0189B7 */ jal Collider_CylinderUpdate /* 02A84 80A99834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02A88 80A99838 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02A8C 80A9983C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02A90 80A99840 8FA60028 */ lw $a2, 0x0028($sp) /* 02A94 80A99844 02212821 */ addu $a1, $s1, $at -/* 02A98 80A99848 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02A98 80A99848 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02A9C 80A9984C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02AA0 80A99850 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s index 89bc6bfd90..704ece21f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s @@ -74,14 +74,14 @@ glabel func_80A99048 /* 023B4 80A99164 01A17021 */ addu $t6, $t5, $at /* 023B8 80A99168 3C018016 */ lui $at, %hi(gSegments+0x18) /* 023BC 80A9916C AC2E6FC0 */ sw $t6, %lo(gSegments+0x18)($at) -/* 023C0 80A99170 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 023C0 80A99170 0C0170D9 */ jal Collider_InitCylinder /* 023C4 80A99174 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 023C8 80A99178 3C0780AA */ lui $a3, %hi(D_80A9A100) ## $a3 = 80AA0000 /* 023CC 80A9917C 8FA50040 */ lw $a1, 0x0040($sp) /* 023D0 80A99180 24E7A100 */ addiu $a3, $a3, %lo(D_80A9A100) ## $a3 = 80A9A100 /* 023D4 80A99184 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 023D8 80A99188 0C01712B */ jal ActorCollider_InitCylinder +/* 023D8 80A99188 0C01712B */ jal Collider_SetCylinder /* 023DC 80A9918C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 023E0 80A99190 3C0680AA */ lui $a2, %hi(D_80A9A12C) ## $a2 = 80AA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Destroy.s index 7c2ac31b97..4fc3bfe6f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/EnKusa_Destroy.s @@ -3,7 +3,7 @@ glabel EnKusa_Destroy /* 00828 80A9B7C8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0082C 80A9B7CC AFBF0014 */ sw $ra, 0x0014($sp) /* 00830 80A9B7D0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00834 80A9B7D4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00834 80A9B7D4 0C0170EB */ jal Collider_DestroyCylinder /* 00838 80A9B7D8 24E50150 */ addiu $a1, $a3, 0x0150 ## $a1 = 00000150 /* 0083C 80A9B7DC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B630.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B630.s index 682f51d5e7..04be7ac081 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B630.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B630.s @@ -6,18 +6,18 @@ glabel func_80A9B630 /* 006A0 80A9B640 AFBF0014 */ sw $ra, 0x0014($sp) /* 006A4 80A9B644 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 006A8 80A9B648 AFA50018 */ sw $a1, 0x0018($sp) -/* 006AC 80A9B64C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 006AC 80A9B64C 0C0170D9 */ jal Collider_InitCylinder /* 006B0 80A9B650 AFA60020 */ sw $a2, 0x0020($sp) /* 006B4 80A9B654 3C0780AA */ lui $a3, %hi(D_80A9C208) ## $a3 = 80AA0000 /* 006B8 80A9B658 8FA60020 */ lw $a2, 0x0020($sp) /* 006BC 80A9B65C 24E7C208 */ addiu $a3, $a3, %lo(D_80A9C208) ## $a3 = 80A9C208 /* 006C0 80A9B660 8FA40024 */ lw $a0, 0x0024($sp) -/* 006C4 80A9B664 0C01712B */ jal ActorCollider_InitCylinder +/* 006C4 80A9B664 0C01712B */ jal Collider_SetCylinder /* 006C8 80A9B668 8FA50018 */ lw $a1, 0x0018($sp) /* 006CC 80A9B66C 8FA40020 */ lw $a0, 0x0020($sp) -/* 006D0 80A9B670 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 006D0 80A9B670 0C0189B7 */ jal Collider_CylinderUpdate /* 006D4 80A9B674 8FA50018 */ lw $a1, 0x0018($sp) /* 006D8 80A9B678 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B8D8.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B8D8.s index d5830f4128..4da61ea306 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B8D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B8D8.s @@ -85,7 +85,7 @@ glabel func_80A9B8D8 /* 00A60 80A9BA00 00000000 */ nop /* 00A64 80A9BA04 45020020 */ bc1fl .L80A9BA88 /* 00A68 80A9BA08 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A6C 80A9BA0C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00A6C 80A9BA0C 0C0189B7 */ jal Collider_CylinderUpdate /* 00A70 80A9BA10 AFA50028 */ sw $a1, 0x0028($sp) /* 00A74 80A9BA14 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -93,7 +93,7 @@ glabel func_80A9B8D8 /* 00A7C 80A9BA1C 02212821 */ addu $a1, $s1, $at /* 00A80 80A9BA20 AFA50024 */ sw $a1, 0x0024($sp) /* 00A84 80A9BA24 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A88 80A9BA28 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00A88 80A9BA28 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00A8C 80A9BA2C 8FA60028 */ lw $a2, 0x0028($sp) /* 00A90 80A9BA30 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 @@ -105,7 +105,7 @@ glabel func_80A9B8D8 /* 00AA8 80A9BA48 00000000 */ nop /* 00AAC 80A9BA4C 4502000E */ bc1fl .L80A9BA88 /* 00AB0 80A9BA50 8FBF001C */ lw $ra, 0x001C($sp) -/* 00AB4 80A9BA54 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00AB4 80A9BA54 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00AB8 80A9BA58 8FA60028 */ lw $a2, 0x0028($sp) /* 00ABC 80A9BA5C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BC1C.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BC1C.s index 83d38f427f..2a196261de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BC1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BC1C.s @@ -160,14 +160,14 @@ glabel func_80A9BC1C /* 00ECC 80A9BE6C 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 /* 00ED0 80A9BE70 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000150 /* 00ED4 80A9BE74 AFA60028 */ sw $a2, 0x0028($sp) -/* 00ED8 80A9BE78 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00ED8 80A9BE78 0C0189B7 */ jal Collider_CylinderUpdate /* 00EDC 80A9BE7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00EE0 80A9BE80 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00EE4 80A9BE84 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00EE8 80A9BE88 8FA60028 */ lw $a2, 0x0028($sp) /* 00EEC 80A9BE8C 02212821 */ addu $a1, $s1, $at -/* 00EF0 80A9BE90 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00EF0 80A9BE90 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00EF4 80A9BE94 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00EF8 80A9BE98 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Destroy.s index 026419914a..8772a1f93a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Destroy.s @@ -3,7 +3,7 @@ glabel EnKz_Destroy /* 00B4C 80A9D09C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00B50 80A9D0A0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00B54 80A9D0A4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00B58 80A9D0A8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00B58 80A9D0A8 0C0170EB */ jal Collider_DestroyCylinder /* 00B5C 80A9D0AC 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 00B60 80A9D0B0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s index 2e93398e0c..3fb8ca350f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s @@ -28,14 +28,14 @@ glabel EnKz_Init /* 00A20 80A9CF70 00000000 */ nop /* 00A24 80A9CF74 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00A28 80A9CF78 AFA50040 */ sw $a1, 0x0040($sp) -/* 00A2C 80A9CF7C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00A2C 80A9CF7C 0C0170D9 */ jal Collider_InitCylinder /* 00A30 80A9CF80 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A34 80A9CF84 3C0780AA */ lui $a3, %hi(D_80A9D8C0) ## $a3 = 80AA0000 /* 00A38 80A9CF88 8FA50040 */ lw $a1, 0x0040($sp) /* 00A3C 80A9CF8C 24E7D8C0 */ addiu $a3, $a3, %lo(D_80A9D8C0) ## $a3 = 80A9D8C0 /* 00A40 80A9CF90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A44 80A9CF94 0C01712B */ jal ActorCollider_InitCylinder +/* 00A44 80A9CF94 0C01712B */ jal Collider_SetCylinder /* 00A48 80A9CF98 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00A4C 80A9CF9C 3C0680AA */ lui $a2, %hi(D_80A9D8EC) ## $a2 = 80AA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Update.s index d27d9580de..d7093f075d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Update.s @@ -17,14 +17,14 @@ glabel EnKz_Update /* 0109C 80A9D5EC 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 010A0 80A9D5F0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 010A4 80A9D5F4 AFA60024 */ sw $a2, 0x0024($sp) -/* 010A8 80A9D5F8 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 010A8 80A9D5F8 0C0189B7 */ jal Collider_CylinderUpdate /* 010AC 80A9D5FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 010B0 80A9D600 8FA40034 */ lw $a0, 0x0034($sp) /* 010B4 80A9D604 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 010B8 80A9D608 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 010BC 80A9D60C 8FA60024 */ lw $a2, 0x0024($sp) -/* 010C0 80A9D610 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 010C0 80A9D610 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 010C4 80A9D614 00812821 */ addu $a1, $a0, $at /* 010C8 80A9D618 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Destroy.s index 56c6286451..f9b3e132e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Destroy.s @@ -12,7 +12,7 @@ glabel EnMThunder_Destroy /* 002F0 80A9F2D0 8FA50020 */ lw $a1, 0x0020($sp) .L80A9F2D4: /* 002F4 80A9F2D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002F8 80A9F2D8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002F8 80A9F2D8 0C0170EB */ jal Collider_DestroyCylinder /* 002FC 80A9F2DC 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C /* 00300 80A9F2E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Init.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Init.s index ed864e85d2..e229ecca88 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Init.s @@ -9,14 +9,14 @@ glabel EnMThunder_Init /* 00024 80A9F004 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00028 80A9F008 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0002C 80A9F00C AFA50030 */ sw $a1, 0x0030($sp) -/* 00030 80A9F010 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00030 80A9F010 0C0170D9 */ jal Collider_InitCylinder /* 00034 80A9F014 AFA60044 */ sw $a2, 0x0044($sp) /* 00038 80A9F018 3C0780AA */ lui $a3, %hi(D_80AA0420) ## $a3 = 80AA0000 /* 0003C 80A9F01C 8FA50030 */ lw $a1, 0x0030($sp) /* 00040 80A9F020 24E70420 */ addiu $a3, $a3, %lo(D_80AA0420) ## $a3 = 80AA0420 /* 00044 80A9F024 8FA40044 */ lw $a0, 0x0044($sp) -/* 00048 80A9F028 0C01712B */ jal ActorCollider_InitCylinder +/* 00048 80A9F028 0C01712B */ jal Collider_SetCylinder /* 0004C 80A9F02C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00050 80A9F030 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s index 3ab60f3dc9..7dd36a6d47 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s @@ -56,14 +56,14 @@ glabel func_80A9F9B4 /* 00A78 80A9FA58 44089000 */ mfc1 $t0, $f18 /* 00A7C 80A9FA5C 00000000 */ nop /* 00A80 80A9FA60 A608018C */ sh $t0, 0x018C($s0) ## 0000018C -/* 00A84 80A9FA64 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00A84 80A9FA64 0C0189B7 */ jal Collider_CylinderUpdate /* 00A88 80A9FA68 AFA60028 */ sw $a2, 0x0028($sp) /* 00A8C 80A9FA6C 8FA40034 */ lw $a0, 0x0034($sp) /* 00A90 80A9FA70 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00A94 80A9FA74 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00A98 80A9FA78 8FA60028 */ lw $a2, 0x0028($sp) -/* 00A9C 80A9FA7C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00A9C 80A9FA7C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00AA0 80A9FA80 00812821 */ addu $a1, $a0, $at /* 00AA4 80A9FA84 960201C4 */ lhu $v0, 0x01C4($s0) ## 000001C4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s index 0462f549cf..95a515d378 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s @@ -7,7 +7,7 @@ glabel EnMa1_Destroy /* 006D4 80AA0D64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 006D8 80AA0D68 8FA50018 */ lw $a1, 0x0018($sp) /* 006DC 80AA0D6C 8FA4001C */ lw $a0, 0x001C($sp) -/* 006E0 80AA0D70 0C0170EB */ jal ActorCollider_FreeCylinder +/* 006E0 80AA0D70 0C0170EB */ jal Collider_DestroyCylinder /* 006E4 80AA0D74 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 /* 006E8 80AA0D78 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s index c33e26a32f..4a4ef22106 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s @@ -22,17 +22,17 @@ glabel EnMa1_Init /* 005A4 80AA0C34 AFA00018 */ sw $zero, 0x0018($sp) /* 005A8 80AA0C38 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 005AC 80AA0C3C AFA50030 */ sw $a1, 0x0030($sp) -/* 005B0 80AA0C40 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 005B0 80AA0C40 0C0170D9 */ jal Collider_InitCylinder /* 005B4 80AA0C44 8FA40044 */ lw $a0, 0x0044($sp) /* 005B8 80AA0C48 3C0780AA */ lui $a3, %hi(D_80AA1640) ## $a3 = 80AA0000 /* 005BC 80AA0C4C 8FA50030 */ lw $a1, 0x0030($sp) /* 005C0 80AA0C50 24E71640 */ addiu $a3, $a3, %lo(D_80AA1640) ## $a3 = 80AA1640 /* 005C4 80AA0C54 8FA40044 */ lw $a0, 0x0044($sp) -/* 005C8 80AA0C58 0C01712B */ jal ActorCollider_InitCylinder +/* 005C8 80AA0C58 0C01712B */ jal Collider_SetCylinder /* 005CC 80AA0C5C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 005D0 80AA0C60 0C016C80 */ jal CollisionBtlTbl_Get +/* 005D0 80AA0C60 0C016C80 */ jal DamageTable_Get /* 005D4 80AA0C64 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 005D8 80AA0C68 3C0680AA */ lui $a2, %hi(D_80AA166C) ## $a2 = 80AA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Update.s index e59972b2db..55d3201ba2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Update.s @@ -7,14 +7,14 @@ glabel EnMa1_Update /* 00B58 80AA11E8 AFBF0024 */ sw $ra, 0x0024($sp) /* 00B5C 80AA11EC 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 00B60 80AA11F0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 00B64 80AA11F4 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00B64 80AA11F4 0C0189B7 */ jal Collider_CylinderUpdate /* 00B68 80AA11F8 AFA6002C */ sw $a2, 0x002C($sp) /* 00B6C 80AA11FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00B70 80AA1200 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00B74 80AA1204 8FA6002C */ lw $a2, 0x002C($sp) /* 00B78 80AA1208 02212821 */ addu $a1, $s1, $at -/* 00B7C 80AA120C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00B7C 80AA120C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00B80 80AA1210 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B84 80AA1214 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s index 4032e6c5ac..9dba7e9c5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s @@ -7,7 +7,7 @@ glabel EnMa2_Destroy /* 00654 80AA1FF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00658 80AA1FF8 8FA50018 */ lw $a1, 0x0018($sp) /* 0065C 80AA1FFC 8FA4001C */ lw $a0, 0x001C($sp) -/* 00660 80AA2000 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00660 80AA2000 0C0170EB */ jal Collider_DestroyCylinder /* 00664 80AA2004 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 /* 00668 80AA2008 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s index c80a626591..5a680d7e0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s @@ -22,17 +22,17 @@ glabel EnMa2_Init /* 004E8 80AA1E88 AFA00018 */ sw $zero, 0x0018($sp) /* 004EC 80AA1E8C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 004F0 80AA1E90 AFA50030 */ sw $a1, 0x0030($sp) -/* 004F4 80AA1E94 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 004F4 80AA1E94 0C0170D9 */ jal Collider_InitCylinder /* 004F8 80AA1E98 8FA40044 */ lw $a0, 0x0044($sp) /* 004FC 80AA1E9C 3C0780AA */ lui $a3, %hi(D_80AA2820) ## $a3 = 80AA0000 /* 00500 80AA1EA0 8FA50030 */ lw $a1, 0x0030($sp) /* 00504 80AA1EA4 24E72820 */ addiu $a3, $a3, %lo(D_80AA2820) ## $a3 = 80AA2820 /* 00508 80AA1EA8 8FA40044 */ lw $a0, 0x0044($sp) -/* 0050C 80AA1EAC 0C01712B */ jal ActorCollider_InitCylinder +/* 0050C 80AA1EAC 0C01712B */ jal Collider_SetCylinder /* 00510 80AA1EB0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00514 80AA1EB4 0C016C80 */ jal CollisionBtlTbl_Get +/* 00514 80AA1EB4 0C016C80 */ jal DamageTable_Get /* 00518 80AA1EB8 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 0051C 80AA1EBC 3C0680AA */ lui $a2, %hi(D_80AA284C) ## $a2 = 80AA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Update.s index 452b942c3c..1be022f7b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Update.s @@ -7,14 +7,14 @@ glabel EnMa2_Update /* 008DC 80AA227C AFBF0024 */ sw $ra, 0x0024($sp) /* 008E0 80AA2280 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 008E4 80AA2284 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 008E8 80AA2288 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 008E8 80AA2288 0C0189B7 */ jal Collider_CylinderUpdate /* 008EC 80AA228C AFA6002C */ sw $a2, 0x002C($sp) /* 008F0 80AA2290 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 008F4 80AA2294 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 008F8 80AA2298 8FA6002C */ lw $a2, 0x002C($sp) /* 008FC 80AA229C 02212821 */ addu $a1, $s1, $at -/* 00900 80AA22A0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00900 80AA22A0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00904 80AA22A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00908 80AA22A8 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s index 1155376ad2..6927b3f352 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s @@ -7,7 +7,7 @@ glabel EnMa3_Destroy /* 0073C 80AA31DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00740 80AA31E0 8FA50018 */ lw $a1, 0x0018($sp) /* 00744 80AA31E4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00748 80AA31E8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00748 80AA31E8 0C0170EB */ jal Collider_DestroyCylinder /* 0074C 80AA31EC 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 /* 00750 80AA31F0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s index 38a7e0f061..802e95cffb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s @@ -22,17 +22,17 @@ glabel EnMa3_Init /* 00620 80AA30C0 AFA00018 */ sw $zero, 0x0018($sp) /* 00624 80AA30C4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00628 80AA30C8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0062C 80AA30CC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0062C 80AA30CC 0C0170D9 */ jal Collider_InitCylinder /* 00630 80AA30D0 8FA40044 */ lw $a0, 0x0044($sp) /* 00634 80AA30D4 3C0780AA */ lui $a3, %hi(D_80AA3810) ## $a3 = 80AA0000 /* 00638 80AA30D8 8FA50030 */ lw $a1, 0x0030($sp) /* 0063C 80AA30DC 24E73810 */ addiu $a3, $a3, %lo(D_80AA3810) ## $a3 = 80AA3810 /* 00640 80AA30E0 8FA40044 */ lw $a0, 0x0044($sp) -/* 00644 80AA30E4 0C01712B */ jal ActorCollider_InitCylinder +/* 00644 80AA30E4 0C01712B */ jal Collider_SetCylinder /* 00648 80AA30E8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0064C 80AA30EC 0C016C80 */ jal CollisionBtlTbl_Get +/* 0064C 80AA30EC 0C016C80 */ jal DamageTable_Get /* 00650 80AA30F0 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 00654 80AA30F4 3C0680AA */ lui $a2, %hi(D_80AA383C) ## $a2 = 80AA0000 /* 00658 80AA30F8 24C6383C */ addiu $a2, $a2, %lo(D_80AA383C) ## $a2 = 80AA383C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Update.s index 20ab4b97e7..11ae3c0624 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Update.s @@ -7,14 +7,14 @@ glabel EnMa3_Update /* 007A8 80AA3248 AFBF0024 */ sw $ra, 0x0024($sp) /* 007AC 80AA324C 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 007B0 80AA3250 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 007B4 80AA3254 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 007B4 80AA3254 0C0189B7 */ jal Collider_CylinderUpdate /* 007B8 80AA3258 AFA6002C */ sw $a2, 0x002C($sp) /* 007BC 80AA325C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 007C0 80AA3260 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 007C4 80AA3264 8FA6002C */ lw $a2, 0x002C($sp) /* 007C8 80AA3268 02212821 */ addu $a1, $s1, $at -/* 007CC 80AA326C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 007CC 80AA326C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 007D0 80AA3270 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 007D4 80AA3274 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Destroy.s index 369b24768e..77a575e6f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Destroy.s @@ -5,16 +5,16 @@ glabel EnMb_Destroy /* 00374 80AA63C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00378 80AA63C8 8FA50018 */ lw $a1, 0x0018($sp) /* 0037C 80AA63CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00380 80AA63D0 0C017232 */ jal func_8005C8C8 +/* 00380 80AA63D0 0C017232 */ jal Collider_DestroyTris /* 00384 80AA63D4 24A50434 */ addiu $a1, $a1, 0x0434 ## $a1 = 00000434 /* 00388 80AA63D8 8FA50018 */ lw $a1, 0x0018($sp) /* 0038C 80AA63DC 8FA4001C */ lw $a0, 0x001C($sp) -/* 00390 80AA63E0 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00390 80AA63E0 0C0170EB */ jal Collider_DestroyCylinder /* 00394 80AA63E4 24A50368 */ addiu $a1, $a1, 0x0368 ## $a1 = 00000368 /* 00398 80AA63E8 8FA50018 */ lw $a1, 0x0018($sp) /* 0039C 80AA63EC 8FA4001C */ lw $a0, 0x001C($sp) -/* 003A0 80AA63F0 0C017418 */ jal func_8005D060 +/* 003A0 80AA63F0 0C017418 */ jal Collider_DestroyQuad /* 003A4 80AA63F4 24A503B4 */ addiu $a1, $a1, 0x03B4 ## $a1 = 000003B4 /* 003A8 80AA63F8 8FBF0014 */ lw $ra, 0x0014($sp) /* 003AC 80AA63FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s index 4c772ed122..0bf0702d82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s @@ -35,19 +35,19 @@ glabel EnMb_Init /* 00060 80AA60B0 AE180098 */ sw $t8, 0x0098($s0) ## 00000098 /* 00064 80AA60B4 26050368 */ addiu $a1, $s0, 0x0368 ## $a1 = 00000368 /* 00068 80AA60B8 AFA50038 */ sw $a1, 0x0038($sp) -/* 0006C 80AA60BC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0006C 80AA60BC 0C0170D9 */ jal Collider_InitCylinder /* 00070 80AA60C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00074 80AA60C4 3C0780AB */ lui $a3, %hi(D_80AA9C00) ## $a3 = 80AB0000 /* 00078 80AA60C8 8FA50038 */ lw $a1, 0x0038($sp) /* 0007C 80AA60CC 24E79C00 */ addiu $a3, $a3, %lo(D_80AA9C00) ## $a3 = 80AA9C00 /* 00080 80AA60D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00084 80AA60D4 0C01712B */ jal ActorCollider_InitCylinder +/* 00084 80AA60D4 0C01712B */ jal Collider_SetCylinder /* 00088 80AA60D8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0008C 80AA60DC 26050434 */ addiu $a1, $s0, 0x0434 ## $a1 = 00000434 /* 00090 80AA60E0 AFA50038 */ sw $a1, 0x0038($sp) -/* 00094 80AA60E4 0C0171F8 */ jal func_8005C7E0 +/* 00094 80AA60E4 0C0171F8 */ jal Collider_InitTris /* 00098 80AA60E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0009C 80AA60EC 3C0780AB */ lui $a3, %hi(D_80AA9CA4) ## $a3 = 80AB0000 /* 000A0 80AA60F0 26190454 */ addiu $t9, $s0, 0x0454 ## $t9 = 00000454 @@ -55,17 +55,17 @@ glabel EnMb_Init /* 000A8 80AA60F8 AFB90010 */ sw $t9, 0x0010($sp) /* 000AC 80AA60FC 24E79CA4 */ addiu $a3, $a3, %lo(D_80AA9CA4) ## $a3 = 80AA9CA4 /* 000B0 80AA6100 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000B4 80AA6104 0C0172EB */ jal func_8005CBAC +/* 000B4 80AA6104 0C0172EB */ jal Collider_SetTris /* 000B8 80AA6108 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000BC 80AA610C 260503B4 */ addiu $a1, $s0, 0x03B4 ## $a1 = 000003B4 /* 000C0 80AA6110 AFA50038 */ sw $a1, 0x0038($sp) -/* 000C4 80AA6114 0C017406 */ jal func_8005D018 +/* 000C4 80AA6114 0C017406 */ jal Collider_InitQuad /* 000C8 80AA6118 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000CC 80AA611C 3C0780AB */ lui $a3, %hi(D_80AA9CB4) ## $a3 = 80AB0000 /* 000D0 80AA6120 8FA50038 */ lw $a1, 0x0038($sp) /* 000D4 80AA6124 24E79CB4 */ addiu $a3, $a3, %lo(D_80AA9CB4) ## $a3 = 80AA9CB4 /* 000D8 80AA6128 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000DC 80AA612C 0C017441 */ jal func_8005D104 +/* 000DC 80AA612C 0C017441 */ jal Collider_SetQuad /* 000E0 80AA6130 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000E4 80AA6134 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 000E8 80AA6138 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Update.s index 6a21ba85ed..82788f6eb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Update.s @@ -51,7 +51,7 @@ glabel EnMb_Update /* 036E8 80AA9738 00000000 */ nop /* 036EC 80AA973C 26050368 */ addiu $a1, $s0, 0x0368 ## $a1 = 00000368 /* 036F0 80AA9740 AFA50028 */ sw $a1, 0x0028($sp) -/* 036F4 80AA9744 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 036F4 80AA9744 0C0189B7 */ jal Collider_CylinderUpdate /* 036F8 80AA9748 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 036FC 80AA974C 921800AF */ lbu $t8, 0x00AF($s0) ## 000000AF @@ -96,7 +96,7 @@ glabel EnMb_Update /* 0378C 80AA97DC 02212821 */ addu $a1, $s1, $at /* 03790 80AA97E0 AFA50030 */ sw $a1, 0x0030($sp) /* 03794 80AA97E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03798 80AA97E8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 03798 80AA97E8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0379C 80AA97EC 8FA60028 */ lw $a2, 0x0028($sp) /* 037A0 80AA97F0 8E020320 */ lw $v0, 0x0320($s0) ## 00000320 @@ -111,7 +111,7 @@ glabel EnMb_Update /* 037C4 80AA9814 50410005 */ beql $v0, $at, .L80AA982C /* 037C8 80AA9818 28410006 */ slti $at, $v0, 0x0006 .L80AA981C: -/* 037CC 80AA981C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 037CC 80AA981C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 037D0 80AA9820 8FA60028 */ lw $a2, 0x0028($sp) /* 037D4 80AA9824 8E020320 */ lw $v0, 0x0320($s0) ## 00000320 @@ -120,7 +120,7 @@ glabel EnMb_Update /* 037DC 80AA982C 14200004 */ bne $at, $zero, .L80AA9840 /* 037E0 80AA9830 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 037E4 80AA9834 8FA50030 */ lw $a1, 0x0030($sp) -/* 037E8 80AA9838 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 037E8 80AA9838 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 037EC 80AA983C 26060434 */ addiu $a2, $s0, 0x0434 ## $a2 = 00000434 .L80AA9840: @@ -129,7 +129,7 @@ glabel EnMb_Update /* 037F8 80AA9848 8FA50030 */ lw $a1, 0x0030($sp) /* 037FC 80AA984C 5B200004 */ blezl $t9, .L80AA9860 /* 03800 80AA9850 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03804 80AA9854 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 03804 80AA9854 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 03808 80AA9858 260603B4 */ addiu $a2, $s0, 0x03B4 ## $a2 = 000003B4 /* 0380C 80AA985C 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Destroy.s index 60794361b1..46e011919a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Destroy.s @@ -3,7 +3,7 @@ glabel EnMd_Destroy /* 01600 80AAB850 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 01604 80AAB854 AFBF0014 */ sw $ra, 0x0014($sp) /* 01608 80AAB858 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0160C 80AAB85C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0160C 80AAB85C 0C0170EB */ jal Collider_DestroyCylinder /* 01610 80AAB860 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 01614 80AAB864 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s index 4dbb73d6d1..a42b017635 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s @@ -27,14 +27,14 @@ glabel EnMd_Init /* 01460 80AAB6B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01464 80AAB6B4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 01468 80AAB6B8 AFA50040 */ sw $a1, 0x0040($sp) -/* 0146C 80AAB6BC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0146C 80AAB6BC 0C0170D9 */ jal Collider_InitCylinder /* 01470 80AAB6C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01474 80AAB6C4 3C0780AB */ lui $a3, %hi(D_80AAC310) ## $a3 = 80AB0000 /* 01478 80AAB6C8 8FA50040 */ lw $a1, 0x0040($sp) /* 0147C 80AAB6CC 24E7C310 */ addiu $a3, $a3, %lo(D_80AAC310) ## $a3 = 80AAC310 /* 01480 80AAB6D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01484 80AAB6D4 0C01712B */ jal ActorCollider_InitCylinder +/* 01484 80AAB6D4 0C01712B */ jal Collider_SetCylinder /* 01488 80AAB6D8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0148C 80AAB6DC 3C0680AB */ lui $a2, %hi(D_80AAC33C) ## $a2 = 80AB0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Update.s index 343f404692..2af2e4340c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Update.s @@ -7,14 +7,14 @@ glabel EnMd_Update /* 01BF8 80AABE48 AFBF0024 */ sw $ra, 0x0024($sp) /* 01BFC 80AABE4C 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 01C00 80AABE50 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 01C04 80AABE54 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01C04 80AABE54 0C0189B7 */ jal Collider_CylinderUpdate /* 01C08 80AABE58 AFA6002C */ sw $a2, 0x002C($sp) /* 01C0C 80AABE5C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01C10 80AABE60 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01C14 80AABE64 8FA6002C */ lw $a2, 0x002C($sp) /* 01C18 80AABE68 02212821 */ addu $a1, $s1, $at -/* 01C1C 80AABE6C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01C1C 80AABE6C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01C20 80AABE70 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01C24 80AABE74 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Destroy.s index 8231cdfca1..3745613191 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Destroy.s @@ -3,7 +3,7 @@ glabel EnMk_Destroy /* 0011C 80AACA1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00120 80AACA20 AFBF0014 */ sw $ra, 0x0014($sp) /* 00124 80AACA24 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00128 80AACA28 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00128 80AACA28 0C0170EB */ jal Collider_DestroyCylinder /* 0012C 80AACA2C 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 00130 80AACA30 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s index 3c449c6a8d..59621f73fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s @@ -37,14 +37,14 @@ glabel EnMk_Init /* 00088 80AAC988 8FA40034 */ lw $a0, 0x0034($sp) /* 0008C 80AAC98C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00090 80AAC990 AFA50034 */ sw $a1, 0x0034($sp) -/* 00094 80AAC994 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00094 80AAC994 0C0170D9 */ jal Collider_InitCylinder /* 00098 80AAC998 8FA40044 */ lw $a0, 0x0044($sp) /* 0009C 80AAC99C 3C0780AB */ lui $a3, %hi(D_80AAD620) ## $a3 = 80AB0000 /* 000A0 80AAC9A0 8FA50034 */ lw $a1, 0x0034($sp) /* 000A4 80AAC9A4 24E7D620 */ addiu $a3, $a3, %lo(D_80AAD620) ## $a3 = 80AAD620 /* 000A8 80AAC9A8 8FA40044 */ lw $a0, 0x0044($sp) -/* 000AC 80AAC9AC 0C01712B */ jal ActorCollider_InitCylinder +/* 000AC 80AAC9AC 0C01712B */ jal Collider_SetCylinder /* 000B0 80AAC9B0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B4 80AAC9B4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s index 5cf2a1f341..5007b2df8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Update.s @@ -11,14 +11,14 @@ glabel EnMk_Update /* 009E0 80AAD2E0 AFA50054 */ sw $a1, 0x0054($sp) /* 009E4 80AAD2E4 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 009E8 80AAD2E8 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 009EC 80AAD2EC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 009EC 80AAD2EC 0C0189B7 */ jal Collider_CylinderUpdate /* 009F0 80AAD2F0 AFA60034 */ sw $a2, 0x0034($sp) /* 009F4 80AAD2F4 8FA40054 */ lw $a0, 0x0054($sp) /* 009F8 80AAD2F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 009FC 80AAD2FC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00A00 80AAD300 8FA60034 */ lw $a2, 0x0034($sp) -/* 00A04 80AAD304 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00A04 80AAD304 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00A08 80AAD308 00812821 */ addu $a1, $a0, $at /* 00A0C 80AAD30C 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Destroy.s index 97dbad66b3..f631b23e70 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Destroy.s @@ -3,7 +3,7 @@ glabel EnMm_Destroy /* 002DC 80AADA4C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 002E0 80AADA50 AFBF0014 */ sw $ra, 0x0014($sp) /* 002E4 80AADA54 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002E8 80AADA58 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002E8 80AADA58 0C0170EB */ jal Collider_DestroyCylinder /* 002EC 80AADA5C 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 002F0 80AADA60 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s index da58e70992..c8bb8a5311 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s @@ -30,14 +30,14 @@ glabel EnMm_Init /* 00188 80AAD8F8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0018C 80AAD8FC 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00190 80AAD900 AFA50034 */ sw $a1, 0x0034($sp) -/* 00194 80AAD904 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00194 80AAD904 0C0170D9 */ jal Collider_InitCylinder /* 00198 80AAD908 8FA4004C */ lw $a0, 0x004C($sp) /* 0019C 80AAD90C 3C0780AB */ lui $a3, %hi(D_80AAEAE0) ## $a3 = 80AB0000 /* 001A0 80AAD910 8FA50034 */ lw $a1, 0x0034($sp) /* 001A4 80AAD914 24E7EAE0 */ addiu $a3, $a3, %lo(D_80AAEAE0) ## $a3 = 80AAEAE0 /* 001A8 80AAD918 8FA4004C */ lw $a0, 0x004C($sp) -/* 001AC 80AAD91C 0C01712B */ jal ActorCollider_InitCylinder +/* 001AC 80AAD91C 0C01712B */ jal Collider_SetCylinder /* 001B0 80AAD920 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001B4 80AAD924 3C0580AB */ lui $a1, %hi(D_80AAEB18) ## $a1 = 80AB0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Update.s index 25e29c1bde..fb3ca3921e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Update.s @@ -13,14 +13,14 @@ glabel EnMm_Update /* 00EFC 80AAE66C 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 00F00 80AAE670 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 00F04 80AAE674 AFA60024 */ sw $a2, 0x0024($sp) -/* 00F08 80AAE678 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00F08 80AAE678 0C0189B7 */ jal Collider_CylinderUpdate /* 00F0C 80AAE67C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F10 80AAE680 8FA40034 */ lw $a0, 0x0034($sp) /* 00F14 80AAE684 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00F18 80AAE688 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00F1C 80AAE68C 8FA60024 */ lw $a2, 0x0024($sp) -/* 00F20 80AAE690 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00F20 80AAE690 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00F24 80AAE694 00812821 */ addu $a1, $a0, $at /* 00F28 80AAE698 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Destroy.s index 40f486914e..dc11014725 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Destroy.s @@ -3,7 +3,7 @@ glabel EnMm2_Destroy /* 003B0 80AAF200 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 003B4 80AAF204 AFBF0014 */ sw $ra, 0x0014($sp) /* 003B8 80AAF208 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003BC 80AAF20C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 003BC 80AAF20C 0C0170EB */ jal Collider_DestroyCylinder /* 003C0 80AAF210 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 003C4 80AAF214 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s index df11b23c25..bc2ede8552 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s @@ -58,14 +58,14 @@ glabel EnMm2_Init /* 002A4 80AAF0F4 AE0801F8 */ sw $t0, 0x01F8($s0) ## 000001F8 /* 002A8 80AAF0F8 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 002AC 80AAF0FC AFA50030 */ sw $a1, 0x0030($sp) -/* 002B0 80AAF100 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 002B0 80AAF100 0C0170D9 */ jal Collider_InitCylinder /* 002B4 80AAF104 8FA40044 */ lw $a0, 0x0044($sp) /* 002B8 80AAF108 3C0780AB */ lui $a3, %hi(D_80AAFAC0) ## $a3 = 80AB0000 /* 002BC 80AAF10C 8FA50030 */ lw $a1, 0x0030($sp) /* 002C0 80AAF110 24E7FAC0 */ addiu $a3, $a3, %lo(D_80AAFAC0) ## $a3 = 80AAFAC0 /* 002C4 80AAF114 8FA40044 */ lw $a0, 0x0044($sp) -/* 002C8 80AAF118 0C01712B */ jal ActorCollider_InitCylinder +/* 002C8 80AAF118 0C01712B */ jal Collider_SetCylinder /* 002CC 80AAF11C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002D0 80AAF120 960B01F4 */ lhu $t3, 0x01F4($s0) ## 000001F4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Update.s index a6264a873d..beb5fefb1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Update.s @@ -63,14 +63,14 @@ glabel EnMm2_Update /* 00A1C 80AAF86C 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 00A20 80AAF870 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 00A24 80AAF874 AFA60034 */ sw $a2, 0x0034($sp) -/* 00A28 80AAF878 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00A28 80AAF878 0C0189B7 */ jal Collider_CylinderUpdate /* 00A2C 80AAF87C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A30 80AAF880 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00A34 80AAF884 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00A38 80AAF888 8FA60034 */ lw $a2, 0x0034($sp) /* 00A3C 80AAF88C 02212821 */ addu $a1, $s1, $at -/* 00A40 80AAF890 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00A40 80AAF890 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00A44 80AAF894 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A48 80AAF898 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s index ee20426a98..519260a34c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s @@ -23,14 +23,14 @@ glabel EnMu_Init /* 0025C 80AB067C AFA00018 */ sw $zero, 0x0018($sp) /* 00260 80AB0680 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00264 80AB0684 AFA50034 */ sw $a1, 0x0034($sp) -/* 00268 80AB0688 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00268 80AB0688 0C0170D9 */ jal Collider_InitCylinder /* 0026C 80AB068C 8FA40044 */ lw $a0, 0x0044($sp) /* 00270 80AB0690 3C0780AB */ lui $a3, %hi(D_80AB0BD0) ## $a3 = 80AB0000 /* 00274 80AB0694 8FA50034 */ lw $a1, 0x0034($sp) /* 00278 80AB0698 24E70BD0 */ addiu $a3, $a3, %lo(D_80AB0BD0) ## $a3 = 80AB0BD0 /* 0027C 80AB069C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00280 80AB06A0 0C01712B */ jal ActorCollider_InitCylinder +/* 00280 80AB06A0 0C01712B */ jal Collider_SetCylinder /* 00284 80AB06A4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00288 80AB06A8 3C0680AB */ lui $a2, %hi(D_80AB0BFC) ## $a2 = 80AB0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Update.s index 0151f2fa7d..272846dae6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Update.s @@ -29,7 +29,7 @@ glabel EnMu_Update /* 003A8 80AB07C8 954C0004 */ lhu $t4, 0x0004($t2) ## FFFFFFF0 /* 003AC 80AB07CC A48C01DE */ sh $t4, 0x01DE($a0) ## 000001DE /* 003B0 80AB07D0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003B4 80AB07D4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 003B4 80AB07D4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 003B8 80AB07D8 00A12821 */ addu $a1, $a1, $at /* 003BC 80AB07DC 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Destroy.s index fc7870bf94..5a726b2cfd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Destroy.s @@ -3,7 +3,7 @@ glabel EnNb_Destroy /* 00208 80AB0F98 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0020C 80AB0F9C AFBF0014 */ sw $ra, 0x0014($sp) /* 00210 80AB0FA0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00214 80AB0FA4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00214 80AB0FA4 0C0170EB */ jal Collider_DestroyCylinder /* 00218 80AB0FA8 24C50294 */ addiu $a1, $a2, 0x0294 ## $a1 = 00000294 /* 0021C 80AB0FAC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F04.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F04.s index 2c61edeea3..13827d9c59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F04.s @@ -6,14 +6,14 @@ glabel func_80AB0F04 /* 00184 80AB0F14 AFBF0014 */ sw $ra, 0x0014($sp) /* 00188 80AB0F18 24C50294 */ addiu $a1, $a2, 0x0294 ## $a1 = 00000294 /* 0018C 80AB0F1C AFA50018 */ sw $a1, 0x0018($sp) -/* 00190 80AB0F20 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00190 80AB0F20 0C0170D9 */ jal Collider_InitCylinder /* 00194 80AB0F24 AFA60020 */ sw $a2, 0x0020($sp) /* 00198 80AB0F28 3C0780AB */ lui $a3, %hi(D_80AB42E0) ## $a3 = 80AB0000 /* 0019C 80AB0F2C 8FA50018 */ lw $a1, 0x0018($sp) /* 001A0 80AB0F30 8FA60020 */ lw $a2, 0x0020($sp) /* 001A4 80AB0F34 24E742E0 */ addiu $a3, $a3, %lo(D_80AB42E0) ## $a3 = 80AB42E0 -/* 001A8 80AB0F38 0C017114 */ jal func_8005C450 +/* 001A8 80AB0F38 0C017114 */ jal Collider_SetCylinder_Set3 /* 001AC 80AB0F3C 8FA40024 */ lw $a0, 0x0024($sp) /* 001B0 80AB0F40 8FBF0014 */ lw $ra, 0x0014($sp) /* 001B4 80AB0F44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F50.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F50.s index 319254c821..6128015add 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0F50.s @@ -4,14 +4,14 @@ glabel func_80AB0F50 /* 001C8 80AB0F58 AFA50034 */ sw $a1, 0x0034($sp) /* 001CC 80AB0F5C 24860294 */ addiu $a2, $a0, 0x0294 ## $a2 = 00000294 /* 001D0 80AB0F60 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000294 -/* 001D4 80AB0F64 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 001D4 80AB0F64 0C0189B7 */ jal Collider_CylinderUpdate /* 001D8 80AB0F68 AFA60018 */ sw $a2, 0x0018($sp) /* 001DC 80AB0F6C 8FA40034 */ lw $a0, 0x0034($sp) /* 001E0 80AB0F70 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 001E4 80AB0F74 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 001E8 80AB0F78 8FA60018 */ lw $a2, 0x0018($sp) -/* 001EC 80AB0F7C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 001EC 80AB0F7C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 001F0 80AB0F80 00812821 */ addu $a1, $a0, $at /* 001F4 80AB0F84 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Destroy.s index 39bc9b6458..4bbf8d6822 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Destroy.s @@ -3,7 +3,7 @@ glabel EnNiw_Destroy /* 00454 80AB5BD4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00458 80AB5BD8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0045C 80AB5BDC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00460 80AB5BE0 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00460 80AB5BE0 0C0170EB */ jal Collider_DestroyCylinder /* 00464 80AB5BE4 24C5030C */ addiu $a1, $a2, 0x030C ## $a1 = 0000030C /* 00468 80AB5BE8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s index 527d242e5a..a09b72dbd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s @@ -259,7 +259,7 @@ glabel L80AB5AF4 /* 00374 80AB5AF4 2650030C */ addiu $s0, $s2, 0x030C ## $s0 = 0000030C .L80AB5AF8: /* 00378 80AB5AF8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000030C -/* 0037C 80AB5AFC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0037C 80AB5AFC 0C0170D9 */ jal Collider_InitCylinder /* 00380 80AB5B00 8FA40054 */ lw $a0, 0x0054($sp) /* 00384 80AB5B04 8642001C */ lh $v0, 0x001C($s2) ## 0000001C @@ -280,7 +280,7 @@ glabel L80AB5AF4 .L80AB5B3C: /* 003BC 80AB5B3C 3C0780AC */ lui $a3, %hi(D_80AB86B0) ## $a3 = 80AC0000 /* 003C0 80AB5B40 24E786B0 */ addiu $a3, $a3, %lo(D_80AB86B0) ## $a3 = 80AB86B0 -/* 003C4 80AB5B44 0C01712B */ jal ActorCollider_InitCylinder +/* 003C4 80AB5B44 0C01712B */ jal Collider_SetCylinder /* 003C8 80AB5B48 8FA40054 */ lw $a0, 0x0054($sp) /* 003CC 80AB5B4C 8FAD0054 */ lw $t5, 0x0054($sp) @@ -300,7 +300,7 @@ glabel L80AB5AF4 .L80AB5B80: /* 00400 80AB5B80 3C0780AC */ lui $a3, %hi(D_80AB8684) ## $a3 = 80AC0000 /* 00404 80AB5B84 24E78684 */ addiu $a3, $a3, %lo(D_80AB8684) ## $a3 = 80AB8684 -/* 00408 80AB5B88 0C01712B */ jal ActorCollider_InitCylinder +/* 00408 80AB5B88 0C01712B */ jal Collider_SetCylinder /* 0040C 80AB5B8C 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 .L80AB5B90: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s index 86c68bac65..c2fc74e07b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s @@ -670,7 +670,7 @@ glabel EnNiw_Update /* 02720 80AB7EA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02724 80AB7EA4 3C0C80AB */ lui $t4, %hi(func_80AB6BF8) ## $t4 = 80AB0000 /* 02728 80AB7EA8 258C6BF8 */ addiu $t4, $t4, %lo(func_80AB6BF8) ## $t4 = 80AB6BF8 -/* 0272C 80AB7EAC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0272C 80AB7EAC 0C0189B7 */ jal Collider_CylinderUpdate /* 02730 80AB7EB0 AFAC003C */ sw $t4, 0x003C($sp) /* 02734 80AB7EB4 8622001C */ lh $v0, 0x001C($s1) ## 0000001C @@ -686,7 +686,7 @@ glabel EnNiw_Update /* 0275C 80AB7EDC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02760 80AB7EE0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02764 80AB7EE4 00812821 */ addu $a1, $a0, $at -/* 02768 80AB7EE8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02768 80AB7EE8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0276C 80AB7EEC 02003025 */ or $a2, $s0, $zero ## $a2 = 0000030C .L80AB7EF0: @@ -710,7 +710,7 @@ glabel EnNiw_Update /* 027B4 80AB7F34 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 027B8 80AB7F38 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 027BC 80AB7F3C 00812821 */ addu $a1, $a0, $at -/* 027C0 80AB7F40 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 027C0 80AB7F40 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 027C4 80AB7F44 02003025 */ or $a2, $s0, $zero ## $a2 = 0000030C .L80AB7F48: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s index 31c3abe8c2..2225528e1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s @@ -53,14 +53,14 @@ glabel EnNiwGirl_Init /* 00044 80AB8FC4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00048 80AB8FC8 26050288 */ addiu $a1, $s0, 0x0288 ## $a1 = 00000288 /* 0004C 80AB8FCC AFA50040 */ sw $a1, 0x0040($sp) -/* 00050 80AB8FD0 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00050 80AB8FD0 0C0170D9 */ jal Collider_InitCylinder /* 00054 80AB8FD4 8FA4006C */ lw $a0, 0x006C($sp) /* 00058 80AB8FD8 3C0780AC */ lui $a3, %hi(D_80AB99A0) ## $a3 = 80AC0000 /* 0005C 80AB8FDC 8FA50040 */ lw $a1, 0x0040($sp) /* 00060 80AB8FE0 24E799A0 */ addiu $a3, $a3, %lo(D_80AB99A0) ## $a3 = 80AB99A0 /* 00064 80AB8FE4 8FA4006C */ lw $a0, 0x006C($sp) -/* 00068 80AB8FE8 0C01712B */ jal ActorCollider_InitCylinder +/* 00068 80AB8FE8 0C01712B */ jal Collider_SetCylinder /* 0006C 80AB8FEC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00070 80AB8FF0 8603001C */ lh $v1, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Update.s index acde0c5e25..793e88609a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Update.s @@ -135,14 +135,14 @@ glabel EnNiwGirl_Update /* 00824 80AB97A4 26060288 */ addiu $a2, $s0, 0x0288 ## $a2 = 00000288 /* 00828 80AB97A8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000288 /* 0082C 80AB97AC AFA60028 */ sw $a2, 0x0028($sp) -/* 00830 80AB97B0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00830 80AB97B0 0C0189B7 */ jal Collider_CylinderUpdate /* 00834 80AB97B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00838 80AB97B8 8FA4003C */ lw $a0, 0x003C($sp) /* 0083C 80AB97BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00840 80AB97C0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00844 80AB97C4 8FA60028 */ lw $a2, 0x0028($sp) -/* 00848 80AB97C8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00848 80AB97C8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0084C 80AB97CC 00812821 */ addu $a1, $a0, $at /* 00850 80AB97D0 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Destroy.s index 1676057973..badc2b53c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Destroy.s @@ -3,7 +3,7 @@ glabel EnNiwLady_Destroy /* 000FC 80AB9D3C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00100 80AB9D40 AFBF0014 */ sw $ra, 0x0014($sp) /* 00104 80AB9D44 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00108 80AB9D48 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00108 80AB9D48 0C0170EB */ jal Collider_DestroyCylinder /* 0010C 80AB9D4C 24C502B0 */ addiu $a1, $a2, 0x02B0 ## $a1 = 000002B0 /* 00110 80AB9D50 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s index f9b7c38bad..eba94aa2c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s @@ -150,14 +150,14 @@ glabel EnNiwLady_Update /* 01420 80ABB060 260602B0 */ addiu $a2, $s0, 0x02B0 ## $a2 = 000002B0 /* 01424 80ABB064 00C02825 */ or $a1, $a2, $zero ## $a1 = 000002B0 /* 01428 80ABB068 AFA60028 */ sw $a2, 0x0028($sp) -/* 0142C 80ABB06C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0142C 80ABB06C 0C0189B7 */ jal Collider_CylinderUpdate /* 01430 80ABB070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01434 80ABB074 8FA4003C */ lw $a0, 0x003C($sp) /* 01438 80ABB078 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0143C 80ABB07C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01440 80ABB080 8FA60028 */ lw $a2, 0x0028($sp) -/* 01444 80ABB084 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01444 80ABB084 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01448 80ABB088 00812821 */ addu $a1, $a0, $at /* 0144C 80ABB08C 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s index 6c31abd66f..b04a56ae0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s @@ -74,14 +74,14 @@ glabel func_80AB9F24 /* 003F4 80ABA034 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 003F8 80ABA038 260502B0 */ addiu $a1, $s0, 0x02B0 ## $a1 = 000002B0 /* 003FC 80ABA03C AFA50034 */ sw $a1, 0x0034($sp) -/* 00400 80ABA040 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00400 80ABA040 0C0170D9 */ jal Collider_InitCylinder /* 00404 80ABA044 8FA4004C */ lw $a0, 0x004C($sp) /* 00408 80ABA048 3C0780AC */ lui $a3, %hi(D_80ABB3C4) ## $a3 = 80AC0000 /* 0040C 80ABA04C 8FA50034 */ lw $a1, 0x0034($sp) /* 00410 80ABA050 24E7B3C4 */ addiu $a3, $a3, %lo(D_80ABB3C4) ## $a3 = 80ABB3C4 /* 00414 80ABA054 8FA4004C */ lw $a0, 0x004C($sp) -/* 00418 80ABA058 0C01712B */ jal ActorCollider_InitCylinder +/* 00418 80ABA058 0C01712B */ jal Collider_SetCylinder /* 0041C 80ABA05C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00420 80ABA060 86030278 */ lh $v1, 0x0278($s0) ## 00000278 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Destroy.s index 177ffa0026..809c0c8009 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Destroy.s @@ -3,7 +3,7 @@ glabel EnNwc_Destroy /* 008CC 80ABC9AC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 008D0 80ABC9B0 AFBF0014 */ sw $ra, 0x0014($sp) /* 008D4 80ABC9B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 008D8 80ABC9B8 0C016F0A */ jal func_8005BC28 +/* 008D8 80ABC9B8 0C016F0A */ jal Collider_FreeJntSph /* 008DC 80ABC9BC 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 008E0 80ABC9C0 8FBF0014 */ lw $ra, 0x0014($sp) /* 008E4 80ABC9C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Init.s index c1ff939c20..81f8c61b1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Init.s @@ -40,12 +40,12 @@ glabel EnNwc_Init /* 007CC 80ABC8AC 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = FFFFFDDC /* 007D0 80ABC8B0 2650014C */ addiu $s0, $s2, 0x014C ## $s0 = 0000014C /* 007D4 80ABC8B4 02002825 */ or $a1, $s0, $zero ## $a1 = 0000014C -/* 007D8 80ABC8B8 0C016EFE */ jal func_8005BBF8 +/* 007D8 80ABC8B8 0C016EFE */ jal Collider_InitJntSph /* 007DC 80ABC8BC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 007E0 80ABC8C0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 007E4 80ABC8C4 02002825 */ or $a1, $s0, $zero ## $a1 = 0000014C /* 007E8 80ABC8C8 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -/* 007EC 80ABC8CC 0C016F94 */ jal func_8005BE50 ## ClObjJntSph_set3 +/* 007EC 80ABC8CC 0C016F94 */ jal Collider_SetJntSph_Set3 ## ClObjJntSph_set3 /* 007F0 80ABC8D0 02803825 */ or $a3, $s4, $zero ## $a3 = 80ABCAA4 /* 007F4 80ABC8D4 240A0010 */ addiu $t2, $zero, 0x0010 ## $t2 = 00000010 /* 007F8 80ABC8D8 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000010 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Update.s index 75db76ab79..cec9d20467 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/EnNwc_Update.s @@ -11,7 +11,7 @@ glabel EnNwc_Update /* 00934 80ABCA14 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00938 80ABCA18 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0093C 80ABCA1C 00812821 */ addu $a1, $a0, $at -/* 00940 80ABCA20 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00940 80ABCA20 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00944 80ABCA24 24E6014C */ addiu $a2, $a3, 0x014C ## $a2 = 0000014C /* 00948 80ABCA28 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Destroy.s index ccee1a9e49..e9969b9608 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Destroy.s @@ -3,7 +3,7 @@ glabel EnNy_Destroy /* 0016C 80ABCD1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00170 80ABCD20 AFBF0014 */ sw $ra, 0x0014($sp) /* 00174 80ABCD24 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00178 80ABCD28 0C016F32 */ jal func_8005BCC8 +/* 00178 80ABCD28 0C016F32 */ jal Collider_DestroyJntSph /* 0017C 80ABCD2C 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 00180 80ABCD30 8FBF0014 */ lw $ra, 0x0014($sp) /* 00184 80ABCD34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s index f556b0e576..d04e9a66fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Init.s @@ -33,7 +33,7 @@ glabel EnNy_Init /* 00030 80ABCBE0 A20F00AF */ sb $t7, 0x00AF($s0) ## 000000AF /* 00034 80ABCBE4 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 00038 80ABCBE8 AFA50028 */ sw $a1, 0x0028($sp) -/* 0003C 80ABCBEC 0C016EFE */ jal func_8005BBF8 +/* 0003C 80ABCBEC 0C016EFE */ jal Collider_InitJntSph /* 00040 80ABCBF0 8FA40034 */ lw $a0, 0x0034($sp) /* 00044 80ABCBF4 3C0780AC */ lui $a3, %hi(D_80ABE354) ## $a3 = 80AC0000 /* 00048 80ABCBF8 26180170 */ addiu $t8, $s0, 0x0170 ## $t8 = 00000170 @@ -41,7 +41,7 @@ glabel EnNy_Init /* 00050 80ABCC00 AFB80010 */ sw $t8, 0x0010($sp) /* 00054 80ABCC04 24E7E354 */ addiu $a3, $a3, %lo(D_80ABE354) ## $a3 = 80ABE354 /* 00058 80ABCC08 8FA40034 */ lw $a0, 0x0034($sp) -/* 0005C 80ABCC0C 0C017014 */ jal func_8005C050 +/* 0005C 80ABCC0C 0C017014 */ jal Collider_SetJntSph /* 00060 80ABCC10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00064 80ABCC14 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 00068 80ABCC18 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s index a12f966afe..1b69bee109 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Update.s @@ -154,7 +154,7 @@ glabel EnNy_Update /* 00B10 80ABD6C0 02002025 */ or $a0, $s0, $zero ## $a0 = 0000000C /* 00B14 80ABD6C4 45020004 */ bc1fl .L80ABD6D8 /* 00B18 80ABD6C8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B1C 80ABD6CC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00B1C 80ABD6CC 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00B20 80ABD6D0 26460150 */ addiu $a2, $s2, 0x0150 ## $a2 = 00000150 /* 00B24 80ABD6D4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -164,12 +164,12 @@ glabel EnNy_Update /* 00B30 80ABD6E0 26530150 */ addiu $s3, $s2, 0x0150 ## $s3 = 00000150 /* 00B34 80ABD6E4 02603025 */ or $a2, $s3, $zero ## $a2 = 00000150 /* 00B38 80ABD6E8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000001 -/* 00B3C 80ABD6EC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00B3C 80ABD6EC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00B40 80ABD6F0 02002025 */ or $a0, $s0, $zero ## $a0 = 0000000C /* 00B44 80ABD6F4 02002025 */ or $a0, $s0, $zero ## $a0 = 0000000C /* 00B48 80ABD6F8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000001 -/* 00B4C 80ABD6FC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00B4C 80ABD6FC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00B50 80ABD700 02603025 */ or $a2, $s3, $zero ## $a2 = 00000150 .L80ABD704: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s index 2527340975..2989916a9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABDBF8.s @@ -58,12 +58,12 @@ glabel func_80ABDBF8 /* 01120 80ABDCD0 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 01124 80ABDCD4 AFA6002C */ sw $a2, 0x002C($sp) /* 01128 80ABDCD8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0112C 80ABDCDC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0112C 80ABDCDC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01130 80ABDCE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01134 80ABDCE4 8FA50030 */ lw $a1, 0x0030($sp) /* 01138 80ABDCE8 8FA6002C */ lw $a2, 0x002C($sp) -/* 0113C 80ABDCEC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0113C 80ABDCEC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01140 80ABDCF0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01144 80ABDCF4 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Destroy.s index d50dcb170a..08da8a24b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Destroy.s @@ -3,7 +3,7 @@ glabel EnOkuta_Destroy /* 0020C 80AC086C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00210 80AC0870 AFBF0014 */ sw $ra, 0x0014($sp) /* 00214 80AC0874 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00218 80AC0878 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00218 80AC0878 0C0170EB */ jal Collider_DestroyCylinder /* 0021C 80AC087C 24C50370 */ addiu $a1, $a2, 0x0370 ## $a1 = 00000370 /* 00220 80AC0880 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Init.s index 360de5b7bc..c5b1603be6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Init.s @@ -35,14 +35,14 @@ glabel EnOkuta_Init /* 0007C 80AC06DC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00080 80AC06E0 26050370 */ addiu $a1, $s0, 0x0370 ## $a1 = 00000370 /* 00084 80AC06E4 AFA50030 */ sw $a1, 0x0030($sp) -/* 00088 80AC06E8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00088 80AC06E8 0C0170D9 */ jal Collider_InitCylinder /* 0008C 80AC06EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00090 80AC06F0 3C0780AC */ lui $a3, %hi(D_80AC284C) ## $a3 = 80AC0000 /* 00094 80AC06F4 8FA50030 */ lw $a1, 0x0030($sp) /* 00098 80AC06F8 24E7284C */ addiu $a3, $a3, %lo(D_80AC284C) ## $a3 = 80AC284C /* 0009C 80AC06FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000A0 80AC0700 0C01712B */ jal ActorCollider_InitCylinder +/* 000A0 80AC0700 0C01712B */ jal Collider_SetCylinder /* 000A4 80AC0704 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000A8 80AC0708 3C0580AC */ lui $a1, %hi(D_80AC2880) ## $a1 = 80AC0000 @@ -113,14 +113,14 @@ glabel EnOkuta_Init /* 00190 80AC07F0 350A0010 */ ori $t2, $t0, 0x0010 ## $t2 = 00000010 /* 00194 80AC07F4 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 /* 00198 80AC07F8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0019C 80AC07FC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0019C 80AC07FC 0C0170D9 */ jal Collider_InitCylinder /* 001A0 80AC0800 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001A4 80AC0804 3C0780AC */ lui $a3, %hi(D_80AC2820) ## $a3 = 80AC0000 /* 001A8 80AC0808 8FA50030 */ lw $a1, 0x0030($sp) /* 001AC 80AC080C 24E72820 */ addiu $a3, $a3, %lo(D_80AC2820) ## $a3 = 80AC2820 /* 001B0 80AC0810 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001B4 80AC0814 0C01712B */ jal ActorCollider_InitCylinder +/* 001B4 80AC0814 0C01712B */ jal Collider_SetCylinder /* 001B8 80AC0818 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001BC 80AC081C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Update.s index 7345d39cc9..39f2a9b47d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Update.s @@ -143,7 +143,7 @@ glabel EnOkuta_Update /* 01B74 80AC21D4 26050370 */ addiu $a1, $s0, 0x0370 ## $a1 = 00000370 .L80AC21D8: /* 01B78 80AC21D8 AFA5002C */ sw $a1, 0x002C($sp) -/* 01B7C 80AC21DC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01B7C 80AC21DC 0C0189B7 */ jal Collider_CylinderUpdate /* 01B80 80AC21E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01B84 80AC21E4 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 @@ -196,7 +196,7 @@ glabel EnOkuta_Update /* 01C38 80AC2298 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 /* 01C3C 80AC229C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01C40 80AC22A0 02212821 */ addu $a1, $s1, $at -/* 01C44 80AC22A4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01C44 80AC22A4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01C48 80AC22A8 8FA6002C */ lw $a2, 0x002C($sp) /* 01C4C 80AC22AC 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 @@ -218,13 +218,13 @@ glabel EnOkuta_Update /* 01C88 80AC22E8 11C20005 */ beq $t6, $v0, .L80AC2300 /* 01C8C 80AC22EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01C90 80AC22F0 8FA6002C */ lw $a2, 0x002C($sp) -/* 01C94 80AC22F4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01C94 80AC22F4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01C98 80AC22F8 AFA50030 */ sw $a1, 0x0030($sp) /* 01C9C 80AC22FC 8FA50030 */ lw $a1, 0x0030($sp) .L80AC2300: /* 01CA0 80AC2300 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01CA4 80AC2304 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01CA4 80AC2304 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01CA8 80AC2308 8FA6002C */ lw $a2, 0x002C($sp) .L80AC230C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s index e9b56c1c36..10a8965726 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s @@ -7,7 +7,7 @@ glabel EnOssan_Destroy /* 00A80 80AC3720 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00A84 80AC3724 8FA50018 */ lw $a1, 0x0018($sp) /* 00A88 80AC3728 8FA4001C */ lw $a0, 0x001C($sp) -/* 00A8C 80AC372C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00A8C 80AC372C 0C0170EB */ jal Collider_DestroyCylinder /* 00A90 80AC3730 24A50198 */ addiu $a1, $a1, 0x0198 ## $a1 = 00000198 /* 00A94 80AC3734 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Destroy.s index bdca494a61..85a7e676a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Destroy.s @@ -3,7 +3,7 @@ glabel EnOwl_Destroy /* 00474 80ACA394 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00478 80ACA398 AFBF0014 */ sw $ra, 0x0014($sp) /* 0047C 80ACA39C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00480 80ACA3A0 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00480 80ACA3A0 0C0170EB */ jal Collider_DestroyCylinder /* 00484 80ACA3A4 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 00488 80ACA3A8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s index f36d0564b1..15d2a17ea4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s @@ -106,14 +106,14 @@ glabel EnOwl_Init /* 000A0 80AC9FC0 8FA40054 */ lw $a0, 0x0054($sp) /* 000A4 80AC9FC4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 000A8 80AC9FC8 AFA50038 */ sw $a1, 0x0038($sp) -/* 000AC 80AC9FCC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000AC 80AC9FCC 0C0170D9 */ jal Collider_InitCylinder /* 000B0 80AC9FD0 8FA40054 */ lw $a0, 0x0054($sp) /* 000B4 80AC9FD4 3C0780AD */ lui $a3, %hi(D_80ACD5F0) ## $a3 = 80AD0000 /* 000B8 80AC9FD8 8FA50038 */ lw $a1, 0x0038($sp) /* 000BC 80AC9FDC 24E7D5F0 */ addiu $a3, $a3, %lo(D_80ACD5F0) ## $a3 = 80ACD5F0 /* 000C0 80AC9FE0 8FA40054 */ lw $a0, 0x0054($sp) -/* 000C4 80AC9FE4 0C01712B */ jal ActorCollider_InitCylinder +/* 000C4 80AC9FE4 0C01712B */ jal Collider_SetCylinder /* 000C8 80AC9FE8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000CC 80AC9FEC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s index 5f4b332658..819a0402a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s @@ -25,14 +25,14 @@ glabel EnOwl_Update /* 02790 80ACC6B0 AFA50044 */ sw $a1, 0x0044($sp) /* 02794 80ACC6B4 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 02798 80ACC6B8 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 0279C 80ACC6BC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0279C 80ACC6BC 0C0189B7 */ jal Collider_CylinderUpdate /* 027A0 80ACC6C0 AFA6002C */ sw $a2, 0x002C($sp) /* 027A4 80ACC6C4 8FA40044 */ lw $a0, 0x0044($sp) /* 027A8 80ACC6C8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 027AC 80ACC6CC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 027B0 80ACC6D0 8FA6002C */ lw $a2, 0x002C($sp) -/* 027B4 80ACC6D4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 027B4 80ACC6D4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 027B8 80ACC6D8 00812821 */ addu $a1, $a0, $at /* 027BC 80ACC6DC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Destroy.s index 9f99f50312..a8ec60605a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Destroy.s @@ -5,12 +5,12 @@ glabel EnPeehat_Destroy /* 00280 80ACF720 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00284 80ACF724 8FA50018 */ lw $a1, 0x0018($sp) /* 00288 80ACF728 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0028C 80ACF72C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0028C 80ACF72C 0C0170EB */ jal Collider_DestroyCylinder /* 00290 80ACF730 24A50300 */ addiu $a1, $a1, 0x0300 ## $a1 = 00000300 /* 00294 80ACF734 8FA50018 */ lw $a1, 0x0018($sp) /* 00298 80ACF738 8FA4001C */ lw $a0, 0x001C($sp) -/* 0029C 80ACF73C 0C016F32 */ jal func_8005BCC8 +/* 0029C 80ACF73C 0C016F32 */ jal Collider_DestroyJntSph /* 002A0 80ACF740 24A5034C */ addiu $a1, $a1, 0x034C ## $a1 = 0000034C /* 002A4 80ACF744 8FA30018 */ lw $v1, 0x0018($sp) /* 002A8 80ACF748 846E001C */ lh $t6, 0x001C($v1) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s index 60f7be36fc..63a8f71f3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s @@ -63,29 +63,29 @@ glabel EnPeehat_Init /* 000C8 80ACF568 E6040080 */ swc1 $f4, 0x0080($s0) ## 00000080 /* 000CC 80ACF56C AE080040 */ sw $t0, 0x0040($s0) ## 00000040 /* 000D0 80ACF570 AFA50034 */ sw $a1, 0x0034($sp) -/* 000D4 80ACF574 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000D4 80ACF574 0C0170D9 */ jal Collider_InitCylinder /* 000D8 80ACF578 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000DC 80ACF57C 3C0780AD */ lui $a3, %hi(D_80AD2740) ## $a3 = 80AD0000 /* 000E0 80ACF580 8FA50034 */ lw $a1, 0x0034($sp) /* 000E4 80ACF584 24E72740 */ addiu $a3, $a3, %lo(D_80AD2740) ## $a3 = 80AD2740 /* 000E8 80ACF588 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000EC 80ACF58C 0C01712B */ jal ActorCollider_InitCylinder +/* 000EC 80ACF58C 0C01712B */ jal Collider_SetCylinder /* 000F0 80ACF590 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000F4 80ACF594 260503AC */ addiu $a1, $s0, 0x03AC ## $a1 = 000003AC /* 000F8 80ACF598 AFA50034 */ sw $a1, 0x0034($sp) -/* 000FC 80ACF59C 0C017406 */ jal func_8005D018 +/* 000FC 80ACF59C 0C017406 */ jal Collider_InitQuad /* 00100 80ACF5A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00104 80ACF5A4 3C0780AD */ lui $a3, %hi(D_80AD27A0) ## $a3 = 80AD0000 /* 00108 80ACF5A8 8FA50034 */ lw $a1, 0x0034($sp) /* 0010C 80ACF5AC 24E727A0 */ addiu $a3, $a3, %lo(D_80AD27A0) ## $a3 = 80AD27A0 /* 00110 80ACF5B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00114 80ACF5B4 0C017441 */ jal func_8005D104 +/* 00114 80ACF5B4 0C017441 */ jal Collider_SetQuad /* 00118 80ACF5B8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0011C 80ACF5BC 2605034C */ addiu $a1, $s0, 0x034C ## $a1 = 0000034C /* 00120 80ACF5C0 AFA50034 */ sw $a1, 0x0034($sp) -/* 00124 80ACF5C4 0C016EFE */ jal func_8005BBF8 +/* 00124 80ACF5C4 0C016EFE */ jal Collider_InitJntSph /* 00128 80ACF5C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0012C 80ACF5CC 3C0780AD */ lui $a3, %hi(D_80AD2790) ## $a3 = 80AD0000 /* 00130 80ACF5D0 260C036C */ addiu $t4, $s0, 0x036C ## $t4 = 0000036C @@ -93,7 +93,7 @@ glabel EnPeehat_Init /* 00138 80ACF5D8 AFAC0010 */ sw $t4, 0x0010($sp) /* 0013C 80ACF5DC 24E72790 */ addiu $a3, $a3, %lo(D_80AD2790) ## $a3 = 80AD2790 /* 00140 80ACF5E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00144 80ACF5E4 0C017014 */ jal func_8005C050 +/* 00144 80ACF5E4 0C017014 */ jal Collider_SetJntSph /* 00148 80ACF5E8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0014C 80ACF5EC 3C014439 */ lui $at, 0x4439 ## $at = 44390000 /* 00150 80ACF5F0 44813000 */ mtc1 $at, $f6 ## $f6 = 740.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s index 07d9155a2e..2f942099f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s @@ -132,7 +132,7 @@ glabel EnPeehat_Update /* 02AEC 80AD1F8C 26720300 */ addiu $s2, $s3, 0x0300 ## $s2 = 00000300 .L80AD1F90: /* 02AF0 80AD1F90 02402825 */ or $a1, $s2, $zero ## $a1 = 00000300 -/* 02AF4 80AD1F94 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 02AF4 80AD1F94 0C0189B7 */ jal Collider_CylinderUpdate /* 02AF8 80AD1F98 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 02AFC 80AD1F9C 926A00AF */ lbu $t2, 0x00AF($s3) ## 000000AF @@ -145,13 +145,13 @@ glabel EnPeehat_Update /* 02B18 80AD1FB8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 02B1C 80AD1FBC 02818021 */ addu $s0, $s4, $at /* 02B20 80AD1FC0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02B24 80AD1FC4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02B24 80AD1FC4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02B28 80AD1FC8 02403025 */ or $a2, $s2, $zero ## $a2 = 00000300 /* 02B2C 80AD1FCC 2671034C */ addiu $s1, $s3, 0x034C ## $s1 = 0000034C /* 02B30 80AD1FD0 02203025 */ or $a2, $s1, $zero ## $a2 = 0000034C /* 02B34 80AD1FD4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 02B38 80AD1FD8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02B38 80AD1FD8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02B3C 80AD1FDC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02B40 80AD1FE0 926C0114 */ lbu $t4, 0x0114($s3) ## 00000114 @@ -167,7 +167,7 @@ glabel EnPeehat_Update /* 02B64 80AD2004 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 02B68 80AD2008 11E10003 */ beq $t7, $at, .L80AD2018 /* 02B6C 80AD200C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02B70 80AD2010 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02B70 80AD2010 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02B74 80AD2014 02203025 */ or $a2, $s1, $zero ## $a2 = 0000034C .L80AD2018: @@ -209,12 +209,12 @@ glabel EnPeehat_Update /* 02BF4 80AD2094 02818021 */ addu $s0, $s4, $at /* 02BF8 80AD2098 267103AC */ addiu $s1, $s3, 0x03AC ## $s1 = 000003AC /* 02BFC 80AD209C 02203025 */ or $a2, $s1, $zero ## $a2 = 000003AC -/* 02C00 80AD20A0 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 02C00 80AD20A0 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 02C04 80AD20A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02C08 80AD20A8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 02C0C 80AD20AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02C10 80AD20B0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02C10 80AD20B0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02C14 80AD20B4 02203025 */ or $a2, $s1, $zero ## $a2 = 000003AC /* 02C18 80AD20B8 8663001C */ lh $v1, 0x001C($s3) ## 0000001C @@ -287,7 +287,7 @@ glabel EnPeehat_Update /* 02D14 80AD21B4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02D18 80AD21B8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02D1C 80AD21BC 02812821 */ addu $a1, $s4, $at -/* 02D20 80AD21C0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02D20 80AD21C0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02D24 80AD21C4 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFE8 /* 02D28 80AD21C8 10000007 */ beq $zero, $zero, .L80AD21E8 @@ -296,7 +296,7 @@ glabel EnPeehat_Update /* 02D30 80AD21D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02D34 80AD21D4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02D38 80AD21D8 02812821 */ addu $a1, $s4, $at -/* 02D3C 80AD21DC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02D3C 80AD21DC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02D40 80AD21E0 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFE8 .L80AD21E4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Destroy.s index 870bb4048d..72dac60cc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Destroy.s @@ -12,7 +12,7 @@ glabel EnPoDesert_Destroy /* 00190 80AD2E40 24A507A8 */ addiu $a1, $a1, 0x07A8 ## $a1 = 000007A8 /* 00194 80AD2E44 8FA50018 */ lw $a1, 0x0018($sp) /* 00198 80AD2E48 8FA4001C */ lw $a0, 0x001C($sp) -/* 0019C 80AD2E4C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0019C 80AD2E4C 0C0170EB */ jal Collider_DestroyCylinder /* 001A0 80AD2E50 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 00000238 /* 001A4 80AD2E54 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s index c925afe113..a3d16e2ec1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s @@ -25,14 +25,14 @@ glabel EnPoDesert_Init /* 00054 80AD2D04 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00058 80AD2D08 26050238 */ addiu $a1, $s0, 0x0238 ## $a1 = 00000238 /* 0005C 80AD2D0C AFA50034 */ sw $a1, 0x0034($sp) -/* 00060 80AD2D10 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00060 80AD2D10 0C0170D9 */ jal Collider_InitCylinder /* 00064 80AD2D14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00068 80AD2D18 3C0780AD */ lui $a3, %hi(D_80AD39A0) ## $a3 = 80AD0000 /* 0006C 80AD2D1C 8FA50034 */ lw $a1, 0x0034($sp) /* 00070 80AD2D20 24E739A0 */ addiu $a3, $a3, %lo(D_80AD39A0) ## $a3 = 80AD39A0 /* 00074 80AD2D24 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00078 80AD2D28 0C01712B */ jal ActorCollider_InitCylinder +/* 00078 80AD2D28 0C01712B */ jal Collider_SetCylinder /* 0007C 80AD2D2C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00080 80AD2D30 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s index eca04fd919..6384460eb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s @@ -35,14 +35,14 @@ glabel EnPoDesert_Update /* 007D8 80AD3488 26060238 */ addiu $a2, $s0, 0x0238 ## $a2 = 00000238 /* 007DC 80AD348C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000238 /* 007E0 80AD3490 AFA6002C */ sw $a2, 0x002C($sp) -/* 007E4 80AD3494 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 007E4 80AD3494 0C0189B7 */ jal Collider_CylinderUpdate /* 007E8 80AD3498 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 007EC 80AD349C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 007F0 80AD34A0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 007F4 80AD34A4 8FA6002C */ lw $a2, 0x002C($sp) /* 007F8 80AD34A8 02212821 */ addu $a1, $s1, $at -/* 007FC 80AD34AC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 007FC 80AD34AC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00800 80AD34B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00804 80AD34B4 922F1C27 */ lbu $t7, 0x1C27($s1) ## 00001C27 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Destroy.s index d586f667ac..87c46cf676 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Destroy.s @@ -14,12 +14,12 @@ glabel EnPoField_Destroy /* 00234 80AD3D34 24A507A8 */ addiu $a1, $a1, 0x07A8 ## $a1 = 000007A8 /* 00238 80AD3D38 8FA50018 */ lw $a1, 0x0018($sp) /* 0023C 80AD3D3C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00240 80AD3D40 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00240 80AD3D40 0C0170EB */ jal Collider_DestroyCylinder /* 00244 80AD3D44 24A50290 */ addiu $a1, $a1, 0x0290 ## $a1 = 00000290 /* 00248 80AD3D48 8FA50018 */ lw $a1, 0x0018($sp) /* 0024C 80AD3D4C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00250 80AD3D50 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00250 80AD3D50 0C0170EB */ jal Collider_DestroyCylinder /* 00254 80AD3D54 24A50244 */ addiu $a1, $a1, 0x0244 ## $a1 = 00000244 .L80AD3D58: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s index 686c0795d5..dfe6cc70a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s @@ -69,26 +69,26 @@ glabel EnPoField_Init /* 000F8 80AD3BF8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 000FC 80AD3BFC 26050244 */ addiu $a1, $s0, 0x0244 ## $a1 = 00000244 /* 00100 80AD3C00 AFA50034 */ sw $a1, 0x0034($sp) -/* 00104 80AD3C04 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00104 80AD3C04 0C0170D9 */ jal Collider_InitCylinder /* 00108 80AD3C08 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0010C 80AD3C0C 3C0780AD */ lui $a3, %hi(D_80AD7080) ## $a3 = 80AD0000 /* 00110 80AD3C10 8FA50034 */ lw $a1, 0x0034($sp) /* 00114 80AD3C14 24E77080 */ addiu $a3, $a3, %lo(D_80AD7080) ## $a3 = 80AD7080 /* 00118 80AD3C18 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0011C 80AD3C1C 0C01712B */ jal ActorCollider_InitCylinder +/* 0011C 80AD3C1C 0C01712B */ jal Collider_SetCylinder /* 00120 80AD3C20 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00124 80AD3C24 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 /* 00128 80AD3C28 AFA50034 */ sw $a1, 0x0034($sp) -/* 0012C 80AD3C2C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0012C 80AD3C2C 0C0170D9 */ jal Collider_InitCylinder /* 00130 80AD3C30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00134 80AD3C34 3C0780AD */ lui $a3, %hi(D_80AD70AC) ## $a3 = 80AD0000 /* 00138 80AD3C38 8FA50034 */ lw $a1, 0x0034($sp) /* 0013C 80AD3C3C 24E770AC */ addiu $a3, $a3, %lo(D_80AD70AC) ## $a3 = 80AD70AC /* 00140 80AD3C40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00144 80AD3C44 0C01712B */ jal ActorCollider_InitCylinder +/* 00144 80AD3C44 0C01712B */ jal Collider_SetCylinder /* 00148 80AD3C48 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0014C 80AD3C4C 3C0580AD */ lui $a1, %hi(D_80AD70E0) ## $a1 = 80AD0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Update.s index f7fdccd09a..b675507b7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Update.s @@ -54,7 +54,7 @@ glabel EnPoField_Update /* 02A64 80AD6564 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02A68 80AD6568 26050244 */ addiu $a1, $s0, 0x0244 ## $a1 = 00000244 /* 02A6C 80AD656C AFA50028 */ sw $a1, 0x0028($sp) -/* 02A70 80AD6570 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 02A70 80AD6570 0C0189B7 */ jal Collider_CylinderUpdate /* 02A74 80AD6574 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02A78 80AD6578 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -62,7 +62,7 @@ glabel EnPoField_Update /* 02A80 80AD6580 02212821 */ addu $a1, $s1, $at /* 02A84 80AD6584 AFA5002C */ sw $a1, 0x002C($sp) /* 02A88 80AD6588 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02A8C 80AD658C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02A8C 80AD658C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02A90 80AD6590 8FA60028 */ lw $a2, 0x0028($sp) /* 02A94 80AD6594 920A0255 */ lbu $t2, 0x0255($s0) ## 00000255 @@ -71,7 +71,7 @@ glabel EnPoField_Update /* 02AA0 80AD65A0 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 /* 02AA4 80AD65A4 51600004 */ beql $t3, $zero, .L80AD65B8 /* 02AA8 80AD65A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02AAC 80AD65AC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02AAC 80AD65AC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02AB0 80AD65B0 8FA60028 */ lw $a2, 0x0028($sp) .L80AD65B4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD58D4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD58D4.s index 27b773849f..ad066cf0dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD58D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD58D4.s @@ -64,7 +64,7 @@ glabel func_80AD58D4 /* 01EA4 80AD59A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01EA8 80AD59A8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01EAC 80AD59AC AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 01EB0 80AD59B0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01EB0 80AD59B0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01EB4 80AD59B4 00E12821 */ addu $a1, $a3, $at /* 01EB8 80AD59B8 92040194 */ lbu $a0, 0x0194($s0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D60.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D60.s index eb5e4e77d4..ece436824c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D60.s @@ -75,7 +75,7 @@ glabel func_80AD5D60 /* 02364 80AD5E64 440E2000 */ mfc1 $t6, $f4 /* 02368 80AD5E68 A60A02D6 */ sh $t2, 0x02D6($s0) ## 000002D6 /* 0236C 80AD5E6C A60C02D8 */ sh $t4, 0x02D8($s0) ## 000002D8 -/* 02370 80AD5E70 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 02370 80AD5E70 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 02374 80AD5E74 A60E02DA */ sh $t6, 0x02DA($s0) ## 000002DA /* 02378 80AD5E78 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Destroy.s index 2a79a45282..728bb9ac38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Destroy.s @@ -12,7 +12,7 @@ glabel EnPoRelay_Destroy /* 001A8 80AD78E8 24A507A8 */ addiu $a1, $a1, 0x07A8 ## $a1 = 000007A8 /* 001AC 80AD78EC 8FA50018 */ lw $a1, 0x0018($sp) /* 001B0 80AD78F0 8FA4001C */ lw $a0, 0x001C($sp) -/* 001B4 80AD78F4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001B4 80AD78F4 0C0170EB */ jal Collider_DestroyCylinder /* 001B8 80AD78F8 24A50290 */ addiu $a1, $a1, 0x0290 ## $a1 = 00000290 /* 001BC 80AD78FC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s index 5ab9b8d87a..910bc6d0ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s @@ -31,14 +31,14 @@ glabel EnPoRelay_Init /* 0006C 80AD77AC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00070 80AD77B0 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 /* 00074 80AD77B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00078 80AD77B8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00078 80AD77B8 0C0170D9 */ jal Collider_InitCylinder /* 0007C 80AD77BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00080 80AD77C0 3C0780AE */ lui $a3, %hi(D_80AD8CF8) ## $a3 = 80AE0000 /* 00084 80AD77C4 8FA50034 */ lw $a1, 0x0034($sp) /* 00088 80AD77C8 24E78CF8 */ addiu $a3, $a3, %lo(D_80AD8CF8) ## $a3 = 80AD8CF8 /* 0008C 80AD77CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00090 80AD77D0 0C01712B */ jal ActorCollider_InitCylinder +/* 00090 80AD77D0 0C01712B */ jal Collider_SetCylinder /* 00094 80AD77D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00098 80AD77D8 26060280 */ addiu $a2, $s0, 0x0280 ## $a2 = 00000280 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Update.s index daa0284fff..d00113ebeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Update.s @@ -30,14 +30,14 @@ glabel EnPoRelay_Update /* 01104 80AD8844 26060290 */ addiu $a2, $s0, 0x0290 ## $a2 = 00000290 /* 01108 80AD8848 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000290 /* 0110C 80AD884C AFA6002C */ sw $a2, 0x002C($sp) -/* 01110 80AD8850 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01110 80AD8850 0C0189B7 */ jal Collider_CylinderUpdate /* 01114 80AD8854 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01118 80AD8858 8FA4003C */ lw $a0, 0x003C($sp) /* 0111C 80AD885C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01120 80AD8860 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01124 80AD8864 8FA6002C */ lw $a2, 0x002C($sp) -/* 01128 80AD8868 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01128 80AD8868 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0112C 80AD886C 00812821 */ addu $a1, $a0, $at /* 01130 80AD8870 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Destroy.s index 7140fdd0a9..8f8e234abb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Destroy.s @@ -21,7 +21,7 @@ glabel EnPoSisters_Destroy /* 00290 80AD9220 8FA70018 */ lw $a3, 0x0018($sp) /* 00294 80AD9224 8FA4001C */ lw $a0, 0x001C($sp) .L80AD9228: -/* 00298 80AD9228 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00298 80AD9228 0C0170EB */ jal Collider_DestroyCylinder /* 0029C 80AD922C 24E502AC */ addiu $a1, $a3, 0x02AC ## $a1 = 000002AC /* 002A0 80AD9230 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s index 237fdf31eb..99f4db4514 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s @@ -67,14 +67,14 @@ glabel EnPoSisters_Init /* 000F0 80AD9080 8FA40034 */ lw $a0, 0x0034($sp) /* 000F4 80AD9084 260502AC */ addiu $a1, $s0, 0x02AC ## $a1 = 000002AC /* 000F8 80AD9088 AFA50034 */ sw $a1, 0x0034($sp) -/* 000FC 80AD908C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000FC 80AD908C 0C0170D9 */ jal Collider_InitCylinder /* 00100 80AD9090 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00104 80AD9094 3C0780AE */ lui $a3, %hi(D_80ADD730) ## $a3 = 80AE0000 /* 00108 80AD9098 8FA50034 */ lw $a1, 0x0034($sp) /* 0010C 80AD909C 24E7D730 */ addiu $a3, $a3, %lo(D_80ADD730) ## $a3 = 80ADD730 /* 00110 80AD90A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00114 80AD90A4 0C01712B */ jal ActorCollider_InitCylinder +/* 00114 80AD90A4 0C01712B */ jal Collider_SetCylinder /* 00118 80AD90A8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0011C 80AD90AC 3C0580AE */ lui $a1, %hi(D_80ADD764) ## $a1 = 80AE0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Update.s index 3d4d6bf743..afa3921407 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Update.s @@ -77,7 +77,7 @@ glabel EnPoSisters_Update /* 03454 80ADC3E4 260502AC */ addiu $a1, $s0, 0x02AC ## $a1 = 000002AC .L80ADC3E8: /* 03458 80ADC3E8 AFA50028 */ sw $a1, 0x0028($sp) -/* 0345C 80ADC3EC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0345C 80ADC3EC 0C0189B7 */ jal Collider_CylinderUpdate /* 03460 80ADC3F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03464 80ADC3F4 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 @@ -131,7 +131,7 @@ glabel EnPoSisters_Update /* 0350C 80ADC49C AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 /* 03510 80ADC4A0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 03514 80ADC4A4 8FA60028 */ lw $a2, 0x0028($sp) -/* 03518 80ADC4A8 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 03518 80ADC4A8 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 0351C 80ADC4AC 00812821 */ addu $a1, $a0, $at /* 03520 80ADC4B0 920C0199 */ lbu $t4, 0x0199($s0) ## 00000199 @@ -142,7 +142,7 @@ glabel EnPoSisters_Update /* 03530 80ADC4C0 11A00004 */ beq $t5, $zero, .L80ADC4D4 /* 03534 80ADC4C4 8FA40054 */ lw $a0, 0x0054($sp) /* 03538 80ADC4C8 00812821 */ addu $a1, $a0, $at -/* 0353C 80ADC4CC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0353C 80ADC4CC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 03540 80ADC4D0 8FA60028 */ lw $a2, 0x0028($sp) .L80ADC4D4: @@ -154,7 +154,7 @@ glabel EnPoSisters_Update /* 03558 80ADC4E8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0355C 80ADC4EC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 03560 80ADC4F0 00812821 */ addu $a1, $a0, $at -/* 03564 80ADC4F4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 03564 80ADC4F4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 03568 80ADC4F8 8FA60028 */ lw $a2, 0x0028($sp) .L80ADC4FC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Destroy.s index 0babf88b74..a24301cc03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Destroy.s @@ -12,11 +12,11 @@ glabel EnPoh_Destroy /* 00368 80ADE0B8 24A507A8 */ addiu $a1, $a1, 0x07A8 ## $a1 = 000007A8 /* 0036C 80ADE0BC 8FA50018 */ lw $a1, 0x0018($sp) /* 00370 80ADE0C0 8FA4001C */ lw $a0, 0x001C($sp) -/* 00374 80ADE0C4 0C016F32 */ jal func_8005BCC8 +/* 00374 80ADE0C4 0C016F32 */ jal Collider_DestroyJntSph /* 00378 80ADE0C8 24A50308 */ addiu $a1, $a1, 0x0308 ## $a1 = 00000308 /* 0037C 80ADE0CC 8FA50018 */ lw $a1, 0x0018($sp) /* 00380 80ADE0D0 8FA4001C */ lw $a0, 0x001C($sp) -/* 00384 80ADE0D4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00384 80ADE0D4 0C0170EB */ jal Collider_DestroyCylinder /* 00388 80ADE0D8 24A502BC */ addiu $a1, $a1, 0x02BC ## $a1 = 000002BC /* 0038C 80ADE0DC 8FAF0018 */ lw $t7, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s index d0759f093d..d38c6b87e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s @@ -18,7 +18,7 @@ glabel EnPoh_Init /* 00038 80ADDD88 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 0003C 80ADDD8C 26050308 */ addiu $a1, $s0, 0x0308 ## $a1 = 00000308 /* 00040 80ADDD90 AFA50030 */ sw $a1, 0x0030($sp) -/* 00044 80ADDD94 0C016EFE */ jal func_8005BBF8 +/* 00044 80ADDD94 0C016EFE */ jal Collider_InitJntSph /* 00048 80ADDD98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0004C 80ADDD9C 3C0780AE */ lui $a3, %hi(D_80AE1AC4) ## $a3 = 80AE0000 /* 00050 80ADDDA0 260E0328 */ addiu $t6, $s0, 0x0328 ## $t6 = 00000328 @@ -26,7 +26,7 @@ glabel EnPoh_Init /* 00058 80ADDDA8 AFAE0010 */ sw $t6, 0x0010($sp) /* 0005C 80ADDDAC 24E71AC4 */ addiu $a3, $a3, %lo(D_80AE1AC4) ## $a3 = 80AE1AC4 /* 00060 80ADDDB0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00064 80ADDDB4 0C017014 */ jal func_8005C050 +/* 00064 80ADDDB4 0C017014 */ jal Collider_SetJntSph /* 00068 80ADDDB8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0006C 80ADDDBC 8E0F0324 */ lw $t7, 0x0324($s0) ## 00000324 /* 00070 80ADDDC0 260502BC */ addiu $a1, $s0, 0x02BC ## $a1 = 000002BC @@ -50,14 +50,14 @@ glabel EnPoh_Init /* 000B8 80ADDE08 440D9000 */ mfc1 $t5, $f18 /* 000BC 80ADDE0C 00000000 */ nop /* 000C0 80ADDE10 A5CD0034 */ sh $t5, 0x0034($t6) ## 00000034 -/* 000C4 80ADDE14 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000C4 80ADDE14 0C0170D9 */ jal Collider_InitCylinder /* 000C8 80ADDE18 AFA50030 */ sw $a1, 0x0030($sp) /* 000CC 80ADDE1C 3C0780AE */ lui $a3, %hi(D_80AE1A74) ## $a3 = 80AE0000 /* 000D0 80ADDE20 8FA50030 */ lw $a1, 0x0030($sp) /* 000D4 80ADDE24 24E71A74 */ addiu $a3, $a3, %lo(D_80AE1A74) ## $a3 = 80AE1A74 /* 000D8 80ADDE28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000DC 80ADDE2C 0C01712B */ jal ActorCollider_InitCylinder +/* 000DC 80ADDE2C 0C01712B */ jal Collider_SetCylinder /* 000E0 80ADDE30 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000E4 80ADDE34 3C0580AE */ lui $a1, %hi(D_80AE1ADC) ## $a1 = 80AE0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE80.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE80.s index be71ea5cc3..304cf913d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE80.s @@ -69,7 +69,7 @@ glabel func_80ADFE80 /* 02214 80ADFF64 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02218 80ADFF68 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0221C 80ADFF6C AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 -/* 02220 80ADFF70 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02220 80ADFF70 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02224 80ADFF74 00E12821 */ addu $a1, $a3, $at /* 02228 80ADFF78 92040195 */ lbu $a0, 0x0195($s0) ## 00000195 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0A1C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0A1C.s index 35e7a7c224..bb07ca6c8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0A1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0A1C.s @@ -42,7 +42,7 @@ glabel func_80AE0A1C /* 02D64 80AE0AB4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02D68 80AE0AB8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02D6C 80AE0ABC AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 02D70 80AE0AC0 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 02D70 80AE0AC0 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 02D74 80AE0AC4 02212821 */ addu $a1, $s1, $at /* 02D78 80AE0AC8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -54,7 +54,7 @@ glabel func_80AE0A1C /* 02D8C 80AE0ADC AFAD0030 */ sw $t5, 0x0030($sp) /* 02D90 80AE0AE0 AFA5002C */ sw $a1, 0x002C($sp) /* 02D94 80AE0AE4 AFAC0034 */ sw $t4, 0x0034($sp) -/* 02D98 80AE0AE8 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 02D98 80AE0AE8 0C0189B7 */ jal Collider_CylinderUpdate /* 02D9C 80AE0AEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02DA0 80AE0AF0 920E02CD */ lbu $t6, 0x02CD($s0) ## 000002CD @@ -66,19 +66,19 @@ glabel func_80AE0A1C /* 02DB8 80AE0B08 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02DBC 80AE0B0C 17210003 */ bne $t9, $at, .L80AE0B1C /* 02DC0 80AE0B10 8FA50034 */ lw $a1, 0x0034($sp) -/* 02DC4 80AE0B14 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02DC4 80AE0B14 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 02DC8 80AE0B18 8FA6002C */ lw $a2, 0x002C($sp) .L80AE0B1C: /* 02DCC 80AE0B1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80AE0B20: /* 02DD0 80AE0B20 8FA50034 */ lw $a1, 0x0034($sp) -/* 02DD4 80AE0B24 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02DD4 80AE0B24 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02DD8 80AE0B28 8FA6002C */ lw $a2, 0x002C($sp) /* 02DDC 80AE0B2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02DE0 80AE0B30 8FA50034 */ lw $a1, 0x0034($sp) -/* 02DE4 80AE0B34 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02DE4 80AE0B34 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02DE8 80AE0B38 8FA60030 */ lw $a2, 0x0030($sp) /* 02DEC 80AE0B3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s index d3308d84cf..e34098507a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s @@ -10,7 +10,7 @@ glabel EnRd_Destroy /* 00210 80AE2610 A4401422 */ sh $zero, 0x1422($v0) ## 8015FA82 .L80AE2614: /* 00214 80AE2614 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00218 80AE2618 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00218 80AE2618 0C0170EB */ jal Collider_DestroyCylinder /* 0021C 80AE261C 24C50320 */ addiu $a1, $a2, 0x0320 ## $a1 = 00000320 /* 00220 80AE2620 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s index 415d20b4bd..00f19a95ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s @@ -95,14 +95,14 @@ glabel EnRd_Init .L80AE2568: /* 00168 80AE2568 26050320 */ addiu $a1, $s0, 0x0320 ## $a1 = 00000320 /* 0016C 80AE256C AFA50034 */ sw $a1, 0x0034($sp) -/* 00170 80AE2570 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00170 80AE2570 0C0170D9 */ jal Collider_InitCylinder /* 00174 80AE2574 8FA40044 */ lw $a0, 0x0044($sp) /* 00178 80AE2578 3C0780AE */ lui $a3, %hi(D_80AE48C0) ## $a3 = 80AE0000 /* 0017C 80AE257C 8FA50034 */ lw $a1, 0x0034($sp) /* 00180 80AE2580 24E748C0 */ addiu $a3, $a3, %lo(D_80AE48C0) ## $a3 = 80AE48C0 /* 00184 80AE2584 8FA40044 */ lw $a0, 0x0044($sp) -/* 00188 80AE2588 0C01712B */ jal ActorCollider_InitCylinder +/* 00188 80AE2588 0C01712B */ jal Collider_SetCylinder /* 0018C 80AE258C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00190 80AE2590 8619001C */ lh $t9, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s index fad4370027..2b14514c1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s @@ -101,7 +101,7 @@ glabel EnRd_Update /* 02044 80AE4444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02048 80AE4448 11C10019 */ beq $t6, $at, .L80AE44B0 /* 0204C 80AE444C 26050320 */ addiu $a1, $s0, 0x0320 ## $a1 = 00000320 -/* 02050 80AE4450 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 02050 80AE4450 0C0189B7 */ jal Collider_CylinderUpdate /* 02054 80AE4454 AFA50028 */ sw $a1, 0x0028($sp) /* 02058 80AE4458 8FA40044 */ lw $a0, 0x0044($sp) @@ -109,7 +109,7 @@ glabel EnRd_Update /* 02060 80AE4460 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02064 80AE4464 00812821 */ addu $a1, $a0, $at /* 02068 80AE4468 AFA5002C */ sw $a1, 0x002C($sp) -/* 0206C 80AE446C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0206C 80AE446C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02070 80AE4470 8FA60028 */ lw $a2, 0x0028($sp) /* 02074 80AE4474 9218031B */ lbu $t8, 0x031B($s0) ## 0000031B @@ -126,7 +126,7 @@ glabel EnRd_Update /* 020A0 80AE44A0 8FBF0024 */ lw $ra, 0x0024($sp) .L80AE44A4: /* 020A4 80AE44A4 8FA40044 */ lw $a0, 0x0044($sp) -/* 020A8 80AE44A8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 020A8 80AE44A8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 020AC 80AE44AC 8FA60028 */ lw $a2, 0x0028($sp) .L80AE44B0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s index 2cbbbbac83..4c475f8405 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s @@ -4,7 +4,7 @@ glabel EnReeba_Destroy /* 00204 80AE4ED4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00208 80AE4ED8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0020C 80AE4EDC 24C50290 */ addiu $a1, $a2, 0x0290 ## $a1 = 00000290 -/* 00210 80AE4EE0 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00210 80AE4EE0 0C0170EB */ jal Collider_DestroyCylinder /* 00214 80AE4EE4 AFA60018 */ sw $a2, 0x0018($sp) /* 00218 80AE4EE8 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s index ef5804a6dc..9a3e0c5c7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s @@ -51,14 +51,14 @@ glabel EnReeba_Init /* 0008C 80AE4D5C A20C00AF */ sb $t4, 0x00AF($s0) ## 000000AF /* 00090 80AE4D60 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 /* 00094 80AE4D64 AFA50034 */ sw $a1, 0x0034($sp) -/* 00098 80AE4D68 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00098 80AE4D68 0C0170D9 */ jal Collider_InitCylinder /* 0009C 80AE4D6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000A0 80AE4D70 3C0780AE */ lui $a3, %hi(D_80AE65A0) ## $a3 = 80AE0000 /* 000A4 80AE4D74 8FA50034 */ lw $a1, 0x0034($sp) /* 000A8 80AE4D78 24E765A0 */ addiu $a3, $a3, %lo(D_80AE65A0) ## $a3 = 80AE65A0 /* 000AC 80AE4D7C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000B0 80AE4D80 0C01712B */ jal ActorCollider_InitCylinder +/* 000B0 80AE4D80 0C01712B */ jal Collider_SetCylinder /* 000B4 80AE4D84 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B8 80AE4D88 860D001C */ lh $t5, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s index 9e17e7dca8..cd9a9f4c61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s @@ -133,7 +133,7 @@ glabel EnReeba_Update /* 01620 80AE62F0 46105480 */ add.s $f18, $f10, $f16 /* 01624 80AE62F4 E612003C */ swc1 $f18, 0x003C($s0) ## 0000003C .L80AE62F8: -/* 01628 80AE62F8 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01628 80AE62F8 0C0189B7 */ jal Collider_CylinderUpdate /* 0162C 80AE62FC AFA50028 */ sw $a1, 0x0028($sp) /* 01630 80AE6300 3C01C42F */ lui $at, 0xC42F ## $at = C42F0000 @@ -155,7 +155,7 @@ glabel EnReeba_Update /* 01670 80AE6340 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01674 80AE6344 00812821 */ addu $a1, $a0, $at /* 01678 80AE6348 AFA5002C */ sw $a1, 0x002C($sp) -/* 0167C 80AE634C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0167C 80AE634C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01680 80AE6350 8FA60028 */ lw $a2, 0x0028($sp) /* 01684 80AE6354 C60800BC */ lwc1 $f8, 0x00BC($s0) ## 000000BC @@ -168,7 +168,7 @@ glabel EnReeba_Update /* 016A0 80AE6370 8FA60028 */ lw $a2, 0x0028($sp) /* 016A4 80AE6374 4503000F */ bc1tl .L80AE63B4 /* 016A8 80AE6378 8FBF0024 */ lw $ra, 0x0024($sp) -/* 016AC 80AE637C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 016AC 80AE637C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 016B0 80AE6380 AFB90030 */ sw $t9, 0x0030($sp) /* 016B4 80AE6384 8E02026C */ lw $v0, 0x026C($s0) ## 0000026C @@ -181,7 +181,7 @@ glabel EnReeba_Update /* 016D0 80AE63A0 8FBF0024 */ lw $ra, 0x0024($sp) .L80AE63A4: /* 016D4 80AE63A4 8FA5002C */ lw $a1, 0x002C($sp) -/* 016D8 80AE63A8 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 016D8 80AE63A8 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 016DC 80AE63AC 8FA60028 */ lw $a2, 0x0028($sp) .L80AE63B0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Destroy.s index 833366c796..21d45bb4c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Destroy.s @@ -5,12 +5,12 @@ glabel EnRr_Destroy /* 001A8 80AE85E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 001AC 80AE85EC 8FA50018 */ lw $a1, 0x0018($sp) /* 001B0 80AE85F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001B4 80AE85F4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001B4 80AE85F4 0C0170EB */ jal Collider_DestroyCylinder /* 001B8 80AE85F8 24A50150 */ addiu $a1, $a1, 0x0150 ## $a1 = 00000150 /* 001BC 80AE85FC 8FA50018 */ lw $a1, 0x0018($sp) /* 001C0 80AE8600 8FA4001C */ lw $a0, 0x001C($sp) -/* 001C4 80AE8604 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001C4 80AE8604 0C0170EB */ jal Collider_DestroyCylinder /* 001C8 80AE8608 24A5019C */ addiu $a1, $a1, 0x019C ## $a1 = 0000019C /* 001CC 80AE860C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Init.s index 0afd920bd5..26d3d00113 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Init.s @@ -25,25 +25,25 @@ glabel EnRr_Init /* 00034 80AE8474 A20F00AF */ sb $t7, 0x00AF($s0) ## 000000AF /* 00038 80AE8478 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 0003C 80AE847C AFA50024 */ sw $a1, 0x0024($sp) -/* 00040 80AE8480 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00040 80AE8480 0C0170D9 */ jal Collider_InitCylinder /* 00044 80AE8484 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00048 80AE8488 3C0780AF */ lui $a3, %hi(D_80AEA658) ## $a3 = 80AF0000 /* 0004C 80AE848C 8FA50024 */ lw $a1, 0x0024($sp) /* 00050 80AE8490 24E7A658 */ addiu $a3, $a3, %lo(D_80AEA658) ## $a3 = 80AEA658 /* 00054 80AE8494 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00058 80AE8498 0C017114 */ jal func_8005C450 +/* 00058 80AE8498 0C017114 */ jal Collider_SetCylinder_Set3 /* 0005C 80AE849C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00060 80AE84A0 2605019C */ addiu $a1, $s0, 0x019C ## $a1 = 0000019C /* 00064 80AE84A4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00068 80AE84A8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00068 80AE84A8 0C0170D9 */ jal Collider_InitCylinder /* 0006C 80AE84AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00070 80AE84B0 3C0780AF */ lui $a3, %hi(D_80AEA684) ## $a3 = 80AF0000 /* 00074 80AE84B4 8FA50024 */ lw $a1, 0x0024($sp) /* 00078 80AE84B8 24E7A684 */ addiu $a3, $a3, %lo(D_80AEA684) ## $a3 = 80AEA684 /* 0007C 80AE84BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00080 80AE84C0 0C017114 */ jal func_8005C450 +/* 00080 80AE84C0 0C017114 */ jal Collider_SetCylinder_Set3 /* 00084 80AE84C4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00088 80AE84C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0008C 80AE84CC 0C00B56E */ jal Actor_SetHeight diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Update.s index 8ffaaecaa5..3aea058635 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Update.s @@ -111,7 +111,7 @@ glabel EnRr_Update /* 01A8C 80AE9ECC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01A90 80AE9ED0 26330150 */ addiu $s3, $s1, 0x0150 ## $s3 = 00000150 /* 01A94 80AE9ED4 02602825 */ or $a1, $s3, $zero ## $a1 = 00000150 -/* 01A98 80AE9ED8 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01A98 80AE9ED8 0C0189B7 */ jal Collider_CylinderUpdate /* 01A9C 80AE9EDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01AA0 80AE9EE0 C624037C */ lwc1 $f4, 0x037C($s1) ## 0000037C @@ -135,13 +135,13 @@ glabel EnRr_Update /* 01AE8 80AE9F28 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01AEC 80AE9F2C 02818021 */ addu $s0, $s4, $at /* 01AF0 80AE9F30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01AF4 80AE9F34 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01AF4 80AE9F34 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01AF8 80AE9F38 02603025 */ or $a2, $s3, $zero ## $a2 = 00000150 /* 01AFC 80AE9F3C 2632019C */ addiu $s2, $s1, 0x019C ## $s2 = 0000019C /* 01B00 80AE9F40 02403025 */ or $a2, $s2, $zero ## $a2 = 0000019C /* 01B04 80AE9F44 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01B08 80AE9F48 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01B08 80AE9F48 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01B0C 80AE9F4C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01B10 80AE9F50 863901F4 */ lh $t9, 0x01F4($s1) ## 000001F4 @@ -149,13 +149,13 @@ glabel EnRr_Update /* 01B18 80AE9F58 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01B1C 80AE9F5C 57200004 */ bnel $t9, $zero, .L80AE9F70 /* 01B20 80AE9F60 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01B24 80AE9F64 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01B24 80AE9F64 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01B28 80AE9F68 02603025 */ or $a2, $s3, $zero ## $a2 = 00000150 /* 01B2C 80AE9F6C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 .L80AE9F70: /* 01B30 80AE9F70 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01B34 80AE9F74 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01B34 80AE9F74 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01B38 80AE9F78 02403025 */ or $a2, $s2, $zero ## $a2 = 0000019C /* 01B3C 80AE9F7C 1000000E */ beq $zero, $zero, .L80AE9FB8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Destroy.s index 8073be0103..dd280945af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Destroy.s @@ -3,7 +3,7 @@ glabel EnSa_Destroy /* 00EC4 80AF6424 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00EC8 80AF6428 AFBF0014 */ sw $ra, 0x0014($sp) /* 00ECC 80AF642C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00ED0 80AF6430 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00ED0 80AF6430 0C0170EB */ jal Collider_DestroyCylinder /* 00ED4 80AF6434 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 00ED8 80AF6438 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s index 546a7af4c7..2b53e4bdbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s @@ -37,14 +37,14 @@ glabel EnSa_Init /* 00CB0 80AF6210 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00CB4 80AF6214 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00CB8 80AF6218 AFA50040 */ sw $a1, 0x0040($sp) -/* 00CBC 80AF621C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00CBC 80AF621C 0C0170D9 */ jal Collider_InitCylinder /* 00CC0 80AF6220 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00CC4 80AF6224 3C0780AF */ lui $a3, %hi(D_80AF7260) ## $a3 = 80AF0000 /* 00CC8 80AF6228 8FA50040 */ lw $a1, 0x0040($sp) /* 00CCC 80AF622C 24E77260 */ addiu $a3, $a3, %lo(D_80AF7260) ## $a3 = 80AF7260 /* 00CD0 80AF6230 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00CD4 80AF6234 0C01712B */ jal ActorCollider_InitCylinder +/* 00CD4 80AF6234 0C01712B */ jal Collider_SetCylinder /* 00CD8 80AF6238 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00CDC 80AF623C 3C0680AF */ lui $a2, %hi(D_80AF728C) ## $a2 = 80AF0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s index 062ae43c6c..4c919088b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Update.s @@ -7,14 +7,14 @@ glabel EnSa_Update /* 01694 80AF6BF4 AFBF0024 */ sw $ra, 0x0024($sp) /* 01698 80AF6BF8 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 0169C 80AF6BFC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 016A0 80AF6C00 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 016A0 80AF6C00 0C0189B7 */ jal Collider_CylinderUpdate /* 016A4 80AF6C04 AFA6002C */ sw $a2, 0x002C($sp) /* 016A8 80AF6C08 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 016AC 80AF6C0C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 016B0 80AF6C10 8FA6002C */ lw $a2, 0x002C($sp) /* 016B4 80AF6C14 02212821 */ addu $a1, $s1, $at -/* 016B8 80AF6C18 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 016B8 80AF6C18 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 016BC 80AF6C1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 016C0 80AF6C20 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s index 030ec17620..7a8d0af071 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s @@ -7,7 +7,7 @@ glabel EnSb_Destroy /* 000F8 80AF78E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 000FC 80AF78EC 8FA50018 */ lw $a1, 0x0018($sp) /* 00100 80AF78F0 8FA4001C */ lw $a0, 0x001C($sp) -/* 00104 80AF78F4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00104 80AF78F4 0C0170EB */ jal Collider_DestroyCylinder /* 00108 80AF78F8 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 /* 0010C 80AF78FC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s index f19f9f20b9..cb2fa535f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s @@ -30,14 +30,14 @@ glabel EnSb_Init /* 00058 80AF7848 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0005C 80AF784C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00060 80AF7850 AFA50030 */ sw $a1, 0x0030($sp) -/* 00064 80AF7854 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00064 80AF7854 0C0170D9 */ jal Collider_InitCylinder /* 00068 80AF7858 8FA4003C */ lw $a0, 0x003C($sp) /* 0006C 80AF785C 3C0780B0 */ lui $a3, %hi(D_80AF89D0) ## $a3 = 80B00000 /* 00070 80AF7860 8FA50030 */ lw $a1, 0x0030($sp) /* 00074 80AF7864 24E789D0 */ addiu $a3, $a3, %lo(D_80AF89D0) ## $a3 = 80AF89D0 /* 00078 80AF7868 8FA4003C */ lw $a0, 0x003C($sp) -/* 0007C 80AF786C 0C017114 */ jal func_8005C450 +/* 0007C 80AF786C 0C017114 */ jal Collider_SetCylinder_Set3 /* 00080 80AF7870 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00084 80AF7874 3C053BC4 */ lui $a1, 0x3BC4 ## $a1 = 3BC40000 /* 00088 80AF7878 A60001FC */ sh $zero, 0x01FC($s0) ## 000001FC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Update.s index edf989300d..16533aa9c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Update.s @@ -80,7 +80,7 @@ glabel EnSb_Update /* 00FCC 80AF87BC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00FD0 80AF87C0 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00FD4 80AF87C4 AFA50028 */ sw $a1, 0x0028($sp) -/* 00FD8 80AF87C8 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00FD8 80AF87C8 0C0189B7 */ jal Collider_CylinderUpdate /* 00FDC 80AF87CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00FE0 80AF87D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -88,17 +88,17 @@ glabel EnSb_Update /* 00FE8 80AF87D8 02212821 */ addu $a1, $s1, $at /* 00FEC 80AF87DC AFA5002C */ sw $a1, 0x002C($sp) /* 00FF0 80AF87E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00FF4 80AF87E4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00FF4 80AF87E4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00FF8 80AF87E8 8FA60028 */ lw $a2, 0x0028($sp) /* 00FFC 80AF87EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01000 80AF87F0 8FA5002C */ lw $a1, 0x002C($sp) -/* 01004 80AF87F4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01004 80AF87F4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01008 80AF87F8 8FA60028 */ lw $a2, 0x0028($sp) /* 0100C 80AF87FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01010 80AF8800 8FA5002C */ lw $a1, 0x002C($sp) -/* 01014 80AF8804 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01014 80AF8804 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01018 80AF8808 8FA60028 */ lw $a2, 0x0028($sp) /* 0101C 80AF880C 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Destroy.s index 2a82f43511..c0c597a3e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Destroy.s @@ -3,7 +3,7 @@ glabel EnShopnuts_Destroy /* 0013C 80AFA85C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00140 80AFA860 AFBF0014 */ sw $ra, 0x0014($sp) /* 00144 80AFA864 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00148 80AFA868 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00148 80AFA868 0C0170EB */ jal Collider_DestroyCylinder /* 0014C 80AFA86C 24C50270 */ addiu $a1, $a2, 0x0270 ## $a1 = 00000270 /* 00150 80AFA870 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s index e4f6e7a490..4fc6fdb1c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s @@ -30,14 +30,14 @@ glabel EnShopnuts_Init /* 00068 80AFA788 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0006C 80AFA78C 26050270 */ addiu $a1, $s0, 0x0270 ## $a1 = 00000270 /* 00070 80AFA790 AFA50030 */ sw $a1, 0x0030($sp) -/* 00074 80AFA794 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00074 80AFA794 0C0170D9 */ jal Collider_InitCylinder /* 00078 80AFA798 8FA4003C */ lw $a0, 0x003C($sp) /* 0007C 80AFA79C 3C0780B0 */ lui $a3, %hi(D_80AFB4E0) ## $a3 = 80B00000 /* 00080 80AFA7A0 24E7B4E0 */ addiu $a3, $a3, %lo(D_80AFB4E0) ## $a3 = 80AFB4E0 /* 00084 80AFA7A4 8FA4003C */ lw $a0, 0x003C($sp) /* 00088 80AFA7A8 8FA50030 */ lw $a1, 0x0030($sp) -/* 0008C 80AFA7AC 0C01712B */ jal ActorCollider_InitCylinder +/* 0008C 80AFA7AC 0C01712B */ jal Collider_SetCylinder /* 00090 80AFA7B0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00094 80AFA7B4 3C0680B0 */ lui $a2, %hi(D_80AFB50C) ## $a2 = 80B00000 @@ -46,7 +46,7 @@ glabel EnShopnuts_Init /* 000A0 80AFA7C0 0C0187B5 */ jal func_80061ED4 /* 000A4 80AFA7C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 000A8 80AFA7C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000AC 80AFA7CC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 000AC 80AFA7CC 0C0189B7 */ jal Collider_CylinderUpdate /* 000B0 80AFA7D0 8FA50030 */ lw $a1, 0x0030($sp) /* 000B4 80AFA7D4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Update.s index 3dbc624fe3..1941a5c903 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Update.s @@ -32,7 +32,7 @@ glabel EnShopnuts_Update /* 00A7C 80AFB19C 11200004 */ beq $t1, $zero, .L80AFB1B0 /* 00A80 80AFB1A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A84 80AFB1A4 02212821 */ addu $a1, $s1, $at -/* 00A88 80AFB1A8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00A88 80AFB1A8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00A8C 80AFB1AC 26060270 */ addiu $a2, $s0, 0x0270 ## $a2 = 00000270 .L80AFB1B0: @@ -40,7 +40,7 @@ glabel EnShopnuts_Update /* 00A94 80AFB1B4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00A98 80AFB1B8 02212821 */ addu $a1, $s1, $at /* 00A9C 80AFB1BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00AA0 80AFB1C0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00AA0 80AFB1C0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00AA4 80AFB1C4 26060270 */ addiu $a2, $s0, 0x0270 ## $a2 = 00000270 /* 00AA8 80AFB1C8 8E030190 */ lw $v1, 0x0190($s0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Destroy.s index 663da267e9..43c1fb4994 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Destroy.s @@ -3,7 +3,7 @@ glabel EnSi_Destroy /* 00094 80AFB724 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00098 80AFB728 AFBF0014 */ sw $ra, 0x0014($sp) /* 0009C 80AFB72C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000A0 80AFB730 0C0170EB */ jal ActorCollider_FreeCylinder +/* 000A0 80AFB730 0C0170EB */ jal Collider_DestroyCylinder /* 000A4 80AFB734 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 000A8 80AFB738 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Init.s index 5e6a00628e..97e76b9f68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Init.s @@ -6,14 +6,14 @@ glabel EnSi_Init /* 00010 80AFB6A0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00014 80AFB6A4 AFBF001C */ sw $ra, 0x001C($sp) /* 00018 80AFB6A8 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 0001C 80AFB6AC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0001C 80AFB6AC 0C0170D9 */ jal Collider_InitCylinder /* 00020 80AFB6B0 AFA50020 */ sw $a1, 0x0020($sp) /* 00024 80AFB6B4 3C0780B0 */ lui $a3, %hi(D_80AFBAB0) ## $a3 = 80B00000 /* 00028 80AFB6B8 8FA50020 */ lw $a1, 0x0020($sp) /* 0002C 80AFB6BC 24E7BAB0 */ addiu $a3, $a3, %lo(D_80AFBAB0) ## $a3 = 80AFBAB0 /* 00030 80AFB6C0 8FA4002C */ lw $a0, 0x002C($sp) -/* 00034 80AFB6C4 0C01712B */ jal ActorCollider_InitCylinder +/* 00034 80AFB6C4 0C01712B */ jal Collider_SetCylinder /* 00038 80AFB6C8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0003C 80AFB6CC 3C0680B0 */ lui $a2, %hi(D_80AFBADC) ## $a2 = 80B00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB768.s b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB768.s index f8bfb1e1f7..246d5724fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB768.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Si/func_80AFB768.s @@ -62,7 +62,7 @@ glabel func_80AFB768 /* 001BC 80AFB84C 1000000E */ beq $zero, $zero, .L80AFB888 /* 001C0 80AFB850 AE0E014C */ sw $t6, 0x014C($s0) ## 0000014C .L80AFB854: -/* 001C4 80AFB854 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 001C4 80AFB854 0C0189B7 */ jal Collider_CylinderUpdate /* 001C8 80AFB858 AFA50028 */ sw $a1, 0x0028($sp) /* 001CC 80AFB85C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -70,12 +70,12 @@ glabel func_80AFB768 /* 001D4 80AFB864 02218021 */ addu $s0, $s1, $at /* 001D8 80AFB868 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 001DC 80AFB86C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001E0 80AFB870 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 001E0 80AFB870 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 001E4 80AFB874 8FA60028 */ lw $a2, 0x0028($sp) /* 001E8 80AFB878 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001EC 80AFB87C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001F0 80AFB880 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 001F0 80AFB880 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 001F4 80AFB884 8FA60028 */ lw $a2, 0x0028($sp) .L80AFB888: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Destroy.s index edd1d08a27..cbe31a9fe8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Destroy.s @@ -15,7 +15,7 @@ glabel EnSkb_Destroy /* 003A0 80AFCD40 246FFFFF */ addiu $t7, $v1, 0xFFFF ## $t7 = FFFFFFFF /* 003A4 80AFCD44 A44F0152 */ sh $t7, 0x0152($v0) ## 00000152 .L80AFCD48: -/* 003A8 80AFCD48 0C016F32 */ jal func_8005BCC8 +/* 003A8 80AFCD48 0C016F32 */ jal Collider_DestroyJntSph /* 003AC 80AFCD4C 24C502A4 */ addiu $a1, $a2, 0x02A4 ## $a1 = 000002A4 /* 003B0 80AFCD50 8FBF0014 */ lw $ra, 0x0014($sp) /* 003B4 80AFCD54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s index b945c87e35..4d39dd39d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s @@ -60,7 +60,7 @@ glabel EnSkb_Init /* 00274 80AFCC14 A20C0117 */ sb $t4, 0x0117($s0) ## 00000117 /* 00278 80AFCC18 260502A4 */ addiu $a1, $s0, 0x02A4 ## $a1 = 000002A4 /* 0027C 80AFCC1C AFA50030 */ sw $a1, 0x0030($sp) -/* 00280 80AFCC20 0C016EFE */ jal func_8005BBF8 +/* 00280 80AFCC20 0C016EFE */ jal Collider_InitJntSph /* 00284 80AFCC24 8FA40044 */ lw $a0, 0x0044($sp) /* 00288 80AFCC28 3C0780B0 */ lui $a3, %hi(D_80AFE068) ## $a3 = 80B00000 /* 0028C 80AFCC2C 260D02C4 */ addiu $t5, $s0, 0x02C4 ## $t5 = 000002C4 @@ -68,7 +68,7 @@ glabel EnSkb_Init /* 00294 80AFCC34 AFAD0010 */ sw $t5, 0x0010($sp) /* 00298 80AFCC38 24E7E068 */ addiu $a3, $a3, %lo(D_80AFE068) ## $a3 = 80AFE068 /* 0029C 80AFCC3C 8FA40044 */ lw $a0, 0x0044($sp) -/* 002A0 80AFCC40 0C017014 */ jal func_8005C050 +/* 002A0 80AFCC40 0C017014 */ jal Collider_SetJntSph /* 002A4 80AFCC44 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002A8 80AFCC48 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 002AC 80AFCC4C 3C0180B0 */ lui $at, %hi(D_80AFE108) ## $at = 80B00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Update.s index d164e831cb..b67f771438 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Update.s @@ -48,7 +48,7 @@ glabel EnSkb_Update /* 01310 80AFDCB0 460A8480 */ add.s $f18, $f16, $f10 /* 01314 80AFDCB4 11000003 */ beq $t0, $zero, .L80AFDCC4 /* 01318 80AFDCB8 E612003C */ swc1 $f18, 0x003C($s0) ## 0000003C -/* 0131C 80AFDCBC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0131C 80AFDCBC 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01320 80AFDCC0 260602A4 */ addiu $a2, $s0, 0x02A4 ## $a2 = 000002A4 .L80AFDCC4: @@ -69,13 +69,13 @@ glabel EnSkb_Update /* 0135C 80AFDCFC 00000000 */ nop /* 01360 80AFDD00 AFA5002C */ sw $a1, 0x002C($sp) .L80AFDD04: -/* 01364 80AFDD04 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01364 80AFDD04 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01368 80AFDD08 AFA60028 */ sw $a2, 0x0028($sp) /* 0136C 80AFDD0C 8FA5002C */ lw $a1, 0x002C($sp) /* 01370 80AFDD10 8FA60028 */ lw $a2, 0x0028($sp) .L80AFDD14: -/* 01374 80AFDD14 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01374 80AFDD14 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01378 80AFDD18 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0137C 80AFDD1C 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Destroy.s index 48a697fcdc..60d8321b29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Destroy.s @@ -3,7 +3,7 @@ glabel EnSkj_Destroy /* 00618 80AFE8C8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0061C 80AFE8CC AFBF0014 */ sw $ra, 0x0014($sp) /* 00620 80AFE8D0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00624 80AFE8D4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00624 80AFE8D4 0C0170EB */ jal Collider_DestroyCylinder /* 00628 80AFE8D8 24C50278 */ addiu $a1, $a2, 0x0278 ## $a1 = 00000278 /* 0062C 80AFE8DC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s index 19cdb50b69..c0f9a9ae6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s @@ -185,14 +185,14 @@ glabel EnSkj_Init /* 004A0 80AFE750 A21800AF */ sb $t8, 0x00AF($s0) ## 000000AF /* 004A4 80AFE754 26050278 */ addiu $a1, $s0, 0x0278 ## $a1 = 00000278 /* 004A8 80AFE758 AFA50034 */ sw $a1, 0x0034($sp) -/* 004AC 80AFE75C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 004AC 80AFE75C 0C0170D9 */ jal Collider_InitCylinder /* 004B0 80AFE760 8FA40054 */ lw $a0, 0x0054($sp) /* 004B4 80AFE764 3C0780B0 */ lui $a3, %hi(D_80B01678) ## $a3 = 80B00000 /* 004B8 80AFE768 8FA50034 */ lw $a1, 0x0034($sp) /* 004BC 80AFE76C 24E71678 */ addiu $a3, $a3, %lo(D_80B01678) ## $a3 = 80B01678 /* 004C0 80AFE770 8FA40054 */ lw $a0, 0x0054($sp) -/* 004C4 80AFE774 0C017114 */ jal func_8005C450 +/* 004C4 80AFE774 0C017114 */ jal Collider_SetCylinder_Set3 /* 004C8 80AFE778 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 004CC 80AFE77C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 004D0 80AFE780 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Update.s index e9c1147a84..6c7e362fba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Update.s @@ -81,7 +81,7 @@ glabel EnSkj_Update /* 025EC 80B0089C A60D010E */ sh $t5, 0x010E($s0) ## 0000010E /* 025F0 80B008A0 26050278 */ addiu $a1, $s0, 0x0278 ## $a1 = 00000278 /* 025F4 80B008A4 AFA5002C */ sw $a1, 0x002C($sp) -/* 025F8 80B008A8 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 025F8 80B008A8 0C0189B7 */ jal Collider_CylinderUpdate /* 025FC 80B008AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02600 80B008B0 920E02D3 */ lbu $t6, 0x02D3($s0) ## 000002D3 @@ -95,7 +95,7 @@ glabel EnSkj_Update /* 02620 80B008D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02624 80B008D4 02212821 */ addu $a1, $s1, $at /* 02628 80B008D8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0262C 80B008DC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0262C 80B008DC 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 02630 80B008E0 8FA6002C */ lw $a2, 0x002C($sp) /* 02634 80B008E4 92180114 */ lbu $t8, 0x0114($s0) ## 00000114 @@ -103,7 +103,7 @@ glabel EnSkj_Update /* 0263C 80B008EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02640 80B008F0 57000004 */ bnel $t8, $zero, .L80B00904 /* 02644 80B008F4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02648 80B008F8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 02648 80B008F8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0264C 80B008FC 8FA6002C */ lw $a2, 0x002C($sp) .L80B00900: @@ -112,7 +112,7 @@ glabel EnSkj_Update /* 02654 80B00904 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02658 80B00908 02212821 */ addu $a1, $s1, $at /* 0265C 80B0090C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02660 80B00910 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02660 80B00910 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02664 80B00914 8FA6002C */ lw $a2, 0x002C($sp) /* 02668 80B00918 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Destroy.s index 19d64b4d7e..82a5a63d15 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Destroy.s @@ -3,7 +3,7 @@ glabel EnSkjneedle_Destroy /* 00098 80B01F48 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0009C 80B01F4C AFBF0014 */ sw $ra, 0x0014($sp) /* 000A0 80B01F50 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000A4 80B01F54 0C0170EB */ jal ActorCollider_FreeCylinder +/* 000A4 80B01F54 0C0170EB */ jal Collider_DestroyCylinder /* 000A8 80B01F58 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 000AC 80B01F5C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Init.s index 568f468dc5..85dc7c8827 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Init.s @@ -10,14 +10,14 @@ glabel EnSkjneedle_Init /* 0001C 80B01ECC 24A521AC */ addiu $a1, $a1, %lo(D_80B021AC) ## $a1 = 80B021AC /* 00020 80B01ED0 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00024 80B01ED4 AFA50020 */ sw $a1, 0x0020($sp) -/* 00028 80B01ED8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00028 80B01ED8 0C0170D9 */ jal Collider_InitCylinder /* 0002C 80B01EDC 8FA4002C */ lw $a0, 0x002C($sp) /* 00030 80B01EE0 3C0780B0 */ lui $a3, %hi(D_80B02180) ## $a3 = 80B00000 /* 00034 80B01EE4 8FA50020 */ lw $a1, 0x0020($sp) /* 00038 80B01EE8 24E72180 */ addiu $a3, $a3, %lo(D_80B02180) ## $a3 = 80B02180 /* 0003C 80B01EEC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00040 80B01EF0 0C017114 */ jal func_8005C450 +/* 00040 80B01EF0 0C017114 */ jal Collider_SetCylinder_Set3 /* 00044 80B01EF4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00048 80B01EF8 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) /* 0004C 80B01EFC 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Update.s index bd1c154544..39cc2e2ef1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Update.s @@ -34,7 +34,7 @@ glabel EnSkjneedle_Update /* 00158 80B02008 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 0000D70A /* 0015C 80B0200C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00160 80B02010 AFA50028 */ sw $a1, 0x0028($sp) -/* 00164 80B02014 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00164 80B02014 0C0189B7 */ jal Collider_CylinderUpdate /* 00168 80B02018 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0016C 80B0201C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -42,12 +42,12 @@ glabel EnSkjneedle_Update /* 00174 80B02024 02212821 */ addu $a1, $s1, $at /* 00178 80B02028 AFA5002C */ sw $a1, 0x002C($sp) /* 0017C 80B0202C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00180 80B02030 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00180 80B02030 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00184 80B02034 8FA60028 */ lw $a2, 0x0028($sp) /* 00188 80B02038 8FA5002C */ lw $a1, 0x002C($sp) /* 0018C 80B0203C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00190 80B02040 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00190 80B02040 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00194 80B02044 8FA60028 */ lw $a2, 0x0028($sp) /* 00198 80B02048 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Destroy.s index 236ab8930e..788f665dc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Destroy.s @@ -16,14 +16,14 @@ glabel EnSsh_Destroy /* 016B0 80B03920 241201C8 */ addiu $s2, $zero, 0x01C8 ## $s2 = 000001C8 .L80B03924: /* 016B4 80B03924 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 016B8 80B03928 0C0170EB */ jal ActorCollider_FreeCylinder +/* 016B8 80B03928 0C0170EB */ jal Collider_DestroyCylinder /* 016BC 80B0392C 02202825 */ or $a1, $s1, $zero ## $a1 = 000002FC /* 016C0 80B03930 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C /* 016C4 80B03934 1612FFFB */ bne $s0, $s2, .L80B03924 /* 016C8 80B03938 2631004C */ addiu $s1, $s1, 0x004C ## $s1 = 00000348 /* 016CC 80B0393C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 016D0 80B03940 0C016F32 */ jal func_8005BCC8 +/* 016D0 80B03940 0C016F32 */ jal Collider_DestroyJntSph /* 016D4 80B03944 266504C4 */ addiu $a1, $s3, 0x04C4 ## $a1 = 000004C4 /* 016D8 80B03948 8FBF002C */ lw $ra, 0x002C($sp) /* 016DC 80B0394C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B025C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B025C0.s index c5361f1f27..7836a7a57b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B025C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B025C0.s @@ -28,13 +28,13 @@ glabel func_80B025C0 /* 003B8 80B02628 ADD80014 */ sw $t8, 0x0014($t6) ## FFFFFFFC .L80B0262C: /* 003BC 80B0262C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 003C0 80B02630 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 003C0 80B02630 0C0170D9 */ jal Collider_InitCylinder /* 003C4 80B02634 02002825 */ or $a1, $s0, $zero ## $a1 = 000002FC /* 003C8 80B02638 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 003CC 80B0263C 02002825 */ or $a1, $s0, $zero ## $a1 = 000002FC /* 003D0 80B02640 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 -/* 003D4 80B02644 0C01712B */ jal ActorCollider_InitCylinder +/* 003D4 80B02644 0C01712B */ jal Collider_SetCylinder /* 003D8 80B02648 8E270000 */ lw $a3, 0x0000($s1) ## FFFFFFE8 /* 003DC 80B0264C 26310004 */ addiu $s1, $s1, 0x0004 ## $s1 = FFFFFFEC @@ -55,7 +55,7 @@ glabel func_80B025C0 /* 00418 80B02688 A26B03C2 */ sb $t3, 0x03C2($s3) ## 000003C2 /* 0041C 80B0268C A26C03C0 */ sb $t4, 0x03C0($s3) ## 000003C0 /* 00420 80B02690 AE6D03B4 */ sw $t5, 0x03B4($s3) ## 000003B4 -/* 00424 80B02694 0C016C80 */ jal CollisionBtlTbl_Get +/* 00424 80B02694 0C016C80 */ jal DamageTable_Get /* 00428 80B02698 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 /* 0042C 80B0269C 3C0680B0 */ lui $a2, %hi(D_80B0449C) ## $a2 = 80B00000 @@ -65,7 +65,7 @@ glabel func_80B025C0 /* 0043C 80B026AC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00440 80B026B0 267004C4 */ addiu $s0, $s3, 0x04C4 ## $s0 = 000004C4 /* 00444 80B026B4 02002825 */ or $a1, $s0, $zero ## $a1 = 000004C4 -/* 00448 80B026B8 0C016EFE */ jal func_8005BBF8 +/* 00448 80B026B8 0C016EFE */ jal Collider_InitJntSph /* 0044C 80B026BC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00450 80B026C0 3C0780B0 */ lui $a3, %hi(D_80B044F8) ## $a3 = 80B00000 /* 00454 80B026C4 266E04E4 */ addiu $t6, $s3, 0x04E4 ## $t6 = 000004E4 @@ -73,7 +73,7 @@ glabel func_80B025C0 /* 0045C 80B026CC 24E744F8 */ addiu $a3, $a3, %lo(D_80B044F8) ## $a3 = 80B044F8 /* 00460 80B026D0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00464 80B026D4 02002825 */ or $a1, $s0, $zero ## $a1 = 000004C4 -/* 00468 80B026D8 0C017014 */ jal func_8005C050 +/* 00468 80B026D8 0C017014 */ jal Collider_SetJntSph /* 0046C 80B026DC 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 00470 80B026E0 8FBF0034 */ lw $ra, 0x0034($sp) /* 00474 80B026E4 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B033BC.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B033BC.s index 414d9ceb5a..8009087959 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B033BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B033BC.s @@ -4,14 +4,14 @@ glabel func_80B033BC /* 01154 80B033C4 AFA50024 */ sw $a1, 0x0024($sp) /* 01158 80B033C8 248602FC */ addiu $a2, $a0, 0x02FC ## $a2 = 000002FC /* 0115C 80B033CC 00C02825 */ or $a1, $a2, $zero ## $a1 = 000002FC -/* 01160 80B033D0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01160 80B033D0 0C0189B7 */ jal Collider_CylinderUpdate /* 01164 80B033D4 AFA6001C */ sw $a2, 0x001C($sp) /* 01168 80B033D8 8FA40024 */ lw $a0, 0x0024($sp) /* 0116C 80B033DC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01170 80B033E0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01174 80B033E4 8FA6001C */ lw $a2, 0x001C($sp) -/* 01178 80B033E8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01178 80B033E8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0117C 80B033EC 00812821 */ addu $a1, $a0, $at /* 01180 80B033F0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03400.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03400.s index 53826eb587..e52b2a2b35 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03400.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03400.s @@ -23,28 +23,28 @@ glabel func_80B03400 /* 011DC 80B0344C 24860394 */ addiu $a2, $a0, 0x0394 ## $a2 = 00000394 /* 011E0 80B03450 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000394 /* 011E4 80B03454 AFA60018 */ sw $a2, 0x0018($sp) -/* 011E8 80B03458 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 011E8 80B03458 0C0189B7 */ jal Collider_CylinderUpdate /* 011EC 80B0345C AFA70024 */ sw $a3, 0x0024($sp) /* 011F0 80B03460 8FA40024 */ lw $a0, 0x0024($sp) /* 011F4 80B03464 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 011F8 80B03468 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 011FC 80B0346C 8FA60018 */ lw $a2, 0x0018($sp) -/* 01200 80B03470 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01200 80B03470 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01204 80B03474 00812821 */ addu $a1, $a0, $at /* 01208 80B03478 1000000B */ beq $zero, $zero, .L80B034A8 /* 0120C 80B0347C 8FBF0014 */ lw $ra, 0x0014($sp) .L80B03480: /* 01210 80B03480 AFA60018 */ sw $a2, 0x0018($sp) -/* 01214 80B03484 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01214 80B03484 0C0189B7 */ jal Collider_CylinderUpdate /* 01218 80B03488 AFA70024 */ sw $a3, 0x0024($sp) /* 0121C 80B0348C 8FA40024 */ lw $a0, 0x0024($sp) /* 01220 80B03490 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01224 80B03494 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01228 80B03498 8FA60018 */ lw $a2, 0x0018($sp) -/* 0122C 80B0349C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0122C 80B0349C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01230 80B034A0 00812821 */ addu $a1, $a0, $at /* 01234 80B034A4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B034B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B034B4.s index 9f89cbd9ba..34c2af4d49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B034B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B034B4.s @@ -101,7 +101,7 @@ glabel func_80B034B4 /* 013B4 80B03624 C7B00078 */ lwc1 $f16, 0x0078($sp) /* 013B8 80B03628 4600848D */ trunc.w.s $f18, $f16 /* 013BC 80B0362C 44189000 */ mfc1 $t8, $f18 -/* 013C0 80B03630 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 013C0 80B03630 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 013C4 80B03634 A638042A */ sh $t8, 0x042A($s1) ## 0000042A /* 013C8 80B03638 2673004C */ addiu $s3, $s3, 0x004C ## $s3 = 0000004C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0368C.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0368C.s index 72d4a6257a..ebdf086e8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0368C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B0368C.s @@ -12,12 +12,12 @@ glabel func_80B0368C /* 01444 80B036B4 00A12821 */ addu $a1, $a1, $at /* 01448 80B036B8 24E604C4 */ addiu $a2, $a3, 0x04C4 ## $a2 = 000004C4 /* 0144C 80B036BC AFA60024 */ sw $a2, 0x0024($sp) -/* 01450 80B036C0 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01450 80B036C0 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01454 80B036C4 AFA50028 */ sw $a1, 0x0028($sp) /* 01458 80B036C8 8FA50028 */ lw $a1, 0x0028($sp) /* 0145C 80B036CC 8FA60024 */ lw $a2, 0x0024($sp) -/* 01460 80B036D0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01460 80B036D0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01464 80B036D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01468 80B036D8 1000001A */ beq $zero, $zero, .L80B03744 diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Destroy.s index 43bf2eb47a..03869e844f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Destroy.s @@ -16,14 +16,14 @@ glabel EnSt_Destroy /* 01BD8 80B06468 241201C8 */ addiu $s2, $zero, 0x01C8 ## $s2 = 000001C8 .L80B0646C: /* 01BDC 80B0646C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01BE0 80B06470 0C0170EB */ jal ActorCollider_FreeCylinder +/* 01BE0 80B06470 0C0170EB */ jal Collider_DestroyCylinder /* 01BE4 80B06474 02202825 */ or $a1, $s1, $zero ## $a1 = 00000194 /* 01BE8 80B06478 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C /* 01BEC 80B0647C 1612FFFB */ bne $s0, $s2, .L80B0646C /* 01BF0 80B06480 2631004C */ addiu $s1, $s1, 0x004C ## $s1 = 000001E0 /* 01BF4 80B06484 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01BF8 80B06488 0C016F32 */ jal func_8005BCC8 +/* 01BF8 80B06488 0C016F32 */ jal Collider_DestroyJntSph /* 01BFC 80B0648C 2665035C */ addiu $a1, $s3, 0x035C ## $a1 = 0000035C /* 01C00 80B06490 8FBF002C */ lw $ra, 0x002C($sp) /* 01C04 80B06494 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B050A0.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B050A0.s index d7926abbfc..5f2f04d235 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B050A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B050A0.s @@ -28,13 +28,13 @@ glabel func_80B050A0 /* 00878 80B05108 ADD80014 */ sw $t8, 0x0014($t6) ## FFFFFFFC .L80B0510C: /* 0087C 80B0510C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00880 80B05110 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00880 80B05110 0C0170D9 */ jal Collider_InitCylinder /* 00884 80B05114 02002825 */ or $a1, $s0, $zero ## $a1 = 00000194 /* 00888 80B05118 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0088C 80B0511C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000194 /* 00890 80B05120 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 -/* 00894 80B05124 0C01712B */ jal ActorCollider_InitCylinder +/* 00894 80B05124 0C01712B */ jal Collider_SetCylinder /* 00898 80B05128 8E270000 */ lw $a3, 0x0000($s1) ## FFFFFFE8 /* 0089C 80B0512C 26310004 */ addiu $s1, $s1, 0x0004 ## $s1 = FFFFFFEC @@ -55,7 +55,7 @@ glabel func_80B050A0 /* 008D8 80B05168 A26B025A */ sb $t3, 0x025A($s3) ## 0000025A /* 008DC 80B0516C A26C0258 */ sb $t4, 0x0258($s3) ## 00000258 /* 008E0 80B05170 AE6D024C */ sw $t5, 0x024C($s3) ## 0000024C -/* 008E4 80B05174 0C016C80 */ jal CollisionBtlTbl_Get +/* 008E4 80B05174 0C016C80 */ jal DamageTable_Get /* 008E8 80B05178 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 /* 008EC 80B0517C 3C0680B0 */ lui $a2, %hi(D_80B0701C) ## $a2 = 80B00000 @@ -65,7 +65,7 @@ glabel func_80B050A0 /* 008FC 80B0518C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00900 80B05190 2670035C */ addiu $s0, $s3, 0x035C ## $s0 = 0000035C /* 00904 80B05194 02002825 */ or $a1, $s0, $zero ## $a1 = 0000035C -/* 00908 80B05198 0C016EFE */ jal func_8005BBF8 +/* 00908 80B05198 0C016EFE */ jal Collider_InitJntSph /* 0090C 80B0519C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00910 80B051A0 3C0780B0 */ lui $a3, %hi(D_80B07078) ## $a3 = 80B00000 /* 00914 80B051A4 266E037C */ addiu $t6, $s3, 0x037C ## $t6 = 0000037C @@ -73,7 +73,7 @@ glabel func_80B050A0 /* 0091C 80B051AC 24E77078 */ addiu $a3, $a3, %lo(D_80B07078) ## $a3 = 80B07078 /* 00920 80B051B0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00924 80B051B4 02002825 */ or $a1, $s0, $zero ## $a1 = 0000035C -/* 00928 80B051B8 0C017014 */ jal func_8005C050 +/* 00928 80B051B8 0C017014 */ jal Collider_SetJntSph /* 0092C 80B051BC 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 00930 80B051C0 8FBF0034 */ lw $ra, 0x0034($sp) /* 00934 80B051C4 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05254.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05254.s index 1820aebda4..ad7d0f086b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05254.s @@ -4,14 +4,14 @@ glabel func_80B05254 /* 009CC 80B0525C AFA50024 */ sw $a1, 0x0024($sp) /* 009D0 80B05260 24860194 */ addiu $a2, $a0, 0x0194 ## $a2 = 00000194 /* 009D4 80B05264 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 009D8 80B05268 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 009D8 80B05268 0C0189B7 */ jal Collider_CylinderUpdate /* 009DC 80B0526C AFA6001C */ sw $a2, 0x001C($sp) /* 009E0 80B05270 8FA40024 */ lw $a0, 0x0024($sp) /* 009E4 80B05274 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 009E8 80B05278 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 009EC 80B0527C 8FA6001C */ lw $a2, 0x001C($sp) -/* 009F0 80B05280 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 009F0 80B05280 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 009F4 80B05284 00812821 */ addu $a1, $a0, $at /* 009F8 80B05288 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05298.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05298.s index 2b773f4d9f..be2ecd10d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05298.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B05298.s @@ -23,28 +23,28 @@ glabel func_80B05298 /* 00A54 80B052E4 2486022C */ addiu $a2, $a0, 0x022C ## $a2 = 0000022C /* 00A58 80B052E8 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000022C /* 00A5C 80B052EC AFA60018 */ sw $a2, 0x0018($sp) -/* 00A60 80B052F0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00A60 80B052F0 0C0189B7 */ jal Collider_CylinderUpdate /* 00A64 80B052F4 AFA70024 */ sw $a3, 0x0024($sp) /* 00A68 80B052F8 8FA40024 */ lw $a0, 0x0024($sp) /* 00A6C 80B052FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00A70 80B05300 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00A74 80B05304 8FA60018 */ lw $a2, 0x0018($sp) -/* 00A78 80B05308 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00A78 80B05308 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00A7C 80B0530C 00812821 */ addu $a1, $a0, $at /* 00A80 80B05310 1000000B */ beq $zero, $zero, .L80B05340 /* 00A84 80B05314 8FBF0014 */ lw $ra, 0x0014($sp) .L80B05318: /* 00A88 80B05318 AFA60018 */ sw $a2, 0x0018($sp) -/* 00A8C 80B0531C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00A8C 80B0531C 0C0189B7 */ jal Collider_CylinderUpdate /* 00A90 80B05320 AFA70024 */ sw $a3, 0x0024($sp) /* 00A94 80B05324 8FA40024 */ lw $a0, 0x0024($sp) /* 00A98 80B05328 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00A9C 80B0532C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00AA0 80B05330 8FA60018 */ lw $a2, 0x0018($sp) -/* 00AA4 80B05334 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00AA4 80B05334 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00AA8 80B05338 00812821 */ addu $a1, $a0, $at /* 00AAC 80B0533C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0534C.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0534C.s index 803a1042ad..63f42e48e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0534C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B0534C.s @@ -101,7 +101,7 @@ glabel func_80B0534C /* 00C2C 80B054BC C7B00078 */ lwc1 $f16, 0x0078($sp) /* 00C30 80B054C0 4600848D */ trunc.w.s $f18, $f16 /* 00C34 80B054C4 44189000 */ mfc1 $t8, $f18 -/* 00C38 80B054C8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00C38 80B054C8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00C3C 80B054CC A63802C2 */ sh $t8, 0x02C2($s1) ## 000002C2 /* 00C40 80B054D0 2673004C */ addiu $s3, $s3, 0x004C ## $s3 = 0000004C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Destroy.s index a8f2e600ce..257a6f459f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/EnSth_Destroy.s @@ -3,7 +3,7 @@ glabel EnSth_Destroy /* 00314 80B07854 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00318 80B07858 AFBF0014 */ sw $ra, 0x0014($sp) /* 0031C 80B0785C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00320 80B07860 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00320 80B07860 0C0170EB */ jal Collider_DestroyCylinder /* 00324 80B07864 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 00328 80B07868 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B076B0.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B076B0.s index a610b0bb73..9a7e64be03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B076B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B076B0.s @@ -13,14 +13,14 @@ glabel func_80B076B0 /* 00198 80B076D8 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 0019C 80B076DC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 001A0 80B076E0 AFA50020 */ sw $a1, 0x0020($sp) -/* 001A4 80B076E4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 001A4 80B076E4 0C0170D9 */ jal Collider_InitCylinder /* 001A8 80B076E8 8FA4002C */ lw $a0, 0x002C($sp) /* 001AC 80B076EC 3C0780B1 */ lui $a3, %hi(D_80B0B404) ## $a3 = 80B10000 /* 001B0 80B076F0 8FA50020 */ lw $a1, 0x0020($sp) /* 001B4 80B076F4 24E7B404 */ addiu $a3, $a3, %lo(D_80B0B404) ## $a3 = 80B0B404 /* 001B8 80B076F8 8FA4002C */ lw $a0, 0x002C($sp) -/* 001BC 80B076FC 0C01712B */ jal ActorCollider_InitCylinder +/* 001BC 80B076FC 0C01712B */ jal Collider_SetCylinder /* 001C0 80B07700 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001C4 80B07704 8E1802A0 */ lw $t8, 0x02A0($s0) ## 000002A0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07EE0.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07EE0.s index afac72a577..a946b0ca1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07EE0.s @@ -6,14 +6,14 @@ glabel func_80B07EE0 /* 009B0 80B07EF0 AFA5003C */ sw $a1, 0x003C($sp) /* 009B4 80B07EF4 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 009B8 80B07EF8 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 009BC 80B07EFC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 009BC 80B07EFC 0C0189B7 */ jal Collider_CylinderUpdate /* 009C0 80B07F00 AFA60028 */ sw $a2, 0x0028($sp) /* 009C4 80B07F04 8FA4003C */ lw $a0, 0x003C($sp) /* 009C8 80B07F08 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 009CC 80B07F0C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 009D0 80B07F10 8FA60028 */ lw $a2, 0x0028($sp) -/* 009D4 80B07F14 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 009D4 80B07F14 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 009D8 80B07F18 00812821 */ addu $a1, $a0, $at /* 009DC 80B07F1C 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Destroy.s index b1f3bd5854..d03d1374ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Destroy.s @@ -3,7 +3,7 @@ glabel EnSw_Destroy /* 00C1C 80B0C9CC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00C20 80B0C9D0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00C24 80B0C9D4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00C28 80B0C9D8 0C016F32 */ jal func_8005BCC8 +/* 00C28 80B0C9D8 0C016F32 */ jal Collider_DestroyJntSph /* 00C2C 80B0C9DC 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 00C30 80B0C9E0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00C34 80B0C9E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s index 6b7fd19f62..7f708d9c77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s @@ -99,7 +99,7 @@ glabel EnSw_Init /* 008A8 80B0C658 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 008AC 80B0C65C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 008B0 80B0C660 AFA50040 */ sw $a1, 0x0040($sp) -/* 008B4 80B0C664 0C016EFE */ jal func_8005BBF8 +/* 008B4 80B0C664 0C016EFE */ jal Collider_InitJntSph /* 008B8 80B0C668 8FA40064 */ lw $a0, 0x0064($sp) /* 008BC 80B0C66C 3C0780B1 */ lui $a3, %hi(D_80B0F064) ## $a3 = 80B10000 /* 008C0 80B0C670 260901B4 */ addiu $t1, $s0, 0x01B4 ## $t1 = 000001B4 @@ -107,9 +107,9 @@ glabel EnSw_Init /* 008C8 80B0C678 AFA90010 */ sw $t1, 0x0010($sp) /* 008CC 80B0C67C 24E7F064 */ addiu $a3, $a3, %lo(D_80B0F064) ## $a3 = 80B0F064 /* 008D0 80B0C680 8FA40064 */ lw $a0, 0x0064($sp) -/* 008D4 80B0C684 0C017014 */ jal func_8005C050 +/* 008D4 80B0C684 0C017014 */ jal Collider_SetJntSph /* 008D8 80B0C688 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 008DC 80B0C68C 0C016C80 */ jal CollisionBtlTbl_Get +/* 008DC 80B0C68C 0C016C80 */ jal DamageTable_Get /* 008E0 80B0C690 2404000E */ addiu $a0, $zero, 0x000E ## $a0 = 0000000E /* 008E4 80B0C694 3C0680B1 */ lui $a2, %hi(D_80B0F074) ## $a2 = 80B10000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CBE8.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CBE8.s index 969ab5ad20..c91fd2d918 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CBE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CBE8.s @@ -37,7 +37,7 @@ glabel func_80B0CBE8 /* 00EB8 80B0CC68 8FA4002C */ lw $a0, 0x002C($sp) /* 00EBC 80B0CC6C 00812821 */ addu $a1, $a0, $at /* 00EC0 80B0CC70 24E60194 */ addiu $a2, $a3, 0x0194 ## $a2 = 00000194 -/* 00EC4 80B0CC74 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00EC4 80B0CC74 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00EC8 80B0CC78 AFA70028 */ sw $a3, 0x0028($sp) /* 00ECC 80B0CC7C 8FA70028 */ lw $a3, 0x0028($sp) @@ -64,13 +64,13 @@ glabel func_80B0CBE8 /* 00F10 80B0CCC0 11C00006 */ beq $t6, $zero, .L80B0CCDC /* 00F14 80B0CCC4 00000000 */ nop /* 00F18 80B0CCC8 AFA5001C */ sw $a1, 0x001C($sp) -/* 00F1C 80B0CCCC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00F1C 80B0CCCC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00F20 80B0CCD0 AFA60018 */ sw $a2, 0x0018($sp) /* 00F24 80B0CCD4 8FA5001C */ lw $a1, 0x001C($sp) /* 00F28 80B0CCD8 8FA60018 */ lw $a2, 0x0018($sp) .L80B0CCDC: -/* 00F2C 80B0CCDC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00F2C 80B0CCDC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00F30 80B0CCE0 8FA4002C */ lw $a0, 0x002C($sp) .L80B0CCE4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Destroy.s index 89d99186da..6da16dd272 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Destroy.s @@ -3,7 +3,7 @@ glabel EnSyatekiNiw_Destroy /* 00180 80B11A70 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00184 80B11A74 AFBF0014 */ sw $ra, 0x0014($sp) /* 00188 80B11A78 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0018C 80B11A7C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0018C 80B11A7C 0C0170EB */ jal Collider_DestroyCylinder /* 00190 80B11A80 24C502FC */ addiu $a1, $a2, 0x02FC ## $a1 = 000002FC /* 00194 80B11A84 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s index 0c6e1de2f6..1a592ce283 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s @@ -59,14 +59,14 @@ glabel EnSyatekiNiw_Init /* 00094 80B11984 A600029E */ sh $zero, 0x029E($s0) ## 0000029E /* 00098 80B11988 8FA4003C */ lw $a0, 0x003C($sp) .L80B1198C: -/* 0009C 80B1198C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0009C 80B1198C 0C0170D9 */ jal Collider_InitCylinder /* 000A0 80B11990 AFA50030 */ sw $a1, 0x0030($sp) /* 000A4 80B11994 3C0780B1 */ lui $a3, %hi(D_80B13660) ## $a3 = 80B10000 /* 000A8 80B11998 8FA50030 */ lw $a1, 0x0030($sp) /* 000AC 80B1199C 24E73660 */ addiu $a3, $a3, %lo(D_80B13660) ## $a3 = 80B13660 /* 000B0 80B119A0 8FA4003C */ lw $a0, 0x003C($sp) -/* 000B4 80B119A4 0C01712B */ jal ActorCollider_InitCylinder +/* 000B4 80B119A4 0C01712B */ jal Collider_SetCylinder /* 000B8 80B119A8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000BC 80B119AC 860B029E */ lh $t3, 0x029E($s0) ## 0000029E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Update.s index 5136a5f8e1..24c69fc4dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Update.s @@ -223,7 +223,7 @@ glabel EnSyatekiNiw_Update /* 01688 80B12F78 1200000F */ beq $s0, $zero, .L80B12FB8 /* 0168C 80B12F7C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01690 80B12F80 263002FC */ addiu $s0, $s1, 0x02FC ## $s0 = 000002FC -/* 01694 80B12F84 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01694 80B12F84 0C0189B7 */ jal Collider_CylinderUpdate /* 01698 80B12F88 02002825 */ or $a1, $s0, $zero ## $a1 = 000002FC /* 0169C 80B12F8C 8FA400AC */ lw $a0, 0x00AC($sp) @@ -231,12 +231,12 @@ glabel EnSyatekiNiw_Update /* 016A4 80B12F94 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 016A8 80B12F98 00812821 */ addu $a1, $a0, $at /* 016AC 80B12F9C AFA50054 */ sw $a1, 0x0054($sp) -/* 016B0 80B12FA0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 016B0 80B12FA0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 016B4 80B12FA4 02003025 */ or $a2, $s0, $zero ## $a2 = 000002FC /* 016B8 80B12FA8 8FA50054 */ lw $a1, 0x0054($sp) /* 016BC 80B12FAC 8FA400AC */ lw $a0, 0x00AC($sp) -/* 016C0 80B12FB0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 016C0 80B12FB0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 016C4 80B12FB4 02003025 */ or $a2, $s0, $zero ## $a2 = 000002FC .L80B12FB8: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s index e500ba8e5a..5201401700 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s @@ -5,7 +5,7 @@ glabel EnTa_Destroy /* 007E8 80B14288 AFA5001C */ sw $a1, 0x001C($sp) /* 007EC 80B1428C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 007F0 80B14290 24C50264 */ addiu $a1, $a2, 0x0264 ## $a1 = 00000264 -/* 007F4 80B14294 0C0170EB */ jal ActorCollider_FreeCylinder +/* 007F4 80B14294 0C0170EB */ jal Collider_DestroyCylinder /* 007F8 80B14298 AFA60018 */ sw $a2, 0x0018($sp) /* 007FC 80B1429C 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s index 6818c0452a..194b28aa6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s @@ -49,14 +49,14 @@ glabel EnTa_Init /* 00148 80B13BE8 8FA40054 */ lw $a0, 0x0054($sp) /* 0014C 80B13BEC 26050264 */ addiu $a1, $s0, 0x0264 ## $a1 = 00000264 /* 00150 80B13BF0 AFA5003C */ sw $a1, 0x003C($sp) -/* 00154 80B13BF4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00154 80B13BF4 0C0170D9 */ jal Collider_InitCylinder /* 00158 80B13BF8 8FA40054 */ lw $a0, 0x0054($sp) /* 0015C 80B13BFC 3C0780B1 */ lui $a3, %hi(D_80B16E50) ## $a3 = 80B10000 /* 00160 80B13C00 8FA5003C */ lw $a1, 0x003C($sp) /* 00164 80B13C04 24E76E50 */ addiu $a3, $a3, %lo(D_80B16E50) ## $a3 = 80B16E50 /* 00168 80B13C08 8FA40054 */ lw $a0, 0x0054($sp) -/* 0016C 80B13C0C 0C01712B */ jal ActorCollider_InitCylinder +/* 0016C 80B13C0C 0C01712B */ jal Collider_SetCylinder /* 00170 80B13C10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00174 80B13C14 3C0980B1 */ lui $t1, %hi(func_80B166CC) ## $t1 = 80B10000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Update.s index 2c54dbbbe4..9229091134 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Update.s @@ -6,14 +6,14 @@ glabel EnTa_Update /* 02F00 80B169A0 AFA50044 */ sw $a1, 0x0044($sp) /* 02F04 80B169A4 26060264 */ addiu $a2, $s0, 0x0264 ## $a2 = 00000264 /* 02F08 80B169A8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000264 -/* 02F0C 80B169AC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 02F0C 80B169AC 0C0189B7 */ jal Collider_CylinderUpdate /* 02F10 80B169B0 AFA60034 */ sw $a2, 0x0034($sp) /* 02F14 80B169B4 8FA40044 */ lw $a0, 0x0044($sp) /* 02F18 80B169B8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02F1C 80B169BC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02F20 80B169C0 8FA60034 */ lw $a2, 0x0034($sp) -/* 02F24 80B169C4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02F24 80B169C4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02F28 80B169C8 00812821 */ addu $a1, $a0, $at /* 02F2C 80B169CC 0C00B638 */ jal Actor_MoveForward diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s index 6164b6580e..91ac0f763c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s @@ -27,15 +27,15 @@ glabel EnTest_Destroy /* 002A8 8085F8F8 0C009C27 */ jal func_8002709C /* 002AC 8085F8FC 8E05080C */ lw $a1, 0x080C($s0) ## 0000080C /* 002B0 8085F900 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002B4 8085F904 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002B4 8085F904 0C0170EB */ jal Collider_DestroyCylinder /* 002B8 8085F908 260508DC */ addiu $a1, $s0, 0x08DC ## $a1 = 000008DC /* 002BC 8085F90C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002C0 8085F910 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002C0 8085F910 0C0170EB */ jal Collider_DestroyCylinder /* 002C4 8085F914 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 /* 002C8 8085F918 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002CC 8085F91C 0C017418 */ jal func_8005D060 +/* 002CC 8085F91C 0C017418 */ jal Collider_DestroyQuad /* 002D0 8085F920 2605085C */ addiu $a1, $s0, 0x085C ## $a1 = 0000085C /* 002D4 8085F924 8FBF0024 */ lw $ra, 0x0024($sp) /* 002D8 8085F928 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s index 24cddb8d29..e6f6e1a36f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s @@ -64,37 +64,37 @@ glabel EnTest_Init /* 000F0 8085F740 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 /* 000F4 8085F744 AE0D0040 */ sw $t5, 0x0040($s0) ## 00000040 /* 000F8 8085F748 AFA50034 */ sw $a1, 0x0034($sp) -/* 000FC 8085F74C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000FC 8085F74C 0C0170D9 */ jal Collider_InitCylinder /* 00100 8085F750 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00104 8085F754 3C078086 */ lui $a3, %hi(D_80864570) ## $a3 = 80860000 /* 00108 8085F758 8FA50034 */ lw $a1, 0x0034($sp) /* 0010C 8085F75C 24E74570 */ addiu $a3, $a3, %lo(D_80864570) ## $a3 = 80864570 /* 00110 8085F760 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00114 8085F764 0C01712B */ jal ActorCollider_InitCylinder +/* 00114 8085F764 0C01712B */ jal Collider_SetCylinder /* 00118 8085F768 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0011C 8085F76C 260508DC */ addiu $a1, $s0, 0x08DC ## $a1 = 000008DC /* 00120 8085F770 AFA50034 */ sw $a1, 0x0034($sp) -/* 00124 8085F774 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00124 8085F774 0C0170D9 */ jal Collider_InitCylinder /* 00128 8085F778 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0012C 8085F77C 3C078086 */ lui $a3, %hi(D_8086459C) ## $a3 = 80860000 /* 00130 8085F780 8FA50034 */ lw $a1, 0x0034($sp) /* 00134 8085F784 24E7459C */ addiu $a3, $a3, %lo(D_8086459C) ## $a3 = 8086459C /* 00138 8085F788 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0013C 8085F78C 0C01712B */ jal ActorCollider_InitCylinder +/* 0013C 8085F78C 0C01712B */ jal Collider_SetCylinder /* 00140 8085F790 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00144 8085F794 2605085C */ addiu $a1, $s0, 0x085C ## $a1 = 0000085C /* 00148 8085F798 AFA50034 */ sw $a1, 0x0034($sp) -/* 0014C 8085F79C 0C017406 */ jal func_8005D018 +/* 0014C 8085F79C 0C017406 */ jal Collider_InitQuad /* 00150 8085F7A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00154 8085F7A4 3C078086 */ lui $a3, %hi(D_808645C8) ## $a3 = 80860000 /* 00158 8085F7A8 8FA50034 */ lw $a1, 0x0034($sp) /* 0015C 8085F7AC 24E745C8 */ addiu $a3, $a3, %lo(D_808645C8) ## $a3 = 808645C8 /* 00160 8085F7B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00164 8085F7B4 0C017441 */ jal func_8005D104 +/* 00164 8085F7B4 0C017441 */ jal Collider_SetQuad /* 00168 8085F7B8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0016C 8085F7BC 240F00FE */ addiu $t7, $zero, 0x00FE ## $t7 = 000000FE /* 00170 8085F7C0 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s index 7288b8946f..148bfa177b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s @@ -207,7 +207,7 @@ glabel L808638F4 /* 04300 80863950 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 .L80863954: /* 04304 80863954 AFA50034 */ sw $a1, 0x0034($sp) -/* 04308 80863958 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 04308 80863958 0C0189B7 */ jal Collider_CylinderUpdate /* 0430C 8086395C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04310 80863960 8E080028 */ lw $t0, 0x0028($s0) ## 00000028 @@ -231,7 +231,7 @@ glabel L808638F4 /* 04354 808639A4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 04358 808639A8 00812821 */ addu $a1, $a0, $at /* 0435C 808639AC AFA50038 */ sw $a1, 0x0038($sp) -/* 04360 808639B0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 04360 808639B0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 04364 808639B4 8FA60034 */ lw $a2, 0x0034($sp) /* 04368 808639B8 920C07C8 */ lbu $t4, 0x07C8($s0) ## 000007C8 @@ -248,7 +248,7 @@ glabel L808638F4 /* 04394 808639E4 55E00004 */ bnel $t7, $zero, .L808639F8 /* 04398 808639E8 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE .L808639EC: -/* 0439C 808639EC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0439C 808639EC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 043A0 808639F0 8FA60034 */ lw $a2, 0x0034($sp) /* 043A4 808639F4 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE @@ -257,7 +257,7 @@ glabel L808638F4 /* 043AC 808639FC 8FA50038 */ lw $a1, 0x0038($sp) /* 043B0 80863A00 53000004 */ beql $t8, $zero, .L80863A14 /* 043B4 80863A04 82190808 */ lb $t9, 0x0808($s0) ## 00000808 -/* 043B8 80863A08 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 043B8 80863A08 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 043BC 80863A0C 260608DC */ addiu $a2, $s0, 0x08DC ## $a2 = 000008DC .L80863A10: @@ -274,7 +274,7 @@ glabel L808638F4 /* 043E4 80863A34 8FA40054 */ lw $a0, 0x0054($sp) /* 043E8 80863A38 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 043EC 80863A3C 2606085C */ addiu $a2, $s0, 0x085C ## $a2 = 0000085C -/* 043F0 80863A40 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 043F0 80863A40 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 043F4 80863A44 00812821 */ addu $a1, $a0, $at /* 043F8 80863A48 10000004 */ beq $zero, $zero, .L80863A5C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s index 3a23b9ef10..7a037bdea5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s @@ -7,7 +7,7 @@ glabel EnTg_Destroy /* 0023C 80B1859C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00240 80B185A0 8FA50018 */ lw $a1, 0x0018($sp) /* 00244 80B185A4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00248 80B185A8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00248 80B185A8 0C0170EB */ jal Collider_DestroyCylinder /* 0024C 80B185AC 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 /* 00250 80B185B0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s index bfd80f16a3..ea2560c6ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s @@ -23,14 +23,14 @@ glabel EnTg_Init /* 001A0 80B18500 AFA00018 */ sw $zero, 0x0018($sp) /* 001A4 80B18504 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 001A8 80B18508 AFA50030 */ sw $a1, 0x0030($sp) -/* 001AC 80B1850C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 001AC 80B1850C 0C0170D9 */ jal Collider_InitCylinder /* 001B0 80B18510 8FA4003C */ lw $a0, 0x003C($sp) /* 001B4 80B18514 3C0780B2 */ lui $a3, %hi(D_80B18910) ## $a3 = 80B20000 /* 001B8 80B18518 8FA50030 */ lw $a1, 0x0030($sp) /* 001BC 80B1851C 24E78910 */ addiu $a3, $a3, %lo(D_80B18910) ## $a3 = 80B18910 /* 001C0 80B18520 8FA4003C */ lw $a0, 0x003C($sp) -/* 001C4 80B18524 0C01712B */ jal ActorCollider_InitCylinder +/* 001C4 80B18524 0C01712B */ jal Collider_SetCylinder /* 001C8 80B18528 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001CC 80B1852C 3C0680B2 */ lui $a2, %hi(D_80B1893C) ## $a2 = 80B20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Update.s index a5102f1140..00a4a082d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Update.s @@ -30,7 +30,7 @@ glabel EnTg_Update /* 002F4 80B18654 95AF0004 */ lhu $t7, 0x0004($t5) ## FFFFFFF0 /* 002F8 80B18658 A48F01DE */ sh $t7, 0x01DE($a0) ## 000001DE /* 002FC 80B1865C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00300 80B18660 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00300 80B18660 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00304 80B18664 00A12821 */ addu $a1, $a1, $at /* 00308 80B18668 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Destroy.s index 49bf5b70c2..24ee9d78fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Destroy.s @@ -44,7 +44,7 @@ glabel EnTite_Destroy /* 001BC 80B18C3C 8FA50020 */ lw $a1, 0x0020($sp) .L80B18C40: /* 001C0 80B18C40 8FA40024 */ lw $a0, 0x0024($sp) -/* 001C4 80B18C44 0C016F32 */ jal func_8005BCC8 +/* 001C4 80B18C44 0C016F32 */ jal Collider_DestroyJntSph /* 001C8 80B18C48 24A502E8 */ addiu $a1, $a1, 0x02E8 ## $a1 = 000002E8 /* 001CC 80B18C4C 8FBF0014 */ lw $ra, 0x0014($sp) /* 001D0 80B18C50 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Init.s index 8dc3823477..c7252c9367 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Init.s @@ -59,7 +59,7 @@ glabel EnTite_Init /* 000DC 80B18B5C 260502E8 */ addiu $a1, $s0, 0x02E8 ## $a1 = 000002E8 /* 000E0 80B18B60 AE0A0040 */ sw $t2, 0x0040($s0) ## 00000040 /* 000E4 80B18B64 AFA50030 */ sw $a1, 0x0030($sp) -/* 000E8 80B18B68 0C016EFE */ jal func_8005BBF8 +/* 000E8 80B18B68 0C016EFE */ jal Collider_InitJntSph /* 000EC 80B18B6C 8FA4003C */ lw $a0, 0x003C($sp) /* 000F0 80B18B70 3C0780B2 */ lui $a3, %hi(D_80B1B5F4) ## $a3 = 80B20000 /* 000F4 80B18B74 260D0308 */ addiu $t5, $s0, 0x0308 ## $t5 = 00000308 @@ -67,7 +67,7 @@ glabel EnTite_Init /* 000FC 80B18B7C AFAD0010 */ sw $t5, 0x0010($sp) /* 00100 80B18B80 24E7B5F4 */ addiu $a3, $a3, %lo(D_80B1B5F4) ## $a3 = 80B1B5F4 /* 00104 80B18B84 8FA4003C */ lw $a0, 0x003C($sp) -/* 00108 80B18B88 0C017014 */ jal func_8005C050 +/* 00108 80B18B88 0C017014 */ jal Collider_SetJntSph /* 0010C 80B18B8C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00110 80B18B90 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 00114 80B18B94 240E001D */ addiu $t6, $zero, 0x001D ## $t6 = 0000001D diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s index 4ef0a8f5d0..b9fcb63289 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s @@ -256,12 +256,12 @@ glabel EnTite_Update /* 026C0 80B1B140 AE0D0040 */ sw $t5, 0x0040($s0) ## 00000040 /* 026C4 80B1B144 AFA6002C */ sw $a2, 0x002C($sp) /* 026C8 80B1B148 AFA50030 */ sw $a1, 0x0030($sp) -/* 026CC 80B1B14C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 026CC 80B1B14C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 026D0 80B1B150 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 026D4 80B1B154 8FA50030 */ lw $a1, 0x0030($sp) /* 026D8 80B1B158 8FA6002C */ lw $a2, 0x002C($sp) -/* 026DC 80B1B15C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 026DC 80B1B15C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 026E0 80B1B160 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 026E4 80B1B164 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s index e344bc8ec0..59d6a6071c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s @@ -297,7 +297,7 @@ glabel func_80B18E7C /* 00818 80B19298 13000006 */ beq $t8, $zero, .L80B192B4 /* 0081C 80B1929C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00820 80B192A0 00812821 */ addu $a1, $a0, $at -/* 00824 80B192A4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00824 80B192A4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00828 80B192A8 260602E8 */ addiu $a2, $s0, 0x02E8 ## $a2 = 000002E8 /* 0082C 80B192AC 1000001B */ beq $zero, $zero, .L80B1931C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Destroy.s index 8528e2d297..854b3ef207 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Destroy.s @@ -11,17 +11,17 @@ glabel EnTorch2_Destroy /* 001CC 80B1DB4C 0C03D6D6 */ jal func_800F5B58 /* 001D0 80B1DB50 00000000 */ nop /* 001D4 80B1DB54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001D8 80B1DB58 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001D8 80B1DB58 0C0170EB */ jal Collider_DestroyCylinder /* 001DC 80B1DB5C 26050498 */ addiu $a1, $s0, 0x0498 ## $a1 = 00000498 /* 001E0 80B1DB60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001E4 80B1DB64 0C017418 */ jal func_8005D060 +/* 001E4 80B1DB64 0C017418 */ jal Collider_DestroyQuad /* 001E8 80B1DB68 260504E4 */ addiu $a1, $s0, 0x04E4 ## $a1 = 000004E4 /* 001EC 80B1DB6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001F0 80B1DB70 0C017418 */ jal func_8005D060 +/* 001F0 80B1DB70 0C017418 */ jal Collider_DestroyQuad /* 001F4 80B1DB74 26050564 */ addiu $a1, $s0, 0x0564 ## $a1 = 00000564 /* 001F8 80B1DB78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001FC 80B1DB7C 0C017418 */ jal func_8005D060 +/* 001FC 80B1DB7C 0C017418 */ jal Collider_DestroyQuad /* 00200 80B1DB80 260505E4 */ addiu $a1, $s0, 0x05E4 ## $a1 = 000005E4 /* 00204 80B1DB84 8FBF001C */ lw $ra, 0x001C($sp) /* 00208 80B1DB88 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s index a3e86cda0b..3cabc2091b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Update.s @@ -228,12 +228,12 @@ glabel EnTorch2_Update /* 00750 80B1E0D0 00812821 */ addu $a1, $a0, $at /* 00754 80B1E0D4 AFA50038 */ sw $a1, 0x0038($sp) /* 00758 80B1E0D8 260604E4 */ addiu $a2, $s0, 0x04E4 ## $a2 = 000004E4 -/* 0075C 80B1E0DC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0075C 80B1E0DC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00760 80B1E0E0 A7A8005A */ sh $t0, 0x005A($sp) /* 00764 80B1E0E4 8FA40084 */ lw $a0, 0x0084($sp) /* 00768 80B1E0E8 8FA50038 */ lw $a1, 0x0038($sp) -/* 0076C 80B1E0EC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0076C 80B1E0EC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00770 80B1E0F0 26060564 */ addiu $a2, $s0, 0x0564 ## $a2 = 00000564 /* 00774 80B1E0F4 3C0780B2 */ lui $a3, %hi(D_80B1F9F0) ## $a3 = 80B20000 @@ -1684,10 +1684,10 @@ glabel EnTorch2_Update /* 01C48 80B1F5C8 0C028EF0 */ jal func_800A3BC0 /* 01C4C 80B1F5CC 8FA40084 */ lw $a0, 0x0084($sp) /* 01C50 80B1F5D0 8FA40084 */ lw $a0, 0x0084($sp) -/* 01C54 80B1F5D4 0C017458 */ jal func_8005D160 +/* 01C54 80B1F5D4 0C017458 */ jal Collider_QuadSetAT /* 01C58 80B1F5D8 8FA50030 */ lw $a1, 0x0030($sp) /* 01C5C 80B1F5DC 8FA40084 */ lw $a0, 0x0084($sp) -/* 01C60 80B1F5E0 0C017458 */ jal func_8005D160 +/* 01C60 80B1F5E0 0C017458 */ jal Collider_QuadSetAT /* 01C64 80B1F5E4 8FA50038 */ lw $a1, 0x0038($sp) /* 01C68 80B1F5E8 3C0780B2 */ lui $a3, %hi(D_80B20163) ## $a3 = 80B20000 /* 01C6C 80B1F5EC 3C0680B2 */ lui $a2, %hi(D_80B20160) ## $a2 = 80B20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Destroy.s index b2e2336e3f..6283e369c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Destroy.s @@ -3,7 +3,7 @@ glabel EnToryo_Destroy /* 00244 80B203B4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00248 80B203B8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0024C 80B203BC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00250 80B203C0 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00250 80B203C0 0C0170EB */ jal Collider_DestroyCylinder /* 00254 80B203C4 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 00258 80B203C8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s index 711a52181f..9fe9b3a0d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s @@ -99,14 +99,14 @@ glabel EnToryo_Init /* 0015C 80B202CC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00160 80B202D0 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00164 80B202D4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00168 80B202D8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00168 80B202D8 0C0170D9 */ jal Collider_InitCylinder /* 0016C 80B202DC 8FA40054 */ lw $a0, 0x0054($sp) /* 00170 80B202E0 3C0780B2 */ lui $a3, %hi(D_80B20C00) ## $a3 = 80B20000 /* 00174 80B202E4 8FA50034 */ lw $a1, 0x0034($sp) /* 00178 80B202E8 24E70C00 */ addiu $a3, $a3, %lo(D_80B20C00) ## $a3 = 80B20C00 /* 0017C 80B202EC 8FA40054 */ lw $a0, 0x0054($sp) -/* 00180 80B202F0 0C01712B */ jal ActorCollider_InitCylinder +/* 00180 80B202F0 0C01712B */ jal Collider_SetCylinder /* 00184 80B202F4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00188 80B202F8 3C0580B2 */ lui $a1, %hi(D_80B20C38) ## $a1 = 80B20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Update.s index 22bea2ac81..93f756e744 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Update.s @@ -15,14 +15,14 @@ glabel EnToryo_Update /* 00820 80B20990 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 00824 80B20994 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 00828 80B20998 AFA60024 */ sw $a2, 0x0024($sp) -/* 0082C 80B2099C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0082C 80B2099C 0C0189B7 */ jal Collider_CylinderUpdate /* 00830 80B209A0 AFAF002C */ sw $t7, 0x002C($sp) /* 00834 80B209A4 8FA4003C */ lw $a0, 0x003C($sp) /* 00838 80B209A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0083C 80B209AC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00840 80B209B0 8FA60024 */ lw $a2, 0x0024($sp) -/* 00844 80B209B4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00844 80B209B4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00848 80B209B8 00812821 */ addu $a1, $a0, $at /* 0084C 80B209BC 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Destroy.s index 669dcc0a5c..fb1e22bad4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Destroy.s @@ -3,7 +3,7 @@ glabel EnTp_Destroy /* 00280 80B21060 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00284 80B21064 AFBF0014 */ sw $ra, 0x0014($sp) /* 00288 80B21068 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0028C 80B2106C 0C016F32 */ jal func_8005BCC8 +/* 0028C 80B2106C 0C016F32 */ jal Collider_DestroyJntSph /* 00290 80B21070 24C50174 */ addiu $a1, $a2, 0x0174 ## $a1 = 00000174 /* 00294 80B21074 8FBF0014 */ lw $ra, 0x0014($sp) /* 00298 80B21078 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Init.s index 16f4587006..d3238867a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Init.s @@ -45,7 +45,7 @@ glabel EnTp_Init /* 00098 80B20E78 0260A825 */ or $s5, $s3, $zero ## $s5 = 00000000 /* 0009C 80B20E7C A679015E */ sh $t9, 0x015E($s3) ## 0000015E /* 000A0 80B20E80 02002825 */ or $a1, $s0, $zero ## $a1 = 00000174 -/* 000A4 80B20E84 0C016EFE */ jal func_8005BBF8 +/* 000A4 80B20E84 0C016EFE */ jal Collider_InitJntSph /* 000A8 80B20E88 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 000AC 80B20E8C 3C0780B2 */ lui $a3, %hi(D_80B22AB4) ## $a3 = 80B20000 /* 000B0 80B20E90 26680194 */ addiu $t0, $s3, 0x0194 ## $t0 = 00000194 @@ -53,7 +53,7 @@ glabel EnTp_Init /* 000B8 80B20E98 24E72AB4 */ addiu $a3, $a3, %lo(D_80B22AB4) ## $a3 = 80B22AB4 /* 000BC 80B20E9C 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 000C0 80B20EA0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000174 -/* 000C4 80B20EA4 0C017014 */ jal func_8005C050 +/* 000C4 80B20EA4 0C017014 */ jal Collider_SetJntSph /* 000C8 80B20EA8 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 000CC 80B20EAC 8663001C */ lh $v1, 0x001C($s3) ## 0000001C /* 000D0 80B20EB0 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s index fc6a1463b0..6a68f9184b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s @@ -126,7 +126,7 @@ glabel EnTp_Update /* 01824 80B22604 14200004 */ bne $at, $zero, .L80B22618 /* 01828 80B22608 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0182C 80B2260C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01830 80B22610 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01830 80B22610 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01834 80B22614 00812821 */ addu $a1, $a0, $at .L80B22618: @@ -155,7 +155,7 @@ glabel EnTp_Update /* 01888 80B22668 8FA40074 */ lw $a0, 0x0074($sp) /* 0188C 80B2266C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01890 80B22670 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01894 80B22674 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 01894 80B22674 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01898 80B22678 00812821 */ addu $a1, $a0, $at .L80B2267C: @@ -232,7 +232,7 @@ glabel EnTp_Update /* 019A4 80B22784 13000004 */ beq $t8, $zero, .L80B22798 /* 019A8 80B22788 8FA40074 */ lw $a0, 0x0074($sp) /* 019AC 80B2278C 00812821 */ addu $a1, $a0, $at -/* 019B0 80B22790 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 019B0 80B22790 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 019B4 80B22794 26060174 */ addiu $a2, $s0, 0x0174 ## $a2 = 00000174 .L80B22798: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Destroy.s index 49f5db3167..a31c00089a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Destroy.s @@ -3,7 +3,7 @@ glabel EnTrap_Destroy /* 003BC 80B24A1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 003C0 80B24A20 AFBF0014 */ sw $ra, 0x0014($sp) /* 003C4 80B24A24 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003C8 80B24A28 0C0170EB */ jal ActorCollider_FreeCylinder +/* 003C8 80B24A28 0C0170EB */ jal Collider_DestroyCylinder /* 003CC 80B24A2C 24C501A0 */ addiu $a1, $a2, 0x01A0 ## $a1 = 000001A0 /* 003D0 80B24A30 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s index 152a5a6a0c..6b65b496da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Init.s @@ -234,14 +234,14 @@ glabel EnTrap_Init /* 0034C 80B249AC 8F080008 */ lw $t0, 0x0008($t8) ## 00000008 /* 00350 80B249B0 AE080040 */ sw $t0, 0x0040($s0) ## 00000040 /* 00354 80B249B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00358 80B249B8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00358 80B249B8 0C0170D9 */ jal Collider_InitCylinder /* 0035C 80B249BC 8FA40054 */ lw $a0, 0x0054($sp) /* 00360 80B249C0 3C0780B2 */ lui $a3, %hi(D_80B25830) ## $a3 = 80B20000 /* 00364 80B249C4 8FA50034 */ lw $a1, 0x0034($sp) /* 00368 80B249C8 24E75830 */ addiu $a3, $a3, %lo(D_80B25830) ## $a3 = 80B25830 /* 0036C 80B249CC 8FA40054 */ lw $a0, 0x0054($sp) -/* 00370 80B249D0 0C01712B */ jal ActorCollider_InitCylinder +/* 00370 80B249D0 0C01712B */ jal Collider_SetCylinder /* 00374 80B249D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00378 80B249D8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s index 38cc0c0d6e..e38c5603d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s @@ -956,7 +956,7 @@ glabel EnTrap_Update /* 01114 80B25774 260501A0 */ addiu $a1, $s0, 0x01A0 ## $a1 = 000001A0 .L80B25778: /* 01118 80B25778 AFA50048 */ sw $a1, 0x0048($sp) -/* 0111C 80B2577C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0111C 80B2577C 0C0189B7 */ jal Collider_CylinderUpdate /* 01120 80B25780 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01124 80B25784 8FA400AC */ lw $a0, 0x00AC($sp) @@ -964,7 +964,7 @@ glabel EnTrap_Update /* 0112C 80B2578C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01130 80B25790 00812821 */ addu $a1, $a0, $at /* 01134 80B25794 AFA5004C */ sw $a1, 0x004C($sp) -/* 01138 80B25798 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01138 80B25798 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0113C 80B2579C 8FA60048 */ lw $a2, 0x0048($sp) /* 01140 80B257A0 920D0114 */ lbu $t5, 0x0114($s0) ## 00000114 @@ -972,7 +972,7 @@ glabel EnTrap_Update /* 01148 80B257A8 8FA400AC */ lw $a0, 0x00AC($sp) /* 0114C 80B257AC 55A00004 */ bnel $t5, $zero, .L80B257C0 /* 01150 80B257B0 8FBF003C */ lw $ra, 0x003C($sp) -/* 01154 80B257B4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01154 80B257B4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01158 80B257B8 8FA60048 */ lw $a2, 0x0048($sp) /* 0115C 80B257BC 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Destroy.s index a9d9377749..3031ce7b0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Destroy.s @@ -5,15 +5,15 @@ glabel EnVali_Destroy /* 00184 80B26834 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00188 80B26838 8FA50018 */ lw $a1, 0x0018($sp) /* 0018C 80B2683C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00190 80B26840 0C017418 */ jal func_8005D060 +/* 00190 80B26840 0C017418 */ jal Collider_DestroyQuad /* 00194 80B26844 24A502FC */ addiu $a1, $a1, 0x02FC ## $a1 = 000002FC /* 00198 80B26848 8FA50018 */ lw $a1, 0x0018($sp) /* 0019C 80B2684C 8FA4001C */ lw $a0, 0x001C($sp) -/* 001A0 80B26850 0C017418 */ jal func_8005D060 +/* 001A0 80B26850 0C017418 */ jal Collider_DestroyQuad /* 001A4 80B26854 24A5037C */ addiu $a1, $a1, 0x037C ## $a1 = 0000037C /* 001A8 80B26858 8FA50018 */ lw $a1, 0x0018($sp) /* 001AC 80B2685C 8FA4001C */ lw $a0, 0x001C($sp) -/* 001B0 80B26860 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001B0 80B26860 0C0170EB */ jal Collider_DestroyCylinder /* 001B4 80B26864 24A503FC */ addiu $a1, $a1, 0x03FC ## $a1 = 000003FC /* 001B8 80B26868 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Init.s index 4ba64937b3..a8dbce8b80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Init.s @@ -34,34 +34,34 @@ glabel EnVali_Init /* 00074 80B26724 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00078 80B26728 260502FC */ addiu $a1, $s0, 0x02FC ## $a1 = 000002FC /* 0007C 80B2672C AFA50030 */ sw $a1, 0x0030($sp) -/* 00080 80B26730 0C017406 */ jal func_8005D018 +/* 00080 80B26730 0C017406 */ jal Collider_InitQuad /* 00084 80B26734 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00088 80B26738 3C0780B3 */ lui $a3, %hi(D_80B288A0) ## $a3 = 80B30000 /* 0008C 80B2673C 8FA50030 */ lw $a1, 0x0030($sp) /* 00090 80B26740 24E788A0 */ addiu $a3, $a3, %lo(D_80B288A0) ## $a3 = 80B288A0 /* 00094 80B26744 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00098 80B26748 0C017441 */ jal func_8005D104 +/* 00098 80B26748 0C017441 */ jal Collider_SetQuad /* 0009C 80B2674C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000A0 80B26750 2605037C */ addiu $a1, $s0, 0x037C ## $a1 = 0000037C /* 000A4 80B26754 AFA50030 */ sw $a1, 0x0030($sp) -/* 000A8 80B26758 0C017406 */ jal func_8005D018 +/* 000A8 80B26758 0C017406 */ jal Collider_InitQuad /* 000AC 80B2675C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000B0 80B26760 3C0780B3 */ lui $a3, %hi(D_80B288A0) ## $a3 = 80B30000 /* 000B4 80B26764 8FA50030 */ lw $a1, 0x0030($sp) /* 000B8 80B26768 24E788A0 */ addiu $a3, $a3, %lo(D_80B288A0) ## $a3 = 80B288A0 /* 000BC 80B2676C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000C0 80B26770 0C017441 */ jal func_8005D104 +/* 000C0 80B26770 0C017441 */ jal Collider_SetQuad /* 000C4 80B26774 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000C8 80B26778 260503FC */ addiu $a1, $s0, 0x03FC ## $a1 = 000003FC /* 000CC 80B2677C AFA50030 */ sw $a1, 0x0030($sp) -/* 000D0 80B26780 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000D0 80B26780 0C0170D9 */ jal Collider_InitCylinder /* 000D4 80B26784 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000D8 80B26788 3C0780B3 */ lui $a3, %hi(D_80B288F0) ## $a3 = 80B30000 /* 000DC 80B2678C 8FA50030 */ lw $a1, 0x0030($sp) /* 000E0 80B26790 24E788F0 */ addiu $a3, $a3, %lo(D_80B288F0) ## $a3 = 80B288F0 /* 000E4 80B26794 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000E8 80B26798 0C01712B */ jal ActorCollider_InitCylinder +/* 000E8 80B26798 0C01712B */ jal Collider_SetCylinder /* 000EC 80B2679C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000F0 80B267A0 3C0580B3 */ lui $a1, %hi(D_80B28924) ## $a1 = 80B30000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Update.s index 18002698fc..351384dec0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Update.s @@ -46,7 +46,7 @@ glabel EnVali_Update /* 014B4 80B27B64 11E20028 */ beq $t7, $v0, .L80B27C08 /* 014B8 80B27B68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 014BC 80B27B6C 260503FC */ addiu $a1, $s0, 0x03FC ## $a1 = 000003FC -/* 014C0 80B27B70 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 014C0 80B27B70 0C0189B7 */ jal Collider_CylinderUpdate /* 014C4 80B27B74 AFA50020 */ sw $a1, 0x0020($sp) /* 014C8 80B27B78 8E080190 */ lw $t0, 0x0190($s0) ## 00000190 @@ -58,17 +58,17 @@ glabel EnVali_Update /* 014E0 80B27B90 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 014E4 80B27B94 02212821 */ addu $a1, $s1, $at /* 014E8 80B27B98 AFA50024 */ sw $a1, 0x0024($sp) -/* 014EC 80B27B9C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 014EC 80B27B9C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 014F0 80B27BA0 260602FC */ addiu $a2, $s0, 0x02FC ## $a2 = 000002FC /* 014F4 80B27BA4 8FA50024 */ lw $a1, 0x0024($sp) /* 014F8 80B27BA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 014FC 80B27BAC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 014FC 80B27BAC 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01500 80B27BB0 2606037C */ addiu $a2, $s0, 0x037C ## $a2 = 0000037C /* 01504 80B27BB4 8FA50024 */ lw $a1, 0x0024($sp) /* 01508 80B27BB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0150C 80B27BBC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0150C 80B27BBC 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 01510 80B27BC0 8FA60020 */ lw $a2, 0x0020($sp) .L80B27BC4: @@ -80,13 +80,13 @@ glabel EnVali_Update /* 01528 80B27BD8 02212821 */ addu $a1, $s1, $at /* 0152C 80B27BDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01530 80B27BE0 8FA60020 */ lw $a2, 0x0020($sp) -/* 01534 80B27BE4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01534 80B27BE4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01538 80B27BE8 AFA50024 */ sw $a1, 0x0024($sp) /* 0153C 80B27BEC 8FA50024 */ lw $a1, 0x0024($sp) .L80B27BF0: /* 01540 80B27BF0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01544 80B27BF4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01544 80B27BF4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01548 80B27BF8 8FA60020 */ lw $a2, 0x0020($sp) /* 0154C 80B27BFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Destroy.s index b3bb768435..e863defa87 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Destroy.s @@ -7,7 +7,7 @@ glabel EnVbBall_Destroy /* 00194 80B29134 29C100C8 */ slti $at, $t6, 0x00C8 /* 00198 80B29138 50200004 */ beql $at, $zero, .L80B2914C /* 0019C 80B2913C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001A0 80B29140 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001A0 80B29140 0C0170EB */ jal Collider_DestroyCylinder /* 001A4 80B29144 24C50168 */ addiu $a1, $a2, 0x0168 ## $a1 = 00000168 /* 001A8 80B29148 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s index 46433d5a11..534ff63a8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s @@ -61,14 +61,14 @@ glabel EnVbBall_Init /* 00094 80B29034 10000035 */ beq $zero, $zero, .L80B2910C /* 00098 80B29038 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C .L80B2903C: -/* 0009C 80B2903C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0009C 80B2903C 0C0170D9 */ jal Collider_InitCylinder /* 000A0 80B29040 AFA50024 */ sw $a1, 0x0024($sp) /* 000A4 80B29044 3C0780B3 */ lui $a3, %hi(D_80B2A000) ## $a3 = 80B30000 /* 000A8 80B29048 8FA50024 */ lw $a1, 0x0024($sp) /* 000AC 80B2904C 24E7A000 */ addiu $a3, $a3, %lo(D_80B2A000) ## $a3 = 80B2A000 /* 000B0 80B29050 8FA4003C */ lw $a0, 0x003C($sp) -/* 000B4 80B29054 0C01712B */ jal ActorCollider_InitCylinder +/* 000B4 80B29054 0C01712B */ jal Collider_SetCylinder /* 000B8 80B29058 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000BC 80B2905C 860F0034 */ lh $t7, 0x0034($s0) ## 00000034 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s index 676e1239b8..70716ff9f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s @@ -539,14 +539,14 @@ glabel EnVbBall_Update .L80B29D28: /* 00D88 80B29D28 26300168 */ addiu $s0, $s1, 0x0168 ## $s0 = 00000168 /* 00D8C 80B29D2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000168 -/* 00D90 80B29D30 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00D90 80B29D30 0C0189B7 */ jal Collider_CylinderUpdate /* 00D94 80B29D34 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00D98 80B29D38 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00D9C 80B29D3C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00DA0 80B29D40 02812821 */ addu $a1, $s4, $at /* 00DA4 80B29D44 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00DA8 80B29D48 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00DA8 80B29D48 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00DAC 80B29D4C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000168 /* 00DB0 80B29D50 8FBF0064 */ lw $ra, 0x0064($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Destroy.s index b11c0f31fa..3027f9aaff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Destroy.s @@ -3,7 +3,7 @@ glabel EnVm_Destroy /* 0017C 80B2D5DC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00180 80B2D5E0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00184 80B2D5E4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00188 80B2D5E8 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00188 80B2D5E8 0C0170EB */ jal Collider_DestroyCylinder /* 0018C 80B2D5EC 24C50268 */ addiu $a1, $a2, 0x0268 ## $a1 = 00000268 /* 00190 80B2D5F0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Init.s index 2399c0d291..c34d407a49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Init.s @@ -29,35 +29,35 @@ glabel EnVm_Init /* 0006C 80B2D4CC 00000000 */ nop /* 00070 80B2D4D0 26050268 */ addiu $a1, $s0, 0x0268 ## $a1 = 00000268 /* 00074 80B2D4D4 AFA50030 */ sw $a1, 0x0030($sp) -/* 00078 80B2D4D8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00078 80B2D4D8 0C0170D9 */ jal Collider_InitCylinder /* 0007C 80B2D4DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00080 80B2D4E0 3C0780B3 */ lui $a3, %hi(D_80B2EA20) ## $a3 = 80B30000 /* 00084 80B2D4E4 8FA50030 */ lw $a1, 0x0030($sp) /* 00088 80B2D4E8 24E7EA20 */ addiu $a3, $a3, %lo(D_80B2EA20) ## $a3 = 80B2EA20 /* 0008C 80B2D4EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00090 80B2D4F0 0C01712B */ jal ActorCollider_InitCylinder +/* 00090 80B2D4F0 0C01712B */ jal Collider_SetCylinder /* 00094 80B2D4F4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00098 80B2D4F8 260502B4 */ addiu $a1, $s0, 0x02B4 ## $a1 = 000002B4 /* 0009C 80B2D4FC AFA50030 */ sw $a1, 0x0030($sp) -/* 000A0 80B2D500 0C017406 */ jal func_8005D018 +/* 000A0 80B2D500 0C017406 */ jal Collider_InitQuad /* 000A4 80B2D504 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000A8 80B2D508 3C0780B3 */ lui $a3, %hi(D_80B2EA4C) ## $a3 = 80B30000 /* 000AC 80B2D50C 8FA50030 */ lw $a1, 0x0030($sp) /* 000B0 80B2D510 24E7EA4C */ addiu $a3, $a3, %lo(D_80B2EA4C) ## $a3 = 80B2EA4C /* 000B4 80B2D514 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000B8 80B2D518 0C017441 */ jal func_8005D104 +/* 000B8 80B2D518 0C017441 */ jal Collider_SetQuad /* 000BC 80B2D51C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000C0 80B2D520 26050334 */ addiu $a1, $s0, 0x0334 ## $a1 = 00000334 /* 000C4 80B2D524 AFA50030 */ sw $a1, 0x0030($sp) -/* 000C8 80B2D528 0C017406 */ jal func_8005D018 +/* 000C8 80B2D528 0C017406 */ jal Collider_InitQuad /* 000CC 80B2D52C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000D0 80B2D530 3C0780B3 */ lui $a3, %hi(D_80B2EA9C) ## $a3 = 80B30000 /* 000D4 80B2D534 8FA50030 */ lw $a1, 0x0030($sp) /* 000D8 80B2D538 24E7EA9C */ addiu $a3, $a3, %lo(D_80B2EA9C) ## $a3 = 80B2EA9C /* 000DC 80B2D53C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000E0 80B2D540 0C017441 */ jal func_8005D104 +/* 000E0 80B2D540 0C017441 */ jal Collider_SetQuad /* 000E4 80B2D544 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000E8 80B2D548 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 000EC 80B2D54C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Update.s index 6ec5656a73..0be5d076cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Update.s @@ -67,7 +67,7 @@ glabel EnVm_Update /* 00DC4 80B2E224 26050268 */ addiu $a1, $s0, 0x0268 ## $a1 = 00000268 .L80B2E228: /* 00DC8 80B2E228 AFA50030 */ sw $a1, 0x0030($sp) -/* 00DCC 80B2E22C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00DCC 80B2E22C 0C0189B7 */ jal Collider_CylinderUpdate /* 00DD0 80B2E230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DD4 80B2E234 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -75,7 +75,7 @@ glabel EnVm_Update /* 00DDC 80B2E23C 02212821 */ addu $a1, $s1, $at /* 00DE0 80B2E240 AFA50034 */ sw $a1, 0x0034($sp) /* 00DE4 80B2E244 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00DE8 80B2E248 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00DE8 80B2E248 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00DEC 80B2E24C 8FA60030 */ lw $a2, 0x0030($sp) /* 00DF0 80B2E250 920F0114 */ lbu $t7, 0x0114($s0) ## 00000114 @@ -86,13 +86,13 @@ glabel EnVm_Update /* 00E04 80B2E264 8FA50034 */ lw $a1, 0x0034($sp) /* 00E08 80B2E268 53000004 */ beql $t8, $zero, .L80B2E27C /* 00E0C 80B2E26C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E10 80B2E270 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00E10 80B2E270 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00E14 80B2E274 8FA60030 */ lw $a2, 0x0030($sp) /* 00E18 80B2E278 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80B2E27C: /* 00E1C 80B2E27C 8FA50034 */ lw $a1, 0x0034($sp) -/* 00E20 80B2E280 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00E20 80B2E280 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00E24 80B2E284 26060334 */ addiu $a2, $s0, 0x0334 ## $a2 = 00000334 /* 00E28 80B2E288 8E090024 */ lw $t1, 0x0024($s0) ## 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DA7C.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DA7C.s index 72cf9033a3..755c7d34fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DA7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DA7C.s @@ -154,7 +154,7 @@ glabel func_80B2DA7C /* 00820 80B2DC80 14200004 */ bne $at, $zero, .L80B2DC94 /* 00824 80B2DC84 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00828 80B2DC88 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 0082C 80B2DC8C 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 0082C 80B2DC8C 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00830 80B2DC90 00812821 */ addu $a1, $a0, $at .L80B2DC94: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Destroy.s index bf877406b8..1531cc332c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Destroy.s @@ -3,7 +3,7 @@ glabel EnWeiyer_Destroy /* 000D0 80B32360 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 000D4 80B32364 AFBF0014 */ sw $ra, 0x0014($sp) /* 000D8 80B32368 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000DC 80B3236C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 000DC 80B3236C 0C0170EB */ jal Collider_DestroyCylinder /* 000E0 80B32370 24C50284 */ addiu $a1, $a2, 0x0284 ## $a1 = 00000284 /* 000E4 80B32374 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Init.s index dc08d37c5f..bfb9c67e24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Init.s @@ -31,14 +31,14 @@ glabel EnWeiyer_Init /* 00068 80B322F8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0006C 80B322FC 26050284 */ addiu $a1, $s0, 0x0284 ## $a1 = 00000284 /* 00070 80B32300 AFA50030 */ sw $a1, 0x0030($sp) -/* 00074 80B32304 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00074 80B32304 0C0170D9 */ jal Collider_InitCylinder /* 00078 80B32308 8FA4003C */ lw $a0, 0x003C($sp) /* 0007C 80B3230C 3C0780B3 */ lui $a3, %hi(D_80B33A90) ## $a3 = 80B30000 /* 00080 80B32310 8FA50030 */ lw $a1, 0x0030($sp) /* 00084 80B32314 24E73A90 */ addiu $a3, $a3, %lo(D_80B33A90) ## $a3 = 80B33A90 /* 00088 80B32318 8FA4003C */ lw $a0, 0x003C($sp) -/* 0008C 80B3231C 0C01712B */ jal ActorCollider_InitCylinder +/* 0008C 80B3231C 0C01712B */ jal Collider_SetCylinder /* 00090 80B32320 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00094 80B32324 3C0580B3 */ lui $a1, %hi(D_80B33AC4) ## $a1 = 80B30000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Update.s index 50b9c9b4c6..6168e54ea7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Update.s @@ -67,7 +67,7 @@ glabel EnWeiyer_Update .L80B33854: /* 015C4 80B33854 26050284 */ addiu $a1, $s0, 0x0284 ## $a1 = 00000284 /* 015C8 80B33858 AFA50028 */ sw $a1, 0x0028($sp) -/* 015CC 80B3385C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 015CC 80B3385C 0C0189B7 */ jal Collider_CylinderUpdate /* 015D0 80B33860 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 015D4 80B33864 92190294 */ lbu $t9, 0x0294($s0) ## 00000294 @@ -77,7 +77,7 @@ glabel EnWeiyer_Update /* 015E4 80B33874 11C00004 */ beq $t6, $zero, .L80B33888 /* 015E8 80B33878 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 015EC 80B3387C 02212821 */ addu $a1, $s1, $at -/* 015F0 80B33880 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 015F0 80B33880 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 015F4 80B33884 8FA60028 */ lw $a2, 0x0028($sp) .L80B33888: @@ -89,13 +89,13 @@ glabel EnWeiyer_Update /* 0160C 80B3389C 02212821 */ addu $a1, $s1, $at /* 01610 80B338A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01614 80B338A4 8FA60028 */ lw $a2, 0x0028($sp) -/* 01618 80B338A8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01618 80B338A8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 0161C 80B338AC AFA5002C */ sw $a1, 0x002C($sp) /* 01620 80B338B0 8FA5002C */ lw $a1, 0x002C($sp) .L80B338B4: /* 01624 80B338B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01628 80B338B8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01628 80B338B8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0162C 80B338BC 8FA60028 */ lw $a2, 0x0028($sp) /* 01630 80B338C0 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Destroy.s index 817a9f169d..d135171316 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Destroy.s @@ -19,14 +19,14 @@ glabel EnWf_Destroy /* 00244 80B33EF4 AFBF001C */ sw $ra, 0x001C($sp) /* 00248 80B33EF8 AFA5002C */ sw $a1, 0x002C($sp) /* 0024C 80B33EFC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00250 80B33F00 0C016F32 */ jal func_8005BCC8 +/* 00250 80B33F00 0C016F32 */ jal Collider_DestroyJntSph /* 00254 80B33F04 26050304 */ addiu $a1, $s0, 0x0304 ## $a1 = 00000304 /* 00258 80B33F08 8FA4002C */ lw $a0, 0x002C($sp) -/* 0025C 80B33F0C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0025C 80B33F0C 0C0170EB */ jal Collider_DestroyCylinder /* 00260 80B33F10 26050424 */ addiu $a1, $s0, 0x0424 ## $a1 = 00000424 /* 00264 80B33F14 8FA4002C */ lw $a0, 0x002C($sp) -/* 00268 80B33F18 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00268 80B33F18 0C0170EB */ jal Collider_DestroyCylinder /* 0026C 80B33F1C 26050470 */ addiu $a1, $s0, 0x0470 ## $a1 = 00000470 /* 00270 80B33F20 860E001C */ lh $t6, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s index 0c6af2c0ee..3c2a572d89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s @@ -47,7 +47,7 @@ glabel EnWf_Init /* 000B4 80B33D64 AE180040 */ sw $t8, 0x0040($s0) ## 00000040 /* 000B8 80B33D68 E60402F4 */ swc1 $f4, 0x02F4($s0) ## 000002F4 /* 000BC 80B33D6C AFA50034 */ sw $a1, 0x0034($sp) -/* 000C0 80B33D70 0C016EFE */ jal func_8005BBF8 +/* 000C0 80B33D70 0C016EFE */ jal Collider_InitJntSph /* 000C4 80B33D74 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000C8 80B33D78 3C0780B3 */ lui $a3, %hi(D_80B37A20) ## $a3 = 80B30000 /* 000CC 80B33D7C 26180324 */ addiu $t8, $s0, 0x0324 ## $t8 = 00000324 @@ -55,30 +55,30 @@ glabel EnWf_Init /* 000D4 80B33D84 AFB80010 */ sw $t8, 0x0010($sp) /* 000D8 80B33D88 24E77A20 */ addiu $a3, $a3, %lo(D_80B37A20) ## $a3 = 80B37A20 /* 000DC 80B33D8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000E0 80B33D90 0C017014 */ jal func_8005C050 +/* 000E0 80B33D90 0C017014 */ jal Collider_SetJntSph /* 000E4 80B33D94 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000E8 80B33D98 26050424 */ addiu $a1, $s0, 0x0424 ## $a1 = 00000424 /* 000EC 80B33D9C AFA50034 */ sw $a1, 0x0034($sp) -/* 000F0 80B33DA0 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000F0 80B33DA0 0C0170D9 */ jal Collider_InitCylinder /* 000F4 80B33DA4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000F8 80B33DA8 3C0780B3 */ lui $a3, %hi(D_80B37A30) ## $a3 = 80B30000 /* 000FC 80B33DAC 8FA50034 */ lw $a1, 0x0034($sp) /* 00100 80B33DB0 24E77A30 */ addiu $a3, $a3, %lo(D_80B37A30) ## $a3 = 80B37A30 /* 00104 80B33DB4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00108 80B33DB8 0C01712B */ jal ActorCollider_InitCylinder +/* 00108 80B33DB8 0C01712B */ jal Collider_SetCylinder /* 0010C 80B33DBC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00110 80B33DC0 26050470 */ addiu $a1, $s0, 0x0470 ## $a1 = 00000470 /* 00114 80B33DC4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00118 80B33DC8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00118 80B33DC8 0C0170D9 */ jal Collider_InitCylinder /* 0011C 80B33DCC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00120 80B33DD0 3C0780B3 */ lui $a3, %hi(D_80B37A5C) ## $a3 = 80B30000 /* 00124 80B33DD4 8FA50034 */ lw $a1, 0x0034($sp) /* 00128 80B33DD8 24E77A5C */ addiu $a3, $a3, %lo(D_80B37A5C) ## $a3 = 80B37A5C /* 0012C 80B33DDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00130 80B33DE0 0C01712B */ jal ActorCollider_InitCylinder +/* 00130 80B33DE0 0C01712B */ jal Collider_SetCylinder /* 00134 80B33DE4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00138 80B33DE8 8619001C */ lh $t9, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Update.s index 42d929c927..d984c899c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Update.s @@ -68,7 +68,7 @@ glabel EnWf_Update /* 03634 80B372E4 26060304 */ addiu $a2, $s0, 0x0304 ## $a2 = 00000304 /* 03638 80B372E8 AFA60030 */ sw $a2, 0x0030($sp) /* 0363C 80B372EC AFA50034 */ sw $a1, 0x0034($sp) -/* 03640 80B372F0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 03640 80B372F0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 03644 80B372F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03648 80B372F8 8E0202D4 */ lw $v0, 0x02D4($s0) ## 000002D4 @@ -85,17 +85,17 @@ glabel EnWf_Update /* 03674 80B37324 5560000D */ bnel $t3, $zero, .L80B3735C /* 03678 80B37328 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 .L80B3732C: -/* 0367C 80B3732C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0367C 80B3732C 0C0189B7 */ jal Collider_CylinderUpdate /* 03680 80B37330 AFA5002C */ sw $a1, 0x002C($sp) /* 03684 80B37334 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03688 80B37338 8FA50034 */ lw $a1, 0x0034($sp) -/* 0368C 80B3733C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0368C 80B3733C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 03690 80B37340 26060470 */ addiu $a2, $s0, 0x0470 ## $a2 = 00000470 /* 03694 80B37344 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03698 80B37348 8FA50034 */ lw $a1, 0x0034($sp) -/* 0369C 80B3734C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0369C 80B3734C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 036A0 80B37350 8FA6002C */ lw $a2, 0x002C($sp) /* 036A4 80B37354 8E0202D4 */ lw $v0, 0x02D4($s0) ## 000002D4 @@ -104,7 +104,7 @@ glabel EnWf_Update /* 036AC 80B3735C 14410004 */ bne $v0, $at, .L80B37370 /* 036B0 80B37360 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 036B4 80B37364 8FA50034 */ lw $a1, 0x0034($sp) -/* 036B8 80B37368 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 036B8 80B37368 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 036BC 80B3736C 8FA60030 */ lw $a2, 0x0030($sp) .L80B37370: @@ -117,7 +117,7 @@ glabel EnWf_Update /* 036D8 80B37388 31AE0004 */ andi $t6, $t5, 0x0004 ## $t6 = 00000000 /* 036DC 80B3738C 15C00005 */ bne $t6, $zero, .L80B373A4 /* 036E0 80B37390 00000000 */ nop -/* 036E4 80B37394 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 036E4 80B37394 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 036E8 80B37398 8FA60030 */ lw $a2, 0x0030($sp) /* 036EC 80B3739C 10000004 */ beq $zero, $zero, .L80B373B0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Destroy.s index 7f7a3de131..257ccea86e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Destroy.s @@ -10,7 +10,7 @@ glabel EnWonderItem_Destroy /* 00020 80B38080 51E00004 */ beql $t7, $zero, .L80B38094 /* 00024 80B38084 8FBF0014 */ lw $ra, 0x0014($sp) .L80B38088: -/* 00028 80B38088 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00028 80B38088 0C0170EB */ jal Collider_DestroyCylinder /* 0002C 80B3808C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00030 80B38090 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Init.s index ae26d149b3..053a5040d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Init.s @@ -152,14 +152,14 @@ glabel L80B383A4 /* 0034C 80B383AC AFA50024 */ sw $a1, 0x0024($sp) /* 00350 80B383B0 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 /* 00354 80B383B4 A7A80032 */ sh $t0, 0x0032($sp) -/* 00358 80B383B8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00358 80B383B8 0C0170D9 */ jal Collider_InitCylinder /* 0035C 80B383BC 8FA4003C */ lw $a0, 0x003C($sp) /* 00360 80B383C0 3C0780B4 */ lui $a3, %hi(D_80B38D40) ## $a3 = 80B40000 /* 00364 80B383C4 8FA50024 */ lw $a1, 0x0024($sp) /* 00368 80B383C8 24E78D40 */ addiu $a3, $a3, %lo(D_80B38D40) ## $a3 = 80B38D40 /* 0036C 80B383CC 8FA4003C */ lw $a0, 0x003C($sp) -/* 00370 80B383D0 0C01712B */ jal ActorCollider_InitCylinder +/* 00370 80B383D0 0C01712B */ jal Collider_SetCylinder /* 00374 80B383D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00378 80B383D8 87A90032 */ lh $t1, 0x0032($sp) @@ -232,14 +232,14 @@ glabel L80B384C0 glabel L80B384D0 /* 00470 80B384D0 26050180 */ addiu $a1, $s0, 0x0180 ## $a1 = 00000180 /* 00474 80B384D4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00478 80B384D8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00478 80B384D8 0C0170D9 */ jal Collider_InitCylinder /* 0047C 80B384DC 8FA4003C */ lw $a0, 0x003C($sp) /* 00480 80B384E0 3C0780B4 */ lui $a3, %hi(D_80B38D40) ## $a3 = 80B40000 /* 00484 80B384E4 8FA50024 */ lw $a1, 0x0024($sp) /* 00488 80B384E8 24E78D40 */ addiu $a3, $a3, %lo(D_80B38D40) ## $a3 = 80B38D40 /* 0048C 80B384EC 8FA4003C */ lw $a0, 0x003C($sp) -/* 00490 80B384F0 0C01712B */ jal ActorCollider_InitCylinder +/* 00490 80B384F0 0C01712B */ jal Collider_SetCylinder /* 00494 80B384F4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00498 80B384F8 8E080024 */ lw $t0, 0x0024($s0) ## 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Update.s index b1ecbfe69d..2bcdd328ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Update.s @@ -32,14 +32,14 @@ glabel EnWonderItem_Update .L80B38C58: /* 00BF8 80B38C58 26060180 */ addiu $a2, $s0, 0x0180 ## $a2 = 00000180 /* 00BFC 80B38C5C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000180 -/* 00C00 80B38C60 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00C00 80B38C60 0C0189B7 */ jal Collider_CylinderUpdate /* 00C04 80B38C64 AFA60050 */ sw $a2, 0x0050($sp) /* 00C08 80B38C68 8FA40064 */ lw $a0, 0x0064($sp) /* 00C0C 80B38C6C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00C10 80B38C70 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00C14 80B38C74 8FA60050 */ lw $a2, 0x0050($sp) -/* 00C18 80B38C78 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00C18 80B38C78 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00C1C 80B38C7C 00812821 */ addu $a1, $a0, $at /* 00C20 80B38C80 86020154 */ lh $v0, 0x0154($s0) ## 00000154 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Destroy.s index a16d12038f..04e11bbc9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Destroy.s @@ -7,7 +7,7 @@ glabel EnWood02_Destroy /* 0078C 80B3B6FC 29C1000B */ slti $at, $t6, 0x000B /* 00790 80B3B700 50200004 */ beql $at, $zero, .L80B3B714 /* 00794 80B3B704 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00798 80B3B708 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00798 80B3B708 0C0170EB */ jal Collider_DestroyCylinder /* 0079C 80B3B70C 24C50158 */ addiu $a1, $a2, 0x0158 ## $a1 = 00000158 /* 007A0 80B3B710 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Init.s index ae291b9689..b9cf9e59f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Init.s @@ -88,14 +88,14 @@ glabel EnWood02_Init /* 003F0 80B3B360 26050158 */ addiu $a1, $s0, 0x0158 ## $a1 = 00000158 /* 003F4 80B3B364 AFA5002C */ sw $a1, 0x002C($sp) /* 003F8 80B3B368 8FA40054 */ lw $a0, 0x0054($sp) -/* 003FC 80B3B36C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 003FC 80B3B36C 0C0170D9 */ jal Collider_InitCylinder /* 00400 80B3B370 A7A8004E */ sh $t0, 0x004E($sp) /* 00404 80B3B374 3C0780B4 */ lui $a3, %hi(D_80B3BF00) ## $a3 = 80B40000 /* 00408 80B3B378 8FA5002C */ lw $a1, 0x002C($sp) /* 0040C 80B3B37C 24E7BF00 */ addiu $a3, $a3, %lo(D_80B3BF00) ## $a3 = 80B3BF00 /* 00410 80B3B380 8FA40054 */ lw $a0, 0x0054($sp) -/* 00414 80B3B384 0C01712B */ jal ActorCollider_InitCylinder +/* 00414 80B3B384 0C01712B */ jal Collider_SetCylinder /* 00418 80B3B388 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0041C 80B3B38C 87A8004E */ lh $t0, 0x004E($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Update.s index 88698a1380..ed351ff7a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Update.s @@ -175,7 +175,7 @@ glabel EnWood02_Update /* 00A00 80B3B970 00000000 */ nop /* 00A04 80B3B974 45020079 */ bc1fl .L80B3BB5C /* 00A08 80B3B978 8630014C */ lh $s0, 0x014C($s1) ## 0000014C -/* 00A0C 80B3B97C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00A0C 80B3B97C 0C0189B7 */ jal Collider_CylinderUpdate /* 00A10 80B3B980 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 /* 00A14 80B3B984 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -183,12 +183,12 @@ glabel EnWood02_Update /* 00A1C 80B3B98C 02412821 */ addu $a1, $s2, $at /* 00A20 80B3B990 AFA50044 */ sw $a1, 0x0044($sp) /* 00A24 80B3B994 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00A28 80B3B998 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00A28 80B3B998 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00A2C 80B3B99C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000158 /* 00A30 80B3B9A0 8FA50044 */ lw $a1, 0x0044($sp) /* 00A34 80B3B9A4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00A38 80B3B9A8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00A38 80B3B9A8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00A3C 80B3B9AC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000158 /* 00A40 80B3B9B0 1000006A */ beq $zero, $zero, .L80B3BB5C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Destroy.s index 8e948cc361..8b72634bd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Destroy.s @@ -3,7 +3,7 @@ glabel EnXc_Destroy /* 00094 80B3C274 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00098 80B3C278 AFBF0014 */ sw $ra, 0x0014($sp) /* 0009C 80B3C27C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000A0 80B3C280 0C0170EB */ jal ActorCollider_FreeCylinder +/* 000A0 80B3C280 0C0170EB */ jal Collider_DestroyCylinder /* 000A4 80B3C284 24C502C0 */ addiu $a1, $a2, 0x02C0 ## $a1 = 000002C0 /* 000A8 80B3C288 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C1E0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C1E0.s index 065d77b4d2..ebb0ccba71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C1E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C1E0.s @@ -6,14 +6,14 @@ glabel func_80B3C1E0 /* 00010 80B3C1F0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00014 80B3C1F4 24C502C0 */ addiu $a1, $a2, 0x02C0 ## $a1 = 000002C0 /* 00018 80B3C1F8 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80B3C1FC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0001C 80B3C1FC 0C0170D9 */ jal Collider_InitCylinder /* 00020 80B3C200 AFA60020 */ sw $a2, 0x0020($sp) /* 00024 80B3C204 3C0780B4 */ lui $a3, %hi(D_80B41D40) ## $a3 = 80B40000 /* 00028 80B3C208 8FA50018 */ lw $a1, 0x0018($sp) /* 0002C 80B3C20C 8FA60020 */ lw $a2, 0x0020($sp) /* 00030 80B3C210 24E71D40 */ addiu $a3, $a3, %lo(D_80B41D40) ## $a3 = 80B41D40 -/* 00034 80B3C214 0C017114 */ jal func_8005C450 +/* 00034 80B3C214 0C017114 */ jal Collider_SetCylinder_Set3 /* 00038 80B3C218 8FA40024 */ lw $a0, 0x0024($sp) /* 0003C 80B3C21C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00040 80B3C220 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C22C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C22C.s index 12734f54bd..9b0a0bd60a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C22C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C22C.s @@ -4,14 +4,14 @@ glabel func_80B3C22C /* 00054 80B3C234 AFA50034 */ sw $a1, 0x0034($sp) /* 00058 80B3C238 248602C0 */ addiu $a2, $a0, 0x02C0 ## $a2 = 000002C0 /* 0005C 80B3C23C 00C02825 */ or $a1, $a2, $zero ## $a1 = 000002C0 -/* 00060 80B3C240 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00060 80B3C240 0C0189B7 */ jal Collider_CylinderUpdate /* 00064 80B3C244 AFA60018 */ sw $a2, 0x0018($sp) /* 00068 80B3C248 8FA40034 */ lw $a0, 0x0034($sp) /* 0006C 80B3C24C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00070 80B3C250 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00074 80B3C254 8FA60018 */ lw $a2, 0x0018($sp) -/* 00078 80B3C258 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00078 80B3C258 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0007C 80B3C25C 00812821 */ addu $a1, $a0, $at /* 00080 80B3C260 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Destroy.s index 84d96fc928..877d66884e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Destroy.s @@ -3,7 +3,7 @@ glabel EnYabusameMark_Destroy /* 00004 80B42DC4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00008 80B42DC8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0000C 80B42DCC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 80B42DD0 0C017418 */ jal func_8005D060 +/* 00010 80B42DD0 0C017418 */ jal Collider_DestroyQuad /* 00014 80B42DD4 24C50190 */ addiu $a1, $a2, 0x0190 ## $a1 = 00000190 /* 00018 80B42DD8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0001C 80B42DDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Init.s index 16690389f4..84eaf0f6d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Init.s @@ -87,13 +87,13 @@ glabel EnYabusameMark_Init .L80B42ECC: /* 0010C 80B42ECC 8FA40034 */ lw $a0, 0x0034($sp) .L80B42ED0: -/* 00110 80B42ED0 0C017406 */ jal func_8005D018 +/* 00110 80B42ED0 0C017406 */ jal Collider_InitQuad /* 00114 80B42ED4 AFA50024 */ sw $a1, 0x0024($sp) /* 00118 80B42ED8 3C0780B4 */ lui $a3, %hi(D_80B434F0) ## $a3 = 80B40000 /* 0011C 80B42EDC 8FA50024 */ lw $a1, 0x0024($sp) /* 00120 80B42EE0 24E734F0 */ addiu $a3, $a3, %lo(D_80B434F0) ## $a3 = 80B434F0 /* 00124 80B42EE4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00128 80B42EE8 0C017441 */ jal func_8005D104 +/* 00128 80B42EE8 0C017441 */ jal Collider_SetQuad /* 0012C 80B42EEC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00130 80B42EF0 8E0D0024 */ lw $t5, 0x0024($s0) ## 00000024 /* 00134 80B42EF4 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Update.s index fa9a87b91d..6431f40997 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/EnYabusameMark_Update.s @@ -66,7 +66,7 @@ glabel EnYabusameMark_Update /* 00684 80B43444 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00688 80B43448 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0068C 80B4344C 8FA60050 */ lw $a2, 0x0050($sp) -/* 00690 80B43450 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00690 80B43450 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00694 80B43454 00812821 */ addu $a1, $a0, $at /* 00698 80B43458 3C088016 */ lui $t0, %hi(gGameInfo) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Destroy.s index 8233a419d6..eff92cec21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Destroy.s @@ -3,7 +3,7 @@ glabel EnYukabyun_Destroy /* 000B0 80B43A70 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 000B4 80B43A74 AFBF0014 */ sw $ra, 0x0014($sp) /* 000B8 80B43A78 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000BC 80B43A7C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 000BC 80B43A7C 0C0170EB */ jal Collider_DestroyCylinder /* 000C0 80B43A80 24C50154 */ addiu $a1, $a2, 0x0154 ## $a1 = 00000154 /* 000C4 80B43A84 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Init.s index 88334f839b..4d8be09664 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Init.s @@ -18,14 +18,14 @@ glabel EnYukabyun_Init /* 00038 80B439F8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0003C 80B439FC 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 00040 80B43A00 AFA50020 */ sw $a1, 0x0020($sp) -/* 00044 80B43A04 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00044 80B43A04 0C0170D9 */ jal Collider_InitCylinder /* 00048 80B43A08 8FA4002C */ lw $a0, 0x002C($sp) /* 0004C 80B43A0C 3C0780B4 */ lui $a3, %hi(D_80B43F30) ## $a3 = 80B40000 /* 00050 80B43A10 8FA50020 */ lw $a1, 0x0020($sp) /* 00054 80B43A14 24E73F30 */ addiu $a3, $a3, %lo(D_80B43F30) ## $a3 = 80B43F30 /* 00058 80B43A18 8FA4002C */ lw $a0, 0x002C($sp) -/* 0005C 80B43A1C 0C01712B */ jal ActorCollider_InitCylinder +/* 0005C 80B43A1C 0C01712B */ jal Collider_SetCylinder /* 00060 80B43A20 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00064 80B43A24 860E001C */ lh $t6, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Update.s index b51f31224c..8dd70b04e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Update.s @@ -80,7 +80,7 @@ glabel EnYukabyun_Update /* 003A0 80B43D60 E7A40010 */ swc1 $f4, 0x0010($sp) /* 003A4 80B43D64 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 003A8 80B43D68 AFA50028 */ sw $a1, 0x0028($sp) -/* 003AC 80B43D6C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 003AC 80B43D6C 0C0189B7 */ jal Collider_CylinderUpdate /* 003B0 80B43D70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 003B4 80B43D74 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 @@ -92,17 +92,17 @@ glabel EnYukabyun_Update /* 003CC 80B43D8C AE180004 */ sw $t8, 0x0004($s0) ## 00000004 /* 003D0 80B43D90 02212821 */ addu $a1, $s1, $at /* 003D4 80B43D94 AFA5002C */ sw $a1, 0x002C($sp) -/* 003D8 80B43D98 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 003D8 80B43D98 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 003DC 80B43D9C 8FA60028 */ lw $a2, 0x0028($sp) /* 003E0 80B43DA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 003E4 80B43DA4 8FA5002C */ lw $a1, 0x002C($sp) -/* 003E8 80B43DA8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 003E8 80B43DA8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 003EC 80B43DAC 8FA60028 */ lw $a2, 0x0028($sp) /* 003F0 80B43DB0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 003F4 80B43DB4 8FA5002C */ lw $a1, 0x002C($sp) -/* 003F8 80B43DB8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 003F8 80B43DB8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 003FC 80B43DBC 8FA60028 */ lw $a2, 0x0028($sp) .L80B43DC0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Destroy.s index 82960e34e2..c11a8fe282 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Destroy.s @@ -30,11 +30,11 @@ glabel EnZf_Destroy /* 00624 80B44674 0C009C27 */ jal func_8002709C /* 00628 80B44678 8E050414 */ lw $a1, 0x0414($s0) ## 00000414 /* 0062C 80B4467C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00630 80B44680 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00630 80B44680 0C0170EB */ jal Collider_DestroyCylinder /* 00634 80B44684 26050418 */ addiu $a1, $s0, 0x0418 ## $a1 = 00000418 /* 00638 80B44688 8FA4002C */ lw $a0, 0x002C($sp) -/* 0063C 80B4468C 0C017418 */ jal func_8005D060 +/* 0063C 80B4468C 0C017418 */ jal Collider_DestroyQuad /* 00640 80B44690 26050464 */ addiu $a1, $s0, 0x0464 ## $a1 = 00000464 /* 00644 80B44694 8FBF0024 */ lw $ra, 0x0024($sp) /* 00648 80B44698 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Init.s index e9fefba96c..ecc0be3c9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Init.s @@ -90,25 +90,25 @@ glabel EnZf_Init /* 003F0 80B44440 A60D00AA */ sh $t5, 0x00AA($s0) ## 000000AA /* 003F4 80B44444 26050418 */ addiu $a1, $s0, 0x0418 ## $a1 = 00000418 /* 003F8 80B44448 AFA50030 */ sw $a1, 0x0030($sp) -/* 003FC 80B4444C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 003FC 80B4444C 0C0170D9 */ jal Collider_InitCylinder /* 00400 80B44450 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00404 80B44454 3C0780B5 */ lui $a3, %hi(D_80B4A1D8) ## $a3 = 80B50000 /* 00408 80B44458 8FA50030 */ lw $a1, 0x0030($sp) /* 0040C 80B4445C 24E7A1D8 */ addiu $a3, $a3, %lo(D_80B4A1D8) ## $a3 = 80B4A1D8 /* 00410 80B44460 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00414 80B44464 0C01712B */ jal ActorCollider_InitCylinder +/* 00414 80B44464 0C01712B */ jal Collider_SetCylinder /* 00418 80B44468 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0041C 80B4446C 26050464 */ addiu $a1, $s0, 0x0464 ## $a1 = 00000464 /* 00420 80B44470 AFA50030 */ sw $a1, 0x0030($sp) -/* 00424 80B44474 0C017406 */ jal func_8005D018 +/* 00424 80B44474 0C017406 */ jal Collider_InitQuad /* 00428 80B44478 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0042C 80B4447C 3C0780B5 */ lui $a3, %hi(D_80B4A204) ## $a3 = 80B50000 /* 00430 80B44480 8FA50030 */ lw $a1, 0x0030($sp) /* 00434 80B44484 24E7A204 */ addiu $a3, $a3, %lo(D_80B4A204) ## $a3 = 80B4A204 /* 00438 80B44488 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0043C 80B4448C 0C017441 */ jal func_8005D104 +/* 0043C 80B4448C 0C017441 */ jal Collider_SetQuad /* 00440 80B44490 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00444 80B44494 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00448 80B44498 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Update.s index d255ecc7f5..150d31116f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Update.s @@ -171,7 +171,7 @@ glabel EnZf_Update /* 05468 80B494B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0546C 80B494BC 15810024 */ bne $t4, $at, .L80B49550 /* 05470 80B494C0 26050418 */ addiu $a1, $s0, 0x0418 ## $a1 = 00000418 -/* 05474 80B494C4 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 05474 80B494C4 0C0189B7 */ jal Collider_CylinderUpdate /* 05478 80B494C8 AFA50028 */ sw $a1, 0x0028($sp) /* 0547C 80B494CC C6060080 */ lwc1 $f6, 0x0080($s0) ## 00000080 @@ -187,7 +187,7 @@ glabel EnZf_Update /* 054A4 80B494F4 10200004 */ beq $at, $zero, .L80B49508 /* 054A8 80B494F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 054AC 80B494FC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 054B0 80B49500 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 054B0 80B49500 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 054B4 80B49504 00812821 */ addu $a1, $a0, $at .L80B49508: @@ -210,7 +210,7 @@ glabel EnZf_Update /* 054F0 80B49540 15000003 */ bne $t0, $zero, .L80B49550 .L80B49544: /* 054F4 80B49544 00812821 */ addu $a1, $a0, $at -/* 054F8 80B49548 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 054F8 80B49548 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 054FC 80B4954C 8FA60028 */ lw $a2, 0x0028($sp) .L80B49550: @@ -243,7 +243,7 @@ glabel EnZf_Update /* 05564 80B495B4 17200006 */ bne $t9, $zero, .L80B495D0 /* 05568 80B495B8 8FA4003C */ lw $a0, 0x003C($sp) /* 0556C 80B495BC 00812821 */ addu $a1, $a0, $at -/* 05570 80B495C0 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 05570 80B495C0 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 05574 80B495C4 26060464 */ addiu $a2, $s0, 0x0464 ## $a2 = 00000464 /* 05578 80B495C8 10000008 */ beq $zero, $zero, .L80B495EC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s index ca077012e5..79e826a387 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s @@ -7,7 +7,7 @@ glabel EnZl1_Destroy /* 002B4 80B4ADF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 002B8 80B4ADF8 8FA50018 */ lw $a1, 0x0018($sp) /* 002BC 80B4ADFC 8FA4001C */ lw $a0, 0x001C($sp) -/* 002C0 80B4AE00 0C0170EB */ jal ActorCollider_FreeCylinder +/* 002C0 80B4AE00 0C0170EB */ jal Collider_DestroyCylinder /* 002C4 80B4AE04 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 /* 002C8 80B4AE08 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s index f891d2a9fe..dc1761a602 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s @@ -35,14 +35,14 @@ glabel EnZl1_Init /* 0008C 80B4ABCC E7A00018 */ swc1 $f0, 0x0018($sp) /* 00090 80B4ABD0 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00094 80B4ABD4 AFA50030 */ sw $a1, 0x0030($sp) -/* 00098 80B4ABD8 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00098 80B4ABD8 0C0170D9 */ jal Collider_InitCylinder /* 0009C 80B4ABDC 8FA40044 */ lw $a0, 0x0044($sp) /* 000A0 80B4ABE0 3C0780B5 */ lui $a3, %hi(D_80B4E5F0) ## $a3 = 80B50000 /* 000A4 80B4ABE4 8FA50030 */ lw $a1, 0x0030($sp) /* 000A8 80B4ABE8 24E7E5F0 */ addiu $a3, $a3, %lo(D_80B4E5F0) ## $a3 = 80B4E5F0 /* 000AC 80B4ABEC 8FA40044 */ lw $a0, 0x0044($sp) -/* 000B0 80B4ABF0 0C01712B */ jal ActorCollider_InitCylinder +/* 000B0 80B4ABF0 0C01712B */ jal Collider_SetCylinder /* 000B4 80B4ABF4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B8 80B4ABF8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Update.s index d48db3f2c9..ad654ef48e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Update.s @@ -38,14 +38,14 @@ glabel EnZl1_Update /* 01764 80B4C2A4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 01768 80B4C2A8 11090009 */ beq $t0, $t1, .L80B4C2D0 /* 0176C 80B4C2AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01770 80B4C2B0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01770 80B4C2B0 0C0189B7 */ jal Collider_CylinderUpdate /* 01774 80B4C2B4 AFA6002C */ sw $a2, 0x002C($sp) /* 01778 80B4C2B8 8FA4003C */ lw $a0, 0x003C($sp) /* 0177C 80B4C2BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01780 80B4C2C0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01784 80B4C2C4 8FA6002C */ lw $a2, 0x002C($sp) -/* 01788 80B4C2C8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01788 80B4C2C8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0178C 80B4C2CC 00812821 */ addu $a1, $a0, $at .L80B4C2D0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AF18.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AF18.s index 2c22c1c1d8..2c98dee515 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AF18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AF18.s @@ -52,14 +52,14 @@ glabel func_80B4AF18 .L80B4AFD4: /* 00494 80B4AFD4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 00498 80B4AFD8 AFA60034 */ sw $a2, 0x0034($sp) -/* 0049C 80B4AFDC 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0049C 80B4AFDC 0C0189B7 */ jal Collider_CylinderUpdate /* 004A0 80B4AFE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004A4 80B4AFE4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 004A8 80B4AFE8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 004AC 80B4AFEC 8FA60034 */ lw $a2, 0x0034($sp) /* 004B0 80B4AFF0 02212821 */ addu $a1, $s1, $at -/* 004B4 80B4AFF4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 004B4 80B4AFF4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 004B8 80B4AFF8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 004BC 80B4AFFC 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Destroy.s index badf1cd9b1..c3fb00ce87 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Destroy.s @@ -3,7 +3,7 @@ glabel EnZl3_Destroy /* 00094 80B53444 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00098 80B53448 AFBF0014 */ sw $ra, 0x0014($sp) /* 0009C 80B5344C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000A0 80B53450 0C0170EB */ jal ActorCollider_FreeCylinder +/* 000A0 80B53450 0C0170EB */ jal Collider_DestroyCylinder /* 000A4 80B53454 24C50378 */ addiu $a1, $a2, 0x0378 ## $a1 = 00000378 /* 000A8 80B53458 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533B0.s index aff2b436f4..3a10a7837e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533B0.s @@ -6,14 +6,14 @@ glabel func_80B533B0 /* 00010 80B533C0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00014 80B533C4 24C50378 */ addiu $a1, $a2, 0x0378 ## $a1 = 00000378 /* 00018 80B533C8 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80B533CC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0001C 80B533CC 0C0170D9 */ jal Collider_InitCylinder /* 00020 80B533D0 AFA60020 */ sw $a2, 0x0020($sp) /* 00024 80B533D4 3C0780B6 */ lui $a3, %hi(D_80B5A410) ## $a3 = 80B60000 /* 00028 80B533D8 8FA50018 */ lw $a1, 0x0018($sp) /* 0002C 80B533DC 8FA60020 */ lw $a2, 0x0020($sp) /* 00030 80B533E0 24E7A410 */ addiu $a3, $a3, %lo(D_80B5A410) ## $a3 = 80B5A410 -/* 00034 80B533E4 0C017114 */ jal func_8005C450 +/* 00034 80B533E4 0C017114 */ jal Collider_SetCylinder_Set3 /* 00038 80B533E8 8FA40024 */ lw $a0, 0x0024($sp) /* 0003C 80B533EC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00040 80B533F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533FC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533FC.s index 203ce7808e..11a350c2b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533FC.s @@ -4,14 +4,14 @@ glabel func_80B533FC /* 00054 80B53404 AFA50034 */ sw $a1, 0x0034($sp) /* 00058 80B53408 24860378 */ addiu $a2, $a0, 0x0378 ## $a2 = 00000378 /* 0005C 80B5340C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000378 -/* 00060 80B53410 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00060 80B53410 0C0189B7 */ jal Collider_CylinderUpdate /* 00064 80B53414 AFA60018 */ sw $a2, 0x0018($sp) /* 00068 80B53418 8FA40034 */ lw $a0, 0x0034($sp) /* 0006C 80B5341C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00070 80B53420 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00074 80B53424 8FA60018 */ lw $a2, 0x0018($sp) -/* 00078 80B53428 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00078 80B53428 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0007C 80B5342C 00812821 */ addu $a1, $a0, $at /* 00080 80B53430 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Destroy.s index 65fa9245fe..72e5fc4ab4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Destroy.s @@ -3,7 +3,7 @@ glabel EnZl4_Destroy /* 007BC 80B5BF6C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 007C0 80B5BF70 AFBF0014 */ sw $ra, 0x0014($sp) /* 007C4 80B5BF74 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 007C8 80B5BF78 0C0170EB */ jal ActorCollider_FreeCylinder +/* 007C8 80B5BF78 0C0170EB */ jal Collider_DestroyCylinder /* 007CC 80B5BF7C 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 /* 007D0 80B5BF80 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s index 68894c05aa..511f2e90cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s @@ -32,14 +32,14 @@ glabel EnZl4_Init /* 00670 80B5BE20 24060015 */ addiu $a2, $zero, 0x0015 ## $a2 = 00000015 /* 00674 80B5BE24 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 /* 00678 80B5BE28 AFA50030 */ sw $a1, 0x0030($sp) -/* 0067C 80B5BE2C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0067C 80B5BE2C 0C0170D9 */ jal Collider_InitCylinder /* 00680 80B5BE30 8FA40044 */ lw $a0, 0x0044($sp) /* 00684 80B5BE34 3C0780B6 */ lui $a3, %hi(D_80B5E780) ## $a3 = 80B60000 /* 00688 80B5BE38 8FA50030 */ lw $a1, 0x0030($sp) /* 0068C 80B5BE3C 24E7E780 */ addiu $a3, $a3, %lo(D_80B5E780) ## $a3 = 80B5E780 /* 00690 80B5BE40 8FA40044 */ lw $a0, 0x0044($sp) -/* 00694 80B5BE44 0C01712B */ jal ActorCollider_InitCylinder +/* 00694 80B5BE44 0C01712B */ jal Collider_SetCylinder /* 00698 80B5BE48 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0069C 80B5BE4C 3C0680B6 */ lui $a2, %hi(D_80B5E7AC) ## $a2 = 80B60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Update.s index 71829c9bfc..88eaead1de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Update.s @@ -31,14 +31,14 @@ glabel EnZl4_Update /* 02B74 80B5E324 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 /* 02B78 80B5E328 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 /* 02B7C 80B5E32C AFA6002C */ sw $a2, 0x002C($sp) -/* 02B80 80B5E330 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 02B80 80B5E330 0C0189B7 */ jal Collider_CylinderUpdate /* 02B84 80B5E334 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02B88 80B5E338 8FA4003C */ lw $a0, 0x003C($sp) /* 02B8C 80B5E33C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02B90 80B5E340 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02B94 80B5E344 8FA6002C */ lw $a2, 0x002C($sp) -/* 02B98 80B5E348 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02B98 80B5E348 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 02B9C 80B5E34C 00812821 */ addu $a1, $a0, $at /* 02BA0 80B5E350 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s index 0cc41ac4a3..c7d50d162b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s @@ -26,14 +26,14 @@ glabel EnZo_Init /* 01518 80B61738 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0151C 80B6173C 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC /* 01520 80B61740 AFA50034 */ sw $a1, 0x0034($sp) -/* 01524 80B61744 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 01524 80B61744 0C0170D9 */ jal Collider_InitCylinder /* 01528 80B61748 8FA40044 */ lw $a0, 0x0044($sp) /* 0152C 80B6174C 3C0780B6 */ lui $a3, %hi(D_80B6248C) ## $a3 = 80B60000 /* 01530 80B61750 8FA50034 */ lw $a1, 0x0034($sp) /* 01534 80B61754 24E7248C */ addiu $a3, $a3, %lo(D_80B6248C) ## $a3 = 80B6248C /* 01538 80B61758 8FA40044 */ lw $a0, 0x0044($sp) -/* 0153C 80B6175C 0C01712B */ jal ActorCollider_InitCylinder +/* 0153C 80B6175C 0C01712B */ jal Collider_SetCylinder /* 01540 80B61760 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 01544 80B61764 3C0680B6 */ lui $a2, %hi(D_80B624B8) ## $a2 = 80B60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Update.s index 4371074022..5e058932a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Update.s @@ -107,14 +107,14 @@ glabel EnZo_Update /* 01D54 80B61F74 00000000 */ nop /* 01D58 80B61F78 13000009 */ beq $t8, $zero, .L80B61FA0 /* 01D5C 80B61F7C 00000000 */ nop -/* 01D60 80B61F80 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 01D60 80B61F80 0C0189B7 */ jal Collider_CylinderUpdate /* 01D64 80B61F84 AFA6002C */ sw $a2, 0x002C($sp) /* 01D68 80B61F88 8FA4004C */ lw $a0, 0x004C($sp) /* 01D6C 80B61F8C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01D70 80B61F90 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01D74 80B61F94 8FA6002C */ lw $a2, 0x002C($sp) -/* 01D78 80B61F98 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 01D78 80B61F98 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01D7C 80B61F9C 00812821 */ addu $a1, $a0, $at .L80B61FA0: diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s index dfb6bcf21d..919d2769af 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s @@ -22,7 +22,7 @@ glabel Fishing_Destroy .L80B6AF08: /* 01568 80B6AF08 14410003 */ bne $v0, $at, .L80B6AF18 /* 0156C 80B6AF0C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01570 80B6AF10 0C016F32 */ jal func_8005BCC8 +/* 01570 80B6AF10 0C016F32 */ jal Collider_DestroyJntSph /* 01574 80B6AF14 24650230 */ addiu $a1, $v1, 0x0230 ## $a1 = 00000230 .L80B6AF18: /* 01578 80B6AF18 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s index 557ebda043..863c34d5ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s @@ -75,7 +75,7 @@ glabel Fishing_Init /* 00C4C 80B6A5EC AC32E070 */ sw $s2, %lo(D_80B7E070)($at) /* 00C50 80B6A5F0 8E050000 */ lw $a1, 0x0000($s0) ## 80B7E070 /* 00C54 80B6A5F4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00C58 80B6A5F8 0C016EFE */ jal func_8005BBF8 +/* 00C58 80B6A5F8 0C016EFE */ jal Collider_InitJntSph /* 00C5C 80B6A5FC 24A50230 */ addiu $a1, $a1, 0x0230 ## $a1 = 00000230 /* 00C60 80B6A600 8E030000 */ lw $v1, 0x0000($s0) ## 80B7E070 /* 00C64 80B6A604 3C0780B8 */ lui $a3, %hi(D_80B7A888) ## $a3 = 80B80000 @@ -84,7 +84,7 @@ glabel Fishing_Init /* 00C70 80B6A610 AFA80010 */ sw $t0, 0x0010($sp) /* 00C74 80B6A614 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00C78 80B6A618 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -/* 00C7C 80B6A61C 0C017014 */ jal func_8005C050 +/* 00C7C 80B6A61C 0C017014 */ jal Collider_SetJntSph /* 00C80 80B6A620 24650230 */ addiu $a1, $v1, 0x0230 ## $a1 = 00000230 /* 00C84 80B6A624 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 00C88 80B6A628 A649001C */ sh $t1, 0x001C($s2) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B761B8.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B761B8.s index addb77ed5b..b591eba84f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B761B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B761B8.s @@ -185,7 +185,7 @@ glabel func_80B761B8 /* 0CA94 80B76434 3C0680B8 */ lui $a2, %hi(D_80B7E070) ## $a2 = 80B80000 /* 0CA98 80B76438 8CC6E070 */ lw $a2, %lo(D_80B7E070)($a2) /* 0CA9C 80B7643C 02612821 */ addu $a1, $s3, $at -/* 0CAA0 80B76440 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0CAA0 80B76440 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0CAA4 80B76444 24C60230 */ addiu $a2, $a2, 0x0230 ## $a2 = 80B80230 .L80B76448: diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Destroy.s index 9f078a49d4..1a54f98415 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Destroy.s @@ -3,7 +3,7 @@ glabel ItemShield_Destroy /* 00184 80B86AA4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00188 80B86AA8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0018C 80B86AAC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00190 80B86AB0 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00190 80B86AB0 0C0170EB */ jal Collider_DestroyCylinder /* 00194 80B86AB4 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 00198 80B86AB8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Init.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Init.s index 191ac12978..aabde5eb83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Init.s @@ -88,14 +88,14 @@ glabel ItemShield_Init /* 00120 80B86A40 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00124 80B86A44 2670014C */ addiu $s0, $s3, 0x014C ## $s0 = 0000014C /* 00128 80B86A48 02002825 */ or $a1, $s0, $zero ## $a1 = 0000014C -/* 0012C 80B86A4C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0012C 80B86A4C 0C0170D9 */ jal Collider_InitCylinder /* 00130 80B86A50 8FA4003C */ lw $a0, 0x003C($sp) /* 00134 80B86A54 3C0780B8 */ lui $a3, %hi(D_80B871A0) ## $a3 = 80B80000 /* 00138 80B86A58 24E771A0 */ addiu $a3, $a3, %lo(D_80B871A0) ## $a3 = 80B871A0 /* 0013C 80B86A5C 8FA4003C */ lw $a0, 0x003C($sp) /* 00140 80B86A60 02002825 */ or $a1, $s0, $zero ## $a1 = 0000014C -/* 00144 80B86A64 0C01712B */ jal ActorCollider_InitCylinder +/* 00144 80B86A64 0C01712B */ jal Collider_SetCylinder /* 00148 80B86A68 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 0014C 80B86A6C 3C0480B8 */ lui $a0, %hi(D_80B87280) ## $a0 = 80B80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86BC8.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86BC8.s index d94435204c..8c218dbe96 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86BC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86BC8.s @@ -50,14 +50,14 @@ glabel func_80B86BC8 /* 0034C 80B86C6C 10000009 */ beq $zero, $zero, .L80B86C94 /* 00350 80B86C70 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 .L80B86C74: -/* 00354 80B86C74 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00354 80B86C74 0C0189B7 */ jal Collider_CylinderUpdate /* 00358 80B86C78 AFA6002C */ sw $a2, 0x002C($sp) /* 0035C 80B86C7C 8FA40034 */ lw $a0, 0x0034($sp) /* 00360 80B86C80 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00364 80B86C84 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00368 80B86C88 8FA6002C */ lw $a2, 0x002C($sp) -/* 0036C 80B86C8C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0036C 80B86C8C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00370 80B86C90 00812821 */ addu $a1, $a0, $at .L80B86C94: diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Init.s b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Init.s index 40415bea6a..ab900484b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Init.s @@ -20,18 +20,18 @@ glabel MagicFire_Init /* 00040 80B88DB0 E6040198 */ swc1 $f4, 0x0198($s0) ## 00000198 /* 00044 80B88DB4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00048 80B88DB8 AFA50020 */ sw $a1, 0x0020($sp) -/* 0004C 80B88DBC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0004C 80B88DBC 0C0170D9 */ jal Collider_InitCylinder /* 00050 80B88DC0 8FA4002C */ lw $a0, 0x002C($sp) /* 00054 80B88DC4 3C0780B9 */ lui $a3, %hi(D_80B8AF50) ## $a3 = 80B90000 /* 00058 80B88DC8 24E7AF50 */ addiu $a3, $a3, %lo(D_80B8AF50) ## $a3 = 80B8AF50 /* 0005C 80B88DCC 8FA4002C */ lw $a0, 0x002C($sp) /* 00060 80B88DD0 8FA50020 */ lw $a1, 0x0020($sp) -/* 00064 80B88DD4 0C01712B */ jal ActorCollider_InitCylinder +/* 00064 80B88DD4 0C01712B */ jal Collider_SetCylinder /* 00068 80B88DD8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0006C 80B88DDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00070 80B88DE0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00070 80B88DE0 0C0189B7 */ jal Collider_CylinderUpdate /* 00074 80B88DE4 8FA50020 */ lw $a1, 0x0020($sp) /* 00078 80B88DE8 3C0E80B9 */ lui $t6, %hi(func_80B88E3C) ## $t6 = 80B90000 diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Update.s b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Update.s index 5c70ac0850..dcf6202f8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Update.s @@ -60,7 +60,7 @@ glabel MagicFire_Update .L80B88F78: /* 00208 80B88F78 AFA6002C */ sw $a2, 0x002C($sp) .L80B88F7C: -/* 0020C 80B88F7C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 0020C 80B88F7C 0C0189B7 */ jal Collider_CylinderUpdate /* 00210 80B88F80 AFA7004C */ sw $a3, 0x004C($sp) /* 00214 80B88F84 3C0180B9 */ lui $at, %hi(D_80B8AFFC) ## $at = 80B90000 @@ -87,7 +87,7 @@ glabel MagicFire_Update /* 00268 80B88FD8 440C2000 */ mfc1 $t4, $f4 /* 0026C 80B88FDC 440E5000 */ mfc1 $t6, $f10 /* 00270 80B88FE0 A60C018E */ sh $t4, 0x018E($s0) ## 0000018E -/* 00274 80B88FE4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00274 80B88FE4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00278 80B88FE8 A60E0190 */ sh $t6, 0x0190($s0) ## 00000190 /* 0027C 80B88FEC 860301A4 */ lh $v1, 0x01A4($s0) ## 000001A4 diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Destroy.s index 1fe9a3a313..4273fd6a61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Destroy.s @@ -20,12 +20,12 @@ glabel MirRay_Destroy /* 00580 80B8D5D0 33280002 */ andi $t0, $t9, 0x0002 ## $t0 = 00000000 /* 00584 80B8D5D4 51000005 */ beql $t0, $zero, .L80B8D5EC /* 00588 80B8D5D8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0058C 80B8D5DC 0C016F32 */ jal func_8005BCC8 +/* 0058C 80B8D5DC 0C016F32 */ jal Collider_DestroyJntSph /* 00590 80B8D5E0 2445014C */ addiu $a1, $v0, 0x014C ## $a1 = 0000014C /* 00594 80B8D5E4 8FA20018 */ lw $v0, 0x0018($sp) /* 00598 80B8D5E8 8FA4001C */ lw $a0, 0x001C($sp) .L80B8D5EC: -/* 0059C 80B8D5EC 0C017418 */ jal func_8005D060 +/* 0059C 80B8D5EC 0C017418 */ jal Collider_DestroyQuad /* 005A0 80B8D5F0 244501AC */ addiu $a1, $v0, 0x01AC ## $a1 = 000001AC /* 005A4 80B8D5F4 8FBF0014 */ lw $ra, 0x0014($sp) /* 005A8 80B8D5F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Init.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Init.s index 87788439bf..d822d1d7b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Init.s @@ -190,7 +190,7 @@ glabel MirRay_Init /* 0048C 80B8D4DC 31AE0002 */ andi $t6, $t5, 0x0002 ## $t6 = 00000000 /* 00490 80B8D4E0 51C00012 */ beql $t6, $zero, .L80B8D52C /* 00494 80B8D4E4 261101AC */ addiu $s1, $s0, 0x01AC ## $s1 = 000001AC -/* 00498 80B8D4E8 0C016EFE */ jal func_8005BBF8 +/* 00498 80B8D4E8 0C016EFE */ jal Collider_InitJntSph /* 0049C 80B8D4EC AFA50030 */ sw $a1, 0x0030($sp) /* 004A0 80B8D4F0 3C0780B9 */ lui $a3, %hi(D_80B8E6E8) ## $a3 = 80B90000 /* 004A4 80B8D4F4 260F016C */ addiu $t7, $s0, 0x016C ## $t7 = 0000016C @@ -198,7 +198,7 @@ glabel MirRay_Init /* 004AC 80B8D4FC AFAF0010 */ sw $t7, 0x0010($sp) /* 004B0 80B8D500 24E7E6E8 */ addiu $a3, $a3, %lo(D_80B8E6E8) ## $a3 = 80B8E6E8 /* 004B4 80B8D504 8FA40044 */ lw $a0, 0x0044($sp) -/* 004B8 80B8D508 0C017014 */ jal func_8005C050 +/* 004B8 80B8D508 0C017014 */ jal Collider_SetJntSph /* 004BC 80B8D50C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 004C0 80B8D510 9238001F */ lbu $t8, 0x001F($s1) ## 000001CB /* 004C4 80B8D514 33190004 */ andi $t9, $t8, 0x0004 ## $t9 = 00000000 @@ -209,13 +209,13 @@ glabel MirRay_Init /* 004D8 80B8D528 261101AC */ addiu $s1, $s0, 0x01AC ## $s1 = 000001AC .L80B8D52C: /* 004DC 80B8D52C 02202825 */ or $a1, $s1, $zero ## $a1 = 000001AC -/* 004E0 80B8D530 0C017406 */ jal func_8005D018 +/* 004E0 80B8D530 0C017406 */ jal Collider_InitQuad /* 004E4 80B8D534 8FA40044 */ lw $a0, 0x0044($sp) /* 004E8 80B8D538 3C0780B9 */ lui $a3, %hi(D_80B8E674) ## $a3 = 80B90000 /* 004EC 80B8D53C 24E7E674 */ addiu $a3, $a3, %lo(D_80B8E674) ## $a3 = 80B8E674 /* 004F0 80B8D540 8FA40044 */ lw $a0, 0x0044($sp) /* 004F4 80B8D544 02202825 */ or $a1, $s1, $zero ## $a1 = 000001AC -/* 004F8 80B8D548 0C017441 */ jal func_8005D104 +/* 004F8 80B8D548 0C017441 */ jal Collider_SetQuad /* 004FC 80B8D54C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00500 80B8D550 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 00504 80B8D554 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Update.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Update.s index 548348e387..db0f641ecd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Update.s @@ -29,7 +29,7 @@ glabel MirRay_Update /* 0061C 80B8D66C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00620 80B8D670 02212821 */ addu $a1, $s1, $at /* 00624 80B8D674 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00628 80B8D678 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00628 80B8D678 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 0062C 80B8D67C 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C .L80B8D680: @@ -42,7 +42,7 @@ glabel MirRay_Update /* 00648 80B8D698 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0064C 80B8D69C 45020004 */ bc1fl .L80B8D6B0 /* 00650 80B8D6A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00654 80B8D6A4 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00654 80B8D6A4 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00658 80B8D6A8 260601AC */ addiu $a2, $s0, 0x01AC ## $a2 = 000001AC /* 0065C 80B8D6AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Destroy.s index d21a2a9a3a..a6f74757be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Destroy.s @@ -19,7 +19,7 @@ glabel ObjBean_Destroy /* 01290 80B8FD10 13000005 */ beq $t8, $zero, .L80B8FD28 /* 01294 80B8FD14 8FA4001C */ lw $a0, 0x001C($sp) /* 01298 80B8FD18 24E50168 */ addiu $a1, $a3, 0x0168 ## $a1 = 00000168 -/* 0129C 80B8FD1C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 0129C 80B8FD1C 0C0170EB */ jal Collider_DestroyCylinder /* 012A0 80B8FD20 AFA70018 */ sw $a3, 0x0018($sp) /* 012A4 80B8FD24 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s index 8078d399d5..d146c87a66 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Update.s @@ -56,14 +56,14 @@ glabel ObjBean_Update /* 020E4 80B90B64 44093000 */ mfc1 $t1, $f6 /* 020E8 80B90B68 00000000 */ nop /* 020EC 80B90B6C A60901A8 */ sh $t1, 0x01A8($s0) ## 000001A8 -/* 020F0 80B90B70 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 020F0 80B90B70 0C0189B7 */ jal Collider_CylinderUpdate /* 020F4 80B90B74 AFA60024 */ sw $a2, 0x0024($sp) /* 020F8 80B90B78 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 020FC 80B90B7C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 02100 80B90B80 8FA60024 */ lw $a2, 0x0024($sp) /* 02104 80B90B84 02212821 */ addu $a1, $s1, $at -/* 02108 80B90B88 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 02108 80B90B88 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0210C 80B90B8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02110 80B90B90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EA80.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EA80.s index 4d1e511167..cae6a61ab4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EA80.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8EA80.s @@ -6,18 +6,18 @@ glabel func_80B8EA80 /* 00010 80B8EA90 AFBF0014 */ sw $ra, 0x0014($sp) /* 00014 80B8EA94 24C50168 */ addiu $a1, $a2, 0x0168 ## $a1 = 00000168 /* 00018 80B8EA98 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80B8EA9C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0001C 80B8EA9C 0C0170D9 */ jal Collider_InitCylinder /* 00020 80B8EAA0 AFA60020 */ sw $a2, 0x0020($sp) /* 00024 80B8EAA4 3C0780B9 */ lui $a3, %hi(D_80B90E54) ## $a3 = 80B90000 /* 00028 80B8EAA8 8FA60020 */ lw $a2, 0x0020($sp) /* 0002C 80B8EAAC 24E70E54 */ addiu $a3, $a3, %lo(D_80B90E54) ## $a3 = 80B90E54 /* 00030 80B8EAB0 8FA40024 */ lw $a0, 0x0024($sp) -/* 00034 80B8EAB4 0C01712B */ jal ActorCollider_InitCylinder +/* 00034 80B8EAB4 0C01712B */ jal Collider_SetCylinder /* 00038 80B8EAB8 8FA50018 */ lw $a1, 0x0018($sp) /* 0003C 80B8EABC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00040 80B8EAC0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00040 80B8EAC0 0C0189B7 */ jal Collider_CylinderUpdate /* 00044 80B8EAC4 8FA50018 */ lw $a1, 0x0018($sp) /* 00048 80B8EAC8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Init.s index 29ab7bce2d..a875ab59df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Init.s @@ -50,14 +50,14 @@ glabel ObjDekujr_Init /* 000A4 80B924C4 00000000 */ nop /* 000A8 80B924C8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 000AC 80B924CC AFA50024 */ sw $a1, 0x0024($sp) -/* 000B0 80B924D0 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000B0 80B924D0 0C0170D9 */ jal Collider_InitCylinder /* 000B4 80B924D4 8FA40034 */ lw $a0, 0x0034($sp) /* 000B8 80B924D8 3C0680B9 */ lui $a2, %hi(D_80B92A00) ## $a2 = 80B90000 /* 000BC 80B924DC 24C62A00 */ addiu $a2, $a2, %lo(D_80B92A00) ## $a2 = 80B92A00 /* 000C0 80B924E0 8FA50024 */ lw $a1, 0x0024($sp) /* 000C4 80B924E4 ACD00000 */ sw $s0, 0x0000($a2) ## 80B92A00 -/* 000C8 80B924E8 0C0170FD */ jal func_8005C3F4 +/* 000C8 80B924E8 0C0170FD */ jal Collider_SetCylinder_Actor /* 000CC 80B924EC 8FA40034 */ lw $a0, 0x0034($sp) /* 000D0 80B924F0 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF /* 000D4 80B924F4 A20B00AE */ sb $t3, 0x00AE($s0) ## 000000AE diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Update.s index 2785bbe637..bb837e06d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Update.s @@ -6,14 +6,14 @@ glabel ObjDekujr_Update /* 00358 80B92778 AFA50034 */ sw $a1, 0x0034($sp) /* 0035C 80B9277C 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 00360 80B92780 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 00364 80B92784 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00364 80B92784 0C0189B7 */ jal Collider_CylinderUpdate /* 00368 80B92788 AFA60024 */ sw $a2, 0x0024($sp) /* 0036C 80B9278C 8FA40034 */ lw $a0, 0x0034($sp) /* 00370 80B92790 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00374 80B92794 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00378 80B92798 8FA60024 */ lw $a2, 0x0024($sp) -/* 0037C 80B9279C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0037C 80B9279C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00380 80B927A0 00812821 */ addu $a1, $a0, $at /* 00384 80B927A4 3C0E8016 */ lui $t6, %hi(gSaveContext+8) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Destroy.s index dcd7f0fd12..5cc2d61284 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Destroy.s @@ -3,7 +3,7 @@ glabel ObjHamishi_Destroy /* 00568 80B934F8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0056C 80B934FC AFBF0014 */ sw $ra, 0x0014($sp) /* 00570 80B93500 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00574 80B93504 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00574 80B93504 0C0170EB */ jal Collider_DestroyCylinder /* 00578 80B93508 24E5014C */ addiu $a1, $a3, 0x014C ## $a1 = 0000014C /* 0057C 80B9350C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Update.s index 78a063f3d2..e3e7edb475 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Update.s @@ -68,12 +68,12 @@ glabel ObjHamishi_Update /* 00680 80B93610 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00684 80B93614 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 00688 80B93618 AFA60020 */ sw $a2, 0x0020($sp) -/* 0068C 80B9361C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 0068C 80B9361C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00690 80B93620 AFA50024 */ sw $a1, 0x0024($sp) /* 00694 80B93624 8FA50024 */ lw $a1, 0x0024($sp) /* 00698 80B93628 8FA60020 */ lw $a2, 0x0020($sp) -/* 0069C 80B9362C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0069C 80B9362C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 006A0 80B93630 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80B93634: diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92F90.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92F90.s index 83e53e9bf7..24a3178d8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92F90.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B92F90.s @@ -6,18 +6,18 @@ glabel func_80B92F90 /* 00010 80B92FA0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00014 80B92FA4 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 00018 80B92FA8 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80B92FAC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0001C 80B92FAC 0C0170D9 */ jal Collider_InitCylinder /* 00020 80B92FB0 AFA60020 */ sw $a2, 0x0020($sp) /* 00024 80B92FB4 3C0780B9 */ lui $a3, %hi(D_80B93750) ## $a3 = 80B90000 /* 00028 80B92FB8 8FA60020 */ lw $a2, 0x0020($sp) /* 0002C 80B92FBC 24E73750 */ addiu $a3, $a3, %lo(D_80B93750) ## $a3 = 80B93750 /* 00030 80B92FC0 8FA40024 */ lw $a0, 0x0024($sp) -/* 00034 80B92FC4 0C01712B */ jal ActorCollider_InitCylinder +/* 00034 80B92FC4 0C01712B */ jal Collider_SetCylinder /* 00038 80B92FC8 8FA50018 */ lw $a1, 0x0018($sp) /* 0003C 80B92FCC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00040 80B92FD0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00040 80B92FD0 0C0189B7 */ jal Collider_CylinderUpdate /* 00044 80B92FD4 8FA50018 */ lw $a1, 0x0018($sp) /* 00048 80B92FD8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Destroy.s index 63d503926f..dec12cff5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Destroy.s @@ -11,7 +11,7 @@ glabel ObjHana_Destroy /* 0011C 80B9397C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00120 80B93980 07220004 */ bltzl $t9, .L80B93994 /* 00124 80B93984 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00128 80B93988 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00128 80B93988 0C0170EB */ jal Collider_DestroyCylinder /* 0012C 80B9398C 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C /* 00130 80B93990 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Init.s index 15523fc9a4..c2563c1746 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Init.s @@ -28,18 +28,18 @@ glabel ObjHana_Init /* 00060 80B938C0 8FA4003C */ lw $a0, 0x003C($sp) /* 00064 80B938C4 05200015 */ bltz $t1, .L80B9391C /* 00068 80B938C8 00000000 */ nop -/* 0006C 80B938CC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0006C 80B938CC 0C0170D9 */ jal Collider_InitCylinder /* 00070 80B938D0 AFA50024 */ sw $a1, 0x0024($sp) /* 00074 80B938D4 3C0780B9 */ lui $a3, %hi(D_80B93A70) ## $a3 = 80B90000 /* 00078 80B938D8 24E73A70 */ addiu $a3, $a3, %lo(D_80B93A70) ## $a3 = 80B93A70 /* 0007C 80B938DC 8FA4003C */ lw $a0, 0x003C($sp) /* 00080 80B938E0 8FA50024 */ lw $a1, 0x0024($sp) -/* 00084 80B938E4 0C01712B */ jal ActorCollider_InitCylinder +/* 00084 80B938E4 0C01712B */ jal Collider_SetCylinder /* 00088 80B938E8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0008C 80B938EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00090 80B938F0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00090 80B938F0 0C0189B7 */ jal Collider_CylinderUpdate /* 00094 80B938F4 8FA50024 */ lw $a1, 0x0024($sp) /* 00098 80B938F8 862A000C */ lh $t2, 0x000C($s1) ## 0000000C diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Update.s index eef82237da..238f2481f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Update.s @@ -21,7 +21,7 @@ glabel ObjHana_Update /* 0018C 80B939EC 00A12821 */ addu $a1, $a1, $at /* 00190 80B939F0 45020004 */ bc1fl .L80B93A04 /* 00194 80B939F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00198 80B939F8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00198 80B939F8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 0019C 80B939FC 24E6014C */ addiu $a2, $a3, 0x014C ## $a2 = 0000014C /* 001A0 80B93A00 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Destroy.s index cf3aa0c8c1..c9df03427b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Destroy.s @@ -9,12 +9,12 @@ glabel ObjIcePoly_Destroy /* 001DC 80B9443C 10200008 */ beq $at, $zero, .L80B94460 /* 001E0 80B94440 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 001E4 80B94444 24C50154 */ addiu $a1, $a2, 0x0154 ## $a1 = 00000154 -/* 001E8 80B94448 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001E8 80B94448 0C0170EB */ jal Collider_DestroyCylinder /* 001EC 80B9444C AFA60018 */ sw $a2, 0x0018($sp) /* 001F0 80B94450 8FA60018 */ lw $a2, 0x0018($sp) /* 001F4 80B94454 8FA4001C */ lw $a0, 0x001C($sp) -/* 001F8 80B94458 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001F8 80B94458 0C0170EB */ jal Collider_DestroyCylinder /* 001FC 80B9445C 24C501A0 */ addiu $a1, $a2, 0x01A0 ## $a1 = 000001A0 .L80B94460: diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Init.s index dd0b11cdea..8345361932 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Init.s @@ -40,34 +40,34 @@ glabel ObjIcePoly_Init /* 00088 80B942E8 46083280 */ add.s $f10, $f6, $f8 /* 0008C 80B942EC E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 00090 80B942F0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00094 80B942F4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00094 80B942F4 0C0170D9 */ jal Collider_InitCylinder /* 00098 80B942F8 8FA40034 */ lw $a0, 0x0034($sp) /* 0009C 80B942FC 3C0780B9 */ lui $a3, %hi(D_80B94B30) ## $a3 = 80B90000 /* 000A0 80B94300 24E74B30 */ addiu $a3, $a3, %lo(D_80B94B30) ## $a3 = 80B94B30 /* 000A4 80B94304 8FA40034 */ lw $a0, 0x0034($sp) /* 000A8 80B94308 8FA50024 */ lw $a1, 0x0024($sp) -/* 000AC 80B9430C 0C01712B */ jal ActorCollider_InitCylinder +/* 000AC 80B9430C 0C01712B */ jal Collider_SetCylinder /* 000B0 80B94310 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B4 80B94314 260501A0 */ addiu $a1, $s0, 0x01A0 ## $a1 = 000001A0 /* 000B8 80B94318 AFA50028 */ sw $a1, 0x0028($sp) -/* 000BC 80B9431C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000BC 80B9431C 0C0170D9 */ jal Collider_InitCylinder /* 000C0 80B94320 8FA40034 */ lw $a0, 0x0034($sp) /* 000C4 80B94324 3C0780B9 */ lui $a3, %hi(D_80B94B5C) ## $a3 = 80B90000 /* 000C8 80B94328 24E74B5C */ addiu $a3, $a3, %lo(D_80B94B5C) ## $a3 = 80B94B5C /* 000CC 80B9432C 8FA40034 */ lw $a0, 0x0034($sp) /* 000D0 80B94330 8FA50028 */ lw $a1, 0x0028($sp) -/* 000D4 80B94334 0C01712B */ jal ActorCollider_InitCylinder +/* 000D4 80B94334 0C01712B */ jal Collider_SetCylinder /* 000D8 80B94338 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000DC 80B9433C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000E0 80B94340 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 000E0 80B94340 0C0189B7 */ jal Collider_CylinderUpdate /* 000E4 80B94344 8FA50024 */ lw $a1, 0x0024($sp) /* 000E8 80B94348 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000EC 80B9434C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 000EC 80B9434C 0C0189B7 */ jal Collider_CylinderUpdate /* 000F0 80B94350 8FA50028 */ lw $a1, 0x0028($sp) /* 000F4 80B94354 860B0194 */ lh $t3, 0x0194($s0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B94470.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B94470.s index 5fb51f3613..081a2fe3fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B94470.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B94470.s @@ -36,22 +36,22 @@ glabel func_80B94470 /* 00294 80B944F4 02212821 */ addu $a1, $s1, $at /* 00298 80B944F8 26060154 */ addiu $a2, $s0, 0x0154 ## $a2 = 00000154 /* 0029C 80B944FC AFA60034 */ sw $a2, 0x0034($sp) -/* 002A0 80B94500 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 002A0 80B94500 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 002A4 80B94504 AFA50038 */ sw $a1, 0x0038($sp) /* 002A8 80B94508 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002AC 80B9450C 8FA50038 */ lw $a1, 0x0038($sp) -/* 002B0 80B94510 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 002B0 80B94510 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 002B4 80B94514 8FA60034 */ lw $a2, 0x0034($sp) /* 002B8 80B94518 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002BC 80B9451C 8FA50038 */ lw $a1, 0x0038($sp) -/* 002C0 80B94520 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 002C0 80B94520 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 002C4 80B94524 8FA60034 */ lw $a2, 0x0034($sp) /* 002C8 80B94528 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002CC 80B9452C 8FA50038 */ lw $a1, 0x0038($sp) -/* 002D0 80B94530 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 002D0 80B94530 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 002D4 80B94534 260601A0 */ addiu $a2, $s0, 0x01A0 ## $a2 = 000001A0 /* 002D8 80B94538 10000004 */ beq $zero, $zero, .L80B9454C diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Destroy.s index 27671e2713..963ec1b22a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Destroy.s @@ -3,7 +3,7 @@ glabel ObjKibako_Destroy /* 00174 80B94E14 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00178 80B94E18 AFBF0014 */ sw $ra, 0x0014($sp) /* 0017C 80B94E1C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00180 80B94E20 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00180 80B94E20 0C0170EB */ jal Collider_DestroyCylinder /* 00184 80B94E24 24E50150 */ addiu $a1, $a3, 0x0150 ## $a1 = 00000150 /* 00188 80B94E28 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D34.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D34.s index c8e1afb65f..0ba0160d54 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D34.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D34.s @@ -6,18 +6,18 @@ glabel func_80B94D34 /* 000A4 80B94D44 AFBF0014 */ sw $ra, 0x0014($sp) /* 000A8 80B94D48 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 000AC 80B94D4C AFA50018 */ sw $a1, 0x0018($sp) -/* 000B0 80B94D50 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 000B0 80B94D50 0C0170D9 */ jal Collider_InitCylinder /* 000B4 80B94D54 AFA60020 */ sw $a2, 0x0020($sp) /* 000B8 80B94D58 3C0780B9 */ lui $a3, %hi(D_80B95850) ## $a3 = 80B90000 /* 000BC 80B94D5C 8FA60020 */ lw $a2, 0x0020($sp) /* 000C0 80B94D60 24E75850 */ addiu $a3, $a3, %lo(D_80B95850) ## $a3 = 80B95850 /* 000C4 80B94D64 8FA40024 */ lw $a0, 0x0024($sp) -/* 000C8 80B94D68 0C01712B */ jal ActorCollider_InitCylinder +/* 000C8 80B94D68 0C01712B */ jal Collider_SetCylinder /* 000CC 80B94D6C 8FA50018 */ lw $a1, 0x0018($sp) /* 000D0 80B94D70 8FA40020 */ lw $a0, 0x0020($sp) -/* 000D4 80B94D74 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 000D4 80B94D74 0C0189B7 */ jal Collider_CylinderUpdate /* 000D8 80B94D78 8FA50018 */ lw $a1, 0x0018($sp) /* 000DC 80B94D7C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s index fccdcefc89..66f39f91f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s @@ -99,7 +99,7 @@ glabel func_80B9534C /* 00808 80B954A8 00000000 */ nop /* 0080C 80B954AC 45020017 */ bc1fl .L80B9550C /* 00810 80B954B0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00814 80B954B4 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00814 80B954B4 0C0189B7 */ jal Collider_CylinderUpdate /* 00818 80B954B8 AFA5002C */ sw $a1, 0x002C($sp) /* 0081C 80B954BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -107,7 +107,7 @@ glabel func_80B9534C /* 00824 80B954C4 02212821 */ addu $a1, $s1, $at /* 00828 80B954C8 AFA50028 */ sw $a1, 0x0028($sp) /* 0082C 80B954CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00830 80B954D0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00830 80B954D0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00834 80B954D4 8FA6002C */ lw $a2, 0x002C($sp) /* 00838 80B954D8 3C014334 */ lui $at, 0x4334 ## $at = 43340000 @@ -119,7 +119,7 @@ glabel func_80B9534C /* 00850 80B954F0 00000000 */ nop /* 00854 80B954F4 45020005 */ bc1fl .L80B9550C /* 00858 80B954F8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0085C 80B954FC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0085C 80B954FC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00860 80B95500 8FA6002C */ lw $a2, 0x002C($sp) /* 00864 80B95504 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9569C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9569C.s index 6e00bbb4ce..e0e26e392c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9569C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9569C.s @@ -66,7 +66,7 @@ glabel func_80B9569C /* 00AE0 80B95780 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00AE4 80B95784 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 00AE8 80B95788 AFA5002C */ sw $a1, 0x002C($sp) -/* 00AEC 80B9578C 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00AEC 80B9578C 0C0189B7 */ jal Collider_CylinderUpdate /* 00AF0 80B95790 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00AF4 80B95794 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -74,12 +74,12 @@ glabel func_80B9569C /* 00AFC 80B9579C 02218021 */ addu $s0, $s1, $at /* 00B00 80B957A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00B04 80B957A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B08 80B957A8 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00B08 80B957A8 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00B0C 80B957AC 8FA6002C */ lw $a2, 0x002C($sp) /* 00B10 80B957B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B14 80B957B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B18 80B957B8 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00B18 80B957B8 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00B1C 80B957BC 8FA6002C */ lw $a2, 0x002C($sp) /* 00B20 80B957C0 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Destroy.s index e99c826581..904767660d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Destroy.s @@ -6,7 +6,7 @@ glabel ObjKibako2_Destroy /* 003F4 80B95DC4 8FA50018 */ lw $a1, 0x0018($sp) /* 003F8 80B95DC8 AFBF0014 */ sw $ra, 0x0014($sp) /* 003FC 80B95DCC AFA7001C */ sw $a3, 0x001C($sp) -/* 00400 80B95DD0 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00400 80B95DD0 0C0170EB */ jal Collider_DestroyCylinder /* 00404 80B95DD4 24A50164 */ addiu $a1, $a1, 0x0164 ## $a1 = 00000164 /* 00408 80B95DD8 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B959D0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B959D0.s index 74adb90d5f..b0ad321e3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B959D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B959D0.s @@ -6,18 +6,18 @@ glabel func_80B959D0 /* 00010 80B959E0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00014 80B959E4 24C50164 */ addiu $a1, $a2, 0x0164 ## $a1 = 00000164 /* 00018 80B959E8 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80B959EC 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0001C 80B959EC 0C0170D9 */ jal Collider_InitCylinder /* 00020 80B959F0 AFA60020 */ sw $a2, 0x0020($sp) /* 00024 80B959F4 3C0780B9 */ lui $a3, %hi(D_80B95FD0) ## $a3 = 80B90000 /* 00028 80B959F8 8FA60020 */ lw $a2, 0x0020($sp) /* 0002C 80B959FC 24E75FD0 */ addiu $a3, $a3, %lo(D_80B95FD0) ## $a3 = 80B95FD0 /* 00030 80B95A00 8FA40024 */ lw $a0, 0x0024($sp) -/* 00034 80B95A04 0C01712B */ jal ActorCollider_InitCylinder +/* 00034 80B95A04 0C01712B */ jal Collider_SetCylinder /* 00038 80B95A08 8FA50018 */ lw $a1, 0x0018($sp) /* 0003C 80B95A0C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00040 80B95A10 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00040 80B95A10 0C0189B7 */ jal Collider_CylinderUpdate /* 00044 80B95A14 8FA50018 */ lw $a1, 0x0018($sp) /* 00048 80B95A18 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95DFC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95DFC.s index c8b8ac2ef5..bab4df0b97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95DFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95DFC.s @@ -49,7 +49,7 @@ glabel func_80B95DFC /* 004DC 80B95EAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 004E0 80B95EB0 45020004 */ bc1fl .L80B95EC4 /* 004E4 80B95EB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 004E8 80B95EB8 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 004E8 80B95EB8 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 004EC 80B95EBC 26060164 */ addiu $a2, $s0, 0x0164 ## $a2 = 00000164 .L80B95EC0: diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Destroy.s index 410ef52425..aa9eb5b6ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Destroy.s @@ -3,7 +3,7 @@ glabel ObjLightswitch_Destroy /* 005E4 80B97184 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 005E8 80B97188 AFBF0014 */ sw $ra, 0x0014($sp) /* 005EC 80B9718C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005F0 80B97190 0C016F32 */ jal func_8005BCC8 +/* 005F0 80B97190 0C016F32 */ jal Collider_DestroyJntSph /* 005F4 80B97194 24E50150 */ addiu $a1, $a3, 0x0150 ## $a1 = 00000150 /* 005F8 80B97198 8FBF0014 */ lw $ra, 0x0014($sp) /* 005FC 80B9719C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Update.s index d8938e003d..1d2abcd566 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Update.s @@ -48,12 +48,12 @@ glabel ObjLightswitch_Update /* 00BF8 80B97798 A20201C2 */ sb $v0, 0x01C2($s0) ## 000001C2 /* 00BFC 80B9779C AFA60020 */ sw $a2, 0x0020($sp) /* 00C00 80B977A0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00C04 80B977A4 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00C04 80B977A4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00C08 80B977A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00C0C 80B977AC 8FA50024 */ lw $a1, 0x0024($sp) /* 00C10 80B977B0 8FA60020 */ lw $a2, 0x0020($sp) -/* 00C14 80B977B4 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00C14 80B977B4 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00C18 80B977B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00C1C 80B977BC 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96BA0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96BA0.s index 2c35ea8726..993e05a834 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96BA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96BA0.s @@ -6,7 +6,7 @@ glabel func_80B96BA0 /* 00010 80B96BB0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00014 80B96BB4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00018 80B96BB8 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 0001C 80B96BBC 0C016EFE */ jal func_8005BBF8 +/* 0001C 80B96BBC 0C016EFE */ jal Collider_InitJntSph /* 00020 80B96BC0 AFA50028 */ sw $a1, 0x0028($sp) /* 00024 80B96BC4 3C0780B9 */ lui $a3, %hi(D_80B97F44) ## $a3 = 80B90000 /* 00028 80B96BC8 260E0170 */ addiu $t6, $s0, 0x0170 ## $t6 = 00000170 @@ -14,7 +14,7 @@ glabel func_80B96BA0 /* 00030 80B96BD0 24E77F44 */ addiu $a3, $a3, %lo(D_80B97F44) ## $a3 = 80B97F44 /* 00034 80B96BD4 8FA40034 */ lw $a0, 0x0034($sp) /* 00038 80B96BD8 8FA50028 */ lw $a1, 0x0028($sp) -/* 0003C 80B96BDC 0C017014 */ jal func_8005C050 +/* 0003C 80B96BDC 0C017014 */ jal Collider_SetJntSph /* 00040 80B96BE0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00044 80B96BE4 C60400BC */ lwc1 $f4, 0x00BC($s0) ## 000000BC /* 00048 80B96BE8 C6060054 */ lwc1 $f6, 0x0054($s0) ## 00000054 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Destroy.s index e6cbac5827..b4928bfff2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Destroy.s @@ -34,12 +34,12 @@ glabel ObjSwitch_Destroy /* 00808 80B9DA18 10000008 */ beq $zero, $zero, .L80B9DA3C /* 0080C 80B9DA1C 8FBF0014 */ lw $ra, 0x0014($sp) .L80B9DA20: -/* 00810 80B9DA20 0C017232 */ jal func_8005C8C8 +/* 00810 80B9DA20 0C017232 */ jal Collider_DestroyTris /* 00814 80B9DA24 24E50180 */ addiu $a1, $a3, 0x0180 ## $a1 = 00000180 /* 00818 80B9DA28 10000004 */ beq $zero, $zero, .L80B9DA3C /* 0081C 80B9DA2C 8FBF0014 */ lw $ra, 0x0014($sp) .L80B9DA30: -/* 00820 80B9DA30 0C016F32 */ jal func_8005BCC8 +/* 00820 80B9DA30 0C016F32 */ jal Collider_DestroyJntSph /* 00824 80B9DA34 24E50180 */ addiu $a1, $a3, 0x0180 ## $a1 = 00000180 /* 00828 80B9DA38 8FBF0014 */ lw $ra, 0x0014($sp) .L80B9DA3C: diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Update.s index fb3ff29e9a..5d718fafcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Update.s @@ -54,7 +54,7 @@ glabel L80B9E690 /* 01494 80B9E6A4 02012821 */ addu $a1, $s0, $at /* 01498 80B9E6A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0149C 80B9E6AC 24E60180 */ addiu $a2, $a3, 0x0180 ## $a2 = 00000180 -/* 014A0 80B9E6B0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 014A0 80B9E6B0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 014A4 80B9E6B4 A0E2017F */ sb $v0, 0x017F($a3) ## 0000017F /* 014A8 80B9E6B8 1000001F */ beq $zero, $zero, .L80B9E738 @@ -81,7 +81,7 @@ glabel L80B9E6C0 /* 014F4 80B9E704 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 014F8 80B9E708 02012821 */ addu $a1, $s0, $at /* 014FC 80B9E70C 24E60180 */ addiu $a2, $a3, 0x0180 ## $a2 = 00000180 -/* 01500 80B9E710 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 01500 80B9E710 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 01504 80B9E714 AFA70020 */ sw $a3, 0x0020($sp) /* 01508 80B9E718 8FA70020 */ lw $a3, 0x0020($sp) @@ -90,7 +90,7 @@ glabel L80B9E6C0 /* 01510 80B9E720 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01514 80B9E724 02012821 */ addu $a1, $s0, $at /* 01518 80B9E728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0151C 80B9E72C 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 0151C 80B9E72C 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 01520 80B9E730 24E60180 */ addiu $a2, $a3, 0x0180 ## $a2 = 00000180 .L80B9E734: diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D31C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D31C.s index 7ef13808d1..f5ab58584f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D31C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D31C.s @@ -7,14 +7,14 @@ glabel func_80B9D31C /* 00120 80B9D330 AFBF0024 */ sw $ra, 0x0024($sp) /* 00124 80B9D334 26050180 */ addiu $a1, $s0, 0x0180 ## $a1 = 00000180 /* 00128 80B9D338 AFA60038 */ sw $a2, 0x0038($sp) -/* 0012C 80B9D33C 0C016EFE */ jal func_8005BBF8 +/* 0012C 80B9D33C 0C016EFE */ jal Collider_InitJntSph /* 00130 80B9D340 AFA50028 */ sw $a1, 0x0028($sp) /* 00134 80B9D344 260E01A0 */ addiu $t6, $s0, 0x01A0 ## $t6 = 000001A0 /* 00138 80B9D348 AFAE0010 */ sw $t6, 0x0010($sp) /* 0013C 80B9D34C 8FA40034 */ lw $a0, 0x0034($sp) /* 00140 80B9D350 8FA50028 */ lw $a1, 0x0028($sp) /* 00144 80B9D354 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00148 80B9D358 0C017014 */ jal func_8005C050 +/* 00148 80B9D358 0C017014 */ jal Collider_SetJntSph /* 0014C 80B9D35C 8FA70038 */ lw $a3, 0x0038($sp) /* 00150 80B9D360 C60400BC */ lwc1 $f4, 0x00BC($s0) ## 000000BC /* 00154 80B9D364 C6060054 */ lwc1 $f6, 0x0054($s0) ## 00000054 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D3B8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D3B8.s index 43d0131b1c..8260ab5632 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D3B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9D3B8.s @@ -15,14 +15,14 @@ glabel func_80B9D3B8 /* 001DC 80B9D3EC AFB3002C */ sw $s3, 0x002C($sp) /* 001E0 80B9D3F0 AFB20028 */ sw $s2, 0x0028($sp) /* 001E4 80B9D3F4 AFB10024 */ sw $s1, 0x0024($sp) -/* 001E8 80B9D3F8 0C0171F8 */ jal func_8005C7E0 +/* 001E8 80B9D3F8 0C0171F8 */ jal Collider_InitTris /* 001EC 80B9D3FC AFA50054 */ sw $a1, 0x0054($sp) /* 001F0 80B9D400 26AE01A0 */ addiu $t6, $s5, 0x01A0 ## $t6 = 000001A0 /* 001F4 80B9D404 AFAE0010 */ sw $t6, 0x0010($sp) /* 001F8 80B9D408 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001FC 80B9D40C 8FA50054 */ lw $a1, 0x0054($sp) /* 00200 80B9D410 02A03025 */ or $a2, $s5, $zero ## $a2 = 00000000 -/* 00204 80B9D414 0C0172EB */ jal func_8005CBAC +/* 00204 80B9D414 0C0172EB */ jal Collider_SetTris /* 00208 80B9D418 02C03825 */ or $a3, $s6, $zero ## $a3 = 00000000 /* 0020C 80B9D41C 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 /* 00210 80B9D420 26B30024 */ addiu $s3, $s5, 0x0024 ## $s3 = 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DA64.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DA64.s index c2a5966962..d9c9e6cedf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DA64.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DA64.s @@ -27,7 +27,7 @@ glabel func_80B9DA64 /* 008B8 80B9DAC8 8FA40024 */ lw $a0, 0x0024($sp) .L80B9DACC: /* 008BC 80B9DACC 26060180 */ addiu $a2, $s0, 0x0180 ## $a2 = 00000180 -/* 008C0 80B9DAD0 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 008C0 80B9DAD0 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 008C4 80B9DAD4 00812821 */ addu $a1, $a0, $at /* 008C8 80B9DAD8 1000003B */ beq $zero, $zero, .L80B9DBC8 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Destroy.s index 84bae763f1..b07e64f18e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Destroy.s @@ -5,12 +5,12 @@ glabel ObjSyokudai_Destroy /* 001CC 80B9F47C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 001D0 80B9F480 8FA50018 */ lw $a1, 0x0018($sp) /* 001D4 80B9F484 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001D8 80B9F488 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001D8 80B9F488 0C0170EB */ jal Collider_DestroyCylinder /* 001DC 80B9F48C 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C /* 001E0 80B9F490 8FA50018 */ lw $a1, 0x0018($sp) /* 001E4 80B9F494 8FA4001C */ lw $a0, 0x001C($sp) -/* 001E8 80B9F498 0C0170EB */ jal ActorCollider_FreeCylinder +/* 001E8 80B9F498 0C0170EB */ jal Collider_DestroyCylinder /* 001EC 80B9F49C 24A50198 */ addiu $a1, $a1, 0x0198 ## $a1 = 00000198 /* 001F0 80B9F4A0 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Init.s index 7cd5b06bb9..4d7bec3dc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Init.s @@ -22,14 +22,14 @@ glabel ObjSyokudai_Init /* 00048 80B9F2F8 00000000 */ nop /* 0004C 80B9F2FC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00050 80B9F300 AFA50030 */ sw $a1, 0x0030($sp) -/* 00054 80B9F304 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00054 80B9F304 0C0170D9 */ jal Collider_InitCylinder /* 00058 80B9F308 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0005C 80B9F30C 3C0780BA */ lui $a3, %hi(D_80B9FE10) ## $a3 = 80BA0000 /* 00060 80B9F310 8FA50030 */ lw $a1, 0x0030($sp) /* 00064 80B9F314 24E7FE10 */ addiu $a3, $a3, %lo(D_80B9FE10) ## $a3 = 80B9FE10 /* 00068 80B9F318 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0006C 80B9F31C 0C01712B */ jal ActorCollider_InitCylinder +/* 0006C 80B9F31C 0C01712B */ jal Collider_SetCylinder /* 00070 80B9F320 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00074 80B9F324 8618001C */ lh $t8, 0x001C($s0) ## 0000001C @@ -40,14 +40,14 @@ glabel ObjSyokudai_Init /* 00088 80B9F338 9108FE78 */ lbu $t0, %lo(D_80B9FE78)($t0) /* 0008C 80B9F33C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00090 80B9F340 A2080160 */ sb $t0, 0x0160($s0) ## 00000160 -/* 00094 80B9F344 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00094 80B9F344 0C0170D9 */ jal Collider_InitCylinder /* 00098 80B9F348 AFA50030 */ sw $a1, 0x0030($sp) /* 0009C 80B9F34C 3C0780BA */ lui $a3, %hi(D_80B9FE3C) ## $a3 = 80BA0000 /* 000A0 80B9F350 8FA50030 */ lw $a1, 0x0030($sp) /* 000A4 80B9F354 24E7FE3C */ addiu $a3, $a3, %lo(D_80B9FE3C) ## $a3 = 80B9FE3C /* 000A8 80B9F358 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000AC 80B9F35C 0C01712B */ jal ActorCollider_InitCylinder +/* 000AC 80B9F35C 0C01712B */ jal Collider_SetCylinder /* 000B0 80B9F360 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B4 80B9F364 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s index e1d5015646..964f3a45a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s @@ -306,7 +306,7 @@ glabel ObjSyokudai_Update /* 00660 80B9F910 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C .L80B9F914: /* 00664 80B9F914 AFA5002C */ sw $a1, 0x002C($sp) -/* 00668 80B9F918 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00668 80B9F918 0C0189B7 */ jal Collider_CylinderUpdate /* 0066C 80B9F91C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00670 80B9F920 8FA40084 */ lw $a0, 0x0084($sp) @@ -314,23 +314,23 @@ glabel ObjSyokudai_Update /* 00678 80B9F928 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 0067C 80B9F92C 00812821 */ addu $a1, $a0, $at /* 00680 80B9F930 AFA50030 */ sw $a1, 0x0030($sp) -/* 00684 80B9F934 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00684 80B9F934 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00688 80B9F938 8FA6002C */ lw $a2, 0x002C($sp) /* 0068C 80B9F93C 8FA40084 */ lw $a0, 0x0084($sp) /* 00690 80B9F940 8FA50030 */ lw $a1, 0x0030($sp) -/* 00694 80B9F944 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 00694 80B9F944 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 00698 80B9F948 8FA6002C */ lw $a2, 0x002C($sp) /* 0069C 80B9F94C 26060198 */ addiu $a2, $s0, 0x0198 ## $a2 = 00000198 /* 006A0 80B9F950 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000198 /* 006A4 80B9F954 AFA6002C */ sw $a2, 0x002C($sp) -/* 006A8 80B9F958 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 006A8 80B9F958 0C0189B7 */ jal Collider_CylinderUpdate /* 006AC 80B9F95C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006B0 80B9F960 8FA40084 */ lw $a0, 0x0084($sp) /* 006B4 80B9F964 8FA6002C */ lw $a2, 0x002C($sp) -/* 006B8 80B9F968 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 006B8 80B9F968 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 006BC 80B9F96C 8FA50030 */ lw $a1, 0x0030($sp) /* 006C0 80B9F970 860301E4 */ lh $v1, 0x01E4($s0) ## 000001E4 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Destroy.s index dd29778fcc..cea50c32cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/ObjTsubo_Destroy.s @@ -3,7 +3,7 @@ glabel ObjTsubo_Destroy /* 00288 80BA0FE8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0028C 80BA0FEC AFBF0014 */ sw $ra, 0x0014($sp) /* 00290 80BA0FF0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00294 80BA0FF4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 00294 80BA0FF4 0C0170EB */ jal Collider_DestroyCylinder /* 00298 80BA0FF8 24E50150 */ addiu $a1, $a3, 0x0150 ## $a1 = 00000150 /* 0029C 80BA0FFC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0E98.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0E98.s index 5052d68f68..11abceac74 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0E98.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA0E98.s @@ -6,18 +6,18 @@ glabel func_80BA0E98 /* 00148 80BA0EA8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0014C 80BA0EAC 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 /* 00150 80BA0EB0 AFA50018 */ sw $a1, 0x0018($sp) -/* 00154 80BA0EB4 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 00154 80BA0EB4 0C0170D9 */ jal Collider_InitCylinder /* 00158 80BA0EB8 AFA60020 */ sw $a2, 0x0020($sp) /* 0015C 80BA0EBC 3C0780BA */ lui $a3, %hi(D_80BA1B94) ## $a3 = 80BA0000 /* 00160 80BA0EC0 8FA60020 */ lw $a2, 0x0020($sp) /* 00164 80BA0EC4 24E71B94 */ addiu $a3, $a3, %lo(D_80BA1B94) ## $a3 = 80BA1B94 /* 00168 80BA0EC8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0016C 80BA0ECC 0C01712B */ jal ActorCollider_InitCylinder +/* 0016C 80BA0ECC 0C01712B */ jal Collider_SetCylinder /* 00170 80BA0ED0 8FA50018 */ lw $a1, 0x0018($sp) /* 00174 80BA0ED4 8FA40020 */ lw $a0, 0x0020($sp) -/* 00178 80BA0ED8 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00178 80BA0ED8 0C0189B7 */ jal Collider_CylinderUpdate /* 0017C 80BA0EDC 8FA50018 */ lw $a1, 0x0018($sp) /* 00180 80BA0EE0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15BC.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15BC.s index ce441a642c..925e423eb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA15BC.s @@ -80,7 +80,7 @@ glabel func_80BA15BC /* 00978 80BA16D8 00000000 */ nop /* 0097C 80BA16DC 4502001A */ bc1fl .L80BA1748 /* 00980 80BA16E0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00984 80BA16E4 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00984 80BA16E4 0C0189B7 */ jal Collider_CylinderUpdate /* 00988 80BA16E8 AFA5002C */ sw $a1, 0x002C($sp) /* 0098C 80BA16EC 920B0161 */ lbu $t3, 0x0161($s0) ## 00000161 @@ -91,7 +91,7 @@ glabel func_80BA15BC /* 009A0 80BA1700 02212821 */ addu $a1, $s1, $at /* 009A4 80BA1704 AFA50028 */ sw $a1, 0x0028($sp) /* 009A8 80BA1708 8FA6002C */ lw $a2, 0x002C($sp) -/* 009AC 80BA170C 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 009AC 80BA170C 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 009B0 80BA1710 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 009B4 80BA1714 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -103,7 +103,7 @@ glabel func_80BA15BC /* 009CC 80BA172C 00000000 */ nop /* 009D0 80BA1730 45020005 */ bc1fl .L80BA1748 /* 009D4 80BA1734 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 009D8 80BA1738 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 009D8 80BA1738 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 009DC 80BA173C 8FA6002C */ lw $a2, 0x002C($sp) /* 009E0 80BA1740 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1958.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1958.s index 62e729b00b..40a21726ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1958.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1958.s @@ -90,7 +90,7 @@ glabel func_80BA1958 /* 00D34 80BA1A94 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00D38 80BA1A98 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 00D3C 80BA1A9C AFA5002C */ sw $a1, 0x002C($sp) -/* 00D40 80BA1AA0 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 00D40 80BA1AA0 0C0189B7 */ jal Collider_CylinderUpdate /* 00D44 80BA1AA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00D48 80BA1AA8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -98,12 +98,12 @@ glabel func_80BA1958 /* 00D50 80BA1AB0 02218021 */ addu $s0, $s1, $at /* 00D54 80BA1AB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00D58 80BA1AB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00D5C 80BA1ABC 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 00D5C 80BA1ABC 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 00D60 80BA1AC0 8FA6002C */ lw $a2, 0x002C($sp) /* 00D64 80BA1AC4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00D68 80BA1AC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00D6C 80BA1ACC 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 00D6C 80BA1ACC 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 00D70 80BA1AD0 8FA6002C */ lw $a2, 0x002C($sp) /* 00D74 80BA1AD4 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Destroy.s index 10f8612367..9a9e80c6e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Destroy.s @@ -9,7 +9,7 @@ glabel ShotSun_Destroy /* 000E8 80BADDA8 24010041 */ addiu $at, $zero, 0x0041 ## $at = 00000041 /* 000EC 80BADDAC 10410003 */ beq $v0, $at, .L80BADDBC /* 000F0 80BADDB0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000F4 80BADDB4 0C0170EB */ jal ActorCollider_FreeCylinder +/* 000F4 80BADDB4 0C0170EB */ jal Collider_DestroyCylinder /* 000F8 80BADDB8 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C .L80BADDBC: diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Init.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Init.s index d2372909d6..9071ba34e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/ShotSun_Init.s @@ -39,14 +39,14 @@ glabel ShotSun_Init /* 00074 80BADD34 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 .L80BADD38: /* 00078 80BADD38 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0007C 80BADD3C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 0007C 80BADD3C 0C0170D9 */ jal Collider_InitCylinder /* 00080 80BADD40 AFA50024 */ sw $a1, 0x0024($sp) /* 00084 80BADD44 3C0780BB */ lui $a3, %hi(D_80BAE2F0) ## $a3 = 80BB0000 /* 00088 80BADD48 8FA50024 */ lw $a1, 0x0024($sp) /* 0008C 80BADD4C 24E7E2F0 */ addiu $a3, $a3, %lo(D_80BAE2F0) ## $a3 = 80BAE2F0 /* 00090 80BADD50 8FA40034 */ lw $a0, 0x0034($sp) -/* 00094 80BADD54 0C01712B */ jal ActorCollider_InitCylinder +/* 00094 80BADD54 0C01712B */ jal Collider_SetCylinder /* 00098 80BADD58 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0009C 80BADD5C 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s index a564f73882..f4dfe7d081 100644 --- a/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s +++ b/asm/non_matchings/overlays/actors/ovl_Shot_Sun/func_80BAE05C.s @@ -158,7 +158,7 @@ glabel func_80BAE05C /* 005B8 80BAE278 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 005BC 80BAE27C 8FA6003C */ lw $a2, 0x003C($sp) /* 005C0 80BAE280 02012821 */ addu $a1, $s0, $at -/* 005C4 80BAE284 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 005C4 80BAE284 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 005C8 80BAE288 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80BAE28C: diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s index 7ba02fcf29..45774ea7f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s @@ -98,45 +98,45 @@ glabel func_80846AAC /* 14A10 80846C20 A608046C */ sh $t0, 0x046C($s0) ## 0000046C /* 14A14 80846C24 26050498 */ addiu $a1, $s0, 0x0498 ## $a1 = 00000498 /* 14A18 80846C28 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A1C 80846C2C 0C0170D9 */ jal ActorCollider_AllocCylinder +/* 14A1C 80846C2C 0C0170D9 */ jal Collider_InitCylinder /* 14A20 80846C30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A24 80846C34 3C078085 */ lui $a3, %hi(D_80854624) ## $a3 = 80850000 /* 14A28 80846C38 8FA50030 */ lw $a1, 0x0030($sp) /* 14A2C 80846C3C 24E74624 */ addiu $a3, $a3, %lo(D_80854624) ## $a3 = 80854624 /* 14A30 80846C40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A34 80846C44 0C01712B */ jal ActorCollider_InitCylinder +/* 14A34 80846C44 0C01712B */ jal Collider_SetCylinder /* 14A38 80846C48 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 14A3C 80846C4C 260504E4 */ addiu $a1, $s0, 0x04E4 ## $a1 = 000004E4 /* 14A40 80846C50 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A44 80846C54 0C017406 */ jal func_8005D018 +/* 14A44 80846C54 0C017406 */ jal Collider_InitQuad /* 14A48 80846C58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A4C 80846C5C 3C078085 */ lui $a3, %hi(D_80854650) ## $a3 = 80850000 /* 14A50 80846C60 8FA50030 */ lw $a1, 0x0030($sp) /* 14A54 80846C64 24E74650 */ addiu $a3, $a3, %lo(D_80854650) ## $a3 = 80854650 /* 14A58 80846C68 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A5C 80846C6C 0C017441 */ jal func_8005D104 +/* 14A5C 80846C6C 0C017441 */ jal Collider_SetQuad /* 14A60 80846C70 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 14A64 80846C74 26050564 */ addiu $a1, $s0, 0x0564 ## $a1 = 00000564 /* 14A68 80846C78 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A6C 80846C7C 0C017406 */ jal func_8005D018 +/* 14A6C 80846C7C 0C017406 */ jal Collider_InitQuad /* 14A70 80846C80 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A74 80846C84 3C078085 */ lui $a3, %hi(D_80854650) ## $a3 = 80850000 /* 14A78 80846C88 8FA50030 */ lw $a1, 0x0030($sp) /* 14A7C 80846C8C 24E74650 */ addiu $a3, $a3, %lo(D_80854650) ## $a3 = 80854650 /* 14A80 80846C90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A84 80846C94 0C017441 */ jal func_8005D104 +/* 14A84 80846C94 0C017441 */ jal Collider_SetQuad /* 14A88 80846C98 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 14A8C 80846C9C 260505E4 */ addiu $a1, $s0, 0x05E4 ## $a1 = 000005E4 /* 14A90 80846CA0 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A94 80846CA4 0C017406 */ jal func_8005D018 +/* 14A94 80846CA4 0C017406 */ jal Collider_InitQuad /* 14A98 80846CA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A9C 80846CAC 3C078085 */ lui $a3, %hi(D_808546A0) ## $a3 = 80850000 /* 14AA0 80846CB0 8FA50030 */ lw $a1, 0x0030($sp) /* 14AA4 80846CB4 24E746A0 */ addiu $a3, $a3, %lo(D_808546A0) ## $a3 = 808546A0 /* 14AA8 80846CB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14AAC 80846CBC 0C017441 */ jal func_8005D104 +/* 14AAC 80846CBC 0C017441 */ jal Collider_SetQuad /* 14AB0 80846CC0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 14AB4 80846CC4 8FBF002C */ lw $ra, 0x002C($sp) /* 14AB8 80846CC8 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s index 83a180f972..2c5a5affbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s @@ -993,7 +993,7 @@ glabel func_80848F9C /* 17B4C 80849D5C 00000000 */ nop /* 17B50 80849D60 A60904DA */ sh $t1, 0x04DA($s0) ## 000004DA .L80849D64: -/* 17B54 80849D64 0C0189B7 */ jal ActorCollider_Cylinder_Update +/* 17B54 80849D64 0C0189B7 */ jal Collider_CylinderUpdate /* 17B58 80849D68 AFA5002C */ sw $a1, 0x002C($sp) /* 17B5C 80849D6C 8E0B0680 */ lw $t3, 0x0680($s0) ## 00000680 @@ -1009,7 +1009,7 @@ glabel func_80848F9C /* 17B84 80849D94 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 17B88 80849D98 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 17B8C 80849D9C 00812821 */ addu $a1, $a0, $at -/* 17B90 80849DA0 0C017713 */ jal Actor_CollisionCheck_SetOT +/* 17B90 80849DA0 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT /* 17B94 80849DA4 8FA6002C */ lw $a2, 0x002C($sp) /* 17B98 80849DA8 8E03067C */ lw $v1, 0x067C($s0) ## 0000067C @@ -1026,7 +1026,7 @@ glabel func_80848F9C /* 17BC0 80849DD0 8FA40084 */ lw $a0, 0x0084($sp) /* 17BC4 80849DD4 00812821 */ addu $a1, $a0, $at /* 17BC8 80849DD8 AFA50030 */ sw $a1, 0x0030($sp) -/* 17BCC 80849DDC 0C01767D */ jal Actor_CollisionCheck_SetAC +/* 17BCC 80849DDC 0C01767D */ jal CollisionCheck_SetAC ## CollisionCheck_setAC /* 17BD0 80849DE0 8FA6002C */ lw $a2, 0x002C($sp) /* 17BD4 80849DE4 820A0A78 */ lb $t2, 0x0A78($s0) ## 00000A78 @@ -1034,7 +1034,7 @@ glabel func_80848F9C /* 17BDC 80849DEC 8FA40084 */ lw $a0, 0x0084($sp) /* 17BE0 80849DF0 05410003 */ bgez $t2, .L80849E00 /* 17BE4 80849DF4 00000000 */ nop -/* 17BE8 80849DF8 0C0175E7 */ jal Actor_CollisionCheck_SetAT +/* 17BE8 80849DF8 0C0175E7 */ jal CollisionCheck_SetAT ## CollisionCheck_setAT /* 17BEC 80849DFC 8FA6002C */ lw $a2, 0x002C($sp) .L80849E00: @@ -1065,20 +1065,20 @@ glabel func_80848F9C /* 17C3C 80849E4C 31AEFFFB */ andi $t6, $t5, 0xFFFB ## $t6 = 00000000 /* 17C40 80849E50 A20E0692 */ sb $t6, 0x0692($s0) ## 00000692 /* 17C44 80849E54 8FA5002C */ lw $a1, 0x002C($sp) -/* 17C48 80849E58 0C017150 */ jal func_8005C540 +/* 17C48 80849E58 0C017150 */ jal Collider_CylinderSetAC /* 17C4C 80849E5C 8FA40084 */ lw $a0, 0x0084($sp) /* 17C50 80849E60 8FA40084 */ lw $a0, 0x0084($sp) -/* 17C54 80849E64 0C017458 */ jal func_8005D160 +/* 17C54 80849E64 0C017458 */ jal Collider_QuadSetAT /* 17C58 80849E68 260504E4 */ addiu $a1, $s0, 0x04E4 ## $a1 = 000004E4 /* 17C5C 80849E6C 8FA40084 */ lw $a0, 0x0084($sp) -/* 17C60 80849E70 0C017458 */ jal func_8005D160 +/* 17C60 80849E70 0C017458 */ jal Collider_QuadSetAT /* 17C64 80849E74 26050564 */ addiu $a1, $s0, 0x0564 ## $a1 = 00000564 /* 17C68 80849E78 260505E4 */ addiu $a1, $s0, 0x05E4 ## $a1 = 000005E4 /* 17C6C 80849E7C AFA50034 */ sw $a1, 0x0034($sp) -/* 17C70 80849E80 0C01746A */ jal func_8005D1A8 +/* 17C70 80849E80 0C01746A */ jal Collider_QuadSetAC /* 17C74 80849E84 8FA40084 */ lw $a0, 0x0084($sp) /* 17C78 80849E88 8FA50034 */ lw $a1, 0x0034($sp) -/* 17C7C 80849E8C 0C017458 */ jal func_8005D160 +/* 17C7C 80849E8C 0C017458 */ jal Collider_QuadSetAT /* 17C80 80849E90 8FA40084 */ lw $a0, 0x0084($sp) /* 17C84 80849E94 8FBF0024 */ lw $ra, 0x0024($sp) /* 17C88 80849E98 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s index 517993e792..faf7a8be4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s @@ -9,17 +9,17 @@ glabel func_8084AB54 /* 18960 8084AB70 0C009C27 */ jal func_8002709C /* 18964 8084AB74 8E050670 */ lw $a1, 0x0670($s0) ## 00000670 /* 18968 8084AB78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1896C 8084AB7C 0C0170EB */ jal ActorCollider_FreeCylinder +/* 1896C 8084AB7C 0C0170EB */ jal Collider_DestroyCylinder /* 18970 8084AB80 26050498 */ addiu $a1, $s0, 0x0498 ## $a1 = 00000498 /* 18974 8084AB84 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 18978 8084AB88 0C017418 */ jal func_8005D060 +/* 18978 8084AB88 0C017418 */ jal Collider_DestroyQuad /* 1897C 8084AB8C 260504E4 */ addiu $a1, $s0, 0x04E4 ## $a1 = 000004E4 /* 18980 8084AB90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 18984 8084AB94 0C017418 */ jal func_8005D060 +/* 18984 8084AB94 0C017418 */ jal Collider_DestroyQuad /* 18988 8084AB98 26050564 */ addiu $a1, $s0, 0x0564 ## $a1 = 00000564 /* 1898C 8084AB9C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 18990 8084ABA0 0C017418 */ jal func_8005D060 +/* 18990 8084ABA0 0C017418 */ jal Collider_DestroyQuad /* 18994 8084ABA4 260505E4 */ addiu $a1, $s0, 0x05E4 ## $a1 = 000005E4 /* 18998 8084ABA8 0C021DB2 */ jal func_800876C8 /* 1899C 8084ABAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 diff --git a/data/z_collision_btltbls.data.s b/data/z_collision_btltbls.data.s deleted file mode 100644 index c931e7a850..0000000000 --- a/data/z_collision_btltbls.data.s +++ /dev/null @@ -1,11 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_8011DB20 - .incbin "baserom.z64", 0xB94CC0, 0x2E0 diff --git a/data/z_collision_check.data.s b/data/z_collision_check.data.s deleted file mode 100644 index 25251580a0..0000000000 --- a/data/z_collision_check.data.s +++ /dev/null @@ -1,113 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_8011DE00 - .incbin "baserom.z64", 0xB94FA0, 0x18 - -glabel D_8011DE18 - .incbin "baserom.z64", 0xB94FB8, 0x8 - -glabel D_8011DE20 - .incbin "baserom.z64", 0xB94FC0, 0xC - -glabel D_8011DE2C - .incbin "baserom.z64", 0xB94FCC, 0x28 - -glabel D_8011DE54 - .incbin "baserom.z64", 0xB94FF4, 0x18 - -glabel D_8011DE6C - .incbin "baserom.z64", 0xB9500C, 0xC - -glabel D_8011DE78 - .incbin "baserom.z64", 0xB95018, 0x34 - -glabel D_8011DEAC - .incbin "baserom.z64", 0xB9504C, 0x40 - -glabel D_8011DEEC - .incbin "baserom.z64", 0xB9508C, 0xC - -glabel D_8011DEF8 - .incbin "baserom.z64", 0xB95098, 0x10 - -glabel D_8011DF08 - .incbin "baserom.z64", 0xB950A8, 0x10 - -glabel D_8011DF18 - .incbin "baserom.z64", 0xB950B8, 0x10 - -glabel D_8011DF28 - .incbin "baserom.z64", 0xB950C8, 0x18 - -glabel D_8011DF40 - .incbin "baserom.z64", 0xB950E0, 0x1 - -glabel D_8011DF41 - .incbin "baserom.z64", 0xB950E1, 0x1B - -glabel D_8011DF5C - .incbin "baserom.z64", 0xB950FC, 0x10 - -glabel D_8011DF6C - .incbin "baserom.z64", 0xB9510C, 0x40 - -glabel D_8011DFAC - .incbin "baserom.z64", 0xB9514C, 0x40 - -glabel D_8011DFEC - .incbin "baserom.z64", 0xB9518C, 0x1C - -glabel D_8011E008 - .incbin "baserom.z64", 0xB951A8, 0x10 - -glabel D_8011E018 - .incbin "baserom.z64", 0xB951B8, 0x10 - -glabel D_8011E028 - .incbin "baserom.z64", 0xB951C8, 0x2 - -glabel D_8011E02A - .incbin "baserom.z64", 0xB951CA, 0x2 - -glabel D_8011E02C - .incbin "baserom.z64", 0xB951CC, 0x2 - -glabel D_8011E02E - .incbin "baserom.z64", 0xB951CE, 0x28 - -glabel D_8011E056 - .incbin "baserom.z64", 0xB951F6, 0x2 - -glabel D_8011E058 - .incbin "baserom.z64", 0xB951F8, 0x2 - -glabel D_8011E05A - .incbin "baserom.z64", 0xB951FA, 0xE - -glabel D_8011E068 - .incbin "baserom.z64", 0xB95208, 0x2 - -glabel D_8011E06A - .incbin "baserom.z64", 0xB9520A, 0x2 - -glabel D_8011E06C - .incbin "baserom.z64", 0xB9520C, 0x2 - -glabel D_8011E06E - .incbin "baserom.z64", 0xB9520E, 0x28 - -glabel D_8011E096 - .incbin "baserom.z64", 0xB95236, 0x2 - -glabel D_8011E098 - .incbin "baserom.z64", 0xB95238, 0x2 - -glabel D_8011E09A - .incbin "baserom.z64", 0xB9523A, 0x16 diff --git a/include/functions.h b/include/functions.h index f6e395c7ca..0b155d35cf 100644 --- a/include/functions.h +++ b/include/functions.h @@ -197,7 +197,7 @@ GlobalContext* func_80026B00(void); // ? func_80026B0C(?); // ? func_80026C1C(?); // ? func_80026C2C(?); -// ? Effect_Add(?); +void Effect_Add(GlobalContext* globalCtx, s32* idp, s32 type, u8 arg3, u8 arg4, void* initParams); // ? func_80026E74(?); // ? func_80026F70(?); // ? func_8002709C(?); @@ -237,9 +237,9 @@ void Effect_SpawnFragment(GlobalContext* globalCtx, Vec3f* burstDepthY, Vec3f* b // ? func_80029568(?); // ? func_80029724(?); // ? func_8002993C(?); -// ? func_800299AC(?); +void func_800299AC(GlobalContext* globalCtx, Vec3f* v); // ? func_80029C50(?); -// ? func_80029CA4(?); +void func_80029CA4(GlobalContext* globalCtx, s32 a, Vec3f* pos); // ? func_80029F44(?); // ? func_8002A32C(?); // ? func_8002A3C4(?); @@ -412,10 +412,10 @@ Actor* Actor_FindNearby(GlobalContext* globalCtx, Actor* refActor, s16 actorId, s32 func_800354B4(GlobalContext* globalCtx, Actor* actor, f32 range, s16 arg3, s16 arg4, s16 arg5); void func_8003555C(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3); void func_800355B8(GlobalContext* globalCtx, Vec3f* arg1); -u8 func_800355E4(GlobalContext* globalCtx, ColliderCylinderInit* colCylinderInit); +u8 func_800355E4(GlobalContext* globalCtx, Collider* collider); u8 Actor_ApplyDamage(Actor* actor); void func_80035650(Actor* actor, ColliderBody* colBody, s32 freezeFlag); -void func_8003573C(Actor* actor, ColliderBody* colBody, s32 freezeFlag); +void func_8003573C(Actor* actor, ColliderJntSph* colBody, s32 freezeFlag); void func_80035844(Vec3f* arg0, Vec3f* arg1, s16* arg2, s32 arg3); void func_800359B8(Actor* actor, s16 arg1, Vec3s* arg2); s32 Flags_GetEventChkInf(s32 flag); @@ -564,10 +564,10 @@ s32 func_8004213C(GlobalContext*, CollisionContext*, f32, f32, f32*, UNK_PTR); s32 func_800427B4(CollisionPoly*, CollisionPoly*, s32, s32, Vec3f*); // ? func_80042868(?); // ? func_80042B2C(?); -// ? func_80042C3C(?); +void func_80042C3C(GlobalContext*, CollisionContext*); // ? func_80042CB8(?); // ? func_80042EF8(?); -// ? func_80042FC4(?); +void func_80042FC4(GlobalContext*, CollisionContext*); // ? func_800430A0(?); // ? func_800432A0(?); // ? func_80043334(?); @@ -660,90 +660,110 @@ s32 func_8005AA90(Camera*, s32, Vec3f*); // ? func_8005AFB4(?); // ? func_8005B044(?); // ? func_8005B1A4(?); -s32 CollisionBtlTbl_Get(s32 index); +DamageTable* DamageTable_Get(s32 index); // ? func_8005B280(?); // ? func_8005B2AC(?); -// ? func_8005B65C(?); -s32 func_8005B6A0(GlobalContext* globalCtx, Collider* collision); -// ? func_8005B6B0(?); -s32 func_8005B6EC(GlobalContext* globalCtx, Collider* collision, Actor* actor, ColliderBodyInfo* src); -s32 func_8005B72C(GlobalContext* globalCtx, Collider* collision, Actor* actor, ColliderBodyInfo* src); -void func_8005B76C(GlobalContext* globalCtx, Collider* collision); -void func_8005B784(GlobalContext* globalCtx, Collider* collision); -void func_8005B79C(GlobalContext* globalCtx, Collider* collision); -// ? func_8005B7C0(?); -s32 func_8005B7E4(GlobalContext* globalCtx, ColliderTouch* touch); -// ? func_8005B7F4(?); -void func_8005B818(GlobalContext* globalCtx, ColliderBody* body); -// ? func_8005B824(?); -s32 func_8005B850(GlobalContext* globalCtx, ColliderBump* bump); -// ? func_8005B860(?); -// ? func_8005B884(?); -s32 func_8005B904(GlobalContext* globalCtx, ColliderBody* body); -s32 func_8005B93C(GlobalContext* globalCtx, ColliderBody* colliderBody, ColliderBodyInfoInner* bodyFlags); -void func_8005B9B0(GlobalContext* globalCtx, ColliderBody* body); -void func_8005B9E8(GlobalContext* globalCtx, ColliderBody* body); -// ? func_8005BA1C(?); -// ? func_8005BA30(?); -s32 func_8005BA74(UNK_TYPE, UNK_TYPE); -// ? func_8005BA84(?); -// ? func_8005BAD8(?); -// ? func_8005BB10(?); -// ? func_8005BB48(?); -// ? func_8005BB8C(?); -// ? func_8005BBB0(?); -// ? func_8005BBD4(?); -void func_8005C050(GlobalContext* globalCtx, Collider* collision, Actor* actor, UNK_TYPE arg3, UNK_TYPE arg4); -// ? func_8005C2BC(?); -s32 func_8005C318(GlobalContext* globalCtx, ColliderDimensions* dim); -s32 func_8005C328(GlobalContext* globalCtx, ColliderDimensions* dest, ColliderDimensions* src); -s32 ActorCollider_AllocCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision); -s32 ActorCollider_FreeCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision); -s32 func_8005C3F4(GlobalContext* globalCtx, ColliderCylinderMain* collision, ColliderCylinderInit* arg2); -s32 ActorCollider_InitCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, - ColliderCylinderInit* src); -s32 func_8005C508(GlobalContext* globalCtx, ColliderCylinderMain* collision); -s32 func_8005C540(GlobalContext* globalCtx, ColliderCylinderMain* collision); -s32 func_8005C578(GlobalContext* globalCtx, ColliderCylinderMain* collision); -// ? func_8005C5B0(?); -s32 func_8005C5F8(UNK_TYPE, UNK_TYPE); -// ? func_8005C608(?); -// ? func_8005C6C0(?); -// ? func_8005C6F8(?); -// ? func_8005C730(?); -// ? func_8005C774(?); -// ? func_8005C798(?); -// ? func_8005C7BC(?); -// ? func_8005CE6C(?); -s32 func_8005CEB4(GlobalContext* globalCtx, ColliderDimensions* dim); -// ? func_8005CEC4(?); -// ? func_8005CEDC(?); -// ? func_8005CF90(?); -s32 func_8005D018(GlobalContext* globalCtx, ColliderCylinderMain* collision); -s32 func_8005D060(GlobalContext* globalCtx, ColliderCylinderMain* collision); -s32 func_8005D0A8(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, ColliderCylinderInit* src); -s32 func_8005D104(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, ColliderCylinderInit* src); -s32 func_8005D160(GlobalContext* globalCtx, ColliderCylinderMain* collision); -s32 func_8005D1A8(GlobalContext* globalCtx, ColliderCylinderMain* collision); -s32 func_8005D1E0(GlobalContext* globalCtx, ColliderCylinderMain* collision); -// ? func_8005D218(?); +s32 Collider_InitBase(GlobalContext* globalCtx, Collider* collider); +s32 Collider_DestroyBase(GlobalContext* globalCtx, Collider* collider); +s32 Collider_SetBase_Actor(GlobalContext* globalCtx, Collider* collider, ColliderInit_Actor* src); +s32 Collider_SetBase_Set3(GlobalContext* globalCtx, Collider* collider, Actor* actor, ColliderInit_Set3* src); +s32 Collider_SetBase(GlobalContext* globalCtx, Collider* collider, Actor* actor, ColliderInit* src); +void Collider_BaseSetAT(GlobalContext* globalCtx, Collider* collider); +void Collider_BaseSetAC(GlobalContext* globalCtx, Collider* collider); +void Collider_BaseSetOC(GlobalContext* globalCtx, Collider* collider); +s32 Collider_InitTouch(GlobalContext* globalCtx, ColliderTouch* touch); +s32 Collider_DestroyTouch(GlobalContext* globalCtx, ColliderTouch* touch); +s32 Collider_SetTouch(GlobalContext* globalCtx, ColliderTouch* dest, ColliderTouch* src); +void Collider_BodySetAT_Unk(GlobalContext* globalCtx, ColliderBody* body); +s32 Collider_InitBump(GlobalContext* globalCtx, ColliderBump* bump); +s32 Collider_DestroyBump(GlobalContext* globalCtx, ColliderBump* bump); +s32 Collider_SetBump(GlobalContext* globalCtx, ColliderBump* bump, ColliderBumpInit* init); +s32 Collider_InitBody(GlobalContext* globalCtx, ColliderBody* body); +s32 Collider_DestroyBody(GlobalContext* globalCtx, ColliderBody* body); +s32 Collider_SetBody(GlobalContext* globalCtx, ColliderBody* body, ColliderBodyInit* bodyInit); +void Collider_BodySetAT(GlobalContext* globalCtx, ColliderBody* body); +void Collider_BodySetAC(GlobalContext* globalCtx, ColliderBody* body); +void Collider_BodySetOC(GlobalContext* globalCtx, ColliderBody* body); +s32 Collider_InitJntSphItemDim(GlobalContext* globalCtx, ColliderJntSphItemDim* dim); +s32 Collider_DestroyJntSphItemDim(GlobalContext* globalCtx, ColliderJntSphItemDim* item); +s32 Collider_SetJntSphItemDim(GlobalContext* globalCtx, ColliderJntSphItemDim* dest, ColliderJntSphItemDimInit* src); +s32 Collider_InitJntSphItem(GlobalContext* globalCtx, ColliderJntSphItem* item); +s32 Collider_DestroyJntSphItem(GlobalContext* globalCtx, ColliderJntSphItem* item); +s32 Collider_SetJntSphItem(GlobalContext* globalCtx, ColliderJntSphItem* dest, ColliderJntSphItemInit* src); +s32 Collider_JntSphItemSetAT(GlobalContext* globalCtx, ColliderJntSphItem* collider); +s32 Collider_JntSphItemSetAC(GlobalContext* globalCtx, ColliderJntSphItem* collider); +s32 Collider_JntSphItemSetOC(GlobalContext* globalCtx, ColliderJntSphItem* collider); +s32 Collider_InitJntSph(GlobalContext* globalCtx, ColliderJntSph* collider); +s32 Collider_FreeJntSph(GlobalContext* globalCtx, ColliderJntSph* collider); +s32 Collider_DestroyJntSph(GlobalContext* globalCtx, ColliderJntSph* collider); +s32 Collider_SetJntSph_Set(GlobalContext* globalCtx, ColliderJntSph* dest, ColliderJntSphInit_Actor* src); +s32 Collider_SetJntSph_Set3(GlobalContext* globalCtx, ColliderJntSph* dest, Actor* actor, ColliderJntSphInit_Set3* src); +s32 Collider_SetJntSph_Set5(GlobalContext* globalCtx, ColliderJntSph* dest, Actor* actor, ColliderJntSphInit* src); +s32 Collider_SetJntSph(GlobalContext* globalCtx, ColliderJntSph* dest, Actor* actor, ColliderJntSphInit* src, ColliderJntSphItem* list); +s32 Collider_InitCylinderDim(GlobalContext* globalCtx, Cylinder16* dim); +s32 Collider_DestroyCylinderDim(GlobalContext* globalCtx, Cylinder16* dim); +s32 Collider_SetCylinderDim(GlobalContext* globalCtx, Cylinder16* dest, Cylinder16* src); +s32 Collider_InitCylinder(GlobalContext* globalCtx, ColliderCylinder* collider); +s32 Collider_DestroyCylinder(GlobalContext* globalCtx, ColliderCylinder* collider); +s32 Collider_SetCylinder_Actor(GlobalContext* globalCtx, ColliderCylinder* collider, ColliderCylinderInit_Actor* arg2); +s32 Collider_SetCylinder_Set3(GlobalContext* globalCtx, ColliderCylinder* collider, Actor* actor, ColliderCylinderInit_Set3* src); +s32 Collider_SetCylinder(GlobalContext* globalCtx, ColliderCylinder* collider, Actor* actor, ColliderCylinderInit* src); +s32 Collider_CylinderSetAT(GlobalContext* globalCtx, Collider* collider); +s32 Collider_CylinderSetAC(GlobalContext* globalCtx, Collider* collider); +s32 Collider_CylinderSetOC(GlobalContext* globalCtx, Collider* collider); +s32 Collider_InitTrisItemDim(GlobalContext* globalCtx, TriNorm* dim); +s32 Collider_DestroyTrisItemDim(GlobalContext* globalCtx, TriNorm* dim); +s32 Collider_SetTrisItemDim(GlobalContext* globalCtx, TriNorm* dest, ColliderTrisItemDimInit* src); +s32 Collider_InitTrisItem(GlobalContext* globalCtx, ColliderTrisItem* collider); +s32 Collider_DestroyTrisItem(GlobalContext* globalCtx, ColliderTrisItem* collider); +s32 Collider_SetTrisItem(GlobalContext* globalCtx, ColliderTrisItem* dest, ColliderTrisItemInit* src); +s32 Collider_TrisItemSetAT(GlobalContext* globalCtx, ColliderTrisItem* item); +s32 Collider_TrisItemSetAC(GlobalContext* globalCtx, ColliderTrisItem* item); +s32 Collider_TrisItemSetOC(GlobalContext* globalCtx, ColliderTrisItem* item); +s32 Collider_InitTris(GlobalContext* globalCtx, ColliderTris* tris); +s32 Collider_FreeTris(GlobalContext* globalCtx, ColliderTris* tris); +s32 Collider_DestroyTris(GlobalContext* globalCtx, ColliderTris* tris); +s32 Collider_SetTris_Set3(GlobalContext* globalCtx, ColliderTris* dest, Actor* actor, ColliderTrisInit_Set3* src); +s32 Collider_SetTris_Set5(GlobalContext* globalCtx, ColliderTris* dest, Actor* actor, ColliderTrisInit* src); +s32 Collider_SetTris(GlobalContext* globalCtx, ColliderTris* dest, Actor* actor, ColliderTrisInit* src, + ColliderTrisItem* list); +s32 Collider_TrisSetAT(GlobalContext* globalCtx, Collider* collider); +s32 Collider_TrisSetAC(GlobalContext* globalCtx, Collider* collider); +s32 Collider_TrisSetOC(GlobalContext* globalCtx, Collider* collider); +s32 Collider_InitQuadDim(GlobalContext* globalCtx, ColliderQuadDim* dim); +s32 Collider_DestroyQuadDim(GlobalContext* globalCtx, ColliderQuadDim* dim); +s32 func_8005CEC4(GlobalContext* globalCtx, ColliderQuadDim* dim); +void func_8005CEDC(ColliderQuadDim* dim); +s32 Collider_SetQuadDim(GlobalContext* globalCtx, ColliderQuadDim* dest, ColliderQuadDimInit* src); +s32 Collider_InitQuad(GlobalContext* globalCtx, ColliderQuad* collider); +s32 Collider_DestroyQuad(GlobalContext* globalCtx, ColliderQuad* collider); +s32 Collider_SetQuad_Set3(GlobalContext* globalCtx, ColliderQuad* collider, Actor* actor, ColliderQuadInit_Set3* src); +s32 Collider_SetQuad(GlobalContext* globalCtx, ColliderQuad* collider, Actor* actor, ColliderQuadInit* src); +s32 Collider_QuadSetAT(GlobalContext* globalCtx, Collider* collider); +s32 Collider_QuadSetAC(GlobalContext* globalCtx, Collider* collider); +s32 Collider_QuadSetOC(GlobalContext* globalCtx, Collider* collider); +s32 func_8005D218(GlobalContext* globalCtx, ColliderQuad* quad, Vec3f* arg2); +s32 Collider_InitOcLine(GlobalContext* globalCtx, OcLine* line); +s32 Collider_DestroyOcLine(GlobalContext* globalCtx, OcLine* line); // ? func_8005D334(?); // ? func_8005D3A4(?); -// ? func_8005D3BC(?); -void func_8005D400(GlobalContext*, SubGlobalContext11E60*); -// ? func_8005D40C(?); -// ? func_8005D4DC(?); -// ? func_8005D62C(?); -s32 Actor_CollisionCheck_SetAT(GlobalContext* globalCtx, SubGlobalContext11E60* simpleBodyGroups, - ColliderCylinderMain* collision); -s32 Actor_CollisionCheck_SetAC(GlobalContext* globalCtx, SubGlobalContext11E60* simpleBodyGroups, - ColliderCylinderMain* collision); -s32 Actor_CollisionCheck_SetOT(GlobalContext* globalCtx, SubGlobalContext11E60* simpleBodyGroups, - ColliderCylinderMain* collision); +void func_8005D3BC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx); +void CollisionCheck_DestroyContext(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx); +void CollisionCheck_InitContext(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx); +void CollisionCheck_EnableSAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx); +void CollisionCheck_DisableSAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx); +void func_8005D4DC(GlobalContext* globalCtx, Collider* collider); +void CollisionCheck_Draw(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx); +s32 CollisionCheck_SetAT(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider); +s32 CollisionCheck_SetAT_SAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider, s32 index); +s32 CollisionCheck_SetAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider); +s32 CollisionCheck_SetAC_SAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider, s32 index); +s32 CollisionCheck_SetOC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider); +s32 CollisionCheck_SetOC_SAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider, s32 index); +s32 CollisionCheck_SetOCLine(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, OcLine* collider); // ? func_8005DF2C(?); // ? func_8005DF50(?); // ? func_8005DF74(?); -// ? func_8005DFAC(?); // ? func_8005E2EC(?); // ? func_8005E4F8(?); // ? func_8005E604(?); @@ -751,29 +771,29 @@ s32 Actor_CollisionCheck_SetOT(GlobalContext* globalCtx, SubGlobalContext11E60* // ? func_8005E81C(?); // ? func_800611A0(?); // ? func_80061274(?); -// ? func_8006139C(?); +void func_8006139C(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx); // ? func_8006146C(?); // ? func_800614A4(?); -// ? func_8006199C(?); // ? func_80061BF4(?); // ? func_80061C18(?); -// ? func_80061C98(?); +void CollisionCheck_OC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx); // ? func_80061E48(?); -// ? func_80061E8C(?); -void func_80061ED4(SubActorStruct98* sub98, ActorDamageChart* damageChart, Sub98Init4* sub98Init); -void func_80061EFC(SubActorStruct98* sub98, ActorDamageChart* damageChart, Sub98Init4* sub98Init); +void func_80061E8C(CollisionCheckInfo* info); +void func_80061EB0(CollisionCheckInfo* info, CollisionCheckInfoInit* init); +void func_80061ED4(CollisionCheckInfo* info, DamageTable* damageTable, CollisionCheckInfoInit* init); +void func_80061EFC(CollisionCheckInfo* info, DamageTable* damageTable, CollisionCheckInfoInit2* init); // ? func_80061F64(?); // ? func_800622E4(?); -// ? func_80062530(?); +s32 CollisionCheck_GeneralLineOcCheck(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Vec3f* camera_3C, Vec3f* arg3, Actor** arg4, s32 arg5); // ? func_800626B0(?); -void ActorCollider_Cylinder_Update(Actor* actor, ColliderCylinderMain* collision); +void Collider_CylinderUpdate(Actor* actor, ColliderCylinder* collider); // ? func_80062734(?); -// ? func_80062A28(?); -// ? func_80062B80(?); -// ? func_80062CD4(?); -void func_80062D60(GlobalContext*, Vec3f*); -// ? func_80062DAC(?); -// ? func_80062E14(?); +void func_80062A28(GlobalContext*, Vec3f*); +void func_80062B80(GlobalContext*, Vec3f*); +void func_80062CD4(GlobalContext* globalCtx, Vec3f* v); +void func_80062D60(GlobalContext* globalCtx, Vec3f* v); +void func_80062DAC(GlobalContext* globalCtx, Vec3f* v, Vec3f* arg2); +void func_80062E14(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2); s32 func_80062ECC(f32, f32, f32, Vec3f*, Vec3f*, Vec3f*, Vec3f*, Vec3f*); void SaveContext_Init(void); // ? func_800636C0(?); @@ -1655,8 +1675,8 @@ s32 Math3D_TrisIntersect(TriNorm* ta, TriNorm* tb, Vec3f* intersect); s32 func_800D0480(Sphere16* arg0, f32 arg1, f32 arg2); s32 func_800D04F0(Sphere16* arg0, f32 arg1, f32 arg2); s32 func_800D0560(Sphere16* arg0, f32 arg1, f32 arg2); -void func_800D05D0(s32 arg0, s32 arg1); -void func_800D05DC(s32 arg0, s32 arg1); +void func_800D05D0(GlobalContext* globalCtx, Sphere16* sph); +void func_800D05DC(GlobalContext* globalCtx, Cylinder16* cyl); s16 atan2s(f32 x, f32 y); f32 atan2f(f32 x, f32 y); void Matrix_Init(GameState* gameState); diff --git a/include/z64.h b/include/z64.h index 18bfa95c59..616ea24e87 100644 --- a/include/z64.h +++ b/include/z64.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -884,8 +885,17 @@ typedef struct { } RoomContext; // size = 0x74 typedef struct { - /* 0x00 */ char unk_00[0x028C]; -} SubGlobalContext11E60; // size = 0x28C + /* 0x000 */ s16 colAtCount; + /* 0x002 */ u16 sacFlags; + /* 0x004 */ Collider* colAt[COLLISION_CHECK_AT_MAX]; + /* 0x0CC */ s32 colAcCount; + /* 0x0D0 */ Collider* colAc[COLLISION_CHECK_AC_MAX]; + /* 0x1C0 */ s32 colOcCount; + /* 0x1C4 */ Collider* colOc[COLLISION_CHECK_OC_MAX]; + /* 0x28C */ s32 colOcLineCount; + /* 0x290 */ OcLine* colOcLine[COLLISION_CHECK_OC_LINE_MAX]; + +} CollisionCheckContext; // size = 0x29C SubGlobalContext11E60 typedef struct { /* 0x00 */ char unk_00[0x10]; @@ -1066,8 +1076,8 @@ typedef struct GlobalContext { /* 0x11E5D */ s8 bombchuBowlingAmmo; // "bombchu_game_flag" /* 0x11E5E */ u8 fadeTransition; /* 0x11E5F */ char unk_11E5F[0x1]; - /* 0x11E60 */ SubGlobalContext11E60 sub_11E60; - /* 0x120EC */ char unk_120EC[0x38]; + /* 0x11E60 */ CollisionCheckContext colChkCtx; + /* 0x120FC */ char unk_120FC[0x28]; /* 0x12124 */ PreRenderContext preRenderCtx; /* 0x121C8 */ TransitionContext transitionCtx; /* 0x12418 */ char unk_12418[0x3]; diff --git a/include/z64actor.h b/include/z64actor.h index b65bf8ae06..770ca1581d 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -60,14 +60,26 @@ typedef struct { } ActorOverlay; // size = 0x20 typedef struct { - struct { - char damage : 4; - char effect : 4; - } attack[32]; -} ActorDamageChart; + u8 table[32]; +} DamageTable; typedef struct { - /* 0x00 */ ActorDamageChart* damageChart; // For actors which contain a damage chart (example: Stalfos)... + /* 0x00 */ u8 health; + /* 0x02 */ s16 unk_02; + /* 0x04 */ s16 unk_04; + /* 0x06 */ u8 mass; +} CollisionCheckInfoInit; + +typedef struct { + /* 0x00 */ u8 health; + /* 0x02 */ s16 unk_02; + /* 0x04 */ s16 unk_04; + /* 0x06 */ s16 unk_06; + /* 0x08 */ u8 mass; +} CollisionCheckInfoInit2; + +typedef struct { + /* 0x00 */ DamageTable* damageTable; // For actors which contain one (example: Stalfos)... /* 0x04 */ Vec3f displacement; // Amount to correct velocity (0x5C) by when colliding into a body /* 0x10 */ s16 unk_10; /* 0x12 */ s16 unk_12; @@ -76,9 +88,9 @@ typedef struct { /* 0x17 */ u8 health; /* 0x18 */ u8 damage; // Amount to decrement health by /* 0x19 */ u8 damageEffect; // Stores what effect should occur when hit by a weapon - /* 0x1A */ u8 impactEffect; // Maybe? set on deku nut when deku nut collides with gossip stone - /* 0x1B */ u8 unk_1B; -} SubActorStruct98; // size = 0x1C + /* 0x1A */ u8 atHitEffect; // Stores what effect should occur when AT connects with an AC + /* 0x1B */ u8 acHitEffect; // Stores what effect should occur when AC is touched by an AT +} CollisionCheckInfo; // size = 0x1C typedef struct { /* 0x00 */ Vec3s rot; // Current actor shape rotation @@ -121,7 +133,7 @@ typedef struct Actor { /* 0x08C */ f32 waterSurfaceDist; /* 0x090 */ f32 xzDistanceFromLink; /* 0x094 */ f32 yDistanceFromLink; - /* 0x098 */ SubActorStruct98 sub_98; + /* 0x098 */ CollisionCheckInfo colChkInfo; /* 0x0B4 */ ActorShape shape; /* 0x0CC */ Vec3f unk_CC[2]; /* 0x0E4 */ Vec3f unk_E4; // Stores result of some vector transformation involving actor xyz vector, and a matrix at Global Context + 11D60 @@ -161,118 +173,6 @@ typedef struct Actor { /* From here on, the structure and size varies for each actor */ } Actor; // size = 0x14C -typedef struct { - /* 0x00 */ u8 health; - /* 0x02 */ s16 unk_02; - /* 0x04 */ s16 unk_04; - /* 0x06 */ u8 mass; -} Sub98Init4; - -typedef struct { - /* 0x00 */ u8 health; - /* 0x02 */ s16 unk_10; - /* 0x04 */ s16 unk_12; - /* 0x06 */ u16 unk_14; - /* 0x08 */ u8 mass; -} Sub98Init5; - -typedef enum { - COLTYPE_CYLINDER = 1, - COLTYPE_CYLINDER_GROUP = 0, - COLTYPE_QUAD = 3, - COLTYPE_TRIANGLE_GROUP = 2 -} ColliderType; - -typedef struct { - /* 0x00 */ Actor* actor; - /* 0x04 */ Actor* at; - /* 0x08 */ Actor* ac; - /* 0x0C */ Actor* ot; - /* 0x10 */ u8 colliderFlags; /* Compared to 0x11 */ - /* 0x11 */ u8 collideFlags; /* Compared to 0x10 */ - /* 0x12 */ u8 maskA; /* Bitwise-and compared to 0x13 */ - /* 0x13 */ u8 maskB; /* Bitwise-and compared to 0x12 */ - /* 0x14 */ u8 unk_14; - /* 0x15 */ u8 type; /* Cylinder Collection, Cylinder, Triangle Collection, Quad */ -} Collider; // size = 0x18 - -typedef struct { - /* 0x00 */ s32 flags; /* Toucher Attack Identifier Flags */ - /* 0x04 */ u8 unk_04; - /* 0x05 */ u8 damage; /* Damage or Stun Timer */ -} ColliderTouch; // size = 0x08 - -typedef struct { - /* 0x00 */ s32 flags; /* Collision Exclusion Mask */ - /* 0x04 */ u8 effect; /* Damage Effect (Knockback, Fire, etc.) */ - /* 0x05 */ u8 unk_05; - /* 0x06 */ s16 unk_06; - /* 0x08 */ s16 unk_08; - /* 0x0A */ s16 unk_0A; -} ColliderBump; // size = 0x0C - -typedef struct ColliderBody { - /* 0x00 */ ColliderTouch toucher; - /* 0x08 */ ColliderBump bumper; - /* 0x14 */ u8 flags; - /* 0x15 */ u8 toucherFlags; - /* 0x16 */ u8 bumperFlags; - /* 0x17 */ u8 flags2; - /* 0x18 */ s32 unk_18; - /* 0x1C */ struct ColliderBodyEntry* colBuf; - /* 0x20 */ s32 unk_20; - /* 0x24 */ struct ColliderBody* colliding; -} ColliderBody; // size = 0x28 - -typedef struct ColliderBodyEntry { - /* 0x00 */ ColliderBody c; - /* 0x28 */ char unk_28[0x18]; -} ColliderBodyEntry; // size = 0x40 - -typedef struct { - /* 0x00 */ u8 bodyFlags; - /* 0x01 */ u8 unk_09[0x3]; /* 000000 */ - /* 0x04 */ s32 toucherMask; /* Attack Toucher Exclusion Mask */ - /* 0x08 */ u8 bumperEffect; /* Damage Effect (Knockback, Fire, etc.) */ - /* 0x09 */ u8 toucherDamage; /* Damage Amount or Stun Timer */ - /* 0x0A */ u8 unk_12[0x2]; /* 0000 */ - /* 0x0C */ s32 bumperMask; /* Bumper Exclusion Mask */ - /* 0x10 */ u8 unk_18[0x4]; /* 00000000 */ - /* 0x14 */ u8 toucherFlags; /* Attack Toucher Flags */ - /* 0x15 */ u8 bumperFlags; /* Bumper Flags */ - /* 0x16 */ u8 bodyFlags2; - /* 0x17 */ u8 unk_1F; /* 00 */ -} ColliderBodyInfoInner; // size = 0x1A - -typedef struct { - /* 0x00 */ u8 unk_00; - /* 0x01 */ u8 colliderFlags; /* Collider Flags */ - /* 0x02 */ u8 collideFlags; /* Collide Flags */ - /* 0x03 */ u8 maskA; /* Bitwise-And with Mask B */ - /* 0x04 */ u8 maskB; /* Bitwise-And with Mask A */ - /* 0x05 */ u8 type; /* Collider Type */ - /* 0x06 */ u8 unk_06[0x2]; /* 0000 */ -} ColliderBodyInfo; // size = 0x08 - -typedef struct { - /* 0x00 */ s16 radius; /* Cylinder Radius */ - /* 0x02 */ s16 height; /* Cylinder Height */ - /* 0x04 */ s16 yShift; /* Shift Cylinder on Y Axis */ - /* 0x06 */ Vec3s position; /* {X, Y, Z} position of Cylinder */ -} ColliderDimensions; // size = 0xC - -typedef struct { - /* 0x00 */ Collider base; - /* 0x18 */ ColliderBody body; - /* 0x40 */ ColliderDimensions dim; -} ColliderCylinderMain; // size = 0x4C - -typedef struct { - /* 0x00 */ ColliderBodyInfo body; - /* 0x08 */ ColliderBodyInfoInner inner; - /* 0x22 */ ColliderDimensions dim; -} ColliderCylinderInit; // size = 0x2E - typedef struct { /* 0x00 */ Actor* actor; /* 0x04 */ char unk_04[0x10]; diff --git a/include/z64collision_check.h b/include/z64collision_check.h new file mode 100644 index 0000000000..8df3094550 --- /dev/null +++ b/include/z64collision_check.h @@ -0,0 +1,253 @@ +#ifndef _Z_COLLISION_CHECK_H_ +#define _Z_COLLISION_CHECK_H_ + +#define COLLISION_CHECK_AT_MAX 50 +#define COLLISION_CHECK_AC_MAX 60 +#define COLLISION_CHECK_OC_MAX 50 +#define COLLISION_CHECK_OC_LINE_MAX 3 + +// From z64.h +struct Actor; + +typedef enum { + COLTYPE_UNK0, + COLTYPE_UNK1, + COLTYPE_UNK2, + COLTYPE_UNK3, + COLTYPE_UNK4, + COLTYPE_UNK5, + COLTYPE_UNK6, + COLTYPE_UNK7, + COLTYPE_UNK8, + COLTYPE_METAL_SHIELD, + COLTYPE_UNK10, + COLTYPE_WOODEN_SHIELD, + COLTYPE_UNK12, + COLTYPE_UNK13 +} ColliderType; + +typedef enum { + COLSHAPE_JNTSPH, + COLSHAPE_CYLINDER, + COLSHAPE_TRIS, + COLSHAPE_QUAD, + COLSHAPE_INVALID +} ColliderShape; + +typedef struct { + /* 0x00 */ struct Actor* actor; + /* 0x04 */ struct Actor* at; + /* 0x08 */ struct Actor* ac; + /* 0x0C */ struct Actor* oc; + /* 0x10 */ u8 atFlags; // Compared to acFlags + /* 0x11 */ u8 acFlags; // Compared to atFlags + /* 0x12 */ u8 maskA; // Bitwise-and compared to maskB + /* 0x13 */ u8 maskB; // Bitwise-and compared to maskA + /* 0x14 */ u8 type; + /* 0x15 */ u8 shape; // ColliderShape +} Collider; // size = 0x18 + +typedef struct { + /* 0x00 */ u8 type; + /* 0x01 */ u8 atFlags; + /* 0x02 */ u8 acFlags; + /* 0x03 */ u8 maskA; // Bitwise-And with maskB + /* 0x04 */ u8 maskB; // Bitwise-And with maskA + /* 0x05 */ u8 shape; // ColliderShape +} ColliderInit; // size = 0x06 + +typedef struct { + /* 0x00 */ u8 type; + /* 0x01 */ u8 atFlags; + /* 0x02 */ u8 acFlags; + /* 0x03 */ u8 maskA; // Bitwise-And with maskB + /* 0x04 */ u8 shape; // Collider Type +} ColliderInit_Set3; // size = 0x06 + +typedef struct { + /* 0x00 */ struct Actor* actor; + /* 0x04 */ u8 atFlags; // Compared to acFlags + /* 0x05 */ u8 acFlags; // Compared to atFlags + /* 0x06 */ u8 maskA; // Bitwise-and compared to maskB + /* 0x07 */ u8 shape; // ColliderShape +} ColliderInit_Actor; // size = 0x08 + +typedef struct { + /* 0x00 */ s32 flags; // Toucher Attack ID Flags + /* 0x04 */ u8 effect; + /* 0x05 */ u8 damage; // Damage or Stun Timer +} ColliderTouch; // size = 0x08 + +typedef struct { + /* 0x00 */ s32 flags; // Collision Exclusion Mask + /* 0x04 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) + /* 0x05 */ u8 defense; // Damage Resistance + /* 0x06 */ Vec3s unk_06; +} ColliderBump; // size = 0x0C + +typedef struct { + /* 0x00 */ s32 flags; // Collision Exclusion Mask + /* 0x04 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) + /* 0x05 */ u8 defense; +} ColliderBumpInit; // size = 0x08 + +typedef struct ColliderBody { + /* 0x00 */ ColliderTouch toucher; + /* 0x08 */ ColliderBump bumper; + /* 0x14 */ u8 flags; // affects sfx reaction when attacked by Link + /* 0x15 */ u8 toucherFlags; + /* 0x16 */ u8 bumperFlags; + /* 0x17 */ u8 ocFlags; + /* 0x18 */ Collider* atHit; // object touching this object's AT collider + /* 0x1C */ Collider* acHit; // object touching this object's AC collider + /* 0x20 */ struct ColliderBody* atHitItem; // element that hit the AT collider + /* 0x24 */ struct ColliderBody* acHitItem; // element that hit the AC collider +} ColliderBody; // size = 0x28 + +typedef struct { + /* 0x00 */ u8 bodyFlags; + /* 0x04 */ ColliderTouch toucher; + /* 0x0C */ ColliderBumpInit bumper; + /* 0x14 */ u8 toucherFlags; // Attack Toucher Flags + /* 0x15 */ u8 bumperFlags; // Bumper Flags + /* 0x16 */ u8 bodyFlags2; +} ColliderBodyInit; // size = 0x18 + +typedef struct { + /* 0x00 */ Sphere16 modelSphere; // model space sphere + /* 0x08 */ Sphere16 worldSphere; // world space sphere + /* 0x10 */ float scale; // world space sphere = model * scale * 0.01 + /* 0x14 */ u8 joint; +} ColliderJntSphItemDim; // size = 0x18 + +typedef struct { + u8 joint; + Sphere16 modelSphere; + s16 scale; +} ColliderJntSphItemDimInit; // size = 0x0C + +typedef struct { + /* 0x00 */ ColliderBody body; + /* 0x28 */ ColliderJntSphItemDim dim; +} ColliderJntSphItem; // size = 0x40 + +typedef struct { + /* 0x00 */ ColliderBodyInit body; + /* 0x18 */ ColliderJntSphItemDimInit dim; +} ColliderJntSphItemInit; // size = 0x24 + +typedef struct { + /* 0x00 */ Collider base; + /* 0x18 */ s32 count; + /* 0x1C */ ColliderJntSphItem* list; +} ColliderJntSph; // size 0x20 + +typedef struct { + /* 0x00 */ ColliderInit base; + /* 0x08 */ s32 count; + /* 0x0C */ ColliderJntSphItemInit* list; +} ColliderJntSphInit; + +typedef struct { + /* 0x00 */ ColliderInit_Set3 base; + /* 0x08 */ s32 count; + /* 0x0C */ ColliderJntSphItemInit* list; +} ColliderJntSphInit_Set3; + +typedef struct { + /* 0x00 */ ColliderInit_Actor base; + /* 0x08 */ s32 count; + /* 0x0C */ ColliderJntSphItemInit* list; +} ColliderJntSphInit_Actor; + +typedef struct { + /* 0x00 */ Collider base; + /* 0x18 */ ColliderBody body; + /* 0x40 */ Cylinder16 dim; +} ColliderCylinder; // size = 0x4C + +typedef struct { + /* 0x00 */ ColliderInit base; + /* 0x08 */ ColliderBodyInit body; + /* 0x20 */ Cylinder16 dim; +} ColliderCylinderInit; // size = 0x2C + +typedef struct { + /* 0x00 */ ColliderInit_Set3 base; + /* 0x08 */ ColliderBodyInit body; + /* 0x20 */ Cylinder16 dim; +} ColliderCylinderInit_Set3; // size = 0x2C + +typedef struct { + /* 0x00 */ ColliderInit_Actor base; + /* 0x08 */ ColliderBodyInit body; + /* 0x20 */ Cylinder16 dim; +} ColliderCylinderInit_Actor; // size = 0x2C + +typedef struct { + /* 0x00 */ Vec3f vtx[3]; +} ColliderTrisItemDimInit; // size = 0x24 + +typedef struct { + /* 0x00 */ ColliderBody body; + /* 0x28 */ TriNorm dim; +} ColliderTrisItem; // size = 0x5C + +typedef struct { + /* 0x00 */ ColliderBodyInit body; + /* 0x18 */ ColliderTrisItemDimInit dim; +} ColliderTrisItemInit; // size 0x3C + +typedef struct { + /* 0x00 */ Collider base; + /* 0x18 */ s32 count; + /* 0x1C */ ColliderTrisItem* list; +} ColliderTris; // size = 0x20 + +typedef struct { + /* 0x00 */ ColliderInit base; + /* 0x08 */ s32 count; + /* 0x0C */ ColliderTrisItemInit* list; +} ColliderTrisInit; + +typedef struct { + /* 0x00 */ ColliderInit_Set3 base; + /* 0x08 */ s32 count; + /* 0x0C */ ColliderTrisItemInit* list; +} ColliderTrisInit_Set3; + +typedef struct { + /* 0x00 */ Vec3f quad[4]; + /* 0x30 */ Vec3s dcMid; // midpoint of vectors d, c + /* 0x36 */ Vec3s baMid; // midpoint of vectors b, a + /* 0x3C */ f32 unk_3C; +} ColliderQuadDim; // size = 0x40 + +typedef struct { + /* 0x00 */ Vec3f quad[4]; +} ColliderQuadDimInit; + +typedef struct { + /* 0x00 */ Collider base; + /* 0x18 */ ColliderBody body; + /* 0x40 */ ColliderQuadDim dim; +} ColliderQuad; // size = 0x80 + +typedef struct { + /* 0x00 */ ColliderInit base; + /* 0x18 */ ColliderBodyInit body; + /* 0x30 */ ColliderQuadDimInit dim; +} ColliderQuadInit; // size 0x60 + +typedef struct { + /* 0x00 */ ColliderInit_Set3 base; + /* 0x18 */ ColliderBodyInit body; + /* 0x30 */ ColliderQuadDimInit dim; +} ColliderQuadInit_Set3; + +typedef struct { + Linef line; + u16 unk_18; +} OcLine; + +#endif diff --git a/include/z64effect.h b/include/z64effect.h index 4f83f2e883..2c158cdae1 100644 --- a/include/z64effect.h +++ b/include/z64effect.h @@ -2,6 +2,27 @@ #define _Z64EFFECT_H_ #include +typedef struct { + /* 0x00 */ Vec3f velocity; + /* 0x0C */ Vec3f position; + /* 0x18 */ Vec3s unk_18; + /* 0x1E */ Vec3s unk_1E; +} EffSparkParticle; // size = 0x24 + +typedef struct { + /* 0x000 */ Vec3s position; + /* 0x008 */ s32 numParticles; // Will be calculated as particleFactor1 * particleFactor2 + 2 + /* 0x00C */ EffSparkParticle particles[32]; + /* 0x48C */ f32 velocity; + /* 0x490 */ f32 gravity; + /* 0x494 */ u32 particleFactor1; + /* 0x498 */ u32 particleFactor2; + /* 0x49C */ Color_RGBA8 colorStart[4]; + /* 0x4AC */ Color_RGBA8 colorEnd[4]; + /* 0x4BC */ s32 age; + /* 0x4C0 */ s32 duration; +} EffSparkParams; // size = 0x4C4 + // gz has trail related structs but they seem to be different in dbg typedef struct { /* 0x0000 */ char unk_00[0x184]; @@ -15,4 +36,21 @@ typedef struct { /* 0x01A0 */ } TrailEffect; // size = unk +typedef struct { + /* 0x00 */ u8 numParticles; + /* 0x02 */ Vec3s position; + /* 0x08 */ Color_RGBA8 primColorStart; + /* 0x0C */ Color_RGBA8 envColorStart; + /* 0x10 */ Color_RGBA8 primColorMid; + /* 0x14 */ Color_RGBA8 envColorMid; + /* 0x18 */ Color_RGBA8 primColorEnd; + /* 0x1C */ Color_RGBA8 envColorEnd; + /* 0x20 */ f32 acceleration; + /* 0x24 */ f32 maxInitialSpeed; + /* 0x28 */ f32 lengthCutoff; + /* 0x2C */ u8 duration; + /* 0x2E */ LightInfoPositionalParams lightParams; + /* 0x3C */ s32 hasLight; +} EffShieldParticleInit; // size = 0x40 + #endif diff --git a/include/z64math.h b/include/z64math.h index 24ccc248d1..3a6cefbd9d 100644 --- a/include/z64math.h +++ b/include/z64math.h @@ -40,7 +40,7 @@ typedef struct { typedef struct { Vec3f vtx[3]; Plane plane; -} TriNorm; +} TriNorm; //size = 0x34 typedef struct { s16 radius; diff --git a/spec b/spec index de37baf51f..08b9e7f932 100644 --- a/spec +++ b/spec @@ -302,9 +302,7 @@ beginseg include "build/data/z_camera.data.o" include "build/data/z_camera.bss.o" include "build/src/code/z_collision_btltbls.o" - include "build/data/z_collision_btltbls.data.o" include "build/src/code/z_collision_check.o" - include "build/data/z_collision_check.data.o" include "build/data/z_collision_check.bss.o" include "build/src/code/z_common_data.o" include "build/data/z_common_data.bss.o" diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 7a2aa43318..64f4a0d4c0 100755 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -1709,8 +1709,8 @@ s32 func_800D0560(Sphere16* arg0, f32 arg1, f32 arg2) { return 0; } -void func_800D05D0(s32 arg0, s32 arg1) { +void func_800D05D0(GlobalContext* gctx, Sphere16* sph) { } -void func_800D05DC(s32 arg0, s32 arg1) { +void func_800D05DC(GlobalContext* gctx, Cylinder16* cyl) { } diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 149959ac5b..61a9d7d9f7 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -842,7 +842,7 @@ void Actor_Init(Actor* actor, GlobalContext* globalCtx) { actor->unk_F4 = 1000.0f; actor->unk_F8 = 350.0f; actor->unk_FC = 700.0f; - func_80061E48(&actor->sub_98); + func_80061E48(&actor->colChkInfo); actor->floorPolySource = 0x32; ActorShape_Init(&actor->shape, 0.0f, NULL, 0.0f); if (Object_IsLoaded(&globalCtx->objectCtx, actor->objBankIndex)) { @@ -870,9 +870,9 @@ void Actor_Destroy(Actor* actor, GlobalContext* globalCtx) { void func_8002D7EC(Actor* actor) { f32 speedRate = R_UPDATE_RATE * 0.5f; - actor->posRot.pos.x += (actor->velocity.x * speedRate) + actor->sub_98.displacement.x; - actor->posRot.pos.y += (actor->velocity.y * speedRate) + actor->sub_98.displacement.y; - actor->posRot.pos.z += (actor->velocity.z * speedRate) + actor->sub_98.displacement.z; + actor->posRot.pos.x += (actor->velocity.x * speedRate) + actor->colChkInfo.displacement.x; + actor->posRot.pos.y += (actor->velocity.y * speedRate) + actor->colChkInfo.displacement.y; + actor->posRot.pos.z += (actor->velocity.z * speedRate) + actor->colChkInfo.displacement.z; } void func_8002D868(Actor* actor) { @@ -1540,7 +1540,7 @@ s32 func_8002F2CC(Actor* actor, GlobalContext* globalCtx, f32 arg2) { } s32 func_8002F2F4(Actor* actor, GlobalContext* globalCtx) { - f32 var1 = 50.0f + actor->sub_98.unk_10; + f32 var1 = 50.0f + actor->colChkInfo.unk_10; return func_8002F2CC(actor, globalCtx, var1); } @@ -2097,7 +2097,7 @@ void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) { } else if ((unkFlag && !(actor->flags & unkFlag)) || (!unkFlag && unkCondition && (sp74 != actor) && (actor != player->unk_68C) && (actor != player->heldActor) && (&player->actor != actor->attachedA))) { - func_80061E8C(&actor->sub_98); + func_80061E8C(&actor->colChkInfo); actor = actor->next; } else if (actor->update == NULL) { if (!actor->activelyDrawn) { @@ -2134,7 +2134,7 @@ void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) { func_8003F8EC(globalCtx, &globalCtx->colCtx.dyna, actor); } - func_80061E8C(&actor->sub_98); + func_80061E8C(&actor->colChkInfo); actor = actor->next; } @@ -2484,7 +2484,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { } if ((HREG(64) != 1) || (HREG(76) != 0)) { - func_8005D62C(globalCtx, &globalCtx->sub_11E60); + CollisionCheck_Draw(globalCtx, &globalCtx->colChkCtx); } Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 6563); @@ -2542,7 +2542,7 @@ void func_80031B14(GlobalContext* globalCtx, ActorContext* actorCtx) { } } - func_8005D40C(globalCtx, &globalCtx->sub_11E60); + CollisionCheck_InitContext(globalCtx, &globalCtx->colChkCtx); actorCtx->flags.tempClear = 0; actorCtx->flags.tempSwch &= 0xFFFFFF; globalCtx->msgCtx.unk_E3F4 = 0; @@ -3262,8 +3262,8 @@ void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s1 } Actor* func_80033640(GlobalContext* globalCtx, Collider* collider) { - if ((collider->collideFlags & 0x2) && (collider->ac->type == ACTORTYPE_EXPLOSIVES)) { - collider->collideFlags &= ~0x2; + if ((collider->acFlags & 0x2) && (collider->ac->type == ACTORTYPE_EXPLOSIVES)) { + collider->acFlags &= ~0x2; return collider->ac; } @@ -3331,7 +3331,7 @@ Actor_80033780* func_80033780(GlobalContext* globalCtx, Actor* refActor, f32 arg spA8.y = itemActor->actor.posRot.pos.y + deltaY; spA8.z = itemActor->actor.posRot.pos.z + deltaZ; - if (func_80062ECC(refActor->sub_98.unk_10, refActor->sub_98.unk_12, 0.0f, &refActor->posRot.pos, + if (func_80062ECC(refActor->colChkInfo.unk_10, refActor->colChkInfo.unk_12, 0.0f, &refActor->posRot.pos, &itemActor->actor.posRot.pos, &spA8, &sp90, &sp84)) { return itemActor; } else { @@ -3982,7 +3982,7 @@ s32 func_80035124(Actor* actor, GlobalContext* globalCtx) { break; } - func_8002E4B4(globalCtx, actor, actor->sub_98.unk_12, actor->sub_98.unk_10, actor->sub_98.unk_10, 0x1D); + func_8002E4B4(globalCtx, actor, actor->colChkInfo.unk_12, actor->colChkInfo.unk_10, actor->colChkInfo.unk_10, 0x1D); return ret; } @@ -4061,11 +4061,10 @@ void func_800355B8(GlobalContext* globalCtx, Vec3f* arg1) { func_8003555C(globalCtx, arg1, &D_80116268, &D_80116274); } -u8 func_800355E4(GlobalContext* globalCtx, ColliderCylinderInit* colCylinderInit) { +u8 func_800355E4(GlobalContext* globalCtx, Collider* collider) { Player* player = PLAYER; - if ((colCylinderInit->inner.toucherDamage & 0x08) && (player->swordState != 0) && - (player->swordAnimation == 0x16)) { + if ((collider->acFlags & 0x08) && (player->swordState != 0) && (player->swordAnimation == 0x16)) { return 1; } else { return 0; @@ -4073,36 +4072,36 @@ u8 func_800355E4(GlobalContext* globalCtx, ColliderCylinderInit* colCylinderInit } u8 Actor_ApplyDamage(Actor* actor) { - if (actor->sub_98.damage >= actor->sub_98.health) { - actor->sub_98.health = 0; + if (actor->colChkInfo.damage >= actor->colChkInfo.health) { + actor->colChkInfo.health = 0; } else { - actor->sub_98.health -= actor->sub_98.damage; + actor->colChkInfo.health -= actor->colChkInfo.damage; } - return actor->sub_98.health; + return actor->colChkInfo.health; } void func_80035650(Actor* actor, ColliderBody* colBody, s32 freezeFlag) { - if (colBody->colliding == NULL) { + if (colBody->acHitItem == NULL) { actor->unk_116 = 0x00; - } else if (freezeFlag && (colBody->colliding->toucher.flags & 0x10060000)) { - actor->freeze = colBody->colliding->toucher.damage; + } else if (freezeFlag && (colBody->acHitItem->toucher.flags & 0x10060000)) { + actor->freeze = colBody->acHitItem->toucher.damage; actor->unk_116 = 0x00; - } else if (colBody->colliding->toucher.flags & 0x0800) { + } else if (colBody->acHitItem->toucher.flags & 0x0800) { actor->unk_116 = 0x01; - } else if (colBody->colliding->toucher.flags & 0x1000) { + } else if (colBody->acHitItem->toucher.flags & 0x1000) { actor->unk_116 = 0x02; - } else if (colBody->colliding->toucher.flags & 0x4000) { + } else if (colBody->acHitItem->toucher.flags & 0x4000) { actor->unk_116 = 0x04; - } else if (colBody->colliding->toucher.flags & 0x8000) { + } else if (colBody->acHitItem->toucher.flags & 0x8000) { actor->unk_116 = 0x08; - } else if ((colBody->colliding->toucher.flags << 0xF) < 0) { + } else if ((colBody->acHitItem->toucher.flags << 0xF) < 0) { actor->unk_116 = 0x10; - } else if (colBody->colliding->toucher.flags & 0x2000) { + } else if (colBody->acHitItem->toucher.flags & 0x2000) { actor->unk_116 = 0x20; - } else if ((colBody->colliding->toucher.flags << 0xC) < 0) { + } else if ((colBody->acHitItem->toucher.flags << 0xC) < 0) { if (freezeFlag) { - actor->freeze = colBody->colliding->toucher.damage; + actor->freeze = colBody->acHitItem->toucher.damage; } actor->unk_116 = 0x40; } else { @@ -4110,35 +4109,35 @@ void func_80035650(Actor* actor, ColliderBody* colBody, s32 freezeFlag) { } } -void func_8003573C(Actor* actor, ColliderBody* colBody, s32 freezeFlag) { +void func_8003573C(Actor* actor, ColliderJntSph* jntSph, s32 freezeFlag) { ColliderBody* curColBody; s32 flag; s32 i; actor->unk_116 = 0x00; - for (i = colBody->unk_18 - 1; i >= 0; i--) { - curColBody = &colBody->colBuf[i].c; - if (curColBody->colliding == NULL) { + for (i = jntSph->count - 1; i >= 0; i--) { + curColBody = &jntSph->list[i].body; + if (curColBody->acHitItem == NULL) { flag = 0x00; - } else if (freezeFlag && (curColBody->colliding->toucher.flags & 0x10060000)) { - actor->freeze = curColBody->colliding->toucher.damage; + } else if (freezeFlag && (curColBody->acHitItem->toucher.flags & 0x10060000)) { + actor->freeze = curColBody->acHitItem->toucher.damage; flag = 0x00; - } else if (curColBody->colliding->toucher.flags & 0x0800) { + } else if (curColBody->acHitItem->toucher.flags & 0x0800) { flag = 0x01; - } else if (curColBody->colliding->toucher.flags & 0x1000) { + } else if (curColBody->acHitItem->toucher.flags & 0x1000) { flag = 0x02; - } else if (curColBody->colliding->toucher.flags & 0x4000) { + } else if (curColBody->acHitItem->toucher.flags & 0x4000) { flag = 0x04; - } else if (curColBody->colliding->toucher.flags & 0x8000) { + } else if (curColBody->acHitItem->toucher.flags & 0x8000) { flag = 0x08; - } else if (curColBody->colliding->toucher.flags & 0x10000) { + } else if (curColBody->acHitItem->toucher.flags & 0x10000) { flag = 0x10; - } else if (curColBody->colliding->toucher.flags & 0x2000) { + } else if (curColBody->acHitItem->toucher.flags & 0x2000) { flag = 0x20; - } else if (curColBody->colliding->toucher.flags & 0x80000) { + } else if (curColBody->acHitItem->toucher.flags & 0x80000) { if (freezeFlag) { - actor->freeze = curColBody->colliding->toucher.damage; + actor->freeze = curColBody->acHitItem->toucher.damage; } flag = 0x40; } else { diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c index b0485a5623..c56347e9a3 100644 --- a/src/code/z_collision_btltbls.c +++ b/src/code/z_collision_btltbls.c @@ -1,6 +1,112 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_btltbls/CollisionBtlTbl_Get.s") +DamageTable D_8011DB20[] = { + { { + 0x10, 0x01, 0x01, 0x02, 0xE0, 0x01, 0xF2, 0x10, 0xF1, 0xF2, 0xF2, 0x22, 0x01, 0x01, 0x00, 0x00, + 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x10, 0x01, 0x01, 0x02, 0xE0, 0x01, 0xF2, 0x10, 0xF1, 0xF2, 0xF2, 0x22, 0x01, 0x01, 0x00, 0x00, + 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x10, 0x02, 0x01, 0x02, 0x10, 0x02, 0x02, 0x02, 0x01, 0x02, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, + 0x00, 0x04, 0x03, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x02, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x10, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x10, 0x02, 0x01, 0x02, 0x01, 0x02, 0x02, 0x02, 0x01, 0x02, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x02, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x10, 0x01, 0x01, 0x00, 0x10, 0x01, 0x01, 0x10, 0x01, 0x01, 0x01, 0x01, 0x31, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x00, 0x03, 0x00, 0x06, 0x00, 0x04, 0x04, 0x00, 0x02, 0x06, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x00, 0x03, 0x00, 0x06, 0x00, 0x04, 0x04, 0x00, 0x02, 0x06, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x02, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x10, 0x01, 0x00, 0xE2, 0x10, 0x01, 0x02, 0x10, 0xF1, 0xF2, 0xF2, 0x22, 0x32, 0x01, 0x00, 0x00, + 0x00, 0x22, 0x32, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x02, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x10, 0x01, 0x01, 0x02, 0x10, 0x01, 0x02, 0x10, 0x01, 0x02, 0x02, 0x22, 0x01, 0x01, 0x00, 0x00, + 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x02, 0x02, 0x01, 0x02, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, + 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x02, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x02, 0x02, 0x01, 0x02, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, + 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x02, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x10, 0x01, 0x00, 0x02, 0x10, 0x01, 0x02, 0x10, 0xF1, 0xF2, 0xF2, 0x22, 0x32, 0x01, 0x00, 0x00, + 0x00, 0x22, 0x32, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x10, 0x01, 0x01, 0xF2, 0xE0, 0x01, 0xD2, 0x10, 0x01, 0x02, 0x02, 0x00, 0x32, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x10, 0x01, 0x00, 0xF0, 0x10, 0x01, 0xF0, 0x10, 0x01, 0x02, 0x02, 0x00, 0x12, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, + { { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_btltbls/func_8005B248.s") +DamageTable* DamageTable_Get(s32 index) { + if (index < 0 || index >= 23) { + osSyncPrintf("CollisionBtlTbl_get():インデックスオーバー\n"); + return 0; + } + return &D_8011DB20[index]; +} + +void func_8005B248(DamageTable* table) { + s32 i; + for (i = 0; i < 32; i++) { + table->table[i] = 0; + } +} diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 5b6561232f..a8bd723a4b 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -1,392 +1,3355 @@ #include #include +#include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B280.s") +void func_8005B2AC(GraphicsContext* gfx, Vec3f* vA, Vec3f* vB, Vec3f* vC, u8 r, u8 g, u8 b); +// draw red poly +void func_8005B280(GraphicsContext* gfx, Vec3f* vA, Vec3f* vB, Vec3f* vC) { + func_8005B2AC(gfx, vA, vB, vC, 255, 0, 0); +} + +// draw poly #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B2AC.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B65C.s") - -s32 func_8005B6A0(GlobalContext* globalCtx, Collider* collision) { +s32 Collider_InitBase(GlobalContext* globalCtx, Collider* collider) { + static Collider init = { NULL, NULL, NULL, NULL, 0, 0, 0, 0, COLTYPE_UNK3, COLSHAPE_INVALID }; + *collider = init; return 1; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B6B0.s") - -s32 func_8005B6EC(GlobalContext* globalCtx, Collider* collision, Actor* actor, ColliderBodyInfo* src) { - collision->actor = actor; - collision->unk_14 = src->unk_00; - collision->colliderFlags = src->colliderFlags; - collision->collideFlags = src->collideFlags; - collision->maskA = src->maskA; - collision->maskB = 0x10; - collision->type = src->maskB; +s32 Collider_DestroyBase(GlobalContext* globalCtx, Collider* collider) { return 1; } -s32 func_8005B72C(GlobalContext* globalCtx, Collider* collision, Actor* actor, ColliderBodyInfo* src) { - collision->actor = actor; - collision->unk_14 = src->unk_00; - collision->colliderFlags = src->colliderFlags; - collision->collideFlags = src->collideFlags; - collision->maskA = src->maskA; - collision->maskB = src->maskB; - collision->type = src->type; +s32 Collider_SetBase_Actor(GlobalContext* globalCtx, Collider* collider, ColliderInit_Actor* src) { + collider->actor = src->actor; + collider->atFlags = src->atFlags; + collider->acFlags = src->acFlags; + collider->maskA = src->maskA; + collider->maskB = 0x10; + collider->shape = src->shape; return 1; } -void func_8005B76C(GlobalContext* globalCtx, Collider* collision) { - collision->at = NULL; - collision->colliderFlags &= ~0x6; -} - -void func_8005B784(GlobalContext* globalCtx, Collider* collision) { - collision->ac = NULL; - collision->collideFlags &= ~0x82; -} - -void func_8005B79C(GlobalContext* globalCtx, Collider* collision) { - collision->ot = NULL; - collision->maskA &= ~0x2; - collision->maskB &= ~0x1; -} - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B7C0.s") - -s32 func_8005B7E4(GlobalContext* globalCtx, ColliderTouch* touch) { +// maskB = 0x10 +s32 Collider_SetBase_Set3(GlobalContext* globalCtx, Collider* collider, Actor* actor, ColliderInit_Set3* src) { + collider->actor = actor; + collider->type = src->type; + collider->atFlags = src->atFlags; + collider->acFlags = src->acFlags; + collider->maskA = src->maskA; + collider->maskB = 0x10; + collider->shape = src->shape; return 1; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B7F4.s") - -void func_8005B818(GlobalContext* globalCtx, ColliderBody* body) { -} - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B824.s") - -s32 func_8005B850(GlobalContext* globalCtx, ColliderBump* bump) { +// maskB = src->maskB +s32 Collider_SetBase(GlobalContext* globalCtx, Collider* collider, Actor* actor, ColliderInit* src) { + collider->actor = actor; + collider->type = src->type; + collider->atFlags = src->atFlags; + collider->acFlags = src->acFlags; + collider->maskA = src->maskA; + collider->maskB = src->maskB; + collider->shape = src->shape; return 1; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B860.s") +void Collider_BaseSetAT(GlobalContext* globalCtx, Collider* collider) { + collider->at = NULL; + collider->atFlags &= ~0x6; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B884.s") +void Collider_BaseSetAC(GlobalContext* globalCtx, Collider* collider) { + collider->ac = NULL; + collider->acFlags &= ~0x82; +} -s32 func_8005B904(GlobalContext* globalCtx, ColliderBody* body) { - func_8005B7E4(globalCtx, &body->toucher); - func_8005B850(globalCtx, &body->bumper); +void Collider_BaseSetOC(GlobalContext* globalCtx, Collider* collider) { + collider->oc = NULL; + collider->maskA &= ~0x2; + collider->maskB &= ~0x1; +} + +s32 Collider_InitTouch(GlobalContext* globalCtx, ColliderTouch* touch) { + static ColliderTouch init = { 0, 0, 0 }; + *touch = init; return 1; } -s32 func_8005B93C(GlobalContext* globalCtx, ColliderBody* body, ColliderBodyInfoInner* bodyInfoInner) { - body->flags = bodyInfoInner->bodyFlags; - func_8005B7F4(globalCtx, &body->toucher, &bodyInfoInner->toucherMask); - func_8005B860(globalCtx, &body->bumper, &bodyInfoInner->bumperMask); - body->toucherFlags = bodyInfoInner->toucherFlags; - body->bumperFlags = bodyInfoInner->bumperFlags; - body->flags2 = bodyInfoInner->bodyFlags2; +s32 Collider_DestroyTouch(GlobalContext* globalCtx, ColliderTouch* touch) { return 1; } -void func_8005B9B0(GlobalContext* globalCtx, ColliderBody* body) { - body->unk_18 = 0; - body->unk_20 = 0; +// src might actually be a different type +s32 Collider_SetTouch(GlobalContext* globalCtx, ColliderTouch* dest, ColliderTouch* src) { + dest->flags = src->flags; + dest->effect = src->effect; + dest->damage = src->damage; + return 1; +} + +void Collider_BodySetAT_Unk(GlobalContext* globalCtx, ColliderBody* body) { +} + +s32 Collider_InitBump(GlobalContext* globalCtx, ColliderBump* bump) { + static ColliderBump init = { 0xFFCFFFFF, 0, 0, { 0, 0, 0 } }; + *bump = init; + return 1; +} + +s32 Collider_DestroyBump(GlobalContext* globalCtx, ColliderBump* bump) { + return 1; +} + +s32 Collider_SetBump(GlobalContext* globalCtx, ColliderBump* bump, ColliderBumpInit* init) { + bump->flags = init->flags; + bump->effect = init->effect; + bump->defense = init->defense; + return 1; +} + +s32 Collider_InitBody(GlobalContext* globalCtx, ColliderBody* body) { + static ColliderBody init = { + { 0, 0, 0 }, { 0xFFCFFFFF, 0, 0, { 0, 0, 0 } }, 0, 0, 0, 0, NULL, NULL, NULL, NULL, + }; + *body = init; + Collider_InitTouch(globalCtx, &body->toucher); + Collider_InitBump(globalCtx, &body->bumper); + return 1; +} + +s32 Collider_DestroyBody(GlobalContext* globalCtx, ColliderBody* body) { + Collider_DestroyTouch(globalCtx, &body->toucher); + Collider_DestroyBump(globalCtx, &body->bumper); + return 1; +} + +s32 Collider_SetBody(GlobalContext* globalCtx, ColliderBody* body, ColliderBodyInit* bodyInit) { + body->flags = bodyInit->bodyFlags; + Collider_SetTouch(globalCtx, &body->toucher, &bodyInit->toucher); + Collider_SetBump(globalCtx, &body->bumper, &bodyInit->bumper); + body->toucherFlags = bodyInit->toucherFlags; + body->bumperFlags = bodyInit->bumperFlags; + body->ocFlags = bodyInit->bodyFlags2; + return 1; +} + +void Collider_BodySetAT(GlobalContext* globalCtx, ColliderBody* body) { + body->atHit = NULL; + body->atHitItem = NULL; body->toucherFlags &= ~0x2; body->toucherFlags &= ~0x40; - func_8005B818(globalCtx, body); + Collider_BodySetAT_Unk(globalCtx, body); } -void func_8005B9E8(GlobalContext* globalCtx, ColliderBody* body) { - body->bumper.unk_0A = 0; +void Collider_BodySetAC(GlobalContext* globalCtx, ColliderBody* body) { + body->bumper.unk_06.z = 0; body->bumperFlags &= ~0x2; body->bumperFlags &= ~0x80; - body->colBuf = NULL; - body->colliding = NULL; - body->bumper.unk_08 = body->bumper.unk_0A; - body->bumper.unk_06 = body->bumper.unk_0A; + body->acHit = NULL; + body->acHitItem = NULL; + body->bumper.unk_06.y = body->bumper.unk_06.z; + body->bumper.unk_06.x = body->bumper.unk_06.z; } -void func_8005BA1C(GlobalContext* globalCtx, ColliderBody* body) { - body->flags2 &= ~0x2; +void Collider_BodySetOC(GlobalContext* globalCtx, ColliderBody* body) { + body->ocFlags &= ~0x2; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BA30.s") - -s32 func_8005BA74(UNK_TYPE arg0, UNK_TYPE arg1) { +s32 Collider_InitJntSphItemDim(GlobalContext* globalCtx, ColliderJntSphItemDim* dim) { + static ColliderJntSphItemDim init = { 0 }; + *dim = init; return 1; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BA84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BAD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BB10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BB48.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BB8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BBB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BBD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BBF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BC28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BCC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BE50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C050.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C2BC.s") - -s32 func_8005C318(GlobalContext* globalCtx, ColliderDimensions* dim) { +s32 Collider_DestroyJntSphItemDim(GlobalContext* globalCtx, ColliderJntSphItemDim* item) { return 1; } -s32 func_8005C328(GlobalContext* globalCtx, ColliderDimensions* dest, ColliderDimensions* src) { +s32 Collider_SetJntSphItemDim(GlobalContext* globalCtx, ColliderJntSphItemDim* dest, ColliderJntSphItemDimInit* src) { + dest->joint = src->joint; + dest->modelSphere = src->modelSphere; + dest->scale = src->scale * 0.01f; + return 1; +} + +s32 Collider_InitJntSphItem(GlobalContext* globalCtx, ColliderJntSphItem* item) { + Collider_InitBody(globalCtx, &item->body); + Collider_InitJntSphItemDim(globalCtx, &item->dim); + return 1; +} + +s32 Collider_DestroyJntSphItem(GlobalContext* globalCtx, ColliderJntSphItem* item) { + Collider_DestroyBody(globalCtx, &item->body); + Collider_DestroyJntSphItemDim(globalCtx, &item->dim); + return 1; +} + +s32 Collider_SetJntSphItem(GlobalContext* globalCtx, ColliderJntSphItem* dest, ColliderJntSphItemInit* src) { + Collider_SetBody(globalCtx, &dest->body, &src->body); + Collider_SetJntSphItemDim(globalCtx, &dest->dim, &src->dim); + return 1; +} + +s32 Collider_JntSphItemSetAT(GlobalContext* globalCtx, ColliderJntSphItem* collider) { + Collider_BodySetAT(globalCtx, &collider->body); + return 1; +} + +s32 Collider_JntSphItemSetAC(GlobalContext* globalCtx, ColliderJntSphItem* collider) { + Collider_BodySetAC(globalCtx, &collider->body); + return 1; +} + +s32 Collider_JntSphItemSetOC(GlobalContext* globalCtx, ColliderJntSphItem* collider) { + Collider_BodySetOC(globalCtx, &collider->body); + return 1; +} + +s32 Collider_InitJntSph(GlobalContext* globalCtx, ColliderJntSph* collider) { + Collider_InitBase(globalCtx, &collider->base); + collider->count = 0; + collider->list = NULL; + return 1; +} + +// Destruct ColliderJntSph (malloc) +s32 Collider_FreeJntSph(GlobalContext* globalCtx, ColliderJntSph* collider) { + ColliderJntSphItem* next; + + Collider_DestroyBase(globalCtx, &collider->base); + next = collider->list; + + while (next < collider->list + collider->count) { + Collider_DestroyJntSphItem(globalCtx, next); + next++; + } + + collider->count = 0; + if (collider->list != NULL) { + ZeldaArena_FreeDebug(collider->list, "../z_collision_check.c", 1393); + } + collider->list = NULL; + return 1; +} + +// Destruct ColliderJntSph (no malloc) +s32 Collider_DestroyJntSph(GlobalContext* globalCtx, ColliderJntSph* collider) { + ColliderJntSphItem* next; + + Collider_DestroyBase(globalCtx, &collider->base); + next = collider->list; + + while (next < collider->list + collider->count) { + + Collider_DestroyJntSphItem(globalCtx, next); + next++; + } + collider->count = 0; + collider->list = NULL; + return 1; +} + +// ClObjJntSph +s32 Collider_SetJntSph_Set(GlobalContext* globalCtx, ColliderJntSph* dest, ColliderJntSphInit_Actor* src) { + ColliderJntSphItem* destNext; + ColliderJntSphItemInit* srcNext; + + Collider_SetBase_Actor(globalCtx, &dest->base, &src->base); + dest->count = src->count; + dest->list = ZeldaArena_MallocDebug(src->count * sizeof(ColliderJntSphItem), "../z_collision_check.c", 1443); + + if (dest->list == NULL) { + dest->count = 0; + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("ClObjJntSph_set():zelda_malloc()出来ません。\n"); // EUC-JP: 出来ません。 | Can not. + osSyncPrintf(VT_RST); + return 0; + } + + destNext = dest->list; + srcNext = src->list; + + while (destNext < dest->list + dest->count) { + Collider_InitJntSphItem(globalCtx, destNext); + Collider_SetJntSphItem(globalCtx, destNext, srcNext); + destNext++; + srcNext++; + } + return 1; +} + +// ClObjJntSph_set3 (maskB = 0x10) +// called by En_Nwc +s32 Collider_SetJntSph_Set3(GlobalContext* globalCtx, ColliderJntSph* dest, Actor* actor, + ColliderJntSphInit_Set3* src) { + ColliderJntSphItem* destNext; + ColliderJntSphItemInit* srcNext; + + Collider_SetBase_Set3(globalCtx, &dest->base, actor, &src->base); + dest->count = src->count; + dest->list = ZeldaArena_MallocDebug(src->count * sizeof(ColliderJntSphItem), "../z_collision_check.c", 1490); + + if (dest->list == NULL) { + dest->count = 0; + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("ClObjJntSph_set3():zelda_malloc_出来ません。\n"); // EUC-JP: 出来ません。 | Can not. + osSyncPrintf(VT_RST); + return 0; + } + + destNext = dest->list; + srcNext = src->list; + + while (destNext < dest->list + dest->count) { + Collider_InitJntSphItem(globalCtx, destNext); + Collider_SetJntSphItem(globalCtx, destNext, srcNext); + destNext++; + srcNext++; + } + return 1; +} + +// ClObjJntSph_set5 (maskB = src->maskB) +s32 Collider_SetJntSph_Set5(GlobalContext* globalCtx, ColliderJntSph* dest, Actor* actor, ColliderJntSphInit* src) { + ColliderJntSphItem* destNext; + ColliderJntSphItemInit* srcNext; + + Collider_SetBase(globalCtx, &dest->base, actor, &src->base); + dest->count = src->count; + dest->list = ZeldaArena_MallocDebug(src->count * sizeof(ColliderJntSphItem), "../z_collision_check.c", 1551); + + if (dest->list == NULL) { + dest->count = 0; + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("ClObjJntSph_set5():zelda_malloc出来ません\n"); // EUC-JP: 出来ません。 | Can not. + osSyncPrintf(VT_RST); + return 0; + } + + destNext = dest->list; + srcNext = src->list; + + while (destNext < dest->list + dest->count) { + Collider_InitJntSphItem(globalCtx, destNext); + Collider_SetJntSphItem(globalCtx, destNext, srcNext); + destNext++; + srcNext++; + } + return 1; +} + +s32 Collider_SetJntSph(GlobalContext* globalCtx, ColliderJntSph* dest, Actor* actor, ColliderJntSphInit* src, + ColliderJntSphItem* list) { + ColliderJntSphItem* destNext; + ColliderJntSphItemInit* srcNext; + + Collider_SetBase(globalCtx, &dest->base, actor, &src->base); + dest->count = src->count; + dest->list = list; + + if (dest->list == NULL) { + __assert("pclobj_jntsph->elem_tbl != NULL", "../z_collision_check.c", 1603); + } + + destNext = dest->list; + srcNext = src->list; + + while (destNext < dest->list + dest->count) { + Collider_InitJntSphItem(globalCtx, destNext); + Collider_SetJntSphItem(globalCtx, destNext, srcNext); + destNext++; + srcNext++; + } + return 1; +} + +s32 Collider_JntSphSetAT(GlobalContext* globalCtx, Collider* collider) { + ColliderJntSphItem* next; + ColliderJntSph* col = (ColliderJntSph*)collider; + GlobalContext* gctx = globalCtx; + + Collider_BaseSetAT(gctx, &col->base); + next = col->list; + + while (next < col->list + col->count) { + Collider_JntSphItemSetAT(gctx, next); + next++; + } + return 1; +} + +s32 Collider_JntSphSetAC(GlobalContext* globalCtx, Collider* collider) { + ColliderJntSphItem* next; + ColliderJntSph* col = (ColliderJntSph*)collider; + GlobalContext* gctx = globalCtx; + + Collider_BaseSetAC(gctx, &col->base); + next = col->list; + + while (next < col->list + col->count) { + Collider_JntSphItemSetAC(gctx, next); + next++; + } + return 1; +} + +s32 Collider_JntSphSetOC(GlobalContext* globalCtx, Collider* collider) { + ColliderJntSphItem* next; + ColliderJntSph* col = (ColliderJntSph*)collider; + GlobalContext* gctx = globalCtx; + + Collider_BaseSetOC(gctx, &col->base); + next = col->list; + while (next < col->list + col->count) { + Collider_JntSphItemSetOC(gctx, next); + next++; + } + return 1; +} + +s32 Collider_InitCylinderDim(GlobalContext* globalCtx, Cylinder16* dim) { + Cylinder16 init = { 0 }; + *dim = init; + return 1; +} + +s32 Collider_DestroyCylinderDim(GlobalContext* globalCtx, Cylinder16* dim) { + return 1; +} + +s32 Collider_SetCylinderDim(GlobalContext* globalCtx, Cylinder16* dest, Cylinder16* src) { *dest = *src; return 1; } -s32 ActorCollider_AllocCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision) { - func_8005B65C(globalCtx, &collision->base); - func_8005B884(globalCtx, &collision->body); - func_8005C2BC(globalCtx, &collision->dim); +s32 Collider_InitCylinder(GlobalContext* globalCtx, ColliderCylinder* collider) { + Collider_InitBase(globalCtx, &collider->base); + Collider_InitBody(globalCtx, &collider->body); + Collider_InitCylinderDim(globalCtx, &collider->dim); return 1; } -s32 ActorCollider_FreeCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision) { - func_8005B6A0(globalCtx, &collision->base); - func_8005B904(globalCtx, &collision->body); - func_8005C318(globalCtx, &collision->dim); +s32 Collider_DestroyCylinder(GlobalContext* globalCtx, ColliderCylinder* collider) { + Collider_DestroyBase(globalCtx, &collider->base); + Collider_DestroyBody(globalCtx, &collider->body); + Collider_DestroyCylinderDim(globalCtx, &collider->dim); return 1; } -s32 func_8005C3F4(GlobalContext* globalCtx, ColliderCylinderMain* collision, ColliderCylinderInit* src) { - func_8005B6B0(globalCtx, &collision->base, &src->body); - func_8005B93C(globalCtx, &collision->body, &src->inner); - func_8005C328(globalCtx, &collision->dim, &src->dim); +// used only by DekuJr, D_80B92A00 +s32 Collider_SetCylinder_Actor(GlobalContext* globalCtx, ColliderCylinder* collider, ColliderCylinderInit_Actor* src) { + Collider_SetBase_Actor(globalCtx, &collider->base, &src->base); + Collider_SetBody(globalCtx, &collider->body, &src->body); + Collider_SetCylinderDim(globalCtx, &collider->dim, &src->dim); return 1; } -s32 func_8005C450(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, ColliderCylinderInit* src) { - func_8005B6EC(globalCtx, &collision->base, actor, &src->body); - func_8005B93C(globalCtx, &collision->body, &src->inner); - func_8005C328(globalCtx, &collision->dim, &src->dim); +// maskB = 0x10 +s32 Collider_SetCylinder_Set3(GlobalContext* globalCtx, ColliderCylinder* collider, Actor* actor, + ColliderCylinderInit_Set3* src) { + Collider_SetBase_Set3(globalCtx, &collider->base, actor, &src->base); + Collider_SetBody(globalCtx, &collider->body, &src->body); + Collider_SetCylinderDim(globalCtx, &collider->dim, &src->dim); return 1; } -s32 ActorCollider_InitCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, - ColliderCylinderInit* src) { - func_8005B72C(globalCtx, &collision->base, actor, &src->body); - func_8005B93C(globalCtx, &collision->body, &src->inner); - func_8005C328(globalCtx, &collision->dim, &src->dim); +// maskB = src->maskB +s32 Collider_SetCylinder(GlobalContext* globalCtx, ColliderCylinder* collider, Actor* actor, + ColliderCylinderInit* src) { + Collider_SetBase(globalCtx, &collider->base, actor, &src->base); + Collider_SetBody(globalCtx, &collider->body, &src->body); + Collider_SetCylinderDim(globalCtx, &collider->dim, &src->dim); return 1; } -s32 func_8005C508(GlobalContext* globalCtx, ColliderCylinderMain* collision) { - func_8005B76C(globalCtx, &collision->base); - func_8005B9B0(globalCtx, &collision->body); +s32 Collider_CylinderSetAT(GlobalContext* globalCtx, Collider* collider) { + ColliderCylinder* col = (ColliderCylinder*)collider; + Collider_BaseSetAT(globalCtx, &col->base); + Collider_BodySetAT(globalCtx, &col->body); return 1; } -s32 func_8005C540(GlobalContext* globalCtx, ColliderCylinderMain* collision) { - func_8005B784(globalCtx, &collision->base); - func_8005B9E8(globalCtx, &collision->body); +s32 Collider_CylinderSetAC(GlobalContext* globalCtx, Collider* collider) { + ColliderCylinder* col = (ColliderCylinder*)collider; + Collider_BaseSetAC(globalCtx, &col->base); + Collider_BodySetAC(globalCtx, &col->body); return 1; } -s32 func_8005C578(GlobalContext* globalCtx, ColliderCylinderMain* collision) { - func_8005B79C(globalCtx, &collision->base); - func_8005BA1C(globalCtx, &collision->body); +s32 Collider_CylinderSetOC(GlobalContext* globalCtx, Collider* collider) { + ColliderCylinder* col = (ColliderCylinder*)collider; + Collider_BaseSetOC(globalCtx, &col->base); + Collider_BodySetOC(globalCtx, &col->body); return 1; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C5B0.s") - -s32 func_8005C5F8(UNK_TYPE arg0, UNK_TYPE arg1) { +s32 Collider_InitTrisItemDim(GlobalContext* globalCtx, TriNorm* dim) { + static TriNorm init = { 0 }; + *dim = init; return 1; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C608.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C6C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C6F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C730.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C774.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C798.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C7BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C7E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C8C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005CBAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005CE6C.s") - -s32 func_8005CEB4(GlobalContext* globalCtx, ColliderDimensions* dim) { +s32 Collider_DestroyTrisItemDim(GlobalContext* globalCtx, TriNorm* dim) { return 1; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005CEC4.s") +s32 Collider_SetTrisItemDim(GlobalContext* globalCtx, TriNorm* dest, ColliderTrisItemDimInit* src) { + Vec3f* d; + Vec3f* s; + float nx, ny, nz, nd; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005CEDC.s") + d = dest->vtx; + s = src->vtx; + while (d < dest->vtx + 3) { + *d++ = *s++; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005CF90.s") + func_800CC8B4(&src->vtx[0], &src->vtx[1], &src->vtx[2], &nx, &ny, &nz, &nd); -s32 func_8005D018(GlobalContext* globalCtx, ColliderCylinderMain* collision) { - func_8005B65C(globalCtx, &collision->base); - func_8005B884(globalCtx, &collision->body); - func_8005CE6C(globalCtx, &collision->dim); + dest->plane.normal.x = nx; + dest->plane.normal.y = ny; + dest->plane.normal.z = nz; + dest->plane.originDist = nd; return 1; } -s32 func_8005D060(GlobalContext* globalCtx, ColliderCylinderMain* collision) { - func_8005B6A0(globalCtx, &collision->base); - func_8005B904(globalCtx, &collision->body); - func_8005CEB4(globalCtx, &collision->dim); +s32 Collider_InitTrisItem(GlobalContext* globalCtx, ColliderTrisItem* collider) { + Collider_InitBody(globalCtx, &collider->body); + Collider_InitTrisItemDim(globalCtx, &collider->dim); return 1; } -s32 func_8005D0A8(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, ColliderCylinderInit* src) { - func_8005B6EC(globalCtx, &collision->base, actor, &src->body); - func_8005B93C(globalCtx, &collision->body, &src->inner); - func_8005CF90(globalCtx, &collision->dim, &src->dim); +s32 Collider_DestroyTrisItem(GlobalContext* globalCtx, ColliderTrisItem* collider) { + Collider_DestroyBody(globalCtx, &collider->body); + Collider_DestroyTrisItemDim(globalCtx, &collider->dim); return 1; } -s32 func_8005D104(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, ColliderCylinderInit* src) { - func_8005B72C(globalCtx, &collision->base, actor, &src->body); - func_8005B93C(globalCtx, &collision->body, &src->inner); - func_8005CF90(globalCtx, &collision->dim, &src->dim); +s32 Collider_SetTrisItem(GlobalContext* globalCtx, ColliderTrisItem* dest, ColliderTrisItemInit* src) { + Collider_SetBody(globalCtx, &dest->body, &src->body); + Collider_SetTrisItemDim(globalCtx, &dest->dim, &src->dim); return 1; } -s32 func_8005D160(GlobalContext* globalCtx, ColliderCylinderMain* collision) { - func_8005B76C(globalCtx, &collision->base); - func_8005B9B0(globalCtx, &collision->body); - func_8005CEC4(globalCtx, &collision->dim); +s32 Collider_TrisItemSetAT(GlobalContext* globalCtx, ColliderTrisItem* item) { + Collider_BodySetAT(globalCtx, &item->body); return 1; } -s32 func_8005D1A8(GlobalContext* globalCtx, ColliderCylinderMain* collision) { - func_8005B784(globalCtx, &collision->base); - func_8005B9E8(globalCtx, &collision->body); +s32 Collider_TrisItemSetAC(GlobalContext* globalCtx, ColliderTrisItem* item) { + Collider_BodySetAC(globalCtx, &item->body); return 1; } -s32 func_8005D1E0(GlobalContext* globalCtx, ColliderCylinderMain* collision) { - func_8005B79C(globalCtx, &collision->base); - func_8005BA1C(globalCtx, &collision->body); +s32 Collider_TrisItemSetOC(GlobalContext* globalCtx, ColliderTrisItem* item) { + Collider_BodySetOC(globalCtx, &item->body); return 1; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D218.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D334.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D3A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D3BC.s") - -void func_8005D400(GlobalContext* globalCtx, SubGlobalContext11E60* sub_11E60) { +s32 Collider_InitTris(GlobalContext* globalCtx, ColliderTris* tris) { + Collider_InitBase(globalCtx, &tris->base); + tris->count = 0; + tris->list = 0; + return 1; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D40C.s") +// zelda malloc +s32 Collider_FreeTris(GlobalContext* globalCtx, ColliderTris* tris) { + ColliderTrisItem* next; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D4DC.s") + Collider_DestroyBase(globalCtx, &tris->base); + next = tris->list; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D62C.s") + while (next < tris->list + tris->count) { + Collider_DestroyTrisItem(globalCtx, next); + next++; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D79C.s") + tris->count = 0; + if (tris->list != NULL) { + ZeldaArena_FreeDebug(tris->list, "../z_collision_check.c", 2099); + } + tris->list = NULL; + return 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D9F4.s") +// no malloc +s32 Collider_DestroyTris(GlobalContext* globalCtx, ColliderTris* tris) { + ColliderTrisItem* next; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005DC4C.s") + Collider_DestroyBase(globalCtx, &tris->base); + next = tris->list; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005DF2C.s") + while (next < tris->list + tris->count) { + Collider_DestroyTrisItem(globalCtx, next); + next++; + } + tris->count = 0; + tris->list = NULL; + return 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005DF50.s") +// ClObjTris_set3 (maskB = 0x10) +s32 Collider_SetTris_Set3(GlobalContext* globalCtx, ColliderTris* dest, Actor* actor, ColliderTrisInit_Set3* src) { + ColliderTrisItem* destNext; + ColliderTrisItemInit* srcNext; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005DF74.s") + Collider_SetBase_Set3(globalCtx, &dest->base, actor, &src->base); + dest->count = src->count; + dest->list = ZeldaArena_MallocDebug(dest->count * sizeof(ColliderTrisItem), "../z_collision_check.c", 2156); + if (dest->list == NULL) { + dest->count = 0; + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("ClObjTris_set3():zelda_malloc()出来ません\n"); // EUC-JP: 出来ません。 | Can not. + osSyncPrintf(VT_RST); + return 0; + } + destNext = dest->list; + srcNext = src->list; + while (destNext < dest->list + dest->count) { + Collider_InitTrisItem(globalCtx, destNext); + Collider_SetTrisItem(globalCtx, destNext, srcNext); + destNext++; + srcNext++; + } + return 1; +} + +// ClObjTris_set5 (maskB = src->maskB) +s32 Collider_SetTris_Set5(GlobalContext* globalCtx, ColliderTris* dest, Actor* actor, ColliderTrisInit* src) { + ColliderTrisItem* destNext; + ColliderTrisItemInit* srcNext; + + Collider_SetBase(globalCtx, &dest->base, actor, &src->base); + dest->count = src->count; + dest->list = ZeldaArena_MallocDebug(dest->count * sizeof(ColliderTrisItem), "../z_collision_check.c", 2207); + + if (dest->list == NULL) { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("ClObjTris_set5():zelda_malloc出来ません\n"); // EUC-JP: 出来ません。 | Can not. + osSyncPrintf(VT_RST); + dest->count = 0; + return 0; + } + + destNext = dest->list; + srcNext = src->list; + + while (destNext < dest->list + dest->count) { + Collider_InitTrisItem(globalCtx, destNext); + Collider_SetTrisItem(globalCtx, destNext, srcNext); + destNext++; + srcNext++; + } + return 1; +} + +s32 Collider_SetTris(GlobalContext* globalCtx, ColliderTris* dest, Actor* actor, ColliderTrisInit* src, + ColliderTrisItem* list) { + ColliderTrisItem* destNext; + ColliderTrisItemInit* srcNext; + + Collider_SetBase(globalCtx, &dest->base, actor, &src->base); + dest->count = src->count; + dest->list = list; + + if (dest->list == NULL) { + __assert("pclobj_tris->elem_tbl != NULL", "../z_collision_check.c", 2258); + } + + destNext = dest->list; + srcNext = src->list; + + while (destNext < dest->list + dest->count) { + Collider_InitTrisItem(globalCtx, destNext); + Collider_SetTrisItem(globalCtx, destNext, srcNext); + destNext++; + srcNext++; + } + return 1; +} + +s32 Collider_TrisSetAT(GlobalContext* globalCtx, Collider* collider) { + ColliderTrisItem* next; + ColliderTris* col = (ColliderTris*)collider; + GlobalContext* gctx = globalCtx; + + Collider_BaseSetAT(gctx, &col->base); + next = col->list; + + while (next < col->list + col->count) { + Collider_TrisItemSetAT(gctx, next); + next++; + } + return 1; +} + +s32 Collider_TrisSetAC(GlobalContext* globalCtx, Collider* collider) { + ColliderTrisItem* next; + ColliderTris* col = (ColliderTris*)collider; + GlobalContext* gctx = globalCtx; + + Collider_BaseSetAC(gctx, &col->base); + next = col->list; + + while (next < col->list + col->count) { + Collider_TrisItemSetAC(gctx, next); + next++; + } + return 1; +} + +s32 Collider_TrisSetOC(GlobalContext* globalCtx, Collider* collider) { + ColliderTrisItem* next; + ColliderTris* col = (ColliderTris*)collider; + GlobalContext* gctx = globalCtx; + + Collider_BaseSetOC(gctx, &col->base); + next = col->list; + + while (next < col->list + col->count) { + Collider_TrisItemSetOC(gctx, next); + next++; + } + return 1; +} + +s32 Collider_InitQuadDim(GlobalContext* globalCtx, ColliderQuadDim* dim) { + static ColliderQuadDim init = { + { { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } }, + { 0, 0, 0 }, + { 0, 0, 0 }, + 1.0E38f, + }; + *dim = init; + return 1; +} + +s32 Collider_DestroyQuadDim(GlobalContext* globalCtx, ColliderQuadDim* dim) { + return 1; +} + +// Set ColliderQuadDim unk_3C +s32 func_8005CEC4(GlobalContext* globalCtx, ColliderQuadDim* dim) { + dim->unk_3C = 1.0E38f; + return 1; +} + +// ColliderQuadDim compute dc ba midpoints +void func_8005CEDC(ColliderQuadDim* dim) { + dim->dcMid.x = (dim->quad[3].x + dim->quad[2].x) * 0.5f; + dim->dcMid.y = (dim->quad[3].y + dim->quad[2].y) * 0.5f; + dim->dcMid.z = (dim->quad[3].z + dim->quad[2].z) * 0.5f; + dim->baMid.x = (dim->quad[1].x + dim->quad[0].x) * 0.5f; + dim->baMid.y = (dim->quad[1].y + dim->quad[0].y) * 0.5f; + dim->baMid.z = (dim->quad[1].z + dim->quad[0].z) * 0.5f; +} + +s32 Collider_SetQuadDim(GlobalContext* globalCtx, ColliderQuadDim* dest, ColliderQuadDimInit* src) { + dest->quad[0] = src->quad[0]; + dest->quad[1] = src->quad[1]; + dest->quad[2] = src->quad[2]; + dest->quad[3] = src->quad[3]; + func_8005CEDC(dest); + return 1; +} + +s32 Collider_InitQuad(GlobalContext* globalCtx, ColliderQuad* collider) { + Collider_InitBase(globalCtx, &collider->base); + Collider_InitBody(globalCtx, &collider->body); + Collider_InitQuadDim(globalCtx, &collider->dim); + return 1; +} + +s32 Collider_DestroyQuad(GlobalContext* globalCtx, ColliderQuad* collider) { + Collider_DestroyBase(globalCtx, &collider->base); + Collider_DestroyBody(globalCtx, &collider->body); + Collider_DestroyQuadDim(globalCtx, &collider->dim); + return 1; +} + +// maskB = 0x10 +s32 Collider_SetQuad_Set3(GlobalContext* globalCtx, ColliderQuad* collider, Actor* actor, ColliderQuadInit_Set3* src) { + Collider_SetBase_Set3(globalCtx, &collider->base, actor, &src->base); + Collider_SetBody(globalCtx, &collider->body, &src->body); + Collider_SetQuadDim(globalCtx, &collider->dim, &src->dim); + return 1; +} + +// maskB = src->maskB +s32 Collider_SetQuad(GlobalContext* globalCtx, ColliderQuad* collider, Actor* actor, ColliderQuadInit* src) { + Collider_SetBase(globalCtx, &collider->base, actor, &src->base); + Collider_SetBody(globalCtx, &collider->body, &src->body); + Collider_SetQuadDim(globalCtx, &collider->dim, &src->dim); + return 1; +} + +s32 Collider_QuadSetAT(GlobalContext* globalCtx, Collider* collider) { + ColliderQuad* col = (ColliderQuad*)collider; + Collider_BaseSetAT(globalCtx, &col->base); + Collider_BodySetAT(globalCtx, &col->body); + func_8005CEC4(globalCtx, &col->dim); + return 1; +} + +s32 Collider_QuadSetAC(GlobalContext* globalCtx, Collider* collider) { + ColliderQuad* col = (ColliderQuad*)collider; + Collider_BaseSetAC(globalCtx, &col->base); + Collider_BodySetAC(globalCtx, &col->body); + return 1; +} + +s32 Collider_QuadSetOC(GlobalContext* globalCtx, Collider* collider) { + ColliderQuad* col = (ColliderQuad*)collider; + Collider_BaseSetOC(globalCtx, &col->base); + Collider_BodySetOC(globalCtx, &col->body); + return 1; +} + +s32 func_8005D218(GlobalContext* globalCtx, ColliderQuad* quad, Vec3f* arg2) { + f32 temp; + Vec3f sp20; + + if (!(quad->body.toucherFlags & 4)) { + return 1; + } + Math_Vec3s_ToVec3f(&sp20, &quad->dim.dcMid); + temp = func_800CB650(&sp20, arg2); + if (temp < quad->dim.unk_3C) { + quad->dim.unk_3C = temp; + if (quad->body.atHit != NULL) { + Collider_BaseSetAC(globalCtx, quad->body.atHit); + } + if (quad->body.atHitItem != NULL) { + Collider_BodySetAC(globalCtx, quad->body.atHitItem); + } + return 1; + } + return 0; +} + +s32 Collider_InitOcLine(GlobalContext* globalCtx, OcLine* line) { + static Vec3f init = { 0, 0, 0 }; + Vec3f temp; + + temp = init; + Math_Vec3f_Copy(&line->line.a, &temp); + Math_Vec3f_Copy(&line->line.b, &temp); + return 1; +} + +s32 Collider_DestroyOcLine(GlobalContext* globalCtx, OcLine* line) { + return 1; +} + +s32 func_8005D334(UNK_TYPE arg0, OcLine* arg1, Vec3f* arg2, Vec3f* arg3) { + Math_Vec3f_Copy(&arg1->line.a, arg2); + Math_Vec3f_Copy(&arg1->line.b, arg3); + return 1; +} + +s32 func_8005D378(UNK_TYPE arg0, OcLine* arg1, OcLine* arg2) { + arg1->unk_18 = arg2->unk_18; + func_8005D334(arg0, arg1, &arg2->line.a, &arg2->line.b); + return 1; +} + +s32 func_8005D3A4(GlobalContext* globalCtx, OcLine* line) { + line->unk_18 &= 0xFFFE; + return 1; +} + +void func_8005D3BC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx) { + colChkCtx->sacFlags = 0; + CollisionCheck_InitContext(globalCtx, colChkCtx); + AREG(21) = 1; + AREG(22) = 1; + AREG(23) = 1; +} + +void CollisionCheck_DestroyContext(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx) { +} + +// Initialize CollisionCheckContext +void CollisionCheck_InitContext(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx) { + Collider** c; + OcLine** d; + + if (!(colChkCtx->sacFlags & 1)) { + colChkCtx->colAtCount = 0; + colChkCtx->colAcCount = 0; + colChkCtx->colOcCount = 0; + colChkCtx->colOcLineCount = 0; + for (c = colChkCtx->colAt; c < colChkCtx->colAt + COLLISION_CHECK_AT_MAX; c++) { + *c = NULL; + } + + for (c = colChkCtx->colAc; c < colChkCtx->colAc + COLLISION_CHECK_AC_MAX; c++) { + *c = NULL; + } + + for (c = colChkCtx->colOc; c < colChkCtx->colOc + COLLISION_CHECK_OC_MAX; c++) { + *c = NULL; + } + + for (d = colChkCtx->colOcLine; d < colChkCtx->colOcLine + COLLISION_CHECK_OC_LINE_MAX; d++) { + *d = NULL; + } + } +} + +// Unused +void CollisionCheck_EnableSAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx) { + colChkCtx->sacFlags |= 1; +} + +// Unused +void CollisionCheck_DisableSAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx) { + colChkCtx->sacFlags &= ~1; +} + +// Draw Collider +void func_8005D4DC(GlobalContext* globalCtx, Collider* collider) { + ColliderJntSph* jntSph; + ColliderCylinder* cylinder; + ColliderTris* tris; + ColliderTrisItem* trisItem; + ColliderQuad* quad; + s32 i; + + if (collider == NULL) { + return; + } + switch (collider->shape) { + case COLSHAPE_JNTSPH: + jntSph = (ColliderJntSph*)collider; + for (i = 0; i < jntSph->count; i++) { + func_800D05D0(globalCtx, &jntSph->list[i].dim.worldSphere); + } + break; + case COLSHAPE_CYLINDER: + cylinder = (ColliderCylinder*)collider; + func_800D05DC(globalCtx, &cylinder->dim); + break; + case COLSHAPE_TRIS: + tris = (ColliderTris*)collider; + for (i = 0; i < tris->count; i++) { + trisItem = &tris->list[i]; + func_8005B280(globalCtx->state.gfxCtx, &trisItem->dim.vtx[0], &trisItem->dim.vtx[1], + &trisItem->dim.vtx[2]); + } + break; + case COLSHAPE_QUAD: + quad = (ColliderQuad*)collider; + func_8005B280(globalCtx->state.gfxCtx, &quad->dim.quad[2], &quad->dim.quad[3], &quad->dim.quad[1]); + func_8005B280(globalCtx->state.gfxCtx, &quad->dim.quad[1], &quad->dim.quad[0], &quad->dim.quad[2]); + break; + } +} + +void CollisionCheck_Draw(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx) { + Collider* collider; + s32 i; + + if (AREG(15)) { + if (AREG(21)) { + for (i = 0; i < colChkCtx->colAtCount; i++) { + func_8005D4DC(globalCtx, colChkCtx->colAt[i]); + } + } + if (AREG(22)) { + for (i = 0; i < colChkCtx->colAcCount; i++) { + func_8005D4DC(globalCtx, colChkCtx->colAc[i]); + } + } + if (AREG(23)) { + for (i = 0; i < colChkCtx->colOcCount; i++) { + collider = colChkCtx->colOc[i]; + if (collider->maskA & 1) { + func_8005D4DC(globalCtx, collider); + } + } + } + if (AREG(24)) { + func_80042C3C(globalCtx, &globalCtx->colCtx); + } + if (AREG(25)) { + func_80042FC4(globalCtx, &globalCtx->colCtx); + } + } +} + +s32 (*D_8011DEF8[])(GlobalContext*, Collider*) = { Collider_JntSphSetAT, Collider_CylinderSetAT, Collider_TrisSetAT, + Collider_QuadSetAT }; + +// Sets collider as an AT (attack) for the current frame, which will be checked against ACs (attack colliders) +s32 CollisionCheck_SetAT(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider) { + s32 index; + + if (func_800C0D28(globalCtx) == 1) { + return -1; + } + if (!(collider->shape < COLSHAPE_INVALID)) { + __assert("pcl_obj->data_type <= CL_DATA_LBL_SWRD", "../z_collision_check.c", 2997); + } + D_8011DEF8[collider->shape](globalCtx, collider); + if (collider->actor != NULL) { + if (collider->actor->update == NULL) { + return -1; + } + } + if (colChkCtx->colAtCount >= COLLISION_CHECK_AT_MAX) { + osSyncPrintf("CollisionCheck_setAT():インデックスがオーバーして追加不能\n"); + // EUC-JP: インデックスがオーバーして追加不能 | Index exceeded and cannot be added + return -1; + } + if (colChkCtx->sacFlags & 1) { + return -1; + } + index = colChkCtx->colAtCount; + colChkCtx->colAt[colChkCtx->colAtCount++] = collider; + return index; +} + +// Unused. Sets collider as an AT (attack) for the current frame, which will be checked against ACs (attack colliders). +// If CollisionCheck_SAC is enabled, the collider will be inserted into the list at the specified index, otherwise it +// will be inserted into the next slot +s32 CollisionCheck_SetAT_SAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider, + s32 index) { + + if (!(collider->shape < COLSHAPE_INVALID)) { + __assert("pcl_obj->data_type <= CL_DATA_LBL_SWRD", "../z_collision_check.c", 3037); + } + if (func_800C0D28(globalCtx) == 1) { + return -1; + } + D_8011DEF8[collider->shape](globalCtx, collider); + if (collider->actor != NULL && collider->actor->update == NULL) { + return -1; + } + if (colChkCtx->sacFlags & 1) { + if (!(index < colChkCtx->colAtCount)) { + osSyncPrintf("CollisionCheck_setAT_SAC():全データ数より大きいところに登録しようとしている。\n"); + // EUC-JP: 全データ数より大きいところに登録しようとしている。 | You are trying to register a location that + // is larger than the total number of data. + return -1; + } + colChkCtx->colAt[index] = collider; + } else { + if (!(colChkCtx->colAtCount < COLLISION_CHECK_AT_MAX)) { + osSyncPrintf("CollisionCheck_setAT():インデックスがオーバーして追加不能\n"); + return -1; + } + index = colChkCtx->colAtCount; + colChkCtx->colAt[colChkCtx->colAtCount++] = collider; + } + return index; +} + +s32 (*D_8011DF08[])(GlobalContext*, Collider*) = { Collider_JntSphSetAC, Collider_CylinderSetAC, Collider_TrisSetAC, + Collider_QuadSetAC }; + +// Sets collider as an AC (attack collider) for the current frame, allowing it to detect ATs (attacks) +s32 CollisionCheck_SetAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider) { + s32 index; + + if (func_800C0D28(globalCtx) == 1) { + return -1; + } + if (!(collider->shape < COLSHAPE_INVALID)) { + __assert("pcl_obj->data_type <= CL_DATA_LBL_SWRD", "../z_collision_check.c", 3114); + } + D_8011DF08[collider->shape](globalCtx, collider); + if (collider->actor != NULL) { + if (collider->actor->update == NULL) { + return -1; + } + } + if (colChkCtx->colAcCount >= COLLISION_CHECK_AC_MAX) { + osSyncPrintf("CollisionCheck_setAC():インデックスがオーバして追加不能\n"); + // EUC-JP: インデックスがオーバして追加不能 | Index exceeded and cannot be added + return -1; + } + if (colChkCtx->sacFlags & 1) { + return -1; + } + index = colChkCtx->colAcCount; + colChkCtx->colAc[colChkCtx->colAcCount++] = collider; + return index; +} + +// Unused. Sets collider as an AC (attack collider) for the current frame, allowing it to detect ATs (attacks). +// If CollisionCheck_SAC is enabled, the collider will be inserted into the list at the specified index, otherwise it +// will be inserted into the next slot +s32 CollisionCheck_SetAC_SAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider, + s32 index) { + + if (!(collider->shape < COLSHAPE_INVALID)) { + __assert("pcl_obj->data_type <= CL_DATA_LBL_SWRD", "../z_collision_check.c", 3153); + } + if (func_800C0D28(globalCtx) == 1) { + return -1; + } + D_8011DF08[collider->shape](globalCtx, collider); + if (collider->actor != NULL && collider->actor->update == NULL) { + return -1; + } + if (colChkCtx->sacFlags & 1) { + if (!(index < colChkCtx->colAcCount)) { + osSyncPrintf("CollisionCheck_setAC_SAC():全データ数より大きいところに登録しようとしている。\n"); + // EUC-JP: 全データ数より大きいところに登録しようとしている。| You are trying to register a location that is + // larger than the total number of data. + return -1; + } + colChkCtx->colAc[index] = collider; + } else { + if (!(colChkCtx->colAcCount < COLLISION_CHECK_AC_MAX)) { + osSyncPrintf("CollisionCheck_setAC():インデックスがオーバして追加不能\n"); + // EUC-JP: インデックスがオーバして追加不能 | Index exceeded and cannot be added + return -1; + } + index = colChkCtx->colAcCount; + colChkCtx->colAc[colChkCtx->colAcCount++] = collider; + } + return index; +} + +s32 (*D_8011DF18[])(GlobalContext*, Collider*) = { + Collider_JntSphSetOC, + Collider_CylinderSetOC, + Collider_TrisSetOC, + Collider_QuadSetOC, +}; + +// Sets collider as an OC (object collider) for the current frame, allowing it to detect other OCs +s32 CollisionCheck_SetOC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider) { + s32 index; + + if (func_800C0D28(globalCtx) == 1) { + return -1; + } + if (!(collider->shape < COLSHAPE_INVALID)) { + __assert("pcl_obj->data_type <= CL_DATA_LBL_SWRD", "../z_collision_check.c", 3229); + } + D_8011DF18[collider->shape](globalCtx, collider); + if (collider->actor != NULL) { + if (collider->actor->update == NULL) { + return -1; + } + } + if (colChkCtx->colOcCount >= COLLISION_CHECK_OC_MAX) { + osSyncPrintf("CollisionCheck_setOC():インデックスがオーバして追加不能\n"); + // EUC-JP: インデックスがオーバして追加不能 | Index exceeded and cannot be added + return -1; + } + if (colChkCtx->sacFlags & 1) { + return -1; + } + index = colChkCtx->colOcCount; + colChkCtx->colOc[colChkCtx->colOcCount++] = collider; + return index; +} + +// Unused. Sets collider as an OC (object collider) for the current frame, allowing it to detect other OCs +// If CollisionCheck_SAC is enabled, the collider will be inserted into the list at the specified index, otherwise it +// will be inserted into the next slot +s32 CollisionCheck_SetOC_SAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider, + s32 index) { + + if (func_800C0D28(globalCtx) == 1) { + return -1; + } + if (!(collider->shape < COLSHAPE_INVALID)) { + __assert("pcl_obj->data_type <= CL_DATA_LBL_SWRD", "../z_collision_check.c", 3274); + } + D_8011DF18[collider->shape](globalCtx, collider); + if (collider->actor != NULL && collider->actor->update == NULL) { + return -1; + } + if (colChkCtx->sacFlags & 1) { + if (!(index < colChkCtx->colOcCount)) { + osSyncPrintf("CollisionCheck_setOC_SAC():全データ数より大きいところに登録しようとしている。\n"); + // EUC-JP: 全データ数より大きいところに登録しようとしている。| You are trying to register a location that is + // larger than the total number of data. + return -1; + } + // BUG: Should be colOc + colChkCtx->colAt[index] = collider; + } else { + if (!(colChkCtx->colOcCount < COLLISION_CHECK_OC_MAX)) { + osSyncPrintf("CollisionCheck_setOC():インデックスがオーバして追加不能\n"); + // EUC-JP: インデックスがオーバして追加不能 | Index exceeded and cannot be added + return -1; + } + index = colChkCtx->colOcCount; + colChkCtx->colOc[colChkCtx->colOcCount++] = collider; + } + return index; +} + +s32 CollisionCheck_SetOCLine(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, OcLine* collider) { + s32 index; + + if (func_800C0D28(globalCtx) == 1) { + return -1; + } + func_8005D3A4(globalCtx, collider); + if (!(colChkCtx->colOcLineCount < COLLISION_CHECK_OC_LINE_MAX)) { + osSyncPrintf("CollisionCheck_setOCLine():インデックスがオーバして追加不能\n"); + return -1; + } + index = colChkCtx->colOcLineCount; + colChkCtx->colOcLine[colChkCtx->colOcLineCount++] = collider; + return index; +} + +s32 func_8005DF2C(ColliderBody* body) { + if (!(body->toucherFlags & 1)) { + return 1; + } + return 0; +} + +s32 func_8005DF50(ColliderBody* body) { + if (!(body->bumperFlags & 1)) { + return 1; + } + return 0; +} + +s32 func_8005DF74(ColliderBody* left, ColliderBody* right) { + if (!(left->toucher.flags & right->bumper.flags)) { + return 1; + } + return 0; +} + +void func_8005DF9C(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { +} + +#ifdef NON_MATCHING +// Blue EffSpark +//.bss problems +void func_8005DFAC(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { + s32 sp24; + static EffSparkParams D_8015D8A0; + + D_8015D8A0.position.x = (s32)v->x; + D_8015D8A0.position.y = (s32)v->y; + D_8015D8A0.position.z = (s32)v->z; + D_8015D8A0.particleFactor1 = 5; + D_8015D8A0.particleFactor2 = 5; + D_8015D8A0.colorStart[0].r = 0x0A; + D_8015D8A0.colorStart[0].g = 0x0A; + D_8015D8A0.colorStart[0].b = 0xC8; + D_8015D8A0.colorStart[0].a = 0xFF; + D_8015D8A0.colorStart[1].r = 0x00; + D_8015D8A0.colorStart[1].g = 0x00; + D_8015D8A0.colorStart[1].b = 0x80; + D_8015D8A0.colorStart[1].a = 0xFF; + D_8015D8A0.colorStart[2].r = 0x00; + D_8015D8A0.colorStart[2].g = 0x00; + D_8015D8A0.colorStart[2].b = 0x80; + D_8015D8A0.colorStart[2].a = 0xFF; + D_8015D8A0.colorStart[3].r = 0x00; + D_8015D8A0.colorStart[3].g = 0x00; + D_8015D8A0.colorStart[3].b = 0x80; + D_8015D8A0.colorStart[3].a = 0xFF; + D_8015D8A0.colorEnd[0].r = 0x00; + D_8015D8A0.colorEnd[0].g = 0x00; + D_8015D8A0.colorEnd[0].b = 0x20; + D_8015D8A0.colorEnd[0].a = 0x00; + D_8015D8A0.colorEnd[1].r = 0x00; + D_8015D8A0.colorEnd[1].g = 0x00; + D_8015D8A0.colorEnd[1].b = 0x20; + D_8015D8A0.colorEnd[1].a = 0x00; + D_8015D8A0.colorEnd[2].r = 0x00; + D_8015D8A0.colorEnd[2].g = 0x00; + D_8015D8A0.colorEnd[2].b = 0x40; + D_8015D8A0.colorEnd[2].a = 0x00; + D_8015D8A0.colorEnd[3].r = 0x00; + D_8015D8A0.colorEnd[3].g = 0x00; + D_8015D8A0.colorEnd[3].b = 0x40; + D_8015D8A0.colorEnd[3].a = 0x00; + D_8015D8A0.age = 0; + D_8015D8A0.duration = 16; + D_8015D8A0.velocity = 8.0f; + D_8015D8A0.gravity = -1.0f; + Effect_Add(globalCtx, &sp24, 0, 0, 1, &D_8015D8A0); +} +#else +void func_8005DFAC(GlobalContext* globalCtx, Collider* collider, Vec3f* v); #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005DFAC.s") +#endif // NON_MATCHING -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005E2EC.s") +#ifdef NON_MATCHING +// Green EffSpark +//.bss problems +void func_8005E10C(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { + s32 sp24; + static EffSparkParams D_8015DD68; + // D_8015DD68 + D_8015DD68.position.x = (s32)v->x; + D_8015DD68.position.y = (s32)v->y; + D_8015DD68.position.z = (s32)v->z; + D_8015DD68.particleFactor1 = 5; + D_8015DD68.particleFactor2 = 5; + D_8015DD68.colorStart[0].r = 0x0A; + D_8015DD68.colorStart[0].g = 0xC8; + D_8015DD68.colorStart[0].b = 0x0A; + D_8015DD68.colorStart[0].a = 0xFF; + D_8015DD68.colorStart[1].r = 0x00; + D_8015DD68.colorStart[1].g = 0x80; + D_8015DD68.colorStart[1].b = 0x00; + D_8015DD68.colorStart[1].a = 0xFF; + D_8015DD68.colorStart[2].r = 0x00; + D_8015DD68.colorStart[2].g = 0x80; + D_8015DD68.colorStart[2].b = 0x00; + D_8015DD68.colorStart[2].a = 0xFF; + D_8015DD68.colorStart[3].r = 0x00; + D_8015DD68.colorStart[3].g = 0x80; + D_8015DD68.colorStart[3].b = 0x00; + D_8015DD68.colorStart[3].a = 0xFF; + D_8015DD68.colorEnd[0].r = 0x00; + D_8015DD68.colorEnd[0].g = 0x20; + D_8015DD68.colorEnd[0].b = 0x00; + D_8015DD68.colorEnd[0].a = 0x00; + D_8015DD68.colorEnd[1].r = 0x00; + D_8015DD68.colorEnd[1].g = 0x20; + D_8015DD68.colorEnd[1].b = 0x00; + D_8015DD68.colorEnd[1].a = 0x00; + D_8015DD68.colorEnd[2].r = 0x00; + D_8015DD68.colorEnd[2].g = 0x40; + D_8015DD68.colorEnd[2].b = 0x00; + D_8015DD68.colorEnd[2].a = 0x00; + D_8015DD68.colorEnd[3].r = 0x00; + D_8015DD68.colorEnd[3].g = 0x40; + D_8015DD68.colorEnd[3].b = 0x00; + D_8015DD68.colorEnd[3].a = 0x00; + D_8015DD68.age = 0; + D_8015DD68.duration = 16; + D_8015DD68.velocity = 8.0f; + D_8015DD68.gravity = -1.0f; + Effect_Add(globalCtx, &sp24, 0, 0, 1, &D_8015DD68); +} +#else +void func_8005E10C(GlobalContext* globalCtx, Collider* collider, Vec3f* v); +#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005E10C.s") +#endif // NON_MATCHING -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005E4F8.s") +void func_8005E26C(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { + func_800299AC(globalCtx, v); + func_80062B80(globalCtx, v); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005E604.s") +void func_8005E2A4(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { + func_80062A28(globalCtx, v); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005E800.s") +void func_8005E2C8(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { + func_80062A28(globalCtx, v); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005E81C.s") +void func_8005E2EC(GlobalContext* globalCtx, ColliderBody* colliderBody, Collider* collider, Vec3f* arg3) { + s32 flags; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_800611A0.s") + flags = colliderBody->toucherFlags & 0x18; + if (flags == 0 && collider->type != COLTYPE_METAL_SHIELD) { + func_80029CA4(globalCtx, 0, arg3); + if (collider->actor == NULL) { + Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + return; + } + Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->unk_E4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + return; + } + if (flags == 0) { + func_80029CA4(globalCtx, 3, arg3); + if (collider->actor == NULL) { + func_80062D60(globalCtx, arg3); + return; + } + func_80062DAC(globalCtx, arg3, &collider->actor->unk_E4); + return; + } + if (flags == 8) { + func_80029CA4(globalCtx, 0, arg3); + if (collider->actor == NULL) { + Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + return; + } + Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &collider->actor->unk_E4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + return; + } + if (flags == 0x10) { + func_80029CA4(globalCtx, 1, arg3); + if (collider->actor == NULL) { + Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + return; + } + Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &collider->actor->unk_E4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + return; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80061274.s") +s32 func_8005E4F8(Collider* left, ColliderBody* rightBody) { + if (left->actor != NULL) { + if (ACTORTYPE_PLAYER == left->actor->type) { + if (rightBody->flags == 0) { + Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE, &left->actor->unk_E4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } else if (rightBody->flags == 1) { + Audio_PlaySoundGeneral(NA_SE_IT_SWORD_STRIKE_HARD, &left->actor->unk_E4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } else if (2 == rightBody->flags) { + Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &left->actor->unk_E4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } else if (rightBody->flags == 3) { + Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &left->actor->unk_E4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } + } + } + return 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8006139C.s") +typedef struct { + u8 unk00; + u8 unk01; +} D_8011DF40_s; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8006146C.s") +void func_8005E604(GlobalContext* globalCtx, Collider* left, ColliderBody* leftBody, Collider* right, + ColliderBody* rightBody, Vec3f* arg5) { -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_800614A4.s") + static void (*D_8011DF28[])(GlobalContext*, Collider*, Vec3f*) = { + func_8005DF9C, func_8005DFAC, func_8005E10C, func_8005E26C, func_8005E2A4, func_8005E2C8, + }; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8006199C.s") + static D_8011DF40_s D_8011DF40[] = { + { 1, 0 }, { 0, 1 }, { 2, 1 }, { 0, 0 }, { 3, 5 }, { 0, 2 }, { 2, 0 }, + { 4, 0 }, { 1, 2 }, { 0, 3 }, { 0, 5 }, { 0, 3 }, { 0, 3 }, { 0, 4 }, + }; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80061BF4.s") + if (rightBody->bumperFlags & 0x40) { + return; + } + if (!(leftBody->toucherFlags & 0x20) && leftBody->toucherFlags & 0x40) { + return; + } + if (right->actor != NULL) { + (*D_8011DF28[D_8011DF40[right->type].unk00])(globalCtx, right, arg5); + } + if (right->actor != NULL) { + if (D_8011DF40[right->type].unk01 == 3) { + func_8005E2EC(globalCtx, leftBody, right, arg5); + } else if (D_8011DF40[right->type].unk01 == 4) { + if (left->actor == NULL) { + func_80062CD4(globalCtx, arg5); + Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } else { + func_80062E14(globalCtx, arg5, &left->actor->unk_E4); + } + } else if (D_8011DF40[right->type].unk01 != 5) { + func_80029CA4(globalCtx, D_8011DF40[right->type].unk01, arg5); + if ((rightBody->bumperFlags & 0x20) == 0) { + func_8005E4F8(left, rightBody); + } + } + } else { + func_80029CA4(globalCtx, 0, arg5); + if (right->actor == NULL) { + Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } else { + Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &right->actor->unk_E4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80061C18.s") +void func_8005E800(Collider* left, Collider* right) { + left->atFlags |= 4; + right->acFlags |= 0x80; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80061C98.s") +// Set AT to AC collision +s32 func_8005E81C(GlobalContext* globalCtx, Collider* left, ColliderBody* leftBody, Vec3f* leftv, Collider* right, + ColliderBody* rightBody, Vec3f* rightv, Vec3f* arg7) { -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80061E48.s") + if (right->acFlags & 4 && left->actor != NULL && right->actor != NULL) { + func_8005E800(left, right); + } + if (!(rightBody->bumperFlags & 8)) { + left->atFlags |= 2; + left->at = right->actor; + leftBody->atHit = right; + leftBody->atHitItem = rightBody; + leftBody->toucherFlags |= 2; + if (left->actor != NULL) { + left->actor->colChkInfo.atHitEffect = rightBody->bumper.effect; + } + } + right->acFlags |= 2; + right->ac = left->actor; + rightBody->acHit = left; + rightBody->acHitItem = leftBody; + rightBody->bumperFlags |= 2; + if (right->actor != NULL) { + right->actor->colChkInfo.acHitEffect = leftBody->toucher.effect; + } + rightBody->bumper.unk_06.x = (s16)arg7->x; + rightBody->bumper.unk_06.y = (s16)arg7->y; + rightBody->bumper.unk_06.z = (s16)arg7->z; + if (!(leftBody->toucherFlags & 0x20) && right->type != COLTYPE_METAL_SHIELD && + right->type != COLTYPE_WOODEN_SHIELD && right->type != COLTYPE_UNK12) { + rightBody->bumperFlags |= 0x80; + } else { + func_8005E604(globalCtx, left, leftBody, right, rightBody, arg7); + leftBody->toucherFlags |= 0x40; + } + return 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80061E8C.s") +void CollisionCheck_AC_JntSphVsJntSph(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + ColliderJntSph* left; + ColliderJntSph* right; + ColliderJntSphItem* lItem; + ColliderJntSphItem* rItem; + f32 sp8C; + f32 sp88; + f32 temp_f0; + Vec3f sp78; + Vec3f sp6C; + Vec3f sp60; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80061ED4.s") + left = (ColliderJntSph*)l; + right = (ColliderJntSph*)r; + if (left->count <= 0 || left->list == NULL || right->count <= 0 || right->list == NULL) { + return; + } + for (lItem = left->list; lItem < left->list + left->count; lItem++) { + if (func_8005DF2C(&lItem->body) == 1) { + continue; + } + for (rItem = right->list; rItem < right->list + right->count; rItem++) { + if (func_8005DF50(&rItem->body) == 1) { + continue; + } + if (func_8005DF74(&lItem->body, &rItem->body) == 1) { + continue; + } + if (Math3D_SpheresTouchingSurfaceCenter(&lItem->dim.worldSphere, &rItem->dim.worldSphere, &sp8C, &sp88) == + 1) { + sp6C.x = lItem->dim.worldSphere.center.x; + sp6C.y = lItem->dim.worldSphere.center.y; + sp6C.z = lItem->dim.worldSphere.center.z; + sp60.x = rItem->dim.worldSphere.center.x; + sp60.y = rItem->dim.worldSphere.center.y; + sp60.z = rItem->dim.worldSphere.center.z; + if (!(fabsf(sp88) < 0.008f)) { + temp_f0 = rItem->dim.worldSphere.radius / sp88; + sp78.x = (((sp6C.x - sp60.x) * temp_f0) + sp60.x); + sp78.y = (((sp6C.y - sp60.y) * temp_f0) + sp60.y); + sp78.z = (((sp6C.z - sp60.z) * temp_f0) + sp60.z); + } else { + Math_Vec3f_Copy(&sp78, &sp6C); + } + func_8005E81C(globalCtx, &left->base, &lItem->body, &sp6C, &right->base, &rItem->body, &sp60, &sp78); + if (!(right->base.maskB & 0x40)) { + return; + } + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80061EFC.s") +void CollisionCheck_AC_JntSphVsCyl(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + ColliderJntSph* left = (ColliderJntSph*)l; + ColliderCylinder* right = (ColliderCylinder*)r; + ColliderJntSphItem* lItem; + f32 sp80; + f32 sp7C; + Vec3f sp70; + Vec3f sp64; + Vec3f sp58; + f32 temp_f0; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80061F64.s") + if (left->count <= 0 || left->list == NULL || right->dim.radius <= 0 || right->dim.height <= 0) { + return; + } + if (func_8005DF50(&right->body) == 1) { + return; + } + for (lItem = left->list; lItem < left->list + left->count; lItem++) { + if (func_8005DF2C(&lItem->body) == 1) { + continue; + } + if (func_8005DF74(&lItem->body, &right->body) == 1) { + continue; + } + if (func_800CFDA4(&lItem->dim.worldSphere, &right->dim, &sp80, &sp7C) != 0) { + sp64.x = lItem->dim.worldSphere.center.x; + sp64.y = lItem->dim.worldSphere.center.y; + sp64.z = lItem->dim.worldSphere.center.z; + sp58.x = right->dim.pos.x; + sp58.y = right->dim.pos.y; + sp58.z = right->dim.pos.z; + if (!(fabsf(sp7C) < 0.008f)) { + temp_f0 = right->dim.radius / sp7C; + if (temp_f0 <= 1.0f) { + sp70.x = ((sp64.x - sp58.x) * temp_f0) + sp58.x; + sp70.y = ((sp64.y - sp58.y) * temp_f0) + sp58.y; + sp70.z = ((sp64.z - sp58.z) * temp_f0) + sp58.z; + } else { + Math_Vec3f_Copy(&sp70, &sp64); + } + } else { + Math_Vec3f_Copy(&sp70, &sp64); + } + func_8005E81C(globalCtx, &left->base, &lItem->body, &sp64, &right->base, &right->body, &sp58, &sp70); + return; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_800622E4.s") +void CollisionCheck_AC_CylVsJntSph(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + ColliderCylinder* left = (ColliderCylinder*)l; + ColliderJntSph* right = (ColliderJntSph*)r; + f32 sp9C; + f32 sp98; + ColliderJntSphItem* rItem; + Vec3f sp88; + Vec3f sp7C; + Vec3f sp70; + f32 temp_f0; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80062530.s") + if (right->count <= 0 || right->list == NULL || left->dim.radius <= 0 || left->dim.height <= 0) { + return; + } + if (func_8005DF2C(&left->body) == 1) { + return; + } + for (rItem = right->list; rItem < right->list + right->count; rItem++) { + if (func_8005DF50(&rItem->body) == 1) { + continue; + } + if (func_8005DF74(&left->body, &rItem->body) == 1) { + continue; + } + if (func_800CFDA4(&rItem->dim.worldSphere, &left->dim, &sp9C, &sp98) != 0) { + sp7C.x = left->dim.pos.x; + sp7C.y = left->dim.pos.y; + sp7C.z = left->dim.pos.z; + sp70.x = rItem->dim.worldSphere.center.x; + sp70.y = rItem->dim.worldSphere.center.y; + sp70.z = rItem->dim.worldSphere.center.z; + if (!(fabsf(sp98) < 0.008f)) { + temp_f0 = (f32)rItem->dim.worldSphere.radius / sp98; + if (temp_f0 <= 1.0f) { + sp88.x = ((sp7C.x - sp70.x) * temp_f0) + sp70.x; + sp88.y = ((sp7C.y - sp70.y) * temp_f0) + sp70.y; + sp88.z = ((sp7C.z - sp70.z) * temp_f0) + sp70.z; + } else { + Math_Vec3f_Copy(&sp88, &sp7C); + } + } else { + Math_Vec3f_Copy(&sp88, &sp7C); + } + func_8005E81C(globalCtx, &left->base, &left->body, &sp7C, &right->base, &rItem->body, &sp70, &sp88); + if (!(right->base.maskB & 0x40)) { + break; + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_800626B0.s") +void CollisionCheck_AC_JntSphVsTris(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + ColliderJntSph* left = (ColliderJntSph*)l; + ColliderTris* right = (ColliderTris*)r; + ColliderJntSphItem* lItem; + ColliderTrisItem* rItem; + Vec3f sp6C; + Vec3f sp60; + Vec3f sp54; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_800626DC.s") + if (left->count <= 0 || left->list == NULL || right->count <= 0 || right->list == NULL) { + return; + } + for (lItem = left->list; lItem < left->list + left->count; lItem++) { + if (func_8005DF2C(&lItem->body) == 1) { + continue; + } + for (rItem = right->list; rItem < right->list + right->count; rItem++) { + if (func_8005DF50(&rItem->body) == 1) { + continue; + } + if (func_8005DF74(&lItem->body, &rItem->body) == 1) { + continue; + } + if (func_800CE934(&lItem->dim.worldSphere, &rItem->dim, &sp6C) == 1) { + sp60.x = lItem->dim.worldSphere.center.x; + sp60.y = lItem->dim.worldSphere.center.y; + sp60.z = lItem->dim.worldSphere.center.z; + sp54.x = (rItem->dim.vtx[0].x + rItem->dim.vtx[1].x + rItem->dim.vtx[2].x) * (1.0f / 3); + sp54.y = (rItem->dim.vtx[0].y + rItem->dim.vtx[1].y + rItem->dim.vtx[2].y) * (1.0f / 3); + sp54.z = (rItem->dim.vtx[0].z + rItem->dim.vtx[1].z + rItem->dim.vtx[2].z) * (1.0f / 3); + func_8005E81C(globalCtx, &left->base, &lItem->body, &sp60, &right->base, &rItem->body, &sp54, &sp6C); + return; + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80062734.s") +void CollisionCheck_AC_TrisVsJntSph(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + ColliderTris* left = (ColliderTris*)l; + ColliderTrisItem* lItem; + ColliderJntSph* right = (ColliderJntSph*)r; + ColliderJntSphItem* rItem; + Vec3f sp7C; + Vec3f sp70; + Vec3f sp64; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_800627A0.s") + if (right->count > 0 && right->list != NULL) { + if (left->count > 0 && left->list != NULL) { + for (rItem = right->list; rItem < right->list + right->count; rItem++) { + if (func_8005DF50(&rItem->body) == 1) { + continue; + } + for (lItem = left->list; lItem < left->list + left->count; lItem++) { + if (func_8005DF2C(&lItem->body) == 1) { + continue; + } + if (func_8005DF74(&lItem->body, &rItem->body) == 1) { + continue; + } + if (func_800CE934(&rItem->dim.worldSphere, &lItem->dim, &sp7C) == 1) { + Math_Vec3s_ToVec3f(&sp64, &rItem->dim.worldSphere.center); + sp70.x = (lItem->dim.vtx[0].x + lItem->dim.vtx[1].x + lItem->dim.vtx[2].x) * (1.0f / 3); + sp70.y = (lItem->dim.vtx[0].y + lItem->dim.vtx[1].y + lItem->dim.vtx[2].y) * (1.0f / 3); + sp70.z = (lItem->dim.vtx[0].z + lItem->dim.vtx[1].z + lItem->dim.vtx[2].z) * (1.0f / 3); + func_8005E81C(globalCtx, &left->base, &lItem->body, &sp70, &right->base, &rItem->body, &sp64, + &sp7C); + if (!(right->base.maskB & 0x40)) { + return; + } + } + } + } + } + } +} +extern TriNorm D_8015E230; +extern TriNorm D_8015E268; + +void CollisionCheck_AC_JntSphVsQuad(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + ColliderJntSph* left = (ColliderJntSph*)l; + ColliderQuad* right = (ColliderQuad*)r; + Vec3f sp7C; + ColliderJntSphItem* lItem; + Vec3f sp6C; + Vec3f sp60; + + if (left->count > 0 && left->list != NULL) { + if (func_8005DF50(&right->body) == 1) { + return; + } + Math3D_TriNorm(&D_8015E230, &right->dim.quad[2], &right->dim.quad[3], &right->dim.quad[1]); + Math3D_TriNorm(&D_8015E268, &right->dim.quad[1], &right->dim.quad[0], &right->dim.quad[2]); + for (lItem = left->list; lItem < left->list + left->count; lItem++) { + if (func_8005DF2C(&lItem->body) == 1) { + continue; + } + if (func_8005DF74(&lItem->body, &right->body) == 1) { + continue; + } + if (func_800CE934(&lItem->dim.worldSphere, &D_8015E230, &sp7C) == 1 || + func_800CE934(&lItem->dim.worldSphere, &D_8015E268, &sp7C) == 1) { + Math_Vec3s_ToVec3f(&sp6C, &lItem->dim.worldSphere.center); + + sp60.x = + (right->dim.quad[0].x + (right->dim.quad[1].x + (right->dim.quad[3].x + right->dim.quad[2].x))) * + (1.0f / 4); + sp60.y = + (right->dim.quad[0].y + (right->dim.quad[1].y + (right->dim.quad[3].y + right->dim.quad[2].y))) * + (1.0f / 4); + sp60.z = + (right->dim.quad[0].z + (right->dim.quad[1].z + (right->dim.quad[3].z + right->dim.quad[2].z))) * + (1.0f / 4); + func_8005E81C(globalCtx, &left->base, &lItem->body, &sp6C, &right->base, &right->body, &sp60, &sp7C); + return; + } + } + } +} + +extern TriNorm D_8015E2A0; +extern TriNorm D_8015E2D8; + +void CollisionCheck_AC_QuadVsJntSph(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + ColliderJntSph* right = (ColliderJntSph*)r; + Vec3f sp88; + ColliderQuad* left = (ColliderQuad*)l; + ColliderJntSphItem* rItem; + Vec3f sp74; + Vec3f sp68; + + if (right->count > 0 && right->list != NULL) { + if (func_8005DF2C(&left->body) != 1) { + Math3D_TriNorm(&D_8015E2A0, &left->dim.quad[2], &left->dim.quad[3], &left->dim.quad[1]); + Math3D_TriNorm(&D_8015E2D8, &left->dim.quad[2], &left->dim.quad[1], &left->dim.quad[0]); + for (rItem = right->list; rItem < right->list + right->count; rItem++) { + if (func_8005DF50(&rItem->body) == 1) { + continue; + } + if (func_8005DF74(&left->body, &rItem->body) == 1) { + continue; + } + if (func_800CE934(&rItem->dim.worldSphere, &D_8015E2A0, &sp88) != 1 && + func_800CE934(&rItem->dim.worldSphere, &D_8015E2D8, &sp88) != 1) { + continue; + } + if (func_8005D218(globalCtx, left, &sp88) != 0) { + sp68.x = rItem->dim.worldSphere.center.x; + sp68.y = rItem->dim.worldSphere.center.y; + sp68.z = rItem->dim.worldSphere.center.z; + + sp74.x = + (left->dim.quad[0].x + (left->dim.quad[1].x + (left->dim.quad[3].x + left->dim.quad[2].x))) * + (1.0f / 4); + sp74.y = + (left->dim.quad[0].y + (left->dim.quad[1].y + (left->dim.quad[3].y + left->dim.quad[2].y))) * + (1.0f / 4); + sp74.z = + (left->dim.quad[0].z + (left->dim.quad[1].z + (left->dim.quad[3].z + left->dim.quad[2].z))) * + (1.0f / 4); + func_8005E81C(globalCtx, &left->base, &left->body, &sp74, &right->base, &rItem->body, &sp68, &sp88); + if ((right->base.maskB & 0x40) == 0) { + return; + } + } + } + } + } +} + +void CollisionCheck_AC_CylVsCyl(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { + ColliderCylinder* left = (ColliderCylinder*)l; + ColliderCylinder* right = (ColliderCylinder*)r; + f32 sp6C; + f32 sp68; + Vec3f sp5C; + Vec3f sp50; + Vec3f sp44; + f32 temp_f0; + + if (left->dim.radius <= 0 || left->dim.height <= 0 || right->dim.radius <= 0 || right->dim.height <= 0) { + return; + } + if (func_8005DF50(&right->body) == 1) { + return; + } + if (func_8005DF2C(&left->body) == 1) { + return; + } + if (func_8005DF74(&left->body, &right->body) == 1) { + return; + } + if (Math3D_CylinderOutCylinderDist(&left->dim, &right->dim, &sp6C, &sp68) == 1) { + Math_Vec3s_ToVec3f(&sp50, &left->dim.pos); + Math_Vec3s_ToVec3f(&sp44, &right->dim.pos); + if (!(fabsf(sp68) < 0.008f)) { + temp_f0 = (f32)right->dim.radius / sp68; + sp5C.y = (f32)right->dim.pos.y + (f32)right->dim.yShift + (f32)right->dim.height * 0.5f; + sp5C.x = ((f32)left->dim.pos.x - right->dim.pos.x) * temp_f0 + right->dim.pos.x; + sp5C.z = ((f32)left->dim.pos.z - right->dim.pos.z) * temp_f0 + right->dim.pos.z; + } else { + Math_Vec3s_ToVec3f(&sp5C, &right->dim.pos); + } + func_8005E81C(globalCtx, &left->base, &left->body, &sp50, &right->base, &right->body, &sp44, &sp5C); + } +} + +void CollisionCheck_AC_CylVsTris(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { + ColliderCylinder* left = (ColliderCylinder*)l; + ColliderTris* right = (ColliderTris*)r; + ColliderTrisItem* rItem; + Vec3f sp68; + Vec3f sp5C; + Vec3f sp50; + + if (left->dim.radius > 0 && left->dim.height > 0 && right->count > 0 && right->list != NULL) { + if (func_8005DF2C(&left->body) == 1) { + return; + } + for (rItem = right->list; rItem < right->list + right->count; rItem++) { + if (func_8005DF50(&rItem->body) == 1) { + continue; + } + if (func_8005DF74(&left->body, &rItem->body) == 1) { + continue; + } + if (Math3D_CylTriTouchingIntersect(&left->dim, &rItem->dim, &sp68) == 1) { + Math_Vec3s_ToVec3f(&sp5C, &left->dim.pos); + + sp50.x = (rItem->dim.vtx[0].x + rItem->dim.vtx[1].x + rItem->dim.vtx[2].x) * (1.0f / 3); + sp50.y = (rItem->dim.vtx[0].y + rItem->dim.vtx[1].y + rItem->dim.vtx[2].y) * (1.0f / 3); + sp50.z = (rItem->dim.vtx[0].z + rItem->dim.vtx[1].z + rItem->dim.vtx[2].z) * (1.0f / 3); + func_8005E81C(globalCtx, &left->base, &left->body, &sp5C, &right->base, &rItem->body, &sp50, &sp68); + return; + } + } + } +} + +extern Vec3f D_8015E310; + +void CollisionCheck_AC_TrisVsCyl(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { + ColliderTris* left = (ColliderTris*)l; + ColliderCylinder* right = (ColliderCylinder*)r; + ColliderTrisItem* lItem; + Vec3f sp60; + Vec3f sp54; + + if (right->dim.radius > 0 && right->dim.height > 0 && left->count > 0 && left->list != NULL) { + if (func_8005DF50(&right->body) == 1) { + return; + } + for (lItem = left->list; lItem < left->list + left->count; lItem++) { + if (func_8005DF2C(&lItem->body) == 1) { + continue; + } + if (func_8005DF74(&lItem->body, &right->body) == 1) { + continue; + } + + if (Math3D_CylTriTouchingIntersect(&right->dim, &lItem->dim, &D_8015E310) == 1) { + sp60.x = (lItem->dim.vtx[0].x + lItem->dim.vtx[1].x + lItem->dim.vtx[2].x) * (1.0f / 3); + sp60.y = (lItem->dim.vtx[0].y + lItem->dim.vtx[1].y + lItem->dim.vtx[2].y) * (1.0f / 3); + sp60.z = (lItem->dim.vtx[0].z + lItem->dim.vtx[1].z + lItem->dim.vtx[2].z) * (1.0f / 3); + Math_Vec3s_ToVec3f(&sp54, &right->dim.pos); + func_8005E81C(globalCtx, &left->base, &lItem->body, &sp60, &right->base, &right->body, &sp54, + &D_8015E310); + return; + } + } + } +} + +extern TriNorm D_8015E320; +extern TriNorm D_8015E358; +extern Vec3f D_8015E390; + +void CollisionCheck_AC_CylVsQuad(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { + ColliderCylinder* left = (ColliderCylinder*)l; + ColliderQuad* right = (ColliderQuad*)r; + Vec3f sp64; + Vec3f sp58; + Vec3f sp4C; + Vec3f sp40; + + if (left->dim.height <= 0 || left->dim.radius <= 0) { + return; + } + if (func_8005DF2C(&left->body) == 1 || func_8005DF50(&right->body) == 1) { + return; + } + if (func_8005DF74(&left->body, &right->body) == 1) { + return; + } + Math3D_TriNorm(&D_8015E320, &right->dim.quad[2], &right->dim.quad[3], &right->dim.quad[1]); + Math3D_TriNorm(&D_8015E358, &right->dim.quad[1], &right->dim.quad[0], &right->dim.quad[2]); + if (Math3D_CylTriTouchingIntersect(&left->dim, &D_8015E320, &D_8015E390) == 1) { + Math_Vec3s_ToVec3f(&sp64, &left->dim.pos); + sp58.x = + (right->dim.quad[0].x + (right->dim.quad[1].x + (right->dim.quad[3].x + right->dim.quad[2].x))) * 0.25f; + sp58.y = + (right->dim.quad[0].y + (right->dim.quad[1].y + (right->dim.quad[3].y + right->dim.quad[2].y))) * 0.25f; + sp58.z = + (right->dim.quad[0].z + (right->dim.quad[1].z + (right->dim.quad[3].z + right->dim.quad[2].z))) * 0.25f; + func_8005E81C(globalCtx, &left->base, &left->body, &sp64, &right->base, &right->body, &sp58, &D_8015E390); + return; + } + if (Math3D_CylTriTouchingIntersect(&left->dim, &D_8015E358, &D_8015E390) == 1) { + Math_Vec3s_ToVec3f(&sp4C, &left->dim.pos); + sp40.x = (right->dim.quad[0].x + (right->dim.quad[1].x + (right->dim.quad[3].x + right->dim.quad[2].x))) * + (1.0f / 4); + sp40.y = (right->dim.quad[0].y + (right->dim.quad[1].y + (right->dim.quad[3].y + right->dim.quad[2].y))) * + (1.0f / 4); + sp40.z = (right->dim.quad[0].z + (right->dim.quad[1].z + (right->dim.quad[3].z + right->dim.quad[2].z))) * + (1.0f / 4); + func_8005E81C(globalCtx, &left->base, &left->body, &sp4C, &right->base, &right->body, &sp40, &D_8015E390); + } +} + +extern TriNorm D_8015E3A0; +extern TriNorm D_8015E3D8; +extern Vec3f D_8015E410; + +void CollisionCheck_AC_QuadVsCyl(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { + ColliderQuad* left = (ColliderQuad*)l; + ColliderCylinder* right = (ColliderCylinder*)r; + Vec3f sp64; + Vec3f sp58; + Vec3f sp4C; + Vec3f sp40; + + if (right->dim.height <= 0 || right->dim.radius <= 0) { + return; + } + if (func_8005DF50(&right->body) == 1 || func_8005DF2C(&left->body) == 1) { + return; + } + if (func_8005DF74(&left->body, &right->body) == 1) { + return; + } + Math3D_TriNorm(&D_8015E3A0, &left->dim.quad[2], &left->dim.quad[3], &left->dim.quad[1]); + Math3D_TriNorm(&D_8015E3D8, &left->dim.quad[2], &left->dim.quad[1], &left->dim.quad[0]); + if (Math3D_CylTriTouchingIntersect(&right->dim, &D_8015E3A0, &D_8015E410) == 1) { + if (func_8005D218(globalCtx, left, &D_8015E410) != 0) { + sp64.x = (left->dim.quad[0].x + (left->dim.quad[1].x + (left->dim.quad[3].x + left->dim.quad[2].x))) * + (1.0f / 4); + sp64.y = (left->dim.quad[0].y + (left->dim.quad[1].y + (left->dim.quad[3].y + left->dim.quad[2].y))) * + (1.0f / 4); + sp64.z = (left->dim.quad[0].z + (left->dim.quad[1].z + (left->dim.quad[3].z + left->dim.quad[2].z))) * + (1.0f / 4); + Math_Vec3s_ToVec3f(&sp58, &right->dim.pos); + func_8005E81C(globalCtx, &left->base, &left->body, &sp64, &right->base, &right->body, &sp58, &D_8015E410); + return; + } + } + if (Math3D_CylTriTouchingIntersect(&right->dim, &D_8015E3D8, &D_8015E410) == 1) { + if (func_8005D218(globalCtx, left, &D_8015E410) != 0) { + sp4C.x = (left->dim.quad[0].x + (left->dim.quad[1].x + (left->dim.quad[3].x + left->dim.quad[2].x))) * + (1.0f / 4); + sp4C.y = (left->dim.quad[0].y + (left->dim.quad[1].y + (left->dim.quad[3].y + left->dim.quad[2].y))) * + (1.0f / 4); + sp4C.z = (left->dim.quad[0].z + (left->dim.quad[1].z + (left->dim.quad[3].z + left->dim.quad[2].z))) * + (1.0f / 4); + Math_Vec3s_ToVec3f(&sp40, &right->dim.pos); + func_8005E81C(globalCtx, &left->base, &left->body, &sp4C, &right->base, &right->body, &sp40, &D_8015E410); + } + } +} + +extern Vec3f D_8015E420; + +void CollisionCheck_AC_TrisVsTris(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + ColliderTris* left = (ColliderTris*)l; + ColliderTris* right = (ColliderTris*)r; + ColliderTrisItem* lItem; + ColliderTrisItem* rItem; + + Vec3f sp5C; + Vec3f sp50; + + if (right->count > 0 && right->list != NULL && left->count > 0 && left->list != NULL) { + for (rItem = right->list; rItem < right->list + right->count; rItem++) { + if (func_8005DF50(&rItem->body) == 1) { + continue; + } + for (lItem = left->list; lItem < left->list + left->count; lItem++) { + if (func_8005DF2C(&lItem->body) == 1) { + continue; + } + if (func_8005DF74(&lItem->body, &rItem->body) == 1) { + continue; + } + if (Math3D_TrisIntersect(&lItem->dim, &rItem->dim, &D_8015E420) == 1) { + sp5C.x = (lItem->dim.vtx[0].x + lItem->dim.vtx[1].x + lItem->dim.vtx[2].x) * (1.0f / 3); + sp5C.y = (lItem->dim.vtx[0].y + lItem->dim.vtx[1].y + lItem->dim.vtx[2].y) * (1.0f / 3); + sp5C.z = (lItem->dim.vtx[0].z + lItem->dim.vtx[1].z + lItem->dim.vtx[2].z) * (1.0f / 3); + sp50.x = (rItem->dim.vtx[0].x + rItem->dim.vtx[1].x + rItem->dim.vtx[2].x) * (1.0f / 3); + sp50.y = (rItem->dim.vtx[0].y + rItem->dim.vtx[1].y + rItem->dim.vtx[2].y) * (1.0f / 3); + sp50.z = (rItem->dim.vtx[0].z + rItem->dim.vtx[1].z + rItem->dim.vtx[2].z) * (1.0f / 3); + func_8005E81C(globalCtx, &left->base, &lItem->body, &sp5C, &right->base, &rItem->body, &sp50, + &D_8015E420); + return; + } + } + } + } +} + +extern Vec3f D_8015E430; +extern TriNorm D_8015E440; +extern TriNorm D_8015E478; + +void CollisionCheck_AC_TrisVsQuad(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + ColliderTris* left = (ColliderTris*)l; + ColliderQuad* right = (ColliderQuad*)r; + ColliderTrisItem* lItem; + Vec3f sp68; + Vec3f sp5C; + + if (left->count > 0 && left->list != NULL) { + if (func_8005DF50(&right->body) != 1) { + Math3D_TriNorm(&D_8015E440, &right->dim.quad[2], &right->dim.quad[3], &right->dim.quad[1]); + Math3D_TriNorm(&D_8015E478, &right->dim.quad[1], &right->dim.quad[0], &right->dim.quad[2]); + for (lItem = left->list; lItem < left->list + left->count; lItem++) { + if (func_8005DF2C(&lItem->body) == 1) { + continue; + } + if (func_8005DF74(&lItem->body, &right->body) == 1) { + continue; + } + if (Math3D_TrisIntersect(&D_8015E440, &lItem->dim, &D_8015E430) == 1 || + Math3D_TrisIntersect(&D_8015E478, &lItem->dim, &D_8015E430) == 1) { + sp68.x = (lItem->dim.vtx[0].x + lItem->dim.vtx[1].x + lItem->dim.vtx[2].x) * (1.0f / 3); + sp68.y = (lItem->dim.vtx[0].y + lItem->dim.vtx[1].y + lItem->dim.vtx[2].y) * (1.0f / 3); + sp68.z = (lItem->dim.vtx[0].z + lItem->dim.vtx[1].z + lItem->dim.vtx[2].z) * (1.0f / 3); + sp5C.x = (right->dim.quad[0].x + + (right->dim.quad[1].x + (right->dim.quad[3].x + right->dim.quad[2].x))) * + (1.0f / 4); + sp5C.y = (right->dim.quad[0].y + + (right->dim.quad[1].y + (right->dim.quad[3].y + right->dim.quad[2].y))) * + (1.0f / 4); + sp5C.z = (right->dim.quad[0].z + + (right->dim.quad[1].z + (right->dim.quad[3].z + right->dim.quad[2].z))) * + (1.0f / 4); + func_8005E81C(globalCtx, &left->base, &lItem->body, &sp68, &right->base, &right->body, &sp5C, + &D_8015E430); + return; + } + } + } + } +} + +extern Vec3f D_8015E4B0; +extern TriNorm D_8015E4C0; +extern TriNorm D_8015E4F8; + +void CollisionCheck_AC_QuadVsTris(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + ColliderQuad* left = (ColliderQuad*)l; + ColliderTris* right = (ColliderTris*)r; + ColliderTrisItem* rItem; + Vec3f sp68; + Vec3f sp5C; + + if (right->count > 0 && right->list != NULL) { + if (func_8005DF2C(&left->body) != 1) { + Math3D_TriNorm(&D_8015E4C0, &left->dim.quad[2], &left->dim.quad[3], &left->dim.quad[1]); + Math3D_TriNorm(&D_8015E4F8, &left->dim.quad[1], &left->dim.quad[0], &left->dim.quad[2]); + for (rItem = right->list; rItem < right->list + right->count; rItem++) { + if (func_8005DF50(&rItem->body) == 1) { + continue; + } + if (func_8005DF74(&left->body, &rItem->body) == 1) { + continue; + } + if (Math3D_TrisIntersect(&D_8015E4C0, &rItem->dim, &D_8015E4B0) == 1 || + Math3D_TrisIntersect(&D_8015E4F8, &rItem->dim, &D_8015E4B0) == 1) { + if (func_8005D218(globalCtx, left, &D_8015E4B0) != 0) { + sp5C.x = (rItem->dim.vtx[0].x + rItem->dim.vtx[1].x + rItem->dim.vtx[2].x) * (1.0f / 3); + sp5C.y = (rItem->dim.vtx[0].y + rItem->dim.vtx[1].y + rItem->dim.vtx[2].y) * (1.0f / 3); + sp5C.z = (rItem->dim.vtx[0].z + rItem->dim.vtx[1].z + rItem->dim.vtx[2].z) * (1.0f / 3); + sp68.x = (left->dim.quad[0].x + + (left->dim.quad[1].x + (left->dim.quad[3].x + left->dim.quad[2].x))) * + (1.0f / 4); + sp68.y = (left->dim.quad[0].y + + (left->dim.quad[1].y + (left->dim.quad[3].y + left->dim.quad[2].y))) * + (1.0f / 4); + sp68.z = (left->dim.quad[0].z + + (left->dim.quad[1].z + (left->dim.quad[3].z + left->dim.quad[2].z))) * + (1.0f / 4); + func_8005E81C(globalCtx, &left->base, &left->body, &sp68, &right->base, &rItem->body, &sp5C, + &D_8015E4B0); + return; + } + } + } + } + } +} + +extern TriNorm D_8015E530[2]; +extern Vec3f D_8015E598; +extern TriNorm D_8015E5A8[2]; + +void CollisionCheck_AC_QuadVsQuad(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + ColliderQuad* left = (ColliderQuad*)l; + ColliderQuad* right = (ColliderQuad*)r; + s32 i; + s32 j; + Vec3f sp6C; + Vec3f sp60; + + if (func_8005DF2C(&left->body) == 1) { + return; + } + if (func_8005DF50(&right->body) == 1) { + return; + } + if (func_8005DF74(&left->body, &right->body) == 1) { + return; + } + Math3D_TriNorm(&D_8015E5A8[0], &left->dim.quad[2], &left->dim.quad[3], &left->dim.quad[1]); + Math3D_TriNorm(&D_8015E5A8[1], &left->dim.quad[2], &left->dim.quad[1], &left->dim.quad[0]); + Math3D_TriNorm(&D_8015E530[0], &right->dim.quad[2], &right->dim.quad[3], &right->dim.quad[1]); + Math3D_TriNorm(&D_8015E530[1], &right->dim.quad[2], &right->dim.quad[1], &right->dim.quad[0]); + for (i = 0; i < 2; i++) { + for (j = 0; j < 2; j++) { + if (Math3D_TrisIntersect(&D_8015E5A8[j], &D_8015E530[i], &D_8015E598) == 1) { + if (func_8005D218(globalCtx, left, &D_8015E598) != 0) { + sp6C.x = + (left->dim.quad[0].x + (left->dim.quad[1].x + (left->dim.quad[3].x + left->dim.quad[2].x))) * + (1.0f / 4); + sp6C.y = + (left->dim.quad[0].y + (left->dim.quad[1].y + (left->dim.quad[3].y + left->dim.quad[2].y))) * + (1.0f / 4); + sp6C.z = + (left->dim.quad[0].z + (left->dim.quad[1].z + (left->dim.quad[3].z + left->dim.quad[2].z))) * + (1.0f / 4); + sp60.x = (right->dim.quad[0].x + + (right->dim.quad[1].x + (right->dim.quad[3].x + right->dim.quad[2].x))) * + (1.0f / 4); + sp60.y = (right->dim.quad[0].y + + (right->dim.quad[1].y + (right->dim.quad[3].y + right->dim.quad[2].y))) * + (1.0f / 4); + sp60.z = (right->dim.quad[0].z + + (right->dim.quad[1].z + (right->dim.quad[3].z + right->dim.quad[2].z))) * + (1.0f / 4); + func_8005E81C(globalCtx, &left->base, &left->body, &sp6C, &right->base, &right->body, &sp60, + &D_8015E598); + return; + } + } + } + } +} + +// D_8011DF5C ColliderJntSph +void func_80060EBC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider) { + ColliderJntSph* col = (ColliderJntSph*)collider; + ColliderJntSphItem* item; + Vec3f sp24; + + for (item = col->list; item < col->list + col->count; item++) { + if (item->body.bumperFlags & 0x80) { + if (item->body.acHitItem != NULL) { + if (!(item->body.acHitItem->toucherFlags & 0x40)) { + Math_Vec3s_ToVec3f(&sp24, &item->body.bumper.unk_06); + func_8005E604(globalCtx, item->body.acHit, item->body.acHitItem, &col->base, &item->body, &sp24); + item->body.acHitItem->toucherFlags |= 0x40; + return; + } + } + } + } +} + +// D_8011DF5C ColliderCylinder +void func_80060F94(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider) { + ColliderCylinder* item = (ColliderCylinder*)collider; + Vec3f sp28; + + if (item->body.bumperFlags & 0x80) { + if (item->body.acHitItem != NULL) { + if (!(item->body.acHitItem->toucherFlags & 0x40)) { + Math_Vec3s_ToVec3f(&sp28, &item->body.bumper.unk_06); + func_8005E604(globalCtx, item->body.acHit, item->body.acHitItem, &item->base, &item->body, &sp28); + item->body.acHitItem->toucherFlags |= 0x40; + } + } + } +} + +// D_8011DF5C ColliderTris +void func_80061028(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider) { + ColliderTris* col = (ColliderTris*)collider; + ColliderTrisItem* item; + Vec3f sp24; + + for (item = col->list; item < col->list + col->count; item++) { + if (item->body.bumperFlags & 0x80) { + if (item->body.acHitItem != NULL) { + if (!(item->body.acHitItem->toucherFlags & 0x40)) { + Math_Vec3s_ToVec3f(&sp24, &item->body.bumper.unk_06); + func_8005E604(globalCtx, item->body.acHit, item->body.acHitItem, &col->base, &item->body, &sp24); + item->body.acHitItem->toucherFlags |= 0x40; + return; + } + } + } + } +} + +// D_8011DF5C ColliderQuad +void func_8006110C(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider) { + ColliderQuad* item = (ColliderQuad*)collider; + Vec3f sp28; + + if (item->body.bumperFlags & 0x80) { + if (item->body.acHitItem != NULL) { + if (!(item->body.acHitItem->toucherFlags & 0x40)) { + Math_Vec3s_ToVec3f(&sp28, &item->body.bumper.unk_06); + func_8005E604(globalCtx, item->body.acHit, item->body.acHitItem, &item->base, &item->body, &sp28); + item->body.acHitItem->toucherFlags |= 0x40; + } + } + } +} + +void func_800611A0(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx) { + Collider** col; + Collider* temp; + + static void (*D_8011DF5C[4])(GlobalContext*, CollisionCheckContext*, Collider*) = { + func_80060EBC, + func_80060F94, + func_80061028, + func_8006110C, + }; + + for (col = colChkCtx->colAc; col < colChkCtx->colAc + colChkCtx->colAcCount; col++) { + temp = *col; + if (temp != NULL) { + if (temp->acFlags & 1) { + if (temp->actor == NULL || temp->actor->update != NULL) { + (*D_8011DF5C[temp->shape])(globalCtx, colChkCtx, temp); + } + } + } + } +} + +void CollisionCheck_AC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider) { + Collider** col; + Collider* temp; + + static void (*D_8011DF6C[4][4])(GlobalContext*, CollisionCheckContext*, Collider*, Collider*) = { + { CollisionCheck_AC_JntSphVsJntSph, CollisionCheck_AC_JntSphVsCyl, CollisionCheck_AC_JntSphVsTris, + CollisionCheck_AC_JntSphVsQuad }, + { CollisionCheck_AC_CylVsJntSph, CollisionCheck_AC_CylVsCyl, CollisionCheck_AC_CylVsTris, + CollisionCheck_AC_CylVsQuad }, + { CollisionCheck_AC_TrisVsJntSph, CollisionCheck_AC_TrisVsCyl, CollisionCheck_AC_TrisVsTris, + CollisionCheck_AC_TrisVsQuad }, + { CollisionCheck_AC_QuadVsJntSph, CollisionCheck_AC_QuadVsCyl, CollisionCheck_AC_QuadVsTris, + CollisionCheck_AC_QuadVsQuad }, + }; + for (col = colChkCtx->colAc; col < colChkCtx->colAc + colChkCtx->colAcCount; col++) { + temp = *col; + if (temp == NULL) { + continue; + } else if (!(temp->acFlags & 1)) { + continue; + } else if (temp->actor != NULL && temp->actor->update == NULL) { + continue; + } else if (!((temp->acFlags & collider->atFlags) & 0x38)) { + continue; + } else if (collider == temp) { + continue; + } + + else if ((collider->atFlags & 0x40) || collider->actor == NULL || temp->actor != collider->actor) { + D_8011DF6C[collider->shape][temp->shape](globalCtx, colChkCtx, collider, temp); + } + } +} + +// Test Attack Collisions +void func_8006139C(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx) { + Collider** colAt; + Collider* colliderAt; + + if (colChkCtx->colAtCount != 0) { + if (colChkCtx->colAcCount != 0) { + for (colAt = colChkCtx->colAt; colAt < colChkCtx->colAt + colChkCtx->colAtCount; colAt++) { + colliderAt = *colAt; + if (colliderAt != NULL) { + if (colliderAt->atFlags & 1) { + if ((colliderAt->actor == NULL) || (colliderAt->actor->update != NULL)) { + CollisionCheck_AC(globalCtx, colChkCtx, colliderAt); + } + } + } + } + func_800611A0(globalCtx, colChkCtx); + } + } +} + +// Get mass type +s32 func_8006146C(u8 mass) { + if (mass == 0xFF) { + return 0; + } + if (mass == 0xFE) { + return 1; + } + return 2; +} + +// SetOC collision, perform elastic collision +void func_800614A4(Collider* left, ColliderBody* leftBody, Vec3f* leftv, Collider* right, ColliderBody* rightBody, + Vec3f* rightv, f32 arg6) { + f32 temp_f0; + f32 leftDisplacementFactor; + f32 rightDisplacementFactor; + f32 xzDist; + f32 leftMass; + f32 rightMass; + f32 totalMass; + f32 inverseTotalMass; + f32 xDelta; + f32 zDelta; + Actor* leftActor; + Actor* rightActor; + s32 rightMassType; + s32 leftMassType; + + leftActor = left->actor; + rightActor = right->actor; + left->maskA |= 2; + left->oc = rightActor; + leftBody->ocFlags |= 2; + if ((right->maskB & 8) != 0) { + left->maskB |= 1; + } + right->oc = leftActor; + right->maskA |= 2; + rightBody->ocFlags |= 2; + if ((left->maskB & 8) != 0) { + right->maskB |= 1; + } + if (leftActor == NULL || rightActor == NULL || (left->maskA & 4) || (right->maskA & 4)) { + return; + } + leftMassType = func_8006146C(leftActor->colChkInfo.mass); + rightMassType = func_8006146C(rightActor->colChkInfo.mass); + leftMass = leftActor->colChkInfo.mass; + rightMass = rightActor->colChkInfo.mass; + totalMass = leftMass + rightMass; + if (fabsf(totalMass) < 0.008f) { + totalMass = (leftMass = rightMass = 1.0f) * 2; + } + xDelta = rightv->x - leftv->x; + zDelta = rightv->z - leftv->z; + xzDist = sqrtf(SQ(xDelta) + SQ(zDelta)); + + if (leftMassType == 0) { + if (rightMassType == 0) { + return; + } else { + leftDisplacementFactor = 0; + rightDisplacementFactor = 1; + } + } else if (leftMassType == 1) { + if (rightMassType == 0) { + leftDisplacementFactor = 1; + rightDisplacementFactor = 0; + } else if (rightMassType == 1) { + leftDisplacementFactor = 0.5f; + rightDisplacementFactor = 0.5f; + } else { + leftDisplacementFactor = 0; + rightDisplacementFactor = 1; + } + } else { + if (rightMassType == 2) { + inverseTotalMass = 1 / totalMass; + leftDisplacementFactor = rightMass * inverseTotalMass; + rightDisplacementFactor = leftMass * inverseTotalMass; + } else { + leftDisplacementFactor = 1; + rightDisplacementFactor = 0; + } + } + + if (!(fabsf(xzDist) < 0.008f)) { + temp_f0 = arg6 / xzDist; + xDelta *= temp_f0; + zDelta *= temp_f0; + leftActor->colChkInfo.displacement.x += -xDelta * leftDisplacementFactor; + leftActor->colChkInfo.displacement.z += -zDelta * leftDisplacementFactor; + rightActor->colChkInfo.displacement.x += xDelta * rightDisplacementFactor; + rightActor->colChkInfo.displacement.z += zDelta * rightDisplacementFactor; + } else if (!(arg6 == 0.0f)) { + leftActor->colChkInfo.displacement.x += -arg6 * leftDisplacementFactor; + rightActor->colChkInfo.displacement.x += arg6 * rightDisplacementFactor; + } else { + leftActor->colChkInfo.displacement.x -= leftDisplacementFactor; + rightActor->colChkInfo.displacement.x += rightDisplacementFactor; + } +} + +void CollisionCheck_OC_JntSphVsJntSph(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + ColliderJntSph* left = (ColliderJntSph*)l; + ColliderJntSph* right = (ColliderJntSph*)r; + ColliderJntSphItem* lItem; + ColliderJntSphItem* rItem; + f32 sp74; + Vec3f sp68; + Vec3f sp5C; + + if (left->count > 0 && left->list != NULL && right->count > 0 && right->list != NULL) { + for (lItem = left->list; lItem < left->list + left->count; lItem++) { + if (!(lItem->body.ocFlags & 1)) { + continue; + } + for (rItem = right->list; rItem < right->list + right->count; rItem++) { + if (!(rItem->body.ocFlags & 1)) { + continue; + } + if (Math3D_SpheresTouchingSurface(&lItem->dim.worldSphere, &rItem->dim.worldSphere, &sp74) == 1) { + Math_Vec3s_ToVec3f(&sp68, &lItem->dim.worldSphere.center); + Math_Vec3s_ToVec3f(&sp5C, &rItem->dim.worldSphere.center); + func_800614A4(&left->base, &lItem->body, &sp68, &right->base, &rItem->body, &sp5C, sp74); + } + } + } + } +} + +void CollisionCheck_OC_JntSphVsCyl(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + ColliderJntSph* left = (ColliderJntSph*)l; + ColliderCylinder* right = (ColliderCylinder*)r; + ColliderJntSphItem* lItem; + f32 sp78; + Vec3f sp6C; + Vec3f sp60; + + if (left->count > 0 && left->list != NULL) { + if (!(right->base.maskA & 1)) { + return; + } + if (!(right->body.ocFlags & 1)) { + return; + } + for (lItem = left->list; lItem < left->list + left->count; lItem++) { + if (!(lItem->body.ocFlags & 1)) { + continue; + } + if (func_800CFD84(&lItem->dim.worldSphere, &right->dim, &sp78) == 1) { + Math_Vec3s_ToVec3f(&sp6C, &lItem->dim.worldSphere.center); + Math_Vec3s_ToVec3f(&sp60, &right->dim.pos); + func_800614A4(&left->base, &lItem->body, &sp6C, &right->base, &right->body, &sp60, sp78); + } + } + } +} + +void CollisionCheck_OC_CylVsJntSph(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { + CollisionCheck_OC_JntSphVsCyl(globalCtx, colChkCtx, r, l); +} + +void CollisionCheck_OC_CylVsCyl(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { + ColliderCylinder* left = (ColliderCylinder*)l; + ColliderCylinder* right = (ColliderCylinder*)r; + f32 sp4C; + Vec3f sp40; + Vec3f sp34; + + if (!(left->base.maskA & 1) || !(right->base.maskA & 1)) { + return; + } + if (!(left->body.ocFlags & 1) || !(right->body.ocFlags & 1)) { + return; + } + if (Math3D_CylinderOutCylinder(&left->dim, &right->dim, &sp4C) == 1) { + Math_Vec3s_ToVec3f(&sp40, &left->dim.pos); + Math_Vec3s_ToVec3f(&sp34, &right->dim.pos); + func_800614A4(&left->base, &left->body, &sp40, &right->base, &right->body, &sp34, sp4C); + } +} + +// CollisionCheck_OC test ? +s32 func_80061BF4(Collider* collider) { + if (!(collider->maskA & 1)) { + return 1; + } + return 0; +} + +// CollisionCheck_OC test ? +s32 func_80061C18(Collider* arg0, Collider* arg1) { + if (!((arg0->maskA & arg1->maskB) & 0x38) || !((arg0->maskB & arg1->maskA) & 0x38) || + ((arg0->maskB & 2) && (arg1->maskB & 4)) || ((arg1->maskB & 2) && (arg0->maskB & 4))) { + return 1; + } + if (arg0->actor == arg1->actor) { + return 1; + } + return 0; +} + +void CollisionCheck_OC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx) { + Collider** phi_s2; + Collider** phi_s0; + Collider** new_var; + Collider** new_var2; + void (*test)(GlobalContext*, CollisionCheckContext*, Collider*, Collider*); + + static void (*D_8011DFAC[4][4])(GlobalContext*, CollisionCheckContext*, Collider*, Collider*) = { + { CollisionCheck_OC_JntSphVsJntSph, CollisionCheck_OC_JntSphVsCyl, NULL, NULL }, + { CollisionCheck_OC_CylVsJntSph, CollisionCheck_OC_CylVsCyl, NULL, NULL }, + { NULL, NULL, NULL, NULL }, + { NULL, NULL, NULL, NULL }, + }; + + for (phi_s2 = colChkCtx->colOc; phi_s2 < colChkCtx->colOc + colChkCtx->colOcCount; phi_s2++) { + if (*phi_s2 == NULL || func_80061BF4(*phi_s2) == 1) { + continue; + } + for (phi_s0 = phi_s2 + 1; phi_s0 < colChkCtx->colOc + colChkCtx->colOcCount; phi_s0++) { + if (*phi_s0 == NULL || func_80061BF4(*phi_s0) == 1 || func_80061C18(*phi_s2, *phi_s0) == 1) { + continue; + } + new_var2 = phi_s0; + new_var = phi_s2; + test = D_8011DFAC[(*new_var)->shape][(*new_var2)->shape]; + if (test == NULL) { + osSyncPrintf("CollisionCheck_OC():未対応 %d, %d\n", (*new_var)->shape, (*new_var2)->shape); + // EUC-JP: 未対応 | Not compatible + continue; + } + (*test)(globalCtx, colChkCtx, *new_var, *new_var2); + } + } +} + +// Initialize CollisionCheckInfo +void func_80061E48(CollisionCheckInfo* info) { + static CollisionCheckInfo init = { NULL, { 0, 0, 0 }, 10, 10, 0, 50, 8, 0, 0, 0, 0 }; + *info = init; +} + +void func_80061E8C(CollisionCheckInfo* info) { + info->damage = 0; + info->damageEffect = 0; + info->atHitEffect = 0; + info->acHitEffect = 0; + info->displacement.z = 0.0f; + info->displacement.y = 0.0f; + info->displacement.x = 0.0f; +} + +void func_80061EB0(CollisionCheckInfo* info, CollisionCheckInfoInit* init) { + info->health = init->health; + info->unk_10 = init->unk_02; + info->unk_12 = init->unk_04; + info->mass = init->mass; +} + +void func_80061ED4(CollisionCheckInfo* info, DamageTable* damageTable, CollisionCheckInfoInit* init) { + info->health = init->health; + info->damageTable = damageTable; + info->unk_10 = init->unk_02; + info->unk_12 = init->unk_04; + info->mass = init->mass; +} + +void func_80061EFC(CollisionCheckInfo* info, DamageTable* damageTable, CollisionCheckInfoInit2* init) { + info->health = init->health; + info->damageTable = damageTable; + info->unk_10 = init->unk_02; + info->unk_12 = init->unk_04; + info->unk_14 = init->unk_06; + info->mass = init->mass; +} + +void func_80061F2C(CollisionCheckInfo* info, s32 index, CollisionCheckInfoInit2* init) { + func_80061EFC(info, DamageTable_Get(index), init); +} + +// Apply AC damage effect +void func_80061F64(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider, ColliderBody* body) { + DamageTable* tbl; + u32 flags; + s32 i; + f32 damage; + int tblLookup; + + if (collider->actor == NULL || !(collider->acFlags & 2)) { + return; + } + if (!(body->bumperFlags & 2) || (body->bumperFlags & 0x10)) { + return; + } + if (body->acHitItem == NULL) { + __assert("pclobj_elem->ac_hit_elem != NULL", "../z_collision_check.c", 6493); + } + tbl = collider->actor->colChkInfo.damageTable; + if (tbl == NULL) { + damage = (f32)body->acHitItem->toucher.damage - (f32)body->bumper.defense; + if (damage < 0) { + damage = 0; + } + } else { + for (i = 0, flags = body->acHitItem->toucher.flags; i < 0x20; i++, flags >>= 1) { + if (flags == 1) { + break; + } + } + + tblLookup = tbl->table[i]; + damage = tblLookup & 0xF; + collider->actor->colChkInfo.damageEffect = tblLookup >> 4 & 0xF; + } + if (!(collider->acFlags & 4)) { + collider->actor->colChkInfo.damage = (u32)(collider->actor->colChkInfo.damage + damage); + } +} + +// Apply ColliderJntSph AC damage effect +void func_8006216C(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider) { + ColliderJntSph* jntSph = (ColliderJntSph*)collider; + s32 i; + + if (!(jntSph->count > 0) || jntSph->list == NULL) { + return; + } + for (i = 0; i < jntSph->count; i++) { + func_80061F64(globalCtx, colChkCtx, &jntSph->base, &jntSph->list[i].body); + } +} + +// Apply ColliderCylinder AC damage effect +void func_80062210(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider) { + ColliderCylinder* cylinder = (ColliderCylinder*)collider; + func_80061F64(globalCtx, colChkCtx, &cylinder->base, &cylinder->body); +} + +// Apply ColliderTris AC damage effect +void func_80062230(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider) { + ColliderTris* tris = (ColliderTris*)collider; + s32 i; + + for (i = 0; i < tris->count; i++) { + func_80061F64(globalCtx, colChkCtx, collider, &tris->list[i].body); + } +} + +// Apply ColliderQuad AC damage effect +void func_800622C4(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider) { + ColliderQuad* quad = (ColliderQuad*)collider; + func_80061F64(globalCtx, colChkCtx, &quad->base, &quad->body); +} + +// Apply all AC damage effects +void func_800622E4(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx) { + Collider* collider; + s32 i; + + static void (*D_8011E008[4])(GlobalContext*, CollisionCheckContext*, Collider*) = { + func_8006216C, + func_80062210, + func_80062230, + func_800622C4, + }; + + for (i = 0; i < colChkCtx->colAcCount; i++) { + collider = colChkCtx->colAc[i]; + if (collider == 0) { + continue; + } + if ((collider->acFlags & 0x40)) { + continue; + } + D_8011E008[collider->shape](globalCtx, colChkCtx, collider); + } +} + +extern Linef D_8015E610; + +s32 CollisionCheck_generalLineOcCheck_JntSph(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, + Collider* collider, Vec3f* arg3, Vec3f* arg4) { + ColliderJntSph* jntSph = (ColliderJntSph*)collider; + ColliderJntSphItem* item; + s32 phi_s0; + for (phi_s0 = 0; phi_s0 < jntSph->count; phi_s0++) { + item = &jntSph->list[phi_s0]; + if (!(item->body.ocFlags & 1)) { + continue; + } + D_8015E610.a = *arg3; + D_8015E610.b = *arg4; + if (func_800CE600(&item->dim.worldSphere, &D_8015E610) == 1) { + return 1; + } + } + return 0; +} + +extern Vec3f D_8015E628; +extern Vec3f D_8015E638; + +s32 CollisionCheck_generalLineOcCheck_Cyl(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, + Collider* collider, Vec3f* arg3, Vec3f* arg4) { + ColliderCylinder* cylinder = (ColliderCylinder*)collider; + if (!(cylinder->body.ocFlags & 1)) { + return 0; + } + if (func_800CEE0C(&cylinder->dim, arg3, arg4, &D_8015E628, &D_8015E638) != 0) { + return 1; + } + return 0; +} + +s32 CollisionCheck_GeneralLineOcCheck(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Vec3f* camera_3C, + Vec3f* arg3, Actor** arg4, s32 arg5) { + Collider* collider; + s32 (*t)(GlobalContext*, CollisionCheckContext*, Collider*, Vec3f*, Vec3f*); + Collider** c; + s32 i; + s32 test; + s32 result; + + static s32 (*D_8011E018[4])(GlobalContext*, CollisionCheckContext*, Collider*, Vec3f*, Vec3f*) = { + CollisionCheck_generalLineOcCheck_JntSph, + CollisionCheck_generalLineOcCheck_Cyl, + NULL, + NULL, + }; + + result = 0; + for (c = colChkCtx->colOc; c < colChkCtx->colOc + colChkCtx->colOcCount; c++) { + if (func_80061BF4(*c) == 1) { + continue; + } + test = 0; + for (i = 0; i < arg5; i++) { + if ((*c)->actor == arg4[i]) { + test = 1; + break; + } + } + if (test == 1) { + continue; + } + collider = *c; + t = D_8011E018[collider->shape]; + if (t == NULL) { + osSyncPrintf("CollisionCheck_generalLineOcCheck():未対応 %dタイプ\n", collider->shape); + // EUC-JP: 未対応 %dタイプ | %d's type is not supported + } else { + result = (*t)(globalCtx, colChkCtx, collider, camera_3C, arg3); + if (result != 0) { + break; + } + } + } + return result; +} + +s32 func_8006268C(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Vec3f* arg2, Vec3f* arg3) { + CollisionCheck_GeneralLineOcCheck(globalCtx, colChkCtx, arg2, arg3, NULL, 0); +} + +s32 func_800626B0(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Vec3f* camera_3C, Vec3f* arg3, + Actor** arg4, s32 arg5) { + CollisionCheck_GeneralLineOcCheck(globalCtx, colChkCtx, camera_3C, arg3, arg4, arg5); +} + +void Collider_CylinderUpdate(Actor* actor, ColliderCylinder* collider) { + collider->dim.pos.x = (s32)actor->posRot.pos.x; + collider->dim.pos.y = (s32)actor->posRot.pos.y; + collider->dim.pos.z = (s32)actor->posRot.pos.z; +} + +// Set ColliderCylinder position +void func_80062718(ColliderCylinder* collider, Vec3s* pos) { + collider->dim.pos.x = pos->x; + collider->dim.pos.y = pos->y; + collider->dim.pos.z = pos->z; +} + +// Set ColliderQuad vertices +void func_80062734(ColliderQuad* collider, Vec3f* a, Vec3f* b, Vec3f* c, Vec3f* d) { + Math_Vec3f_Copy(&collider->dim.quad[2], c); + Math_Vec3f_Copy(&collider->dim.quad[3], d); + Math_Vec3f_Copy(&collider->dim.quad[0], a); + Math_Vec3f_Copy(&collider->dim.quad[1], b); + func_8005CEDC(&collider->dim); +} + +// Set ColliderTrisItem at index +void func_800627A0(ColliderTris* collider, s32 index, Vec3f* a, Vec3f* b, Vec3f* c) { + ColliderTrisItem* item; + f32 sp40; + f32 sp3C; + f32 sp38; + f32 sp34; + + item = &collider->list[index]; + Math_Vec3f_Copy(&item->dim.vtx[0], a); + Math_Vec3f_Copy(&item->dim.vtx[1], b); + Math_Vec3f_Copy(&item->dim.vtx[2], c); + func_800CC8B4(a, b, c, &sp40, &sp3C, &sp38, &sp34); + item->dim.plane.normal.x = sp40; + item->dim.plane.normal.y = sp3C; + item->dim.plane.normal.z = sp38; + item->dim.plane.originDist = sp34; +} + +// Set ColliderTrisItem at index +void func_8006285C(GlobalContext* globalCtx, ColliderTris* collider, s32 index, ColliderTrisItemDimInit* init) { + ColliderTrisItem* item = &collider->list[index]; + Collider_SetTrisItemDim(globalCtx, &item->dim, init); +} + +#ifdef NON_MATCHING +// Codegen OK, .bss section problems +void func_800628A4(s32 arg0, ColliderJntSph* collider) { + s32 phi_s3; + + static Vec3f D_8015CF00; + static Vec3f D_8015E648; + + for (phi_s3 = 0; phi_s3 < collider->count; phi_s3++) { + if (arg0 == collider->list[phi_s3].dim.joint) { + D_8015E648.x = collider->list[phi_s3].dim.modelSphere.center.x; + D_8015E648.y = collider->list[phi_s3].dim.modelSphere.center.y; + D_8015E648.z = collider->list[phi_s3].dim.modelSphere.center.z; + Matrix_MultVec3f(&D_8015E648, &D_8015CF00); + collider->list[phi_s3].dim.worldSphere.center.x = (s32)D_8015CF00.x; + collider->list[phi_s3].dim.worldSphere.center.y = (s32)D_8015CF00.y; + collider->list[phi_s3].dim.worldSphere.center.z = (s32)D_8015CF00.z; + collider->list[phi_s3].dim.worldSphere.radius = + (s32)((f32)collider->list[phi_s3].dim.modelSphere.radius * collider->list[phi_s3].dim.scale); + } + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_800628A4.s") +#endif // NON_MATCHING +#ifdef NON_MATCHING +// Purple EffSpark +//.bss section problems +void func_80062A28(GlobalContext* globalCtx, Vec3f* v) { + s32 sp24; + static EffSparkParams D_8015CF10; + + D_8015CF10.position.x = (s32)v->x; + D_8015CF10.position.y = (s32)v->y; + D_8015CF10.position.z = (s32)v->z; + D_8015CF10.particleFactor1 = 5; + D_8015CF10.particleFactor2 = 5; + D_8015CF10.colorStart[0].r = 0x80; + D_8015CF10.colorStart[0].g = 0x00; + D_8015CF10.colorStart[0].b = 0x40; + D_8015CF10.colorStart[0].a = 0xFF; + D_8015CF10.colorStart[1].r = 0x80; + D_8015CF10.colorStart[1].g = 0x00; + D_8015CF10.colorStart[1].b = 0x40; + D_8015CF10.colorStart[1].a = 0xFF; + D_8015CF10.colorStart[2].r = 0xFF; + D_8015CF10.colorStart[2].g = 0x80; + D_8015CF10.colorStart[2].b = 0x00; + D_8015CF10.colorStart[2].a = 0xFF; + D_8015CF10.colorStart[3].r = 0xFF; + D_8015CF10.colorStart[3].g = 0x80; + D_8015CF10.colorStart[3].b = 0x00; + D_8015CF10.colorStart[3].a = 0xFF; + D_8015CF10.colorEnd[0].r = 0x40; + D_8015CF10.colorEnd[0].g = 0x00; + D_8015CF10.colorEnd[0].b = 0x20; + D_8015CF10.colorEnd[0].a = 0x00; + D_8015CF10.colorEnd[1].r = 0x40; + D_8015CF10.colorEnd[1].g = 0x00; + D_8015CF10.colorEnd[1].b = 0x20; + D_8015CF10.colorEnd[1].a = 0x00; + D_8015CF10.colorEnd[2].r = 0x80; + D_8015CF10.colorEnd[2].g = 0x00; + D_8015CF10.colorEnd[2].b = 0x40; + D_8015CF10.colorEnd[2].a = 0x00; + D_8015CF10.colorEnd[3].r = 0x80; + D_8015CF10.colorEnd[3].g = 0x00; + D_8015CF10.colorEnd[3].b = 0x40; + D_8015CF10.colorEnd[3].a = 0x00; + D_8015CF10.age = 0; + D_8015CF10.duration = 16; + D_8015CF10.velocity = 8.0f; + D_8015CF10.gravity = -1.0f; + Effect_Add(globalCtx, &sp24, 0, 0, 1, &D_8015CF10); +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80062A28.s") +#endif // NON_MATCHING +#ifdef NON_MATCHING +// White EffSpark (Bubbles?) +//.bss section problems +void func_80062B80(GlobalContext* globalCtx, Vec3f* v) { + s32 sp24; + static EffSparkParams D_8015D3D8; + + D_8015D3D8.position.x = (s32)v->x; + D_8015D3D8.position.y = (s32)v->y; + D_8015D3D8.position.z = (s32)v->z; + D_8015D3D8.particleFactor1 = 5; + D_8015D3D8.particleFactor2 = 5; + D_8015D3D8.colorStart[0].r = 0xFF; + D_8015D3D8.colorStart[0].g = 0xFF; + D_8015D3D8.colorStart[0].b = 0xFF; + D_8015D3D8.colorStart[0].a = 0xFF; + D_8015D3D8.colorStart[1].r = 0x64; + D_8015D3D8.colorStart[1].g = 0x64; + D_8015D3D8.colorStart[1].b = 0x64; + D_8015D3D8.colorStart[1].a = 0x64; + D_8015D3D8.colorStart[2].r = 0x64; + D_8015D3D8.colorStart[2].g = 0x64; + D_8015D3D8.colorStart[2].b = 0x64; + D_8015D3D8.colorStart[2].a = 0x64; + D_8015D3D8.colorStart[3].r = 0x64; + D_8015D3D8.colorStart[3].g = 0x64; + D_8015D3D8.colorStart[3].b = 0x64; + D_8015D3D8.colorStart[3].a = 0x64; + D_8015D3D8.colorEnd[0].r = 0x32; + D_8015D3D8.colorEnd[0].g = 0x32; + D_8015D3D8.colorEnd[0].b = 0x32; + D_8015D3D8.colorEnd[0].a = 0x32; + D_8015D3D8.colorEnd[1].r = 0x32; + D_8015D3D8.colorEnd[1].g = 0x32; + D_8015D3D8.colorEnd[1].b = 0x32; + D_8015D3D8.colorEnd[1].a = 0x32; + D_8015D3D8.colorEnd[2].r = 0x32; + D_8015D3D8.colorEnd[2].g = 0x32; + D_8015D3D8.colorEnd[2].b = 0x32; + D_8015D3D8.colorEnd[2].a = 0x32; + D_8015D3D8.colorEnd[3].r = 0x00; + D_8015D3D8.colorEnd[3].g = 0x00; + D_8015D3D8.colorEnd[3].b = 0x00; + D_8015D3D8.colorEnd[3].a = 0x00; + D_8015D3D8.age = 0; + D_8015D3D8.duration = 16; + D_8015D3D8.velocity = 8.0f; + D_8015D3D8.gravity = -1.0f; + Effect_Add(globalCtx, &sp24, 0, 0, 1, &D_8015D3D8); +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80062B80.s") +#endif // NON_MATCHING -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80062CD4.s") +void func_80062CD4(GlobalContext* globalCtx, Vec3f* v) { + s32 sp24; + static EffShieldParticleInit init = { + 16, + { 0, 0, 0 }, + { { 0x00, 0xC8, 0xFF, 0xFF } }, + { { 0xFF, 0xFF, 0xFF, 0xFF } }, + { { 0xFF, 0xFF, 0x80, 0xFF } }, + { { 0xFF, 0xFF, 0x00, 0xFF } }, + { { 0xFF, 0x40, 0x00, 0xC8 } }, + { { 0xFF, 0x00, 0x00, 0xFF } }, + 2.1f, + 35.0f, + 30.0f, + 8, + { 0, 0, 0, 0x00, 0x80, 0xFF, 0x00, 300 }, + 1, + }; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80062D60.s") + init.position.x = (s32)v->x; + init.position.y = (s32)v->y; + init.position.z = (s32)v->z; + init.lightParams.posX = init.position.x; + init.lightParams.posY = init.position.y; + init.lightParams.posZ = init.position.z; + Effect_Add(globalCtx, &sp24, 3, 0, 1, &init); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80062DAC.s") +void func_80062D60(GlobalContext* globalCtx, Vec3f* v) { + func_80062CD4(globalCtx, v); + Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_SW, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80062DF4.s") +void func_80062DAC(GlobalContext* globalCtx, Vec3f* v, Vec3f* arg2) { + func_80062CD4(globalCtx, v); + Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_SW, arg2, 4, &D_801333E0, &D_801333E0, &D_801333E8); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80062E14.s") +void func_80062DF4(GlobalContext* globalCtx, Vec3f* v) { + func_80062D60(globalCtx, v); +} +void func_80062E14(GlobalContext* globalCtx, Vec3f* v, Vec3f* arg2) { + s32 sp24; + static EffShieldParticleInit init = { + 16, + { 0, 0, 0 }, + { { 0x00, 0xC8, 0xFF, 0xFF } }, + { { 0xFF, 0xFF, 0xFF, 0xFF } }, + { { 0xFF, 0xFF, 0x80, 0xFF } }, + { { 0xFF, 0xFF, 0x00, 0xFF } }, + { { 0xFF, 0x40, 0x00, 0xC8 } }, + { { 0xFF, 0x00, 0x00, 0xFF } }, + 2.1f, + 35.0f, + 30.0f, + 8, + { 0, 0, 0, 0x00, 0x80, 0xFF, 0x00, 300 }, + 0, + }; + + init.position.x = (s32)v->x; + init.position.y = (s32)v->y; + init.position.z = (s32)v->z; + init.lightParams.posX = init.position.x; + init.lightParams.posY = init.position.y; + init.lightParams.posZ = init.position.z; + + Effect_Add(globalCtx, &sp24, 3, 0, 1, &init); + Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, arg2, 4, &D_801333E0, &D_801333E0, &D_801333E8); +} + +#if 0 // NON_MATCHING +// Incomplete, possibly not using the same logic +s32 func_80062ECC(f32 actor_ac_98_10, f32 actor_ac_98_12, f32 arg2, Vec3f* ac_actor_pos, Vec3f* at_actor_pos, Vec3f* arg5, Vec3f* arg6, + Vec3f* arg7) { + // arg5 = SP + 0xA8, unk input + // arg6 = SP + 0x90, unk output + // arg7 = SP + 0x84, unk output2 + // sp -0x78 + + Vec3f delta_a3_a4_sp6C; + Vec3f delta_a3_a5_sp60; + Vec3f delta_a4_a5_sp54; + f32 sp50; + f32 sp4C; + f32 temp_f0; + f32 temp_f0_3; + f32 temp_f12; + f32 temp_f14; + f32 sp38; + f32 temp_f16_2; + f32 temp_f2; + s32 phi_v0; + s32 phi_v1; + s32 phi_a0; + s32 phi_a1; + s32 phi_a2; + + delta_a3_a4_sp6C.x = at_actor_pos->x - ac_actor_pos->x; + delta_a3_a4_sp6C.y = at_actor_pos->y - ac_actor_pos->y - arg2; // temp_f14 + delta_a3_a4_sp6C.z = at_actor_pos->z - ac_actor_pos->z; + + delta_a3_a5_sp60.x = arg5->x - ac_actor_pos->x; + delta_a3_a5_sp60.y = arg5->y - ac_actor_pos->y - arg2; // temp_f6 + delta_a3_a5_sp60.z = arg5->z - ac_actor_pos->z; + + delta_a4_a5_sp54.x = delta_a3_a5_sp60.x - delta_a3_a4_sp6C.x; // temp_f16; + delta_a4_a5_sp54.y = delta_a3_a5_sp60.y - delta_a3_a4_sp6C.y; // sp18; // temp_f8; + delta_a4_a5_sp54.z = delta_a3_a5_sp60.z - delta_a3_a4_sp6C.z; // temp_f18; + + phi_v0 = 0; + // ada12c: bc1f 0xada138 ~> + if (0.0f < delta_a3_a4_sp6C.y) { + phi_v0 = 1; + } + // ada138: beqzl v0,0xada188 ~> + if (phi_v0 && delta_a3_a4_sp6C.y < actor_ac_98_12) { + if (sqrtf(SQ(delta_a3_a4_sp6C.x) + SQ(delta_a3_a4_sp6C.z)) < actor_ac_98_10) { + return 3; + } + } + + phi_v1 = 0; + if (0.0f < delta_a3_a5_sp60.y) { //ada19c: bc1f 0xada1a8 ~> + phi_v1 = 1; + } + //ada1a8: beqzl v1,0xada1f4 ~> + if (phi_v1 && delta_a3_a5_sp60.y < actor_ac_98_12) { + if (sqrtf(SQ(delta_a3_a5_sp60.x) + SQ(delta_a3_a5_sp60.z)) < actor_ac_98_10) { + return 3; + } + } + + //ada1f4 + sp38 = SQ(delta_a3_a4_sp6C.x) + SQ(delta_a3_a4_sp6C.z) - SQ(actor_ac_98_10); // temp_f12; + temp_f2 = SQ(delta_a4_a5_sp54.x) + SQ(delta_a4_a5_sp54.z); + if (!(fabsf(temp_f2) < 0.008f)) { // ada23c: bc1t 0xada2f0 ~> + temp_f14 = (delta_a4_a5_sp54.x + delta_a4_a5_sp54.x) * delta_a3_a4_sp6C.x + (delta_a4_a5_sp54.z + delta_a4_a5_sp54.z) * delta_a3_a4_sp6C.z; + temp_f0 = SQ(temp_f14); + temp_f12 = (4.0f * temp_f2) * sp38; + if (temp_f0 < temp_f12) { // ada280: bc1f 0xada290 ~> + return 0; + } + //ada290 + temp_f16_2 = temp_f0 - temp_f12; + temp_f0 = sqrtf(temp_f16_2); + if (0.0f < temp_f16_2) { + phi_v0 = 1; + phi_v1 = 1; + } else { + phi_v0 = 0; + phi_v1 = 1; + } + + sp50 = (temp_f0 - temp_f14) / (temp_f2 + temp_f2); // temp_f16_3; + if (phi_v0 == 1) { + sp4C = (-temp_f14 - temp_f0) / (temp_f2 + temp_f2); + } + } else { // 0xada2f0 + temp_f14 = ((delta_a4_a5_sp54.x + delta_a4_a5_sp54.x) * delta_a3_a4_sp6C.x) + ((delta_a4_a5_sp54.z + delta_a4_a5_sp54.z) * delta_a3_a4_sp6C.z); + if (!(fabsf(temp_f14) < 0.008f)) { // ada324 + phi_v0 = 0; + sp50 = -sp38 / temp_f14; + phi_v1 = 1; + } // ada340: b 0xada468 + else { + if (sp38 <= 0.0f) { // ada358: bc1f 0xada460 + phi_a0 = phi_v0; + if (phi_v0 != 0) // ada360: beqz v0,0xada388 ~> + { + phi_a0 = 0; + //ada37C + if (delta_a3_a4_sp6C.y < actor_ac_98_12) { + phi_a0 = 1; + } + } + phi_a1 = phi_a0; + //ada38C + phi_a0 = phi_v1; + if (phi_v1 != 0) { + phi_a0 = 0; + if (delta_a3_a5_sp60.y < actor_ac_98_12) { + phi_a0 = 1; + } + } + if (phi_a1) { // ada3b4 + if (phi_a0) { // ada3bc + *arg6 = delta_a3_a4_sp6C; + *arg7 = delta_a3_a5_sp60; + return 2; + } + } + // ada408 + if (phi_a1) { + *arg6 = delta_a3_a4_sp6C; + return 1; + } + // ada434 + if (phi_a0) { + *arg6 = delta_a3_a5_sp60; + return 1; + } + } + //ada460 + return 0; + } + } + // ada468 800632C8 + if (phi_v0 == 0) { // ada468: bnezl v0,0xada4a4 ~> + if (sp50 < 0.0f || 1.0f < sp50) { + return 0; + } + } else { // ada4a4 + phi_a1 = 0; + if (sp50 < 0.0f) { //ada4ac + phi_a1 = 1; + } + //ada4b8 + phi_a0 = phi_a1; + if (phi_a1 == 0) { + phi_a1 = 0; + if (1.0f < sp50) { + phi_a1 = 1; + } + } + //ada4dc + phi_a2 = 0; + if (sp4C < 0.0f) { + phi_a2 = 1; + } + if (phi_a2 == 0) { + phi_a2 = 0; + if (1.0f < sp4C) { + phi_a2 = 1; + } + } + if (phi_a1 != 0) { + if (phi_a2 != 0) { + return 0; + } + } + if (phi_a1 != 0) { + phi_v1 = 0; + } + if (phi_a2 != 0) { + phi_v0 = 0; + } + } + if (phi_v1 == 1) { + temp_f0_3 = sp50 * delta_a4_a5_sp54.y + delta_a3_a4_sp6C.y; + if (temp_f0_3 < 0.0f || actor_ac_98_12 < temp_f0_3) { + phi_v1 = 0; + } + } + if (phi_v0 == 1) { + temp_f0_3 = sp4C * delta_a4_a5_sp54.y + delta_a3_a4_sp6C.y; + if (temp_f0_3 < 0.0f || actor_ac_98_12 < temp_f0_3) { + phi_v0 = 0; + } + } + if (phi_v1 == 0 && phi_v0 == 0) { + return 0; + } + if (phi_v1 == 1) { + if (phi_v0 == 1) { + arg6->x = sp50 * delta_a4_a5_sp54.x + delta_a3_a4_sp6C.x + ac_actor_pos->x; + arg6->y = sp50 * delta_a4_a5_sp54.y + delta_a3_a4_sp6C.y + ac_actor_pos->y; + arg6->z = sp50 * delta_a4_a5_sp54.z + delta_a3_a4_sp6C.z + ac_actor_pos->z; + arg7->x = sp4C * delta_a4_a5_sp54.x + delta_a3_a4_sp6C.x + ac_actor_pos->x; + arg7->y = sp4C * delta_a4_a5_sp54.y + delta_a3_a4_sp6C.y + ac_actor_pos->y; + arg7->z = sp4C * delta_a4_a5_sp54.z + delta_a3_a4_sp6C.z + ac_actor_pos->z; + return 2; + } + } + if (phi_v1 == 1) { + arg6->x = sp50 * delta_a4_a5_sp54.x + delta_a3_a4_sp6C.x + ac_actor_pos->x; + arg6->y = sp50 * delta_a4_a5_sp54.y + delta_a3_a4_sp6C.y + ac_actor_pos->y; + arg6->z = sp50 * delta_a4_a5_sp54.z + delta_a3_a4_sp6C.z + ac_actor_pos->z; + return 1; + } + if (phi_v0 == 1) { // ada700 + arg6->x = sp4C * delta_a4_a5_sp54.x + delta_a3_a4_sp6C.x + ac_actor_pos->x; + arg6->y = sp4C * delta_a4_a5_sp54.y + delta_a3_a4_sp6C.y + ac_actor_pos->y; + arg6->z = sp4C * delta_a4_a5_sp54.z + delta_a3_a4_sp6C.z + ac_actor_pos->z; + return 1; + } + return 1; +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80062ECC.s") +#endif // NON_MATCHING -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_800635D0.s") +s32 func_800635D0(s32 arg0) { + s32 result; + + result = 0; + if (arg0 & 0x00400100) { + result = 1; + } else if (arg0 & 0x03000242) { + result = 2; + } else if (arg0 & 0x48800400) { + result = 4; + } else if (arg0 & 0x04000000) { + result = 8; + } + + KREG(7) = result; + return result; +} diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 84107e8a4c..2e6aca5027 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -32,7 +32,7 @@ typedef struct { /* 0x172 */ s16 unk_172; /* 0x174 */ s16 unk_174; /* 0x178 */ f32 unk_178; - /* 0x17C */ ColliderCylinderMain cylinderCollider; + /* 0x17C */ ColliderCylinder cylinderCollider; } ActorEnAObj; // size = 0x1C8 void func_8001D204(ActorEnAObj* this, GlobalContext* globalCtx); @@ -140,9 +140,9 @@ void En_A_Obj_Init(ActorEnAObj* this, GlobalContext* globalCtx) { this->actor.unk_4C = 500.0f; this->unk_178 = 45.0f; func_8001D234(this, this->actor.params); - ActorCollider_AllocCylinder(globalCtx, &this->cylinderCollider); - ActorCollider_InitCylinder(globalCtx, &this->cylinderCollider, &this->actor, &D_80115440); - this->actor.sub_98.mass = 0xFF; + Collider_InitCylinder(globalCtx, &this->cylinderCollider); + Collider_SetCylinder(globalCtx, &this->cylinderCollider, &this->actor, &D_80115440); + this->actor.colChkInfo.mass = 0xFF; this->actor.unk_1F = 0; break; case A_OBJ_KNOB: @@ -156,7 +156,7 @@ void En_A_Obj_Init(ActorEnAObj* this, GlobalContext* globalCtx) { } if (this->actor.params < 5) { - this->actor.sub_98.mass = 0xFF; + this->actor.colChkInfo.mass = 0xFF; } if (this->dynaPolyId != -1) { @@ -169,14 +169,14 @@ void En_A_Obj_Init(ActorEnAObj* this, GlobalContext* globalCtx) { #endif void En_A_Obj_Destroy(ActorEnAObj* this, GlobalContext* globalCtx) { - ColliderCylinderMain* cylinderCollider = &this->cylinderCollider; + ColliderCylinder* cylinderCollider = &this->cylinderCollider; DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); switch (this->actor.params) { case A_OBJ_SIGNPOST_OBLONG: case A_OBJ_SIGNPOST_ARROW: - ActorCollider_FreeCylinder(globalCtx, cylinderCollider); + Collider_DestroyCylinder(globalCtx, cylinderCollider); } } @@ -303,7 +303,7 @@ void func_8001D608(ActorEnAObj* this, GlobalContext* globalCtx) { } void En_A_Obj_Update(ActorEnAObj* this, GlobalContext* globalCtx) { - ColliderCylinderMain* cylinderCollider; + Collider* collider; this->updateFunc(this, globalCtx); Actor_MoveForward(&this->actor); @@ -322,9 +322,9 @@ void En_A_Obj_Update(ActorEnAObj* this, GlobalContext* globalCtx) { switch (this->actor.params) { case A_OBJ_SIGNPOST_OBLONG: case A_OBJ_SIGNPOST_ARROW: - cylinderCollider = &this->cylinderCollider; - ActorCollider_Cylinder_Update(&this->actor, cylinderCollider); - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, cylinderCollider); + collider = (Collider*)&this->cylinderCollider; + Collider_CylinderUpdate(&this->actor, &this->cylinderCollider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, collider); } } diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index dde4f6535f..917e5fecec 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -40,7 +40,7 @@ typedef struct { /* 0x158 */ s16 unk_158; /* 0x15A */ s16 unk_15A; /* 0x15C */ f32 unk_15C; - /* 0x160 */ ColliderCylinderMain cylinderCollider; + /* 0x160 */ ColliderCylinder cylinderCollider; } ActorEnItem00; void func_8001DFC8(ActorEnItem00* this, GlobalContext* globalCtx); @@ -93,8 +93,8 @@ void En_Item00_Init(ActorEnItem00* this, GlobalContext* globalCtx) { } Actor_ProcessInitChain(&this->actor, D_8011550C); - ActorCollider_AllocCylinder(globalCtx, &this->cylinderCollider); - ActorCollider_InitCylinder(globalCtx, &this->cylinderCollider, &this->actor, &D_801154E0); + Collider_InitCylinder(globalCtx, &this->cylinderCollider); + Collider_SetCylinder(globalCtx, &this->cylinderCollider, &this->actor, &D_801154E0); this->unk_158 = 1; @@ -301,8 +301,8 @@ void En_Item00_Init(ActorEnItem00* this, GlobalContext* globalCtx) { #endif void En_Item00_Destroy(ActorEnItem00* this, GlobalContext* globalCtx) { - ColliderCylinderMain* cylinderCollider = &this->cylinderCollider; - ActorCollider_FreeCylinder(globalCtx, cylinderCollider); + ColliderCylinder* cylinderCollider = &this->cylinderCollider; + Collider_DestroyCylinder(globalCtx, cylinderCollider); } void func_8001DFC8(ActorEnItem00* this, GlobalContext* globalCtx) { @@ -529,8 +529,8 @@ void En_Item00_Update(ActorEnItem00* this, GlobalContext* globalCtx) { } } - ActorCollider_Cylinder_Update(&this->actor, &this->cylinderCollider); - Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, &this->cylinderCollider); + Collider_CylinderUpdate(&this->actor, &this->cylinderCollider); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->cylinderCollider); if ((this->actor.params == DROP_SHIELD_DEKU) || (this->actor.params == DROP_SHIELD_HYLIAN) || (this->actor.params == DROP_TUNIC_ZORA) || (this->actor.params == DROP_TUNIC_GORON)) { diff --git a/src/code/z_play.c b/src/code/z_play.c index 55a5c40296..d01d86ce70 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -159,7 +159,7 @@ void Gameplay_Destroy(GlobalContext* globalCtx) { func_800C0F08(&globalCtx->preRenderCtx); func_800271A8(globalCtx); Effect_SS_Clear(globalCtx); - func_8005D400(globalCtx, &globalCtx->sub_11E60); + CollisionCheck_DestroyContext(globalCtx, &globalCtx->colChkCtx); if (D_80161490 == 3) { func_800B1DBC(&D_801613B0); @@ -242,7 +242,7 @@ void Gameplay_Init(GlobalContext* globalCtx) { func_8006BA00(globalCtx); func_80026C2C(globalCtx); func_800272B0(globalCtx, 0x55); - func_8005D3BC(globalCtx, &globalCtx->sub_11E60); + func_8005D3BC(globalCtx, &globalCtx->colChkCtx); SkelAnime_AnimationCtxReset(&globalCtx->animationCtx); func_8006450C(globalCtx, &globalCtx->csCtx); @@ -834,25 +834,25 @@ void Gameplay_Update(GlobalContext* globalCtx) { LOG_NUM("1", 1, "../z_play.c", 3612); } - func_8006139C(globalCtx, &globalCtx->sub_11E60); + func_8006139C(globalCtx, &globalCtx->colChkCtx); if (1 && HREG(63)) { LOG_NUM("1", 1, "../z_play.c", 3618); } - func_80061C98(globalCtx, &globalCtx->sub_11E60); + CollisionCheck_OC(globalCtx, &globalCtx->colChkCtx); if (1 && HREG(63)) { LOG_NUM("1", 1, "../z_play.c", 3624); } - func_800622E4(globalCtx, &globalCtx->sub_11E60); + func_800622E4(globalCtx, &globalCtx->colChkCtx); if (1 && HREG(63)) { LOG_NUM("1", 1, "../z_play.c", 3631); } - func_8005D40C(globalCtx, &globalCtx->sub_11E60); + CollisionCheck_InitContext(globalCtx, &globalCtx->colChkCtx); if (1 && HREG(63)) { LOG_NUM("1", 1, "../z_play.c", 3637); diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index c859ec47fa..13045fbc43 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -43,9 +43,9 @@ const ActorInit Bg_Bdan_Objects_InitVars = { }; static ColliderCylinderInit D_8086CD70 = { - 0x0A, 0x11, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xFFCFFFFF, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00000000, - 0x09, 0x00, 0x00, 0x00, 0x00BB, 0x0050, 0x0000, 0x0000, 0x0000, 0x0000, + { COLTYPE_UNK10, 0x11, 0x00, 0x00, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0xFFCFFFFF, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, 0x09, 0x00, 0x00 }, + { 0x00BB, 0x0050, 0x0000, { 0 } }, }; static InitChainEntry initChain[] = { @@ -111,8 +111,8 @@ void BgBdanObjects_Init(BgBdanObjects* this, GlobalContext* globalCtx) { } if (thisx->params == 0) { DynaPolyInfo_Alloc(&D_06008CE0, &localC); - ActorCollider_AllocCylinder(globalCtx, &this->collider); - ActorCollider_InitCylinder(globalCtx, &this->collider, this, &D_8086CD70); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, this, &D_8086CD70); thisx->posRot.pos.y = (f32)(thisx->posRot.pos.y + -79.0f); if (Flags_GetClear(globalCtx, thisx->room)) { Flags_SetSwitch(globalCtx, this->unk_168); @@ -157,7 +157,7 @@ void BgBdanObjects_Destroy(BgBdanObjects* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); if (thisx->params == 0) { - ActorCollider_FreeCylinder(globalCtx, &this->collider); + Collider_DestroyCylinder(globalCtx, &this->collider); } } @@ -296,8 +296,8 @@ void func_8086C5BC(BgBdanObjects* this, GlobalContext* globalCtx) { } void func_8086C618(BgBdanObjects* this, GlobalContext* globalCtx) { - ActorCollider_Cylinder_Update(&this->dyna.actor, &this->collider); - Actor_CollisionCheck_SetAT(globalCtx, &globalCtx->sub_11E60, &this->collider); + Collider_CylinderUpdate(&this->dyna.actor, &this->collider); + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider); if (Flags_GetClear(globalCtx, this->dyna.actor.room)) { Flags_SetSwitch(globalCtx, this->unk_168); this->dyna.actor.initPosRot.rot.y = (s16)(this->dyna.actor.shape.rot.y + 0x2000) & 0xC000; diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h index 67993180de..db1092bc15 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h @@ -9,7 +9,7 @@ typedef struct { /* 0x0164 */ ActorFunc actionFunc; /* 0x0168 */ u8 unk_168; /* 0x016A */ s16 unk_16A; - /* 0x016C */ ColliderCylinderMain collider; + /* 0x016C */ ColliderCylinder collider; /* 0x01B8 */ s32 unk_1B8; } BgBdanObjects; // size = 0x01BC diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index f15f9a2e5c..785b705d5e 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -57,10 +57,18 @@ extern UNK_PTR D_06005CF8; extern UNK_PTR D_060061A0; extern UNK_PTR D_06005A20; -static u32 D_8086E0A0[] = { 0x00000000, 0x00000000, 0x00000000, 0xEFC1FFFE, 0x00000000, - 0x00010100, 0x00000000, 0x00780000, 0x01720064 }; +static ColliderJntSphItemInit colliderItemsInit[] = { + { + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xEFC1FFFE, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 0x00, { { 0x0000, 0x0078, 0x0000 }, 370 }, 100 }, + }, +}; -static u32 D_8086E0C4[] = { 0x0A000939, 0x20000000, 0x00000001, &D_8086E0A0 }; +static ColliderJntSphInit colliderInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x20, COLSHAPE_JNTSPH }, + 1, + &colliderItemsInit, +}; static InitChainEntry initChain[] = { ICHAIN_F32(unk_F4, 1400, ICHAIN_CONTINUE), @@ -68,7 +76,7 @@ static InitChainEntry initChain[] = { ICHAIN_F32(unk_FC, 1200, ICHAIN_STOP), }; -static u32 D_8086E0E0[] = { 0x00000000, 0x430C0000, 0x00000000, 0x00000000 }; +static Vec3f D_8086E0E0 = { 0, 140.0f, 0 }; void func_8086D010(BgBdanSwitch* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) { s16 pad1; @@ -86,8 +94,8 @@ void func_8086D010(BgBdanSwitch* this, GlobalContext* globalCtx, u32 collision, void func_8086D098(BgBdanSwitch* this, GlobalContext* globalCtx) { Actor* actor = &this->actor; - func_8005BBF8(globalCtx, &this->collider, actor); - func_8005C050(globalCtx, &this->collider, actor, &D_8086E0C4, &this->collider.unk_20); + Collider_InitJntSph(globalCtx, &this->collider); + Collider_SetJntSph(globalCtx, &this->collider, actor, &colliderInit, &this->colliderItems); } void func_8086D0EC(BgBdanSwitch* this) { @@ -187,7 +195,7 @@ void BgBdanSwitch_Destroy(BgBdanSwitch* this, GlobalContext* globalCtx) { break; case YELLOW_TALL_1: case YELLOW_TALL_2: - func_8005BCC8(globalCtx, &this->collider); + Collider_DestroyJntSph(globalCtx, &this->collider); } } @@ -383,14 +391,14 @@ void func_8086DB68(BgBdanSwitch* this, GlobalContext* globalCtx) { default: return; case YELLOW_TALL_1: - if (((this->collider.base.collideFlags & 2) != 0) && this->unk_1D8 <= 0) { + if (((this->collider.base.acFlags & 2) != 0) && this->unk_1D8 <= 0) { this->unk_1D8 = 0xA; func_8086DC30(this); func_8086D4B4(this, globalCtx); } break; case YELLOW_TALL_2: - if (((this->collider.base.collideFlags & 2) != 0) && ((this->unk_1DC & 2) == 0) && this->unk_1D8 <= 0) { + if (((this->collider.base.acFlags & 2) != 0) && ((this->unk_1DC & 2) == 0) && this->unk_1D8 <= 0) { this->unk_1D8 = 0xA; func_8086DC30(this); func_8086D4B4(this, globalCtx); @@ -426,7 +434,7 @@ void func_8086DCE8(BgBdanSwitch* this, GlobalContext* globalCtx) { } break; case YELLOW_TALL_2: - if (((this->collider.base.collideFlags & 2) != 0) && ((this->unk_1DC & 2) == 0) && (this->unk_1D8 <= 0)) { + if (((this->collider.base.acFlags & 2) != 0) && ((this->unk_1DC & 2) == 0) && (this->unk_1D8 <= 0)) { this->unk_1D8 = 0xA; func_8086DDA8(this); func_8086D548(this, globalCtx); @@ -468,12 +476,12 @@ void BgBdanSwitch_Update(BgBdanSwitch* this, GlobalContext* globalCtx) { if (!func_8008E988(globalCtx) && this->unk_1D8 > 0) { this->unk_1D8 -= 1; } - pad = this->collider.base.collideFlags; - this->collider.base.collideFlags &= 0xFFFD; + pad = this->collider.base.acFlags; + this->collider.base.acFlags &= 0xFFFD; this->unk_1DC = pad; - this->collider.unk_1C->unk_2E = this->unk_1D4 * 370.0f; - Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, &this->collider); - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); + this->collider.list[0].dim.modelSphere.radius = this->unk_1D4 * 370.0f; + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); } void func_8086DF58(BgBdanSwitch* this, GlobalContext* globalCtx, UNK_TYPE arg2) { diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h index a0c34ac889..84c9d336d4 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h @@ -13,24 +13,6 @@ typedef enum { /* 0x04 */ YELLOW_TALL_2 } BgBdanSwitchType; -typedef struct { - /* 0x00 */ char unk_00[0x2E]; - /* 0x2E */ s16 unk_2E; -} ColliderCustomHelper; - -typedef struct { - /* 0x00 */ Collider base; - /* 0x18 */ char unk_18[0x4]; - /* 0x1C */ ColliderCustomHelper* unk_1C; - /* 0x20 */ s32 unk_20; - /* 0x24 */ char unk_24[0x1C]; - // after this is a guess based on ColliderCylinderMain - /* 0x40 */ s16 radius; - /* 0x42 */ s16 height; - /* 0x44 */ s16 yShift; - /* 0x46 */ Vec3s position; -} ColliderCustomMain; // size = 0x4C - typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ u32 dynaPolyId; @@ -40,8 +22,8 @@ typedef struct { /* 0x015C */ u32 unk_15C; /* 0x0160 */ u8 unk_160; /* 0x0164 */ ActorFunc updateFunc; - /* 0x0168 */ ColliderCustomMain collider; - /* 0x01B4 */ char unk_1B4[0x14]; + /* 0x0168 */ ColliderJntSph collider; + /* 0x0188 */ ColliderJntSphItem colliderItems[1]; /* 0x01C8 */ f32 unk_1C8; /* 0x01CC */ s16 unk_1CC; /* 0x01CE */ char unk_1CE[0x2]; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index 734810bda6..66e44f757c 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -34,11 +34,12 @@ const ActorInit Bg_Hidan_Firewall_InitVars = { }; static ColliderCylinderInit cylinderInitData = { - 0x0A, 0x11, 0x00, 0x09, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20000000, 0x01, 0x04, - 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x01, 0x00, 0x001E, 0x0053, 0x0000, + { COLTYPE_UNK10, 0x11, 0x00, 0x09, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x20000000, 0x01, 0x04 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x19, 0x00, 0x01 }, + { 30, 83, 0, { 0 } }, }; -static Sub98Init4 actor98InitData = { +static CollisionCheckInfoInit colChkInfoInit = { 0x01, 0x0050, 0x0064, @@ -62,19 +63,19 @@ void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx) { this->unk_150 = 0; - ActorCollider_AllocCylinder(globalCtx, &this->collider); - ActorCollider_InitCylinder(globalCtx, &this->collider, &this->actor, &cylinderInitData); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &cylinderInitData); - this->collider.dim.position.y = this->actor.posRot.pos.y; + this->collider.dim.pos.y = this->actor.posRot.pos.y; - func_80061ED4(&this->actor.sub_98, NULL, &actor98InitData); + func_80061ED4(&this->actor.colChkInfo, NULL, &colChkInfoInit); this->actionFunc = (ActorFunc)BgHidanFirewall_Wait; } void BgHidanFirewall_Destroy(BgHidanFirewall* this, GlobalContext* globalCtx) { BgHidanFirewall* thing = this; - ActorCollider_FreeCylinder(globalCtx, &this->collider); + Collider_DestroyCylinder(globalCtx, &this->collider); } s32 BgHidanFirewall_CheckProximity(BgHidanFirewall* this, GlobalContext* globalCtx) { @@ -165,8 +166,8 @@ void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, GlobalContext* } sp28 = Math_Sins(this->actor.shape.rot.y); temp_ret = Math_Coss(this->actor.shape.rot.y); - this->collider.dim.position.x = this->actor.posRot.pos.x + sp30.x * temp_ret + sp30.z * sp28; - this->collider.dim.position.z = this->actor.posRot.pos.z - sp30.x * sp28 + sp30.z * temp_ret; + this->collider.dim.pos.x = this->actor.posRot.pos.x + sp30.x * temp_ret + sp30.z * sp28; + this->collider.dim.pos.z = this->actor.posRot.pos.z - sp30.x * sp28 + sp30.z * temp_ret; } void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx) { @@ -175,16 +176,16 @@ void BgHidanFirewall_Update(BgHidanFirewall* this, GlobalContext* globalCtx) { this->unk_150 = (this->unk_150 + 1) % 8; - if (this->collider.base.colliderFlags & 2) { - this->collider.base.colliderFlags &= ~2; + if (this->collider.base.atFlags & 2) { + this->collider.base.atFlags &= ~2; BgHidanFirewall_Collide(this, globalCtx); } this->actionFunc(this, globalCtx); if (this->actionFunc == (ActorFunc)BgHidanFirewall_Erupt) { BgHidanFirewall_ColliderFollowPlayer(this, globalCtx); - Actor_CollisionCheck_SetAT(globalCtx, &globalCtx->sub_11E60, &this->collider); - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); func_8002F974(&this->actor, 0x2034); } } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h index 32cc66c10f..c7f75a4980 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h @@ -8,7 +8,7 @@ typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ ActorFunc actionFunc; /* 0x0150 */ s16 unk_150; - /* 0x0154 */ ColliderCylinderMain collider; + /* 0x0154 */ ColliderCylinder collider; } BgHidanFirewall; // size = 0x01A0 #endif diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index f1dccb770d..00730a83a7 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -162,11 +162,12 @@ const ActorInit Bg_Toki_Swd_InitVars = { }; static ColliderCylinderInit colliderInit = { - 0x0A, 0x00, 0x00, 0x39, 0x12, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, - 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000, 0x0001, 0x0000, 0x000A, 0x0046, 0x0000, + { COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x12, COLSHAPE_CYLINDER }, + { 0x00, { 0xFFCFFFFF, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, + { 10, 70, 0, { 0 } } }; -static Sub98Init4 sub98Init = { +static CollisionCheckInfoInit colChkInfoInit = { 0x0A, 0x0023, 0x0064, @@ -182,7 +183,7 @@ void BgTokiSwd_SetupAction(BgTokiSwd* this, ActorFunc actionFunc) { } void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx) { - ColliderCylinderMain* collision; + ColliderCylinder* collision; Actor* thisx = &this->actor; Actor_ProcessInitChain(thisx, initChain); @@ -197,15 +198,15 @@ void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx) { globalCtx->unk_11D30[0] = 0xFF; } - ActorCollider_AllocCylinder(globalCtx, collision); - ActorCollider_InitCylinder(globalCtx, collision, thisx, &colliderInit); - ActorCollider_Cylinder_Update(thisx, collision); - func_80061ED4(&thisx->sub_98, 0, &sub98Init); + Collider_InitCylinder(globalCtx, collision); + Collider_SetCylinder(globalCtx, collision, thisx, &colliderInit); + Collider_CylinderUpdate(thisx, collision); + func_80061ED4(&thisx->colChkInfo, 0, &colChkInfoInit); } void BgTokiSwd_Destroy(BgTokiSwd* this, GlobalContext* globalCtx) { - ColliderCylinderMain* collider = &this->collider; - ActorCollider_FreeCylinder(globalCtx, collider); + ColliderCylinder* collider = &this->collider; + Collider_DestroyCylinder(globalCtx, collider); } void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) { @@ -269,7 +270,7 @@ void func_808BB128(BgTokiSwd* this, GlobalContext* globalCtx) { void BgTokiSwd_Update(BgTokiSwd* this, GlobalContext* globalCtx) { this->actionFunc(&this->actor, globalCtx); - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); } void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h index 4fd13fbb0b..c5c942ff9c 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h @@ -7,7 +7,7 @@ typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ ActorFunc actionFunc; - /* 0x0150 */ ColliderCylinderMain collider; + /* 0x0150 */ ColliderCylinder collider; } BgTokiSwd; // size = 0x019C extern const ActorInit Bg_Toki_Swd_InitVars; diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 97e776eaa4..467cb00900 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -33,9 +33,9 @@ const ActorInit Door_Ana_InitVars = { // initial collision data static ColliderCylinderInit colliderInit = { - 0x0A, 0x00, 0x09, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, - 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00000048, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x00, 0x00, 0x0032, 0x000A, 0x0000, 0x0000, 0x0000, 0x0000, + { COLTYPE_UNK10, 0x00, 0x09, 0x00, 0x00, COLSHAPE_CYLINDER }, + { 0x02, { 0x00000000, 0x00, 0x00 }, { 0x00000048, 0x00, 0x00 }, 0x00, 0x01, 0x00 }, + { 50, 10, 0, { 0 } }, }; // array of entrance table entries to grotto destinations @@ -53,7 +53,7 @@ void DoorAna_SetupAction(DoorAna* this, ActorFunc func) { } void DoorAna_Init(DoorAna* this, GlobalContext* globalCtx) { - ColliderCylinderMain* collider; + ColliderCylinder* collider; this->actor.shape.rot.z = 0; this->actor.shape.rot.y = this->actor.shape.rot.z; @@ -62,8 +62,8 @@ void DoorAna_Init(DoorAna* this, GlobalContext* globalCtx) { // only allocate collider for grottos that need bombing/hammering open if ((this->actor.params & 0x200) != 0) { collider = &this->collider; - ActorCollider_AllocCylinder(globalCtx, collider); - ActorCollider_InitCylinder(globalCtx, collider, &this->actor, &colliderInit); + Collider_InitCylinder(globalCtx, collider); + Collider_SetCylinder(globalCtx, collider, &this->actor, &colliderInit); } else { this->actor.flags |= 0x10; } @@ -78,7 +78,7 @@ void DoorAna_Init(DoorAna* this, GlobalContext* globalCtx) { void DoorAna_Destroy(DoorAna* this, GlobalContext* globalCtx) { // free collider if it has one if ((this->actor.params & 0x200) != 0) { - ActorCollider_FreeCylinder(globalCtx, &this->collider); + Collider_DestroyCylinder(globalCtx, &this->collider); } } @@ -93,12 +93,12 @@ void DoorAna_Update_Hidden(DoorAna* this, GlobalContext* globalCtx) { } } else { // bombing/hammering open a grotto - if ((this->collider.base.collideFlags & 2) != 0) { + if ((this->collider.base.acFlags & 2) != 0) { openGrotto = true; - ActorCollider_FreeCylinder(globalCtx, &this->collider); + Collider_DestroyCylinder(globalCtx, &this->collider); } else { - ActorCollider_Cylinder_Update(&this->actor, &this->collider); - Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, &this->collider); + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider); } } // open the grotto diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h index 98718e330d..3eecfc64cf 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h @@ -6,7 +6,7 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ ColliderCylinderMain collider; + /* 0x014C */ ColliderCylinder collider; /* 0x0198 */ ActorFunc actionFunc; } DoorAna; // size = 0x019C diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 378e66b93a..943c153cdf 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -45,8 +45,9 @@ const ActorInit En_Ani_InitVars = { }; static ColliderCylinderInit cylinderInitData = { - 0x0A, 0x00, 0x11, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00000000, 0x00, 0x00, - 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x001E, 0x0028, 0x0000, + { COLTYPE_UNK10, 0x00, 0x11, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 30, 40, 0, { 0 } }, }; static InitChainEntry initChain[] = { @@ -76,9 +77,9 @@ void EnAni_Init(EnAni* this, GlobalContext* globalCtx) { SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_060000F0, anim, this->limbDrawTable, this->transitionDrawTable, 0x10); SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, anim); - ActorCollider_AllocCylinder(globalCtx, &this->collider); - ActorCollider_InitCylinder(globalCtx, &this->collider, &this->actor, &cylinderInitData); - this->actor.sub_98.mass = 0xFF; + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &cylinderInitData); + this->actor.colChkInfo.mass = 0xFF; if (LINK_IS_CHILD) { EnAni_SetupAction(this, func_809B064C); } else { @@ -91,9 +92,9 @@ void EnAni_Init(EnAni* this, GlobalContext* globalCtx) { } void EnAni_Destroy(EnAni* this, GlobalContext* globalCtx) { - ColliderCylinderMain* collider; + ColliderCylinder* collider; collider = &this->collider; - ActorCollider_FreeCylinder(globalCtx, &this->collider); + Collider_DestroyCylinder(globalCtx, &this->collider); } s32 EnAni_SetText(EnAni* this, GlobalContext* globalCtx, u16 textId) { @@ -238,13 +239,13 @@ void func_809B0A6C(EnAni* this, GlobalContext* globalCtx) { } void EnAni_Update(EnAni* this, GlobalContext* globalCtx) { - ColliderCylinderMain* collider; + ColliderCylinder* collider; u32 pad; u32 pad2; collider = &this->collider; - ActorCollider_Cylinder_Update(&this->actor, collider); - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, collider); + Collider_CylinderUpdate(&this->actor, collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, collider); Actor_MoveForward(&this->actor); func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); if ((globalCtx->csCtx.state != 0) && (globalCtx->csCtx.actorActions[0] != NULL)) { diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.h b/src/overlays/actors/ovl_En_Ani/z_en_ani.h index c690d89571..07f4811545 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.h +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.h @@ -6,7 +6,7 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ ColliderCylinderMain collider; + /* 0x014C */ ColliderCylinder collider; /* 0x0198 */ SkelAnime skelAnime; /* 0x01DC */ Vec3s limbDrawTable[16]; /* 0x023C */ Vec3s transitionDrawTable[16]; diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.c b/src/overlays/actors/ovl_En_Bird/z_en_bird.c index dd7b67efd1..9ec30777e1 100644 --- a/src/overlays/actors/ovl_En_Bird/z_en_bird.c +++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.c @@ -1,7 +1,7 @@ /* * File: z_en_bird.c * Overlay: ovl_En_Bird - * Description: The projectile fired by deku scrubs and octaroks. + * Description: A brown bird. Tweet tweet. */ #include @@ -70,7 +70,7 @@ void EnBird_Init(EnBird* this, GlobalContext* globalCtx) { this->unk_194 = 0; this->unk_198 = 0; this->unk_1C0 = 0x9C4; - this->actor.sub_98.mass = 0; + this->actor.colChkInfo.mass = 0; this->unk_1A8 = 1.5f; this->unk_1AC = 0.5f; this->unk_1A0 = 0.0f; diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index ee14811bdc..7a045c0a2a 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -27,52 +27,10 @@ const ActorInit En_Boom_InitVars = { (ActorFunc)EnBoom_Draw, }; -// Related to collision, should be moved somewhere else when collision_check is decompiled. -// Seems to be made up of a bunch of substructs, but I didnt do too much digging. -// This is probably not accurate. -typedef struct { - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - u8 unk_04; - u8 unk_05; - u16 pad_06; - u8 unk_08; - u8 pad_09; - u8 pad_0A; - u8 pad_0B; - u32 unk_0C; - u8 unk_10; - u8 unk_11; - u16 pad_12; - u32 unk_14; - u8 unk_18; - u8 unk_19; - u16 pad_1A; - u8 unk_1C; - u8 unk_1D; - u8 unk_1E; - u8 pad_1F; - u32 unk_20; - u32 unk_24; - u32 unk_28; - u32 unk_2C; - u32 unk_30; - u32 unk_34; - u32 unk_38; - u32 unk_3C; - u32 unk_40; - u32 unk_44; - u32 unk_48; - u32 unk_4C; -} unkCollision; // size = 0x50 - -static unkCollision col = { - 0x0A, 0x09, 0x00, 0x00, 0x08, 0x03, 0x0000, 0x02, 0x00, - 0x00, 0x00, 0x00000010, 0x00, 0x01, 0x0000, 0xFFCFFFFF, 0x00, 0x00, - 0x0000, 0x05, 0x00, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +static ColliderQuadInit col = { + { COLTYPE_UNK10, 0x09, 0x00, 0x00, 0x08, COLSHAPE_QUAD }, + { 0x02, { 0x00000010, 0x00, 0x01 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x05, 0x00, 0x00 }, + { 0 }, }; static InitChainEntry initChain[] = { @@ -123,15 +81,15 @@ void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx) { Effect_Add(globalCtx, &this->effect, 1, 0, 0, &trail); - func_8005D018(globalCtx, &this->collider); - func_8005D104(globalCtx, &this->collider, this, &col); + Collider_InitQuad(globalCtx, &this->collider); + Collider_SetQuad(globalCtx, &this->collider, this, &col); EnBoom_SetupAction(this, &EnBoom_Fly); } void EnBoom_Destroy(EnBoom* this, GlobalContext* globalCtx) { func_8002709C(globalCtx, this->effect); - func_8005D060(globalCtx, &this->collider); + Collider_DestroyQuad(globalCtx, &this->collider); } void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) { @@ -183,13 +141,13 @@ void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) { func_8002F974(this, 0x1010); // If the boomerang collides with EnItem00 or a Skulltula token, set grabbed pointer to pick it up - collided = (this->collider.colliderFlags & 0x2); + collided = (this->collider.base.atFlags & 0x2); collided = (!!(collided)); if (collided) { - if (((this->collider.at->id == ACTOR_EN_ITEM00) || (this->collider.at->id == ACTOR_EN_SI))) { - this->grabbed = this->collider.at; - if (this->collider.at->id == ACTOR_EN_SI) { - this->collider.at->flags |= 0x2000; + if (((this->collider.base.at->id == ACTOR_EN_ITEM00) || (this->collider.base.at->id == ACTOR_EN_SI))) { + this->grabbed = this->collider.base.at; + if (this->collider.base.at->id == ACTOR_EN_SI) { + this->collider.base.at->flags |= 0x2000; } } } @@ -220,7 +178,7 @@ void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) { Actor_Kill(&this->actor); } } else { - collided = (this->collider.colliderFlags & 0x2); + collided = (this->collider.base.atFlags & 0x2); collided = (!!(collided)); if (collided) { // Copy the position from the prevous frame to the boomerang to start the bounce back. diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h index 473fe4060a..88a3d117c9 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.h +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h @@ -5,16 +5,15 @@ #include typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ Collider collider; - /* 0x0164 */ char unk_164[0x68]; - /* 0x01CC */ Actor* moveTo; // actor boomerang moves toward - /* 0x01D0 */ Actor* grabbed; // actor grabbed by the boomerang - /* 0x01D4 */ u8 returnTimer; // returns to Link when 0 - /* 0x01D5 */ u8 activeTimer; // increments once every update - /* 0x01D8 */ u32 effect; // set by Effect_Add - /* 0x01DC */ u32 unk_1DC[0x7]; - /* 0x01F8 */ ActorFunc actionFunc; + /* 0x0000 */ Actor actor; + /* 0x014C */ ColliderQuad collider; + /* 0x01CC */ Actor* moveTo; // actor boomerang moves toward + /* 0x01D0 */ Actor* grabbed; // actor grabbed by the boomerang + /* 0x01D4 */ u8 returnTimer; // returns to Link when 0 + /* 0x01D5 */ u8 activeTimer; // increments once every update + /* 0x01D8 */ u32 effect; // set by Effect_Add + /* 0x01DC */ u32 unk_1DC[0x7]; + /* 0x01F8 */ ActorFunc actionFunc; } EnBoom; // size = 0x01FC extern const ActorInit En_Boom_InitVars; diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index eea273209c..fa42989f20 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -33,12 +33,12 @@ const ActorInit En_Dog_InitVars = { }; static ColliderCylinderInit cylinderInit = { - 0x06, 0x00, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x01, 0x00, 0x0010, 0x0014, 0x0000, 0x0000, 0x0000, 0x0000, + { COLTYPE_UNK6, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 16, 20, 0, { 0 } }, }; -static Sub98Init5 sub98Data = { +static CollisionCheckInfoInit2 colChkInfoInit = { 0x00, // health 0x0000, // unk_10 0x0000, // unk_12 @@ -155,8 +155,8 @@ s32 EnDog_PlayAnimAndSFX(EnDog* this) { } s8 EnDog_CanFollow(EnDog* this, GlobalContext* globalCtx) { - if ((this->collider.base.collideFlags & 2)) { - this->collider.base.collideFlags &= ~2; + if (this->collider.base.acFlags & 2) { + this->collider.base.acFlags &= ~2; return 2; } @@ -164,7 +164,7 @@ s8 EnDog_CanFollow(EnDog* this, GlobalContext* globalCtx) { return 0; } - if ((this->collider.base.maskB & 1)) { + if (this->collider.base.maskB & 1) { this->collider.base.maskB &= ~1; if (gSaveContext.dogParams != 0) { return 0; @@ -221,7 +221,7 @@ s32 EnDog_Orient(EnDog* this, GlobalContext* globalCtx) { void EnDog_Init(EnDog* this, GlobalContext* globalCtx) { SkelAnime* skelAnime; s16 followingDog; - ColliderCylinderMain* collider; + ColliderCylinder* collider; collider = &this->collider; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 24.0f); @@ -239,9 +239,9 @@ void EnDog_Init(EnDog* this, GlobalContext* globalCtx) { return; } - ActorCollider_AllocCylinder(globalCtx, collider); - ActorCollider_InitCylinder(globalCtx, collider, &this->actor, &cylinderInit); - func_80061EFC(&this->actor.sub_98, 0, &sub98Data); + Collider_InitCylinder(globalCtx, collider); + Collider_SetCylinder(globalCtx, collider, &this->actor, &cylinderInit); + func_80061EFC(&this->actor.colChkInfo, 0, &colChkInfoInit); Actor_SetScale(&this->actor, 0.0075f); this->waypoint = 0; this->actor.gravity = -1.0f; @@ -278,8 +278,8 @@ void EnDog_Init(EnDog* this, GlobalContext* globalCtx) { } void EnDog_Destroy(EnDog* this, GlobalContext* globalCtx) { - ColliderCylinderMain* collider = &this->collider; - ActorCollider_FreeCylinder(globalCtx, collider); + ColliderCylinder* collider = &this->collider; + Collider_DestroyCylinder(globalCtx, collider); } void EnDog_FollowPath(EnDog* this, GlobalContext* globalCtx) { @@ -437,8 +437,8 @@ void EnDog_Update(EnDog* this, GlobalContext* globalCtx) { func_8002E4B4(globalCtx, &this->actor, this->collider.dim.radius, this->collider.dim.height * 0.5f, 0.0f, 5); Actor_MoveForward(&this->actor); this->actionFunc(this, globalCtx); - ActorCollider_Cylinder_Update(&this->actor, &this->collider); - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); } s32 EnDog_Callback1(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) { diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.h b/src/overlays/actors/ovl_En_Dog/z_en_dog.h index 30dda5534b..16be64f5c8 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.h +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.h @@ -8,7 +8,7 @@ typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ SkelAnime skelAnime; /* 0x0190 */ ActorFunc actionFunc; - /* 0x0194 */ ColliderCylinderMain collider; + /* 0x0194 */ ColliderCylinder collider; /* 0x01E0 */ Path* path; /* 0x01E4 */ u8 reverse; /* 0x01E6 */ s16 waypoint; diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index fb3a533648..a5e8426115 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -55,7 +55,7 @@ void EnDs_Init(EnDs* this, GlobalContext* globalCtx) { SkelAnime_InitSV(globalCtx, skelAnime, &D_06004768, &D_0600039C, &this->limbDrawTable, &this->unk_1B4, 6); SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_0600039C); - this->actor.sub_98.mass = 0xFF; + this->actor.colChkInfo.mass = 0xFF; Actor_SetScale(this, 0.013f); diff --git a/src/overlays/actors/ovl_En_It/z_en_it.c b/src/overlays/actors/ovl_En_It/z_en_it.c index f96c66296a..29b9e3f2de 100644 --- a/src/overlays/actors/ovl_En_It/z_en_it.c +++ b/src/overlays/actors/ovl_En_It/z_en_it.c @@ -13,12 +13,13 @@ void EnIt_Destroy(EnIt* this, GlobalContext* globalCtx); void EnIt_Update(EnIt* this, GlobalContext* globalCtx); static ColliderCylinderInit cylinderInitData = { - 0x0A, 0x00, 0x00, 0x05, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00000000, 0x00, 0x00, - 0x00, 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000, 0x0001, 0x0000, 0x0028, 0x000A, 0x0000, + { COLTYPE_UNK10, 0x00, 0x00, 0x05, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, + { 40, 10, 0, { 0 } }, }; -static u8 damageTblInitData[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, +static CollisionCheckInfoInit2 colChkInfoInit = { + 0x00, 0x0000, 0x0000, 0x0000, 0xFF, }; const ActorInit En_It_InitVars = { @@ -37,21 +38,21 @@ void EnIt_Init(EnIt* this, GlobalContext* globalCtx) { EnIt* it = this; it->actor.params = 0x0D05; - ActorCollider_AllocCylinder(globalCtx, &it->cylinderCollider); - ActorCollider_InitCylinder(globalCtx, &it->cylinderCollider, &it->actor, &cylinderInitData); - func_80061EFC(&it->actor.sub_98.damageChart, 0, &damageTblInitData); // Init Damage Chart + Collider_InitCylinder(globalCtx, &it->cylinderCollider); + Collider_SetCylinder(globalCtx, &it->cylinderCollider, &it->actor, &cylinderInitData); + func_80061EFC(&it->actor.colChkInfo, 0, &colChkInfoInit); // Init Damage Chart } void EnIt_Destroy(EnIt* this, GlobalContext* globalCtx) { EnIt* it = this; - ActorCollider_FreeCylinder(globalCtx, &it->cylinderCollider); + Collider_DestroyCylinder(globalCtx, &it->cylinderCollider); } void EnIt_Update(EnIt* this, GlobalContext* globalCtx) { s32 pad; EnIt* it = this; - ActorCollider_Cylinder_Update(&it->actor, &it->cylinderCollider); - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &it->cylinderCollider); + Collider_CylinderUpdate(&it->actor, &it->cylinderCollider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &it->cylinderCollider); } diff --git a/src/overlays/actors/ovl_En_It/z_en_it.h b/src/overlays/actors/ovl_En_It/z_en_it.h index c9c63ee3cf..e859b31cd7 100644 --- a/src/overlays/actors/ovl_En_It/z_en_it.h +++ b/src/overlays/actors/ovl_En_It/z_en_it.h @@ -7,7 +7,7 @@ typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ u32 unk_14C; - /* 0x0150 */ ColliderCylinderMain cylinderCollider; + /* 0x0150 */ ColliderCylinder cylinderCollider; } EnIt; // size = 0x019C extern const ActorInit En_It_InitVars; diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index d4e9422ad1..ef3ff832d4 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -50,8 +50,8 @@ void EnLightbox_Init(EnLightbox* this, GlobalContext* globalCtx) { } thisx->posRot2.pos = thisx->posRot.pos; - thisx->sub_98.unk_10 = 0x1E; - thisx->sub_98.unk_12 = 0x32; + thisx->colChkInfo.unk_10 = 0x1E; + thisx->colChkInfo.unk_12 = 0x32; ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawFunc_Circle, 6.0f); this->dyna.unk_160 = 0; this->dyna.unk_15C = 0; @@ -102,7 +102,7 @@ void EnLightbox_Update(EnLightbox* this, GlobalContext* globalCtx) { } } Actor_MoveForward(thisx); - func_8002E4B4(globalCtx, thisx, thisx->sub_98.unk_12, thisx->sub_98.unk_10, thisx->sub_98.unk_10, 0x1D); + func_8002E4B4(globalCtx, thisx, thisx->colChkInfo.unk_12, thisx->colChkInfo.unk_10, thisx->colChkInfo.unk_10, 0x1D); thisx->posRot2.pos = thisx->posRot.pos; } diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index e5a1ee9141..4b9fbc4727 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -25,8 +25,9 @@ const ActorInit En_M_Fire1_InitVars = { }; static ColliderCylinderInit cylinderInitData = { - 0x0A, 0x09, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00000001, 0x00, 0x00, - 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, 0x19, 0x0000, 0x0000, 0x0000, 0x00C8, 0x00C8, 0x0000, + { COLTYPE_UNK10, 0x09, 0x00, 0x00, 0x08, COLSHAPE_CYLINDER }, + { 0x02, { 0x00000001, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x19, 0x00, 0x00 }, + { 200, 200, 0, { 0 } } }; void EnMFire1_Init(EnMFire1* this, GlobalContext* globalCtx) { @@ -39,13 +40,13 @@ void EnMFire1_Init(EnMFire1* this, GlobalContext* globalCtx) { Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &thisLocal->actor, ACTORTYPE_ITEMACTION); } - ActorCollider_AllocCylinder(globalCtx, &thisLocal->capsule); - ActorCollider_InitCylinder(globalCtx, &thisLocal->capsule, &thisLocal->actor, &cylinderInitData); + Collider_InitCylinder(globalCtx, &thisLocal->capsule); + Collider_SetCylinder(globalCtx, &thisLocal->capsule, &thisLocal->actor, &cylinderInitData); } void EnMFire1_Destroy(EnMFire1* this, GlobalContext* globalCtx) { - ColliderCylinderMain* capsule = &this->capsule; - ActorCollider_FreeCylinder(globalCtx, capsule); + ColliderCylinder* capsule = &this->capsule; + Collider_DestroyCylinder(globalCtx, capsule); } void EnMFire1_Update(EnMFire1* this, GlobalContext* globalCtx) { @@ -55,7 +56,7 @@ void EnMFire1_Update(EnMFire1* this, GlobalContext* globalCtx) { if (Math_ApproxF(&thisLocal->unk_0198, 1.0, 0.2)) { Actor_Kill(&this->actor); } else { - ActorCollider_Cylinder_Update(&thisLocal->actor, &thisLocal->capsule); - Actor_CollisionCheck_SetAT(globalCtx, &globalCtx->sub_11E60, &thisLocal->capsule); + Collider_CylinderUpdate(&thisLocal->actor, &thisLocal->capsule); + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &thisLocal->capsule); } } diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h index cbba916e6a..fd5ebb1282 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h @@ -6,7 +6,7 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ ColliderCylinderMain capsule; + /* 0x014C */ ColliderCylinder capsule; /* 0x0198 */ f32 unk_0198; } EnMFire1; // size = 0x019C diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 1e2e5d4042..f59ec2a662 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -30,9 +30,10 @@ const ActorInit En_Ms_InitVars = { (ActorFunc)EnMs_Draw, }; -static s32 unk_col_80AB0320[] = { - 0x0A000939, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, - 0x00000000, 0x00010100, 0x00160025, 0x00000000, 0x00000000, +static ColliderCylinderInit_Set3 colliderInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x39, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 22, 37, 0, { 0 } }, }; static s16 prices[] = { @@ -73,12 +74,12 @@ void EnMs_Init(EnMs* this, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, initChain); SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06003DC0, &D_060005EC, &this->unkSkelAnimeStruct, &this->unk_1C6, 9); - ActorCollider_AllocCylinder(globalCtx, &this->collider); - func_8005C450(globalCtx, &this->collider, this, &unk_col_80AB0320); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder_Set3(globalCtx, &this->collider, this, &colliderInit); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 35.0f); Actor_SetScale(&this->actor, 0.015f); - this->actor.sub_98.mass = 0xFF; + this->actor.colChkInfo.mass = 0xFF; this->actor.speedXZ = 0.0f; this->actor.velocity.y = 0.0f; this->actor.gravity = -1.0f; @@ -89,8 +90,8 @@ void EnMs_Init(EnMs* this, GlobalContext* globalCtx) { } void EnMs_Destroy(EnMs* this, GlobalContext* globalCtx) { - ColliderCylinderMain* collider = &this->collider; - ActorCollider_FreeCylinder(globalCtx, collider); + ColliderCylinder* collider = &this->collider; + Collider_DestroyCylinder(globalCtx, collider); } void EnMs_Wait(EnMs* this, GlobalContext* globalCtx) { @@ -170,8 +171,8 @@ void EnMs_Update(EnMs* this, GlobalContext* globalCtx) { osSyncPrintf("OOOHHHHHH %f\n", this->actor.velocity.y); func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); } - ActorCollider_Cylinder_Update(&this->actor, &this->collider); - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); } void EnMs_Draw(EnMs* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.h b/src/overlays/actors/ovl_En_Ms/z_en_ms.h index 45a06987d0..c13657fe12 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.h +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.h @@ -12,7 +12,7 @@ typedef struct { /* 0x01C6 */ s16 unk_1C6; /* 0x01C8 */ char unk_1C8[0x34]; /* 0x01FC */ ActorFunc actionFunc; - /* 0x0200 */ ColliderCylinderMain collider; + /* 0x0200 */ ColliderCylinder collider; /* 0x024C */ s16 activeTimer; } EnMs; // size = 0x0250 diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 739d1f94f3..af2f295102 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -28,9 +28,9 @@ const ActorInit En_Nutsball_InitVars = { }; static ColliderCylinderInit cylinderInitData = { - 0x0A, 0x11, 0x09, 0x39, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xFFCFFFFF, 0x00, 0x08, 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, - 0x11, 0x01, 0x01, 0x00, 0x000D, 0x000D, 0x0000, 0x0000, 0x0000, 0x0000, + { COLTYPE_UNK10, 0x11, 0x09, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0xFFCFFFFF, 0x00, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x11, 0x01, 0x01 }, + { 13, 13, 0, { 0 } }, }; static s16 objectTbl[] = { OBJECT_DEKUNUTS, OBJECT_HINTNUTS, OBJECT_SHOPNUTS, OBJECT_DNS, OBJECT_DNK }; @@ -40,8 +40,8 @@ void EnNutsball_Init(EnNutsball* this, GlobalContext* globalCtx) { s32 pad[2]; ActorShape_Init(&this->actor.shape, 400.0f, ActorShadow_DrawFunc_Circle, 13.0f); - ActorCollider_AllocCylinder(globalCtx, &this->collider); - ActorCollider_InitCylinder(globalCtx, &this->collider, &this->actor, &cylinderInitData); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &cylinderInitData); this->objBankIndex = Object_GetIndex(&globalCtx->objectCtx, objectTbl[this->actor.params]); if (this->objBankIndex < 0) { @@ -52,8 +52,8 @@ void EnNutsball_Init(EnNutsball* this, GlobalContext* globalCtx) { } void EnNutsball_Destroy(EnNutsball* this, GlobalContext* globalCtx) { - ColliderCylinderMain* collider = &this->collider; - ActorCollider_FreeCylinder(globalCtx, collider); + ColliderCylinder* collider = &this->collider; + Collider_DestroyCylinder(globalCtx, collider); } void func_80ABBB34(EnNutsball* this, GlobalContext* globalCtx) { @@ -80,15 +80,15 @@ void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx) { this->actor.initPosRot.rot.z += 0x2AA8; - if ((this->actor.bgCheckFlags & 8) || (this->actor.bgCheckFlags & 1) || (this->collider.base.colliderFlags & 2) || - (this->collider.base.collideFlags & 2) || (this->collider.base.maskA & 2)) { + if ((this->actor.bgCheckFlags & 8) || (this->actor.bgCheckFlags & 1) || (this->collider.base.atFlags & 2) || + (this->collider.base.acFlags & 2) || (this->collider.base.maskA & 2)) { // Checking if the player is using a shield that reflects projectiles // And if so, reflects the projectile on impact if ((player->currentShield == 1) || ((player->currentShield == 2) && LINK_IS_ADULT)) { - if ((this->collider.base.colliderFlags & 2) && (this->collider.base.colliderFlags & 0x10) && - (this->collider.base.colliderFlags & 4)) { - this->collider.base.colliderFlags &= ~0x16; - this->collider.base.colliderFlags |= 0x08; + if ((this->collider.base.atFlags & 2) && (this->collider.base.atFlags & 0x10) && + (this->collider.base.atFlags & 4)) { + this->collider.base.atFlags &= ~0x16; + this->collider.base.atFlags |= 0x08; this->collider.body.toucher.flags = 2; func_800D20CC(&player->mf_A20, &sp4C, 0); @@ -122,13 +122,13 @@ void EnNutsball_Update(EnNutsball* this, GlobalContext* globalCtx) { Actor_MoveForward(&nutsball->actor); func_8002E4B4(globalCtx, &nutsball->actor, 10, cylinderInitData.dim.radius, cylinderInitData.dim.height, 5); - ActorCollider_Cylinder_Update(&nutsball->actor, &nutsball->collider); + Collider_CylinderUpdate(&nutsball->actor, &nutsball->collider); nutsball->actor.flags |= 0x1000000; - Actor_CollisionCheck_SetAT(globalCtx, &globalCtx->sub_11E60, &nutsball->collider); - Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, &nutsball->collider); - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &nutsball->collider); + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &nutsball->collider); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &nutsball->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &nutsball->collider); } } diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h index 50d12e96a3..8d79403b66 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h @@ -9,7 +9,7 @@ typedef struct { /* 0x014C */ ActorFunc actionFunc; /* 0x0150 */ s8 objBankIndex; /* 0x0152 */ s16 timer; - /* 0x0154 */ ColliderCylinderMain collider; + /* 0x0154 */ ColliderCylinder collider; } EnNutsball; // size = 0x01A0 extern const ActorInit En_Nutsball_InitVars; diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c index 8c8bb92dfe..69aad33873 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c @@ -48,8 +48,8 @@ void EnPubox_Init(EnPubox* this, GlobalContext* globalCtx) { break; } this->unk_164 = 1; - thisx->sub_98.unk_10 = 0x14; - thisx->sub_98.unk_12 = 0x32; + thisx->colChkInfo.unk_10 = 0x14; + thisx->colChkInfo.unk_12 = 0x32; thisx->unk_FC = 1200.0f; thisx->unk_F8 = 720.0f; ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawFunc_Circle, 6.0f); @@ -78,7 +78,7 @@ void EnPubox_Update(EnPubox* this, GlobalContext* globalCtx) { this->dyna.unk_154 = 0.0f; this->dyna.unk_150 = 0.0f; Actor_MoveForward(thisx); - func_8002E4B4(globalCtx, thisx, thisx->sub_98.unk_12, thisx->sub_98.unk_10, thisx->sub_98.unk_10, 0x1D); + func_8002E4B4(globalCtx, thisx, thisx->colChkInfo.unk_12, thisx->colChkInfo.unk_10, thisx->colChkInfo.unk_10, 0x1D); thisx->posRot2.pos = thisx->posRot.pos; } diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index ecda80c5a7..d11e8480bc 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -68,16 +68,16 @@ void func_80AF03F4(EnRu1* this, GlobalContext* globalCtx); void func_80AF0400(EnRu1* this, GlobalContext* globalCtx); void func_80AF05D4(EnRu1* this, GlobalContext* globalCtx); -ColliderCylinderInit D_80AF0800 = { - 0x00, 0x00, 0x00, 0x09, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x0019, 0x0050, 0x0000, 0x0000, 0x0000, 0x0000, +ColliderCylinderInit_Set3 D_80AF0800 = { + { COLTYPE_UNK0, 0x00, 0x00, 0x09, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, + { 25, 80, 0, { 0 } }, }; -ColliderCylinderInit D_80AF082C = { - 0x00, 0x09, 0x00, 0x09, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00000101, 0x00, 0x00, 0x00, 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x00, 0x01, 0x00, 0x0014, 0x001E, 0x0000, 0x0000, 0x0000, 0x0000, +ColliderCylinderInit_Set3 D_80AF082C = { + { COLTYPE_UNK0, 0x09, 0x00, 0x09, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000101, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x01, 0x00, 0x01 }, + { 20, 30, 0, { 0 } }, }; u32 D_80AF0858[] = { @@ -161,20 +161,20 @@ extern AnimationHeader D_06013A64; void func_80AEAC10(EnRu1* this, GlobalContext* globalCtx) { s32 pad[4]; - ColliderCylinderMain* collider = &this->collider; + ColliderCylinder* collider = &this->collider; - ActorCollider_Cylinder_Update(&this->actor, collider); - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, collider); + Collider_CylinderUpdate(&this->actor, collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, collider); } void func_80AEAC54(EnRu1* this, GlobalContext* globalCtx) { Actor* thisx = &this->actor; - ColliderCylinderMain* collider2 = &this->collider2; + ColliderCylinder* collider2 = &this->collider2; s32 pad[3]; - ActorCollider_Cylinder_Update(thisx, collider2); + Collider_CylinderUpdate(thisx, collider2); if (this->unk_34C != 0) { - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, collider2); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, collider2); } else if (thisx->xzDistanceFromLink > 32.0f) { this->unk_34C = 1; } @@ -182,26 +182,26 @@ void func_80AEAC54(EnRu1* this, GlobalContext* globalCtx) { void func_80AEACDC(EnRu1* this, GlobalContext* globalCtx) { s32 pad[4]; - ColliderCylinderMain* collider2 = &this->collider2; + ColliderCylinder* collider2 = &this->collider2; - ActorCollider_Cylinder_Update(&this->actor, collider2); - Actor_CollisionCheck_SetAT(globalCtx, &globalCtx->sub_11E60, collider2); + Collider_CylinderUpdate(&this->actor, collider2); + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, collider2); } void func_80AEAD20(EnRu1* this, GlobalContext* globalCtx) { Actor* thisx = &this->actor; - ActorCollider_AllocCylinder(globalCtx, &this->collider); + Collider_InitCylinder(globalCtx, &this->collider); if (!thisx) {} // necessary to match - func_8005C450(globalCtx, &this->collider, thisx, &D_80AF0800); + Collider_SetCylinder_Set3(globalCtx, &this->collider, thisx, &D_80AF0800); - ActorCollider_AllocCylinder(globalCtx, &this->collider2); - func_8005C450(globalCtx, &this->collider2, thisx, &D_80AF082C); + Collider_InitCylinder(globalCtx, &this->collider2); + Collider_SetCylinder_Set3(globalCtx, &this->collider2, thisx, &D_80AF082C); } void func_80AEAD98(EnRu1* this, GlobalContext* globalCtx) { - ActorCollider_FreeCylinder(globalCtx, &this->collider); - ActorCollider_FreeCylinder(globalCtx, &this->collider2); + Collider_DestroyCylinder(globalCtx, &this->collider); + Collider_DestroyCylinder(globalCtx, &this->collider2); } void func_80AEADD8(EnRu1* this) { diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index 581cdedecf..dbabf46a10 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -41,8 +41,8 @@ typedef struct { /* 0x02AC */ s16 unk_2AC; /* 0x02AE */ char unk_2AE[0x2]; /* 0x02B0 */ s32 unk_2B0; - /* 0x02B4 */ ColliderCylinderMain collider; - /* 0x0300 */ ColliderCylinderMain collider2; + /* 0x02B4 */ ColliderCylinder collider; + /* 0x0300 */ ColliderCylinder collider2; /* 0x034C */ s32 unk_34C; /* 0x0350 */ s32 unk_350; /* 0x0354 */ f32 unk_354; diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 002dcca43e..f4317d83eb 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -42,10 +42,10 @@ void func_80AF321C(EnRu2* this, GlobalContext* globalCtx); void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx); -static ColliderCylinderInit D_80AF40E0 = { - 0x0A, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00000080, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x00, 0x00, 0x001E, 0x0064, 0x0000, 0x0000, 0x0000, 0x0000, +static ColliderCylinderInit_Set3 colliderInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x00, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000080, 0x00, 0x00 }, 0x00, 0x01, 0x00 }, + { 30, 100, 0, { 0 } }, }; static u32 D_80AF410C[] = { @@ -95,23 +95,23 @@ extern AnimationHeader D_0600F8B8; void func_80AF2550(EnRu2* this, GlobalContext* globalCtx) { EnRu2* thisLocal = this; - ActorCollider_AllocCylinder(globalCtx, &thisLocal->collider); - func_8005C450(globalCtx, &thisLocal->collider, &this->actor, &D_80AF40E0); + Collider_InitCylinder(globalCtx, &thisLocal->collider); + Collider_SetCylinder_Set3(globalCtx, &thisLocal->collider, &this->actor, &colliderInit); } void func_80AF259C(EnRu2* this, GlobalContext* globalCtx) { s32 pad; - ColliderCylinderMain* collider = &this->collider; + ColliderCylinder* collider = &this->collider; Actor* thisx = &this->actor; s32 pad2[2]; - ActorCollider_Cylinder_Update(thisx, collider); - Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, collider); + Collider_CylinderUpdate(thisx, collider); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, collider); } void EnRu2_Destroy(EnRu2* this, GlobalContext* globalCtx) { - ColliderCylinderMain* collider = &this->collider; - ActorCollider_FreeCylinder(globalCtx, collider); + ColliderCylinder* collider = &this->collider; + Collider_DestroyCylinder(globalCtx, collider); } void func_80AF2608(EnRu2* this) { diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h index 01e67ae106..79e8d7f61d 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h @@ -21,7 +21,7 @@ typedef struct { /* 0x02C2 */ u8 unk_2C2; /* 0x02C3 */ u8 unk_2C3; /* 0x02C4 */ f32 unk_2C4; - /* 0x02C8 */ ColliderCylinderMain collider; + /* 0x02C8 */ ColliderCylinder collider; } EnRu2; // size = 0x0314 extern const ActorInit En_Ru2_InitVars; diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 0ea3c3220d..ed9002b6f5 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -169,12 +169,12 @@ s32 EnTkEff_CreateDflt(EnTk* this, Vec3f* pos, u8 duration, f32 size, f32 growth /** z_en_tk_eff.c ends here probably **/ static ColliderCylinderInit D_80B1D508 = { - 0x0A, 0x00, 0x00, 0x39, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x001E, 0x0034, 0x0000, 0x0000, 0x0000, 0x0000, + { 0x0A, 0x00, 0x00, 0x39, 0x20, 0x01 }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, + { 0x001E, 0x0034, 0x0000, { 0 } }, }; -static Sub98Init5 D_80B1D534 = { +static CollisionCheckInfoInit2 colChkInfoInit = { 0x00, 0x0000, 0x0000, 0x0000, 0xFF, }; @@ -502,10 +502,10 @@ void EnTk_Init(EnTk* this, GlobalContext* globalCtx) { SkelAnime_ChangeAnim(&thisAgain->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), 0, 0.f); - ActorCollider_AllocCylinder(globalCtx, &thisAgain->collider); - ActorCollider_InitCylinder(globalCtx, &thisAgain->collider, &thisAgain->actor, &D_80B1D508); + Collider_InitCylinder(globalCtx, &thisAgain->collider); + Collider_SetCylinder(globalCtx, &thisAgain->collider, &thisAgain->actor, &D_80B1D508); - func_80061EFC(&thisAgain->actor.sub_98, NULL, &D_80B1D534); + func_80061EFC(&thisAgain->actor.colChkInfo, NULL, &colChkInfoInit); if (gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || !LINK_IS_CHILD || globalCtx->sceneNum != SCENE_SPOT02) { @@ -524,7 +524,7 @@ void EnTk_Init(EnTk* this, GlobalContext* globalCtx) { void EnTk_Destroy(EnTk* this, GlobalContext* globalCtx) { EnTk* thisAgain = this; - ActorCollider_FreeCylinder(globalCtx, &thisAgain->collider); + Collider_DestroyCylinder(globalCtx, &thisAgain->collider); } void EnTk_Rest(EnTk* this, GlobalContext* globalCtx) { @@ -672,10 +672,10 @@ void EnTk_Dig(EnTk* this, GlobalContext* globalCtx) { void EnTk_Update(EnTk* this, GlobalContext* globalCtx) { EnTk* thisAgain = this; - ColliderCylinderMain* collider = &thisAgain->collider; + ColliderCylinder* collider = &thisAgain->collider; - ActorCollider_Cylinder_Update(&thisAgain->actor, collider); - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, collider); + Collider_CylinderUpdate(&thisAgain->actor, collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, collider); SkelAnime_FrameUpdateMatrix(&thisAgain->skelAnim); diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h index 5d3f67fe83..df0947b966 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h @@ -25,7 +25,7 @@ struct EnTk { /* 0x0000 */ Actor actor; /* 0x014C */ SkelAnime skelAnim; /* 0x0190 */ EnTkFunc* actionFunc; - /* 0x0194 */ ColliderCylinderMain collider; + /* 0x0194 */ ColliderCylinder collider; /* 0x01E0 */ s16 h_1E0; /* 0x01E2 */ char unk_1E2[0x26]; /* 0x0208 */ u8 validDigHere; diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index c254dbf45d..9bdd6bdd3e 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -19,9 +19,9 @@ void EnTuboTrap_Fly(EnTuboTrap* this, GlobalContext* globalCtx); #define FLAGS 0x00000010 static ColliderCylinderInit cylinderInitData = { - 0x0A, 0x11, 0x09, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xFFCFFFFF, 0x00, 0x04, 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x01, 0x00, 0x00, 0x0009, 0x0017, 0x0000, 0x0000, 0x0000, 0x0000, + { COLTYPE_UNK10, 0x11, 0x09, 0x00, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0xFFCFFFFF, 0x00, 0x04 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x01, 0x01, 0x00 }, + { 9, 23, 0, { 0 } }, }; const ActorInit En_Tubo_Trap_InitVars = { @@ -44,15 +44,15 @@ void EnTuboTrap_Init(EnTuboTrap* this, GlobalContext* globalCtx) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 2.0f); osSyncPrintf("\n\n"); osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 壷トラップ ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); // "Urn Trap" - ActorCollider_AllocCylinder(globalCtx, &this->collider); - ActorCollider_InitCylinder(globalCtx, &this->collider, &this->actor, &cylinderInitData); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &cylinderInitData); Actor_SetScale(&this->actor, 0.1f); this->actionFunc = (ActorFunc)EnTuboTrap_WaitForProximity; } void EnTuboTrap_Destroy(EnTuboTrap* this, GlobalContext* globalCtx) { - ColliderCylinderMain* collider = &this->collider; - ActorCollider_FreeCylinder(globalCtx, collider); + ColliderCylinder* collider = &this->collider; + Collider_DestroyCylinder(globalCtx, collider); } void EnTuboTrap_DropCollectible(EnTuboTrap* this, GlobalContext* globalCtx) { @@ -179,8 +179,8 @@ void EnTuboTrap_HandleImpact(EnTuboTrap* this, GlobalContext* globalCtx) { return; } - if (this->collider.base.colliderFlags & 4) { - this->collider.base.colliderFlags &= ~4; + if (this->collider.base.atFlags & 4) { + this->collider.base.atFlags &= ~4; EnTuboTrap_SpawnFragments(this, globalCtx); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_IT_SHIELD_REFLECT_SW); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_POT_BROKEN); @@ -189,8 +189,8 @@ void EnTuboTrap_HandleImpact(EnTuboTrap* this, GlobalContext* globalCtx) { return; } - if (this->collider.base.collideFlags & 2) { - this->collider.base.collideFlags &= ~2; + if (this->collider.base.acFlags & 2) { + this->collider.base.acFlags &= ~2; EnTuboTrap_SpawnFragments(this, globalCtx); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_EXPLOSION); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_POT_BROKEN); @@ -199,8 +199,8 @@ void EnTuboTrap_HandleImpact(EnTuboTrap* this, GlobalContext* globalCtx) { return; } - if (this->collider.base.colliderFlags & 2) { - this->collider.base.colliderFlags &= ~2; + if (this->collider.base.atFlags & 2) { + this->collider.base.atFlags &= ~2; if (this->collider.base.at == &player->actor) { EnTuboTrap_SpawnFragments(this, globalCtx); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_POT_BROKEN); @@ -277,15 +277,15 @@ void EnTuboTrap_Fly(EnTuboTrap* this, GlobalContext* globalCtx) { void EnTuboTrap_Update(EnTuboTrap* this, GlobalContext* globalCtx) { EnTuboTrap* tuboTrap = this; - SubGlobalContext11E60* sub_11E60 = &globalCtx->sub_11E60; + CollisionCheckContext* check = &globalCtx->colChkCtx; tuboTrap->actionFunc(tuboTrap, globalCtx); Actor_MoveForward(&tuboTrap->actor); func_8002E4B4(globalCtx, &tuboTrap->actor, 10.0f, 10.0f, 20.0f, 0x1D); Actor_SetHeight(&tuboTrap->actor, 0.0f); - ActorCollider_Cylinder_Update(&tuboTrap->actor, &tuboTrap->collider); - Actor_CollisionCheck_SetAC(globalCtx, sub_11E60, &tuboTrap->collider); - Actor_CollisionCheck_SetAT(globalCtx, sub_11E60, &tuboTrap->collider); + Collider_CylinderUpdate(&tuboTrap->actor, &tuboTrap->collider); + CollisionCheck_SetAC(globalCtx, check, &tuboTrap->collider); + CollisionCheck_SetAT(globalCtx, check, &tuboTrap->collider); } void EnTuboTrap_Draw(EnTuboTrap* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h index c734b043ce..fc043acaab 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h @@ -9,7 +9,7 @@ typedef struct { /* 0x014C */ ActorFunc actionFunc; /* 0x0150 */ f32 targetY; /* 0x0154 */ Vec3f originPos; - /* 0x0160 */ ColliderCylinderMain collider; + /* 0x0160 */ ColliderCylinder collider; } EnTuboTrap; // size = 0x01AC extern const ActorInit En_Tubo_Trap_InitVars; diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 700123ee57..8cd22678f2 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -50,24 +50,22 @@ const ActorInit En_Wallmas_InitVars = { }; static ColliderCylinderInit colCylinderInit = { - 0x00, 0x00, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x01, 0x00, 0x001E, 0x0028, 0x0000, 0x0000, 0x0000, 0x0000, + { COLTYPE_UNK0, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 30, 40, 0, { 0 } }, }; -static Sub98Init4 sub98Init = { +static CollisionCheckInfoInit colChkInfoInit = { 0x04, 0x001E, 0x0028, 0x96, }; -static ActorDamageChart damageChart = { { - { 0x1, 0x0 }, { 0x0, 0x2 }, { 0x0, 0x1 }, { 0x0, 0x2 }, { 0x1, 0x0 }, { 0x0, 0x2 }, { 0x0, 0x2 }, { 0x1, 0x0 }, - { 0x0, 0x1 }, { 0x0, 0x2 }, { 0x0, 0x4 }, { 0x2, 0x4 }, { 0x0, 0x2 }, { 0x4, 0x4 }, { 0x0, 0x4 }, { 0x0, 0x2 }, - { 0x0, 0x2 }, { 0x2, 0x4 }, { 0x0, 0x0 }, { 0x4, 0x4 }, { 0x0, 0x0 }, { 0x0, 0x0 }, { 0x0, 0x1 }, { 0x0, 0x4 }, - { 0x0, 0x2 }, { 0x0, 0x2 }, { 0x0, 0x8 }, { 0x0, 0x4 }, { 0x0, 0x0 }, { 0x0, 0x0 }, { 0x0, 0x4 }, { 0x0, 0x0 }, -} }; +static DamageTable damageTable = { + 0x10, 0x02, 0x01, 0x02, 0x10, 0x02, 0x02, 0x10, 0x01, 0x02, 0x04, 0x24, 0x02, 0x44, 0x04, 0x02, + 0x02, 0x24, 0x00, 0x44, 0x00, 0x00, 0x01, 0x04, 0x02, 0x02, 0x08, 0x04, 0x00, 0x00, 0x04, 0x00, +}; static InitChainEntry initChain[] = { ICHAIN_S8(naviEnemyId, 0x30, 1), @@ -97,9 +95,9 @@ void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx) { SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06008FB0, &D_06009DB0, &this->unkSkelAnimeStruct, &this->unk_22e, 0x19); - ActorCollider_AllocCylinder(globalCtx, &this->colCylinder); - ActorCollider_InitCylinder(globalCtx, &this->colCylinder, &this->actor, &colCylinderInit); - func_80061ED4(&this->actor.sub_98, &damageChart, &sub98Init); + Collider_InitCylinder(globalCtx, &this->colCylinder); + Collider_SetCylinder(globalCtx, &this->colCylinder, &this->actor, &colCylinderInit); + func_80061ED4(&this->actor.colChkInfo, &damageTable, &colChkInfoInit); this2->switchFlag = (u8)(this2->actor.params >> 0x8); this->actor.params = this->actor.params & 0xFF; @@ -118,8 +116,8 @@ void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx) { } void EnWallmas_Destroy(EnWallmas* this, GlobalContext* globalCtx) { - ColliderCylinderMain* col = &this->colCylinder; - ActorCollider_FreeCylinder(globalCtx, col); + ColliderCylinder* col = &this->colCylinder; + Collider_DestroyCylinder(globalCtx, col); } void EnWallmas_TimerInit(EnWallmas* this, GlobalContext* globalCtx) { @@ -194,7 +192,7 @@ void EnWallmas_ReturnToCeilingStart(EnWallmas* this) { void EnWallmas_TakeDamageStart(EnWallmas* this) { SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_06000590, -3.0f); - if ((this->colCylinder.body.colliding->toucher.flags & 0x1F824) != 0) { + if ((this->colCylinder.body.acHitItem->toucher.flags & 0x1F824) != 0) { this->actor.posRot.rot.y = this->colCylinder.base.ac->posRot.rot.y; } else { this->actor.posRot.rot.y = func_8002DA78(&this->actor, this->colCylinder.base.ac) + 0x8000; @@ -252,7 +250,7 @@ void EnWallmas_StunBegin(EnWallmas* this) { SkelAnime_ChangeAnim(&this->skelAnime, &D_060019CC, 1.5f, 0, 20.0f, 2, -3.0f); this->actor.speedXZ = 0.0f; - if (this->actor.sub_98.damageEffect == 4) { + if (this->actor.colChkInfo.damageEffect == 4) { func_8003426C(&this->actor, -0x8000, 0xFF, 0, 0x50); } else { func_8003426C(&this->actor, 0, 0xFF, 0, 0x50); @@ -365,7 +363,7 @@ void EnWallmas_ReturnToCeiling(EnWallmas* this, GlobalContext* globalCtx) { void EnWallmas_TakeDamage(EnWallmas* this, GlobalContext* globalCtx) { if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { - if (this->actor.sub_98.health == 0) { + if (this->actor.colChkInfo.health == 0) { EnWallMas_DieBegin(this, globalCtx); } else { EnWallmas_DamageCoolDownStart(this); @@ -469,7 +467,7 @@ void EnWallmas_Stun(EnWallmas* this, GlobalContext* globalCtx) { } if (this->timer == 0) { - if (this->actor.sub_98.health == 0) { + if (this->actor.colChkInfo.health == 0) { EnWallMas_DieBegin(this, globalCtx); } else { EnWallmas_ReturnToCeilingStart(this); @@ -478,27 +476,27 @@ void EnWallmas_Stun(EnWallmas* this, GlobalContext* globalCtx) { } void EnWallmas_ColUpdate(EnWallmas* this, GlobalContext* globalCtx) { - if ((this->colCylinder.base.collideFlags & 2) != 0) { - this->colCylinder.base.collideFlags &= ~2; + if ((this->colCylinder.base.acFlags & 2) != 0) { + this->colCylinder.base.acFlags &= ~2; func_80035650(&this->actor, &this->colCylinder.body, 1); - if ((this->actor.sub_98.damageEffect != 0) || (this->actor.sub_98.damage != 0)) { + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { if (Actor_ApplyDamage(&this->actor) == 0) { func_80032C7C(globalCtx, &this->actor); Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_DEAD); this->actor.flags &= ~1; } else { - if (this->actor.sub_98.damage != 0) { + if (this->actor.colChkInfo.damage != 0) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_DAMAGE); } } - if ((this->actor.sub_98.damageEffect == DAMAGE_EFFECT_STUN_WHITE) || - (this->actor.sub_98.damageEffect == DAMAGE_EFFECT_STUN_BLUE)) { + if ((this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_STUN_WHITE) || + (this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_STUN_BLUE)) { if (this->actionFunc != (ActorFunc)&EnWallmas_Stun) { EnWallmas_StunBegin(this); } } else { - if (this->actor.sub_98.damageEffect == DAMAGE_EFFECT_BURN) { + if (this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_BURN) { func_8002A65C(globalCtx, &this->actor, &this->actor.posRot.pos, 0x28, 0x28); } @@ -536,12 +534,12 @@ void EnWallmas_Update(EnWallmas* this, GlobalContext* globalCtx) { } if ((this2->actionFunc != (ActorFunc)&EnWallmas_Die) && (this2->actionFunc != (ActorFunc)&EnWallmas_Drop)) { - ActorCollider_Cylinder_Update(&this2->actor, &this2->colCylinder); - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this2->colCylinder); + Collider_CylinderUpdate(&this2->actor, &this2->colCylinder); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this2->colCylinder); if ((this2->actionFunc != (ActorFunc)&EnWallmas_TakeDamage) && (this2->actor.bgCheckFlags & 1) != 0 && (this2->actor.freeze == 0)) { - Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, &this2->colCylinder); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this2->colCylinder); } } diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h index 1855cdd332..7e8162ccbf 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h @@ -21,7 +21,7 @@ typedef struct { /* 0x022E */ u16 unk_22e; /* 0x0230 */ char unk_230[0x94]; /* 0x02C4 */ f32 unk_2c4; - /* 0x02C8 */ ColliderCylinderMain colCylinder; + /* 0x02C8 */ ColliderCylinder colCylinder; } EnWallmas; // size = 0x0314 extern const ActorInit En_Wallmas_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 3ab37b6d71..5e892c3888 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -29,14 +29,16 @@ const ActorInit Obj_Bombiwa_InitVars = { }; static ColliderCylinderInit colliderInit = { - 0x0C, 0x00, 0x0D, 0x39, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x4FC1FFFE, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x01, 0x00, 0x0037, 0x0046, 0x0000, 0x0000, 0x0000, 0x0000, + { COLTYPE_UNK12, 0x00, 0x0D, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x4FC1FFFE, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 55, 70, 0, { 0 } }, }; -static u32 damageChart[] = { - 0x0000000C, - 0x003CFF00, +static CollisionCheckInfoInit colChkInfoInit = { + 0x00, + 0x000C, + 0x003C, + 0xFF, }; static InitChainEntry initChain[] = { @@ -54,9 +56,9 @@ extern Gfx* D_060009E0; // dlist void ObjBombiwa_InitCollision(ObjBombiwa* this, GlobalContext* globalCtx) { ObjBombiwa* thisLocal = this; - ActorCollider_AllocCylinder(globalCtx, &thisLocal->collider); - ActorCollider_InitCylinder(globalCtx, &thisLocal->collider, &thisLocal->actor, &colliderInit); - ActorCollider_Cylinder_Update(&thisLocal->actor, &thisLocal->collider); + Collider_InitCylinder(globalCtx, &thisLocal->collider); + Collider_SetCylinder(globalCtx, &thisLocal->collider, &thisLocal->actor, &colliderInit); + Collider_CylinderUpdate(&thisLocal->actor, &thisLocal->collider); } void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx) { @@ -65,7 +67,7 @@ void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx) { if ((Flags_GetSwitch(globalCtx, this->actor.params & 0x3F) != 0)) { Actor_Kill(&this->actor); } else { - func_80061ED4(&this->actor.sub_98.damageChart, NULL, damageChart); + func_80061ED4(&this->actor.colChkInfo, NULL, &colChkInfoInit); if (this->actor.shape.rot.y == 0) { s16 rand = (s16)Math_Rand_ZeroFloat(65536.0f); this->actor.posRot.rot.y = rand; @@ -77,7 +79,7 @@ void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx) { } void ObjBombiwa_Destroy(ObjBombiwa* this, GlobalContext* globalCtx) { - ActorCollider_FreeCylinder(globalCtx, &this->collider); + Collider_DestroyCylinder(globalCtx, &this->collider); } void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx) { @@ -105,12 +107,11 @@ void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx) { } void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx) { - SubGlobalContext11E60* sub_11E60; - ColliderCylinderMain* collider; + CollisionCheckContext* colChkCtx; + ColliderCylinder* collider; if (func_80033684(globalCtx, &this->actor) != NULL || - ((this->collider.base.collideFlags & 2) != 0 && - (this->collider.body.colliding->toucher.flags & 0x40000040) != 0)) { + ((this->collider.base.acFlags & 2) != 0 && (this->collider.body.acHitItem->toucher.flags & 0x40000040) != 0)) { ObjBombiwa_Break(this, globalCtx); Flags_SetSwitch(globalCtx, this->actor.params & 0x3F); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 80, NA_SE_EV_WALL_BROKEN); @@ -119,12 +120,12 @@ void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx) { } Actor_Kill(&this->actor); } else { - this->collider.base.collideFlags &= ~0x2; + this->collider.base.acFlags &= ~0x2; if (this->actor.xzDistanceFromLink < 800.0f) { - sub_11E60 = &globalCtx->sub_11E60; + colChkCtx = &globalCtx->colChkCtx; collider = &this->collider; - Actor_CollisionCheck_SetAC(globalCtx, sub_11E60, collider); - Actor_CollisionCheck_SetOT(globalCtx, sub_11E60, collider); + CollisionCheck_SetAC(globalCtx, colChkCtx, collider); + CollisionCheck_SetOC(globalCtx, colChkCtx, collider); } } } diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h index 9f1c2797b8..24a1a3489c 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h @@ -6,7 +6,7 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ ColliderCylinderMain collider; + /* 0x014C */ ColliderCylinder collider; } ObjBombiwa; // size = 0x0198 extern const ActorInit Obj_Bombiwa_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index b8ceea03d1..f8f52cec92 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -30,15 +30,17 @@ const ActorInit Obj_Comb_InitVars = { (ActorFunc)ObjComb_Draw, }; -UNK_TYPE D_80B922E0[] = { - 0x00000000, 0x00000000, 0x00000000, 0x4001FFFE, 0x00000000, 0x00010100, 0x00000000, 0x00000000, 0x000F0064, +ColliderJntSphItemInit colliderItemsInit[1] = { + { + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x4001FFFE, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 0x00, { { 0, 0, 0 }, 15 }, 100 }, + }, }; -UNK_TYPE D_80B92304[] = { - 0x0A000909, - 0x20000000, - 0x00000001, - &D_80B922E0, +ColliderJntSphInit colliderInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x09, 0x20, COLSHAPE_JNTSPH }, + 1, + &colliderItemsInit, }; static InitChainEntry initChain[] = { @@ -132,13 +134,13 @@ void ObjComb_Init(ObjComb* this, GlobalContext* globalCtx) { s32 pad; Actor_ProcessInitChain(&this->actor, &initChain); - func_8005BBF8(globalCtx, &this->collider); - func_8005C050(globalCtx, &this->collider, this, &D_80B92304, &this->colliderBody); + Collider_InitJntSph(globalCtx, &this->collider); + Collider_SetJntSph(globalCtx, &this->collider, this, &colliderInit, &this->colliderItems); ObjComb_SetWait(this); } void ObjComb_Destroy(ObjComb* this, GlobalContext* globalCtx) { - func_8005BCC8(globalCtx, &this->collider); + Collider_DestroyJntSph(globalCtx, &this->collider); } void ObjComb_SetWait(ObjComb* this) { @@ -153,9 +155,9 @@ void ObjComb_Wait(ObjComb* this, GlobalContext* globalCtx) { this->unk_1B0 = 0; } - if ((this->collider.collideFlags & 0x2) != 0) { - this->collider.collideFlags &= ~0x2; - toucherFlags = this->colliderBodyPtr->colliding->toucher.flags; + if ((this->collider.base.acFlags & 0x2) != 0) { + this->collider.base.acFlags &= ~0x2; + toucherFlags = this->collider.list->body.acHitItem->toucher.flags; if (toucherFlags & 0x4001F866) { this->unk_1B0 = 1500; } else { @@ -164,11 +166,11 @@ void ObjComb_Wait(ObjComb* this, GlobalContext* globalCtx) { Actor_Kill(this); } } else { - Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, &this->collider); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider); } if (this->actor.update != NULL) { - Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); } } diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h index fcd17464c8..cde5477b51 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h @@ -7,11 +7,8 @@ typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ ActorFunc actionFunc; - /* 0x0150 */ Collider collider; - /* 0x0168 */ char unk_168[0x4]; - /* 0x016C */ ColliderBody* colliderBodyPtr; - /* 0x0170 */ ColliderBody colliderBody; - /* 0x0198 */ char unk_198[0x18]; + /* 0x0150 */ ColliderJntSph collider; + /* 0x0170 */ ColliderJntSphItem colliderItems[1]; /* 0x01B0 */ s16 unk_1B0; /* 0x01B2 */ s16 unk_1B2; } ObjComb; // size = 0x01B4 diff --git a/tools/overlayhelpers/DamageTable.py b/tools/overlayhelpers/DamageTable.py new file mode 100644 index 0000000000..db0a254665 --- /dev/null +++ b/tools/overlayhelpers/DamageTable.py @@ -0,0 +1,22 @@ +import struct + +ROM_ADDR = 0xB94CC0 +COUNT = 23 + +rom = open("../../baserom.z64", "rb") +rom.seek(ROM_ADDR) +data = bytearray(rom.read(0x20 * COUNT)) +rom.close() + +valFormat = "0x{:02X}" +sfmt = "" +for i in range(4): + sfmt += valFormat + ", " + +for i in range(3): + sfmt += sfmt + +sfmt = "{{ {{ " + sfmt + "}} }}," +for i in range(COUNT): + line = struct.unpack_from(">32B", data, i * 0x20) + print(sfmt.format(*line)) \ No newline at end of file diff --git a/tools/overlayhelpers/GenColliderInit.py b/tools/overlayhelpers/GenColliderInit.py new file mode 100644 index 0000000000..8b854060ab --- /dev/null +++ b/tools/overlayhelpers/GenColliderInit.py @@ -0,0 +1,203 @@ +import struct + +T_DEFAULT = '' +T_SET3 = '_Set3' +T_ACTOR = '_Actor' + +TYPE_ENUM = [ + "COLTYPE_UNK0", + "COLTYPE_UNK1", + "COLTYPE_UNK2", + "COLTYPE_UNK3", + "COLTYPE_UNK4", + "COLTYPE_UNK5", + "COLTYPE_UNK6", + "COLTYPE_UNK7", + "COLTYPE_UNK8", + "COLTYPE_METAL_SHIELD", + "COLTYPE_UNK10", + "COLTYPE_WOODEN_SHIELD", + "COLTYPE_UNK12", + "COLTYPE_UNK13" ] + +SHAPE_ENUM = [ + "COLSHAPE_JNTSPH", + "COLSHAPE_CYLINDER", + "COLSHAPE_TRIS", + "COLSHAPE_QUAD" ] + +sf_ColliderInit = ">BBBBBB" +sf_ColliderInit_Set3 = ">BBBBB" +sf_ColliderInit_Actor = ">IBBBB" +sf_ColliderBodyInit = ">B3xIBB2xIBB2xBBB" +sf_JntSph = ">II" +sf_JntSphItem = ">Bx5h" +sf_Cylinder16 = ">6h" +sf_Tris = ">II" +sf_TrisItem = ">9f" +sf_Quad = ">12f" + +f_ColliderInit = "{{ {0}, 0x{1:02X}, 0x{2:02X}, 0x{3:02X}, 0x{4:02X}, {5} }}" +f_ColliderInit_Set3 = "{{ {0}, 0x{1:02X}, 0x{2:02X}, 0x{3:02X}, {4} }}" +f_ColliderInit_Actor = "{{ {0}, 0x{1:02X}, 0x{2:02X}, 0x{3:02X}, {4} }}" +f_ColliderBodyInit = "{{ 0x{0:02X}, {{ 0x{1:08X}, 0x{2:02X}, 0x{3:02X} }}, {{ 0x{4:08X}, 0x{5:02X}, 0x{6:02X} }}, 0x{7:02X} 0x{8:02X} 0x{9:02X} }}" +f_JntSph = "{{ {0}, D_{1:08X} }}" +f_JntSphItem = "{{ {0}, {{ {{ {1}, {2}, {3} }}, {4} }}, {5} }}" +f_Cylinder16 = "{{ {0}, {1}, {2}, {{ {3}, {4}, {5} }} }}" +f_Tris = "{{ {0}, D_{1:08X} }}" +f_TrisItem = "{{ {{ {0}f, {1}f, {2}f }}, {{ {3}f, {4}f, {5}f }}, {{ {6}f, {7}f, {8}f }} }}" +f_Quad = "{{ {{ {0}f, {1}f, {2}f }}, {{ {3}f, {4}f, {5}f }}, {{ {6}f, {7}f, {8}f }}, {{ {9}f, {10}f, {11}f }} }}" + +def GetColliderFormat(type): + if type == T_DEFAULT: + return (sf_ColliderInit, f_ColliderInit) + if type == T_SET3: + return (sf_ColliderInit_Set3, f_ColliderInit_Set3) + if type == T_ACTOR: + return (sf_ColliderInit_Actor, f_ColliderInit_Actor) + return None + +def GetColliderStr(data, off, type): + cf = GetColliderFormat(type) + cBase = list(struct.unpack_from(cf[0], data, off)) + if type == T_ACTOR: + if cBase[0] == 0: + cBase[0] = 'NULL' + else: + cBase[0] = '0x{0:08X}'.format(cBase[0]) + else: + if cBase[0] < 14: + cBase[0] = TYPE_ENUM[cBase[0]] + else: + cBase[0] = '0x{0:02X}'.format(cBase[0]) + + i = 4 + if type == T_DEFAULT: + i = 5 + + if cBase[i] < 4: + cBase[i] = SHAPE_ENUM[cBase[i]] + else: + cBase[i] = '0x{0:02X}'.format(cBase[i]) + + return cf[1].format(*cBase); + +def GetItems(data, off, count, structf, fmt, size): + result = '' + for i in range(count): + ioff = (i * size) + cBody = struct.unpack_from(sf_ColliderBodyInit, data, off + ioff) + cItem = struct.unpack_from(structf, data, off + 0x18 + ioff) + result += ''' + {{ + {0}, + {1}, + }},'''.format(f_ColliderBodyInit.format(*cBody), fmt.format(*cItem)) + return result + +def GetJntSphItems(data, off, count): + items = GetItems(data, off, count, sf_JntSphItem, f_JntSphItem, 0x0C) + print(''' +ColliderJntSphItemInit jntsphItemsInit[{0}] = {{{1} +}}; +'''.format(count, items)) + +def GetJntSph(data, off, type): + sBase = GetColliderStr(data, off, type) + cJntSph = struct.unpack_from(sf_JntSph, data, off + 8) + + print(''' +ColliderJntSphInit{0} jntsphInit = +{{ + {1}, + {2}, +}}; + '''.format(type, sBase, f_JntSph.format(*cJntSph))) + + +def GetTrisItems(data, off, count): + items = GetItems(data, off, count, sf_TrisItem, f_TrisItem, 0x24) + print(''' +ColliderTrisItemInit trisItemsInit[{0}] = {{{1} +}}; +'''.format(count, items)) + + +def GetCylinder(data, off, type): + sBase = GetColliderStr(data, off, type) + cBody = struct.unpack_from(sf_ColliderBodyInit, data, off + 0x08) + cCyl16 = struct.unpack_from(sf_Cylinder16, data, off + 0x20) + + print(''' +ColliderCylinderInit{0} cylinderInit = +{{ + {1}, + {2}, + {3}, +}}; + '''.format(type, sBase, f_ColliderBodyInit.format(*cBody),f_Cylinder16.format(*cCyl16))) + +def GetTris(data, off, type): + sBase = GetColliderStr(data, off, type) + cTris = struct.unpack_from(sf_Tris, data, off + 8) + + print(''' +ColliderTrisInit{0} trisInit = +{{ + {1}, + {2}, +}}; + '''.format(type, sBase, f_Tris.format(*cTris))) + +def GetQuad(data, off, type): + sBase = GetColliderStr(data, off, type) + cBody = struct.unpack_from(sf_ColliderBodyInit, data, off + 0x08) + cQuad = struct.unpack_from(sf_Quad, data, off + 0x20) + print(cQuad) + print(''' +ColliderQuadInit{0} quadInit = +{{ + {1}, + {2}, + {3}, +}}; + '''.format(type, sBase, f_ColliderBodyInit.format(*cBody), f_Quad.format(*cQuad))) + +TYPE_DICT = { + 'ColliderJntSphInit' : (GetCylinder, 'Shape', T_DEFAULT), + 'ColliderCylinderInit' : (GetJntSph, 'Shape', T_DEFAULT), + 'ColliderTrisInit': (GetTris, 'Shape', T_DEFAULT), + 'ColliderQuadInit': (GetQuad, 'Shape', T_DEFAULT), + 'ColliderJntSphItemInit' : (GetJntSphItems, 'Item'), + 'ColliderTrisItemInit' : (GetTrisItems, 'Item') +} + +update = [(k, v[0]) for k,v in TYPE_DICT.items() if v[1] == 'Shape'] +for i in update: + for j in (T_SET3, T_ACTOR): + TYPE_DICT[i[0] + j] = (i[1], 'Shape', j) + +#ovlName = 'ovl_Obj_Comb' +#address = 0x000780 +#inputType = 'ColliderJntSphItemInit' + +#ovlName = 'ovl_En_Boom' +#address = 0x0007D0 +#inputType = 'ColliderQuadInit' + +ovlName = input("Overlay Name (baserom): ") +ovlFile = open("../../baserom/" + ovlName, "rb") +ovlData = bytearray(ovlFile.read()) +ovlFile.close() + +address = int(input("Address: 0x"), 16) +inputType = input("Type (e.g. ColliderQuadInit): ") + +selectedType = TYPE_DICT[inputType] +arg2 = None +if selectedType[1] == 'Shape': + arg2 = selectedType[2] +else: + arg2 = int(input("Number of items: ")) + +selectedType[0](ovlData, address, arg2) diff --git a/tools/overlayhelpers/GenCylinderInit.py b/tools/overlayhelpers/GenCylinderInit.py deleted file mode 100644 index 464b6eaaf0..0000000000 --- a/tools/overlayhelpers/GenCylinderInit.py +++ /dev/null @@ -1,69 +0,0 @@ -import struct - -ovlName = input("Overlay Name: ") - -ovlFile = open("../../baserom/" + ovlName, "rb") -ovlData = bytearray(ovlFile.read()) -ovlFile.close() - -address = int(input("Address: 0x"), 16) - -v0 = str(hex(struct.unpack_from(">B", ovlData, address + 0)[0])) -v1 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 1)[0])) -v2 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 2)[0])) -v3 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 3)[0])) - -v4 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 4)[0])) -v5 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 5)[0])) -v6 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 6)[0])) -v7 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 7)[0])) - -v8 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 8)[0])) -v9 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 9)[0])) -v10 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 10)[0])) -v11 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 11)[0])) - -v12 = str(hex(struct.unpack_from(">I", ovlData, offset = address + 12)[0])) - -v13 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 16)[0])) -v14 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 17)[0])) -v15 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 18)[0])) -v16 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 19)[0])) - -v17 = str(hex(struct.unpack_from(">I", ovlData, offset = address + 20)[0])) - -v18 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 24)[0])) -v19 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 25)[0])) -v20 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 26)[0])) -v21 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 27)[0])) - -v22 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 28)[0])) -v23 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 29)[0])) -v24 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 30)[0])) -v25 = str(hex(struct.unpack_from(">B", ovlData, offset = address + 31)[0])) - -v26 = str(hex(struct.unpack_from(">H", ovlData, offset = address + 32)[0])) -v27 = str(hex(struct.unpack_from(">H", ovlData, offset = address + 34)[0])) - -v28 = str(hex(struct.unpack_from(">L", ovlData, offset = address + 36)[0])) - - -print( -''' -static ColliderCylinderInit cylinderInitData = -{ - %s, %s, %s, %s, - %s, %s, %s, %s, - %s, %s, %s, %s, - %s, - %s, %s, %s, %s, - %s, - %s, %s, %s, %s, - %s, %s, %s, %s, - %s, - %s, - %s, -}; - ''' - % (v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) -)