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 deleted file mode 100644 index d3feaba7ec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Destroy.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel BgYdanSp_Destroy -/* 003E4 808BF7F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003E8 808BF7F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 003EC 808BF7FC 8FAE0018 */ lw $t6, 0x0018($sp) -/* 003F0 808BF800 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003F4 808BF804 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 003F8 808BF808 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003FC 808BF80C 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00400 808BF810 AFA7001C */ sw $a3, 0x001C($sp) -/* 00404 808BF814 0C00FB56 */ jal DynaPoly_DeleteBgActor - ## DynaPoly_DeleteBgActor -/* 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 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 -/* 00424 808BF834 03E00008 */ jr $ra -/* 00428 808BF838 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s deleted file mode 100644 index 232c38742c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s +++ /dev/null @@ -1,249 +0,0 @@ -.rdata -glabel D_808C09F0 - .asciz "../z_bg_ydan_sp.c" - .balign 4 - -glabel D_808C0A04 - .asciz "../z_bg_ydan_sp.c" - .balign 4 - -glabel D_808C0A18 - .asciz "../z_bg_ydan_sp.c" - .balign 4 - -glabel D_808C0A2C - .asciz "../z_bg_ydan_sp.c" - .balign 4 - -glabel D_808C0A40 - .asciz "../z_bg_ydan_sp.c" - .balign 4 - -glabel D_808C0A54 - .asciz "../z_bg_ydan_sp.c" - .balign 4 - -.late_rodata -glabel D_808C0A90 - .float 0.1 - -glabel D_808C0A94 - .float 0.1 - -.text -glabel BgYdanSp_Draw -/* 011B8 808C05C8 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 011BC 808C05CC AFB40030 */ sw $s4, 0x0030($sp) -/* 011C0 808C05D0 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 011C4 808C05D4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 011C8 808C05D8 AFB3002C */ sw $s3, 0x002C($sp) -/* 011CC 808C05DC AFB20028 */ sw $s2, 0x0028($sp) -/* 011D0 808C05E0 AFB10024 */ sw $s1, 0x0024($sp) -/* 011D4 808C05E4 AFB00020 */ sw $s0, 0x0020($sp) -/* 011D8 808C05E8 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 011DC 808C05EC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 011E0 808C05F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 011E4 808C05F4 3C06808C */ lui $a2, %hi(D_808C09F0) ## $a2 = 808C0000 -/* 011E8 808C05F8 24C609F0 */ addiu $a2, $a2, %lo(D_808C09F0) ## $a2 = 808C09F0 -/* 011EC 808C05FC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFA4 -/* 011F0 808C0600 2407030D */ addiu $a3, $zero, 0x030D ## $a3 = 0000030D -/* 011F4 808C0604 0C031AB1 */ jal Graph_OpenDisps -/* 011F8 808C0608 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 011FC 808C060C 0C024F61 */ jal func_80093D84 -/* 01200 808C0610 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 -/* 01204 808C0614 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 01208 808C0618 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0120C 808C061C 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 01210 808C0620 15C10014 */ bne $t6, $at, .L808C0674 -/* 01214 808C0624 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 01218 808C0628 8E5002D0 */ lw $s0, 0x02D0($s2) ## 000002D0 -/* 0121C 808C062C 3C05808C */ lui $a1, %hi(D_808C0A04) ## $a1 = 808C0000 -/* 01220 808C0630 24A50A04 */ addiu $a1, $a1, %lo(D_808C0A04) ## $a1 = 808C0A04 -/* 01224 808C0634 260F0008 */ addiu $t7, $s0, 0x0008 ## $t7 = 00000008 -/* 01228 808C0638 AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 -/* 0122C 808C063C AE180000 */ sw $t8, 0x0000($s0) ## 00000000 -/* 01230 808C0640 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 -/* 01234 808C0644 0C0346A2 */ jal Matrix_NewMtx -/* 01238 808C0648 24060313 */ addiu $a2, $zero, 0x0313 ## $a2 = 00000313 -/* 0123C 808C064C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 01240 808C0650 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 01244 808C0654 3C090600 */ lui $t1, %hi(D_06005F40) ## $t1 = 06000000 -/* 01248 808C0658 25295F40 */ addiu $t1, $t1, %lo(D_06005F40) ## $t1 = 06005F40 -/* 0124C 808C065C 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 -/* 01250 808C0660 AE5902D0 */ sw $t9, 0x02D0($s2) ## 000002D0 -/* 01254 808C0664 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 01258 808C0668 AC680000 */ sw $t0, 0x0000($v1) ## 00000000 -/* 0125C 808C066C 10000099 */ beq $zero, $zero, .L808C08D4 -/* 01260 808C0670 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 -.L808C0674: -/* 01264 808C0674 8E0B0164 */ lw $t3, 0x0164($s0) ## 00000164 -/* 01268 808C0678 3C0A808C */ lui $t2, %hi(func_808BFC50) ## $t2 = 808C0000 -/* 0126C 808C067C 254AFC50 */ addiu $t2, $t2, %lo(func_808BFC50) ## $t2 = 808BFC50 -/* 01270 808C0680 554B0067 */ bnel $t2, $t3, .L808C0820 -/* 01274 808C0684 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -/* 01278 808C0688 0C034236 */ jal Matrix_Get -/* 0127C 808C068C 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFB8 -/* 01280 808C0690 860C016A */ lh $t4, 0x016A($s0) ## 0000016A -/* 01284 808C0694 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 01288 808C0698 55810030 */ bnel $t4, $at, .L808C075C -/* 0128C 808C069C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01290 808C06A0 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 01294 808C06A4 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 01298 808C06A8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0129C 808C06AC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 012A0 808C06B0 46062201 */ sub.s $f8, $f4, $f6 -/* 012A4 808C06B4 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 012A8 808C06B8 44066000 */ mfc1 $a2, $f12 -/* 012AC 808C06BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012B0 808C06C0 460A4382 */ mul.s $f14, $f8, $f10 -/* 012B4 808C06C4 0C034261 */ jal Matrix_Translate -/* 012B8 808C06C8 00000000 */ nop -/* 012BC 808C06CC C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -/* 012C0 808C06D0 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 012C4 808C06D4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 012C8 808C06D8 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 012CC 808C06DC 46128101 */ sub.s $f4, $f16, $f18 -/* 012D0 808C06E0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 012D4 808C06E4 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 012D8 808C06E8 3C01808C */ lui $at, %hi(D_808C0A90) ## $at = 808C0000 -/* 012DC 808C06EC C42A0A90 */ lwc1 $f10, %lo(D_808C0A90)($at) -/* 012E0 808C06F0 46062200 */ add.s $f8, $f4, $f6 -/* 012E4 808C06F4 44066000 */ mfc1 $a2, $f12 -/* 012E8 808C06F8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012EC 808C06FC 460A4382 */ mul.s $f14, $f8, $f10 -/* 012F0 808C0700 0C0342A3 */ jal Matrix_Scale -/* 012F4 808C0704 00000000 */ nop -/* 012F8 808C0708 8E5002D0 */ lw $s0, 0x02D0($s2) ## 000002D0 -/* 012FC 808C070C 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 01300 808C0710 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 -/* 01304 808C0714 260D0008 */ addiu $t5, $s0, 0x0008 ## $t5 = 00000008 -/* 01308 808C0718 AE4D02D0 */ sw $t5, 0x02D0($s2) ## 000002D0 -/* 0130C 808C071C 3C05808C */ lui $a1, %hi(D_808C0A18) ## $a1 = 808C0000 -/* 01310 808C0720 AE0E0000 */ sw $t6, 0x0000($s0) ## 00000000 -/* 01314 808C0724 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 -/* 01318 808C0728 24A50A18 */ addiu $a1, $a1, %lo(D_808C0A18) ## $a1 = 808C0A18 -/* 0131C 808C072C 0C0346A2 */ jal Matrix_NewMtx -/* 01320 808C0730 24060328 */ addiu $a2, $zero, 0x0328 ## $a2 = 00000328 -/* 01324 808C0734 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 01328 808C0738 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 0132C 808C073C 3C190600 */ lui $t9, %hi(D_060061B0) ## $t9 = 06000000 -/* 01330 808C0740 273961B0 */ addiu $t9, $t9, %lo(D_060061B0) ## $t9 = 060061B0 -/* 01334 808C0744 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 01338 808C0748 AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 -/* 0133C 808C074C 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 01340 808C0750 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 01344 808C0754 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 01348 808C0758 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -.L808C075C: -/* 0134C 808C075C 3C130600 */ lui $s3, %hi(D_06003850) ## $s3 = 06000000 -/* 01350 808C0760 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 -/* 01354 808C0764 26733850 */ addiu $s3, $s3, %lo(D_06003850) ## $s3 = 06003850 -/* 01358 808C0768 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -.L808C076C: -/* 0135C 808C076C 0C03423F */ jal Matrix_Put -/* 01360 808C0770 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFB8 -/* 01364 808C0774 00112C00 */ sll $a1, $s1, 16 -/* 01368 808C0778 00052C03 */ sra $a1, $a1, 16 -/* 0136C 808C077C 2404FA60 */ addiu $a0, $zero, 0xFA60 ## $a0 = FFFFFA60 -/* 01370 808C0780 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01374 808C0784 0C034421 */ jal Matrix_RotateRPY -/* 01378 808C0788 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0137C 808C078C 3C01442F */ lui $at, 0x442F ## $at = 442F0000 -/* 01380 808C0790 44817000 */ mtc1 $at, $f14 ## $f14 = 700.00 -/* 01384 808C0794 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 01388 808C0798 3C06C461 */ lui $a2, 0xC461 ## $a2 = C4610000 -/* 0138C 808C079C 0C034261 */ jal Matrix_Translate -/* 01390 808C07A0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01394 808C07A4 3C014060 */ lui $at, 0x4060 ## $at = 40600000 -/* 01398 808C07A8 44816000 */ mtc1 $at, $f12 ## $f12 = 3.50 -/* 0139C 808C07AC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 013A0 808C07B0 44817000 */ mtc1 $at, $f14 ## $f14 = 5.00 -/* 013A4 808C07B4 4406A000 */ mfc1 $a2, $f20 -/* 013A8 808C07B8 0C0342A3 */ jal Matrix_Scale -/* 013AC 808C07BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 013B0 808C07C0 8E5002D0 */ lw $s0, 0x02D0($s2) ## 000002D0 -/* 013B4 808C07C4 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 013B8 808C07C8 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 013BC 808C07CC 26080008 */ addiu $t0, $s0, 0x0008 ## $t0 = 00000008 -/* 013C0 808C07D0 AE4802D0 */ sw $t0, 0x02D0($s2) ## 000002D0 -/* 013C4 808C07D4 3C05808C */ lui $a1, %hi(D_808C0A2C) ## $a1 = 808C0000 -/* 013C8 808C07D8 AE090000 */ sw $t1, 0x0000($s0) ## 00000000 -/* 013CC 808C07DC 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 -/* 013D0 808C07E0 24A50A2C */ addiu $a1, $a1, %lo(D_808C0A2C) ## $a1 = 808C0A2C -/* 013D4 808C07E4 0C0346A2 */ jal Matrix_NewMtx -/* 013D8 808C07E8 2406033E */ addiu $a2, $zero, 0x033E ## $a2 = 0000033E -/* 013DC 808C07EC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 013E0 808C07F0 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 013E4 808C07F4 26312000 */ addiu $s1, $s1, 0x2000 ## $s1 = 00002000 -/* 013E8 808C07F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 013EC 808C07FC 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 -/* 013F0 808C0800 AE4A02D0 */ sw $t2, 0x02D0($s2) ## 000002D0 -/* 013F4 808C0804 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 013F8 808C0808 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 013FC 808C080C 1621FFD7 */ bne $s1, $at, .L808C076C -/* 01400 808C0810 AC730004 */ sw $s3, 0x0004($v1) ## 00000004 -/* 01404 808C0814 1000002F */ beq $zero, $zero, .L808C08D4 -/* 01408 808C0818 00000000 */ nop -/* 0140C 808C081C C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -.L808C0820: -/* 01410 808C0820 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 01414 808C0824 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01418 808C0828 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 0141C 808C082C 46128101 */ sub.s $f4, $f16, $f18 -/* 01420 808C0830 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 01424 808C0834 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01428 808C0838 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0142C 808C083C 46062382 */ mul.s $f14, $f4, $f6 -/* 01430 808C0840 0C034261 */ jal Matrix_Translate -/* 01434 808C0844 00000000 */ nop -/* 01438 808C0848 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 0143C 808C084C C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 01440 808C0850 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01444 808C0854 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01448 808C0858 460A4401 */ sub.s $f16, $f8, $f10 -/* 0144C 808C085C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01450 808C0860 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 01454 808C0864 3C01808C */ lui $at, %hi(D_808C0A94) ## $at = 808C0000 -/* 01458 808C0868 C4260A94 */ lwc1 $f6, %lo(D_808C0A94)($at) -/* 0145C 808C086C 46128100 */ add.s $f4, $f16, $f18 -/* 01460 808C0870 44066000 */ mfc1 $a2, $f12 -/* 01464 808C0874 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01468 808C0878 46062382 */ mul.s $f14, $f4, $f6 -/* 0146C 808C087C 0C0342A3 */ jal Matrix_Scale -/* 01470 808C0880 00000000 */ nop -/* 01474 808C0884 8E5002D0 */ lw $s0, 0x02D0($s2) ## 000002D0 -/* 01478 808C0888 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 0147C 808C088C 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 01480 808C0890 260C0008 */ addiu $t4, $s0, 0x0008 ## $t4 = 00000008 -/* 01484 808C0894 AE4C02D0 */ sw $t4, 0x02D0($s2) ## 000002D0 -/* 01488 808C0898 3C05808C */ lui $a1, %hi(D_808C0A40) ## $a1 = 808C0000 -/* 0148C 808C089C AE0D0000 */ sw $t5, 0x0000($s0) ## 00000000 -/* 01490 808C08A0 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 -/* 01494 808C08A4 24A50A40 */ addiu $a1, $a1, %lo(D_808C0A40) ## $a1 = 808C0A40 -/* 01498 808C08A8 0C0346A2 */ jal Matrix_NewMtx -/* 0149C 808C08AC 24060351 */ addiu $a2, $zero, 0x0351 ## $a2 = 00000351 -/* 014A0 808C08B0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 014A4 808C08B4 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 -/* 014A8 808C08B8 3C180600 */ lui $t8, %hi(D_060061B0) ## $t8 = 06000000 -/* 014AC 808C08BC 271861B0 */ addiu $t8, $t8, %lo(D_060061B0) ## $t8 = 060061B0 -/* 014B0 808C08C0 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 014B4 808C08C4 AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 -/* 014B8 808C08C8 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 014BC 808C08CC AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 014C0 808C08D0 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -.L808C08D4: -/* 014C4 808C08D4 3C06808C */ lui $a2, %hi(D_808C0A54) ## $a2 = 808C0000 -/* 014C8 808C08D8 24C60A54 */ addiu $a2, $a2, %lo(D_808C0A54) ## $a2 = 808C0A54 -/* 014CC 808C08DC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFA4 -/* 014D0 808C08E0 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 014D4 808C08E4 0C031AD5 */ jal Graph_CloseDisps -/* 014D8 808C08E8 24070358 */ addiu $a3, $zero, 0x0358 ## $a3 = 00000358 -/* 014DC 808C08EC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 014E0 808C08F0 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 014E4 808C08F4 8FB00020 */ lw $s0, 0x0020($sp) -/* 014E8 808C08F8 8FB10024 */ lw $s1, 0x0024($sp) -/* 014EC 808C08FC 8FB20028 */ lw $s2, 0x0028($sp) -/* 014F0 808C0900 8FB3002C */ lw $s3, 0x002C($sp) -/* 014F4 808C0904 8FB40030 */ lw $s4, 0x0030($sp) -/* 014F8 808C0908 03E00008 */ jr $ra -/* 014FC 808C090C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $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 deleted file mode 100644 index 00d4d9e99c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s +++ /dev/null @@ -1,269 +0,0 @@ -glabel BgYdanSp_Init -/* 00000 808BF410 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00004 808BF414 AFA50084 */ sw $a1, 0x0084($sp) -/* 00008 808BF418 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0000C 808BF41C AFB00020 */ sw $s0, 0x0020($sp) -/* 00010 808BF420 3C05808C */ lui $a1, %hi(D_808C09B8) ## $a1 = 808C0000 -/* 00014 808BF424 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 808BF428 AFA0004C */ sw $zero, 0x004C($sp) -/* 0001C 808BF42C 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 808BF430 24A509B8 */ addiu $a1, $a1, %lo(D_808C09B8) ## $a1 = 808C09B8 -/* 00024 808BF434 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00028 808BF438 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 0002C 808BF43C 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00030 808BF440 0018C983 */ sra $t9, $t8, 6 -/* 00034 808BF444 00095303 */ sra $t2, $t1, 12 -/* 00038 808BF448 3328003F */ andi $t0, $t9, 0x003F ## $t0 = 00000000 -/* 0003C 808BF44C 314B000F */ andi $t3, $t2, 0x000F ## $t3 = 00000000 -/* 00040 808BF450 31CF003F */ andi $t7, $t6, 0x003F ## $t7 = 00000000 -/* 00044 808BF454 A20F0168 */ sb $t7, 0x0168($s0) ## 00000168 -/* 00048 808BF458 A2080169 */ sb $t0, 0x0169($s0) ## 00000169 -/* 0004C 808BF45C A60B001C */ sh $t3, 0x001C($s0) ## 0000001C -/* 00050 808BF460 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00054 808BF464 0C010D20 */ jal DynaPolyActor_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 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 -/* 00074 808BF484 AFAC0010 */ sw $t4, 0x0010($sp) -/* 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 Collider_SetTris -/* 00088 808BF498 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0008C 808BF49C 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -/* 00090 808BF4A0 3C040600 */ lui $a0, %hi(D_06006050) ## $a0 = 06000000 -/* 00094 808BF4A4 24846050 */ addiu $a0, $a0, %lo(D_06006050) ## $a0 = 06006050 -/* 00098 808BF4A8 15A00040 */ bne $t5, $zero, .L808BF5AC -/* 0009C 808BF4AC 00000000 */ nop -/* 000A0 808BF4B0 3C040600 */ lui $a0, %hi(D_06006460) ## $a0 = 06000000 -/* 000A4 808BF4B4 24846460 */ addiu $a0, $a0, %lo(D_06006460) ## $a0 = 06006460 -/* 000A8 808BF4B8 0C010620 */ jal CollisionHeader_GetVirtual - -/* 000AC 808BF4BC 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFCC -/* 000B0 808BF4C0 3C0E808C */ lui $t6, %hi(func_808BFE50) ## $t6 = 808C0000 -/* 000B4 808BF4C4 25CEFE50 */ addiu $t6, $t6, %lo(func_808BFE50) ## $t6 = 808BFE50 -/* 000B8 808BF4C8 3C03808C */ lui $v1, %hi(D_808C0930) ## $v1 = 808C0000 -/* 000BC 808BF4CC 3C04808C */ lui $a0, %hi(D_808C0954) ## $a0 = 808C0000 -/* 000C0 808BF4D0 AE0E0164 */ sw $t6, 0x0164($s0) ## 00000164 -/* 000C4 808BF4D4 24840954 */ addiu $a0, $a0, %lo(D_808C0954) ## $a0 = 808C0954 -/* 000C8 808BF4D8 24630930 */ addiu $v1, $v1, %lo(D_808C0930) ## $v1 = 808C0930 -/* 000CC 808BF4DC 27A20054 */ addiu $v0, $sp, 0x0054 ## $v0 = FFFFFFD4 -/* 000D0 808BF4E0 2463000C */ addiu $v1, $v1, 0x000C ## $v1 = 808C093C -/* 000D4 808BF4E4 10640010 */ beq $v1, $a0, .L808BF528 -/* 000D8 808BF4E8 C472000C */ lwc1 $f18, 0x000C($v1) ## 808C0948 -.L808BF4EC: -/* 000DC 808BF4EC C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 000E0 808BF4F0 C46E0010 */ lwc1 $f14, 0x0010($v1) ## 808C094C -/* 000E4 808BF4F4 C46C0014 */ lwc1 $f12, 0x0014($v1) ## 808C0950 -/* 000E8 808BF4F8 46109400 */ add.s $f16, $f18, $f16 -/* 000EC 808BF4FC C4720018 */ lwc1 $f18, 0x0018($v1) ## 808C0954 -/* 000F0 808BF500 2463000C */ addiu $v1, $v1, 0x000C ## $v1 = 808C0948 -/* 000F4 808BF504 2442000C */ addiu $v0, $v0, 0x000C ## $v0 = FFFFFFE0 -/* 000F8 808BF508 E450FFF4 */ swc1 $f16, -0x000C($v0) ## FFFFFFD4 -/* 000FC 808BF50C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00100 808BF510 46107400 */ add.s $f16, $f14, $f16 -/* 00104 808BF514 E450FFF8 */ swc1 $f16, -0x0008($v0) ## FFFFFFD8 -/* 00108 808BF518 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 0010C 808BF51C 46106400 */ add.s $f16, $f12, $f16 -/* 00110 808BF520 1464FFF2 */ bne $v1, $a0, .L808BF4EC -/* 00114 808BF524 E450FFFC */ swc1 $f16, -0x0004($v0) ## FFFFFFDC -.L808BF528: -/* 00118 808BF528 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 0011C 808BF52C C46E0010 */ lwc1 $f14, 0x0010($v1) ## 808C0958 -/* 00120 808BF530 C46C0014 */ lwc1 $f12, 0x0014($v1) ## 808C095C -/* 00124 808BF534 46109400 */ add.s $f16, $f18, $f16 -/* 00128 808BF538 2442000C */ addiu $v0, $v0, 0x000C ## $v0 = FFFFFFEC -/* 0012C 808BF53C E450FFF4 */ swc1 $f16, -0x000C($v0) ## FFFFFFE0 -/* 00130 808BF540 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00134 808BF544 46107400 */ add.s $f16, $f14, $f16 -/* 00138 808BF548 E450FFF8 */ swc1 $f16, -0x0008($v0) ## FFFFFFE4 -/* 0013C 808BF54C C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00140 808BF550 46106400 */ add.s $f16, $f12, $f16 -/* 00144 808BF554 E450FFFC */ swc1 $f16, -0x0004($v0) ## FFFFFFE8 -/* 00148 808BF558 27AF006C */ addiu $t7, $sp, 0x006C ## $t7 = FFFFFFEC -/* 0014C 808BF55C AFAF0010 */ sw $t7, 0x0010($sp) -/* 00150 808BF560 8FA40030 */ lw $a0, 0x0030($sp) -/* 00154 808BF564 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00158 808BF568 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFD4 -/* 0015C 808BF56C 0C0189E8 */ jal Collider_SetTrisVertices -/* 00160 808BF570 27A70060 */ addiu $a3, $sp, 0x0060 ## $a3 = FFFFFFE0 -/* 00164 808BF574 C7B20054 */ lwc1 $f18, 0x0054($sp) -/* 00168 808BF578 C7A40074 */ lwc1 $f4, 0x0074($sp) -/* 0016C 808BF57C 27B80060 */ addiu $t8, $sp, 0x0060 ## $t8 = FFFFFFE0 -/* 00170 808BF580 AFB80010 */ sw $t8, 0x0010($sp) -/* 00174 808BF584 8FA40030 */ lw $a0, 0x0030($sp) -/* 00178 808BF588 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0017C 808BF58C 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFD4 -/* 00180 808BF590 27A7006C */ addiu $a3, $sp, 0x006C ## $a3 = FFFFFFEC -/* 00184 808BF594 E7B20060 */ swc1 $f18, 0x0060($sp) -/* 00188 808BF598 0C0189E8 */ jal Collider_SetTrisVertices -/* 0018C 808BF59C E7A40068 */ swc1 $f4, 0x0068($sp) -/* 00190 808BF5A0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00194 808BF5A4 10000080 */ beq $zero, $zero, .L808BF7A8 -/* 00198 808BF5A8 E606016C */ swc1 $f6, 0x016C($s0) ## 0000016C -.L808BF5AC: -/* 0019C 808BF5AC 0C010620 */ jal CollisionHeader_GetVirtual - -/* 001A0 808BF5B0 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFCC -/* 001A4 808BF5B4 3C19808C */ lui $t9, %hi(func_808C0464) ## $t9 = 808C0000 -/* 001A8 808BF5B8 27390464 */ addiu $t9, $t9, %lo(func_808C0464) ## $t9 = 808C0464 -/* 001AC 808BF5BC AE190164 */ sw $t9, 0x0164($s0) ## 00000164 -/* 001B0 808BF5C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001B4 808BF5C4 0C00B56E */ jal Actor_SetFocus - -/* 001B8 808BF5C8 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 -/* 001BC 808BF5CC 0C01DE1C */ jal Math_SinS - ## sins? -/* 001C0 808BF5D0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 001C4 808BF5D4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 001C8 808BF5D8 0C01DE0D */ jal Math_CosS - ## coss? -/* 001CC 808BF5DC E7A00040 */ swc1 $f0, 0x0040($sp) -/* 001D0 808BF5E0 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 001D4 808BF5E4 0C01DE1C */ jal Math_SinS - ## sins? -/* 001D8 808BF5E8 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 001DC 808BF5EC 46000387 */ neg.s $f14, $f0 -/* 001E0 808BF5F0 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 001E4 808BF5F4 0C01DE0D */ jal Math_CosS - ## coss? -/* 001E8 808BF5F8 E7AE0038 */ swc1 $f14, 0x0038($sp) -/* 001EC 808BF5FC 3C03808C */ lui $v1, %hi(D_808C096C) ## $v1 = 808C0000 -/* 001F0 808BF600 3C04808C */ lui $a0, %hi(D_808C0990) ## $a0 = 808C0000 -/* 001F4 808BF604 C7A20040 */ lwc1 $f2, 0x0040($sp) -/* 001F8 808BF608 C7AC0044 */ lwc1 $f12, 0x0044($sp) -/* 001FC 808BF60C C7AE0038 */ lwc1 $f14, 0x0038($sp) -/* 00200 808BF610 46000406 */ mov.s $f16, $f0 -/* 00204 808BF614 24840990 */ addiu $a0, $a0, %lo(D_808C0990) ## $a0 = 808C0990 -/* 00208 808BF618 2463096C */ addiu $v1, $v1, %lo(D_808C096C) ## $v1 = 808C096C -/* 0020C 808BF61C 27A20054 */ addiu $v0, $sp, 0x0054 ## $v0 = FFFFFFD4 -/* 00210 808BF620 2463000C */ addiu $v1, $v1, 0x000C ## $v1 = 808C0978 -/* 00214 808BF624 C4720010 */ lwc1 $f18, 0x0010($v1) ## 808C0988 -/* 00218 808BF628 1064001B */ beq $v1, $a0, .L808BF698 -/* 0021C 808BF62C C46A000C */ lwc1 $f10, 0x000C($v1) ## 808C0984 -.L808BF630: -/* 00220 808BF630 46029202 */ mul.s $f8, $f18, $f2 -/* 00224 808BF634 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00228 808BF638 C4640010 */ lwc1 $f4, 0x0010($v1) ## 808C0988 -/* 0022C 808BF63C 460A6482 */ mul.s $f18, $f12, $f10 -/* 00230 808BF640 C46A0010 */ lwc1 $f10, 0x0010($v1) ## 808C0988 -/* 00234 808BF644 2463000C */ addiu $v1, $v1, 0x000C ## $v1 = 808C0984 -/* 00238 808BF648 46002102 */ mul.s $f4, $f4, $f0 -/* 0023C 808BF64C 2442000C */ addiu $v0, $v0, 0x000C ## $v0 = FFFFFFE0 -/* 00240 808BF650 460E4202 */ mul.s $f8, $f8, $f14 -/* 00244 808BF654 46123180 */ add.s $f6, $f6, $f18 -/* 00248 808BF658 460C5482 */ mul.s $f18, $f10, $f12 -/* 0024C 808BF65C C46A0000 */ lwc1 $f10, 0x0000($v1) ## 808C0984 -/* 00250 808BF660 460A1282 */ mul.s $f10, $f2, $f10 -/* 00254 808BF664 46083201 */ sub.s $f8, $f6, $f8 -/* 00258 808BF668 460E9182 */ mul.s $f6, $f18, $f14 -/* 0025C 808BF66C C4720010 */ lwc1 $f18, 0x0010($v1) ## 808C0994 -/* 00260 808BF670 E448FFF4 */ swc1 $f8, -0x000C($v0) ## FFFFFFD4 -/* 00264 808BF674 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00268 808BF678 46082200 */ add.s $f8, $f4, $f8 -/* 0026C 808BF67C E448FFF8 */ swc1 $f8, -0x0008($v0) ## FFFFFFD8 -/* 00270 808BF680 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00274 808BF684 460A4201 */ sub.s $f8, $f8, $f10 -/* 00278 808BF688 C46A000C */ lwc1 $f10, 0x000C($v1) ## 808C0990 -/* 0027C 808BF68C 46083200 */ add.s $f8, $f6, $f8 -/* 00280 808BF690 1464FFE7 */ bne $v1, $a0, .L808BF630 -/* 00284 808BF694 E448FFFC */ swc1 $f8, -0x0004($v0) ## FFFFFFDC -.L808BF698: -/* 00288 808BF698 46029202 */ mul.s $f8, $f18, $f2 -/* 0028C 808BF69C C4640010 */ lwc1 $f4, 0x0010($v1) ## 808C0994 -/* 00290 808BF6A0 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00294 808BF6A4 460A6482 */ mul.s $f18, $f12, $f10 -/* 00298 808BF6A8 C46A0010 */ lwc1 $f10, 0x0010($v1) ## 808C0994 -/* 0029C 808BF6AC 2442000C */ addiu $v0, $v0, 0x000C ## $v0 = FFFFFFEC -/* 002A0 808BF6B0 46002102 */ mul.s $f4, $f4, $f0 -/* 002A4 808BF6B4 00000000 */ nop -/* 002A8 808BF6B8 460E4202 */ mul.s $f8, $f8, $f14 -/* 002AC 808BF6BC 46123180 */ add.s $f6, $f6, $f18 -/* 002B0 808BF6C0 460C5482 */ mul.s $f18, $f10, $f12 -/* 002B4 808BF6C4 C46A000C */ lwc1 $f10, 0x000C($v1) ## 808C0990 -/* 002B8 808BF6C8 460A1282 */ mul.s $f10, $f2, $f10 -/* 002BC 808BF6CC 46083201 */ sub.s $f8, $f6, $f8 -/* 002C0 808BF6D0 460E9182 */ mul.s $f6, $f18, $f14 -/* 002C4 808BF6D4 E448FFF4 */ swc1 $f8, -0x000C($v0) ## FFFFFFE0 -/* 002C8 808BF6D8 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 002CC 808BF6DC 46082200 */ add.s $f8, $f4, $f8 -/* 002D0 808BF6E0 E448FFF8 */ swc1 $f8, -0x0008($v0) ## FFFFFFE4 -/* 002D4 808BF6E4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 002D8 808BF6E8 460A4201 */ sub.s $f8, $f8, $f10 -/* 002DC 808BF6EC 46083200 */ add.s $f8, $f6, $f8 -/* 002E0 808BF6F0 E448FFFC */ swc1 $f8, -0x0004($v0) ## FFFFFFE8 -/* 002E4 808BF6F4 27A8006C */ addiu $t0, $sp, 0x006C ## $t0 = FFFFFFEC -/* 002E8 808BF6F8 AFA80010 */ sw $t0, 0x0010($sp) -/* 002EC 808BF6FC 8FA40030 */ lw $a0, 0x0030($sp) -/* 002F0 808BF700 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 002F4 808BF704 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFD4 -/* 002F8 808BF708 27A70060 */ addiu $a3, $sp, 0x0060 ## $a3 = FFFFFFE0 -/* 002FC 808BF70C E7A20040 */ swc1 $f2, 0x0040($sp) -/* 00300 808BF710 E7AC0044 */ swc1 $f12, 0x0044($sp) -/* 00304 808BF714 E7AE0038 */ swc1 $f14, 0x0038($sp) -/* 00308 808BF718 0C0189E8 */ jal Collider_SetTrisVertices -/* 0030C 808BF71C E7B0003C */ swc1 $f16, 0x003C($sp) -/* 00310 808BF720 3C01808C */ lui $at, %hi(D_808C0984) ## $at = 808C0000 -/* 00314 808BF724 C7AC0044 */ lwc1 $f12, 0x0044($sp) -/* 00318 808BF728 C4260984 */ lwc1 $f6, %lo(D_808C0984)($at) -/* 0031C 808BF72C C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 00320 808BF730 3C01808C */ lui $at, %hi(D_808C09A0) ## $at = 808C0000 -/* 00324 808BF734 46066482 */ mul.s $f18, $f12, $f6 -/* 00328 808BF738 C7A20040 */ lwc1 $f2, 0x0040($sp) -/* 0032C 808BF73C C42A09A0 */ lwc1 $f10, %lo(D_808C09A0)($at) -/* 00330 808BF740 C7AE0038 */ lwc1 $f14, 0x0038($sp) -/* 00334 808BF744 C7B0003C */ lwc1 $f16, 0x003C($sp) -/* 00338 808BF748 27A90060 */ addiu $t1, $sp, 0x0060 ## $t1 = FFFFFFE0 -/* 0033C 808BF74C 8FA40030 */ lw $a0, 0x0030($sp) -/* 00340 808BF750 46124100 */ add.s $f4, $f8, $f18 -/* 00344 808BF754 46025202 */ mul.s $f8, $f10, $f2 -/* 00348 808BF758 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0034C 808BF75C 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFD4 -/* 00350 808BF760 27A7006C */ addiu $a3, $sp, 0x006C ## $a3 = FFFFFFEC -/* 00354 808BF764 460E4482 */ mul.s $f18, $f8, $f14 -/* 00358 808BF768 46122201 */ sub.s $f8, $f4, $f18 -/* 0035C 808BF76C 46105102 */ mul.s $f4, $f10, $f16 -/* 00360 808BF770 E7A80060 */ swc1 $f8, 0x0060($sp) -/* 00364 808BF774 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 00368 808BF778 46122200 */ add.s $f8, $f4, $f18 -/* 0036C 808BF77C 46061482 */ mul.s $f18, $f2, $f6 -/* 00370 808BF780 00000000 */ nop -/* 00374 808BF784 460C5182 */ mul.s $f6, $f10, $f12 -/* 00378 808BF788 E7A80064 */ swc1 $f8, 0x0064($sp) -/* 0037C 808BF78C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 00380 808BF790 AFA90010 */ sw $t1, 0x0010($sp) -/* 00384 808BF794 46122201 */ sub.s $f8, $f4, $f18 -/* 00388 808BF798 460E3102 */ mul.s $f4, $f6, $f14 -/* 0038C 808BF79C 46082480 */ add.s $f18, $f4, $f8 -/* 00390 808BF7A0 0C0189E8 */ jal Collider_SetTrisVertices -/* 00394 808BF7A4 E7B20068 */ swc1 $f18, 0x0068($sp) -.L808BF7A8: -/* 00398 808BF7A8 8FA40084 */ lw $a0, 0x0084($sp) -/* 0039C 808BF7AC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 003A0 808BF7B0 8FA7004C */ lw $a3, 0x004C($sp) -/* 003A4 808BF7B4 0C00FA9D */ jal DynaPoly_SetBgActor - ## DynaPoly_SetBgActor -/* 003A8 808BF7B8 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 003AC 808BF7BC AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 003B0 808BF7C0 A600016A */ sh $zero, 0x016A($s0) ## 0000016A -/* 003B4 808BF7C4 8FA40084 */ lw $a0, 0x0084($sp) -/* 003B8 808BF7C8 0C00B2D0 */ jal Flags_GetSwitch - -/* 003BC 808BF7CC 92050168 */ lbu $a1, 0x0168($s0) ## 00000168 -/* 003C0 808BF7D0 50400004 */ beql $v0, $zero, .L808BF7E4 -/* 003C4 808BF7D4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 003C8 808BF7D8 0C00B55C */ jal Actor_Kill - -/* 003CC 808BF7DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003D0 808BF7E0 8FBF0024 */ lw $ra, 0x0024($sp) -.L808BF7E4: -/* 003D4 808BF7E4 8FB00020 */ lw $s0, 0x0020($sp) -/* 003D8 808BF7E8 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 003DC 808BF7EC 03E00008 */ jr $ra -/* 003E0 808BF7F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Update.s deleted file mode 100644 index 8c6fb49d89..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel BgYdanSp_Update -/* 01194 808C05A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01198 808C05A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0119C 808C05AC 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 011A0 808C05B0 0320F809 */ jalr $ra, $t9 -/* 011A4 808C05B4 00000000 */ nop -/* 011A8 808C05B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 011AC 808C05BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 011B0 808C05C0 03E00008 */ jr $ra -/* 011B4 808C05C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF83C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF83C.s deleted file mode 100644 index 5ecfe09493..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF83C.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_808BF83C -/* 0042C 808BF83C 3C030600 */ lui $v1, %hi(D_06006460) ## $v1 = 06000000 -/* 00430 808BF840 24636460 */ addiu $v1, $v1, %lo(D_06006460) ## $v1 = 06006460 -/* 00434 808BF844 00037100 */ sll $t6, $v1, 4 -/* 00438 808BF848 3C078016 */ lui $a3, %hi(gSegments) -/* 0043C 808BF84C 000E7F02 */ srl $t7, $t6, 28 -/* 00440 808BF850 24E76FA8 */ addiu $a3, %lo(gSegments) -/* 00444 808BF854 000FC080 */ sll $t8, $t7, 2 -/* 00448 808BF858 00F8C821 */ addu $t9, $a3, $t8 -/* 0044C 808BF85C 8F2A0000 */ lw $t2, 0x0000($t9) ## 00000000 -/* 00450 808BF860 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 -/* 00454 808BF864 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 00458 808BF868 00685824 */ and $t3, $v1, $t0 -/* 0045C 808BF86C 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 -/* 00460 808BF870 014B6021 */ addu $t4, $t2, $t3 -/* 00464 808BF874 01891021 */ addu $v0, $t4, $t1 -/* 00468 808BF878 8C450010 */ lw $a1, 0x0010($v0) ## 00000010 -/* 0046C 808BF87C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00470 808BF880 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 00474 808BF884 00056900 */ sll $t5, $a1, 4 -/* 00478 808BF888 000D7702 */ srl $t6, $t5, 28 -/* 0047C 808BF88C 000E7880 */ sll $t7, $t6, 2 -/* 00480 808BF890 00EFC021 */ addu $t8, $a3, $t7 -/* 00484 808BF894 8F190000 */ lw $t9, 0x0000($t8) ## 00000000 -/* 00488 808BF898 00A85024 */ and $t2, $a1, $t0 -/* 0048C 808BF89C 032A5821 */ addu $t3, $t9, $t2 -/* 00490 808BF8A0 01696021 */ addu $t4, $t3, $t1 -/* 00494 808BF8A4 AC4C0010 */ sw $t4, 0x0010($v0) ## 00000010 -/* 00498 808BF8A8 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 0049C 808BF8AC C484000C */ lwc1 $f4, 0x000C($a0) ## 0000000C -/* 004A0 808BF8B0 46062201 */ sub.s $f8, $f4, $f6 -/* 004A4 808BF8B4 460A4402 */ mul.s $f16, $f8, $f10 -/* 004A8 808BF8B8 4600848D */ trunc.w.s $f18, $f16 -/* 004AC 808BF8BC 44069000 */ mfc1 $a2, $f18 -/* 004B0 808BF8C0 00000000 */ nop -/* 004B4 808BF8C4 00063400 */ sll $a2, $a2, 16 -/* 004B8 808BF8C8 00063403 */ sra $a2, $a2, 16 -/* 004BC 808BF8CC A5860056 */ sh $a2, 0x0056($t4) ## 00000056 -/* 004C0 808BF8D0 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 004C4 808BF8D4 A5E6004A */ sh $a2, 0x004A($t7) ## 0000004A -/* 004C8 808BF8D8 8C580010 */ lw $t8, 0x0010($v0) ## 00000010 -/* 004CC 808BF8DC A706003E */ sh $a2, 0x003E($t8) ## 0000003E -/* 004D0 808BF8E0 8C590010 */ lw $t9, 0x0010($v0) ## 00000010 -/* 004D4 808BF8E4 A7260038 */ sh $a2, 0x0038($t9) ## 00000038 -/* 004D8 808BF8E8 8C4A0010 */ lw $t2, 0x0010($v0) ## 00000010 -/* 004DC 808BF8EC A5460026 */ sh $a2, 0x0026($t2) ## 00000026 -/* 004E0 808BF8F0 8C4B0010 */ lw $t3, 0x0010($v0) ## 00000010 -/* 004E4 808BF8F4 A5660020 */ sh $a2, 0x0020($t3) ## 00000020 -/* 004E8 808BF8F8 8C4C0010 */ lw $t4, 0x0010($v0) ## 00000010 -/* 004EC 808BF8FC A5860008 */ sh $a2, 0x0008($t4) ## 00000008 -/* 004F0 808BF900 8C4D0010 */ lw $t5, 0x0010($v0) ## 00000010 -/* 004F4 808BF904 03E00008 */ jr $ra -/* 004F8 808BF908 A5A60002 */ sh $a2, 0x0002($t5) ## 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF90C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF90C.s deleted file mode 100644 index 8305f0bc6d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF90C.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_808BF90C -/* 004FC 808BF90C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00500 808BF910 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00504 808BF914 AFA5001C */ sw $a1, 0x001C($sp) -/* 00508 808BF918 240E001E */ addiu $t6, $zero, 0x001E ## $t6 = 0000001E -/* 0050C 808BF91C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00510 808BF920 A48E016A */ sh $t6, 0x016A($a0) ## 0000016A -/* 00514 808BF924 AFA60018 */ sw $a2, 0x0018($sp) -/* 00518 808BF928 0C01E221 */ jal func_80078884 -/* 0051C 808BF92C 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 00520 808BF930 8FA60018 */ lw $a2, 0x0018($sp) -/* 00524 808BF934 8FA4001C */ lw $a0, 0x001C($sp) -/* 00528 808BF938 0C00B2DD */ jal Flags_SetSwitch - -/* 0052C 808BF93C 90C50168 */ lbu $a1, 0x0168($a2) ## 00000168 -/* 00530 808BF940 8FA60018 */ lw $a2, 0x0018($sp) -/* 00534 808BF944 3C18808C */ lui $t8, %hi(func_808BF97C) ## $t8 = 808C0000 -/* 00538 808BF948 3C19808C */ lui $t9, %hi(func_808C012C) ## $t9 = 808C0000 -/* 0053C 808BF94C 84CF001C */ lh $t7, 0x001C($a2) ## 0000001C -/* 00540 808BF950 2718F97C */ addiu $t8, $t8, %lo(func_808BF97C) ## $t8 = 808BF97C -/* 00544 808BF954 2739012C */ addiu $t9, $t9, %lo(func_808C012C) ## $t9 = 808C012C -/* 00548 808BF958 55E00004 */ bnel $t7, $zero, .L808BF96C -/* 0054C 808BF95C ACD90164 */ sw $t9, 0x0164($a2) ## 00000164 -/* 00550 808BF960 10000002 */ beq $zero, $zero, .L808BF96C -/* 00554 808BF964 ACD80164 */ sw $t8, 0x0164($a2) ## 00000164 -/* 00558 808BF968 ACD90164 */ sw $t9, 0x0164($a2) ## 00000164 -.L808BF96C: -/* 0055C 808BF96C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00560 808BF970 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00564 808BF974 03E00008 */ jr $ra -/* 00568 808BF978 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s deleted file mode 100644 index 021424054c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s +++ /dev/null @@ -1,205 +0,0 @@ -.late_rodata -glabel D_808C0A68 - .word 0x462AA800 -glabel D_808C0A6C - .word 0x3C088889 -glabel D_808C0A70 - .float 0.7 - -.text -glabel func_808BF97C -/* 0056C 808BF97C 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 -/* 00570 808BF980 AFBF009C */ sw $ra, 0x009C($sp) -/* 00574 808BF984 AFBE0098 */ sw $s8, 0x0098($sp) -/* 00578 808BF988 AFB70094 */ sw $s7, 0x0094($sp) -/* 0057C 808BF98C AFB60090 */ sw $s6, 0x0090($sp) -/* 00580 808BF990 AFB5008C */ sw $s5, 0x008C($sp) -/* 00584 808BF994 AFB40088 */ sw $s4, 0x0088($sp) -/* 00588 808BF998 AFB30084 */ sw $s3, 0x0084($sp) -/* 0058C 808BF99C AFB20080 */ sw $s2, 0x0080($sp) -/* 00590 808BF9A0 AFB1007C */ sw $s1, 0x007C($sp) -/* 00594 808BF9A4 AFB00078 */ sw $s0, 0x0078($sp) -/* 00598 808BF9A8 F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 0059C 808BF9AC F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 005A0 808BF9B0 F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 005A4 808BF9B4 F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 005A8 808BF9B8 F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 005AC 808BF9BC F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 005B0 808BF9C0 AFA500DC */ sw $a1, 0x00DC($sp) -/* 005B4 808BF9C4 8482016A */ lh $v0, 0x016A($a0) ## 0000016A -/* 005B8 808BF9C8 0080A825 */ or $s5, $a0, $zero ## $s5 = 00000000 -/* 005BC 808BF9CC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 005C0 808BF9D0 10400003 */ beq $v0, $zero, .L808BF9E0 -/* 005C4 808BF9D4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 005C8 808BF9D8 A48E016A */ sh $t6, 0x016A($a0) ## 0000016A -/* 005CC 808BF9DC 8482016A */ lh $v0, 0x016A($a0) ## 0000016A -.L808BF9E0: -/* 005D0 808BF9E0 14400005 */ bne $v0, $zero, .L808BF9F8 -/* 005D4 808BF9E4 00000000 */ nop -/* 005D8 808BF9E8 0C00B55C */ jal Actor_Kill - -/* 005DC 808BF9EC 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 005E0 808BF9F0 10000086 */ beq $zero, $zero, .L808BFC0C -/* 005E4 808BF9F4 8FBF009C */ lw $ra, 0x009C($sp) -.L808BF9F8: -/* 005E8 808BF9F8 0041001A */ div $zero, $v0, $at -/* 005EC 808BF9FC 00007810 */ mfhi $t7 -/* 005F0 808BFA00 55E00082 */ bnel $t7, $zero, .L808BFC0C -/* 005F4 808BFA04 8FBF009C */ lw $ra, 0x009C($sp) -/* 005F8 808BFA08 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 005FC 808BFA0C 00000000 */ nop -/* 00600 808BFA10 3C01808C */ lui $at, %hi(D_808C0A68) ## $at = 808C0000 -/* 00604 808BFA14 C4240A68 */ lwc1 $f4, %lo(D_808C0A68)($at) -/* 00608 808BFA18 4480F000 */ mtc1 $zero, $f30 ## $f30 = 0.00 -/* 0060C 808BFA1C 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 00610 808BFA20 46040182 */ mul.s $f6, $f0, $f4 -/* 00614 808BFA24 4481E000 */ mtc1 $at, $f28 ## $f28 = 7.00 -/* 00618 808BFA28 3C01808C */ lui $at, %hi(D_808C0A6C) ## $at = 808C0000 -/* 0061C 808BFA2C E7BE00D0 */ swc1 $f30, 0x00D0($sp) -/* 00620 808BFA30 C6AA0028 */ lwc1 $f10, 0x0028($s5) ## 00000028 -/* 00624 808BFA34 C43A0A6C */ lwc1 $f26, %lo(D_808C0A6C)($at) -/* 00628 808BFA38 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 0062C 808BFA3C 4600320D */ trunc.w.s $f8, $f6 -/* 00630 808BFA40 4481C000 */ mtc1 $at, $f24 ## $f24 = 120.00 -/* 00634 808BFA44 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 00638 808BFA48 26B40008 */ addiu $s4, $s5, 0x0008 ## $s4 = 00000008 -/* 0063C 808BFA4C 44124000 */ mfc1 $s2, $f8 -/* 00640 808BFA50 27BE00CC */ addiu $s8, $sp, 0x00CC ## $s8 = FFFFFFF4 -/* 00644 808BFA54 34178000 */ ori $s7, $zero, 0x8000 ## $s7 = 00008000 -/* 00648 808BFA58 00129400 */ sll $s2, $s2, 16 -/* 0064C 808BFA5C 00129403 */ sra $s2, $s2, 16 -/* 00650 808BFA60 27B600C0 */ addiu $s6, $sp, 0x00C0 ## $s6 = FFFFFFE8 -/* 00654 808BFA64 E7AA00C4 */ swc1 $f10, 0x00C4($sp) -.L808BFA68: -/* 00658 808BFA68 3C014620 */ lui $at, 0x4620 ## $at = 46200000 -/* 0065C 808BFA6C 44816000 */ mtc1 $at, $f12 ## $f12 = 10240.00 -/* 00660 808BFA70 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00664 808BFA74 00000000 */ nop -/* 00668 808BFA78 44928000 */ mtc1 $s2, $f16 ## $f16 = 0.00 -/* 0066C 808BFA7C 00000000 */ nop -/* 00670 808BFA80 468084A0 */ cvt.s.w $f18, $f16 -/* 00674 808BFA84 46120100 */ add.s $f4, $f0, $f18 -/* 00678 808BFA88 4600218D */ trunc.w.s $f6, $f4 -/* 0067C 808BFA8C 44023000 */ mfc1 $v0, $f6 -/* 00680 808BFA90 00000000 */ nop -/* 00684 808BFA94 00028400 */ sll $s0, $v0, 16 -/* 00688 808BFA98 00022400 */ sll $a0, $v0, 16 -/* 0068C 808BFA9C 00108403 */ sra $s0, $s0, 16 -/* 00690 808BFAA0 0C01DE1C */ jal Math_SinS - ## sins? -/* 00694 808BFAA4 00042403 */ sra $a0, $a0, 16 -/* 00698 808BFAA8 00102400 */ sll $a0, $s0, 16 -/* 0069C 808BFAAC 46000506 */ mov.s $f20, $f0 -/* 006A0 808BFAB0 0C01DE0D */ jal Math_CosS - ## coss? -/* 006A4 808BFAB4 00042403 */ sra $a0, $a0, 16 -/* 006A8 808BFAB8 4614C282 */ mul.s $f10, $f24, $f20 -/* 006AC 808BFABC C6A80024 */ lwc1 $f8, 0x0024($s5) ## 00000024 -/* 006B0 808BFAC0 46000586 */ mov.s $f22, $f0 -/* 006B4 808BFAC4 4600C102 */ mul.s $f4, $f24, $f0 -/* 006B8 808BFAC8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000008 -/* 006BC 808BFACC 02C02825 */ or $a1, $s6, $zero ## $a1 = FFFFFFE8 -/* 006C0 808BFAD0 460A4400 */ add.s $f16, $f8, $f10 -/* 006C4 808BFAD4 E7B000C0 */ swc1 $f16, 0x00C0($sp) -/* 006C8 808BFAD8 C6B2002C */ lwc1 $f18, 0x002C($s5) ## 0000002C -/* 006CC 808BFADC 46049180 */ add.s $f6, $f18, $f4 -/* 006D0 808BFAE0 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 006D4 808BFAE4 E7A600C8 */ swc1 $f6, 0x00C8($sp) -/* 006D8 808BFAE8 461A0302 */ mul.s $f12, $f0, $f26 -/* 006DC 808BFAEC 3C01808C */ lui $at, %hi(D_808C0A70) ## $at = 808C0000 -/* 006E0 808BFAF0 C4280A70 */ lwc1 $f8, %lo(D_808C0A70)($at) -/* 006E4 808BFAF4 02178821 */ addu $s1, $s0, $s7 -/* 006E8 808BFAF8 00118C00 */ sll $s1, $s1, 16 -/* 006EC 808BFAFC 00118C03 */ sra $s1, $s1, 16 -/* 006F0 808BFB00 00112400 */ sll $a0, $s1, 16 -/* 006F4 808BFB04 4608603C */ c.lt.s $f12, $f8 -/* 006F8 808BFB08 00000000 */ nop -/* 006FC 808BFB0C 45000015 */ bc1f .L808BFB64 -/* 00700 808BFB10 00000000 */ nop -/* 00704 808BFB14 0C01DE1C */ jal Math_SinS - ## sins? -/* 00708 808BFB18 00042403 */ sra $a0, $a0, 16 -/* 0070C 808BFB1C 00112400 */ sll $a0, $s1, 16 -/* 00710 808BFB20 46000506 */ mov.s $f20, $f0 -/* 00714 808BFB24 0C01DE0D */ jal Math_CosS - ## coss? -/* 00718 808BFB28 00042403 */ sra $a0, $a0, 16 -/* 0071C 808BFB2C 4614C402 */ mul.s $f16, $f24, $f20 -/* 00720 808BFB30 C6AA0024 */ lwc1 $f10, 0x0024($s5) ## 00000024 -/* 00724 808BFB34 46000586 */ mov.s $f22, $f0 -/* 00728 808BFB38 4600C182 */ mul.s $f6, $f24, $f0 -/* 0072C 808BFB3C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000008 -/* 00730 808BFB40 02C02825 */ or $a1, $s6, $zero ## $a1 = FFFFFFE8 -/* 00734 808BFB44 46105480 */ add.s $f18, $f10, $f16 -/* 00738 808BFB48 E7B200C0 */ swc1 $f18, 0x00C0($sp) -/* 0073C 808BFB4C C6A4002C */ lwc1 $f4, 0x002C($s5) ## 0000002C -/* 00740 808BFB50 46062200 */ add.s $f8, $f4, $f6 -/* 00744 808BFB54 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 00748 808BFB58 E7A800C8 */ swc1 $f8, 0x00C8($sp) -/* 0074C 808BFB5C 461A0302 */ mul.s $f12, $f0, $f26 -/* 00750 808BFB60 00000000 */ nop -.L808BFB64: -/* 00754 808BFB64 4614E282 */ mul.s $f10, $f28, $f20 -/* 00758 808BFB68 3C07808C */ lui $a3, %hi(D_808C09BC) ## $a3 = 808C0000 -/* 0075C 808BFB6C 2408003C */ addiu $t0, $zero, 0x003C ## $t0 = 0000003C -/* 00760 808BFB70 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 00764 808BFB74 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00768 808BFB78 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 0076C 808BFB7C 240C0096 */ addiu $t4, $zero, 0x0096 ## $t4 = 00000096 -/* 00770 808BFB80 460C5402 */ mul.s $f16, $f10, $f12 -/* 00774 808BFB84 240D00AA */ addiu $t5, $zero, 0x00AA ## $t5 = 000000AA -/* 00778 808BFB88 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 0077C 808BFB8C 4616E482 */ mul.s $f18, $f28, $f22 -/* 00780 808BFB90 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00784 808BFB94 2418000E */ addiu $t8, $zero, 0x000E ## $t8 = 0000000E -/* 00788 808BFB98 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0078C 808BFB9C E7B000CC */ swc1 $f16, 0x00CC($sp) -/* 00790 808BFBA0 E7BE00D0 */ swc1 $f30, 0x00D0($sp) -/* 00794 808BFBA4 AFB9003C */ sw $t9, 0x003C($sp) -/* 00798 808BFBA8 460C9102 */ mul.s $f4, $f18, $f12 -/* 0079C 808BFBAC AFB80038 */ sw $t8, 0x0038($sp) -/* 007A0 808BFBB0 AFAF0034 */ sw $t7, 0x0034($sp) -/* 007A4 808BFBB4 AFAE0028 */ sw $t6, 0x0028($sp) -/* 007A8 808BFBB8 AFAD0024 */ sw $t5, 0x0024($sp) -/* 007AC 808BFBBC AFAC0020 */ sw $t4, 0x0020($sp) -/* 007B0 808BFBC0 AFAB001C */ sw $t3, 0x001C($sp) -/* 007B4 808BFBC4 E7A400D4 */ swc1 $f4, 0x00D4($sp) -/* 007B8 808BFBC8 AFAA0018 */ sw $t2, 0x0018($sp) -/* 007BC 808BFBCC AFA90014 */ sw $t1, 0x0014($sp) -/* 007C0 808BFBD0 AFA80010 */ sw $t0, 0x0010($sp) -/* 007C4 808BFBD4 24E709BC */ addiu $a3, $a3, %lo(D_808C09BC) ## $a3 = 808C09BC -/* 007C8 808BFBD8 8FA400DC */ lw $a0, 0x00DC($sp) -/* 007CC 808BFBDC 02802825 */ or $a1, $s4, $zero ## $a1 = 00000008 -/* 007D0 808BFBE0 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFF4 -/* 007D4 808BFBE4 AFA0002C */ sw $zero, 0x002C($sp) -/* 007D8 808BFBE8 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 007DC 808BFBEC AFA00030 */ sw $zero, 0x0030($sp) -/* 007E0 808BFBF0 26522AAA */ addiu $s2, $s2, 0x2AAA ## $s2 = 00002AAA -/* 007E4 808BFBF4 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 007E8 808BFBF8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 007EC 808BFBFC 00129400 */ sll $s2, $s2, 16 -/* 007F0 808BFC00 1661FF99 */ bne $s3, $at, .L808BFA68 -/* 007F4 808BFC04 00129403 */ sra $s2, $s2, 16 -/* 007F8 808BFC08 8FBF009C */ lw $ra, 0x009C($sp) -.L808BFC0C: -/* 007FC 808BFC0C D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 00800 808BFC10 D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 00804 808BFC14 D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 00808 808BFC18 D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 0080C 808BFC1C D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 00810 808BFC20 D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 00814 808BFC24 8FB00078 */ lw $s0, 0x0078($sp) -/* 00818 808BFC28 8FB1007C */ lw $s1, 0x007C($sp) -/* 0081C 808BFC2C 8FB20080 */ lw $s2, 0x0080($sp) -/* 00820 808BFC30 8FB30084 */ lw $s3, 0x0084($sp) -/* 00824 808BFC34 8FB40088 */ lw $s4, 0x0088($sp) -/* 00828 808BFC38 8FB5008C */ lw $s5, 0x008C($sp) -/* 0082C 808BFC3C 8FB60090 */ lw $s6, 0x0090($sp) -/* 00830 808BFC40 8FB70094 */ lw $s7, 0x0094($sp) -/* 00834 808BFC44 8FBE0098 */ lw $s8, 0x0098($sp) -/* 00838 808BFC48 03E00008 */ jr $ra -/* 0083C 808BFC4C 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC50.s deleted file mode 100644 index bf3cb86dd5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC50.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_808BFC50 -/* 00840 808BFC50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00844 808BFC54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00848 808BFC58 AFA5001C */ sw $a1, 0x001C($sp) -/* 0084C 808BFC5C 8482016A */ lh $v0, 0x016A($a0) ## 0000016A -/* 00850 808BFC60 10400003 */ beq $v0, $zero, .L808BFC70 -/* 00854 808BFC64 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00858 808BFC68 A48E016A */ sh $t6, 0x016A($a0) ## 0000016A -/* 0085C 808BFC6C 8482016A */ lh $v0, 0x016A($a0) ## 0000016A -.L808BFC70: -/* 00860 808BFC70 54400004 */ bnel $v0, $zero, .L808BFC84 -/* 00864 808BFC74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00868 808BFC78 0C00B55C */ jal Actor_Kill - -/* 0086C 808BFC7C 00000000 */ nop -/* 00870 808BFC80 8FBF0014 */ lw $ra, 0x0014($sp) -.L808BFC84: -/* 00874 808BFC84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00878 808BFC88 03E00008 */ jr $ra -/* 0087C 808BFC8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC90.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC90.s deleted file mode 100644 index 3cd2869bf7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC90.s +++ /dev/null @@ -1,125 +0,0 @@ -.late_rodata -glabel D_808C0A74 - .word 0x3E20D97C - -.text -glabel func_808BFC90 -/* 00880 808BFC90 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00884 808BFC94 AFBF0054 */ sw $ra, 0x0054($sp) -/* 00888 808BFC98 AFBE0050 */ sw $s8, 0x0050($sp) -/* 0088C 808BFC9C AFB7004C */ sw $s7, 0x004C($sp) -/* 00890 808BFCA0 AFB60048 */ sw $s6, 0x0048($sp) -/* 00894 808BFCA4 AFB50044 */ sw $s5, 0x0044($sp) -/* 00898 808BFCA8 AFB40040 */ sw $s4, 0x0040($sp) -/* 0089C 808BFCAC AFB3003C */ sw $s3, 0x003C($sp) -/* 008A0 808BFCB0 AFB20038 */ sw $s2, 0x0038($sp) -/* 008A4 808BFCB4 AFB10034 */ sw $s1, 0x0034($sp) -/* 008A8 808BFCB8 AFB00030 */ sw $s0, 0x0030($sp) -/* 008AC 808BFCBC F7B40028 */ sdc1 $f20, 0x0028($sp) -/* 008B0 808BFCC0 8482016A */ lh $v0, 0x016A($a0) ## 0000016A -/* 008B4 808BFCC4 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 008B8 808BFCC8 00A0F025 */ or $s8, $a1, $zero ## $s8 = 00000000 -/* 008BC 808BFCCC 10400003 */ beq $v0, $zero, .L808BFCDC -/* 008C0 808BFCD0 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 008C4 808BFCD4 A48E016A */ sh $t6, 0x016A($a0) ## 0000016A -/* 008C8 808BFCD8 8482016A */ lh $v0, 0x016A($a0) ## 0000016A -.L808BFCDC: -/* 008CC 808BFCDC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 008D0 808BFCE0 3C01808C */ lui $at, %hi(D_808C0A74) ## $at = 808C0000 -/* 008D4 808BFCE4 C4280A74 */ lwc1 $f8, %lo(D_808C0A74)($at) -/* 008D8 808BFCE8 468021A0 */ cvt.s.w $f6, $f4 -/* 008DC 808BFCEC 46083302 */ mul.s $f12, $f6, $f8 -/* 008E0 808BFCF0 0C0400A4 */ jal sinf - -/* 008E4 808BFCF4 00000000 */ nop -/* 008E8 808BFCF8 C66A016C */ lwc1 $f10, 0x016C($s3) ## 0000016C -/* 008EC 808BFCFC C662000C */ lwc1 $f2, 0x000C($s3) ## 0000000C -/* 008F0 808BFD00 3C01433E */ lui $at, 0x433E ## $at = 433E0000 -/* 008F4 808BFD04 460A0402 */ mul.s $f16, $f0, $f10 -/* 008F8 808BFD08 44819000 */ mtc1 $at, $f18 ## $f18 = 190.00 -/* 008FC 808BFD0C 03C02025 */ or $a0, $s8, $zero ## $a0 = 00000000 -/* 00900 808BFD10 27C50810 */ addiu $a1, $s8, 0x0810 ## $a1 = 00000810 -/* 00904 808BFD14 46028300 */ add.s $f12, $f16, $f2 -/* 00908 808BFD18 460C1101 */ sub.s $f4, $f2, $f12 -/* 0090C 808BFD1C E66C0028 */ swc1 $f12, 0x0028($s3) ## 00000028 -/* 00910 808BFD20 4604903C */ c.lt.s $f18, $f4 -/* 00914 808BFD24 00000000 */ nop -/* 00918 808BFD28 4500003A */ bc1f .L808BFE14 -/* 0091C 808BFD2C 00000000 */ nop -/* 00920 808BFD30 0C00FAFE */ jal func_8003EBF8 -/* 00924 808BFD34 8E66014C */ lw $a2, 0x014C($s3) ## 0000014C -/* 00928 808BFD38 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 0092C 808BFD3C A66F016A */ sh $t7, 0x016A($s3) ## 0000016A -/* 00930 808BFD40 0C01E221 */ jal func_80078884 -/* 00934 808BFD44 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 00938 808BFD48 03C02025 */ or $a0, $s8, $zero ## $a0 = 00000000 -/* 0093C 808BFD4C 0C00B2DD */ jal Flags_SetSwitch - -/* 00940 808BFD50 92650168 */ lbu $a1, 0x0168($s3) ## 00000168 -/* 00944 808BFD54 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00948 808BFD58 4481A000 */ mtc1 $at, $f20 ## $f20 = 60.00 -/* 0094C 808BFD5C C6660028 */ lwc1 $f6, 0x0028($s3) ## 00000028 -/* 00950 808BFD60 3C18808C */ lui $t8, %hi(func_808BFC50) ## $t8 = 808C0000 -/* 00954 808BFD64 2718FC50 */ addiu $t8, $t8, %lo(func_808BFC50) ## $t8 = 808BFC50 -/* 00958 808BFD68 46143201 */ sub.s $f8, $f6, $f20 -/* 0095C 808BFD6C AE780164 */ sw $t8, 0x0164($s3) ## 00000164 -/* 00960 808BFD70 3C16808C */ lui $s6, %hi(D_808C09CC) ## $s6 = 808C0000 -/* 00964 808BFD74 3C15808C */ lui $s5, %hi(D_808C09C8) ## $s5 = 808C0000 -/* 00968 808BFD78 3C12808C */ lui $s2, %hi(D_808C09D0) ## $s2 = 808C0000 -/* 0096C 808BFD7C E7A8006C */ swc1 $f8, 0x006C($sp) -/* 00970 808BFD80 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 00974 808BFD84 265209D0 */ addiu $s2, $s2, %lo(D_808C09D0) ## $s2 = 808C09D0 -/* 00978 808BFD88 26B509C8 */ addiu $s5, $s5, %lo(D_808C09C8) ## $s5 = 808C09C8 -/* 0097C 808BFD8C 26D609CC */ addiu $s6, $s6, %lo(D_808C09CC) ## $s6 = 808C09CC -/* 00980 808BFD90 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00984 808BFD94 24170006 */ addiu $s7, $zero, 0x0006 ## $s7 = 00000006 -/* 00988 808BFD98 27B40068 */ addiu $s4, $sp, 0x0068 ## $s4 = FFFFFFF0 -.L808BFD9C: -/* 0098C 808BFD9C 00102400 */ sll $a0, $s0, 16 -/* 00990 808BFDA0 0C01DE1C */ jal Math_SinS - ## sins? -/* 00994 808BFDA4 00042403 */ sra $a0, $a0, 16 -/* 00998 808BFDA8 46140282 */ mul.s $f10, $f0, $f20 -/* 0099C 808BFDAC C6700024 */ lwc1 $f16, 0x0024($s3) ## 00000024 -/* 009A0 808BFDB0 00102400 */ sll $a0, $s0, 16 -/* 009A4 808BFDB4 00042403 */ sra $a0, $a0, 16 -/* 009A8 808BFDB8 46105480 */ add.s $f18, $f10, $f16 -/* 009AC 808BFDBC 0C01DE0D */ jal Math_CosS - ## coss? -/* 009B0 808BFDC0 E7B20068 */ swc1 $f18, 0x0068($sp) -/* 009B4 808BFDC4 46140102 */ mul.s $f4, $f0, $f20 -/* 009B8 808BFDC8 C666002C */ lwc1 $f6, 0x002C($s3) ## 0000002C -/* 009BC 808BFDCC 241903E8 */ addiu $t9, $zero, 0x03E8 ## $t9 = 000003E8 -/* 009C0 808BFDD0 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 009C4 808BFDD4 AFA8001C */ sw $t0, 0x001C($sp) -/* 009C8 808BFDD8 AFB90018 */ sw $t9, 0x0018($sp) -/* 009CC 808BFDDC AFB60014 */ sw $s6, 0x0014($sp) -/* 009D0 808BFDE0 46062200 */ add.s $f8, $f4, $f6 -/* 009D4 808BFDE4 AFB50010 */ sw $s5, 0x0010($sp) -/* 009D8 808BFDE8 03C02025 */ or $a0, $s8, $zero ## $a0 = 00000000 -/* 009DC 808BFDEC 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFF0 -/* 009E0 808BFDF0 E7A80070 */ swc1 $f8, 0x0070($sp) -/* 009E4 808BFDF4 02403025 */ or $a2, $s2, $zero ## $a2 = 808C09D0 -/* 009E8 808BFDF8 0C00A0A7 */ jal func_8002829C -/* 009EC 808BFDFC 02403825 */ or $a3, $s2, $zero ## $a3 = 808C09D0 -/* 009F0 808BFE00 26102AAA */ addiu $s0, $s0, 0x2AAA ## $s0 = 00002AAA -/* 009F4 808BFE04 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 009F8 808BFE08 00108400 */ sll $s0, $s0, 16 -/* 009FC 808BFE0C 1637FFE3 */ bne $s1, $s7, .L808BFD9C -/* 00A00 808BFE10 00108403 */ sra $s0, $s0, 16 -.L808BFE14: -/* 00A04 808BFE14 0C22FE0F */ jal func_808BF83C -/* 00A08 808BFE18 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00A0C 808BFE1C 8FBF0054 */ lw $ra, 0x0054($sp) -/* 00A10 808BFE20 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 00A14 808BFE24 8FB00030 */ lw $s0, 0x0030($sp) -/* 00A18 808BFE28 8FB10034 */ lw $s1, 0x0034($sp) -/* 00A1C 808BFE2C 8FB20038 */ lw $s2, 0x0038($sp) -/* 00A20 808BFE30 8FB3003C */ lw $s3, 0x003C($sp) -/* 00A24 808BFE34 8FB40040 */ lw $s4, 0x0040($sp) -/* 00A28 808BFE38 8FB50044 */ lw $s5, 0x0044($sp) -/* 00A2C 808BFE3C 8FB60048 */ lw $s6, 0x0048($sp) -/* 00A30 808BFE40 8FB7004C */ lw $s7, 0x004C($sp) -/* 00A34 808BFE44 8FBE0050 */ lw $s8, 0x0050($sp) -/* 00A38 808BFE48 03E00008 */ jr $ra -/* 00A3C 808BFE4C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 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 deleted file mode 100644 index fa75bc5494..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s +++ /dev/null @@ -1,213 +0,0 @@ -.late_rodata -glabel D_808C0A78 - .word 0x443B8000 -glabel D_808C0A7C - .float 0.1 - -glabel D_808C0A80 - .word 0x3EE5C8FA - -.text -glabel func_808BFE50 -/* 00A40 808BFE50 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00A44 808BFE54 AFBF001C */ sw $ra, 0x001C($sp) -/* 00A48 808BFE58 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A4C 808BFE5C AFA50044 */ sw $a1, 0x0044($sp) -/* 00A50 808BFE60 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 00A54 808BFE64 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00A58 808BFE68 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00A5C 808BFE6C E7A40030 */ swc1 $f4, 0x0030($sp) -/* 00A60 808BFE70 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 -/* 00A64 808BFE74 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 00A68 808BFE78 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A6C 808BFE7C 44070000 */ mfc1 $a3, $f0 -/* 00A70 808BFE80 46003201 */ sub.s $f8, $f6, $f0 -/* 00A74 808BFE84 3C06428C */ lui $a2, 0x428C ## $a2 = 428C0000 -/* 00A78 808BFE88 E7A80034 */ swc1 $f8, 0x0034($sp) -/* 00A7C 808BFE8C C48A002C */ lwc1 $f10, 0x002C($a0) ## 0000002C -/* 00A80 808BFE90 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00A84 808BFE94 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF0 -/* 00A88 808BFE98 AFA3003C */ sw $v1, 0x003C($sp) -/* 00A8C 808BFE9C 0C023BD7 */ jal Player_IsBurningStickInRange -/* 00A90 808BFEA0 E7AA0038 */ swc1 $f10, 0x0038($sp) -/* 00A94 808BFEA4 1040000A */ beq $v0, $zero, .L808BFED0 -/* 00A98 808BFEA8 8FA3003C */ lw $v1, 0x003C($sp) -/* 00A9C 808BFEAC C47008B8 */ lwc1 $f16, 0x08B8($v1) ## 000008B8 -/* 00AA0 808BFEB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AA4 808BFEB4 E6100008 */ swc1 $f16, 0x0008($s0) ## 00000008 -/* 00AA8 808BFEB8 C47208C0 */ lwc1 $f18, 0x08C0($v1) ## 000008C0 -/* 00AAC 808BFEBC E6120010 */ swc1 $f18, 0x0010($s0) ## 00000010 -/* 00AB0 808BFEC0 0C22FE43 */ jal func_808BF90C -/* 00AB4 808BFEC4 8FA50044 */ lw $a1, 0x0044($sp) -/* 00AB8 808BFEC8 10000094 */ beq $zero, $zero, .L808C011C -/* 00ABC 808BFECC 8FBF001C */ lw $ra, 0x001C($sp) -.L808BFED0: -/* 00AC0 808BFED0 920F0181 */ lbu $t7, 0x0181($s0) ## 00000181 -/* 00AC4 808BFED4 8FA50044 */ lw $a1, 0x0044($sp) -/* 00AC8 808BFED8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ACC 808BFEDC 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 00AD0 808BFEE0 13000005 */ beq $t8, $zero, .L808BFEF8 -/* 00AD4 808BFEE4 00000000 */ nop -/* 00AD8 808BFEE8 0C22FE43 */ jal func_808BF90C -/* 00ADC 808BFEEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AE0 808BFEF0 1000008A */ beq $zero, $zero, .L808C011C -/* 00AE4 808BFEF4 8FBF001C */ lw $ra, 0x001C($sp) -.L808BFEF8: -/* 00AE8 808BFEF8 0C010D5B */ jal func_8004356C -/* 00AEC 808BFEFC AFA3003C */ sw $v1, 0x003C($sp) -/* 00AF0 808BFF00 10400051 */ beq $v0, $zero, .L808C0048 -/* 00AF4 808BFF04 8FA3003C */ lw $v1, 0x003C($sp) -/* 00AF8 808BFF08 84790896 */ lh $t9, 0x0896($v1) ## 00000896 -/* 00AFC 808BFF0C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 00B00 808BFF10 3C01808C */ lui $at, %hi(D_808C0A78) ## $at = 808C0000 -/* 00B04 808BFF14 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 00B08 808BFF18 00000000 */ nop -/* 00B0C 808BFF1C 468020A0 */ cvt.s.w $f2, $f4 -/* 00B10 808BFF20 460E103C */ c.lt.s $f2, $f14 -/* 00B14 808BFF24 00000000 */ nop -/* 00B18 808BFF28 45020004 */ bc1fl .L808BFF3C -/* 00B1C 808BFF2C 46001306 */ mov.s $f12, $f2 -/* 00B20 808BFF30 10000002 */ beq $zero, $zero, .L808BFF3C -/* 00B24 808BFF34 46007306 */ mov.s $f12, $f14 -/* 00B28 808BFF38 46001306 */ mov.s $f12, $f2 -.L808BFF3C: -/* 00B2C 808BFF3C C4260A78 */ lwc1 $f6, %lo(D_808C0A78)($at) -/* 00B30 808BFF40 46006004 */ sqrt.s $f0, $f12 -/* 00B34 808BFF44 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00B38 808BFF48 4602303C */ c.lt.s $f6, $f2 -/* 00B3C 808BFF4C 00000000 */ nop -/* 00B40 808BFF50 45020018 */ bc1fl .L808BFFB4 -/* 00B44 808BFF54 46000080 */ add.s $f2, $f0, $f0 -/* 00B48 808BFF58 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 00B4C 808BFF5C 44815000 */ mtc1 $at, $f10 ## $f10 = 80.00 -/* 00B50 808BFF60 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00B54 808BFF64 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 00B58 808BFF68 460A403C */ c.lt.s $f8, $f10 -/* 00B5C 808BFF6C 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 -/* 00B60 808BFF70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B64 808BFF74 24052862 */ addiu $a1, $zero, 0x2862 ## $a1 = 00002862 -/* 00B68 808BFF78 4502000E */ bc1fl .L808BFFB4 -/* 00B6C 808BFF7C 46000080 */ add.s $f2, $f0, $f0 -/* 00B70 808BFF80 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 00B74 808BFF84 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 -/* 00B78 808BFF88 A2080003 */ sb $t0, 0x0003($s0) ## 00000003 -/* 00B7C 808BFF8C 352A0010 */ ori $t2, $t1, 0x0010 ## $t2 = 00000010 -/* 00B80 808BFF90 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 00B84 808BFF94 A60B016A */ sh $t3, 0x016A($s0) ## 0000016A -/* 00B88 808BFF98 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00B8C 808BFF9C E610016C */ swc1 $f16, 0x016C($s0) ## 0000016C -/* 00B90 808BFFA0 3C0C808C */ lui $t4, %hi(func_808BFC90) ## $t4 = 808C0000 -/* 00B94 808BFFA4 258CFC90 */ addiu $t4, $t4, %lo(func_808BFC90) ## $t4 = 808BFC90 -/* 00B98 808BFFA8 1000005B */ beq $zero, $zero, .L808C0118 -/* 00B9C 808BFFAC AE0C0164 */ sw $t4, 0x0164($s0) ## 00000164 -/* 00BA0 808BFFB0 46000080 */ add.s $f2, $f0, $f0 -.L808BFFB4: -/* 00BA4 808BFFB4 C612016C */ lwc1 $f18, 0x016C($s0) ## 0000016C -/* 00BA8 808BFFB8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00BAC 808BFFBC 4602903C */ c.lt.s $f18, $f2 -/* 00BB0 808BFFC0 00000000 */ nop -/* 00BB4 808BFFC4 4502000A */ bc1fl .L808BFFF0 -/* 00BB8 808BFFC8 C4640068 */ lwc1 $f4, 0x0068($v1) ## 00000068 -/* 00BBC 808BFFCC 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 00BC0 808BFFD0 240D000E */ addiu $t5, $zero, 0x000E ## $t5 = 0000000E -/* 00BC4 808BFFD4 4602603C */ c.lt.s $f12, $f2 -/* 00BC8 808BFFD8 00000000 */ nop -/* 00BCC 808BFFDC 45020004 */ bc1fl .L808BFFF0 -/* 00BD0 808BFFE0 C4640068 */ lwc1 $f4, 0x0068($v1) ## 00000068 -/* 00BD4 808BFFE4 E602016C */ swc1 $f2, 0x016C($s0) ## 0000016C -/* 00BD8 808BFFE8 A60D016A */ sh $t5, 0x016A($s0) ## 0000016A -/* 00BDC 808BFFEC C4640068 */ lwc1 $f4, 0x0068($v1) ## 00000068 -.L808BFFF0: -/* 00BE0 808BFFF0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00BE4 808BFFF4 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 00BE8 808BFFF8 46047032 */ c.eq.s $f14, $f4 -/* 00BEC 808BFFFC 3C01808C */ lui $at, %hi(D_808C0A7C) ## $at = 808C0000 -/* 00BF0 808C0000 45030012 */ bc1tl .L808C004C -/* 00BF4 808C0004 8602016A */ lh $v0, 0x016A($s0) ## 0000016A -/* 00BF8 808C0008 C600016C */ lwc1 $f0, 0x016C($s0) ## 0000016C -/* 00BFC 808C000C C4260A7C */ lwc1 $f6, %lo(D_808C0A7C)($at) -/* 00C00 808C0010 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 00C04 808C0014 4606003C */ c.lt.s $f0, $f6 -/* 00C08 808C0018 00000000 */ nop -/* 00C0C 808C001C 45020004 */ bc1fl .L808C0030 -/* 00C10 808C0020 460C003C */ c.lt.s $f0, $f12 -/* 00C14 808C0024 A60E016A */ sh $t6, 0x016A($s0) ## 0000016A -/* 00C18 808C0028 C600016C */ lwc1 $f0, 0x016C($s0) ## 0000016C -/* 00C1C 808C002C 460C003C */ c.lt.s $f0, $f12 -.L808C0030: -/* 00C20 808C0030 00000000 */ nop -/* 00C24 808C0034 45020004 */ bc1fl .L808C0048 -/* 00C28 808C0038 E600016C */ swc1 $f0, 0x016C($s0) ## 0000016C -/* 00C2C 808C003C 10000002 */ beq $zero, $zero, .L808C0048 -/* 00C30 808C0040 E60C016C */ swc1 $f12, 0x016C($s0) ## 0000016C -/* 00C34 808C0044 E600016C */ swc1 $f0, 0x016C($s0) ## 0000016C -.L808C0048: -/* 00C38 808C0048 8602016A */ lh $v0, 0x016A($s0) ## 0000016A -.L808C004C: -/* 00C3C 808C004C 2418000E */ addiu $t8, $zero, 0x000E ## $t8 = 0000000E -/* 00C40 808C0050 10400003 */ beq $v0, $zero, .L808C0060 -/* 00C44 808C0054 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 00C48 808C0058 A60F016A */ sh $t7, 0x016A($s0) ## 0000016A -/* 00C4C 808C005C 8602016A */ lh $v0, 0x016A($s0) ## 0000016A -.L808C0060: -/* 00C50 808C0060 54400004 */ bnel $v0, $zero, .L808C0074 -/* 00C54 808C0064 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 00C58 808C0068 A618016A */ sh $t8, 0x016A($s0) ## 0000016A -/* 00C5C 808C006C 8602016A */ lh $v0, 0x016A($s0) ## 0000016A -/* 00C60 808C0070 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -.L808C0074: -/* 00C64 808C0074 3C01808C */ lui $at, %hi(D_808C0A80) ## $at = 808C0000 -/* 00C68 808C0078 C4300A80 */ lwc1 $f16, %lo(D_808C0A80)($at) -/* 00C6C 808C007C 468042A0 */ cvt.s.w $f10, $f8 -/* 00C70 808C0080 46105302 */ mul.s $f12, $f10, $f16 -/* 00C74 808C0084 0C0400A4 */ jal sinf - -/* 00C78 808C0088 00000000 */ nop -/* 00C7C 808C008C C612016C */ lwc1 $f18, 0x016C($s0) ## 0000016C -/* 00C80 808C0090 C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C -/* 00C84 808C0094 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 -/* 00C88 808C0098 46120102 */ mul.s $f4, $f0, $f18 -/* 00C8C 808C009C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD -/* 00C90 808C00A0 2604016C */ addiu $a0, $s0, 0x016C ## $a0 = 0000016C -/* 00C94 808C00A4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00C98 808C00A8 46062200 */ add.s $f8, $f4, $f6 -/* 00C9C 808C00AC 0C01E123 */ jal Math_ApproachZeroF - -/* 00CA0 808C00B0 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 00CA4 808C00B4 8619016A */ lh $t9, 0x016A($s0) ## 0000016A -/* 00CA8 808C00B8 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00CAC 808C00BC 1721000E */ bne $t9, $at, .L808C00F8 -/* 00CB0 808C00C0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00CB4 808C00C4 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -/* 00CB8 808C00C8 C610016C */ lwc1 $f16, 0x016C($s0) ## 0000016C -/* 00CBC 808C00CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CC0 808C00D0 4610503C */ c.lt.s $f10, $f16 -/* 00CC4 808C00D4 00000000 */ nop -/* 00CC8 808C00D8 45000005 */ bc1f .L808C00F0 -/* 00CCC 808C00DC 00000000 */ nop -/* 00CD0 808C00E0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00CD4 808C00E4 24052861 */ addiu $a1, $zero, 0x2861 ## $a1 = 00002861 -/* 00CD8 808C00E8 10000003 */ beq $zero, $zero, .L808C00F8 -/* 00CDC 808C00EC 00000000 */ nop -.L808C00F0: -/* 00CE0 808C00F0 0C03E341 */ jal func_800F8D04 -/* 00CE4 808C00F4 24042861 */ addiu $a0, $zero, 0x2861 ## $a0 = 00002861 -.L808C00F8: -/* 00CE8 808C00F8 0C22FE0F */ jal func_808BF83C -/* 00CEC 808C00FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CF0 808C0100 8FA40044 */ lw $a0, 0x0044($sp) -/* 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 CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00D04 808C0114 00812821 */ addu $a1, $a0, $at -.L808C0118: -/* 00D08 808C0118 8FBF001C */ lw $ra, 0x001C($sp) -.L808C011C: -/* 00D0C 808C011C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00D10 808C0120 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00D14 808C0124 03E00008 */ jr $ra -/* 00D18 808C0128 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s deleted file mode 100644 index adf2f15a66..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s +++ /dev/null @@ -1,234 +0,0 @@ -.late_rodata -glabel D_808C0A84 - .word 0x462AA800 -glabel D_808C0A88 - .word 0x3BEA0EA1 -glabel D_808C0A8C - .word 0x3F266666 - -.text -glabel func_808C012C -/* 00D1C 808C012C 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 -/* 00D20 808C0130 AFBF009C */ sw $ra, 0x009C($sp) -/* 00D24 808C0134 AFBE0098 */ sw $s8, 0x0098($sp) -/* 00D28 808C0138 AFB70094 */ sw $s7, 0x0094($sp) -/* 00D2C 808C013C AFB60090 */ sw $s6, 0x0090($sp) -/* 00D30 808C0140 AFB5008C */ sw $s5, 0x008C($sp) -/* 00D34 808C0144 AFB40088 */ sw $s4, 0x0088($sp) -/* 00D38 808C0148 AFB30084 */ sw $s3, 0x0084($sp) -/* 00D3C 808C014C AFB20080 */ sw $s2, 0x0080($sp) -/* 00D40 808C0150 AFB1007C */ sw $s1, 0x007C($sp) -/* 00D44 808C0154 AFB00078 */ sw $s0, 0x0078($sp) -/* 00D48 808C0158 F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 00D4C 808C015C F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 00D50 808C0160 F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 00D54 808C0164 F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 00D58 808C0168 F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 00D5C 808C016C F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 00D60 808C0170 AFA500E4 */ sw $a1, 0x00E4($sp) -/* 00D64 808C0174 8482016A */ lh $v0, 0x016A($a0) ## 0000016A -/* 00D68 808C0178 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D6C 808C017C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00D70 808C0180 10400003 */ beq $v0, $zero, .L808C0190 -/* 00D74 808C0184 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00D78 808C0188 A48E016A */ sh $t6, 0x016A($a0) ## 0000016A -/* 00D7C 808C018C 8482016A */ lh $v0, 0x016A($a0) ## 0000016A -.L808C0190: -/* 00D80 808C0190 14400005 */ bne $v0, $zero, .L808C01A8 -/* 00D84 808C0194 00000000 */ nop -/* 00D88 808C0198 0C00B55C */ jal Actor_Kill - -/* 00D8C 808C019C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D90 808C01A0 1000009F */ beq $zero, $zero, .L808C0420 -/* 00D94 808C01A4 8FBF009C */ lw $ra, 0x009C($sp) -.L808C01A8: -/* 00D98 808C01A8 0041001A */ div $zero, $v0, $at -/* 00D9C 808C01AC 00007810 */ mfhi $t7 -/* 00DA0 808C01B0 55E0009B */ bnel $t7, $zero, .L808C0420 -/* 00DA4 808C01B4 8FBF009C */ lw $ra, 0x009C($sp) -/* 00DA8 808C01B8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00DAC 808C01BC 00000000 */ nop -/* 00DB0 808C01C0 3C01808C */ lui $at, %hi(D_808C0A84) ## $at = 808C0000 -/* 00DB4 808C01C4 C4240A84 */ lwc1 $f4, %lo(D_808C0A84)($at) -/* 00DB8 808C01C8 3C01808C */ lui $at, %hi(D_808C0A88) ## $at = 808C0000 -/* 00DBC 808C01CC C43E0A88 */ lwc1 $f30, %lo(D_808C0A88)($at) -/* 00DC0 808C01D0 46040182 */ mul.s $f6, $f0, $f4 -/* 00DC4 808C01D4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00DC8 808C01D8 4481E000 */ mtc1 $at, $f28 ## $f28 = 1.00 -/* 00DCC 808C01DC 3C01430C */ lui $at, 0x430C ## $at = 430C0000 -/* 00DD0 808C01E0 4481D000 */ mtc1 $at, $f26 ## $f26 = 140.00 -/* 00DD4 808C01E4 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 00DD8 808C01E8 26150008 */ addiu $s5, $s0, 0x0008 ## $s5 = 00000008 -/* 00DDC 808C01EC 4600320D */ trunc.w.s $f8, $f6 -/* 00DE0 808C01F0 27BE00D4 */ addiu $s8, $sp, 0x00D4 ## $s8 = FFFFFFF4 -/* 00DE4 808C01F4 34178000 */ ori $s7, $zero, 0x8000 ## $s7 = 00008000 -/* 00DE8 808C01F8 27B600C8 */ addiu $s6, $sp, 0x00C8 ## $s6 = FFFFFFE8 -/* 00DEC 808C01FC 44134000 */ mfc1 $s3, $f8 -/* 00DF0 808C0200 00000000 */ nop -/* 00DF4 808C0204 00139C00 */ sll $s3, $s3, 16 -/* 00DF8 808C0208 00139C03 */ sra $s3, $s3, 16 -.L808C020C: -/* 00DFC 808C020C 3C014620 */ lui $at, 0x4620 ## $at = 46200000 -/* 00E00 808C0210 44816000 */ mtc1 $at, $f12 ## $f12 = 10240.00 -/* 00E04 808C0214 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00E08 808C0218 00000000 */ nop -/* 00E0C 808C021C 44935000 */ mtc1 $s3, $f10 ## $f10 = 0.00 -/* 00E10 808C0220 00000000 */ nop -/* 00E14 808C0224 46805420 */ cvt.s.w $f16, $f10 -/* 00E18 808C0228 46100480 */ add.s $f18, $f0, $f16 -/* 00E1C 808C022C 4600910D */ trunc.w.s $f4, $f18 -/* 00E20 808C0230 44022000 */ mfc1 $v0, $f4 -/* 00E24 808C0234 00000000 */ nop -/* 00E28 808C0238 00029400 */ sll $s2, $v0, 16 -/* 00E2C 808C023C 00022400 */ sll $a0, $v0, 16 -/* 00E30 808C0240 00129403 */ sra $s2, $s2, 16 -/* 00E34 808C0244 0C01DE1C */ jal Math_SinS - ## sins? -/* 00E38 808C0248 00042403 */ sra $a0, $a0, 16 -/* 00E3C 808C024C 00122400 */ sll $a0, $s2, 16 -/* 00E40 808C0250 46000506 */ mov.s $f20, $f0 -/* 00E44 808C0254 0C01DE0D */ jal Math_CosS - ## coss? -/* 00E48 808C0258 00042403 */ sra $a0, $a0, 16 -/* 00E4C 808C025C 46000586 */ mov.s $f22, $f0 -/* 00E50 808C0260 0C01DE0D */ jal Math_CosS - ## coss? -/* 00E54 808C0264 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00E58 808C0268 46140602 */ mul.s $f24, $f0, $f20 -/* 00E5C 808C026C 0C01DE1C */ jal Math_SinS - ## sins? -/* 00E60 808C0270 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00E64 808C0274 4600A502 */ mul.s $f20, $f20, $f0 -/* 00E68 808C0278 4616E480 */ add.s $f18, $f28, $f22 -/* 00E6C 808C027C C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00E70 808C0280 4618D202 */ mul.s $f8, $f26, $f24 -/* 00E74 808C0284 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000008 -/* 00E78 808C0288 02C02825 */ or $a1, $s6, $zero ## $a1 = FFFFFFE8 -/* 00E7C 808C028C 4612D102 */ mul.s $f4, $f26, $f18 -/* 00E80 808C0290 46083280 */ add.s $f10, $f6, $f8 -/* 00E84 808C0294 E7AA00C8 */ swc1 $f10, 0x00C8($sp) -/* 00E88 808C0298 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00E8C 808C029C 4614D282 */ mul.s $f10, $f26, $f20 -/* 00E90 808C02A0 46048180 */ add.s $f6, $f16, $f4 -/* 00E94 808C02A4 E7A600CC */ swc1 $f6, 0x00CC($sp) -/* 00E98 808C02A8 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00E9C 808C02AC 460A4481 */ sub.s $f18, $f8, $f10 -/* 00EA0 808C02B0 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 00EA4 808C02B4 E7B200D0 */ swc1 $f18, 0x00D0($sp) -/* 00EA8 808C02B8 461E0302 */ mul.s $f12, $f0, $f30 -/* 00EAC 808C02BC 3C01808C */ lui $at, %hi(D_808C0A8C) ## $at = 808C0000 -/* 00EB0 808C02C0 C4300A8C */ lwc1 $f16, %lo(D_808C0A8C)($at) -/* 00EB4 808C02C4 02578821 */ addu $s1, $s2, $s7 -/* 00EB8 808C02C8 00118C00 */ sll $s1, $s1, 16 -/* 00EBC 808C02CC 00118C03 */ sra $s1, $s1, 16 -/* 00EC0 808C02D0 00112400 */ sll $a0, $s1, 16 -/* 00EC4 808C02D4 4610603C */ c.lt.s $f12, $f16 -/* 00EC8 808C02D8 00000000 */ nop -/* 00ECC 808C02DC 45020021 */ bc1fl .L808C0364 -/* 00ED0 808C02E0 3C0140D0 */ lui $at, 0x40D0 ## $at = 40D00000 -/* 00ED4 808C02E4 0C01DE1C */ jal Math_SinS - ## sins? -/* 00ED8 808C02E8 00042403 */ sra $a0, $a0, 16 -/* 00EDC 808C02EC 00112400 */ sll $a0, $s1, 16 -/* 00EE0 808C02F0 46000506 */ mov.s $f20, $f0 -/* 00EE4 808C02F4 0C01DE0D */ jal Math_CosS - ## coss? -/* 00EE8 808C02F8 00042403 */ sra $a0, $a0, 16 -/* 00EEC 808C02FC 46000586 */ mov.s $f22, $f0 -/* 00EF0 808C0300 0C01DE0D */ jal Math_CosS - ## coss? -/* 00EF4 808C0304 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00EF8 808C0308 46140602 */ mul.s $f24, $f0, $f20 -/* 00EFC 808C030C 0C01DE1C */ jal Math_SinS - ## sins? -/* 00F00 808C0310 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00F04 808C0314 4600A502 */ mul.s $f20, $f20, $f0 -/* 00F08 808C0318 4616E480 */ add.s $f18, $f28, $f22 -/* 00F0C 808C031C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00F10 808C0320 4618D182 */ mul.s $f6, $f26, $f24 -/* 00F14 808C0324 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000008 -/* 00F18 808C0328 02C02825 */ or $a1, $s6, $zero ## $a1 = FFFFFFE8 -/* 00F1C 808C032C 4612D402 */ mul.s $f16, $f26, $f18 -/* 00F20 808C0330 46062200 */ add.s $f8, $f4, $f6 -/* 00F24 808C0334 E7A800C8 */ swc1 $f8, 0x00C8($sp) -/* 00F28 808C0338 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 00F2C 808C033C 4614D202 */ mul.s $f8, $f26, $f20 -/* 00F30 808C0340 46105100 */ add.s $f4, $f10, $f16 -/* 00F34 808C0344 E7A400CC */ swc1 $f4, 0x00CC($sp) -/* 00F38 808C0348 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00F3C 808C034C 46083481 */ sub.s $f18, $f6, $f8 -/* 00F40 808C0350 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 00F44 808C0354 E7B200D0 */ swc1 $f18, 0x00D0($sp) -/* 00F48 808C0358 461E0302 */ mul.s $f12, $f0, $f30 -/* 00F4C 808C035C 00000000 */ nop -/* 00F50 808C0360 3C0140D0 */ lui $at, 0x40D0 ## $at = 40D00000 -.L808C0364: -/* 00F54 808C0364 44810000 */ mtc1 $at, $f0 ## $f0 = 6.50 -/* 00F58 808C0368 3C01C0D0 */ lui $at, 0xC0D0 ## $at = C0D00000 -/* 00F5C 808C036C 44814000 */ mtc1 $at, $f8 ## $f8 = -6.50 -/* 00F60 808C0370 46180282 */ mul.s $f10, $f0, $f24 -/* 00F64 808C0374 3C07808C */ lui $a3, %hi(D_808C09DC) ## $a3 = 808C0000 -/* 00F68 808C0378 24080050 */ addiu $t0, $zero, 0x0050 ## $t0 = 00000050 -/* 00F6C 808C037C 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 00F70 808C0380 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00F74 808C0384 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00F78 808C0388 240C0096 */ addiu $t4, $zero, 0x0096 ## $t4 = 00000096 -/* 00F7C 808C038C 460C5402 */ mul.s $f16, $f10, $f12 -/* 00F80 808C0390 240D00AA */ addiu $t5, $zero, 0x00AA ## $t5 = 000000AA -/* 00F84 808C0394 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00F88 808C0398 46160102 */ mul.s $f4, $f0, $f22 -/* 00F8C 808C039C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00F90 808C03A0 2418000E */ addiu $t8, $zero, 0x000E ## $t8 = 0000000E -/* 00F94 808C03A4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00F98 808C03A8 E7B000D4 */ swc1 $f16, 0x00D4($sp) -/* 00F9C 808C03AC AFB9003C */ sw $t9, 0x003C($sp) -/* 00FA0 808C03B0 AFB80038 */ sw $t8, 0x0038($sp) -/* 00FA4 808C03B4 460C2182 */ mul.s $f6, $f4, $f12 -/* 00FA8 808C03B8 AFAF0034 */ sw $t7, 0x0034($sp) -/* 00FAC 808C03BC AFAE0028 */ sw $t6, 0x0028($sp) -/* 00FB0 808C03C0 46144482 */ mul.s $f18, $f8, $f20 -/* 00FB4 808C03C4 AFAD0024 */ sw $t5, 0x0024($sp) -/* 00FB8 808C03C8 AFAC0020 */ sw $t4, 0x0020($sp) -/* 00FBC 808C03CC AFAB001C */ sw $t3, 0x001C($sp) -/* 00FC0 808C03D0 E7A600D8 */ swc1 $f6, 0x00D8($sp) -/* 00FC4 808C03D4 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00FC8 808C03D8 AFA90014 */ sw $t1, 0x0014($sp) -/* 00FCC 808C03DC 460C9282 */ mul.s $f10, $f18, $f12 -/* 00FD0 808C03E0 AFA80010 */ sw $t0, 0x0010($sp) -/* 00FD4 808C03E4 24E709DC */ addiu $a3, $a3, %lo(D_808C09DC) ## $a3 = 808C09DC -/* 00FD8 808C03E8 8FA400E4 */ lw $a0, 0x00E4($sp) -/* 00FDC 808C03EC 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000008 -/* 00FE0 808C03F0 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFF4 -/* 00FE4 808C03F4 AFA0002C */ sw $zero, 0x002C($sp) -/* 00FE8 808C03F8 E7AA00DC */ swc1 $f10, 0x00DC($sp) -/* 00FEC 808C03FC 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 00FF0 808C0400 AFA00030 */ sw $zero, 0x0030($sp) -/* 00FF4 808C0404 26732AAA */ addiu $s3, $s3, 0x2AAA ## $s3 = 00002AAA -/* 00FF8 808C0408 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 -/* 00FFC 808C040C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01000 808C0410 00139C00 */ sll $s3, $s3, 16 -/* 01004 808C0414 1681FF7D */ bne $s4, $at, .L808C020C -/* 01008 808C0418 00139C03 */ sra $s3, $s3, 16 -/* 0100C 808C041C 8FBF009C */ lw $ra, 0x009C($sp) -.L808C0420: -/* 01010 808C0420 D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 01014 808C0424 D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 01018 808C0428 D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 0101C 808C042C D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 01020 808C0430 D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 01024 808C0434 D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 01028 808C0438 8FB00078 */ lw $s0, 0x0078($sp) -/* 0102C 808C043C 8FB1007C */ lw $s1, 0x007C($sp) -/* 01030 808C0440 8FB20080 */ lw $s2, 0x0080($sp) -/* 01034 808C0444 8FB30084 */ lw $s3, 0x0084($sp) -/* 01038 808C0448 8FB40088 */ lw $s4, 0x0088($sp) -/* 0103C 808C044C 8FB5008C */ lw $s5, 0x008C($sp) -/* 01040 808C0450 8FB60090 */ lw $s6, 0x0090($sp) -/* 01044 808C0454 8FB70094 */ lw $s7, 0x0094($sp) -/* 01048 808C0458 8FBE0098 */ lw $s8, 0x0098($sp) -/* 0104C 808C045C 03E00008 */ jr $ra -/* 01050 808C0460 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 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 deleted file mode 100644 index d6c87ac4d7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C0464.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel func_808C0464 -/* 01054 808C0464 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01058 808C0468 AFB0001C */ sw $s0, 0x001C($sp) -/* 0105C 808C046C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01060 808C0470 AFB10020 */ sw $s1, 0x0020($sp) -/* 01064 808C0474 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 01068 808C0478 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0106C 808C047C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01070 808C0480 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01074 808C0484 92050169 */ lbu $a1, 0x0169($s0) ## 00000169 -/* 01078 808C0488 0C00B2D0 */ jal Flags_GetSwitch - -/* 0107C 808C048C AFA3003C */ sw $v1, 0x003C($sp) -/* 01080 808C0490 14400004 */ bne $v0, $zero, .L808C04A4 -/* 01084 808C0494 8FA3003C */ lw $v1, 0x003C($sp) -/* 01088 808C0498 920E0181 */ lbu $t6, 0x0181($s0) ## 00000181 -/* 0108C 808C049C 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 01090 808C04A0 11E0000A */ beq $t7, $zero, .L808C04CC -.L808C04A4: -/* 01094 808C04A4 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 01098 808C04A8 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 0109C 808C04AC C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 010A0 808C04B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010A4 808C04B4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 010A8 808C04B8 46062200 */ add.s $f8, $f4, $f6 -/* 010AC 808C04BC 0C22FE43 */ jal func_808BF90C -/* 010B0 808C04C0 E608000C */ swc1 $f8, 0x000C($s0) ## 0000000C -/* 010B4 808C04C4 1000002D */ beq $zero, $zero, .L808C057C -/* 010B8 808C04C8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L808C04CC: -/* 010BC 808C04CC 80780151 */ lb $t8, 0x0151($v1) ## 00000151 -/* 010C0 808C04D0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 010C4 808C04D4 57010029 */ bnel $t8, $at, .L808C057C -/* 010C8 808C04D8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 010CC 808C04DC 84790860 */ lh $t9, 0x0860($v1) ## 00000860 -/* 010D0 808C04E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010D4 808C04E4 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF0 -/* 010D8 808C04E8 13200023 */ beq $t9, $zero, .L808C0578 -/* 010DC 808C04EC 246608B8 */ addiu $a2, $v1, 0x08B8 ## $a2 = 000008B8 -/* 010E0 808C04F0 0C00B6F4 */ jal func_8002DBD0 -/* 010E4 808C04F4 AFA6002C */ sw $a2, 0x002C($sp) -/* 010E8 808C04F8 C7A00030 */ lwc1 $f0, 0x0030($sp) -/* 010EC 808C04FC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 010F0 808C0500 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 010F4 808C0504 46000005 */ abs.s $f0, $f0 -/* 010F8 808C0508 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 010FC 808C050C 460A003C */ c.lt.s $f0, $f10 -/* 01100 808C0510 C7B00038 */ lwc1 $f16, 0x0038($sp) -/* 01104 808C0514 45020019 */ bc1fl .L808C057C -/* 01108 808C0518 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0110C 808C051C 44819000 */ mtc1 $at, $f18 ## $f18 = 0.00 -/* 01110 808C0520 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 01114 808C0524 C7A40034 */ lwc1 $f4, 0x0034($sp) -/* 01118 808C0528 4612803C */ c.lt.s $f16, $f18 -/* 0111C 808C052C 00000000 */ nop -/* 01120 808C0530 45020012 */ bc1fl .L808C057C -/* 01124 808C0534 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01128 808C0538 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 -/* 0112C 808C053C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01130 808C0540 24050BCC */ addiu $a1, $zero, 0x0BCC ## $a1 = 00000BCC -/* 01134 808C0544 4606203C */ c.lt.s $f4, $f6 -/* 01138 808C0548 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 -/* 0113C 808C054C 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 01140 808C0550 4502000A */ bc1fl .L808C057C -/* 01144 808C0554 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01148 808C0558 0C02003E */ jal func_800800F8 -/* 0114C 808C055C AFA00010 */ sw $zero, 0x0010($sp) -/* 01150 808C0560 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 -/* 01154 808C0564 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 01158 808C0568 8FA5002C */ lw $a1, 0x002C($sp) -/* 0115C 808C056C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01160 808C0570 0C22FE43 */ jal func_808BF90C -/* 01164 808C0574 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L808C0578: -/* 01168 808C0578 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L808C057C: -/* 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 CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 0117C 808C058C 26060170 */ addiu $a2, $s0, 0x0170 ## $a2 = 00000170 -/* 01180 808C0590 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01184 808C0594 8FB0001C */ lw $s0, 0x001C($sp) -/* 01188 808C0598 8FB10020 */ lw $s1, 0x0020($sp) -/* 0118C 808C059C 03E00008 */ jr $ra -/* 01190 808C05A0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/data/overlays/actors/z_bg_ydan_sp.data.s b/data/overlays/actors/z_bg_ydan_sp.data.s deleted file mode 100644 index 80ae658a74..0000000000 --- a/data/overlays/actors/z_bg_ydan_sp.data.s +++ /dev/null @@ -1,45 +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 purpose registers - -.section .data - -.balign 16 - -glabel Bg_Ydan_Sp_InitVars - .word 0x000F0100, 0x00000000, 0x00360000, 0x00000248 -.word BgYdanSp_Init -.word BgYdanSp_Destroy -.word BgYdanSp_Update -.word BgYdanSp_Draw -glabel D_808C0930 - .word 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00020800, 0x00000000, 0x00010000, 0x42960000, 0xC1000000, 0x42960000 -glabel D_808C0954 - .word 0xC2960000, 0xC1000000, 0x42960000, 0xC2960000, 0xC1000000, 0xC2960000 -glabel D_808C096C - .word 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00020800, 0x00000000, 0x00010000 -glabel D_808C0984 - .word 0x430C0000, 0x43906666, 0x00000000 -glabel D_808C0990 - .word 0xC30C0000, 0x43900000, 0x00000000, 0xC30C0000 -glabel D_808C09A0 - .word 0x00000000, 0x00000000 -glabel D_808C09A8 - .word 0x0A000900, 0x20020000, 0x00000002 -.word D_808C0930 -glabel D_808C09B8 - .word 0x48500064 -glabel D_808C09BC - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_808C09C8 - .word 0xFAFAFAFF -glabel D_808C09CC - .word 0xB4B4B4FF -glabel D_808C09D0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_808C09DC - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_ydan_sp.reloc.s b/data/overlays/actors/z_bg_ydan_sp.reloc.s deleted file mode 100644 index adfdd95c4f..0000000000 --- a/data/overlays/actors/z_bg_ydan_sp.reloc.s +++ /dev/null @@ -1,13 +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 purpose registers - -.section .rodata - -.balign 16 - -glabel D_808C0AA0 - .incbin "baserom/ovl_Bg_Ydan_Sp", 0x1690, 0x00000180 diff --git a/spec b/spec index bdd99d7f74..e6d4d9d2ed 100644 --- a/spec +++ b/spec @@ -1364,8 +1364,7 @@ endseg beginseg name "ovl_Bg_Ydan_Sp" include "build/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.o" - include "build/data/overlays/actors/z_bg_ydan_sp.data.o" - include "build/data/overlays/actors/z_bg_ydan_sp.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Ydan_Sp/ovl_Bg_Ydan_Sp_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index 4cce5d3734..c4c58532fe 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -9,13 +9,23 @@ void BgYdanSp_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgYdanSp_Update(Actor* thisx, GlobalContext* globalCtx); void BgYdanSp_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06003850; -extern UNK_TYPE D_06005F40; -extern UNK_TYPE D_06006050; -extern UNK_TYPE D_060061B0; -extern UNK_TYPE D_06006460; +void BgYdanSp_BurnFloorWeb(BgYdanSp* this, GlobalContext* globalCtx); +void BgYdanSp_FloorWebIdle(BgYdanSp* this, GlobalContext* globalCtx); +void BgYdanSp_BurnWallWeb(BgYdanSp* this, GlobalContext* globalCtx); +void BgYdanSp_WallWebIdle(BgYdanSp* this, GlobalContext* globalCtx); + +extern Gfx D_060061B0[]; +extern Gfx D_06003850[]; +extern Gfx D_06005F40[]; + +extern CollisionHeader D_06006050; +extern CollisionHeader D_06006460; + +typedef enum { + /* 0 */ WEB_FLOOR, + /* 1 */ WEB_WALL +} BgYdanSpType; -/* const ActorInit Bg_Ydan_Sp_InitVars = { ACTOR_BG_YDAN_SP, ACTORCAT_BG, @@ -28,7 +38,7 @@ const ActorInit Bg_Ydan_Sp_InitVars = { (ActorFunc)BgYdanSp_Draw, }; -static ColliderTrisElementInit D_808C0930[2] = { +static ColliderTrisElementInit sTrisItemsInit[2] = { { { ELEMTYPE_UNK0, @@ -49,11 +59,11 @@ static ColliderTrisElementInit D_808C0930[2] = { BUMP_ON, OCELEM_NONE, }, - { { { 140.0f, 288.79998779296875f, 0.0f }, { -140.0f, 288.0f, 0.0f }, { -140.0f, 0.0f, 0.0f } } }, + { { { 140.0f, 288.8f, 0.0f }, { -140.0f, 288.0f, 0.0f }, { -140.0f, 0.0f, 0.0f } } }, }, }; -static ColliderTrisInit D_808C09A8 = { +static ColliderTrisInit sTrisInit = { { COLTYPE_NONE, AT_NONE, @@ -63,29 +73,386 @@ static ColliderTrisInit D_808C09A8 = { COLSHAPE_TRIS, }, 2, - D_808C0930, + sTrisItemsInit, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Destroy.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF83C.s") +void BgYdanSp_Init(Actor* thisx, GlobalContext* globalCtx) { + BgYdanSp* this = THIS; + ColliderTrisElementInit* ti0 = &sTrisItemsInit[0]; + Vec3f tri[3]; + s32 i; + CollisionHeader* colHeader = NULL; + ColliderTrisElementInit* ti1 = &sTrisItemsInit[1]; + f32 cossY; + f32 sinsY; + f32 cossX; + f32 nSinsX; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF90C.s") + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); + this->isDestroyedSwitchFlag = thisx->params & 0x3F; + this->burnSwitchFlag = (thisx->params >> 6) & 0x3F; + this->dyna.actor.params = (thisx->params >> 0xC) & 0xF; + DynaPolyActor_Init(&this->dyna, DPM_PLAYER); + Collider_InitTris(globalCtx, &this->trisCollider); + Collider_SetTris(globalCtx, &this->trisCollider, &this->dyna.actor, &sTrisInit, this->trisColliderItems); + if (this->dyna.actor.params == WEB_FLOOR) { + CollisionHeader_GetVirtual(&D_06006460, &colHeader); + this->actionFunc = BgYdanSp_FloorWebIdle; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s") + for (i = 0; i < 3; i++) { + tri[i].x = ti0->dim.vtx[i].x + this->dyna.actor.world.pos.x; + tri[i].y = ti0->dim.vtx[i].y + this->dyna.actor.world.pos.y; + tri[i].z = ti0->dim.vtx[i].z + this->dyna.actor.world.pos.z; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC50.s") + Collider_SetTrisVertices(&this->trisCollider, 0, &tri[0], &tri[1], &tri[2]); + tri[1].x = tri[0].x; + tri[1].z = tri[2].z; + Collider_SetTrisVertices(&this->trisCollider, 1, &tri[0], &tri[2], &tri[1]); + this->unk16C = 0.0f; + } else { + CollisionHeader_GetVirtual(&D_06006050, &colHeader); + this->actionFunc = BgYdanSp_WallWebIdle; + Actor_SetFocus(&this->dyna.actor, 30.0f); + sinsY = Math_SinS(this->dyna.actor.shape.rot.y); + cossY = Math_CosS(this->dyna.actor.shape.rot.y); + nSinsX = -Math_SinS(this->dyna.actor.shape.rot.x); + cossX = Math_CosS(this->dyna.actor.shape.rot.x); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFC90.s") + for (i = 0; i < 3; i++) { + tri[i].x = + this->dyna.actor.world.pos.x + (cossY * ti1->dim.vtx[i].x) - (sinsY * ti1->dim.vtx[i].y * nSinsX); + tri[i].y = this->dyna.actor.world.pos.y + (ti1->dim.vtx[i].y * cossX); + tri[i].z = + this->dyna.actor.world.pos.z - (sinsY * ti1->dim.vtx[i].x) + (ti1->dim.vtx[i].y * cossY * nSinsX); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s") + Collider_SetTrisVertices(&this->trisCollider, 0, &tri[0], &tri[1], &tri[2]); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s") + tri[1].x = this->dyna.actor.world.pos.x + (cossY * ti1->dim.vtx[0].x) - (ti1->dim.vtx[2].y * sinsY * nSinsX); + tri[1].y = this->dyna.actor.world.pos.y + (ti1->dim.vtx[2].y * cossX); + tri[1].z = this->dyna.actor.world.pos.z - (sinsY * ti1->dim.vtx[0].x) + (ti1->dim.vtx[2].y * cossY * nSinsX); + Collider_SetTrisVertices(&this->trisCollider, 1, &tri[0], &tri[2], &tri[1]); + } + this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); + this->timer = 0; + if (Flags_GetSwitch(globalCtx, this->isDestroyedSwitchFlag)) { + Actor_Kill(&this->dyna.actor); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C0464.s") +void BgYdanSp_Destroy(Actor* thisx, GlobalContext* globalCtx) { + BgYdanSp* this = THIS; + DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); + Collider_DestroyTris(globalCtx, &this->trisCollider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Update.s") +void* BgYdanSp_UpdateFloorWebCollision(BgYdanSp* this) { + s16 newY; + CollisionHeader* colHeader; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s") + colHeader = SEGMENTED_TO_VIRTUAL(&D_06006460); + colHeader->vtxList = SEGMENTED_TO_VIRTUAL(colHeader->vtxList); + newY = (this->dyna.actor.home.pos.y - this->dyna.actor.world.pos.y) * 10; + colHeader->vtxList[14].y = newY; + colHeader->vtxList[12].y = newY; + colHeader->vtxList[10].y = newY; + colHeader->vtxList[9].y = newY; + colHeader->vtxList[6].y = newY; + colHeader->vtxList[5].y = newY; + colHeader->vtxList[1].y = newY; + colHeader->vtxList[0].y = newY; +} + +void BgYdanSp_BurnWeb(BgYdanSp* this, GlobalContext* globalCtx) { + this->timer = 30; + this = this; + func_80078884(NA_SE_SY_CORRECT_CHIME); + Flags_SetSwitch(globalCtx, this->isDestroyedSwitchFlag); + if (this->dyna.actor.params == WEB_FLOOR) { + this->actionFunc = BgYdanSp_BurnFloorWeb; + } else { + this->actionFunc = BgYdanSp_BurnWallWeb; + } +} + +void BgYdanSp_BurnFloorWeb(BgYdanSp* this, GlobalContext* globalCtx) { + static Vec3f accel = { 0 }; + Vec3f velocity; + Vec3f pos2; + f32 distXZ; + f32 sins; + f32 coss; + s16 rot; + s16 rot2; + s32 i; + + if (this->timer != 0) { + this->timer--; + } + + if (this->timer == 0) { + Actor_Kill(&this->dyna.actor); + return; + } + if ((this->timer % 3) == 0) { + rot2 = Rand_ZeroOne() * 0x2AAA; + velocity.y = 0.0f; + pos2.y = this->dyna.actor.world.pos.y; + + for (i = 0; i < 6; i++) { + rot = Rand_CenteredFloat(0x2800) + rot2; + sins = Math_SinS(rot); + coss = Math_CosS(rot); + pos2.x = this->dyna.actor.world.pos.x + (120.0f * sins); + pos2.z = this->dyna.actor.world.pos.z + (120.0f * coss); + distXZ = Math_Vec3f_DistXZ(&this->dyna.actor.home.pos, &pos2) * (1.0f / 120.0f); + if (distXZ < 0.7f) { + sins = Math_SinS(rot + 0x8000); + coss = Math_CosS(rot + 0x8000); + pos2.x = this->dyna.actor.world.pos.x + (120.0f * sins); + pos2.z = this->dyna.actor.world.pos.z + (120.0f * coss); + distXZ = Math_Vec3f_DistXZ(&this->dyna.actor.home.pos, &pos2) * (1.0f / 120.0f); + } + velocity.x = (7.0f * sins) * distXZ; + velocity.y = 0.0f; + velocity.z = (7.0f * coss) * distXZ; + EffectSsDeadDb_Spawn(globalCtx, &this->dyna.actor.home.pos, &velocity, &accel, 60, 6, 255, 255, 150, 170, + 255, 0, 0, 1, 0xE, 1); + rot2 += 0x2AAA; + } + } +} + +void BgYdanSp_FloorWebBroken(BgYdanSp* this, GlobalContext* globalCtx) { + if (this->timer != 0) { + this->timer--; + } + + if (this->timer == 0) { + Actor_Kill(&this->dyna.actor); + } +} + +void BgYdanSp_FloorWebBreaking(BgYdanSp* this, GlobalContext* globalCtx) { + static Color_RGBA8 primColor = { 250, 250, 250, 255 }; + static Color_RGBA8 envColor = { 180, 180, 180, 255 }; + static Vec3f zeroVec = { 0 }; + s32 i; + Vec3f pos; + s16 rot; + + if (this->timer != 0) { + this->timer--; + } + + this->dyna.actor.world.pos.y = (sinf((f32)this->timer * (M_PI / 20)) * this->unk16C) + this->dyna.actor.home.pos.y; + if (this->dyna.actor.home.pos.y - this->dyna.actor.world.pos.y > 190.0f) { + func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); + this->timer = 40; + func_80078884(NA_SE_SY_CORRECT_CHIME); + Flags_SetSwitch(globalCtx, this->isDestroyedSwitchFlag); + this->actionFunc = BgYdanSp_FloorWebBroken; + pos.y = this->dyna.actor.world.pos.y - 60.0f; + rot = 0; + for (i = 0; i < 6; i++) { + pos.x = Math_SinS(rot) * 60.0f + this->dyna.actor.world.pos.x; + pos.z = Math_CosS(rot) * 60.0f + this->dyna.actor.world.pos.z; + func_8002829C(globalCtx, &pos, &zeroVec, &zeroVec, &primColor, &envColor, 1000, 10); + + rot += 0x2AAA; + } + } + BgYdanSp_UpdateFloorWebCollision(this); +} + +void BgYdanSp_FloorWebIdle(BgYdanSp* this, GlobalContext* globalCtx) { + Player* player; + Vec3f webPos; + f32 sqrtFallDistance; + f32 unk; + + player = PLAYER; + webPos.x = this->dyna.actor.world.pos.x; + webPos.y = this->dyna.actor.world.pos.y - 50.0f; + webPos.z = this->dyna.actor.world.pos.z; + if (Player_IsBurningStickInRange(globalCtx, &webPos, 70.0f, 50.0f) != 0) { + this->dyna.actor.home.pos.x = player->swordInfo[0].tip.x; + this->dyna.actor.home.pos.z = player->swordInfo[0].tip.z; + BgYdanSp_BurnWeb(this, globalCtx); + return; + } + if ((this->trisCollider.base.acFlags & 2) != 0) { + BgYdanSp_BurnWeb(this, globalCtx); + return; + } + if (func_8004356C(&this->dyna)) { + sqrtFallDistance = sqrtf(CLAMP_MIN(player->fallDistance, 0.0f)); + if (player->fallDistance > 750.0f) { + if (this->dyna.actor.xzDistToPlayer < 80.0f) { + this->unk16C = 200.0f; + this->dyna.actor.room = -1; + this->dyna.actor.flags |= 0x10; + this->timer = 40; + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_WEB_BROKEN); + this->actionFunc = BgYdanSp_FloorWebBreaking; + return; + } + } + unk = sqrtFallDistance + sqrtFallDistance; + if (this->unk16C < unk) { + if (unk > 2.0f) { + this->unk16C = unk; + this->timer = 14; + } + } + if (player->actor.speedXZ != 0.0f) { + if (this->unk16C < 0.1f) { + this->timer = 14; + } + if (this->unk16C < 2.0f) { + this->unk16C = 2.0f; + } else { + this->unk16C = this->unk16C; + } + } + } + if (this->timer != 0) { + this->timer--; + } + if (this->timer == 0) { + this->timer = 14; + } + this->dyna.actor.world.pos.y = sinf((f32)this->timer * (M_PI / 7)) * this->unk16C + this->dyna.actor.home.pos.y; + Math_ApproachZeroF(&this->unk16C, 1.0f, 0.8f); + if (this->timer == 13) { + if (this->unk16C > 3.0f) { + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_WEB_VIBRATION); + } else { + func_800F8D04(NA_SE_EV_WEB_VIBRATION); + } + } + BgYdanSp_UpdateFloorWebCollision(this); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->trisCollider.base); +} + +void BgYdanSp_BurnWallWeb(BgYdanSp* this, GlobalContext* globalCtx) { + static Vec3f accel = { 0 }; + Vec3f velocity; + Vec3f spC8; + f32 distXYZ; + f32 sins; + f32 coss; + f32 coss2; + s16 rot; + s16 rot2; + s32 i; + + if (this->timer != 0) { + this->timer--; + } + if (this->timer == 0) { + Actor_Kill(&this->dyna.actor); + return; + } + if ((this->timer % 3) == 0) { + rot2 = Rand_ZeroOne() * 0x2AAA; + + for (i = 0; i < 6; i++) { + rot = Rand_CenteredFloat(0x2800) + rot2; + sins = Math_SinS(rot); + coss = Math_CosS(rot); + coss2 = Math_CosS(this->dyna.actor.shape.rot.y) * sins; + sins *= Math_SinS(this->dyna.actor.shape.rot.y); + + spC8.x = this->dyna.actor.world.pos.x + (140.0f * coss2); + spC8.y = this->dyna.actor.world.pos.y + (140.0f * (1.0f + coss)); + spC8.z = this->dyna.actor.world.pos.z - (140.0f * sins); + distXYZ = Math_Vec3f_DistXYZ(&this->dyna.actor.home.pos, &spC8) * (1.0f / 140.0f); + if (distXYZ < 0.65f) { + sins = Math_SinS(rot + 0x8000); + coss = Math_CosS(rot + 0x8000); + coss2 = Math_CosS(this->dyna.actor.shape.rot.y) * sins; + sins *= Math_SinS(this->dyna.actor.shape.rot.y); + spC8.x = this->dyna.actor.world.pos.x + (140.0f * coss2); + spC8.y = this->dyna.actor.world.pos.y + (140.0f * (1.0f + coss)); + spC8.z = this->dyna.actor.world.pos.z - (140.0f * sins); + distXYZ = Math_Vec3f_DistXYZ(&this->dyna.actor.home.pos, &spC8) * (1.0f / 140.0f); + } + velocity.x = 6.5f * coss2 * distXYZ; + velocity.y = 6.5f * coss * distXYZ; + velocity.z = -6.5f * sins * distXYZ; + EffectSsDeadDb_Spawn(globalCtx, &this->dyna.actor.home.pos, &velocity, &accel, 80, 6, 255, 255, 150, 170, + 255, 0, 0, 1, 0xE, 1); + rot2 += 0x2AAA; + } + } +} + +void BgYdanSp_WallWebIdle(BgYdanSp* this, GlobalContext* globalCtx) { + Player* player; + Vec3f sp30; + + player = PLAYER; + if (Flags_GetSwitch(globalCtx, this->burnSwitchFlag) || (this->trisCollider.base.acFlags & 2)) { + this->dyna.actor.home.pos.y = this->dyna.actor.world.pos.y + 80.0f; + BgYdanSp_BurnWeb(this, globalCtx); + } else if (player->heldItemActionParam == PLAYER_AP_STICK && player->unk_860 != 0) { + func_8002DBD0(&this->dyna.actor, &sp30, &player->swordInfo[0].tip); + if (fabsf(sp30.x) < 100.0f && sp30.z < 1.0f && sp30.y < 200.0f) { + func_800800F8(globalCtx, 0xBCC, 0x28, &this->dyna.actor, 0); + Math_Vec3f_Copy(&this->dyna.actor.home.pos, &player->swordInfo[0].tip); + BgYdanSp_BurnWeb(this, globalCtx); + } + } + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->trisCollider.base); +} + +void BgYdanSp_Update(Actor* thisx, GlobalContext* globalCtx) { + BgYdanSp* this = THIS; + this->actionFunc(this, globalCtx); +} + +void BgYdanSp_Draw(Actor* thisx, GlobalContext* globalCtx) { + BgYdanSp* this = THIS; + s32 i; + MtxF mtxF; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 781); + func_80093D84(globalCtx->state.gfxCtx); + if (thisx->params == WEB_WALL) { + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 787), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06005F40); + } else if (this->actionFunc == BgYdanSp_FloorWebBroken) { + Matrix_Get(&mtxF); + if (this->timer == 40) { + Matrix_Translate(0.0f, (thisx->home.pos.y - thisx->world.pos.y) * 10.0f, 0.0f, MTXMODE_APPLY); + Matrix_Scale(1.0f, ((thisx->home.pos.y - thisx->world.pos.y) + 10.0f) * 0.1f, 1.0f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 808), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_060061B0); + } + for (i = 0; i < 8; i++) { + Matrix_Put(&mtxF); + Matrix_RotateRPY(-0x5A0, i * 0x2000, 0, MTXMODE_APPLY); + Matrix_Translate(0.0f, 700.0f, -900.0f, MTXMODE_APPLY); + Matrix_Scale(3.5f, 5.0f, 1.0f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 830), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06003850); + } + } else { + Matrix_Translate(0.0f, (thisx->home.pos.y - thisx->world.pos.y) * 10.0f, 0.0f, MTXMODE_APPLY); + Matrix_Scale(1.0f, ((thisx->home.pos.y - thisx->world.pos.y) + 10.0f) * 0.1f, 1.0f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 849), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_060061B0); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 856); +} diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h index 1511c8b72a..5401afe56e 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h @@ -6,9 +6,17 @@ struct BgYdanSp; +typedef void (*BgYdanSpActionFunc)(struct BgYdanSp*, GlobalContext*); + typedef struct BgYdanSp { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xFC]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ BgYdanSpActionFunc actionFunc; + /* 0x0168 */ u8 isDestroyedSwitchFlag; + /* 0x0169 */ u8 burnSwitchFlag; + /* 0x016A */ s16 timer; + /* 0x016C */ f32 unk16C; + /* 0x0170 */ ColliderTris trisCollider; + /* 0x0190 */ ColliderTrisElement trisColliderItems[2]; } BgYdanSp; // size = 0x0248 extern const ActorInit Bg_Ydan_Sp_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index e17508bfff..2a7e7d906a 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -2749,3 +2749,10 @@ D_06000B30 = 0x06000B30; D_060041A8 = 0x060041A8; D_060009A0 = 0x060009A0; D_06004404 = 0x06004404; + +// z_bg_ydan_sp +D_06006050 = 0x06006050; +D_06006460 = 0x06006460; +D_060061B0 = 0x060061B0; +D_06003850 = 0x06003850; +D_06005F40 = 0x06005F40;