diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Destroy.s deleted file mode 100644 index d03d1374ae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Destroy.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel EnSw_Destroy -/* 00C18 80B0C9C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C1C 80B0C9CC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00C20 80B0C9D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C24 80B0C9D4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00C28 80B0C9D8 0C016F32 */ jal Collider_DestroyJntSph -/* 00C2C 80B0C9DC 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 -/* 00C30 80B0C9E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C34 80B0C9E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C38 80B0C9E8 03E00008 */ jr $ra -/* 00C3C 80B0C9EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Draw.s deleted file mode 100644 index 14cda68ada..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Draw.s +++ /dev/null @@ -1,79 +0,0 @@ -.late_rodata -glabel D_80B0F2BC - .word 0xBFB2B8C2 - -.text -glabel EnSw_Draw -/* 03160 80B0EF10 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03164 80B0EF14 3C0E80B1 */ lui $t6, %hi(D_80B0F198) ## $t6 = 80B10000 -/* 03168 80B0EF18 8DCEF198 */ lw $t6, %lo(D_80B0F198)($t6) -/* 0316C 80B0EF1C AFBF0024 */ sw $ra, 0x0024($sp) -/* 03170 80B0EF20 AFB10020 */ sw $s1, 0x0020($sp) -/* 03174 80B0EF24 AFB0001C */ sw $s0, 0x001C($sp) -/* 03178 80B0EF28 AFAE0030 */ sw $t6, 0x0030($sp) -/* 0317C 80B0EF2C 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 03180 80B0EF30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03184 80B0EF34 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03188 80B0EF38 31F8E000 */ andi $t8, $t7, 0xE000 ## $t8 = 00000000 -/* 0318C 80B0EF3C 0018CB43 */ sra $t9, $t8, 13 -/* 03190 80B0EF40 13200013 */ beq $t9, $zero, .L80B0EF90 -/* 03194 80B0EF44 3C0180B1 */ lui $at, %hi(D_80B0F2BC) ## $at = 80B10000 -/* 03198 80B0EF48 C42CF2BC */ lwc1 $f12, %lo(D_80B0F2BC)($at) -/* 0319C 80B0EF4C 0C0342DC */ jal Matrix_RotateX -/* 031A0 80B0EF50 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 031A4 80B0EF54 920800AF */ lbu $t0, 0x00AF($s0) ## 000000AF -/* 031A8 80B0EF58 3C064348 */ lui $a2, 0x4348 ## $a2 = 43480000 -/* 031AC 80B0EF5C 51000006 */ beql $t0, $zero, .L80B0EF78 -/* 031B0 80B0EF60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031B4 80B0EF64 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 031B8 80B0EF68 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 031BC 80B0EF6C 0C034261 */ jal Matrix_Translate -/* 031C0 80B0EF70 46006386 */ mov.s $f14, $f12 -/* 031C4 80B0EF74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B0EF78: -/* 031C8 80B0EF78 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 031CC 80B0EF7C 0C00BAF3 */ jal func_8002EBCC -/* 031D0 80B0EF80 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 031D4 80B0EF84 3C0280B1 */ lui $v0, %hi(func_80B0E728) ## $v0 = 80B10000 -/* 031D8 80B0EF88 1000000C */ beq $zero, $zero, .L80B0EFBC -/* 031DC 80B0EF8C 2442E728 */ addiu $v0, $v0, %lo(func_80B0E728) ## $v0 = 80B0E728 -.L80B0EF90: -/* 031E0 80B0EF90 8E090190 */ lw $t1, 0x0190($s0) ## 00000190 -/* 031E4 80B0EF94 3C0280B1 */ lui $v0, %hi(func_80B0E728) ## $v0 = 80B10000 -/* 031E8 80B0EF98 2442E728 */ addiu $v0, $v0, %lo(func_80B0E728) ## $v0 = 80B0E728 -/* 031EC 80B0EF9C 14490007 */ bne $v0, $t1, .L80B0EFBC -/* 031F0 80B0EFA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 031F4 80B0EFA4 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 031F8 80B0EFA8 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 031FC 80B0EFAC 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E -/* 03200 80B0EFB0 0C2C3B6E */ jal func_80B0EDB8 -/* 03204 80B0EFB4 AFA2002C */ sw $v0, 0x002C($sp) -/* 03208 80B0EFB8 8FA2002C */ lw $v0, 0x002C($sp) -.L80B0EFBC: -/* 0320C 80B0EFBC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 03210 80B0EFC0 0C024F46 */ jal func_80093D18 -/* 03214 80B0EFC4 AFA2002C */ sw $v0, 0x002C($sp) -/* 03218 80B0EFC8 3C0A80B1 */ lui $t2, %hi(func_80B0EDA4) ## $t2 = 80B10000 -/* 0321C 80B0EFCC 254AEDA4 */ addiu $t2, $t2, %lo(func_80B0EDA4) ## $t2 = 80B0EDA4 -/* 03220 80B0EFD0 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 03224 80B0EFD4 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 03228 80B0EFD8 3C0780B1 */ lui $a3, %hi(func_80B0EAC4) ## $a3 = 80B10000 -/* 0322C 80B0EFDC 24E7EAC4 */ addiu $a3, $a3, %lo(func_80B0EAC4) ## $a3 = 80B0EAC4 -/* 03230 80B0EFE0 AFB00014 */ sw $s0, 0x0014($sp) -/* 03234 80B0EFE4 AFAA0010 */ sw $t2, 0x0010($sp) -/* 03238 80B0EFE8 0C028572 */ jal SkelAnime_DrawOpa - -/* 0323C 80B0EFEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03240 80B0EFF0 8FA2002C */ lw $v0, 0x002C($sp) -/* 03244 80B0EFF4 8E0B0190 */ lw $t3, 0x0190($s0) ## 00000190 -/* 03248 80B0EFF8 544B0004 */ bnel $v0, $t3, .L80B0F00C -/* 0324C 80B0EFFC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03250 80B0F000 0C2C3BA9 */ jal func_80B0EEA4 -/* 03254 80B0F004 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03258 80B0F008 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B0F00C: -/* 0325C 80B0F00C 8FB0001C */ lw $s0, 0x001C($sp) -/* 03260 80B0F010 8FB10020 */ lw $s1, 0x0020($sp) -/* 03264 80B0F014 03E00008 */ jr $ra -/* 03268 80B0F018 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0326C 80B0F01C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s deleted file mode 100644 index 0b1d085911..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s +++ /dev/null @@ -1,341 +0,0 @@ -.late_rodata -glabel D_80B0F208 - .float 0.02 - -.text -glabel EnSw_Init -/* 00750 80B0C500 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 00754 80B0C504 3C0F80B1 */ lui $t7, %hi(D_80B0F0E0) ## $t7 = 80B10000 -/* 00758 80B0C508 AFBF002C */ sw $ra, 0x002C($sp) -/* 0075C 80B0C50C AFB00028 */ sw $s0, 0x0028($sp) -/* 00760 80B0C510 AFA50064 */ sw $a1, 0x0064($sp) -/* 00764 80B0C514 25EFF0E0 */ addiu $t7, $t7, %lo(D_80B0F0E0) ## $t7 = 80B0F0E0 -/* 00768 80B0C518 8DF90000 */ lw $t9, 0x0000($t7) ## 80B0F0E0 -/* 0076C 80B0C51C 27AE004C */ addiu $t6, $sp, 0x004C ## $t6 = FFFFFFEC -/* 00770 80B0C520 8DF80004 */ lw $t8, 0x0004($t7) ## 80B0F0E4 -/* 00774 80B0C524 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFEC -/* 00778 80B0C528 8DF90008 */ lw $t9, 0x0008($t7) ## 80B0F0E8 -/* 0077C 80B0C52C ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF0 -/* 00780 80B0C530 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00784 80B0C534 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF4 -/* 00788 80B0C538 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 0078C 80B0C53C 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 00790 80B0C540 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00794 80B0C544 30488000 */ andi $t0, $v0, 0x8000 ## $t0 = 00000000 -/* 00798 80B0C548 11000009 */ beq $t0, $zero, .L80B0C570 -/* 0079C 80B0C54C 00411821 */ addu $v1, $v0, $at -/* 007A0 80B0C550 3063E000 */ andi $v1, $v1, 0xE000 ## $v1 = 00000000 -/* 007A4 80B0C554 00031B43 */ sra $v1, $v1, 13 -/* 007A8 80B0C558 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 007AC 80B0C55C 00035340 */ sll $t2, $v1, 13 -/* 007B0 80B0C560 30491FFF */ andi $t1, $v0, 0x1FFF ## $t1 = 00000000 -/* 007B4 80B0C564 012A5825 */ or $t3, $t1, $t2 ## $t3 = 00000000 -/* 007B8 80B0C568 A48B001C */ sh $t3, 0x001C($a0) ## 0000001C -/* 007BC 80B0C56C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -.L80B0C570: -/* 007C0 80B0C570 304CE000 */ andi $t4, $v0, 0xE000 ## $t4 = 00000000 -/* 007C4 80B0C574 000C6B43 */ sra $t5, $t4, 13 -/* 007C8 80B0C578 19A00009 */ blez $t5, .L80B0C5A0 -/* 007CC 80B0C57C 3C098016 */ lui $t1, %hi(gSaveContext+0xe9c) -/* 007D0 80B0C580 30431F00 */ andi $v1, $v0, 0x1F00 ## $v1 = 00000000 -/* 007D4 80B0C584 00031A03 */ sra $v1, $v1, 8 -/* 007D8 80B0C588 2463FFFF */ addiu $v1, $v1, 0xFFFF ## $v1 = FFFFFFFF -/* 007DC 80B0C58C 00037A00 */ sll $t7, $v1, 8 -/* 007E0 80B0C590 304EE0FF */ andi $t6, $v0, 0xE0FF ## $t6 = 00000000 -/* 007E4 80B0C594 01CFC025 */ or $t8, $t6, $t7 ## $t8 = 80B0F0E0 -/* 007E8 80B0C598 A618001C */ sh $t8, 0x001C($s0) ## 0000001C -/* 007EC 80B0C59C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80B0C5A0: -/* 007F0 80B0C5A0 30431F00 */ andi $v1, $v0, 0x1F00 ## $v1 = 00000000 -/* 007F4 80B0C5A4 00031A03 */ sra $v1, $v1, 8 -/* 007F8 80B0C5A8 30640003 */ andi $a0, $v1, 0x0003 ## $a0 = 00000000 -/* 007FC 80B0C5AC 0003C883 */ sra $t9, $v1, 2 -/* 00800 80B0C5B0 00194080 */ sll $t0, $t9, 2 -/* 00804 80B0C5B4 00042080 */ sll $a0, $a0, 2 -/* 00808 80B0C5B8 3C0A8012 */ lui $t2, %hi(D_8012723C) -/* 0080C 80B0C5BC 01445021 */ addu $t2, $t2, $a0 -/* 00810 80B0C5C0 01284821 */ addu $t1, $t1, $t0 -/* 00814 80B0C5C4 3C0C8012 */ lui $t4, %hi(D_8012724C) -/* 00818 80B0C5C8 8D29F4FC */ lw $t1, %lo(gSaveContext+0xe9c)($t1) -/* 0081C 80B0C5CC 8D4A723C */ lw $t2, %lo(D_8012723C)($t2) -/* 00820 80B0C5D0 01846021 */ addu $t4, $t4, $a0 -/* 00824 80B0C5D4 8D8C724C */ lw $t4, %lo(D_8012724C)($t4) -/* 00828 80B0C5D8 012A5824 */ and $t3, $t1, $t2 -/* 0082C 80B0C5DC 304E00FF */ andi $t6, $v0, 0x00FF ## $t6 = 00000000 -/* 00830 80B0C5E0 018B6806 */ srlv $t5, $t3, $t4 -/* 00834 80B0C5E4 01AE7824 */ and $t7, $t5, $t6 -/* 00838 80B0C5E8 11E00005 */ beq $t7, $zero, .L80B0C600 -/* 0083C 80B0C5EC 8FA40064 */ lw $a0, 0x0064($sp) -/* 00840 80B0C5F0 0C00B55C */ jal Actor_Kill - -/* 00844 80B0C5F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00848 80B0C5F8 100000EF */ beq $zero, $zero, .L80B0C9B8 -/* 0084C 80B0C5FC 8FBF002C */ lw $ra, 0x002C($sp) -.L80B0C600: -/* 00850 80B0C600 3C060600 */ lui $a2, %hi(D_06005298) ## $a2 = 06000000 -/* 00854 80B0C604 261801F8 */ addiu $t8, $s0, 0x01F8 ## $t8 = 000001F8 -/* 00858 80B0C608 261902AC */ addiu $t9, $s0, 0x02AC ## $t9 = 000002AC -/* 0085C 80B0C60C 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 00860 80B0C610 AFA80018 */ sw $t0, 0x0018($sp) -/* 00864 80B0C614 AFB90014 */ sw $t9, 0x0014($sp) -/* 00868 80B0C618 AFB80010 */ sw $t8, 0x0010($sp) -/* 0086C 80B0C61C 24C65298 */ addiu $a2, $a2, %lo(D_06005298) ## $a2 = 06005298 -/* 00870 80B0C620 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00874 80B0C624 0C02915F */ jal SkelAnime_Init - -/* 00878 80B0C628 AFA50040 */ sw $a1, 0x0040($sp) -/* 0087C 80B0C62C 3C0580B1 */ lui $a1, %hi(D_80B0F080) ## $a1 = 80B10000 -/* 00880 80B0C630 24A5F080 */ addiu $a1, $a1, %lo(D_80B0F080) ## $a1 = 80B0F080 -/* 00884 80B0C634 8FA40040 */ lw $a0, 0x0040($sp) -/* 00888 80B0C638 0C00D3B0 */ jal func_80034EC0 -/* 0088C 80B0C63C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00890 80B0C640 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00894 80B0C644 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00898 80B0C648 AFA4003C */ sw $a0, 0x003C($sp) -/* 0089C 80B0C64C 44050000 */ mfc1 $a1, $f0 -/* 008A0 80B0C650 44070000 */ mfc1 $a3, $f0 -/* 008A4 80B0C654 0C00AC78 */ jal ActorShape_Init - -/* 008A8 80B0C658 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 008AC 80B0C65C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 008B0 80B0C660 AFA50040 */ sw $a1, 0x0040($sp) -/* 008B4 80B0C664 0C016EFE */ jal Collider_InitJntSph -/* 008B8 80B0C668 8FA40064 */ lw $a0, 0x0064($sp) -/* 008BC 80B0C66C 3C0780B1 */ lui $a3, %hi(D_80B0F064) ## $a3 = 80B10000 -/* 008C0 80B0C670 260901B4 */ addiu $t1, $s0, 0x01B4 ## $t1 = 000001B4 -/* 008C4 80B0C674 8FA50040 */ lw $a1, 0x0040($sp) -/* 008C8 80B0C678 AFA90010 */ sw $t1, 0x0010($sp) -/* 008CC 80B0C67C 24E7F064 */ addiu $a3, $a3, %lo(D_80B0F064) ## $a3 = 80B0F064 -/* 008D0 80B0C680 8FA40064 */ lw $a0, 0x0064($sp) -/* 008D4 80B0C684 0C017014 */ jal Collider_SetJntSph -/* 008D8 80B0C688 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 008DC 80B0C68C 0C016C80 */ jal DamageTable_Get - -/* 008E0 80B0C690 2404000E */ addiu $a0, $zero, 0x000E ## $a0 = 0000000E -/* 008E4 80B0C694 3C0680B1 */ lui $a2, %hi(D_80B0F074) ## $a2 = 80B10000 -/* 008E8 80B0C698 24C6F074 */ addiu $a2, $a2, %lo(D_80B0F074) ## $a2 = 80B0F074 -/* 008EC 80B0C69C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 008F0 80B0C6A0 0C0187BF */ jal CollisionCheck_SetInfo2 -/* 008F4 80B0C6A4 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 008F8 80B0C6A8 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 008FC 80B0C6AC 3C0180B1 */ lui $at, %hi(D_80B0F208) ## $at = 80B10000 -/* 00900 80B0C6B0 C424F208 */ lwc1 $f4, %lo(D_80B0F208)($at) -/* 00904 80B0C6B4 314BE000 */ andi $t3, $t2, 0xE000 ## $t3 = 00000000 -/* 00908 80B0C6B8 000B6343 */ sra $t4, $t3, 13 -/* 0090C 80B0C6BC 1580002C */ bne $t4, $zero, .L80B0C770 -/* 00910 80B0C6C0 E6040050 */ swc1 $f4, 0x0050($s0) ## 00000050 -/* 00914 80B0C6C4 A6000030 */ sh $zero, 0x0030($s0) ## 00000030 -/* 00918 80B0C6C8 A6000034 */ sh $zero, 0x0034($s0) ## 00000034 -/* 0091C 80B0C6CC 26020030 */ addiu $v0, $s0, 0x0030 ## $v0 = 00000030 -/* 00920 80B0C6D0 884F0000 */ lwl $t7, 0x0000($v0) ## 00000030 -/* 00924 80B0C6D4 8FAD003C */ lw $t5, 0x003C($sp) -/* 00928 80B0C6D8 984F0003 */ lwr $t7, 0x0003($v0) ## 00000033 -/* 0092C 80B0C6DC A9AF0000 */ swl $t7, 0x0000($t5) ## 00000000 -/* 00930 80B0C6E0 B9AF0003 */ swr $t7, 0x0003($t5) ## 00000003 -/* 00934 80B0C6E4 944F0004 */ lhu $t7, 0x0004($v0) ## 00000034 -/* 00938 80B0C6E8 A5AF0004 */ sh $t7, 0x0004($t5) ## 00000004 -/* 0093C 80B0C6EC C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 00940 80B0C6F0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 00944 80B0C6F4 E6060488 */ swc1 $f6, 0x0488($s0) ## 00000488 -/* 00948 80B0C6F8 0C01DE1C */ jal Math_SinS - ## sins? -/* 0094C 80B0C6FC AFA20030 */ sw $v0, 0x0030($sp) -/* 00950 80B0C700 3C01C270 */ lui $at, 0xC270 ## $at = C2700000 -/* 00954 80B0C704 44814000 */ mtc1 $at, $f8 ## $f8 = -60.00 -/* 00958 80B0C708 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 0095C 80B0C70C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 00960 80B0C710 46080282 */ mul.s $f10, $f0, $f8 -/* 00964 80B0C714 46105480 */ add.s $f18, $f10, $f16 -/* 00968 80B0C718 0C01DE0D */ jal Math_CosS - ## coss? -/* 0096C 80B0C71C E6120484 */ swc1 $f18, 0x0484($s0) ## 00000484 -/* 00970 80B0C720 3C01C270 */ lui $at, 0xC270 ## $at = C2700000 -/* 00974 80B0C724 44812000 */ mtc1 $at, $f4 ## $f4 = -60.00 -/* 00978 80B0C728 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 0097C 80B0C72C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00980 80B0C730 46040182 */ mul.s $f6, $f0, $f4 -/* 00984 80B0C734 46083280 */ add.s $f10, $f6, $f8 -/* 00988 80B0C738 E60A048C */ swc1 $f10, 0x048C($s0) ## 0000048C -/* 0098C 80B0C73C 0C2C37FF */ jal func_80B0DFFC -/* 00990 80B0C740 8FA50064 */ lw $a1, 0x0064($sp) -/* 00994 80B0C744 26180008 */ addiu $t8, $s0, 0x0008 ## $t8 = 00000008 -/* 00998 80B0C748 26190024 */ addiu $t9, $s0, 0x0024 ## $t9 = 00000024 -/* 0099C 80B0C74C AFB90034 */ sw $t9, 0x0034($sp) -/* 009A0 80B0C750 AFB80038 */ sw $t8, 0x0038($sp) -/* 009A4 80B0C754 8F2B0000 */ lw $t3, 0x0000($t9) ## 00000024 -/* 009A8 80B0C758 AF0B0000 */ sw $t3, 0x0000($t8) ## 00000008 -/* 009AC 80B0C75C 8F2A0004 */ lw $t2, 0x0004($t9) ## 00000028 -/* 009B0 80B0C760 AF0A0004 */ sw $t2, 0x0004($t8) ## 0000000C -/* 009B4 80B0C764 8F2B0008 */ lw $t3, 0x0008($t9) ## 0000002C -/* 009B8 80B0C768 10000027 */ beq $zero, $zero, .L80B0C808 -/* 009BC 80B0C76C AF0B0008 */ sw $t3, 0x0008($t8) ## 00000010 -.L80B0C770: -/* 009C0 80B0C770 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 009C4 80B0C774 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 009C8 80B0C778 00042400 */ sll $a0, $a0, 16 -/* 009CC 80B0C77C 0C01DE1C */ jal Math_SinS - ## sins? -/* 009D0 80B0C780 00042403 */ sra $a0, $a0, 16 -/* 009D4 80B0C784 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 009D8 80B0C788 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 009DC 80B0C78C E6000370 */ swc1 $f0, 0x0370($s0) ## 00000370 -/* 009E0 80B0C790 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 009E4 80B0C794 00042400 */ sll $a0, $a0, 16 -/* 009E8 80B0C798 00042403 */ sra $a0, $a0, 16 -/* 009EC 80B0C79C 0C01DE0D */ jal Math_CosS - ## coss? -/* 009F0 80B0C7A0 E6100374 */ swc1 $f16, 0x0374($s0) ## 00000374 -/* 009F4 80B0C7A4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 009F8 80B0C7A8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 009FC 80B0C7AC 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 00A00 80B0C7B0 E6000378 */ swc1 $f0, 0x0378($s0) ## 00000378 -/* 00A04 80B0C7B4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00A08 80B0C7B8 E6020364 */ swc1 $f2, 0x0364($s0) ## 00000364 -/* 00A0C 80B0C7BC E602036C */ swc1 $f2, 0x036C($s0) ## 0000036C -/* 00A10 80B0C7C0 0C01DE1C */ jal Math_SinS - ## sins? -/* 00A14 80B0C7C4 E6120368 */ swc1 $f18, 0x0368($s0) ## 00000368 -/* 00A18 80B0C7C8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00A1C 80B0C7CC E600037C */ swc1 $f0, 0x037C($s0) ## 0000037C -/* 00A20 80B0C7D0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00A24 80B0C7D4 0C01DE0D */ jal Math_CosS - ## coss? -/* 00A28 80B0C7D8 E6040380 */ swc1 $f4, 0x0380($s0) ## 00000380 -/* 00A2C 80B0C7DC E6000384 */ swc1 $f0, 0x0384($s0) ## 00000384 -/* 00A30 80B0C7E0 8FA50064 */ lw $a1, 0x0064($sp) -/* 00A34 80B0C7E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A38 80B0C7E8 0C2C3033 */ jal func_80B0C0CC -/* 00A3C 80B0C7EC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00A40 80B0C7F0 260C0008 */ addiu $t4, $s0, 0x0008 ## $t4 = 00000008 -/* 00A44 80B0C7F4 260D0024 */ addiu $t5, $s0, 0x0024 ## $t5 = 00000024 -/* 00A48 80B0C7F8 260E0030 */ addiu $t6, $s0, 0x0030 ## $t6 = 00000030 -/* 00A4C 80B0C7FC AFAE0030 */ sw $t6, 0x0030($sp) -/* 00A50 80B0C800 AFAD0034 */ sw $t5, 0x0034($sp) -/* 00A54 80B0C804 AFAC0038 */ sw $t4, 0x0038($sp) -.L80B0C808: -/* 00A58 80B0C808 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00A5C 80B0C80C 3C078013 */ lui $a3, %hi(D_801333E0) -/* 00A60 80B0C810 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00A64 80B0C814 3042E000 */ andi $v0, $v0, 0xE000 ## $v0 = 00000000 -/* 00A68 80B0C818 00021343 */ sra $v0, $v0, 13 -/* 00A6C 80B0C81C 28410003 */ slti $at, $v0, 0x0003 -/* 00A70 80B0C820 1420000C */ bne $at, $zero, .L80B0C854 -/* 00A74 80B0C824 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 00A78 80B0C828 3C0F8013 */ lui $t7, %hi(D_801333E8) -/* 00A7C 80B0C82C 25EF33E8 */ addiu $t7, %lo(D_801333E8) -/* 00A80 80B0C830 3C058013 */ lui $a1, %hi(D_801333D4) -/* 00A84 80B0C834 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 00A88 80B0C838 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00A8C 80B0C83C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00A90 80B0C840 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00A94 80B0C844 AFA70010 */ sw $a3, 0x0010($sp) -/* 00A98 80B0C848 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00A9C 80B0C84C 3042E000 */ andi $v0, $v0, 0xE000 ## $v0 = 00000000 -/* 00AA0 80B0C850 00021343 */ sra $v0, $v0, 13 -.L80B0C854: -/* 00AA4 80B0C854 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00AA8 80B0C858 10410015 */ beq $v0, $at, .L80B0C8B0 -/* 00AAC 80B0C85C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00AB0 80B0C860 10410010 */ beq $v0, $at, .L80B0C8A4 -/* 00AB4 80B0C864 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00AB8 80B0C868 10410004 */ beq $v0, $at, .L80B0C87C -/* 00ABC 80B0C86C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00AC0 80B0C870 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00AC4 80B0C874 1441001C */ bne $v0, $at, .L80B0C8E8 -/* 00AC8 80B0C878 8FA40064 */ lw $a0, 0x0064($sp) -.L80B0C87C: -/* 00ACC 80B0C87C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00AD0 80B0C880 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 -/* 00AD4 80B0C884 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00AD8 80B0C888 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 00ADC 80B0C88C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00AE0 80B0C890 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 -/* 00AE4 80B0C894 A2180360 */ sb $t8, 0x0360($s0) ## 00000360 -/* 00AE8 80B0C898 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 00AEC 80B0C89C E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 00AF0 80B0C8A0 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -.L80B0C8A4: -/* 00AF4 80B0C8A4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00AF8 80B0C8A8 00000000 */ nop -/* 00AFC 80B0C8AC E6100050 */ swc1 $f16, 0x0050($s0) ## 00000050 -.L80B0C8B0: -/* 00B00 80B0C8B0 8E0201B0 */ lw $v0, 0x01B0($s0) ## 000001B0 -/* 00B04 80B0C8B4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00B08 80B0C8B8 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 00B0C 80B0C8BC 90590005 */ lbu $t9, 0x0005($v0) ## 00000005 -/* 00B10 80B0C8C0 00194040 */ sll $t0, $t9, 1 -/* 00B14 80B0C8C4 A0480005 */ sb $t0, 0x0005($v0) ## 00000005 -/* 00B18 80B0C8C8 920A00AF */ lbu $t2, 0x00AF($s0) ## 000000AF -/* 00B1C 80B0C8CC 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 00B20 80B0C8D0 A2090117 */ sb $t1, 0x0117($s0) ## 00000117 -/* 00B24 80B0C8D4 000A5840 */ sll $t3, $t2, 1 -/* 00B28 80B0C8D8 01816824 */ and $t5, $t4, $at -/* 00B2C 80B0C8DC A20B00AF */ sb $t3, 0x00AF($s0) ## 000000AF -/* 00B30 80B0C8E0 10000007 */ beq $zero, $zero, .L80B0C900 -/* 00B34 80B0C8E4 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -.L80B0C8E8: -/* 00B38 80B0C8E8 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 00B3C 80B0C8EC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00B40 80B0C8F0 0C00CDD2 */ jal Actor_ChangeCategory - -/* 00B44 80B0C8F4 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 00B48 80B0C8F8 240F001F */ addiu $t7, $zero, 0x001F ## $t7 = 0000001F -/* 00B4C 80B0C8FC A20F0117 */ sb $t7, 0x0117($s0) ## 00000117 -.L80B0C900: -/* 00B50 80B0C900 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F -/* 00B54 80B0C904 0C01DF64 */ jal Rand_S16Offset - -/* 00B58 80B0C908 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00B5C 80B0C90C A602038E */ sh $v0, 0x038E($s0) ## 0000038E -/* 00B60 80B0C910 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B64 80B0C914 0C00B58B */ jal Actor_SetScale - -/* 00B68 80B0C918 8E050050 */ lw $a1, 0x0050($s0) ## 00000050 -/* 00B6C 80B0C91C 8FB90034 */ lw $t9, 0x0034($sp) -/* 00B70 80B0C920 8FB80038 */ lw $t8, 0x0038($sp) -/* 00B74 80B0C924 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 -/* 00B78 80B0C928 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 -/* 00B7C 80B0C92C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00B80 80B0C930 AF090000 */ sw $t1, 0x0000($t8) ## 00000000 -/* 00B84 80B0C934 8F280004 */ lw $t0, 0x0004($t9) ## 00000004 -/* 00B88 80B0C938 AF080004 */ sw $t0, 0x0004($t8) ## 00000004 -/* 00B8C 80B0C93C 8F290008 */ lw $t1, 0x0008($t9) ## 00000008 -/* 00B90 80B0C940 AF090008 */ sw $t1, 0x0008($t8) ## 00000008 -/* 00B94 80B0C944 8FAB0030 */ lw $t3, 0x0030($sp) -/* 00B98 80B0C948 8FAA003C */ lw $t2, 0x003C($sp) -/* 00B9C 80B0C94C 3C1880B1 */ lui $t8, %hi(func_80B0D364) ## $t8 = 80B10000 -/* 00BA0 80B0C950 896D0000 */ lwl $t5, 0x0000($t3) ## 00000000 -/* 00BA4 80B0C954 996D0003 */ lwr $t5, 0x0003($t3) ## 00000003 -/* 00BA8 80B0C958 2718D364 */ addiu $t8, $t8, %lo(func_80B0D364) ## $t8 = 80B0D364 -/* 00BAC 80B0C95C A94D0000 */ swl $t5, 0x0000($t2) ## 00000000 -/* 00BB0 80B0C960 B94D0003 */ swr $t5, 0x0003($t2) ## 00000003 -/* 00BB4 80B0C964 956D0004 */ lhu $t5, 0x0004($t3) ## 00000004 -/* 00BB8 80B0C968 A54D0004 */ sh $t5, 0x0004($t2) ## 00000004 -/* 00BBC 80B0C96C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00BC0 80B0C970 3042E000 */ andi $v0, $v0, 0xE000 ## $v0 = 00000000 -/* 00BC4 80B0C974 00021343 */ sra $v0, $v0, 13 -/* 00BC8 80B0C978 28410003 */ slti $at, $v0, 0x0003 -/* 00BCC 80B0C97C 14200005 */ bne $at, $zero, .L80B0C994 -/* 00BD0 80B0C980 00000000 */ nop -/* 00BD4 80B0C984 A60E038C */ sh $t6, 0x038C($s0) ## 0000038C -/* 00BD8 80B0C988 A60F0394 */ sh $t7, 0x0394($s0) ## 00000394 -/* 00BDC 80B0C98C 10000009 */ beq $zero, $zero, .L80B0C9B4 -/* 00BE0 80B0C990 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -.L80B0C994: -/* 00BE4 80B0C994 14400005 */ bne $v0, $zero, .L80B0C9AC -/* 00BE8 80B0C998 3C0880B1 */ lui $t0, %hi(func_80B0D590) ## $t0 = 80B10000 -/* 00BEC 80B0C99C 3C1980B1 */ lui $t9, %hi(func_80B0E5E0) ## $t9 = 80B10000 -/* 00BF0 80B0C9A0 2739E5E0 */ addiu $t9, $t9, %lo(func_80B0E5E0) ## $t9 = 80B0E5E0 -/* 00BF4 80B0C9A4 10000003 */ beq $zero, $zero, .L80B0C9B4 -/* 00BF8 80B0C9A8 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -.L80B0C9AC: -/* 00BFC 80B0C9AC 2508D590 */ addiu $t0, $t0, %lo(func_80B0D590) ## $t0 = 80B0D590 -/* 00C00 80B0C9B0 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -.L80B0C9B4: -/* 00C04 80B0C9B4 8FBF002C */ lw $ra, 0x002C($sp) -.L80B0C9B8: -/* 00C08 80B0C9B8 8FB00028 */ lw $s0, 0x0028($sp) -/* 00C0C 80B0C9BC 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 00C10 80B0C9C0 03E00008 */ jr $ra -/* 00C14 80B0C9C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Update.s deleted file mode 100644 index ae08fd4844..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Update.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel EnSw_Update -/* 02CB8 80B0EA68 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02CBC 80B0EA6C AFB00018 */ sw $s0, 0x0018($sp) -/* 02CC0 80B0EA70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02CC4 80B0EA74 AFBF001C */ sw $ra, 0x001C($sp) -/* 02CC8 80B0EA78 AFA50024 */ sw $a1, 0x0024($sp) -/* 02CCC 80B0EA7C 0C02927F */ jal SkelAnime_Update - -/* 02CD0 80B0EA80 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02CD4 80B0EA84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02CD8 80B0EA88 0C2C327C */ jal func_80B0C9F0 -/* 02CDC 80B0EA8C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02CE0 80B0EA90 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 02CE4 80B0EA94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02CE8 80B0EA98 8FA50024 */ lw $a1, 0x0024($sp) -/* 02CEC 80B0EA9C 0320F809 */ jalr $ra, $t9 -/* 02CF0 80B0EAA0 00000000 */ nop -/* 02CF4 80B0EAA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02CF8 80B0EAA8 0C2C32FA */ jal func_80B0CBE8 -/* 02CFC 80B0EAAC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02D00 80B0EAB0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02D04 80B0EAB4 8FB00018 */ lw $s0, 0x0018($sp) -/* 02D08 80B0EAB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02D0C 80B0EABC 03E00008 */ jr $ra -/* 02D10 80B0EAC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BDB0.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BDB0.s deleted file mode 100644 index 2cc17a5340..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BDB0.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80B0BDB0 -/* 00000 80B0BDB0 C4840004 */ lwc1 $f4, 0x0004($a0) ## 00000004 -/* 00004 80B0BDB4 C4A60008 */ lwc1 $f6, 0x0008($a1) ## 00000008 -/* 00008 80B0BDB8 C48A0008 */ lwc1 $f10, 0x0008($a0) ## 00000008 -/* 0000C 80B0BDBC C4B00004 */ lwc1 $f16, 0x0004($a1) ## 00000004 -/* 00010 80B0BDC0 46062202 */ mul.s $f8, $f4, $f6 -/* 00014 80B0BDC4 00000000 */ nop -/* 00018 80B0BDC8 46105482 */ mul.s $f18, $f10, $f16 -/* 0001C 80B0BDCC 46124101 */ sub.s $f4, $f8, $f18 -/* 00020 80B0BDD0 E4C40000 */ swc1 $f4, 0x0000($a2) ## 00000000 -/* 00024 80B0BDD4 C4AA0000 */ lwc1 $f10, 0x0000($a1) ## 00000000 -/* 00028 80B0BDD8 C4860008 */ lwc1 $f6, 0x0008($a0) ## 00000008 -/* 0002C 80B0BDDC C4880000 */ lwc1 $f8, 0x0000($a0) ## 00000000 -/* 00030 80B0BDE0 C4B20008 */ lwc1 $f18, 0x0008($a1) ## 00000008 -/* 00034 80B0BDE4 460A3402 */ mul.s $f16, $f6, $f10 -/* 00038 80B0BDE8 00000000 */ nop -/* 0003C 80B0BDEC 46124102 */ mul.s $f4, $f8, $f18 -/* 00040 80B0BDF0 46048181 */ sub.s $f6, $f16, $f4 -/* 00044 80B0BDF4 E4C60004 */ swc1 $f6, 0x0004($a2) ## 00000004 -/* 00048 80B0BDF8 C4A80004 */ lwc1 $f8, 0x0004($a1) ## 00000004 -/* 0004C 80B0BDFC C48A0000 */ lwc1 $f10, 0x0000($a0) ## 00000000 -/* 00050 80B0BE00 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 00054 80B0BE04 C4900004 */ lwc1 $f16, 0x0004($a0) ## 00000004 -/* 00058 80B0BE08 46085482 */ mul.s $f18, $f10, $f8 -/* 0005C 80B0BE0C 00000000 */ nop -/* 00060 80B0BE10 46048182 */ mul.s $f6, $f16, $f4 -/* 00064 80B0BE14 46069281 */ sub.s $f10, $f18, $f6 -/* 00068 80B0BE18 03E00008 */ jr $ra -/* 0006C 80B0BE1C E4CA0008 */ swc1 $f10, 0x0008($a2) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s deleted file mode 100644 index f198fbc266..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s +++ /dev/null @@ -1,138 +0,0 @@ -.late_rodata -glabel D_80B0F200 - .word 0x38000100 -glabel D_80B0F204 - .float 0.001 - -.text -glabel func_80B0BE20 -/* 00070 80B0BE20 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00074 80B0BE24 3C0180B1 */ lui $at, %hi(D_80B0F200) ## $at = 80B10000 -/* 00078 80B0BE28 C420F200 */ lwc1 $f0, %lo(D_80B0F200)($at) -/* 0007C 80B0BE2C AFBF001C */ sw $ra, 0x001C($sp) -/* 00080 80B0BE30 AFB00018 */ sw $s0, 0x0018($sp) -/* 00084 80B0BE34 AC850078 */ sw $a1, 0x0078($a0) ## 00000078 -/* 00088 80B0BE38 84AE0008 */ lh $t6, 0x0008($a1) ## 00000008 -/* 0008C 80B0BE3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00090 80B0BE40 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00094 80B0BE44 00000000 */ nop -/* 00098 80B0BE48 468021A0 */ cvt.s.w $f6, $f4 -/* 0009C 80B0BE4C 46003202 */ mul.s $f8, $f6, $f0 -/* 000A0 80B0BE50 E7A80044 */ swc1 $f8, 0x0044($sp) -/* 000A4 80B0BE54 84AF000A */ lh $t7, 0x000A($a1) ## 0000000A -/* 000A8 80B0BE58 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 000AC 80B0BE5C 00000000 */ nop -/* 000B0 80B0BE60 46805420 */ cvt.s.w $f16, $f10 -/* 000B4 80B0BE64 46008482 */ mul.s $f18, $f16, $f0 -/* 000B8 80B0BE68 E7B20048 */ swc1 $f18, 0x0048($sp) -/* 000BC 80B0BE6C 84B8000C */ lh $t8, 0x000C($a1) ## 0000000C -/* 000C0 80B0BE70 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 000C4 80B0BE74 00000000 */ nop -/* 000C8 80B0BE78 468021A0 */ cvt.s.w $f6, $f4 -/* 000CC 80B0BE7C 46003282 */ mul.s $f10, $f6, $f0 -/* 000D0 80B0BE80 E7AA004C */ swc1 $f10, 0x004C($sp) -/* 000D4 80B0BE84 C4900364 */ lwc1 $f16, 0x0364($a0) ## 00000364 -/* 000D8 80B0BE88 C4860368 */ lwc1 $f6, 0x0368($a0) ## 00000368 -/* 000DC 80B0BE8C 46088102 */ mul.s $f4, $f16, $f8 -/* 000E0 80B0BE90 00000000 */ nop -/* 000E4 80B0BE94 46069402 */ mul.s $f16, $f18, $f6 -/* 000E8 80B0BE98 C492036C */ lwc1 $f18, 0x036C($a0) ## 0000036C -/* 000EC 80B0BE9C 46125182 */ mul.s $f6, $f10, $f18 -/* 000F0 80B0BEA0 46102200 */ add.s $f8, $f4, $f16 -/* 000F4 80B0BEA4 0C03F4DA */ jal Math_FAcosF -/* 000F8 80B0BEA8 46064300 */ add.s $f12, $f8, $f6 -/* 000FC 80B0BEAC 26040364 */ addiu $a0, $s0, 0x0364 ## $a0 = 00000364 -/* 00100 80B0BEB0 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 00104 80B0BEB4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00108 80B0BEB8 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFF4 -/* 0010C 80B0BEBC 0C2C2F6C */ jal func_80B0BDB0 -/* 00110 80B0BEC0 27A60038 */ addiu $a2, $sp, 0x0038 ## $a2 = FFFFFFE8 -/* 00114 80B0BEC4 C7AC0034 */ lwc1 $f12, 0x0034($sp) -/* 00118 80B0BEC8 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFE8 -/* 0011C 80B0BECC 0C0348FF */ jal func_800D23FC -/* 00120 80B0BED0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00124 80B0BED4 26040370 */ addiu $a0, $s0, 0x0370 ## $a0 = 00000370 -/* 00128 80B0BED8 AFA40024 */ sw $a0, 0x0024($sp) -/* 0012C 80B0BEDC 0C0346BD */ jal Matrix_MultVec3f -/* 00130 80B0BEE0 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFE8 -/* 00134 80B0BEE4 27B90038 */ addiu $t9, $sp, 0x0038 ## $t9 = FFFFFFE8 -/* 00138 80B0BEE8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0013C 80B0BEEC 8F290000 */ lw $t1, 0x0000($t9) ## FFFFFFE8 -/* 00140 80B0BEF0 2606037C */ addiu $a2, $s0, 0x037C ## $a2 = 0000037C -/* 00144 80B0BEF4 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFF4 -/* 00148 80B0BEF8 AC890000 */ sw $t1, 0x0000($a0) ## 00000000 -/* 0014C 80B0BEFC 8F280004 */ lw $t0, 0x0004($t9) ## FFFFFFEC -/* 00150 80B0BF00 AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 00154 80B0BF04 8F290008 */ lw $t1, 0x0008($t9) ## FFFFFFF0 -/* 00158 80B0BF08 AC890008 */ sw $t1, 0x0008($a0) ## 00000008 -/* 0015C 80B0BF0C 0C2C2F6C */ jal func_80B0BDB0 -/* 00160 80B0BF10 AFA60020 */ sw $a2, 0x0020($sp) -/* 00164 80B0BF14 0C032D8A */ jal Math3D_Vec3fMagnitude -/* 00168 80B0BF18 8FA40020 */ lw $a0, 0x0020($sp) -/* 0016C 80B0BF1C 3C0180B1 */ lui $at, %hi(D_80B0F204) ## $at = 80B10000 -/* 00170 80B0BF20 C424F204 */ lwc1 $f4, %lo(D_80B0F204)($at) -/* 00174 80B0BF24 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00178 80B0BF28 4604003C */ c.lt.s $f0, $f4 -/* 0017C 80B0BF2C 00000000 */ nop -/* 00180 80B0BF30 45020004 */ bc1fl .L80B0BF44 -/* 00184 80B0BF34 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 -/* 00188 80B0BF38 10000034 */ beq $zero, $zero, .L80B0C00C -/* 0018C 80B0BF3C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00190 80B0BF40 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 -.L80B0BF44: -/* 00194 80B0BF44 C610037C */ lwc1 $f16, 0x037C($s0) ## 0000037C -/* 00198 80B0BF48 C6120380 */ lwc1 $f18, 0x0380($s0) ## 00000380 -/* 0019C 80B0BF4C 46007083 */ div.s $f2, $f14, $f0 -/* 001A0 80B0BF50 C6060384 */ lwc1 $f6, 0x0384($s0) ## 00000384 -/* 001A4 80B0BF54 27AB0044 */ addiu $t3, $sp, 0x0044 ## $t3 = FFFFFFF4 -/* 001A8 80B0BF58 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 001AC 80B0BF5C 260403D8 */ addiu $a0, $s0, 0x03D8 ## $a0 = 000003D8 -/* 001B0 80B0BF60 26050030 */ addiu $a1, $s0, 0x0030 ## $a1 = 00000030 -/* 001B4 80B0BF64 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 001B8 80B0BF68 46028282 */ mul.s $f10, $f16, $f2 -/* 001BC 80B0BF6C 00000000 */ nop -/* 001C0 80B0BF70 46029202 */ mul.s $f8, $f18, $f2 -/* 001C4 80B0BF74 00000000 */ nop -/* 001C8 80B0BF78 46023102 */ mul.s $f4, $f6, $f2 -/* 001CC 80B0BF7C E60A037C */ swc1 $f10, 0x037C($s0) ## 0000037C -/* 001D0 80B0BF80 E6080380 */ swc1 $f8, 0x0380($s0) ## 00000380 -/* 001D4 80B0BF84 E6040384 */ swc1 $f4, 0x0384($s0) ## 00000384 -/* 001D8 80B0BF88 8D6D0000 */ lw $t5, 0x0000($t3) ## FFFFFFF4 -/* 001DC 80B0BF8C 8FAA0028 */ lw $t2, 0x0028($sp) -/* 001E0 80B0BF90 AD4D0000 */ sw $t5, 0x0000($t2) ## 00000000 -/* 001E4 80B0BF94 8D6C0004 */ lw $t4, 0x0004($t3) ## FFFFFFF8 -/* 001E8 80B0BF98 AD4C0004 */ sw $t4, 0x0004($t2) ## 00000004 -/* 001EC 80B0BF9C 8D6D0008 */ lw $t5, 0x0008($t3) ## FFFFFFFC -/* 001F0 80B0BFA0 AD4D0008 */ sw $t5, 0x0008($t2) ## 00000008 -/* 001F4 80B0BFA4 C6100370 */ lwc1 $f16, 0x0370($s0) ## 00000370 -/* 001F8 80B0BFA8 C60A0374 */ lwc1 $f10, 0x0374($s0) ## 00000374 -/* 001FC 80B0BFAC C6120378 */ lwc1 $f18, 0x0378($s0) ## 00000378 -/* 00200 80B0BFB0 E61003D8 */ swc1 $f16, 0x03D8($s0) ## 000003D8 -/* 00204 80B0BFB4 E60A03DC */ swc1 $f10, 0x03DC($s0) ## 000003DC -/* 00208 80B0BFB8 E61203E0 */ swc1 $f18, 0x03E0($s0) ## 000003E0 -/* 0020C 80B0BFBC C6080364 */ lwc1 $f8, 0x0364($s0) ## 00000364 -/* 00210 80B0BFC0 C6060368 */ lwc1 $f6, 0x0368($s0) ## 00000368 -/* 00214 80B0BFC4 C604036C */ lwc1 $f4, 0x036C($s0) ## 0000036C -/* 00218 80B0BFC8 C610037C */ lwc1 $f16, 0x037C($s0) ## 0000037C -/* 0021C 80B0BFCC C60A0380 */ lwc1 $f10, 0x0380($s0) ## 00000380 -/* 00220 80B0BFD0 C6120384 */ lwc1 $f18, 0x0384($s0) ## 00000384 -/* 00224 80B0BFD4 E60E0414 */ swc1 $f14, 0x0414($s0) ## 00000414 -/* 00228 80B0BFD8 E60C03E4 */ swc1 $f12, 0x03E4($s0) ## 000003E4 -/* 0022C 80B0BFDC E60C03F4 */ swc1 $f12, 0x03F4($s0) ## 000003F4 -/* 00230 80B0BFE0 E60C0404 */ swc1 $f12, 0x0404($s0) ## 00000404 -/* 00234 80B0BFE4 E60C0408 */ swc1 $f12, 0x0408($s0) ## 00000408 -/* 00238 80B0BFE8 E60C040C */ swc1 $f12, 0x040C($s0) ## 0000040C -/* 0023C 80B0BFEC E60C0410 */ swc1 $f12, 0x0410($s0) ## 00000410 -/* 00240 80B0BFF0 E60803E8 */ swc1 $f8, 0x03E8($s0) ## 000003E8 -/* 00244 80B0BFF4 E60603EC */ swc1 $f6, 0x03EC($s0) ## 000003EC -/* 00248 80B0BFF8 E60403F0 */ swc1 $f4, 0x03F0($s0) ## 000003F0 -/* 0024C 80B0BFFC E61003F8 */ swc1 $f16, 0x03F8($s0) ## 000003F8 -/* 00250 80B0C000 E60A03FC */ swc1 $f10, 0x03FC($s0) ## 000003FC -/* 00254 80B0C004 0C034833 */ jal func_800D20CC -/* 00258 80B0C008 E6120400 */ swc1 $f18, 0x0400($s0) ## 00000400 -.L80B0C00C: -/* 0025C 80B0C00C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00260 80B0C010 8FB00018 */ lw $s0, 0x0018($sp) -/* 00264 80B0C014 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00268 80B0C018 03E00008 */ jr $ra -/* 0026C 80B0C01C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C020.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C020.s deleted file mode 100644 index 1ec73c0217..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C020.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80B0C020 -/* 00270 80B0C020 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00274 80B0C024 8FA80050 */ lw $t0, 0x0050($sp) -/* 00278 80B0C028 AFA40040 */ sw $a0, 0x0040($sp) -/* 0027C 80B0C02C AFBF002C */ sw $ra, 0x002C($sp) -/* 00280 80B0C030 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 00284 80B0C034 27AE003C */ addiu $t6, $sp, 0x003C ## $t6 = FFFFFFFC -/* 00288 80B0C038 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0028C 80B0C03C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00290 80B0C040 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00294 80B0C044 AFB9001C */ sw $t9, 0x001C($sp) -/* 00298 80B0C048 AFB80018 */ sw $t8, 0x0018($sp) -/* 0029C 80B0C04C AFAF0014 */ sw $t7, 0x0014($sp) -/* 002A0 80B0C050 AFAE0010 */ sw $t6, 0x0010($sp) -/* 002A4 80B0C054 AFA40034 */ sw $a0, 0x0034($sp) -/* 002A8 80B0C058 AFA00020 */ sw $zero, 0x0020($sp) -/* 002AC 80B0C05C 0C00F7A1 */ jal BgCheck_EntityLineTest1 -/* 002B0 80B0C060 AFA80024 */ sw $t0, 0x0024($sp) -/* 002B4 80B0C064 14400003 */ bne $v0, $zero, .L80B0C074 -/* 002B8 80B0C068 8FA40034 */ lw $a0, 0x0034($sp) -/* 002BC 80B0C06C 10000013 */ beq $zero, $zero, .L80B0C0BC -/* 002C0 80B0C070 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B0C074: -/* 002C4 80B0C074 8FA90050 */ lw $t1, 0x0050($sp) -/* 002C8 80B0C078 8FA5003C */ lw $a1, 0x003C($sp) -/* 002CC 80B0C07C 0C01076E */ jal func_80041DB8 -/* 002D0 80B0C080 8D260000 */ lw $a2, 0x0000($t1) ## 00000000 -/* 002D4 80B0C084 304A0030 */ andi $t2, $v0, 0x0030 ## $t2 = 00000000 -/* 002D8 80B0C088 11400003 */ beq $t2, $zero, .L80B0C098 -/* 002DC 80B0C08C 8FA40034 */ lw $a0, 0x0034($sp) -/* 002E0 80B0C090 1000000A */ beq $zero, $zero, .L80B0C0BC -/* 002E4 80B0C094 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B0C098: -/* 002E8 80B0C098 8FAB0050 */ lw $t3, 0x0050($sp) -/* 002EC 80B0C09C 8FA5003C */ lw $a1, 0x003C($sp) -/* 002F0 80B0C0A0 0C010812 */ jal SurfaceType_IsIgnoredByProjectiles -/* 002F4 80B0C0A4 8D660000 */ lw $a2, 0x0000($t3) ## 00000000 -/* 002F8 80B0C0A8 50400004 */ beql $v0, $zero, .L80B0C0BC -/* 002FC 80B0C0AC 8FA2003C */ lw $v0, 0x003C($sp) -/* 00300 80B0C0B0 10000002 */ beq $zero, $zero, .L80B0C0BC -/* 00304 80B0C0B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00308 80B0C0B8 8FA2003C */ lw $v0, 0x003C($sp) -.L80B0C0BC: -/* 0030C 80B0C0BC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00310 80B0C0C0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00314 80B0C0C4 03E00008 */ jr $ra -/* 00318 80B0C0C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C0CC.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C0CC.s deleted file mode 100644 index 48c51d6fd3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C0CC.s +++ /dev/null @@ -1,286 +0,0 @@ -glabel func_80B0C0CC -/* 0031C 80B0C0CC 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 -/* 00320 80B0C0D0 AFBF004C */ sw $ra, 0x004C($sp) -/* 00324 80B0C0D4 AFBE0048 */ sw $s8, 0x0048($sp) -/* 00328 80B0C0D8 AFB70044 */ sw $s7, 0x0044($sp) -/* 0032C 80B0C0DC AFB60040 */ sw $s6, 0x0040($sp) -/* 00330 80B0C0E0 AFB5003C */ sw $s5, 0x003C($sp) -/* 00334 80B0C0E4 AFB40038 */ sw $s4, 0x0038($sp) -/* 00338 80B0C0E8 AFB30034 */ sw $s3, 0x0034($sp) -/* 0033C 80B0C0EC AFB20030 */ sw $s2, 0x0030($sp) -/* 00340 80B0C0F0 AFB1002C */ sw $s1, 0x002C($sp) -/* 00344 80B0C0F4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00348 80B0C0F8 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 0034C 80B0C0FC AFA600B8 */ sw $a2, 0x00B8($sp) -/* 00350 80B0C100 AFA00064 */ sw $zero, 0x0064($sp) -/* 00354 80B0C104 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00358 80B0C108 A08E042C */ sb $t6, 0x042C($a0) ## 0000042C -/* 0035C 80B0C10C 24830024 */ addiu $v1, $a0, 0x0024 ## $v1 = 00000024 -/* 00360 80B0C110 8C780000 */ lw $t8, 0x0000($v1) ## 00000024 -/* 00364 80B0C114 27A20058 */ addiu $v0, $sp, 0x0058 ## $v0 = FFFFFFA8 -/* 00368 80B0C118 27B40078 */ addiu $s4, $sp, 0x0078 ## $s4 = FFFFFFC8 -/* 0036C 80B0C11C AC580000 */ sw $t8, 0x0000($v0) ## FFFFFFA8 -/* 00370 80B0C120 8C6F0004 */ lw $t7, 0x0004($v1) ## 00000028 -/* 00374 80B0C124 8C480000 */ lw $t0, 0x0000($v0) ## FFFFFFA8 -/* 00378 80B0C128 8C4A0000 */ lw $t2, 0x0000($v0) ## FFFFFFA8 -/* 0037C 80B0C12C AC4F0004 */ sw $t7, 0x0004($v0) ## FFFFFFAC -/* 00380 80B0C130 8C780008 */ lw $t8, 0x0008($v1) ## 0000002C -/* 00384 80B0C134 27B50084 */ addiu $s5, $sp, 0x0084 ## $s5 = FFFFFFD4 -/* 00388 80B0C138 3C014190 */ lui $at, 0x4190 ## $at = 41900000 -/* 0038C 80B0C13C AEAF0004 */ sw $t7, 0x0004($s5) ## FFFFFFD8 -/* 00390 80B0C140 AE8F0004 */ sw $t7, 0x0004($s4) ## FFFFFFCC -/* 00394 80B0C144 AE880000 */ sw $t0, 0x0000($s4) ## FFFFFFC8 -/* 00398 80B0C148 AEAA0000 */ sw $t2, 0x0000($s5) ## FFFFFFD4 -/* 0039C 80B0C14C AEB80008 */ sw $t8, 0x0008($s5) ## FFFFFFDC -/* 003A0 80B0C150 AC580008 */ sw $t8, 0x0008($v0) ## FFFFFFB0 -/* 003A4 80B0C154 AE980008 */ sw $t8, 0x0008($s4) ## FFFFFFD0 -/* 003A8 80B0C158 44810000 */ mtc1 $at, $f0 ## $f0 = 18.00 -/* 003AC 80B0C15C C4860364 */ lwc1 $f6, 0x0364($a0) ## 00000364 -/* 003B0 80B0C160 C7A40084 */ lwc1 $f4, 0x0084($sp) -/* 003B4 80B0C164 C7B00088 */ lwc1 $f16, 0x0088($sp) -/* 003B8 80B0C168 46003202 */ mul.s $f8, $f6, $f0 -/* 003BC 80B0C16C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003C0 80B0C170 27B20090 */ addiu $s2, $sp, 0x0090 ## $s2 = FFFFFFE0 -/* 003C4 80B0C174 00A0B825 */ or $s7, $a1, $zero ## $s7 = 00000000 -/* 003C8 80B0C178 27AB0070 */ addiu $t3, $sp, 0x0070 ## $t3 = FFFFFFC0 -/* 003CC 80B0C17C 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFFE0 -/* 003D0 80B0C180 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFC8 -/* 003D4 80B0C184 46082280 */ add.s $f10, $f4, $f8 -/* 003D8 80B0C188 C7A8008C */ lwc1 $f8, 0x008C($sp) -/* 003DC 80B0C18C E7AA0084 */ swc1 $f10, 0x0084($sp) -/* 003E0 80B0C190 C4920368 */ lwc1 $f18, 0x0368($a0) ## 00000368 -/* 003E4 80B0C194 46009182 */ mul.s $f6, $f18, $f0 -/* 003E8 80B0C198 46068100 */ add.s $f4, $f16, $f6 -/* 003EC 80B0C19C C7A60078 */ lwc1 $f6, 0x0078($sp) -/* 003F0 80B0C1A0 E7A40088 */ swc1 $f4, 0x0088($sp) -/* 003F4 80B0C1A4 C48A036C */ lwc1 $f10, 0x036C($a0) ## 0000036C -/* 003F8 80B0C1A8 46005482 */ mul.s $f18, $f10, $f0 -/* 003FC 80B0C1AC 46124400 */ add.s $f16, $f8, $f18 -/* 00400 80B0C1B0 C7B2007C */ lwc1 $f18, 0x007C($sp) -/* 00404 80B0C1B4 E7B0008C */ swc1 $f16, 0x008C($sp) -/* 00408 80B0C1B8 C4840364 */ lwc1 $f4, 0x0364($a0) ## 00000364 -/* 0040C 80B0C1BC 46002282 */ mul.s $f10, $f4, $f0 -/* 00410 80B0C1C0 460A3201 */ sub.s $f8, $f6, $f10 -/* 00414 80B0C1C4 C7AA0080 */ lwc1 $f10, 0x0080($sp) -/* 00418 80B0C1C8 E7A80078 */ swc1 $f8, 0x0078($sp) -/* 0041C 80B0C1CC C4900368 */ lwc1 $f16, 0x0368($a0) ## 00000368 -/* 00420 80B0C1D0 46008102 */ mul.s $f4, $f16, $f0 -/* 00424 80B0C1D4 46049181 */ sub.s $f6, $f18, $f4 -/* 00428 80B0C1D8 E7A6007C */ swc1 $f6, 0x007C($sp) -/* 0042C 80B0C1DC C488036C */ lwc1 $f8, 0x036C($a0) ## 0000036C -/* 00430 80B0C1E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00434 80B0C1E4 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFD4 -/* 00438 80B0C1E8 46004402 */ mul.s $f16, $f8, $f0 -/* 0043C 80B0C1EC AFA30054 */ sw $v1, 0x0054($sp) -/* 00440 80B0C1F0 AFAB0010 */ sw $t3, 0x0010($sp) -/* 00444 80B0C1F4 46105481 */ sub.s $f18, $f10, $f16 -/* 00448 80B0C1F8 0C2C3008 */ jal func_80B0C020 -/* 0044C 80B0C1FC E7B20080 */ swc1 $f18, 0x0080($sp) -/* 00450 80B0C200 10400041 */ beq $v0, $zero, .L80B0C308 -/* 00454 80B0C204 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 00458 80B0C208 920C0360 */ lbu $t4, 0x0360($s0) ## 00000360 -/* 0045C 80B0C20C 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 00460 80B0C210 5580003E */ bnel $t4, $zero, .L80B0C30C -/* 00464 80B0C214 8E8F0000 */ lw $t7, 0x0000($s4) ## FFFFFFC8 -/* 00468 80B0C218 44810000 */ mtc1 $at, $f0 ## $f0 = 24.00 -/* 0046C 80B0C21C C604037C */ lwc1 $f4, 0x037C($s0) ## 0000037C -/* 00470 80B0C220 C7A80084 */ lwc1 $f8, 0x0084($sp) -/* 00474 80B0C224 27B6006C */ addiu $s6, $sp, 0x006C ## $s6 = FFFFFFBC -/* 00478 80B0C228 46002182 */ mul.s $f6, $f4, $f0 -/* 0047C 80B0C22C C7A40088 */ lwc1 $f4, 0x0088($sp) -/* 00480 80B0C230 27BE009C */ addiu $s8, $sp, 0x009C ## $s8 = FFFFFFEC -/* 00484 80B0C234 03C03825 */ or $a3, $s8, $zero ## $a3 = FFFFFFEC -/* 00488 80B0C238 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000000 -/* 0048C 80B0C23C 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFD4 -/* 00490 80B0C240 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFC8 -/* 00494 80B0C244 46083280 */ add.s $f10, $f6, $f8 -/* 00498 80B0C248 E7AA0078 */ swc1 $f10, 0x0078($sp) -/* 0049C 80B0C24C C6100380 */ lwc1 $f16, 0x0380($s0) ## 00000380 -/* 004A0 80B0C250 46008482 */ mul.s $f18, $f16, $f0 -/* 004A4 80B0C254 C7B0008C */ lwc1 $f16, 0x008C($sp) -/* 004A8 80B0C258 46049180 */ add.s $f6, $f18, $f4 -/* 004AC 80B0C25C E7A6007C */ swc1 $f6, 0x007C($sp) -/* 004B0 80B0C260 C6080384 */ lwc1 $f8, 0x0384($s0) ## 00000384 -/* 004B4 80B0C264 AFB60010 */ sw $s6, 0x0010($sp) -/* 004B8 80B0C268 46004282 */ mul.s $f10, $f8, $f0 -/* 004BC 80B0C26C 46105480 */ add.s $f18, $f10, $f16 -/* 004C0 80B0C270 0C2C3008 */ jal func_80B0C020 -/* 004C4 80B0C274 E7B20080 */ swc1 $f18, 0x0080($sp) -/* 004C8 80B0C278 10400011 */ beq $v0, $zero, .L80B0C2C0 -/* 004CC 80B0C27C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 004D0 80B0C280 8FAD00B8 */ lw $t5, 0x00B8($sp) -/* 004D4 80B0C284 24130001 */ addiu $s3, $zero, 0x0001 ## $s3 = 00000001 -/* 004D8 80B0C288 55B3001D */ bnel $t5, $s3, .L80B0C300 -/* 004DC 80B0C28C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 004E0 80B0C290 0C2C2F88 */ jal func_80B0BE20 -/* 004E4 80B0C294 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004E8 80B0C298 8FAE0054 */ lw $t6, 0x0054($sp) -/* 004EC 80B0C29C 8FD80000 */ lw $t8, 0x0000($s8) ## FFFFFFEC -/* 004F0 80B0C2A0 ADD80000 */ sw $t8, 0x0000($t6) ## 00000000 -/* 004F4 80B0C2A4 8FCF0004 */ lw $t7, 0x0004($s8) ## FFFFFFF0 -/* 004F8 80B0C2A8 ADCF0004 */ sw $t7, 0x0004($t6) ## 00000004 -/* 004FC 80B0C2AC 8FD80008 */ lw $t8, 0x0008($s8) ## FFFFFFF4 -/* 00500 80B0C2B0 ADD80008 */ sw $t8, 0x0008($t6) ## 00000008 -/* 00504 80B0C2B4 8FB9006C */ lw $t9, 0x006C($sp) -/* 00508 80B0C2B8 10000010 */ beq $zero, $zero, .L80B0C2FC -/* 0050C 80B0C2BC A219007D */ sb $t9, 0x007D($s0) ## 0000007D -.L80B0C2C0: -/* 00510 80B0C2C0 8E080078 */ lw $t0, 0x0078($s0) ## 00000078 -/* 00514 80B0C2C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00518 80B0C2C8 52280004 */ beql $s1, $t0, .L80B0C2DC -/* 0051C 80B0C2CC 8FA90054 */ lw $t1, 0x0054($sp) -/* 00520 80B0C2D0 0C2C2F88 */ jal func_80B0BE20 -/* 00524 80B0C2D4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00528 80B0C2D8 8FA90054 */ lw $t1, 0x0054($sp) -.L80B0C2DC: -/* 0052C 80B0C2DC 8E4B0000 */ lw $t3, 0x0000($s2) ## FFFFFFE0 -/* 00530 80B0C2E0 AD2B0000 */ sw $t3, 0x0000($t1) ## 00000000 -/* 00534 80B0C2E4 8E4A0004 */ lw $t2, 0x0004($s2) ## FFFFFFE4 -/* 00538 80B0C2E8 AD2A0004 */ sw $t2, 0x0004($t1) ## 00000004 -/* 0053C 80B0C2EC 8E4B0008 */ lw $t3, 0x0008($s2) ## FFFFFFE8 -/* 00540 80B0C2F0 AD2B0008 */ sw $t3, 0x0008($t1) ## 00000008 -/* 00544 80B0C2F4 8FAC0070 */ lw $t4, 0x0070($sp) -/* 00548 80B0C2F8 A20C007D */ sb $t4, 0x007D($s0) ## 0000007D -.L80B0C2FC: -/* 0054C 80B0C2FC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -.L80B0C300: -/* 00550 80B0C300 1000005C */ beq $zero, $zero, .L80B0C474 -/* 00554 80B0C304 AFAD0064 */ sw $t5, 0x0064($sp) -.L80B0C308: -/* 00558 80B0C308 8E8F0000 */ lw $t7, 0x0000($s4) ## FFFFFFC8 -.L80B0C30C: -/* 0055C 80B0C30C 8E8E0004 */ lw $t6, 0x0004($s4) ## FFFFFFCC -/* 00560 80B0C310 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 00564 80B0C314 AEAF0000 */ sw $t7, 0x0000($s5) ## FFFFFFD4 -/* 00568 80B0C318 8E8F0008 */ lw $t7, 0x0008($s4) ## FFFFFFD0 -/* 0056C 80B0C31C 4481A000 */ mtc1 $at, $f20 ## $f20 = 24.00 -/* 00570 80B0C320 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00574 80B0C324 27BE009C */ addiu $s8, $sp, 0x009C ## $s8 = FFFFFFEC -/* 00578 80B0C328 27B6006C */ addiu $s6, $sp, 0x006C ## $s6 = FFFFFFBC -/* 0057C 80B0C32C 24130001 */ addiu $s3, $zero, 0x0001 ## $s3 = 00000001 -/* 00580 80B0C330 24120003 */ addiu $s2, $zero, 0x0003 ## $s2 = 00000003 -/* 00584 80B0C334 AEAE0004 */ sw $t6, 0x0004($s5) ## FFFFFFD8 -/* 00588 80B0C338 AEAF0008 */ sw $t7, 0x0008($s5) ## FFFFFFDC -.L80B0C33C: -/* 0058C 80B0C33C 16200011 */ bne $s1, $zero, .L80B0C384 -/* 00590 80B0C340 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000000 -/* 00594 80B0C344 C606037C */ lwc1 $f6, 0x037C($s0) ## 0000037C -/* 00598 80B0C348 C7A40084 */ lwc1 $f4, 0x0084($sp) -/* 0059C 80B0C34C C7B00088 */ lwc1 $f16, 0x0088($sp) -/* 005A0 80B0C350 46143202 */ mul.s $f8, $f6, $f20 -/* 005A4 80B0C354 46082281 */ sub.s $f10, $f4, $f8 -/* 005A8 80B0C358 C7A8008C */ lwc1 $f8, 0x008C($sp) -/* 005AC 80B0C35C E7AA0078 */ swc1 $f10, 0x0078($sp) -/* 005B0 80B0C360 C6120380 */ lwc1 $f18, 0x0380($s0) ## 00000380 -/* 005B4 80B0C364 46149182 */ mul.s $f6, $f18, $f20 -/* 005B8 80B0C368 46068101 */ sub.s $f4, $f16, $f6 -/* 005BC 80B0C36C E7A4007C */ swc1 $f4, 0x007C($sp) -/* 005C0 80B0C370 C60A0384 */ lwc1 $f10, 0x0384($s0) ## 00000384 -/* 005C4 80B0C374 46145482 */ mul.s $f18, $f10, $f20 -/* 005C8 80B0C378 46124401 */ sub.s $f16, $f8, $f18 -/* 005CC 80B0C37C 10000022 */ beq $zero, $zero, .L80B0C408 -/* 005D0 80B0C380 E7B00080 */ swc1 $f16, 0x0080($sp) -.L80B0C384: -/* 005D4 80B0C384 56330012 */ bnel $s1, $s3, .L80B0C3D0 -/* 005D8 80B0C388 C6040370 */ lwc1 $f4, 0x0370($s0) ## 00000370 -/* 005DC 80B0C38C C6060370 */ lwc1 $f6, 0x0370($s0) ## 00000370 -/* 005E0 80B0C390 C7AA0084 */ lwc1 $f10, 0x0084($sp) -/* 005E4 80B0C394 46143102 */ mul.s $f4, $f6, $f20 -/* 005E8 80B0C398 C7A60088 */ lwc1 $f6, 0x0088($sp) -/* 005EC 80B0C39C 460A2200 */ add.s $f8, $f4, $f10 -/* 005F0 80B0C3A0 E7A80078 */ swc1 $f8, 0x0078($sp) -/* 005F4 80B0C3A4 C6120374 */ lwc1 $f18, 0x0374($s0) ## 00000374 -/* 005F8 80B0C3A8 46149402 */ mul.s $f16, $f18, $f20 -/* 005FC 80B0C3AC C7B2008C */ lwc1 $f18, 0x008C($sp) -/* 00600 80B0C3B0 46068100 */ add.s $f4, $f16, $f6 -/* 00604 80B0C3B4 E7A4007C */ swc1 $f4, 0x007C($sp) -/* 00608 80B0C3B8 C60A0378 */ lwc1 $f10, 0x0378($s0) ## 00000378 -/* 0060C 80B0C3BC 46145202 */ mul.s $f8, $f10, $f20 -/* 00610 80B0C3C0 46124400 */ add.s $f16, $f8, $f18 -/* 00614 80B0C3C4 10000010 */ beq $zero, $zero, .L80B0C408 -/* 00618 80B0C3C8 E7B00080 */ swc1 $f16, 0x0080($sp) -/* 0061C 80B0C3CC C6040370 */ lwc1 $f4, 0x0370($s0) ## 00000370 -.L80B0C3D0: -/* 00620 80B0C3D0 C7A60084 */ lwc1 $f6, 0x0084($sp) -/* 00624 80B0C3D4 C7B20088 */ lwc1 $f18, 0x0088($sp) -/* 00628 80B0C3D8 46142282 */ mul.s $f10, $f4, $f20 -/* 0062C 80B0C3DC 460A3201 */ sub.s $f8, $f6, $f10 -/* 00630 80B0C3E0 C7AA008C */ lwc1 $f10, 0x008C($sp) -/* 00634 80B0C3E4 E7A80078 */ swc1 $f8, 0x0078($sp) -/* 00638 80B0C3E8 C6100374 */ lwc1 $f16, 0x0374($s0) ## 00000374 -/* 0063C 80B0C3EC 46148102 */ mul.s $f4, $f16, $f20 -/* 00640 80B0C3F0 46049181 */ sub.s $f6, $f18, $f4 -/* 00644 80B0C3F4 E7A6007C */ swc1 $f6, 0x007C($sp) -/* 00648 80B0C3F8 C6080378 */ lwc1 $f8, 0x0378($s0) ## 00000378 -/* 0064C 80B0C3FC 46144402 */ mul.s $f16, $f8, $f20 -/* 00650 80B0C400 46105481 */ sub.s $f18, $f10, $f16 -/* 00654 80B0C404 E7B20080 */ swc1 $f18, 0x0080($sp) -.L80B0C408: -/* 00658 80B0C408 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFD4 -/* 0065C 80B0C40C 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFC8 -/* 00660 80B0C410 03C03825 */ or $a3, $s8, $zero ## $a3 = FFFFFFEC -/* 00664 80B0C414 0C2C3008 */ jal func_80B0C020 -/* 00668 80B0C418 AFB60010 */ sw $s6, 0x0010($sp) -/* 0066C 80B0C41C 10400012 */ beq $v0, $zero, .L80B0C468 -/* 00670 80B0C420 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00674 80B0C424 8FB800B8 */ lw $t8, 0x00B8($sp) -/* 00678 80B0C428 5713000D */ bnel $t8, $s3, .L80B0C460 -/* 0067C 80B0C42C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00680 80B0C430 0C2C2F88 */ jal func_80B0BE20 -/* 00684 80B0C434 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00688 80B0C438 8FB90054 */ lw $t9, 0x0054($sp) -/* 0068C 80B0C43C 8FC90000 */ lw $t1, 0x0000($s8) ## FFFFFFEC -/* 00690 80B0C440 AF290000 */ sw $t1, 0x0000($t9) ## 00000000 -/* 00694 80B0C444 8FC80004 */ lw $t0, 0x0004($s8) ## FFFFFFF0 -/* 00698 80B0C448 AF280004 */ sw $t0, 0x0004($t9) ## 00000004 -/* 0069C 80B0C44C 8FC90008 */ lw $t1, 0x0008($s8) ## FFFFFFF4 -/* 006A0 80B0C450 AF290008 */ sw $t1, 0x0008($t9) ## 00000008 -/* 006A4 80B0C454 8FAA006C */ lw $t2, 0x006C($sp) -/* 006A8 80B0C458 A20A007D */ sb $t2, 0x007D($s0) ## 0000007D -/* 006AC 80B0C45C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -.L80B0C460: -/* 006B0 80B0C460 10000004 */ beq $zero, $zero, .L80B0C474 -/* 006B4 80B0C464 AFAB0064 */ sw $t3, 0x0064($sp) -.L80B0C468: -/* 006B8 80B0C468 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 006BC 80B0C46C 1632FFB3 */ bne $s1, $s2, .L80B0C33C -/* 006C0 80B0C470 00000000 */ nop -.L80B0C474: -/* 006C4 80B0C474 86050030 */ lh $a1, 0x0030($s0) ## 00000030 -/* 006C8 80B0C478 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 006CC 80B0C47C AFAC0010 */ sw $t4, 0x0010($sp) -/* 006D0 80B0C480 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 006D4 80B0C484 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 006D8 80B0C488 0C01E1A7 */ jal Math_SmoothStepToS - -/* 006DC 80B0C48C 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 006E0 80B0C490 86050032 */ lh $a1, 0x0032($s0) ## 00000032 -/* 006E4 80B0C494 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 006E8 80B0C498 AFAD0010 */ sw $t5, 0x0010($sp) -/* 006EC 80B0C49C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 006F0 80B0C4A0 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 006F4 80B0C4A4 0C01E1A7 */ jal Math_SmoothStepToS - -/* 006F8 80B0C4A8 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 006FC 80B0C4AC 86050034 */ lh $a1, 0x0034($s0) ## 00000034 -/* 00700 80B0C4B0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00704 80B0C4B4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00708 80B0C4B8 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 0070C 80B0C4BC 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00710 80B0C4C0 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00714 80B0C4C4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 00718 80B0C4C8 8FBF004C */ lw $ra, 0x004C($sp) -/* 0071C 80B0C4CC 8FA20064 */ lw $v0, 0x0064($sp) -/* 00720 80B0C4D0 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 00724 80B0C4D4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00728 80B0C4D8 8FB1002C */ lw $s1, 0x002C($sp) -/* 0072C 80B0C4DC 8FB20030 */ lw $s2, 0x0030($sp) -/* 00730 80B0C4E0 8FB30034 */ lw $s3, 0x0034($sp) -/* 00734 80B0C4E4 8FB40038 */ lw $s4, 0x0038($sp) -/* 00738 80B0C4E8 8FB5003C */ lw $s5, 0x003C($sp) -/* 0073C 80B0C4EC 8FB60040 */ lw $s6, 0x0040($sp) -/* 00740 80B0C4F0 8FB70044 */ lw $s7, 0x0044($sp) -/* 00744 80B0C4F4 8FBE0048 */ lw $s8, 0x0048($sp) -/* 00748 80B0C4F8 03E00008 */ jr $ra -/* 0074C 80B0C4FC 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C9F0.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C9F0.s deleted file mode 100644 index 346e155579..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C9F0.s +++ /dev/null @@ -1,149 +0,0 @@ -.late_rodata -glabel D_80B0F20C - .word 0x481C4000 -glabel D_80B0F210 - .float 0.1 - -glabel D_80B0F214 - .word 0xBDCCCCCD - -.text -glabel func_80B0C9F0 -/* 00C40 80B0C9F0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00C44 80B0C9F4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00C48 80B0C9F8 AFB00020 */ sw $s0, 0x0020($sp) -/* 00C4C 80B0C9FC AFA5002C */ sw $a1, 0x002C($sp) -/* 00C50 80B0CA00 3C0180B1 */ lui $at, %hi(D_80B0F20C) ## $at = 80B10000 -/* 00C54 80B0CA04 C426F20C */ lwc1 $f6, %lo(D_80B0F20C)($at) -/* 00C58 80B0CA08 C484008C */ lwc1 $f4, 0x008C($a0) ## 0000008C -/* 00C5C 80B0CA0C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C60 80B0CA10 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00C64 80B0CA14 4606203C */ c.lt.s $f4, $f6 -/* 00C68 80B0CA18 00000000 */ nop -/* 00C6C 80B0CA1C 4502000D */ bc1fl .L80B0CA54 -/* 00C70 80B0CA20 860A0392 */ lh $t2, 0x0392($s0) ## 00000392 -/* 00C74 80B0CA24 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00C78 80B0CA28 31CFE000 */ andi $t7, $t6, 0xE000 ## $t7 = 00000000 -/* 00C7C 80B0CA2C 000FC343 */ sra $t8, $t7, 13 -/* 00C80 80B0CA30 57000008 */ bnel $t8, $zero, .L80B0CA54 -/* 00C84 80B0CA34 860A0392 */ lh $t2, 0x0392($s0) ## 00000392 -/* 00C88 80B0CA38 90A81C26 */ lbu $t0, 0x1C26($a1) ## 00001C26 -/* 00C8C 80B0CA3C 51000005 */ beql $t0, $zero, .L80B0CA54 -/* 00C90 80B0CA40 860A0392 */ lh $t2, 0x0392($s0) ## 00000392 -/* 00C94 80B0CA44 908900AF */ lbu $t1, 0x00AF($a0) ## 000000AF -/* 00C98 80B0CA48 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00C9C 80B0CA4C A08900B0 */ sb $t1, 0x00B0($a0) ## 000000B0 -/* 00CA0 80B0CA50 860A0392 */ lh $t2, 0x0392($s0) ## 00000392 -.L80B0CA54: -/* 00CA4 80B0CA54 55400056 */ bnel $t2, $zero, .L80B0CBB0 -/* 00CA8 80B0CA58 860A0390 */ lh $t2, 0x0390($s0) ## 00000390 -/* 00CAC 80B0CA5C 920201A5 */ lbu $v0, 0x01A5($s0) ## 000001A5 -/* 00CB0 80B0CA60 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 -/* 00CB4 80B0CA64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CB8 80B0CA68 304B0002 */ andi $t3, $v0, 0x0002 ## $t3 = 00000000 -/* 00CBC 80B0CA6C 15600003 */ bne $t3, $zero, .L80B0CA7C -/* 00CC0 80B0CA70 304CFFFD */ andi $t4, $v0, 0xFFFD ## $t4 = 00000000 -/* 00CC4 80B0CA74 5060004E */ beql $v1, $zero, .L80B0CBB0 -/* 00CC8 80B0CA78 860A0390 */ lh $t2, 0x0390($s0) ## 00000390 -.L80B0CA7C: -/* 00CCC 80B0CA7C A60D0392 */ sh $t5, 0x0392($s0) ## 00000392 -/* 00CD0 80B0CA80 860E0392 */ lh $t6, 0x0392($s0) ## 00000392 -/* 00CD4 80B0CA84 A20C01A5 */ sb $t4, 0x01A5($s0) ## 000001A5 -/* 00CD8 80B0CA88 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00CDC 80B0CA8C 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 00CE0 80B0CA90 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00CE4 80B0CA94 0C00D09B */ jal func_8003426C -/* 00CE8 80B0CA98 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00CEC 80B0CA9C 0C00D58A */ jal Actor_ApplyDamage - -/* 00CF0 80B0CAA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CF4 80B0CAA4 10400006 */ beq $v0, $zero, .L80B0CAC0 -/* 00CF8 80B0CAA8 8FA4002C */ lw $a0, 0x002C($sp) -/* 00CFC 80B0CAAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D00 80B0CAB0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00D04 80B0CAB4 2405386B */ addiu $a1, $zero, 0x386B ## $a1 = 0000386B -/* 00D08 80B0CAB8 10000046 */ beq $zero, $zero, .L80B0CBD4 -/* 00D0C 80B0CABC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B0CAC0: -/* 00D10 80B0CAC0 0C00CB1F */ jal func_80032C7C -/* 00D14 80B0CAC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00D18 80B0CAC8 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 00D1C 80B0CACC 3C0E8003 */ lui $t6, %hi(ActorShadow_DrawCircle) -/* 00D20 80B0CAD0 25CEB5EC */ addiu $t6, %lo(ActorShadow_DrawCircle) -/* 00D24 80B0CAD4 31F8E000 */ andi $t8, $t7, 0xE000 ## $t8 = 00000000 -/* 00D28 80B0CAD8 0018CB43 */ sra $t9, $t8, 13 -/* 00D2C 80B0CADC 1320001D */ beq $t9, $zero, .L80B0CB54 -/* 00D30 80B0CAE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D34 80B0CAE4 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00D38 80B0CAE8 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 -/* 00D3C 80B0CAEC 3C0180B1 */ lui $at, %hi(D_80B0F214) ## $at = 80B10000 -/* 00D40 80B0CAF0 E6080168 */ swc1 $f8, 0x0168($s0) ## 00000168 -/* 00D44 80B0CAF4 8FA8002C */ lw $t0, 0x002C($sp) -/* 00D48 80B0CAF8 8D09009C */ lw $t1, 0x009C($t0) ## 0000009C -/* 00D4C 80B0CAFC 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 00D50 80B0CB00 15400005 */ bne $t2, $zero, .L80B0CB18 -/* 00D54 80B0CB04 00000000 */ nop -/* 00D58 80B0CB08 3C0180B1 */ lui $at, %hi(D_80B0F210) ## $at = 80B10000 -/* 00D5C 80B0CB0C C42AF210 */ lwc1 $f10, %lo(D_80B0F210)($at) -/* 00D60 80B0CB10 10000003 */ beq $zero, $zero, .L80B0CB20 -/* 00D64 80B0CB14 E60A0420 */ swc1 $f10, 0x0420($s0) ## 00000420 -.L80B0CB18: -/* 00D68 80B0CB18 C430F214 */ lwc1 $f16, %lo(D_80B0F214)($at) -/* 00D6C 80B0CB1C E6100420 */ swc1 $f16, 0x0420($s0) ## 00000420 -.L80B0CB20: -/* 00D70 80B0CB20 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00D74 80B0CB24 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 00D78 80B0CB28 C6120420 */ lwc1 $f18, 0x0420($s0) ## 00000420 -/* 00D7C 80B0CB2C 3C0D80B1 */ lui $t5, %hi(func_80B0D878) ## $t5 = 80B10000 -/* 00D80 80B0CB30 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A -/* 00D84 80B0CB34 46049182 */ mul.s $f6, $f18, $f4 -/* 00D88 80B0CB38 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00D8C 80B0CB3C 25ADD878 */ addiu $t5, $t5, %lo(func_80B0D878) ## $t5 = 80B0D878 -/* 00D90 80B0CB40 A60B0394 */ sh $t3, 0x0394($s0) ## 00000394 -/* 00D94 80B0CB44 A60C038A */ sh $t4, 0x038A($s0) ## 0000038A -/* 00D98 80B0CB48 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 00D9C 80B0CB4C 10000013 */ beq $zero, $zero, .L80B0CB9C -/* 00DA0 80B0CB50 E6060420 */ swc1 $f6, 0x0420($s0) ## 00000420 -.L80B0CB54: -/* 00DA4 80B0CB54 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 00DA8 80B0CB58 44814000 */ mtc1 $at, $f8 ## $f8 = 16.00 -/* 00DAC 80B0CB5C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00DB0 80B0CB60 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 -/* 00DB4 80B0CB64 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 00DB8 80B0CB68 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00DBC 80B0CB6C 3C0980B1 */ lui $t1, %hi(func_80B0DB00) ## $t1 = 80B10000 -/* 00DC0 80B0CB70 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00DC4 80B0CB74 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00DC8 80B0CB78 2529DB00 */ addiu $t1, $t1, %lo(func_80B0DB00) ## $t1 = 80B0DB00 -/* 00DCC 80B0CB7C 03214024 */ and $t0, $t9, $at -/* 00DD0 80B0CB80 AE0E00C0 */ sw $t6, 0x00C0($s0) ## 000000C0 -/* 00DD4 80B0CB84 A20F00C8 */ sb $t7, 0x00C8($s0) ## 000000C8 -/* 00DD8 80B0CB88 A618038A */ sh $t8, 0x038A($s0) ## 0000038A -/* 00DDC 80B0CB8C AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 00DE0 80B0CB90 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 00DE4 80B0CB94 E60800C4 */ swc1 $f8, 0x00C4($s0) ## 000000C4 -/* 00DE8 80B0CB98 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -.L80B0CB9C: -/* 00DEC 80B0CB9C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00DF0 80B0CBA0 24053885 */ addiu $a1, $zero, 0x3885 ## $a1 = 00003885 -/* 00DF4 80B0CBA4 1000000B */ beq $zero, $zero, .L80B0CBD4 -/* 00DF8 80B0CBA8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00DFC 80B0CBAC 860A0390 */ lh $t2, 0x0390($s0) ## 00000390 -.L80B0CBB0: -/* 00E00 80B0CBB0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00E04 80B0CBB4 15400007 */ bne $t2, $zero, .L80B0CBD4 -/* 00E08 80B0CBB8 00000000 */ nop -/* 00E0C 80B0CBBC 920B01A4 */ lbu $t3, 0x01A4($s0) ## 000001A4 -/* 00E10 80B0CBC0 240D001E */ addiu $t5, $zero, 0x001E ## $t5 = 0000001E -/* 00E14 80B0CBC4 316C0002 */ andi $t4, $t3, 0x0002 ## $t4 = 00000000 -/* 00E18 80B0CBC8 11800002 */ beq $t4, $zero, .L80B0CBD4 -/* 00E1C 80B0CBCC 00000000 */ nop -/* 00E20 80B0CBD0 A60D0390 */ sh $t5, 0x0390($s0) ## 00000390 -.L80B0CBD4: -/* 00E24 80B0CBD4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00E28 80B0CBD8 8FB00020 */ lw $s0, 0x0020($sp) -/* 00E2C 80B0CBDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E30 80B0CBE0 03E00008 */ jr $ra -/* 00E34 80B0CBE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CBE8.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CBE8.s deleted file mode 100644 index 1008377d3c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CBE8.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel func_80B0CBE8 -/* 00E38 80B0CBE8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00E3C 80B0CBEC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E40 80B0CBF0 AFA5002C */ sw $a1, 0x002C($sp) -/* 00E44 80B0CBF4 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00E48 80B0CBF8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00E4C 80B0CBFC 31CFE000 */ andi $t7, $t6, 0xE000 ## $t7 = 00000000 -/* 00E50 80B0CC00 000FC343 */ sra $t8, $t7, 13 -/* 00E54 80B0CC04 5B00000C */ blezl $t8, .L80B0CC38 -/* 00E58 80B0CC08 84E20390 */ lh $v0, 0x0390($a3) ## 00000390 -/* 00E5C 80B0CC0C 8C880190 */ lw $t0, 0x0190($a0) ## 00000190 -/* 00E60 80B0CC10 3C1980B1 */ lui $t9, %hi(func_80B0D590) ## $t9 = 80B10000 -/* 00E64 80B0CC14 2739D590 */ addiu $t9, $t9, %lo(func_80B0D590) ## $t9 = 80B0D590 -/* 00E68 80B0CC18 53280007 */ beql $t9, $t0, .L80B0CC38 -/* 00E6C 80B0CC1C 84E20390 */ lh $v0, 0x0390($a3) ## 00000390 -/* 00E70 80B0CC20 84820392 */ lh $v0, 0x0392($a0) ## 00000392 -/* 00E74 80B0CC24 1040002F */ beq $v0, $zero, .L80B0CCE4 -/* 00E78 80B0CC28 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 00E7C 80B0CC2C 1000002D */ beq $zero, $zero, .L80B0CCE4 -/* 00E80 80B0CC30 A4890392 */ sh $t1, 0x0392($a0) ## 00000392 -/* 00E84 80B0CC34 84E20390 */ lh $v0, 0x0390($a3) ## 00000390 -.L80B0CC38: -/* 00E88 80B0CC38 14400003 */ bne $v0, $zero, .L80B0CC48 -/* 00E8C 80B0CC3C 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF -/* 00E90 80B0CC40 10000003 */ beq $zero, $zero, .L80B0CC50 -/* 00E94 80B0CC44 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80B0CC48: -/* 00E98 80B0CC48 A4EA0390 */ sh $t2, 0x0390($a3) ## 00000390 -/* 00E9C 80B0CC4C 84E30390 */ lh $v1, 0x0390($a3) ## 00000390 -.L80B0CC50: -/* 00EA0 80B0CC50 5460000C */ bnel $v1, $zero, .L80B0CC84 -/* 00EA4 80B0CC54 84E20392 */ lh $v0, 0x0392($a3) ## 00000392 -/* 00EA8 80B0CC58 90EB00AF */ lbu $t3, 0x00AF($a3) ## 000000AF -/* 00EAC 80B0CC5C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00EB0 80B0CC60 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00EB4 80B0CC64 11600006 */ beq $t3, $zero, .L80B0CC80 -/* 00EB8 80B0CC68 8FA4002C */ lw $a0, 0x002C($sp) -/* 00EBC 80B0CC6C 00812821 */ addu $a1, $a0, $at -/* 00EC0 80B0CC70 24E60194 */ addiu $a2, $a3, 0x0194 ## $a2 = 00000194 -/* 00EC4 80B0CC74 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 00EC8 80B0CC78 AFA70028 */ sw $a3, 0x0028($sp) -/* 00ECC 80B0CC7C 8FA70028 */ lw $a3, 0x0028($sp) -.L80B0CC80: -/* 00ED0 80B0CC80 84E20392 */ lh $v0, 0x0392($a3) ## 00000392 -.L80B0CC84: -/* 00ED4 80B0CC84 8FA5002C */ lw $a1, 0x002C($sp) -/* 00ED8 80B0CC88 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00EDC 80B0CC8C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00EE0 80B0CC90 24E60194 */ addiu $a2, $a3, 0x0194 ## $a2 = 00000194 -/* 00EE4 80B0CC94 14400003 */ bne $v0, $zero, .L80B0CCA4 -/* 00EE8 80B0CC98 00A12821 */ addu $a1, $a1, $at -/* 00EEC 80B0CC9C 10000004 */ beq $zero, $zero, .L80B0CCB0 -/* 00EF0 80B0CCA0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80B0CCA4: -/* 00EF4 80B0CCA4 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF -/* 00EF8 80B0CCA8 A4ED0392 */ sh $t5, 0x0392($a3) ## 00000392 -/* 00EFC 80B0CCAC 84E30392 */ lh $v1, 0x0392($a3) ## 00000392 -.L80B0CCB0: -/* 00F00 80B0CCB0 1460000A */ bne $v1, $zero, .L80B0CCDC -/* 00F04 80B0CCB4 00000000 */ nop -/* 00F08 80B0CCB8 90EE00AF */ lbu $t6, 0x00AF($a3) ## 000000AF -/* 00F0C 80B0CCBC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00F10 80B0CCC0 11C00006 */ beq $t6, $zero, .L80B0CCDC -/* 00F14 80B0CCC4 00000000 */ nop -/* 00F18 80B0CCC8 AFA5001C */ sw $a1, 0x001C($sp) -/* 00F1C 80B0CCCC 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00F20 80B0CCD0 AFA60018 */ sw $a2, 0x0018($sp) -/* 00F24 80B0CCD4 8FA5001C */ lw $a1, 0x001C($sp) -/* 00F28 80B0CCD8 8FA60018 */ lw $a2, 0x0018($sp) -.L80B0CCDC: -/* 00F2C 80B0CCDC 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 00F30 80B0CCE0 8FA4002C */ lw $a0, 0x002C($sp) -.L80B0CCE4: -/* 00F34 80B0CCE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F38 80B0CCE8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00F3C 80B0CCEC 03E00008 */ jr $ra -/* 00F40 80B0CCF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CCF4.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CCF4.s deleted file mode 100644 index fe2e43734d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CCF4.s +++ /dev/null @@ -1,120 +0,0 @@ -.late_rodata -glabel D_80B0F218 - .word 0x38000100 -glabel D_80B0F21C - .float 0.001 - -.text -glabel func_80B0CCF4 -/* 00F44 80B0CCF4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00F48 80B0CCF8 AFBF001C */ sw $ra, 0x001C($sp) -/* 00F4C 80B0CCFC AFB00018 */ sw $s0, 0x0018($sp) -/* 00F50 80B0CD00 8C830078 */ lw $v1, 0x0078($a0) ## 00000078 -/* 00F54 80B0CD04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F58 80B0CD08 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00F5C 80B0CD0C 54600004 */ bnel $v1, $zero, .L80B0CD20 -/* 00F60 80B0CD10 846E0008 */ lh $t6, 0x0008($v1) ## 00000008 -/* 00F64 80B0CD14 1000005F */ beq $zero, $zero, .L80B0CE94 -/* 00F68 80B0CD18 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00F6C 80B0CD1C 846E0008 */ lh $t6, 0x0008($v1) ## 00000008 -.L80B0CD20: -/* 00F70 80B0CD20 3C0180B1 */ lui $at, %hi(D_80B0F218) ## $at = 80B10000 -/* 00F74 80B0CD24 C420F218 */ lwc1 $f0, %lo(D_80B0F218)($at) -/* 00F78 80B0CD28 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00F7C 80B0CD2C 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFEC -/* 00F80 80B0CD30 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00F84 80B0CD34 468021A0 */ cvt.s.w $f6, $f4 -/* 00F88 80B0CD38 46003202 */ mul.s $f8, $f6, $f0 -/* 00F8C 80B0CD3C E7A8006C */ swc1 $f8, 0x006C($sp) -/* 00F90 80B0CD40 846F000A */ lh $t7, 0x000A($v1) ## 0000000A -/* 00F94 80B0CD44 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00F98 80B0CD48 00000000 */ nop -/* 00F9C 80B0CD4C 46805420 */ cvt.s.w $f16, $f10 -/* 00FA0 80B0CD50 46008482 */ mul.s $f18, $f16, $f0 -/* 00FA4 80B0CD54 E7B20070 */ swc1 $f18, 0x0070($sp) -/* 00FA8 80B0CD58 8478000C */ lh $t8, 0x000C($v1) ## 0000000C -/* 00FAC 80B0CD5C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 00FB0 80B0CD60 00000000 */ nop -/* 00FB4 80B0CD64 468021A0 */ cvt.s.w $f6, $f4 -/* 00FB8 80B0CD68 46003202 */ mul.s $f8, $f6, $f0 -/* 00FBC 80B0CD6C E7A80074 */ swc1 $f8, 0x0074($sp) -/* 00FC0 80B0CD70 0C0348FF */ jal func_800D23FC -/* 00FC4 80B0CD74 C4EC0000 */ lwc1 $f12, 0x0000($a3) ## 00000000 -/* 00FC8 80B0CD78 26040370 */ addiu $a0, $s0, 0x0370 ## $a0 = 00000370 -/* 00FCC 80B0CD7C AFA40028 */ sw $a0, 0x0028($sp) -/* 00FD0 80B0CD80 0C0346BD */ jal Matrix_MultVec3f -/* 00FD4 80B0CD84 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFEC -/* 00FD8 80B0CD88 27B9006C */ addiu $t9, $sp, 0x006C ## $t9 = FFFFFFEC -/* 00FDC 80B0CD8C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00FE0 80B0CD90 8F290000 */ lw $t1, 0x0000($t9) ## FFFFFFEC -/* 00FE4 80B0CD94 2606037C */ addiu $a2, $s0, 0x037C ## $a2 = 0000037C -/* 00FE8 80B0CD98 26050364 */ addiu $a1, $s0, 0x0364 ## $a1 = 00000364 -/* 00FEC 80B0CD9C AC890000 */ sw $t1, 0x0000($a0) ## 00000000 -/* 00FF0 80B0CDA0 8F280004 */ lw $t0, 0x0004($t9) ## FFFFFFF0 -/* 00FF4 80B0CDA4 AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 00FF8 80B0CDA8 8F290008 */ lw $t1, 0x0008($t9) ## FFFFFFF4 -/* 00FFC 80B0CDAC AC890008 */ sw $t1, 0x0008($a0) ## 00000008 -/* 01000 80B0CDB0 0C2C2F6C */ jal func_80B0BDB0 -/* 01004 80B0CDB4 AFA60024 */ sw $a2, 0x0024($sp) -/* 01008 80B0CDB8 0C032D8A */ jal Math3D_Vec3fMagnitude -/* 0100C 80B0CDBC 8FA40024 */ lw $a0, 0x0024($sp) -/* 01010 80B0CDC0 3C0180B1 */ lui $at, %hi(D_80B0F21C) ## $at = 80B10000 -/* 01014 80B0CDC4 C42AF21C */ lwc1 $f10, %lo(D_80B0F21C)($at) -/* 01018 80B0CDC8 46000086 */ mov.s $f2, $f0 -/* 0101C 80B0CDCC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01020 80B0CDD0 460A003C */ c.lt.s $f0, $f10 -/* 01024 80B0CDD4 00000000 */ nop -/* 01028 80B0CDD8 45020004 */ bc1fl .L80B0CDEC -/* 0102C 80B0CDDC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01030 80B0CDE0 1000002C */ beq $zero, $zero, .L80B0CE94 -/* 01034 80B0CDE4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01038 80B0CDE8 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -.L80B0CDEC: -/* 0103C 80B0CDEC C610037C */ lwc1 $f16, 0x037C($s0) ## 0000037C -/* 01040 80B0CDF0 C6040380 */ lwc1 $f4, 0x0380($s0) ## 00000380 -/* 01044 80B0CDF4 46026083 */ div.s $f2, $f12, $f2 -/* 01048 80B0CDF8 C6080384 */ lwc1 $f8, 0x0384($s0) ## 00000384 -/* 0104C 80B0CDFC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01050 80B0CE00 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFAC -/* 01054 80B0CE04 26050030 */ addiu $a1, $s0, 0x0030 ## $a1 = 00000030 -/* 01058 80B0CE08 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0105C 80B0CE0C 46028482 */ mul.s $f18, $f16, $f2 -/* 01060 80B0CE10 C6100370 */ lwc1 $f16, 0x0370($s0) ## 00000370 -/* 01064 80B0CE14 46022182 */ mul.s $f6, $f4, $f2 -/* 01068 80B0CE18 00000000 */ nop -/* 0106C 80B0CE1C 46024282 */ mul.s $f10, $f8, $f2 -/* 01070 80B0CE20 E612037C */ swc1 $f18, 0x037C($s0) ## 0000037C -/* 01074 80B0CE24 E6060380 */ swc1 $f6, 0x0380($s0) ## 00000380 -/* 01078 80B0CE28 E60A0384 */ swc1 $f10, 0x0384($s0) ## 00000384 -/* 0107C 80B0CE2C E7B0002C */ swc1 $f16, 0x002C($sp) -/* 01080 80B0CE30 C6120374 */ lwc1 $f18, 0x0374($s0) ## 00000374 -/* 01084 80B0CE34 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 01088 80B0CE38 C6040378 */ lwc1 $f4, 0x0378($s0) ## 00000378 -/* 0108C 80B0CE3C E7A00038 */ swc1 $f0, 0x0038($sp) -/* 01090 80B0CE40 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 01094 80B0CE44 C6060364 */ lwc1 $f6, 0x0364($s0) ## 00000364 -/* 01098 80B0CE48 E7A6003C */ swc1 $f6, 0x003C($sp) -/* 0109C 80B0CE4C C6080368 */ lwc1 $f8, 0x0368($s0) ## 00000368 -/* 010A0 80B0CE50 E7A80040 */ swc1 $f8, 0x0040($sp) -/* 010A4 80B0CE54 C60A036C */ lwc1 $f10, 0x036C($s0) ## 0000036C -/* 010A8 80B0CE58 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 010AC 80B0CE5C E7AA0044 */ swc1 $f10, 0x0044($sp) -/* 010B0 80B0CE60 C610037C */ lwc1 $f16, 0x037C($s0) ## 0000037C -/* 010B4 80B0CE64 E7B0004C */ swc1 $f16, 0x004C($sp) -/* 010B8 80B0CE68 C6120380 */ lwc1 $f18, 0x0380($s0) ## 00000380 -/* 010BC 80B0CE6C E7B20050 */ swc1 $f18, 0x0050($sp) -/* 010C0 80B0CE70 C6040384 */ lwc1 $f4, 0x0384($s0) ## 00000384 -/* 010C4 80B0CE74 E7AC0068 */ swc1 $f12, 0x0068($sp) -/* 010C8 80B0CE78 E7A00058 */ swc1 $f0, 0x0058($sp) -/* 010CC 80B0CE7C E7A0005C */ swc1 $f0, 0x005C($sp) -/* 010D0 80B0CE80 E7A00060 */ swc1 $f0, 0x0060($sp) -/* 010D4 80B0CE84 E7A00064 */ swc1 $f0, 0x0064($sp) -/* 010D8 80B0CE88 0C034833 */ jal func_800D20CC -/* 010DC 80B0CE8C E7A40054 */ swc1 $f4, 0x0054($sp) -/* 010E0 80B0CE90 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B0CE94: -/* 010E4 80B0CE94 8FBF001C */ lw $ra, 0x001C($sp) -/* 010E8 80B0CE98 8FB00018 */ lw $s0, 0x0018($sp) -/* 010EC 80B0CE9C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 010F0 80B0CEA0 03E00008 */ jr $ra -/* 010F4 80B0CEA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CEA8.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CEA8.s deleted file mode 100644 index da7176bebf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CEA8.s +++ /dev/null @@ -1,49 +0,0 @@ -.late_rodata -glabel D_80B0F220 - .word 0x3C656041 - -.text -glabel func_80B0CEA8 -/* 010F8 80B0CEA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010FC 80B0CEAC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01100 80B0CEB0 3C0180B1 */ lui $at, %hi(D_80B0F220) ## $at = 80B10000 -/* 01104 80B0CEB4 C426F220 */ lwc1 $f6, %lo(D_80B0F220)($at) -/* 01108 80B0CEB8 C4840050 */ lwc1 $f4, 0x0050($a0) ## 00000050 -/* 0110C 80B0CEBC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01110 80B0CEC0 4606203C */ c.lt.s $f4, $f6 -/* 01114 80B0CEC4 00000000 */ nop -/* 01118 80B0CEC8 4503001B */ bc1tl .L80B0CF38 -/* 0111C 80B0CECC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01120 80B0CED0 84AE07A0 */ lh $t6, 0x07A0($a1) ## 000007A0 -/* 01124 80B0CED4 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 01128 80B0CED8 000E7880 */ sll $t7, $t6, 2 -/* 0112C 80B0CEDC 00AFC021 */ addu $t8, $a1, $t7 -/* 01130 80B0CEE0 8F020790 */ lw $v0, 0x0790($t8) ## 00000790 -/* 01134 80B0CEE4 AFA60018 */ sw $a2, 0x0018($sp) -/* 01138 80B0CEE8 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 0113C 80B0CEEC 2445005C */ addiu $a1, $v0, 0x005C ## $a1 = 0000005C -/* 01140 80B0CEF0 3C0143BE */ lui $at, 0x43BE ## $at = 43BE0000 -/* 01144 80B0CEF4 44814000 */ mtc1 $at, $f8 ## $f8 = 380.00 -/* 01148 80B0CEF8 8FA60018 */ lw $a2, 0x0018($sp) -/* 0114C 80B0CEFC 4600403E */ c.le.s $f8, $f0 -/* 01150 80B0CF00 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01154 80B0CF04 4503000C */ bc1tl .L80B0CF38 -/* 01158 80B0CF08 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0115C 80B0CF0C 84D9001C */ lh $t9, 0x001C($a2) ## 0000001C -/* 01160 80B0CF10 2402388C */ addiu $v0, $zero, 0x388C ## $v0 = 0000388C -/* 01164 80B0CF14 3328E000 */ andi $t0, $t9, 0xE000 ## $t0 = 00000000 -/* 01168 80B0CF18 00084B43 */ sra $t1, $t0, 13 -/* 0116C 80B0CF1C 19200003 */ blez $t1, .L80B0CF2C -/* 01170 80B0CF20 00000000 */ nop -/* 01174 80B0CF24 10000001 */ beq $zero, $zero, .L80B0CF2C -/* 01178 80B0CF28 240239DA */ addiu $v0, $zero, 0x39DA ## $v0 = 000039DA -.L80B0CF2C: -/* 0117C 80B0CF2C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01180 80B0CF30 3045FFFF */ andi $a1, $v0, 0xFFFF ## $a1 = 000039DA -/* 01184 80B0CF34 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B0CF38: -/* 01188 80B0CF38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0118C 80B0CF3C 03E00008 */ jr $ra -/* 01190 80B0CF40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CF44.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CF44.s deleted file mode 100644 index 2097ce5909..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CF44.s +++ /dev/null @@ -1,139 +0,0 @@ -glabel func_80B0CF44 -/* 01194 80B0CF44 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 -/* 01198 80B0CF48 3C0E80B1 */ lui $t6, %hi(D_80B0F0EC) ## $t6 = 80B10000 -/* 0119C 80B0CF4C AFBF0064 */ sw $ra, 0x0064($sp) -/* 011A0 80B0CF50 AFBE0060 */ sw $s8, 0x0060($sp) -/* 011A4 80B0CF54 AFB7005C */ sw $s7, 0x005C($sp) -/* 011A8 80B0CF58 AFB60058 */ sw $s6, 0x0058($sp) -/* 011AC 80B0CF5C AFB50054 */ sw $s5, 0x0054($sp) -/* 011B0 80B0CF60 AFB40050 */ sw $s4, 0x0050($sp) -/* 011B4 80B0CF64 AFB3004C */ sw $s3, 0x004C($sp) -/* 011B8 80B0CF68 AFB20048 */ sw $s2, 0x0048($sp) -/* 011BC 80B0CF6C AFB10044 */ sw $s1, 0x0044($sp) -/* 011C0 80B0CF70 AFB00040 */ sw $s0, 0x0040($sp) -/* 011C4 80B0CF74 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 011C8 80B0CF78 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 011CC 80B0CF7C 25CEF0EC */ addiu $t6, $t6, %lo(D_80B0F0EC) ## $t6 = 80B0F0EC -/* 011D0 80B0CF80 8DD80000 */ lw $t8, 0x0000($t6) ## 80B0F0EC -/* 011D4 80B0CF84 27B500A4 */ addiu $s5, $sp, 0x00A4 ## $s5 = FFFFFFFC -/* 011D8 80B0CF88 3C1980B1 */ lui $t9, %hi(D_80B0F0F0) ## $t9 = 80B10000 -/* 011DC 80B0CF8C 2739F0F0 */ addiu $t9, $t9, %lo(D_80B0F0F0) ## $t9 = 80B0F0F0 -/* 011E0 80B0CF90 AEB80000 */ sw $t8, 0x0000($s5) ## FFFFFFFC -/* 011E4 80B0CF94 8F290000 */ lw $t1, 0x0000($t9) ## 80B0F0F0 -/* 011E8 80B0CF98 27B600A0 */ addiu $s6, $sp, 0x00A0 ## $s6 = FFFFFFF8 -/* 011EC 80B0CF9C 3C0A80B1 */ lui $t2, %hi(D_80B0F0F4) ## $t2 = 80B10000 -/* 011F0 80B0CFA0 254AF0F4 */ addiu $t2, $t2, %lo(D_80B0F0F4) ## $t2 = 80B0F0F4 -/* 011F4 80B0CFA4 AEC90000 */ sw $t1, 0x0000($s6) ## FFFFFFF8 -/* 011F8 80B0CFA8 8D4C0000 */ lw $t4, 0x0000($t2) ## 80B0F0F4 -/* 011FC 80B0CFAC 27B70094 */ addiu $s7, $sp, 0x0094 ## $s7 = FFFFFFEC -/* 01200 80B0CFB0 3C0D80B1 */ lui $t5, %hi(D_80B0F100) ## $t5 = 80B10000 -/* 01204 80B0CFB4 AEEC0000 */ sw $t4, 0x0000($s7) ## FFFFFFEC -/* 01208 80B0CFB8 8D4B0004 */ lw $t3, 0x0004($t2) ## 80B0F0F8 -/* 0120C 80B0CFBC 25ADF100 */ addiu $t5, $t5, %lo(D_80B0F100) ## $t5 = 80B0F100 -/* 01210 80B0CFC0 27BE0088 */ addiu $s8, $sp, 0x0088 ## $s8 = FFFFFFE0 -/* 01214 80B0CFC4 AEEB0004 */ sw $t3, 0x0004($s7) ## FFFFFFF0 -/* 01218 80B0CFC8 8D4C0008 */ lw $t4, 0x0008($t2) ## 80B0F0FC -/* 0121C 80B0CFCC 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 01220 80B0CFD0 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 01224 80B0CFD4 AEEC0008 */ sw $t4, 0x0008($s7) ## FFFFFFF4 -/* 01228 80B0CFD8 8DAF0000 */ lw $t7, 0x0000($t5) ## 80B0F100 -/* 0122C 80B0CFDC AFCF0000 */ sw $t7, 0x0000($s8) ## FFFFFFE0 -/* 01230 80B0CFE0 8DAE0004 */ lw $t6, 0x0004($t5) ## 80B0F104 -/* 01234 80B0CFE4 AFCE0004 */ sw $t6, 0x0004($s8) ## FFFFFFE4 -/* 01238 80B0CFE8 8DAF0008 */ lw $t7, 0x0008($t5) ## 80B0F108 -/* 0123C 80B0CFEC AFCF0008 */ sw $t7, 0x0008($s8) ## FFFFFFE8 -/* 01240 80B0CFF0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01244 80B0CFF4 AFA600B0 */ sw $a2, 0x00B0($sp) -/* 01248 80B0CFF8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0124C 80B0CFFC 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 01250 80B0D000 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 01254 80B0D004 44813000 */ mtc1 $at, $f6 ## $f6 = 65536.00 -/* 01258 80B0D008 46160101 */ sub.s $f4, $f0, $f22 -/* 0125C 80B0D00C 8FA600B0 */ lw $a2, 0x00B0($sp) -/* 01260 80B0D010 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 01264 80B0D014 46062202 */ mul.s $f8, $f4, $f6 -/* 01268 80B0D018 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 0126C 80B0D01C 4600428D */ trunc.w.s $f10, $f8 -/* 01270 80B0D020 44105000 */ mfc1 $s0, $f10 -/* 01274 80B0D024 00000000 */ nop -/* 01278 80B0D028 00108400 */ sll $s0, $s0, 16 -/* 0127C 80B0D02C 04C00039 */ bltz $a2, .L80B0D114 -/* 01280 80B0D030 00108403 */ sra $s0, $s0, 16 -/* 01284 80B0D034 0326001A */ div $zero, $t9, $a2 -/* 01288 80B0D038 00009812 */ mflo $s3 -/* 0128C 80B0D03C 00139C00 */ sll $s3, $s3, 16 -/* 01290 80B0D040 00139C03 */ sra $s3, $s3, 16 -/* 01294 80B0D044 14C00002 */ bne $a2, $zero, .L80B0D050 -/* 01298 80B0D048 00000000 */ nop -/* 0129C 80B0D04C 0007000D */ break 7 -.L80B0D050: -/* 012A0 80B0D050 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 012A4 80B0D054 14C10004 */ bne $a2, $at, .L80B0D068 -/* 012A8 80B0D058 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 012AC 80B0D05C 17210002 */ bne $t9, $at, .L80B0D068 -/* 012B0 80B0D060 00000000 */ nop -/* 012B4 80B0D064 0006000D */ break 6 -.L80B0D068: -/* 012B8 80B0D068 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 012BC 80B0D06C 00000000 */ nop -/* 012C0 80B0D070 46160501 */ sub.s $f20, $f0, $f22 -/* 012C4 80B0D074 4614A400 */ add.s $f16, $f20, $f20 -/* 012C8 80B0D078 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 012CC 80B0D07C E7B00088 */ swc1 $f16, 0x0088($sp) -/* 012D0 80B0D080 46160501 */ sub.s $f20, $f0, $f22 -/* 012D4 80B0D084 00102400 */ sll $a0, $s0, 16 -/* 012D8 80B0D088 00042403 */ sra $a0, $a0, 16 -/* 012DC 80B0D08C 4614A480 */ add.s $f18, $f20, $f20 -/* 012E0 80B0D090 0C01DE1C */ jal Math_SinS - ## sins? -/* 012E4 80B0D094 E7B20090 */ swc1 $f18, 0x0090($sp) -/* 012E8 80B0D098 46000100 */ add.s $f4, $f0, $f0 -/* 012EC 80B0D09C C6460024 */ lwc1 $f6, 0x0024($s2) ## 00000024 -/* 012F0 80B0D0A0 00102400 */ sll $a0, $s0, 16 -/* 012F4 80B0D0A4 00042403 */ sra $a0, $a0, 16 -/* 012F8 80B0D0A8 46062200 */ add.s $f8, $f4, $f6 -/* 012FC 80B0D0AC E7A8007C */ swc1 $f8, 0x007C($sp) -/* 01300 80B0D0B0 C64A0028 */ lwc1 $f10, 0x0028($s2) ## 00000028 -/* 01304 80B0D0B4 0C01DE0D */ jal Math_CosS - ## coss? -/* 01308 80B0D0B8 E7AA0080 */ swc1 $f10, 0x0080($sp) -/* 0130C 80B0D0BC 46000400 */ add.s $f16, $f0, $f0 -/* 01310 80B0D0C0 C652002C */ lwc1 $f18, 0x002C($s2) ## 0000002C -/* 01314 80B0D0C4 24080014 */ addiu $t0, $zero, 0x0014 ## $t0 = 00000014 -/* 01318 80B0D0C8 2409001E */ addiu $t1, $zero, 0x001E ## $t1 = 0000001E -/* 0131C 80B0D0CC 46128100 */ add.s $f4, $f16, $f18 -/* 01320 80B0D0D0 240A000C */ addiu $t2, $zero, 0x000C ## $t2 = 0000000C -/* 01324 80B0D0D4 AFAA0020 */ sw $t2, 0x0020($sp) -/* 01328 80B0D0D8 AFA9001C */ sw $t1, 0x001C($sp) -/* 0132C 80B0D0DC E7A40084 */ swc1 $f4, 0x0084($sp) -/* 01330 80B0D0E0 AFA80018 */ sw $t0, 0x0018($sp) -/* 01334 80B0D0E4 AFB60014 */ sw $s6, 0x0014($sp) -/* 01338 80B0D0E8 AFB50010 */ sw $s5, 0x0010($sp) -/* 0133C 80B0D0EC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01340 80B0D0F0 27A5007C */ addiu $a1, $sp, 0x007C ## $a1 = FFFFFFD4 -/* 01344 80B0D0F4 02E03025 */ or $a2, $s7, $zero ## $a2 = FFFFFFEC -/* 01348 80B0D0F8 0C00A0DB */ jal func_8002836C -/* 0134C 80B0D0FC 03C03825 */ or $a3, $s8, $zero ## $a3 = FFFFFFE0 -/* 01350 80B0D100 02138021 */ addu $s0, $s0, $s3 -/* 01354 80B0D104 00108400 */ sll $s0, $s0, 16 -/* 01358 80B0D108 2631FFFF */ addiu $s1, $s1, 0xFFFF ## $s1 = FFFFFFFF -/* 0135C 80B0D10C 0621FFD6 */ bgez $s1, .L80B0D068 -/* 01360 80B0D110 00108403 */ sra $s0, $s0, 16 -.L80B0D114: -/* 01364 80B0D114 8FBF0064 */ lw $ra, 0x0064($sp) -/* 01368 80B0D118 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 0136C 80B0D11C D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 01370 80B0D120 8FB00040 */ lw $s0, 0x0040($sp) -/* 01374 80B0D124 8FB10044 */ lw $s1, 0x0044($sp) -/* 01378 80B0D128 8FB20048 */ lw $s2, 0x0048($sp) -/* 0137C 80B0D12C 8FB3004C */ lw $s3, 0x004C($sp) -/* 01380 80B0D130 8FB40050 */ lw $s4, 0x0050($sp) -/* 01384 80B0D134 8FB50054 */ lw $s5, 0x0054($sp) -/* 01388 80B0D138 8FB60058 */ lw $s6, 0x0058($sp) -/* 0138C 80B0D13C 8FB7005C */ lw $s7, 0x005C($sp) -/* 01390 80B0D140 8FBE0060 */ lw $s8, 0x0060($sp) -/* 01394 80B0D144 03E00008 */ jr $ra -/* 01398 80B0D148 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D14C.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D14C.s deleted file mode 100644 index 6729c92ae0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D14C.s +++ /dev/null @@ -1,144 +0,0 @@ -glabel func_80B0D14C -/* 0139C 80B0D14C 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 -/* 013A0 80B0D150 3C0E80B1 */ lui $t6, %hi(D_80B0F10C) ## $t6 = 80B10000 -/* 013A4 80B0D154 AFBF006C */ sw $ra, 0x006C($sp) -/* 013A8 80B0D158 AFBE0068 */ sw $s8, 0x0068($sp) -/* 013AC 80B0D15C AFB70064 */ sw $s7, 0x0064($sp) -/* 013B0 80B0D160 AFB60060 */ sw $s6, 0x0060($sp) -/* 013B4 80B0D164 AFB5005C */ sw $s5, 0x005C($sp) -/* 013B8 80B0D168 AFB40058 */ sw $s4, 0x0058($sp) -/* 013BC 80B0D16C AFB30054 */ sw $s3, 0x0054($sp) -/* 013C0 80B0D170 AFB20050 */ sw $s2, 0x0050($sp) -/* 013C4 80B0D174 AFB1004C */ sw $s1, 0x004C($sp) -/* 013C8 80B0D178 AFB00048 */ sw $s0, 0x0048($sp) -/* 013CC 80B0D17C F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 013D0 80B0D180 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 013D4 80B0D184 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 013D8 80B0D188 25CEF10C */ addiu $t6, $t6, %lo(D_80B0F10C) ## $t6 = 80B0F10C -/* 013DC 80B0D18C 8DD80000 */ lw $t8, 0x0000($t6) ## 80B0F10C -/* 013E0 80B0D190 27B500AC */ addiu $s5, $sp, 0x00AC ## $s5 = FFFFFFFC -/* 013E4 80B0D194 3C1980B1 */ lui $t9, %hi(D_80B0F110) ## $t9 = 80B10000 -/* 013E8 80B0D198 2739F110 */ addiu $t9, $t9, %lo(D_80B0F110) ## $t9 = 80B0F110 -/* 013EC 80B0D19C AEB80000 */ sw $t8, 0x0000($s5) ## FFFFFFFC -/* 013F0 80B0D1A0 8F290000 */ lw $t1, 0x0000($t9) ## 80B0F110 -/* 013F4 80B0D1A4 27B600A8 */ addiu $s6, $sp, 0x00A8 ## $s6 = FFFFFFF8 -/* 013F8 80B0D1A8 3C0A80B1 */ lui $t2, %hi(D_80B0F114) ## $t2 = 80B10000 -/* 013FC 80B0D1AC 254AF114 */ addiu $t2, $t2, %lo(D_80B0F114) ## $t2 = 80B0F114 -/* 01400 80B0D1B0 AEC90000 */ sw $t1, 0x0000($s6) ## FFFFFFF8 -/* 01404 80B0D1B4 8D4C0000 */ lw $t4, 0x0000($t2) ## 80B0F114 -/* 01408 80B0D1B8 27B7009C */ addiu $s7, $sp, 0x009C ## $s7 = FFFFFFEC -/* 0140C 80B0D1BC 3C0D80B1 */ lui $t5, %hi(D_80B0F120) ## $t5 = 80B10000 -/* 01410 80B0D1C0 AEEC0000 */ sw $t4, 0x0000($s7) ## FFFFFFEC -/* 01414 80B0D1C4 8D4B0004 */ lw $t3, 0x0004($t2) ## 80B0F118 -/* 01418 80B0D1C8 25ADF120 */ addiu $t5, $t5, %lo(D_80B0F120) ## $t5 = 80B0F120 -/* 0141C 80B0D1CC 27BE0090 */ addiu $s8, $sp, 0x0090 ## $s8 = FFFFFFE0 -/* 01420 80B0D1D0 AEEB0004 */ sw $t3, 0x0004($s7) ## FFFFFFF0 -/* 01424 80B0D1D4 8D4C0008 */ lw $t4, 0x0008($t2) ## 80B0F11C -/* 01428 80B0D1D8 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 0142C 80B0D1DC 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 01430 80B0D1E0 AEEC0008 */ sw $t4, 0x0008($s7) ## FFFFFFF4 -/* 01434 80B0D1E4 8DAF0000 */ lw $t7, 0x0000($t5) ## 80B0F120 -/* 01438 80B0D1E8 AFCF0000 */ sw $t7, 0x0000($s8) ## FFFFFFE0 -/* 0143C 80B0D1EC 8DAE0004 */ lw $t6, 0x0004($t5) ## 80B0F124 -/* 01440 80B0D1F0 AFCE0004 */ sw $t6, 0x0004($s8) ## FFFFFFE4 -/* 01444 80B0D1F4 8DAF0008 */ lw $t7, 0x0008($t5) ## 80B0F128 -/* 01448 80B0D1F8 AFCF0008 */ sw $t7, 0x0008($s8) ## FFFFFFE8 -/* 0144C 80B0D1FC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01450 80B0D200 AFA600B8 */ sw $a2, 0x00B8($sp) -/* 01454 80B0D204 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01458 80B0D208 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 0145C 80B0D20C 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 01460 80B0D210 44813000 */ mtc1 $at, $f6 ## $f6 = 65536.00 -/* 01464 80B0D214 46160101 */ sub.s $f4, $f0, $f22 -/* 01468 80B0D218 8FA600B8 */ lw $a2, 0x00B8($sp) -/* 0146C 80B0D21C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 01470 80B0D220 46062202 */ mul.s $f8, $f4, $f6 -/* 01474 80B0D224 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 01478 80B0D228 4600428D */ trunc.w.s $f10, $f8 -/* 0147C 80B0D22C 44105000 */ mfc1 $s0, $f10 -/* 01480 80B0D230 00000000 */ nop -/* 01484 80B0D234 00108400 */ sll $s0, $s0, 16 -/* 01488 80B0D238 04C0003B */ bltz $a2, .L80B0D328 -/* 0148C 80B0D23C 00108403 */ sra $s0, $s0, 16 -/* 01490 80B0D240 0326001A */ div $zero, $t9, $a2 -/* 01494 80B0D244 14C00002 */ bne $a2, $zero, .L80B0D250 -/* 01498 80B0D248 00000000 */ nop -/* 0149C 80B0D24C 0007000D */ break 7 -.L80B0D250: -/* 014A0 80B0D250 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 014A4 80B0D254 14C10004 */ bne $a2, $at, .L80B0D268 -/* 014A8 80B0D258 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 014AC 80B0D25C 17210002 */ bne $t9, $at, .L80B0D268 -/* 014B0 80B0D260 00000000 */ nop -/* 014B4 80B0D264 0006000D */ break 6 -.L80B0D268: -/* 014B8 80B0D268 3C014160 */ lui $at, 0x4160 ## $at = 41600000 -/* 014BC 80B0D26C 00009812 */ mflo $s3 -/* 014C0 80B0D270 00139C00 */ sll $s3, $s3, 16 -/* 014C4 80B0D274 4481C000 */ mtc1 $at, $f24 ## $f24 = 14.00 -/* 014C8 80B0D278 00139C03 */ sra $s3, $s3, 16 -.L80B0D27C: -/* 014CC 80B0D27C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 014D0 80B0D280 00000000 */ nop -/* 014D4 80B0D284 46160501 */ sub.s $f20, $f0, $f22 -/* 014D8 80B0D288 4614A400 */ add.s $f16, $f20, $f20 -/* 014DC 80B0D28C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 014E0 80B0D290 E7B00090 */ swc1 $f16, 0x0090($sp) -/* 014E4 80B0D294 46160501 */ sub.s $f20, $f0, $f22 -/* 014E8 80B0D298 00102400 */ sll $a0, $s0, 16 -/* 014EC 80B0D29C 00042403 */ sra $a0, $a0, 16 -/* 014F0 80B0D2A0 4614A480 */ add.s $f18, $f20, $f20 -/* 014F4 80B0D2A4 0C01DE1C */ jal Math_SinS - ## sins? -/* 014F8 80B0D2A8 E7B20098 */ swc1 $f18, 0x0098($sp) -/* 014FC 80B0D2AC 46180102 */ mul.s $f4, $f0, $f24 -/* 01500 80B0D2B0 C6460024 */ lwc1 $f6, 0x0024($s2) ## 00000024 -/* 01504 80B0D2B4 00102400 */ sll $a0, $s0, 16 -/* 01508 80B0D2B8 00042403 */ sra $a0, $a0, 16 -/* 0150C 80B0D2BC 46062200 */ add.s $f8, $f4, $f6 -/* 01510 80B0D2C0 E7A80084 */ swc1 $f8, 0x0084($sp) -/* 01514 80B0D2C4 C64A0028 */ lwc1 $f10, 0x0028($s2) ## 00000028 -/* 01518 80B0D2C8 0C01DE0D */ jal Math_CosS - ## coss? -/* 0151C 80B0D2CC E7AA0088 */ swc1 $f10, 0x0088($sp) -/* 01520 80B0D2D0 46180402 */ mul.s $f16, $f0, $f24 -/* 01524 80B0D2D4 C652002C */ lwc1 $f18, 0x002C($s2) ## 0000002C -/* 01528 80B0D2D8 24080014 */ addiu $t0, $zero, 0x0014 ## $t0 = 00000014 -/* 0152C 80B0D2DC 24090028 */ addiu $t1, $zero, 0x0028 ## $t1 = 00000028 -/* 01530 80B0D2E0 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 01534 80B0D2E4 AFAA0020 */ sw $t2, 0x0020($sp) -/* 01538 80B0D2E8 AFA9001C */ sw $t1, 0x001C($sp) -/* 0153C 80B0D2EC 46128100 */ add.s $f4, $f16, $f18 -/* 01540 80B0D2F0 AFA80018 */ sw $t0, 0x0018($sp) -/* 01544 80B0D2F4 AFB60014 */ sw $s6, 0x0014($sp) -/* 01548 80B0D2F8 AFB50010 */ sw $s5, 0x0010($sp) -/* 0154C 80B0D2FC E7A4008C */ swc1 $f4, 0x008C($sp) -/* 01550 80B0D300 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01554 80B0D304 27A50084 */ addiu $a1, $sp, 0x0084 ## $a1 = FFFFFFD4 -/* 01558 80B0D308 02E03025 */ or $a2, $s7, $zero ## $a2 = FFFFFFEC -/* 0155C 80B0D30C 0C00A0DB */ jal func_8002836C -/* 01560 80B0D310 03C03825 */ or $a3, $s8, $zero ## $a3 = FFFFFFE0 -/* 01564 80B0D314 02138021 */ addu $s0, $s0, $s3 -/* 01568 80B0D318 00108400 */ sll $s0, $s0, 16 -/* 0156C 80B0D31C 2631FFFF */ addiu $s1, $s1, 0xFFFF ## $s1 = FFFFFFFF -/* 01570 80B0D320 0621FFD6 */ bgez $s1, .L80B0D27C -/* 01574 80B0D324 00108403 */ sra $s0, $s0, 16 -.L80B0D328: -/* 01578 80B0D328 8FBF006C */ lw $ra, 0x006C($sp) -/* 0157C 80B0D32C D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 01580 80B0D330 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 01584 80B0D334 D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 01588 80B0D338 8FB00048 */ lw $s0, 0x0048($sp) -/* 0158C 80B0D33C 8FB1004C */ lw $s1, 0x004C($sp) -/* 01590 80B0D340 8FB20050 */ lw $s2, 0x0050($sp) -/* 01594 80B0D344 8FB30054 */ lw $s3, 0x0054($sp) -/* 01598 80B0D348 8FB40058 */ lw $s4, 0x0058($sp) -/* 0159C 80B0D34C 8FB5005C */ lw $s5, 0x005C($sp) -/* 015A0 80B0D350 8FB60060 */ lw $s6, 0x0060($sp) -/* 015A4 80B0D354 8FB70064 */ lw $s7, 0x0064($sp) -/* 015A8 80B0D358 8FBE0068 */ lw $s8, 0x0068($sp) -/* 015AC 80B0D35C 03E00008 */ jr $ra -/* 015B0 80B0D360 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D364.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D364.s deleted file mode 100644 index 3c24bb0297..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D364.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B0D364 -/* 015B4 80B0D364 AFA50004 */ sw $a1, 0x0004($sp) -/* 015B8 80B0D368 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 015BC 80B0D36C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 015C0 80B0D370 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 015C4 80B0D374 31CFE000 */ andi $t7, $t6, 0xE000 ## $t7 = 00000000 -/* 015C8 80B0D378 000FC343 */ sra $t8, $t7, 13 -/* 015CC 80B0D37C 17010006 */ bne $t8, $at, .L80B0D398 -/* 015D0 80B0D380 3C0980B1 */ lui $t1, %hi(func_80B0D3AC) ## $t1 = 80B10000 -/* 015D4 80B0D384 3C1980B1 */ lui $t9, %hi(func_80B0D3AC) ## $t9 = 80B10000 -/* 015D8 80B0D388 2739D3AC */ addiu $t9, $t9, %lo(func_80B0D3AC) ## $t9 = 80B0D3AC -/* 015DC 80B0D38C A480038C */ sh $zero, 0x038C($a0) ## 0000038C -/* 015E0 80B0D390 03E00008 */ jr $ra -/* 015E4 80B0D394 AC990190 */ sw $t9, 0x0190($a0) ## 00000190 -.L80B0D398: -/* 015E8 80B0D398 2529D3AC */ addiu $t1, $t1, %lo(func_80B0D3AC) ## $t1 = 80B0D3AC -/* 015EC 80B0D39C A488038C */ sh $t0, 0x038C($a0) ## 0000038C -/* 015F0 80B0D3A0 AC890190 */ sw $t1, 0x0190($a0) ## 00000190 -/* 015F4 80B0D3A4 03E00008 */ jr $ra -/* 015F8 80B0D3A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D3AC.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D3AC.s deleted file mode 100644 index 385b9e4198..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D3AC.s +++ /dev/null @@ -1,138 +0,0 @@ -.late_rodata -glabel D_80B0F224 - .float 0.02 - -.text -glabel func_80B0D3AC -/* 015FC 80B0D3AC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01600 80B0D3B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01604 80B0D3B4 AFB00018 */ sw $s0, 0x0018($sp) -/* 01608 80B0D3B8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0160C 80B0D3BC 8482038C */ lh $v0, 0x038C($a0) ## 0000038C -/* 01610 80B0D3C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01614 80B0D3C4 10400015 */ beq $v0, $zero, .L80B0D41C -/* 01618 80B0D3C8 304E0004 */ andi $t6, $v0, 0x0004 ## $t6 = 00000000 -/* 0161C 80B0D3CC 51C00005 */ beql $t6, $zero, .L80B0D3E4 -/* 01620 80B0D3D0 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 01624 80B0D3D4 0C2C33D1 */ jal func_80B0CF44 -/* 01628 80B0D3D8 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 0162C 80B0D3DC 8602038C */ lh $v0, 0x038C($s0) ## 0000038C -/* 01630 80B0D3E0 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -.L80B0D3E4: -/* 01634 80B0D3E4 A60F038C */ sh $t7, 0x038C($s0) ## 0000038C -/* 01638 80B0D3E8 8618038C */ lh $t8, 0x038C($s0) ## 0000038C -/* 0163C 80B0D3EC 8FA4002C */ lw $a0, 0x002C($sp) -/* 01640 80B0D3F0 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 01644 80B0D3F4 17000061 */ bne $t8, $zero, .L80B0D57C -/* 01648 80B0D3F8 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 -/* 0164C 80B0D3FC 240739EA */ addiu $a3, $zero, 0x39EA ## $a3 = 000039EA -/* 01650 80B0D400 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 01654 80B0D404 AFA50024 */ sw $a1, 0x0024($sp) -/* 01658 80B0D408 8FA50024 */ lw $a1, 0x0024($sp) -/* 0165C 80B0D40C 8FA4002C */ lw $a0, 0x002C($sp) -/* 01660 80B0D410 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 -/* 01664 80B0D414 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 01668 80B0D418 24073824 */ addiu $a3, $zero, 0x3824 ## $a3 = 00003824 -.L80B0D41C: -/* 0166C 80B0D41C 3C053CA3 */ lui $a1, 0x3CA3 ## $a1 = 3CA30000 -/* 01670 80B0D420 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 01674 80B0D424 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 -/* 01678 80B0D428 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A -/* 0167C 80B0D42C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01680 80B0D430 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3CA3D70A -/* 01684 80B0D434 0C01E107 */ jal Math_ApproachF - -/* 01688 80B0D438 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 -/* 0168C 80B0D43C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01690 80B0D440 0C00B58B */ jal Actor_SetScale - -/* 01694 80B0D444 8E050050 */ lw $a1, 0x0050($s0) ## 00000050 -/* 01698 80B0D448 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 -/* 0169C 80B0D44C C6060364 */ lwc1 $f6, 0x0364($s0) ## 00000364 -/* 016A0 80B0D450 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 016A4 80B0D454 C6120368 */ lwc1 $f18, 0x0368($s0) ## 00000368 -/* 016A8 80B0D458 46003202 */ mul.s $f8, $f6, $f0 -/* 016AC 80B0D45C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 016B0 80B0D460 C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -/* 016B4 80B0D464 46009182 */ mul.s $f6, $f18, $f0 -/* 016B8 80B0D468 C60C0070 */ lwc1 $f12, 0x0070($s0) ## 00000070 -/* 016BC 80B0D46C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016C0 80B0D470 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 016C4 80B0D474 46082280 */ add.s $f10, $f4, $f8 -/* 016C8 80B0D478 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 016CC 80B0D47C 46068100 */ add.s $f4, $f16, $f6 -/* 016D0 80B0D480 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 016D4 80B0D484 C60A036C */ lwc1 $f10, 0x036C($s0) ## 0000036C -/* 016D8 80B0D488 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 016DC 80B0D48C E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 016E0 80B0D490 46005482 */ mul.s $f18, $f10, $f0 -/* 016E4 80B0D494 C604037C */ lwc1 $f4, 0x037C($s0) ## 0000037C -/* 016E8 80B0D498 46022282 */ mul.s $f10, $f4, $f2 -/* 016EC 80B0D49C 46124400 */ add.s $f16, $f8, $f18 -/* 016F0 80B0D4A0 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 016F4 80B0D4A4 460A3200 */ add.s $f8, $f6, $f10 -/* 016F8 80B0D4A8 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C -/* 016FC 80B0D4AC C6100380 */ lwc1 $f16, 0x0380($s0) ## 00000380 -/* 01700 80B0D4B0 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 01704 80B0D4B4 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 01708 80B0D4B8 46028102 */ mul.s $f4, $f16, $f2 -/* 0170C 80B0D4BC C6080384 */ lwc1 $f8, 0x0384($s0) ## 00000384 -/* 01710 80B0D4C0 46024402 */ mul.s $f16, $f8, $f2 -/* 01714 80B0D4C4 46049180 */ add.s $f6, $f18, $f4 -/* 01718 80B0D4C8 C604006C */ lwc1 $f4, 0x006C($s0) ## 0000006C -/* 0171C 80B0D4CC 46105480 */ add.s $f18, $f10, $f16 -/* 01720 80B0D4D0 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 01724 80B0D4D4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01728 80B0D4D8 46040180 */ add.s $f6, $f0, $f4 -/* 0172C 80B0D4DC E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 01730 80B0D4E0 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 01734 80B0D4E4 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 -/* 01738 80B0D4E8 460C003C */ c.lt.s $f0, $f12 -/* 0173C 80B0D4EC 00000000 */ nop -/* 01740 80B0D4F0 45020004 */ bc1fl .L80B0D504 -/* 01744 80B0D4F4 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 01748 80B0D4F8 10000002 */ beq $zero, $zero, .L80B0D504 -/* 0174C 80B0D4FC E60C0060 */ swc1 $f12, 0x0060($s0) ## 00000060 -/* 01750 80B0D500 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -.L80B0D504: -/* 01754 80B0D504 C6080060 */ lwc1 $f8, 0x0060($s0) ## 00000060 -/* 01758 80B0D508 460A403C */ c.lt.s $f8, $f10 -/* 0175C 80B0D50C 00000000 */ nop -/* 01760 80B0D510 45000002 */ bc1f .L80B0D51C -/* 01764 80B0D514 00000000 */ nop -/* 01768 80B0D518 A2000360 */ sb $zero, 0x0360($s0) ## 00000360 -.L80B0D51C: -/* 0176C 80B0D51C 0C2C3033 */ jal func_80B0C0CC -/* 01770 80B0D520 8FA5002C */ lw $a1, 0x002C($sp) -/* 01774 80B0D524 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01778 80B0D528 14410014 */ bne $v0, $at, .L80B0D57C -/* 0177C 80B0D52C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01780 80B0D530 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01784 80B0D534 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B -/* 01788 80B0D538 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0178C 80B0D53C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01790 80B0D540 0C2C3453 */ jal func_80B0D14C -/* 01794 80B0D544 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 01798 80B0D548 3C0180B1 */ lui $at, %hi(D_80B0F224) ## $at = 80B10000 -/* 0179C 80B0D54C C420F224 */ lwc1 $f0, %lo(D_80B0F224)($at) -/* 017A0 80B0D550 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017A4 80B0D554 44050000 */ mfc1 $a1, $f0 -/* 017A8 80B0D558 0C00B58B */ jal Actor_SetScale - -/* 017AC 80B0D55C E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 -/* 017B0 80B0D560 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 017B4 80B0D564 3C1980B1 */ lui $t9, %hi(func_80B0D590) ## $t9 = 80B10000 -/* 017B8 80B0D568 2739D590 */ addiu $t9, $t9, %lo(func_80B0D590) ## $t9 = 80B0D590 -/* 017BC 80B0D56C AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 017C0 80B0D570 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 017C4 80B0D574 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 017C8 80B0D578 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -.L80B0D57C: -/* 017CC 80B0D57C 8FBF001C */ lw $ra, 0x001C($sp) -/* 017D0 80B0D580 8FB00018 */ lw $s0, 0x0018($sp) -/* 017D4 80B0D584 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 017D8 80B0D588 03E00008 */ jr $ra -/* 017DC 80B0D58C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s deleted file mode 100644 index 0ed5c18e37..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s +++ /dev/null @@ -1,222 +0,0 @@ -.late_rodata -glabel D_80B0F228 - .word 0x3C656041 -glabel D_80B0F22C - .float 0.02 - -glabel D_80B0F230 - .float 0.1 - -glabel D_80B0F234 - .word 0xBDCCCCCD - -.text -glabel func_80B0D590 -/* 017E0 80B0D590 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 017E4 80B0D594 AFBF001C */ sw $ra, 0x001C($sp) -/* 017E8 80B0D598 AFB00018 */ sw $s0, 0x0018($sp) -/* 017EC 80B0D59C AFA50034 */ sw $a1, 0x0034($sp) -/* 017F0 80B0D5A0 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 017F4 80B0D5A4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 017F8 80B0D5A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 017FC 80B0D5AC 31CFE000 */ andi $t7, $t6, 0xE000 ## $t7 = 00000000 -/* 01800 80B0D5B0 000FC343 */ sra $t8, $t7, 13 -/* 01804 80B0D5B4 1701002B */ bne $t8, $at, .L80B0D664 -/* 01808 80B0D5B8 3C0D8016 */ lui $t5, %hi(gSaveContext+0x10) -/* 0180C 80B0D5BC 3C0180B1 */ lui $at, %hi(D_80B0F228) ## $at = 80B10000 -/* 01810 80B0D5C0 C422F228 */ lwc1 $f2, %lo(D_80B0F228)($at) -/* 01814 80B0D5C4 C4800050 */ lwc1 $f0, 0x0050($a0) ## 00000050 -/* 01818 80B0D5C8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 0181C 80B0D5CC 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 -/* 01820 80B0D5D0 4602003C */ c.lt.s $f0, $f2 -/* 01824 80B0D5D4 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A -/* 01828 80B0D5D8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 0182C 80B0D5DC 3C0180B1 */ lui $at, %hi(D_80B0F22C) ## $at = 80B10000 -/* 01830 80B0D5E0 45020009 */ bc1fl .L80B0D608 -/* 01834 80B0D5E4 4600103E */ c.le.s $f2, $f0 -/* 01838 80B0D5E8 8C9901B0 */ lw $t9, 0x01B0($a0) ## 000001B0 -/* 0183C 80B0D5EC A3200015 */ sb $zero, 0x0015($t9) ## 00000015 -/* 01840 80B0D5F0 8C8801B0 */ lw $t0, 0x01B0($a0) ## 000001B0 -/* 01844 80B0D5F4 A1000016 */ sb $zero, 0x0016($t0) ## 00000016 -/* 01848 80B0D5F8 8C8901B0 */ lw $t1, 0x01B0($a0) ## 000001B0 -/* 0184C 80B0D5FC A1200017 */ sb $zero, 0x0017($t1) ## 00000017 -/* 01850 80B0D600 C4800050 */ lwc1 $f0, 0x0050($a0) ## 00000050 -/* 01854 80B0D604 4600103E */ c.le.s $f2, $f0 -.L80B0D608: -/* 01858 80B0D608 00000000 */ nop -/* 0185C 80B0D60C 45000008 */ bc1f .L80B0D630 -/* 01860 80B0D610 00000000 */ nop -/* 01864 80B0D614 8E0A01B0 */ lw $t2, 0x01B0($s0) ## 000001B0 -/* 01868 80B0D618 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0186C 80B0D61C A1420015 */ sb $v0, 0x0015($t2) ## 00000015 -/* 01870 80B0D620 8E0B01B0 */ lw $t3, 0x01B0($s0) ## 000001B0 -/* 01874 80B0D624 A1620016 */ sb $v0, 0x0016($t3) ## 00000016 -/* 01878 80B0D628 8E0C01B0 */ lw $t4, 0x01B0($s0) ## 000001B0 -/* 0187C 80B0D62C A1820017 */ sb $v0, 0x0017($t4) ## 00000017 -.L80B0D630: -/* 01880 80B0D630 8DADE670 */ lw $t5, %lo(gSaveContext+0x10)($t5) -/* 01884 80B0D634 51A00004 */ beql $t5, $zero, .L80B0D648 -/* 01888 80B0D638 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0188C 80B0D63C 10000003 */ beq $zero, $zero, .L80B0D64C -/* 01890 80B0D640 C420F22C */ lwc1 $f0, %lo(D_80B0F22C)($at) -/* 01894 80B0D644 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80B0D648: -/* 01898 80B0D648 00000000 */ nop -.L80B0D64C: -/* 0189C 80B0D64C 44050000 */ mfc1 $a1, $f0 -/* 018A0 80B0D650 0C01E107 */ jal Math_ApproachF - -/* 018A4 80B0D654 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 -/* 018A8 80B0D658 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018AC 80B0D65C 0C00B58B */ jal Actor_SetScale - -/* 018B0 80B0D660 8E050050 */ lw $a1, 0x0050($s0) ## 00000050 -.L80B0D664: -/* 018B4 80B0D664 8602038E */ lh $v0, 0x038E($s0) ## 0000038E -/* 018B8 80B0D668 10400026 */ beq $v0, $zero, .L80B0D704 -/* 018BC 80B0D66C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 018C0 80B0D670 A60E038E */ sh $t6, 0x038E($s0) ## 0000038E -/* 018C4 80B0D674 860F038E */ lh $t7, 0x038E($s0) ## 0000038E -/* 018C8 80B0D678 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018CC 80B0D67C 55E0007A */ bnel $t7, $zero, .L80B0D868 -/* 018D0 80B0D680 8FBF001C */ lw $ra, 0x001C($sp) -/* 018D4 80B0D684 0C2C33AA */ jal func_80B0CEA8 -/* 018D8 80B0D688 8FA50034 */ lw $a1, 0x0034($sp) -/* 018DC 80B0D68C 8FB80034 */ lw $t8, 0x0034($sp) -/* 018E0 80B0D690 3C0180B1 */ lui $at, %hi(D_80B0F234) ## $at = 80B10000 -/* 018E4 80B0D694 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 018E8 80B0D698 8F19009C */ lw $t9, 0x009C($t8) ## 0000009C -/* 018EC 80B0D69C 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 018F0 80B0D6A0 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 018F4 80B0D6A4 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 018F8 80B0D6A8 15000005 */ bne $t0, $zero, .L80B0D6C0 -/* 018FC 80B0D6AC 00000000 */ nop -/* 01900 80B0D6B0 3C0180B1 */ lui $at, %hi(D_80B0F230) ## $at = 80B10000 -/* 01904 80B0D6B4 C424F230 */ lwc1 $f4, %lo(D_80B0F230)($at) -/* 01908 80B0D6B8 10000003 */ beq $zero, $zero, .L80B0D6C8 -/* 0190C 80B0D6BC E6040420 */ swc1 $f4, 0x0420($s0) ## 00000420 -.L80B0D6C0: -/* 01910 80B0D6C0 C426F234 */ lwc1 $f6, %lo(D_80B0F234)($at) -/* 01914 80B0D6C4 E6060420 */ swc1 $f6, 0x0420($s0) ## 00000420 -.L80B0D6C8: -/* 01918 80B0D6C8 0C01DF64 */ jal Rand_S16Offset - -/* 0191C 80B0D6CC A609038A */ sh $t1, 0x038A($s0) ## 0000038A -/* 01920 80B0D6D0 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 01924 80B0D6D4 A602038C */ sh $v0, 0x038C($s0) ## 0000038C -/* 01928 80B0D6D8 314BE000 */ andi $t3, $t2, 0xE000 ## $t3 = 00000000 -/* 0192C 80B0D6DC 000B6343 */ sra $t4, $t3, 13 -/* 01930 80B0D6E0 51800061 */ beql $t4, $zero, .L80B0D868 -/* 01934 80B0D6E4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01938 80B0D6E8 C6000420 */ lwc1 $f0, 0x0420($s0) ## 00000420 -/* 0193C 80B0D6EC 860D038C */ lh $t5, 0x038C($s0) ## 0000038C -/* 01940 80B0D6F0 46000200 */ add.s $f8, $f0, $f0 -/* 01944 80B0D6F4 000D7040 */ sll $t6, $t5, 1 -/* 01948 80B0D6F8 A60E038C */ sh $t6, 0x038C($s0) ## 0000038C -/* 0194C 80B0D6FC 10000059 */ beq $zero, $zero, .L80B0D864 -/* 01950 80B0D700 E6080420 */ swc1 $f8, 0x0420($s0) ## 00000420 -.L80B0D704: -/* 01954 80B0D704 860F038C */ lh $t7, 0x038C($s0) ## 0000038C -/* 01958 80B0D708 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F -/* 0195C 80B0D70C 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 01960 80B0D710 A618038C */ sh $t8, 0x038C($s0) ## 0000038C -/* 01964 80B0D714 8619038C */ lh $t9, 0x038C($s0) ## 0000038C -/* 01968 80B0D718 57200013 */ bnel $t9, $zero, .L80B0D768 -/* 0196C 80B0D71C 8602038A */ lh $v0, 0x038A($s0) ## 0000038A -/* 01970 80B0D720 0C01DF64 */ jal Rand_S16Offset - -/* 01974 80B0D724 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 01978 80B0D728 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 0197C 80B0D72C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01980 80B0D730 A602038E */ sh $v0, 0x038E($s0) ## 0000038E -/* 01984 80B0D734 3109E000 */ andi $t1, $t0, 0xE000 ## $t1 = 00000000 -/* 01988 80B0D738 00095343 */ sra $t2, $t1, 13 -/* 0198C 80B0D73C A600038A */ sh $zero, 0x038A($s0) ## 0000038A -/* 01990 80B0D740 11400048 */ beq $t2, $zero, .L80B0D864 -/* 01994 80B0D744 E60A0168 */ swc1 $f10, 0x0168($s0) ## 00000168 -/* 01998 80B0D748 860B038E */ lh $t3, 0x038E($s0) ## 0000038E -/* 0199C 80B0D74C 05610003 */ bgez $t3, .L80B0D75C -/* 019A0 80B0D750 000B6043 */ sra $t4, $t3, 1 -/* 019A4 80B0D754 25610001 */ addiu $at, $t3, 0x0001 ## $at = 00000001 -/* 019A8 80B0D758 00016043 */ sra $t4, $at, 1 -.L80B0D75C: -/* 019AC 80B0D75C 10000041 */ beq $zero, $zero, .L80B0D864 -/* 019B0 80B0D760 A60C038E */ sh $t4, 0x038E($s0) ## 0000038E -/* 019B4 80B0D764 8602038A */ lh $v0, 0x038A($s0) ## 0000038A -.L80B0D768: -/* 019B8 80B0D768 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 019BC 80B0D76C 1040001D */ beq $v0, $zero, .L80B0D7E4 -/* 019C0 80B0D770 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF -/* 019C4 80B0D774 A60D038A */ sh $t5, 0x038A($s0) ## 0000038A -/* 019C8 80B0D778 860E038A */ lh $t6, 0x038A($s0) ## 0000038A -/* 019CC 80B0D77C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 019D0 80B0D780 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 019D4 80B0D784 15C00004 */ bne $t6, $zero, .L80B0D798 -/* 019D8 80B0D788 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019DC 80B0D78C 44818000 */ mtc1 $at, $f16 ## $f16 = 4.00 -/* 019E0 80B0D790 10000004 */ beq $zero, $zero, .L80B0D7A4 -/* 019E4 80B0D794 E6100168 */ swc1 $f16, 0x0168($s0) ## 00000168 -.L80B0D798: -/* 019E8 80B0D798 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 019EC 80B0D79C 00000000 */ nop -/* 019F0 80B0D7A0 E6120168 */ swc1 $f18, 0x0168($s0) ## 00000168 -.L80B0D7A4: -/* 019F4 80B0D7A4 C6060168 */ lwc1 $f6, 0x0168($s0) ## 00000168 -/* 019F8 80B0D7A8 4606203C */ c.lt.s $f4, $f6 -/* 019FC 80B0D7AC 00000000 */ nop -/* 01A00 80B0D7B0 45020004 */ bc1fl .L80B0D7C4 -/* 01A04 80B0D7B4 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 01A08 80B0D7B8 0C2C33AA */ jal func_80B0CEA8 -/* 01A0C 80B0D7BC 8FA50034 */ lw $a1, 0x0034($sp) -/* 01A10 80B0D7C0 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -.L80B0D7C4: -/* 01A14 80B0D7C4 31F8E000 */ andi $t8, $t7, 0xE000 ## $t8 = 00000000 -/* 01A18 80B0D7C8 0018CB43 */ sra $t9, $t8, 13 -/* 01A1C 80B0D7CC 53200026 */ beql $t9, $zero, .L80B0D868 -/* 01A20 80B0D7D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01A24 80B0D7D4 C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 -/* 01A28 80B0D7D8 46000200 */ add.s $f8, $f0, $f0 -/* 01A2C 80B0D7DC 10000021 */ beq $zero, $zero, .L80B0D864 -/* 01A30 80B0D7E0 E6080168 */ swc1 $f8, 0x0168($s0) ## 00000168 -.L80B0D7E4: -/* 01A34 80B0D7E4 0C0295B2 */ jal Animation_OnFrame -/* 01A38 80B0D7E8 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 01A3C 80B0D7EC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01A40 80B0D7F0 14410002 */ bne $v0, $at, .L80B0D7FC -/* 01A44 80B0D7F4 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 01A48 80B0D7F8 A608038A */ sh $t0, 0x038A($s0) ## 0000038A -.L80B0D7FC: -/* 01A4C 80B0D7FC 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 01A50 80B0D800 44815000 */ mtc1 $at, $f10 ## $f10 = 32768.00 -/* 01A54 80B0D804 C610015C */ lwc1 $f16, 0x015C($s0) ## 0000015C -/* 01A58 80B0D808 46105483 */ div.s $f18, $f10, $f16 -/* 01A5C 80B0D80C E7B2002C */ swc1 $f18, 0x002C($sp) -/* 01A60 80B0D810 C6040164 */ lwc1 $f4, 0x0164($s0) ## 00000164 -/* 01A64 80B0D814 46049182 */ mul.s $f6, $f18, $f4 -/* 01A68 80B0D818 4600320D */ trunc.w.s $f8, $f6 -/* 01A6C 80B0D81C E7A6002C */ swc1 $f6, 0x002C($sp) -/* 01A70 80B0D820 44044000 */ mfc1 $a0, $f8 -/* 01A74 80B0D824 00000000 */ nop -/* 01A78 80B0D828 00042400 */ sll $a0, $a0, 16 -/* 01A7C 80B0D82C 0C01DE1C */ jal Math_SinS - ## sins? -/* 01A80 80B0D830 00042403 */ sra $a0, $a0, 16 -/* 01A84 80B0D834 C60A0420 */ lwc1 $f10, 0x0420($s0) ## 00000420 -/* 01A88 80B0D838 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A8C 80B0D83C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFFC -/* 01A90 80B0D840 460A0402 */ mul.s $f16, $f0, $f10 -/* 01A94 80B0D844 0C2C333D */ jal func_80B0CCF4 -/* 01A98 80B0D848 E7B0002C */ swc1 $f16, 0x002C($sp) -/* 01A9C 80B0D84C 8A0B0030 */ lwl $t3, 0x0030($s0) ## 00000030 -/* 01AA0 80B0D850 9A0B0033 */ lwr $t3, 0x0033($s0) ## 00000033 -/* 01AA4 80B0D854 AA0B00B4 */ swl $t3, 0x00B4($s0) ## 000000B4 -/* 01AA8 80B0D858 BA0B00B7 */ swr $t3, 0x00B7($s0) ## 000000B7 -/* 01AAC 80B0D85C 960B0034 */ lhu $t3, 0x0034($s0) ## 00000034 -/* 01AB0 80B0D860 A60B00B8 */ sh $t3, 0x00B8($s0) ## 000000B8 -.L80B0D864: -/* 01AB4 80B0D864 8FBF001C */ lw $ra, 0x001C($sp) -.L80B0D868: -/* 01AB8 80B0D868 8FB00018 */ lw $s0, 0x0018($sp) -/* 01ABC 80B0D86C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01AC0 80B0D870 03E00008 */ jr $ra -/* 01AC4 80B0D874 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s deleted file mode 100644 index efdb910012..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s +++ /dev/null @@ -1,175 +0,0 @@ -glabel func_80B0D878 -/* 01AC8 80B0D878 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 01ACC 80B0D87C 3C0F80B1 */ lui $t7, %hi(D_80B0F12C) ## $t7 = 80B10000 -/* 01AD0 80B0D880 AFBF004C */ sw $ra, 0x004C($sp) -/* 01AD4 80B0D884 AFB00048 */ sw $s0, 0x0048($sp) -/* 01AD8 80B0D888 AFA5008C */ sw $a1, 0x008C($sp) -/* 01ADC 80B0D88C 25EFF12C */ addiu $t7, $t7, %lo(D_80B0F12C) ## $t7 = 80B0F12C -/* 01AE0 80B0D890 8DF90000 */ lw $t9, 0x0000($t7) ## 80B0F12C -/* 01AE4 80B0D894 27AE006C */ addiu $t6, $sp, 0x006C ## $t6 = FFFFFFE4 -/* 01AE8 80B0D898 8DF80004 */ lw $t8, 0x0004($t7) ## 80B0F130 -/* 01AEC 80B0D89C ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFE4 -/* 01AF0 80B0D8A0 8DF90008 */ lw $t9, 0x0008($t7) ## 80B0F134 -/* 01AF4 80B0D8A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01AF8 80B0D8A8 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFE8 -/* 01AFC 80B0D8AC ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFEC -/* 01B00 80B0D8B0 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 01B04 80B0D8B4 0C0295B2 */ jal Animation_OnFrame -/* 01B08 80B0D8B8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B0C 80B0D8BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01B10 80B0D8C0 14410003 */ bne $v0, $at, .L80B0D8D0 -/* 01B14 80B0D8C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B18 80B0D8C8 0C2C33AA */ jal func_80B0CEA8 -/* 01B1C 80B0D8CC 8FA5008C */ lw $a1, 0x008C($sp) -.L80B0D8D0: -/* 01B20 80B0D8D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B24 80B0D8D4 0C2C333D */ jal func_80B0CCF4 -/* 01B28 80B0D8D8 26050420 */ addiu $a1, $s0, 0x0420 ## $a1 = 00000420 -/* 01B2C 80B0D8DC 8A090030 */ lwl $t1, 0x0030($s0) ## 00000030 -/* 01B30 80B0D8E0 9A090033 */ lwr $t1, 0x0033($s0) ## 00000033 -/* 01B34 80B0D8E4 86030394 */ lh $v1, 0x0394($s0) ## 00000394 -/* 01B38 80B0D8E8 AA0900B4 */ swl $t1, 0x00B4($s0) ## 000000B4 -/* 01B3C 80B0D8EC BA0900B7 */ swr $t1, 0x00B7($s0) ## 000000B7 -/* 01B40 80B0D8F0 96090034 */ lhu $t1, 0x0034($s0) ## 00000034 -/* 01B44 80B0D8F4 14600030 */ bne $v1, $zero, .L80B0D9B8 -/* 01B48 80B0D8F8 A60900B8 */ sh $t1, 0x00B8($s0) ## 000000B8 -/* 01B4C 80B0D8FC 860A0392 */ lh $t2, 0x0392($s0) ## 00000392 -/* 01B50 80B0D900 3C078013 */ lui $a3, %hi(D_801333E0) -/* 01B54 80B0D904 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 01B58 80B0D908 1540002B */ bne $t2, $zero, .L80B0D9B8 -/* 01B5C 80B0D90C 24044843 */ addiu $a0, $zero, 0x4843 ## $a0 = 00004843 -/* 01B60 80B0D910 3C0B8013 */ lui $t3, %hi(D_801333E8) -/* 01B64 80B0D914 256B33E8 */ addiu $t3, %lo(D_801333E8) -/* 01B68 80B0D918 3C058013 */ lui $a1, %hi(D_801333D4) -/* 01B6C 80B0D91C 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 01B70 80B0D920 AFAB0014 */ sw $t3, 0x0014($sp) -/* 01B74 80B0D924 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01B78 80B0D928 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01B7C 80B0D92C AFA70010 */ sw $a3, 0x0010($sp) -/* 01B80 80B0D930 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01B84 80B0D934 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 -/* 01B88 80B0D938 C6040364 */ lwc1 $f4, 0x0364($s0) ## 00000364 -/* 01B8C 80B0D93C C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 01B90 80B0D940 C6060368 */ lwc1 $f6, 0x0368($s0) ## 00000368 -/* 01B94 80B0D944 460E2002 */ mul.s $f0, $f4, $f14 -/* 01B98 80B0D948 C608036C */ lwc1 $f8, 0x036C($s0) ## 0000036C -/* 01B9C 80B0D94C 8FA6008C */ lw $a2, 0x008C($sp) -/* 01BA0 80B0D950 460E3082 */ mul.s $f2, $f6, $f14 -/* 01BA4 80B0D954 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01BA8 80B0D958 2407019C */ addiu $a3, $zero, 0x019C ## $a3 = 0000019C -/* 01BAC 80B0D95C 460E4302 */ mul.s $f12, $f8, $f14 -/* 01BB0 80B0D960 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 01BB4 80B0D964 46005400 */ add.s $f16, $f10, $f0 -/* 01BB8 80B0D968 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01BBC 80B0D96C C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 01BC0 80B0D970 46029100 */ add.s $f4, $f18, $f2 -/* 01BC4 80B0D974 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 01BC8 80B0D978 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 01BCC 80B0D97C AFA00024 */ sw $zero, 0x0024($sp) -/* 01BD0 80B0D980 AFA00020 */ sw $zero, 0x0020($sp) -/* 01BD4 80B0D984 460C3200 */ add.s $f8, $f6, $f12 -/* 01BD8 80B0D988 AFA0001C */ sw $zero, 0x001C($sp) -/* 01BDC 80B0D98C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01BE0 80B0D990 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 01BE4 80B0D994 0C00C916 */ jal Actor_SpawnAsChild - -/* 01BE8 80B0D998 AFAC0028 */ sw $t4, 0x0028($sp) -/* 01BEC 80B0D99C 10400002 */ beq $v0, $zero, .L80B0D9A8 -/* 01BF0 80B0D9A0 00000000 */ nop -/* 01BF4 80B0D9A4 AC400118 */ sw $zero, 0x0118($v0) ## 00000118 -.L80B0D9A8: -/* 01BF8 80B0D9A8 0C00B55C */ jal Actor_Kill - -/* 01BFC 80B0D9AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C00 80B0D9B0 1000004F */ beq $zero, $zero, .L80B0DAF0 -/* 01C04 80B0D9B4 8FBF004C */ lw $ra, 0x004C($sp) -.L80B0D9B8: -/* 01C08 80B0D9B8 860D0392 */ lh $t5, 0x0392($s0) ## 00000392 -/* 01C0C 80B0D9BC 55A0004C */ bnel $t5, $zero, .L80B0DAF0 -/* 01C10 80B0D9C0 8FBF004C */ lw $ra, 0x004C($sp) -/* 01C14 80B0D9C4 14600003 */ bne $v1, $zero, .L80B0D9D4 -/* 01C18 80B0D9C8 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 01C1C 80B0D9CC 10000003 */ beq $zero, $zero, .L80B0D9DC -/* 01C20 80B0D9D0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B0D9D4: -/* 01C24 80B0D9D4 A60E0394 */ sh $t6, 0x0394($s0) ## 00000394 -/* 01C28 80B0D9D8 86020394 */ lh $v0, 0x0394($s0) ## 00000394 -.L80B0D9DC: -/* 01C2C 80B0D9DC 50400044 */ beql $v0, $zero, .L80B0DAF0 -/* 01C30 80B0D9E0 8FBF004C */ lw $ra, 0x004C($sp) -/* 01C34 80B0D9E4 8E190024 */ lw $t9, 0x0024($s0) ## 00000024 -/* 01C38 80B0D9E8 27AF0078 */ addiu $t7, $sp, 0x0078 ## $t7 = FFFFFFF0 -/* 01C3C 80B0D9EC ADF90000 */ sw $t9, 0x0000($t7) ## FFFFFFF0 -/* 01C40 80B0D9F0 8E180028 */ lw $t8, 0x0028($s0) ## 00000028 -/* 01C44 80B0D9F4 ADF80004 */ sw $t8, 0x0004($t7) ## FFFFFFF4 -/* 01C48 80B0D9F8 8E19002C */ lw $t9, 0x002C($s0) ## 0000002C -/* 01C4C 80B0D9FC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01C50 80B0DA00 ADF90008 */ sw $t9, 0x0008($t7) ## FFFFFFF8 -/* 01C54 80B0DA04 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01C58 80B0DA08 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 -/* 01C5C 80B0DA0C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01C60 80B0DA10 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 01C64 80B0DA14 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 01C68 80B0DA18 44819000 */ mtc1 $at, $f18 ## $f18 = 6.00 -/* 01C6C 80B0DA1C 460A0401 */ sub.s $f16, $f0, $f10 -/* 01C70 80B0DA20 C7A8007C */ lwc1 $f8, 0x007C($sp) -/* 01C74 80B0DA24 46128102 */ mul.s $f4, $f16, $f18 -/* 01C78 80B0DA28 46047180 */ add.s $f6, $f14, $f4 -/* 01C7C 80B0DA2C 46064280 */ add.s $f10, $f8, $f6 -/* 01C80 80B0DA30 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01C84 80B0DA34 E7AA007C */ swc1 $f10, 0x007C($sp) -/* 01C88 80B0DA38 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01C8C 80B0DA3C 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 01C90 80B0DA40 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 01C94 80B0DA44 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 -/* 01C98 80B0DA48 46100481 */ sub.s $f18, $f0, $f16 -/* 01C9C 80B0DA4C C7A60078 */ lwc1 $f6, 0x0078($sp) -/* 01CA0 80B0DA50 46049202 */ mul.s $f8, $f18, $f4 -/* 01CA4 80B0DA54 46083280 */ add.s $f10, $f6, $f8 -/* 01CA8 80B0DA58 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01CAC 80B0DA5C E7AA0078 */ swc1 $f10, 0x0078($sp) -/* 01CB0 80B0DA60 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01CB4 80B0DA64 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 01CB8 80B0DA68 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 01CBC 80B0DA6C 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 -/* 01CC0 80B0DA70 46100481 */ sub.s $f18, $f0, $f16 -/* 01CC4 80B0DA74 C7A80080 */ lwc1 $f8, 0x0080($sp) -/* 01CC8 80B0DA78 27A6006C */ addiu $a2, $sp, 0x006C ## $a2 = FFFFFFE4 -/* 01CCC 80B0DA7C 2408002A */ addiu $t0, $zero, 0x002A ## $t0 = 0000002A -/* 01CD0 80B0DA80 46049182 */ mul.s $f6, $f18, $f4 -/* 01CD4 80B0DA84 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 01CD8 80B0DA88 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 01CDC 80B0DA8C 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 01CE0 80B0DA90 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 01CE4 80B0DA94 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 01CE8 80B0DA98 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01CEC 80B0DA9C 46064280 */ add.s $f10, $f8, $f6 -/* 01CF0 80B0DAA0 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 -/* 01CF4 80B0DAA4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01CF8 80B0DAA8 AFB8003C */ sw $t8, 0x003C($sp) -/* 01CFC 80B0DAAC E7AA0080 */ swc1 $f10, 0x0080($sp) -/* 01D00 80B0DAB0 AFAF0038 */ sw $t7, 0x0038($sp) -/* 01D04 80B0DAB4 AFAE0034 */ sw $t6, 0x0034($sp) -/* 01D08 80B0DAB8 AFAD0028 */ sw $t5, 0x0028($sp) -/* 01D0C 80B0DABC AFAC0024 */ sw $t4, 0x0024($sp) -/* 01D10 80B0DAC0 AFAB0020 */ sw $t3, 0x0020($sp) -/* 01D14 80B0DAC4 AFAA001C */ sw $t2, 0x001C($sp) -/* 01D18 80B0DAC8 AFA90018 */ sw $t1, 0x0018($sp) -/* 01D1C 80B0DACC AFA80010 */ sw $t0, 0x0010($sp) -/* 01D20 80B0DAD0 00C03825 */ or $a3, $a2, $zero ## $a3 = FFFFFFE4 -/* 01D24 80B0DAD4 8FA4008C */ lw $a0, 0x008C($sp) -/* 01D28 80B0DAD8 27A50078 */ addiu $a1, $sp, 0x0078 ## $a1 = FFFFFFF0 -/* 01D2C 80B0DADC AFA00014 */ sw $zero, 0x0014($sp) -/* 01D30 80B0DAE0 AFA0002C */ sw $zero, 0x002C($sp) -/* 01D34 80B0DAE4 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 01D38 80B0DAE8 AFA00030 */ sw $zero, 0x0030($sp) -/* 01D3C 80B0DAEC 8FBF004C */ lw $ra, 0x004C($sp) -.L80B0DAF0: -/* 01D40 80B0DAF0 8FB00048 */ lw $s0, 0x0048($sp) -/* 01D44 80B0DAF4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 01D48 80B0DAF8 03E00008 */ jr $ra -/* 01D4C 80B0DAFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DB00.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DB00.s deleted file mode 100644 index e0a0493dbf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DB00.s +++ /dev/null @@ -1,104 +0,0 @@ -glabel func_80B0DB00 -/* 01D50 80B0DB00 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01D54 80B0DB04 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01D58 80B0DB08 AFB00030 */ sw $s0, 0x0030($sp) -/* 01D5C 80B0DB0C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D60 80B0DB10 0C00B638 */ jal Actor_MoveForward - -/* 01D64 80B0DB14 AFA5003C */ sw $a1, 0x003C($sp) -/* 01D68 80B0DB18 860E00B4 */ lh $t6, 0x00B4($s0) ## 000000B4 -/* 01D6C 80B0DB1C 861800B8 */ lh $t8, 0x00B8($s0) ## 000000B8 -/* 01D70 80B0DB20 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01D74 80B0DB24 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 01D78 80B0DB28 25CF1000 */ addiu $t7, $t6, 0x1000 ## $t7 = 00001000 -/* 01D7C 80B0DB2C 27191000 */ addiu $t9, $t8, 0x1000 ## $t9 = 00001000 -/* 01D80 80B0DB30 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01D84 80B0DB34 A60F00B4 */ sh $t7, 0x00B4($s0) ## 000000B4 -/* 01D88 80B0DB38 A61900B8 */ sh $t9, 0x00B8($s0) ## 000000B8 -/* 01D8C 80B0DB3C 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 01D90 80B0DB40 44060000 */ mfc1 $a2, $f0 -/* 01D94 80B0DB44 44070000 */ mfc1 $a3, $f0 -/* 01D98 80B0DB48 AFA80014 */ sw $t0, 0x0014($sp) -/* 01D9C 80B0DB4C 8FA4003C */ lw $a0, 0x003C($sp) -/* 01DA0 80B0DB50 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01DA4 80B0DB54 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 01DA8 80B0DB58 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01DAC 80B0DB5C 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 -/* 01DB0 80B0DB60 30690001 */ andi $t1, $v1, 0x0001 ## $t1 = 00000000 -/* 01DB4 80B0DB64 51200041 */ beql $t1, $zero, .L80B0DC6C -/* 01DB8 80B0DB68 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01DBC 80B0DB6C C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 -/* 01DC0 80B0DB70 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01DC4 80B0DB74 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 -/* 01DC8 80B0DB78 4606403E */ c.le.s $f8, $f6 -/* 01DCC 80B0DB7C 00000000 */ nop -/* 01DD0 80B0DB80 4503003A */ bc1tl .L80B0DC6C -/* 01DD4 80B0DB84 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01DD8 80B0DB88 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 -/* 01DDC 80B0DB8C 44815000 */ mtc1 $at, $f10 ## $f10 = -32000.00 -/* 01DE0 80B0DB90 3C0146FA */ lui $at, 0x46FA ## $at = 46FA0000 -/* 01DE4 80B0DB94 460A003E */ c.le.s $f0, $f10 -/* 01DE8 80B0DB98 00000000 */ nop -/* 01DEC 80B0DB9C 45010007 */ bc1t .L80B0DBBC -/* 01DF0 80B0DBA0 00000000 */ nop -/* 01DF4 80B0DBA4 44818000 */ mtc1 $at, $f16 ## $f16 = 32000.00 -/* 01DF8 80B0DBA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DFC 80B0DBAC 4600803E */ c.le.s $f16, $f0 -/* 01E00 80B0DBB0 00000000 */ nop -/* 01E04 80B0DBB4 45020006 */ bc1fl .L80B0DBD0 -/* 01E08 80B0DBB8 8602038A */ lh $v0, 0x038A($s0) ## 0000038A -.L80B0DBBC: -/* 01E0C 80B0DBBC 0C00B55C */ jal Actor_Kill - -/* 01E10 80B0DBC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E14 80B0DBC4 10000029 */ beq $zero, $zero, .L80B0DC6C -/* 01E18 80B0DBC8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01E1C 80B0DBCC 8602038A */ lh $v0, 0x038A($s0) ## 0000038A -.L80B0DBD0: -/* 01E20 80B0DBD0 306AFFFE */ andi $t2, $v1, 0xFFFE ## $t2 = 00000000 -/* 01E24 80B0DBD4 A60A0088 */ sh $t2, 0x0088($s0) ## 00000088 -/* 01E28 80B0DBD8 14400006 */ bne $v0, $zero, .L80B0DBF4 -/* 01E2C 80B0DBDC 3C0B80B1 */ lui $t3, %hi(func_80B0DC7C) ## $t3 = 80B10000 -/* 01E30 80B0DBE0 256BDC7C */ addiu $t3, $t3, %lo(func_80B0DC7C) ## $t3 = 80B0DC7C -/* 01E34 80B0DBE4 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 01E38 80B0DBE8 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 01E3C 80B0DBEC 1000000D */ beq $zero, $zero, .L80B0DC24 -/* 01E40 80B0DBF0 A60C0394 */ sh $t4, 0x0394($s0) ## 00000394 -.L80B0DBF4: -/* 01E44 80B0DBF4 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 01E48 80B0DBF8 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 01E4C 80B0DBFC 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 -/* 01E50 80B0DC00 46809120 */ cvt.s.w $f4, $f18 -/* 01E54 80B0DC04 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01E58 80B0DC08 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 01E5C 80B0DC0C 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF -/* 01E60 80B0DC10 A60D038A */ sh $t5, 0x038A($s0) ## 0000038A -/* 01E64 80B0DC14 46062202 */ mul.s $f8, $f4, $f6 -/* 01E68 80B0DC18 00000000 */ nop -/* 01E6C 80B0DC1C 460A4402 */ mul.s $f16, $f8, $f10 -/* 01E70 80B0DC20 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 -.L80B0DC24: -/* 01E74 80B0DC24 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01E78 80B0DC28 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B -/* 01E7C 80B0DC2C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01E80 80B0DC30 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 -/* 01E84 80B0DC34 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 01E88 80B0DC38 240F0078 */ addiu $t7, $zero, 0x0078 ## $t7 = 00000078 -/* 01E8C 80B0DC3C 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 01E90 80B0DC40 AFB8001C */ sw $t8, 0x001C($sp) -/* 01E94 80B0DC44 AFAF0018 */ sw $t7, 0x0018($sp) -/* 01E98 80B0DC48 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01E9C 80B0DC4C 8FA4003C */ lw $a0, 0x003C($sp) -/* 01EA0 80B0DC50 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01EA4 80B0DC54 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 01EA8 80B0DC58 3C074180 */ lui $a3, 0x4180 ## $a3 = 41800000 -/* 01EAC 80B0DC5C AFA00020 */ sw $zero, 0x0020($sp) -/* 01EB0 80B0DC60 0C00CC98 */ jal func_80033260 -/* 01EB4 80B0DC64 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 01EB8 80B0DC68 8FBF0034 */ lw $ra, 0x0034($sp) -.L80B0DC6C: -/* 01EBC 80B0DC6C 8FB00030 */ lw $s0, 0x0030($sp) -/* 01EC0 80B0DC70 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01EC4 80B0DC74 03E00008 */ jr $ra -/* 01EC8 80B0DC78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s deleted file mode 100644 index e869836269..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s +++ /dev/null @@ -1,120 +0,0 @@ -glabel func_80B0DC7C -/* 01ECC 80B0DC7C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 01ED0 80B0DC80 3C0F80B1 */ lui $t7, %hi(D_80B0F138) ## $t7 = 80B10000 -/* 01ED4 80B0DC84 AFBF004C */ sw $ra, 0x004C($sp) -/* 01ED8 80B0DC88 AFB00048 */ sw $s0, 0x0048($sp) -/* 01EDC 80B0DC8C AFA50074 */ sw $a1, 0x0074($sp) -/* 01EE0 80B0DC90 25EFF138 */ addiu $t7, $t7, %lo(D_80B0F138) ## $t7 = 80B0F138 -/* 01EE4 80B0DC94 8DF90000 */ lw $t9, 0x0000($t7) ## 80B0F138 -/* 01EE8 80B0DC98 27AE0064 */ addiu $t6, $sp, 0x0064 ## $t6 = FFFFFFF4 -/* 01EEC 80B0DC9C 8DF80004 */ lw $t8, 0x0004($t7) ## 80B0F13C -/* 01EF0 80B0DCA0 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 01EF4 80B0DCA4 8DF90008 */ lw $t9, 0x0008($t7) ## 80B0F140 -/* 01EF8 80B0DCA8 3C0980B1 */ lui $t1, %hi(D_80B0F144) ## $t1 = 80B10000 -/* 01EFC 80B0DCAC 2529F144 */ addiu $t1, $t1, %lo(D_80B0F144) ## $t1 = 80B0F144 -/* 01F00 80B0DCB0 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 01F04 80B0DCB4 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 01F08 80B0DCB8 8D2B0000 */ lw $t3, 0x0000($t1) ## 80B0F144 -/* 01F0C 80B0DCBC 27A80058 */ addiu $t0, $sp, 0x0058 ## $t0 = FFFFFFE8 -/* 01F10 80B0DCC0 8D2A0004 */ lw $t2, 0x0004($t1) ## 80B0F148 -/* 01F14 80B0DCC4 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFE8 -/* 01F18 80B0DCC8 8D2B0008 */ lw $t3, 0x0008($t1) ## 80B0F14C -/* 01F1C 80B0DCCC AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFEC -/* 01F20 80B0DCD0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F24 80B0DCD4 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFF0 -/* 01F28 80B0DCD8 84820394 */ lh $v0, 0x0394($a0) ## 00000394 -/* 01F2C 80B0DCDC 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 01F30 80B0DCE0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01F34 80B0DCE4 14400003 */ bne $v0, $zero, .L80B0DCF4 -/* 01F38 80B0DCE8 244CFFFF */ addiu $t4, $v0, 0xFFFF ## $t4 = FFFFFFFF -/* 01F3C 80B0DCEC 10000003 */ beq $zero, $zero, .L80B0DCFC -/* 01F40 80B0DCF0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80B0DCF4: -/* 01F44 80B0DCF4 A60C0394 */ sh $t4, 0x0394($s0) ## 00000394 -/* 01F48 80B0DCF8 86030394 */ lh $v1, 0x0394($s0) ## 00000394 -.L80B0DCFC: -/* 01F4C 80B0DCFC 10600044 */ beq $v1, $zero, .L80B0DE10 -/* 01F50 80B0DD00 8FA40074 */ lw $a0, 0x0074($sp) -/* 01F54 80B0DD04 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01F58 80B0DD08 00000000 */ nop -/* 01F5C 80B0DD0C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01F60 80B0DD10 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 01F64 80B0DD14 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 01F68 80B0DD18 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 01F6C 80B0DD1C 46040181 */ sub.s $f6, $f0, $f4 -/* 01F70 80B0DD20 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01F74 80B0DD24 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 01F78 80B0DD28 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 01F7C 80B0DD2C 46083282 */ mul.s $f10, $f6, $f8 -/* 01F80 80B0DD30 46128100 */ add.s $f4, $f16, $f18 -/* 01F84 80B0DD34 46045180 */ add.s $f6, $f10, $f4 -/* 01F88 80B0DD38 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01F8C 80B0DD3C E7A6005C */ swc1 $f6, 0x005C($sp) -/* 01F90 80B0DD40 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01F94 80B0DD44 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 01F98 80B0DD48 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 01F9C 80B0DD4C 44819000 */ mtc1 $at, $f18 ## $f18 = 32.00 -/* 01FA0 80B0DD50 46080401 */ sub.s $f16, $f0, $f8 -/* 01FA4 80B0DD54 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 01FA8 80B0DD58 46128282 */ mul.s $f10, $f16, $f18 -/* 01FAC 80B0DD5C 46045180 */ add.s $f6, $f10, $f4 -/* 01FB0 80B0DD60 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01FB4 80B0DD64 E7A60058 */ swc1 $f6, 0x0058($sp) -/* 01FB8 80B0DD68 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01FBC 80B0DD6C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 01FC0 80B0DD70 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 01FC4 80B0DD74 44819000 */ mtc1 $at, $f18 ## $f18 = 32.00 -/* 01FC8 80B0DD78 46080401 */ sub.s $f16, $f0, $f8 -/* 01FCC 80B0DD7C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 01FD0 80B0DD80 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFFF4 -/* 01FD4 80B0DD84 240D002A */ addiu $t5, $zero, 0x002A ## $t5 = 0000002A -/* 01FD8 80B0DD88 46128282 */ mul.s $f10, $f16, $f18 -/* 01FDC 80B0DD8C 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 01FE0 80B0DD90 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 01FE4 80B0DD94 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01FE8 80B0DD98 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01FEC 80B0DD9C 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 01FF0 80B0DDA0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01FF4 80B0DDA4 46045180 */ add.s $f6, $f10, $f4 -/* 01FF8 80B0DDA8 240A0009 */ addiu $t2, $zero, 0x0009 ## $t2 = 00000009 -/* 01FFC 80B0DDAC 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02000 80B0DDB0 AFAB003C */ sw $t3, 0x003C($sp) -/* 02004 80B0DDB4 E7A60060 */ swc1 $f6, 0x0060($sp) -/* 02008 80B0DDB8 AFAA0038 */ sw $t2, 0x0038($sp) -/* 0200C 80B0DDBC AFA90034 */ sw $t1, 0x0034($sp) -/* 02010 80B0DDC0 AFA80028 */ sw $t0, 0x0028($sp) -/* 02014 80B0DDC4 AFB90024 */ sw $t9, 0x0024($sp) -/* 02018 80B0DDC8 AFB80020 */ sw $t8, 0x0020($sp) -/* 0201C 80B0DDCC AFAF001C */ sw $t7, 0x001C($sp) -/* 02020 80B0DDD0 AFAE0018 */ sw $t6, 0x0018($sp) -/* 02024 80B0DDD4 AFAD0010 */ sw $t5, 0x0010($sp) -/* 02028 80B0DDD8 00C03825 */ or $a3, $a2, $zero ## $a3 = FFFFFFF4 -/* 0202C 80B0DDDC AFA00030 */ sw $zero, 0x0030($sp) -/* 02030 80B0DDE0 AFA0002C */ sw $zero, 0x002C($sp) -/* 02034 80B0DDE4 AFA00014 */ sw $zero, 0x0014($sp) -/* 02038 80B0DDE8 8FA40074 */ lw $a0, 0x0074($sp) -/* 0203C 80B0DDEC 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 02040 80B0DDF0 27A50058 */ addiu $a1, $sp, 0x0058 ## $a1 = FFFFFFE8 -/* 02044 80B0DDF4 860C00B4 */ lh $t4, 0x00B4($s0) ## 000000B4 -/* 02048 80B0DDF8 860E00B8 */ lh $t6, 0x00B8($s0) ## 000000B8 -/* 0204C 80B0DDFC 258D1000 */ addiu $t5, $t4, 0x1000 ## $t5 = 00001000 -/* 02050 80B0DE00 25CF1000 */ addiu $t7, $t6, 0x1000 ## $t7 = 00001000 -/* 02054 80B0DE04 A60D00B4 */ sh $t5, 0x00B4($s0) ## 000000B4 -/* 02058 80B0DE08 10000005 */ beq $zero, $zero, .L80B0DE20 -/* 0205C 80B0DE0C A60F00B8 */ sh $t7, 0x00B8($s0) ## 000000B8 -.L80B0DE10: -/* 02060 80B0DE10 0C007E50 */ jal Item_DropCollectibleRandom - -/* 02064 80B0DE14 24070030 */ addiu $a3, $zero, 0x0030 ## $a3 = 00000030 -/* 02068 80B0DE18 0C00B55C */ jal Actor_Kill - -/* 0206C 80B0DE1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B0DE20: -/* 02070 80B0DE20 8FBF004C */ lw $ra, 0x004C($sp) -/* 02074 80B0DE24 8FB00048 */ lw $s0, 0x0048($sp) -/* 02078 80B0DE28 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 0207C 80B0DE2C 03E00008 */ jr $ra -/* 02080 80B0DE30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DE34.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DE34.s deleted file mode 100644 index b12f63c281..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DE34.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80B0DE34 -/* 02084 80B0DE34 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02088 80B0DE38 AFA40028 */ sw $a0, 0x0028($sp) -/* 0208C 80B0DE3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02090 80B0DE40 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 02094 80B0DE44 AFA5002C */ sw $a1, 0x002C($sp) -/* 02098 80B0DE48 0C01E01A */ jal Math_Vec3f_Yaw - -/* 0209C 80B0DE4C AFA4001C */ sw $a0, 0x001C($sp) -/* 020A0 80B0DE50 8FAE0028 */ lw $t6, 0x0028($sp) -/* 020A4 80B0DE54 8FA4001C */ lw $a0, 0x001C($sp) -/* 020A8 80B0DE58 8FA5002C */ lw $a1, 0x002C($sp) -/* 020AC 80B0DE5C 85CF007E */ lh $t7, 0x007E($t6) ## 0000007E -/* 020B0 80B0DE60 004FC023 */ subu $t8, $v0, $t7 -/* 020B4 80B0DE64 0C01E027 */ jal Math_Vec3f_Pitch - -/* 020B8 80B0DE68 A7B80024 */ sh $t8, 0x0024($sp) -/* 020BC 80B0DE6C 87B90024 */ lh $t9, 0x0024($sp) -/* 020C0 80B0DE70 2444C000 */ addiu $a0, $v0, 0xC000 ## $a0 = FFFFC000 -/* 020C4 80B0DE74 00042400 */ sll $a0, $a0, 16 -/* 020C8 80B0DE78 07200003 */ bltz $t9, .L80B0DE88 -/* 020CC 80B0DE7C 00042403 */ sra $a0, $a0, 16 -/* 020D0 80B0DE80 10000002 */ beq $zero, $zero, .L80B0DE8C -/* 020D4 80B0DE84 2403FFFF */ addiu $v1, $zero, 0xFFFF ## $v1 = FFFFFFFF -.L80B0DE88: -/* 020D8 80B0DE88 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80B0DE8C: -/* 020DC 80B0DE8C 00640019 */ multu $v1, $a0 -/* 020E0 80B0DE90 8FBF0014 */ lw $ra, 0x0014($sp) -/* 020E4 80B0DE94 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 020E8 80B0DE98 00001012 */ mflo $v0 -/* 020EC 80B0DE9C 00021400 */ sll $v0, $v0, 16 -/* 020F0 80B0DEA0 03E00008 */ jr $ra -/* 020F4 80B0DEA4 00021403 */ sra $v0, $v0, 16 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DEA8.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DEA8.s deleted file mode 100644 index f733303054..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DEA8.s +++ /dev/null @@ -1,95 +0,0 @@ -glabel func_80B0DEA8 -/* 020F8 80B0DEA8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 020FC 80B0DEAC AFBF0034 */ sw $ra, 0x0034($sp) -/* 02100 80B0DEB0 AFB00030 */ sw $s0, 0x0030($sp) -/* 02104 80B0DEB4 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 02108 80B0DEB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0210C 80B0DEBC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02110 80B0DEC0 8C6E067C */ lw $t6, 0x067C($v1) ## 0000067C -/* 02114 80B0DEC4 000E7A80 */ sll $t7, $t6, 10 -/* 02118 80B0DEC8 05E20006 */ bltzl $t7, .L80B0DEE4 -/* 0211C 80B0DECC AFA3005C */ sw $v1, 0x005C($sp) -/* 02120 80B0DED0 50C00004 */ beql $a2, $zero, .L80B0DEE4 -/* 02124 80B0DED4 AFA3005C */ sw $v1, 0x005C($sp) -/* 02128 80B0DED8 10000043 */ beq $zero, $zero, .L80B0DFE8 -/* 0212C 80B0DEDC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02130 80B0DEE0 AFA3005C */ sw $v1, 0x005C($sp) -.L80B0DEE4: -/* 02134 80B0DEE4 AFA50064 */ sw $a1, 0x0064($sp) -/* 02138 80B0DEE8 0C00B77D */ jal func_8002DDF4 -/* 0213C 80B0DEEC AFA60068 */ sw $a2, 0x0068($sp) -/* 02140 80B0DEF0 8FA3005C */ lw $v1, 0x005C($sp) -/* 02144 80B0DEF4 10400005 */ beq $v0, $zero, .L80B0DF0C -/* 02148 80B0DEF8 8FA60068 */ lw $a2, 0x0068($sp) -/* 0214C 80B0DEFC 50C00004 */ beql $a2, $zero, .L80B0DF10 -/* 02150 80B0DF00 24650024 */ addiu $a1, $v1, 0x0024 ## $a1 = 00000024 -/* 02154 80B0DF04 10000038 */ beq $zero, $zero, .L80B0DFE8 -/* 02158 80B0DF08 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B0DF0C: -/* 0215C 80B0DF0C 24650024 */ addiu $a1, $v1, 0x0024 ## $a1 = 00000024 -.L80B0DF10: -/* 02160 80B0DF10 AFA50040 */ sw $a1, 0x0040($sp) -/* 02164 80B0DF14 0C2C378D */ jal func_80B0DE34 -/* 02168 80B0DF18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0216C 80B0DF1C 861800B8 */ lh $t8, 0x00B8($s0) ## 000000B8 -/* 02170 80B0DF20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02174 80B0DF24 8FA50040 */ lw $a1, 0x0040($sp) -/* 02178 80B0DF28 0058C823 */ subu $t9, $v0, $t8 -/* 0217C 80B0DF2C 07200006 */ bltz $t9, .L80B0DF48 -/* 02180 80B0DF30 00000000 */ nop -/* 02184 80B0DF34 0C2C378D */ jal func_80B0DE34 -/* 02188 80B0DF38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0218C 80B0DF3C 860800B8 */ lh $t0, 0x00B8($s0) ## 000000B8 -/* 02190 80B0DF40 10000006 */ beq $zero, $zero, .L80B0DF5C -/* 02194 80B0DF44 00481823 */ subu $v1, $v0, $t0 -.L80B0DF48: -/* 02198 80B0DF48 0C2C378D */ jal func_80B0DE34 -/* 0219C 80B0DF4C 8FA50040 */ lw $a1, 0x0040($sp) -/* 021A0 80B0DF50 860900B8 */ lh $t1, 0x00B8($s0) ## 000000B8 -/* 021A4 80B0DF54 00491823 */ subu $v1, $v0, $t1 -/* 021A8 80B0DF58 00031823 */ subu $v1, $zero, $v1 -.L80B0DF5C: -/* 021AC 80B0DF5C 28611FC2 */ slti $at, $v1, 0x1FC2 -/* 021B0 80B0DF60 14200003 */ bne $at, $zero, .L80B0DF70 -/* 021B4 80B0DF64 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 021B8 80B0DF68 1000001F */ beq $zero, $zero, .L80B0DFE8 -/* 021BC 80B0DF6C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B0DF70: -/* 021C0 80B0DF70 8FA50040 */ lw $a1, 0x0040($sp) -/* 021C4 80B0DF74 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 021C8 80B0DF78 AFA4003C */ sw $a0, 0x003C($sp) -/* 021CC 80B0DF7C 3C014302 */ lui $at, 0x4302 ## $at = 43020000 -/* 021D0 80B0DF80 44812000 */ mtc1 $at, $f4 ## $f4 = 130.00 -/* 021D4 80B0DF84 8FA40064 */ lw $a0, 0x0064($sp) -/* 021D8 80B0DF88 8FA5003C */ lw $a1, 0x003C($sp) -/* 021DC 80B0DF8C 4600203E */ c.le.s $f4, $f0 -/* 021E0 80B0DF90 8FA60040 */ lw $a2, 0x0040($sp) -/* 021E4 80B0DF94 27A70048 */ addiu $a3, $sp, 0x0048 ## $a3 = FFFFFFE8 -/* 021E8 80B0DF98 27AA0058 */ addiu $t2, $sp, 0x0058 ## $t2 = FFFFFFF8 -/* 021EC 80B0DF9C 45000003 */ bc1f .L80B0DFAC -/* 021F0 80B0DFA0 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 021F4 80B0DFA4 10000010 */ beq $zero, $zero, .L80B0DFE8 -/* 021F8 80B0DFA8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B0DFAC: -/* 021FC 80B0DFAC 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02200 80B0DFB0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 02204 80B0DFB4 27AD0054 */ addiu $t5, $sp, 0x0054 ## $t5 = FFFFFFF4 -/* 02208 80B0DFB8 AFAD0024 */ sw $t5, 0x0024($sp) -/* 0220C 80B0DFBC AFAC0020 */ sw $t4, 0x0020($sp) -/* 02210 80B0DFC0 AFAB0014 */ sw $t3, 0x0014($sp) -/* 02214 80B0DFC4 AFAA0010 */ sw $t2, 0x0010($sp) -/* 02218 80B0DFC8 AFA00018 */ sw $zero, 0x0018($sp) -/* 0221C 80B0DFCC 0C00F7A1 */ jal BgCheck_EntityLineTest1 -/* 02220 80B0DFD0 AFA0001C */ sw $zero, 0x001C($sp) -/* 02224 80B0DFD4 54400004 */ bnel $v0, $zero, .L80B0DFE8 -/* 02228 80B0DFD8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0222C 80B0DFDC 10000002 */ beq $zero, $zero, .L80B0DFE8 -/* 02230 80B0DFE0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02234 80B0DFE4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B0DFE8: -/* 02238 80B0DFE8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0223C 80B0DFEC 8FB00030 */ lw $s0, 0x0030($sp) -/* 02240 80B0DFF0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 02244 80B0DFF4 03E00008 */ jr $ra -/* 02248 80B0DFF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s deleted file mode 100644 index d5e99af10d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s +++ /dev/null @@ -1,218 +0,0 @@ -.late_rodata -glabel D_80B0F238 - .word 0x4622F983 - -.text -glabel func_80B0DFFC -/* 0224C 80B0DFFC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 02250 80B0E000 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 02254 80B0E004 AFBF003C */ sw $ra, 0x003C($sp) -/* 02258 80B0E008 AFB20038 */ sw $s2, 0x0038($sp) -/* 0225C 80B0E00C AFB10034 */ sw $s1, 0x0034($sp) -/* 02260 80B0E010 AFB00030 */ sw $s0, 0x0030($sp) -/* 02264 80B0E014 AFA5006C */ sw $a1, 0x006C($sp) -/* 02268 80B0E018 AFAE004C */ sw $t6, 0x004C($sp) -/* 0226C 80B0E01C 908F01A6 */ lbu $t7, 0x01A6($a0) ## 000001A6 -/* 02270 80B0E020 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02274 80B0E024 8FA9006C */ lw $t1, 0x006C($sp) -/* 02278 80B0E028 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 0227C 80B0E02C 5300000A */ beql $t8, $zero, .L80B0E058 -/* 02280 80B0E030 8D2A009C */ lw $t2, 0x009C($t1) ## 0000009C -/* 02284 80B0E034 909901A5 */ lbu $t9, 0x01A5($a0) ## 000001A5 -/* 02288 80B0E038 24910024 */ addiu $s1, $a0, 0x0024 ## $s1 = 00000024 -/* 0228C 80B0E03C 3328FFFD */ andi $t0, $t9, 0xFFFD ## $t0 = 00000000 -/* 02290 80B0E040 A08801A5 */ sb $t0, 0x01A5($a0) ## 000001A5 -/* 02294 80B0E044 8FB2006C */ lw $s2, 0x006C($sp) -/* 02298 80B0E048 AFA0004C */ sw $zero, 0x004C($sp) -/* 0229C 80B0E04C 10000062 */ beq $zero, $zero, .L80B0E1D8 -/* 022A0 80B0E050 265207C0 */ addiu $s2, $s2, 0x07C0 ## $s2 = 000007C0 -/* 022A4 80B0E054 8D2A009C */ lw $t2, 0x009C($t1) ## 0000009C -.L80B0E058: -/* 022A8 80B0E058 253207C0 */ addiu $s2, $t1, 0x07C0 ## $s2 = 000007C0 -/* 022AC 80B0E05C 02402025 */ or $a0, $s2, $zero ## $a0 = 000007C0 -/* 022B0 80B0E060 314B0003 */ andi $t3, $t2, 0x0003 ## $t3 = 00000000 -/* 022B4 80B0E064 15600013 */ bne $t3, $zero, .L80B0E0B4 -/* 022B8 80B0E068 26110024 */ addiu $s1, $s0, 0x0024 ## $s1 = 00000024 -/* 022BC 80B0E06C 27AC0060 */ addiu $t4, $sp, 0x0060 ## $t4 = FFFFFFF8 -/* 022C0 80B0E070 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 022C4 80B0E074 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 022C8 80B0E078 27AF005C */ addiu $t7, $sp, 0x005C ## $t7 = FFFFFFF4 -/* 022CC 80B0E07C AFAF0024 */ sw $t7, 0x0024($sp) -/* 022D0 80B0E080 AFAE0020 */ sw $t6, 0x0020($sp) -/* 022D4 80B0E084 AFAD0014 */ sw $t5, 0x0014($sp) -/* 022D8 80B0E088 AFAC0010 */ sw $t4, 0x0010($sp) -/* 022DC 80B0E08C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000024 -/* 022E0 80B0E090 26060454 */ addiu $a2, $s0, 0x0454 ## $a2 = 00000454 -/* 022E4 80B0E094 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFE8 -/* 022E8 80B0E098 AFA00018 */ sw $zero, 0x0018($sp) -/* 022EC 80B0E09C 0C00F7A1 */ jal BgCheck_EntityLineTest1 -/* 022F0 80B0E0A0 AFA0001C */ sw $zero, 0x001C($sp) -/* 022F4 80B0E0A4 54400004 */ bnel $v0, $zero, .L80B0E0B8 -/* 022F8 80B0E0A8 8FB8006C */ lw $t8, 0x006C($sp) -/* 022FC 80B0E0AC 1000004A */ beq $zero, $zero, .L80B0E1D8 -/* 02300 80B0E0B0 AFA0004C */ sw $zero, 0x004C($sp) -.L80B0E0B4: -/* 02304 80B0E0B4 8FB8006C */ lw $t8, 0x006C($sp) -.L80B0E0B8: -/* 02308 80B0E0B8 26110024 */ addiu $s1, $s0, 0x0024 ## $s1 = 00000024 -/* 0230C 80B0E0BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02310 80B0E0C0 8F19009C */ lw $t9, 0x009C($t8) ## 0000009C -/* 02314 80B0E0C4 271207C0 */ addiu $s2, $t8, 0x07C0 ## $s2 = 000007C0 -/* 02318 80B0E0C8 02402025 */ or $a0, $s2, $zero ## $a0 = 000007C0 -/* 0231C 80B0E0CC 33280003 */ andi $t0, $t9, 0x0003 ## $t0 = 00000000 -/* 02320 80B0E0D0 15010012 */ bne $t0, $at, .L80B0E11C -/* 02324 80B0E0D4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000024 -/* 02328 80B0E0D8 27AA0060 */ addiu $t2, $sp, 0x0060 ## $t2 = FFFFFFF8 -/* 0232C 80B0E0DC 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02330 80B0E0E0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02334 80B0E0E4 27AC005C */ addiu $t4, $sp, 0x005C ## $t4 = FFFFFFF4 -/* 02338 80B0E0E8 AFAC0024 */ sw $t4, 0x0024($sp) -/* 0233C 80B0E0EC AFA90020 */ sw $t1, 0x0020($sp) -/* 02340 80B0E0F0 AFAB0014 */ sw $t3, 0x0014($sp) -/* 02344 80B0E0F4 AFAA0010 */ sw $t2, 0x0010($sp) -/* 02348 80B0E0F8 26060460 */ addiu $a2, $s0, 0x0460 ## $a2 = 00000460 -/* 0234C 80B0E0FC 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFE8 -/* 02350 80B0E100 AFA00018 */ sw $zero, 0x0018($sp) -/* 02354 80B0E104 0C00F7A1 */ jal BgCheck_EntityLineTest1 -/* 02358 80B0E108 AFA0001C */ sw $zero, 0x001C($sp) -/* 0235C 80B0E10C 50400004 */ beql $v0, $zero, .L80B0E120 -/* 02360 80B0E110 8FAD006C */ lw $t5, 0x006C($sp) -/* 02364 80B0E114 10000030 */ beq $zero, $zero, .L80B0E1D8 -/* 02368 80B0E118 AFA0004C */ sw $zero, 0x004C($sp) -.L80B0E11C: -/* 0236C 80B0E11C 8FAD006C */ lw $t5, 0x006C($sp) -.L80B0E120: -/* 02370 80B0E120 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02374 80B0E124 02402025 */ or $a0, $s2, $zero ## $a0 = 000007C0 -/* 02378 80B0E128 8DAE009C */ lw $t6, 0x009C($t5) ## 0000009C -/* 0237C 80B0E12C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000024 -/* 02380 80B0E130 2606046C */ addiu $a2, $s0, 0x046C ## $a2 = 0000046C -/* 02384 80B0E134 31CF0003 */ andi $t7, $t6, 0x0003 ## $t7 = 00000000 -/* 02388 80B0E138 15E10010 */ bne $t7, $at, .L80B0E17C -/* 0238C 80B0E13C 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFE8 -/* 02390 80B0E140 27B80060 */ addiu $t8, $sp, 0x0060 ## $t8 = FFFFFFF8 -/* 02394 80B0E144 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02398 80B0E148 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0239C 80B0E14C 27AA005C */ addiu $t2, $sp, 0x005C ## $t2 = FFFFFFF4 -/* 023A0 80B0E150 AFAA0024 */ sw $t2, 0x0024($sp) -/* 023A4 80B0E154 AFA80020 */ sw $t0, 0x0020($sp) -/* 023A8 80B0E158 AFB90014 */ sw $t9, 0x0014($sp) -/* 023AC 80B0E15C AFB80010 */ sw $t8, 0x0010($sp) -/* 023B0 80B0E160 AFA00018 */ sw $zero, 0x0018($sp) -/* 023B4 80B0E164 0C00F7A1 */ jal BgCheck_EntityLineTest1 -/* 023B8 80B0E168 AFA0001C */ sw $zero, 0x001C($sp) -/* 023BC 80B0E16C 54400004 */ bnel $v0, $zero, .L80B0E180 -/* 023C0 80B0E170 8FAB006C */ lw $t3, 0x006C($sp) -/* 023C4 80B0E174 10000018 */ beq $zero, $zero, .L80B0E1D8 -/* 023C8 80B0E178 AFA0004C */ sw $zero, 0x004C($sp) -.L80B0E17C: -/* 023CC 80B0E17C 8FAB006C */ lw $t3, 0x006C($sp) -.L80B0E180: -/* 023D0 80B0E180 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 023D4 80B0E184 02402025 */ or $a0, $s2, $zero ## $a0 = 000007C0 -/* 023D8 80B0E188 8D69009C */ lw $t1, 0x009C($t3) ## 0000009C -/* 023DC 80B0E18C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000024 -/* 023E0 80B0E190 26060478 */ addiu $a2, $s0, 0x0478 ## $a2 = 00000478 -/* 023E4 80B0E194 312C0003 */ andi $t4, $t1, 0x0003 ## $t4 = 00000000 -/* 023E8 80B0E198 1581000F */ bne $t4, $at, .L80B0E1D8 -/* 023EC 80B0E19C 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFE8 -/* 023F0 80B0E1A0 27AD0060 */ addiu $t5, $sp, 0x0060 ## $t5 = FFFFFFF8 -/* 023F4 80B0E1A4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 023F8 80B0E1A8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 023FC 80B0E1AC 27B8005C */ addiu $t8, $sp, 0x005C ## $t8 = FFFFFFF4 -/* 02400 80B0E1B0 AFB80024 */ sw $t8, 0x0024($sp) -/* 02404 80B0E1B4 AFAF0020 */ sw $t7, 0x0020($sp) -/* 02408 80B0E1B8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0240C 80B0E1BC AFAD0010 */ sw $t5, 0x0010($sp) -/* 02410 80B0E1C0 AFA00018 */ sw $zero, 0x0018($sp) -/* 02414 80B0E1C4 0C00F7A1 */ jal BgCheck_EntityLineTest1 -/* 02418 80B0E1C8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0241C 80B0E1CC 50400003 */ beql $v0, $zero, .L80B0E1DC -/* 02420 80B0E1D0 26190430 */ addiu $t9, $s0, 0x0430 ## $t9 = 00000430 -/* 02424 80B0E1D4 AFA0004C */ sw $zero, 0x004C($sp) -.L80B0E1D8: -/* 02428 80B0E1D8 26190430 */ addiu $t9, $s0, 0x0430 ## $t9 = 00000430 -.L80B0E1DC: -/* 0242C 80B0E1DC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 02430 80B0E1E0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 02434 80B0E1E4 27AB005C */ addiu $t3, $sp, 0x005C ## $t3 = FFFFFFF4 -/* 02438 80B0E1E8 AFAB0024 */ sw $t3, 0x0024($sp) -/* 0243C 80B0E1EC AFAA0020 */ sw $t2, 0x0020($sp) -/* 02440 80B0E1F0 AFA80014 */ sw $t0, 0x0014($sp) -/* 02444 80B0E1F4 AFB90010 */ sw $t9, 0x0010($sp) -/* 02448 80B0E1F8 02402025 */ or $a0, $s2, $zero ## $a0 = 000007C0 -/* 0244C 80B0E1FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000024 -/* 02450 80B0E200 26060484 */ addiu $a2, $s0, 0x0484 ## $a2 = 00000484 -/* 02454 80B0E204 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFE8 -/* 02458 80B0E208 AFA00018 */ sw $zero, 0x0018($sp) -/* 0245C 80B0E20C 0C00F7A1 */ jal BgCheck_EntityLineTest1 -/* 02460 80B0E210 AFA0001C */ sw $zero, 0x001C($sp) -/* 02464 80B0E214 50400039 */ beql $v0, $zero, .L80B0E2FC -/* 02468 80B0E218 8FBF003C */ lw $ra, 0x003C($sp) -/* 0246C 80B0E21C 8E020430 */ lw $v0, 0x0430($s0) ## 00000430 -/* 02470 80B0E220 84490008 */ lh $t1, 0x0008($v0) ## 00000008 -/* 02474 80B0E224 844C000C */ lh $t4, 0x000C($v0) ## 0000000C -/* 02478 80B0E228 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 0247C 80B0E22C 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 02480 80B0E230 46802320 */ cvt.s.w $f12, $f4 -/* 02484 80B0E234 0C03F494 */ jal Math_FAtan2F -/* 02488 80B0E238 468033A0 */ cvt.s.w $f14, $f6 -/* 0248C 80B0E23C 3C0180B1 */ lui $at, %hi(D_80B0F238) ## $at = 80B10000 -/* 02490 80B0E240 C428F238 */ lwc1 $f8, %lo(D_80B0F238)($at) -/* 02494 80B0E244 27AF0050 */ addiu $t7, $sp, 0x0050 ## $t7 = FFFFFFE8 -/* 02498 80B0E248 46080282 */ mul.s $f10, $f0, $f8 -/* 0249C 80B0E24C 4600540D */ trunc.w.s $f16, $f10 -/* 024A0 80B0E250 440E8000 */ mfc1 $t6, $f16 -/* 024A4 80B0E254 00000000 */ nop -/* 024A8 80B0E258 A60E007E */ sh $t6, 0x007E($s0) ## 0000007E -/* 024AC 80B0E25C 8DF90000 */ lw $t9, 0x0000($t7) ## FFFFFFE8 -/* 024B0 80B0E260 AE390000 */ sw $t9, 0x0000($s1) ## 00000024 -/* 024B4 80B0E264 8DF80004 */ lw $t8, 0x0004($t7) ## FFFFFFEC -/* 024B8 80B0E268 AE380004 */ sw $t8, 0x0004($s1) ## 00000028 -/* 024BC 80B0E26C 8DF90008 */ lw $t9, 0x0008($t7) ## FFFFFFF0 -/* 024C0 80B0E270 AE390008 */ sw $t9, 0x0008($s1) ## 0000002C -/* 024C4 80B0E274 0C01DE1C */ jal Math_SinS - ## sins? -/* 024C8 80B0E278 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 024CC 80B0E27C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 024D0 80B0E280 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 024D4 80B0E284 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 024D8 80B0E288 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 024DC 80B0E28C 46002182 */ mul.s $f6, $f4, $f0 -/* 024E0 80B0E290 46069200 */ add.s $f8, $f18, $f6 -/* 024E4 80B0E294 0C01DE0D */ jal Math_CosS - ## coss? -/* 024E8 80B0E298 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 024EC 80B0E29C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 024F0 80B0E2A0 44818000 */ mtc1 $at, $f16 ## $f16 = 6.00 -/* 024F4 80B0E2A4 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 024F8 80B0E2A8 27A80050 */ addiu $t0, $sp, 0x0050 ## $t0 = FFFFFFE8 -/* 024FC 80B0E2AC 46008102 */ mul.s $f4, $f16, $f0 -/* 02500 80B0E2B0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 02504 80B0E2B4 46045480 */ add.s $f18, $f10, $f4 -/* 02508 80B0E2B8 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 0250C 80B0E2BC 8D0B0000 */ lw $t3, 0x0000($t0) ## FFFFFFE8 -/* 02510 80B0E2C0 AE0B0434 */ sw $t3, 0x0434($s0) ## 00000434 -/* 02514 80B0E2C4 8D0A0004 */ lw $t2, 0x0004($t0) ## FFFFFFEC -/* 02518 80B0E2C8 AE0A0438 */ sw $t2, 0x0438($s0) ## 00000438 -/* 0251C 80B0E2CC 8D0B0008 */ lw $t3, 0x0008($t0) ## FFFFFFF0 -/* 02520 80B0E2D0 0C01DE1C */ jal Math_SinS - ## sins? -/* 02524 80B0E2D4 AE0B043C */ sw $t3, 0x043C($s0) ## 0000043C -/* 02528 80B0E2D8 C6060434 */ lwc1 $f6, 0x0434($s0) ## 00000434 -/* 0252C 80B0E2DC 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 02530 80B0E2E0 46003200 */ add.s $f8, $f6, $f0 -/* 02534 80B0E2E4 0C01DE0D */ jal Math_CosS - ## coss? -/* 02538 80B0E2E8 E6080434 */ swc1 $f8, 0x0434($s0) ## 00000434 -/* 0253C 80B0E2EC C610043C */ lwc1 $f16, 0x043C($s0) ## 0000043C -/* 02540 80B0E2F0 46008280 */ add.s $f10, $f16, $f0 -/* 02544 80B0E2F4 E60A043C */ swc1 $f10, 0x043C($s0) ## 0000043C -/* 02548 80B0E2F8 8FBF003C */ lw $ra, 0x003C($sp) -.L80B0E2FC: -/* 0254C 80B0E2FC 8FA2004C */ lw $v0, 0x004C($sp) -/* 02550 80B0E300 8FB00030 */ lw $s0, 0x0030($sp) -/* 02554 80B0E304 8FB10034 */ lw $s1, 0x0034($sp) -/* 02558 80B0E308 8FB20038 */ lw $s2, 0x0038($sp) -/* 0255C 80B0E30C 03E00008 */ jr $ra -/* 02560 80B0E310 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E314.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E314.s deleted file mode 100644 index dc53a36bfa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E314.s +++ /dev/null @@ -1,80 +0,0 @@ -.late_rodata -glabel D_80B0F23C - .float 0.1 - -.text -glabel func_80B0E314 -/* 02564 80B0E314 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02568 80B0E318 3C0180B1 */ lui $at, %hi(D_80B0F23C) ## $at = 80B10000 -/* 0256C 80B0E31C C424F23C */ lwc1 $f4, %lo(D_80B0F23C)($at) -/* 02570 80B0E320 AFB00020 */ sw $s0, 0x0020($sp) -/* 02574 80B0E324 AFA60058 */ sw $a2, 0x0058($sp) -/* 02578 80B0E328 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0257C 80B0E32C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02580 80B0E330 AFA50054 */ sw $a1, 0x0054($sp) -/* 02584 80B0E334 AFA7005C */ sw $a3, 0x005C($sp) -/* 02588 80B0E338 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 0258C 80B0E33C 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 02590 80B0E340 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 02594 80B0E344 8FA50060 */ lw $a1, 0x0060($sp) -/* 02598 80B0E348 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 0259C 80B0E34C 0C01E0C4 */ jal Math_SmoothStepToF - -/* 025A0 80B0E350 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 025A4 80B0E354 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 025A8 80B0E358 C7A80054 */ lwc1 $f8, 0x0054($sp) -/* 025AC 80B0E35C E7A60030 */ swc1 $f6, 0x0030($sp) -/* 025B0 80B0E360 C7AA0030 */ lwc1 $f10, 0x0030($sp) -/* 025B4 80B0E364 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 025B8 80B0E368 C7A60058 */ lwc1 $f6, 0x0058($sp) -/* 025BC 80B0E36C 460A4401 */ sub.s $f16, $f8, $f10 -/* 025C0 80B0E370 E7A4002C */ swc1 $f4, 0x002C($sp) -/* 025C4 80B0E374 C7A8002C */ lwc1 $f8, 0x002C($sp) -/* 025C8 80B0E378 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 025CC 80B0E37C C7A4005C */ lwc1 $f4, 0x005C($sp) -/* 025D0 80B0E380 46083481 */ sub.s $f18, $f6, $f8 -/* 025D4 80B0E384 E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 025D8 80B0E388 C7A60028 */ lwc1 $f6, 0x0028($sp) -/* 025DC 80B0E38C 46062201 */ sub.s $f8, $f4, $f6 -/* 025E0 80B0E390 46084282 */ mul.s $f10, $f8, $f8 -/* 025E4 80B0E394 E7A80034 */ swc1 $f8, 0x0034($sp) -/* 025E8 80B0E398 46108102 */ mul.s $f4, $f16, $f16 -/* 025EC 80B0E39C 00000000 */ nop -/* 025F0 80B0E3A0 46129182 */ mul.s $f6, $f18, $f18 -/* 025F4 80B0E3A4 46062200 */ add.s $f8, $f4, $f6 -/* 025F8 80B0E3A8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 025FC 80B0E3AC C7A60034 */ lwc1 $f6, 0x0034($sp) -/* 02600 80B0E3B0 460A4000 */ add.s $f0, $f8, $f10 -/* 02604 80B0E3B4 46000004 */ sqrt.s $f0, $f0 -/* 02608 80B0E3B8 46040032 */ c.eq.s $f0, $f4 -/* 0260C 80B0E3BC 00000000 */ nop -/* 02610 80B0E3C0 45000006 */ bc1f .L80B0E3DC -/* 02614 80B0E3C4 00000000 */ nop -/* 02618 80B0E3C8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0261C 80B0E3CC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 02620 80B0E3D0 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 02624 80B0E3D4 10000005 */ beq $zero, $zero, .L80B0E3EC -/* 02628 80B0E3D8 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -.L80B0E3DC: -/* 0262C 80B0E3DC 46008383 */ div.s $f14, $f16, $f0 -/* 02630 80B0E3E0 46009303 */ div.s $f12, $f18, $f0 -/* 02634 80B0E3E4 46003083 */ div.s $f2, $f6, $f0 -/* 02638 80B0E3E8 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -.L80B0E3EC: -/* 0263C 80B0E3EC C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 02640 80B0E3F0 46007382 */ mul.s $f14, $f14, $f0 -/* 02644 80B0E3F4 460E4280 */ add.s $f10, $f8, $f14 -/* 02648 80B0E3F8 46006302 */ mul.s $f12, $f12, $f0 -/* 0264C 80B0E3FC E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 02650 80B0E400 C7A4002C */ lwc1 $f4, 0x002C($sp) -/* 02654 80B0E404 46001082 */ mul.s $f2, $f2, $f0 -/* 02658 80B0E408 460C2180 */ add.s $f6, $f4, $f12 -/* 0265C 80B0E40C E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 02660 80B0E410 C7A80028 */ lwc1 $f8, 0x0028($sp) -/* 02664 80B0E414 46024280 */ add.s $f10, $f8, $f2 -/* 02668 80B0E418 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 0266C 80B0E41C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02670 80B0E420 8FB00020 */ lw $s0, 0x0020($sp) -/* 02674 80B0E424 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 02678 80B0E428 03E00008 */ jr $ra -/* 0267C 80B0E42C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s deleted file mode 100644 index 4702a99a4b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s +++ /dev/null @@ -1,133 +0,0 @@ -.late_rodata -glabel D_80B0F240 - .float 0.01 - -glabel D_80B0F244 - .float 0.01 - -.text -glabel func_80B0E430 -/* 02680 80B0E430 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02684 80B0E434 AFB00020 */ sw $s0, 0x0020($sp) -/* 02688 80B0E438 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0268C 80B0E43C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02690 80B0E440 3C040600 */ lui $a0, %hi(D_06000304) ## $a0 = 06000000 -/* 02694 80B0E444 AFA50034 */ sw $a1, 0x0034($sp) -/* 02698 80B0E448 AFA60038 */ sw $a2, 0x0038($sp) -/* 0269C 80B0E44C AFA7003C */ sw $a3, 0x003C($sp) -/* 026A0 80B0E450 0C028800 */ jal Animation_GetLastFrame - -/* 026A4 80B0E454 24840304 */ addiu $a0, $a0, %lo(D_06000304) ## $a0 = 06000304 -/* 026A8 80B0E458 86030388 */ lh $v1, 0x0388($s0) ## 00000388 -/* 026AC 80B0E45C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 026B0 80B0E460 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 026B4 80B0E464 14600003 */ bne $v1, $zero, .L80B0E474 -/* 026B8 80B0E468 468020A0 */ cvt.s.w $f2, $f4 -/* 026BC 80B0E46C 10000004 */ beq $zero, $zero, .L80B0E480 -/* 026C0 80B0E470 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B0E474: -/* 026C4 80B0E474 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 026C8 80B0E478 A60E0388 */ sh $t6, 0x0388($s0) ## 00000388 -/* 026CC 80B0E47C 86020388 */ lh $v0, 0x0388($s0) ## 00000388 -.L80B0E480: -/* 026D0 80B0E480 1040000C */ beq $v0, $zero, .L80B0E4B4 -/* 026D4 80B0E484 8FA50034 */ lw $a1, 0x0034($sp) -/* 026D8 80B0E488 3C0180B1 */ lui $at, %hi(D_80B0F240) ## $at = 80B10000 -/* 026DC 80B0E48C C426F240 */ lwc1 $f6, %lo(D_80B0F240)($at) -/* 026E0 80B0E490 3C063F19 */ lui $a2, 0x3F19 ## $a2 = 3F190000 -/* 026E4 80B0E494 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3F19999A -/* 026E8 80B0E498 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 -/* 026EC 80B0E49C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 026F0 80B0E4A0 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 -/* 026F4 80B0E4A4 0C01E0C4 */ jal Math_SmoothStepToF - -/* 026F8 80B0E4A8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 026FC 80B0E4AC 10000047 */ beq $zero, $zero, .L80B0E5CC -/* 02700 80B0E4B0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B0E4B4: -/* 02704 80B0E4B4 3C0180B1 */ lui $at, %hi(D_80B0F244) ## $at = 80B10000 -/* 02708 80B0E4B8 C428F244 */ lwc1 $f8, %lo(D_80B0F244)($at) -/* 0270C 80B0E4BC 3C063F19 */ lui $a2, 0x3F19 ## $a2 = 3F190000 -/* 02710 80B0E4C0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3F19999A -/* 02714 80B0E4C4 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 -/* 02718 80B0E4C8 E7A20028 */ swc1 $f2, 0x0028($sp) -/* 0271C 80B0E4CC 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02720 80B0E4D0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 02724 80B0E4D4 8FAF003C */ lw $t7, 0x003C($sp) -/* 02728 80B0E4D8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0272C 80B0E4DC C7A20028 */ lwc1 $f2, 0x0028($sp) -/* 02730 80B0E4E0 15E1000A */ bne $t7, $at, .L80B0E50C -/* 02734 80B0E4E4 8FA30040 */ lw $v1, 0x0040($sp) -/* 02738 80B0E4E8 C60A0164 */ lwc1 $f10, 0x0164($s0) ## 00000164 -/* 0273C 80B0E4EC C6100168 */ lwc1 $f16, 0x0168($s0) ## 00000168 -/* 02740 80B0E4F0 46105480 */ add.s $f18, $f10, $f16 -/* 02744 80B0E4F4 4612103C */ c.lt.s $f2, $f18 -/* 02748 80B0E4F8 00000000 */ nop -/* 0274C 80B0E4FC 45020004 */ bc1fl .L80B0E510 -/* 02750 80B0E500 847807A0 */ lh $t8, 0x07A0($v1) ## 000007A0 -/* 02754 80B0E504 10000031 */ beq $zero, $zero, .L80B0E5CC -/* 02758 80B0E508 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B0E50C: -/* 0275C 80B0E50C 847807A0 */ lh $t8, 0x07A0($v1) ## 000007A0 -.L80B0E510: -/* 02760 80B0E510 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 02764 80B0E514 0018C880 */ sll $t9, $t8, 2 -/* 02768 80B0E518 00794021 */ addu $t0, $v1, $t9 -/* 0276C 80B0E51C 8D020790 */ lw $v0, 0x0790($t0) ## 00000790 -/* 02770 80B0E520 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 02774 80B0E524 2445005C */ addiu $a1, $v0, 0x005C ## $a1 = 0000005C -/* 02778 80B0E528 3C0143BE */ lui $at, 0x43BE ## $at = 43BE0000 -/* 0277C 80B0E52C 44812000 */ mtc1 $at, $f4 ## $f4 = 380.00 -/* 02780 80B0E530 00000000 */ nop -/* 02784 80B0E534 4604003C */ c.lt.s $f0, $f4 -/* 02788 80B0E538 00000000 */ nop -/* 0278C 80B0E53C 45020011 */ bc1fl .L80B0E584 -/* 02790 80B0E540 A6000440 */ sh $zero, 0x0440($s0) ## 00000440 -/* 02794 80B0E544 86030440 */ lh $v1, 0x0440($s0) ## 00000440 -/* 02798 80B0E548 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0279C 80B0E54C 14600003 */ bne $v1, $zero, .L80B0E55C -/* 027A0 80B0E550 2469FFFF */ addiu $t1, $v1, 0xFFFF ## $t1 = FFFFFFFF -/* 027A4 80B0E554 10000003 */ beq $zero, $zero, .L80B0E564 -/* 027A8 80B0E558 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B0E55C: -/* 027AC 80B0E55C A6090440 */ sh $t1, 0x0440($s0) ## 00000440 -/* 027B0 80B0E560 86020440 */ lh $v0, 0x0440($s0) ## 00000440 -.L80B0E564: -/* 027B4 80B0E564 54400008 */ bnel $v0, $zero, .L80B0E588 -/* 027B8 80B0E568 87A7003A */ lh $a3, 0x003A($sp) -/* 027BC 80B0E56C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 027C0 80B0E570 2405388C */ addiu $a1, $zero, 0x388C ## $a1 = 0000388C -/* 027C4 80B0E574 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 027C8 80B0E578 10000002 */ beq $zero, $zero, .L80B0E584 -/* 027CC 80B0E57C A60A0440 */ sh $t2, 0x0440($s0) ## 00000440 -/* 027D0 80B0E580 A6000440 */ sh $zero, 0x0440($s0) ## 00000440 -.L80B0E584: -/* 027D4 80B0E584 87A7003A */ lh $a3, 0x003A($sp) -.L80B0E588: -/* 027D8 80B0E588 86050444 */ lh $a1, 0x0444($s0) ## 00000444 -/* 027DC 80B0E58C 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 027E0 80B0E590 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 027E4 80B0E594 0C01E1A7 */ jal Math_SmoothStepToS - -/* 027E8 80B0E598 AFA70010 */ sw $a3, 0x0010($sp) -/* 027EC 80B0E59C 8A0C00B4 */ lwl $t4, 0x00B4($s0) ## 000000B4 -/* 027F0 80B0E5A0 9A0C00B7 */ lwr $t4, 0x00B7($s0) ## 000000B7 -/* 027F4 80B0E5A4 860D0444 */ lh $t5, 0x0444($s0) ## 00000444 -/* 027F8 80B0E5A8 860E00B8 */ lh $t6, 0x00B8($s0) ## 000000B8 -/* 027FC 80B0E5AC AA0C0030 */ swl $t4, 0x0030($s0) ## 00000030 -/* 02800 80B0E5B0 BA0C0033 */ swr $t4, 0x0033($s0) ## 00000033 -/* 02804 80B0E5B4 960C00B8 */ lhu $t4, 0x00B8($s0) ## 000000B8 -/* 02808 80B0E5B8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0280C 80B0E5BC 15AE0003 */ bne $t5, $t6, .L80B0E5CC -/* 02810 80B0E5C0 A60C0034 */ sh $t4, 0x0034($s0) ## 00000034 -/* 02814 80B0E5C4 10000001 */ beq $zero, $zero, .L80B0E5CC -/* 02818 80B0E5C8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B0E5CC: -/* 0281C 80B0E5CC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02820 80B0E5D0 8FB00020 */ lw $s0, 0x0020($sp) -/* 02824 80B0E5D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02828 80B0E5D8 03E00008 */ jr $ra -/* 0282C 80B0E5DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E5E0.s deleted file mode 100644 index ac2e1b3a60..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E5E0.s +++ /dev/null @@ -1,99 +0,0 @@ -.late_rodata -glabel D_80B0F248 - .word 0x469C4000 - -.text -glabel func_80B0E5E0 -/* 02830 80B0E5E0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 02834 80B0E5E4 AFA5003C */ sw $a1, 0x003C($sp) -/* 02838 80B0E5E8 8FAE003C */ lw $t6, 0x003C($sp) -/* 0283C 80B0E5EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 02840 80B0E5F0 AFB00020 */ sw $s0, 0x0020($sp) -/* 02844 80B0E5F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02848 80B0E5F8 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 0284C 80B0E5FC 240603E8 */ addiu $a2, $zero, 0x03E8 ## $a2 = 000003E8 -/* 02850 80B0E600 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02854 80B0E604 0C2C390C */ jal func_80B0E430 -/* 02858 80B0E608 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0285C 80B0E60C 5040002C */ beql $v0, $zero, .L80B0E6C0 -/* 02860 80B0E610 86020442 */ lh $v0, 0x0442($s0) ## 00000442 -/* 02864 80B0E614 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02868 80B0E618 00000000 */ nop -/* 0286C 80B0E61C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02870 80B0E620 E7A0002C */ swc1 $f0, 0x002C($sp) -/* 02874 80B0E624 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 02878 80B0E628 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 0287C 80B0E62C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 02880 80B0E630 C7A8002C */ lwc1 $f8, 0x002C($sp) -/* 02884 80B0E634 4600203E */ c.le.s $f4, $f0 -/* 02888 80B0E638 00000000 */ nop -/* 0288C 80B0E63C 45020006 */ bc1fl .L80B0E658 -/* 02890 80B0E640 44810000 */ mtc1 $at, $f0 ## $f0 = -1.00 -/* 02894 80B0E644 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02898 80B0E648 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 0289C 80B0E64C 10000003 */ beq $zero, $zero, .L80B0E65C -/* 028A0 80B0E650 00000000 */ nop -/* 028A4 80B0E654 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -.L80B0E658: -/* 028A8 80B0E658 00000000 */ nop -.L80B0E65C: -/* 028AC 80B0E65C 3C0180B1 */ lui $at, %hi(D_80B0F248) ## $at = 80B10000 -/* 028B0 80B0E660 C426F248 */ lwc1 $f6, %lo(D_80B0F248)($at) -/* 028B4 80B0E664 860A0034 */ lh $t2, 0x0034($s0) ## 00000034 -/* 028B8 80B0E668 2404000A */ addiu $a0, $zero, 0x000A ## $a0 = 0000000A -/* 028BC 80B0E66C 46083282 */ mul.s $f10, $f6, $f8 -/* 028C0 80B0E670 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 028C4 80B0E674 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 028C8 80B0E678 4600540D */ trunc.w.s $f16, $f10 -/* 028CC 80B0E67C 468042A0 */ cvt.s.w $f10, $f8 -/* 028D0 80B0E680 44188000 */ mfc1 $t8, $f16 -/* 028D4 80B0E684 00000000 */ nop -/* 028D8 80B0E688 0018CC00 */ sll $t9, $t8, 16 -/* 028DC 80B0E68C 00194403 */ sra $t0, $t9, 16 -/* 028E0 80B0E690 25092EE0 */ addiu $t1, $t0, 0x2EE0 ## $t1 = 00002EE0 -/* 028E4 80B0E694 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 028E8 80B0E698 00000000 */ nop -/* 028EC 80B0E69C 46809120 */ cvt.s.w $f4, $f18 -/* 028F0 80B0E6A0 46040182 */ mul.s $f6, $f0, $f4 -/* 028F4 80B0E6A4 460A3400 */ add.s $f16, $f6, $f10 -/* 028F8 80B0E6A8 4600848D */ trunc.w.s $f18, $f16 -/* 028FC 80B0E6AC 440C9000 */ mfc1 $t4, $f18 -/* 02900 80B0E6B0 0C01DF64 */ jal Rand_S16Offset - -/* 02904 80B0E6B4 A60C0444 */ sh $t4, 0x0444($s0) ## 00000444 -/* 02908 80B0E6B8 A6020388 */ sh $v0, 0x0388($s0) ## 00000388 -/* 0290C 80B0E6BC 86020442 */ lh $v0, 0x0442($s0) ## 00000442 -.L80B0E6C0: -/* 02910 80B0E6C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02914 80B0E6C4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02918 80B0E6C8 14400003 */ bne $v0, $zero, .L80B0E6D8 -/* 0291C 80B0E6CC 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF -/* 02920 80B0E6D0 10000003 */ beq $zero, $zero, .L80B0E6E0 -/* 02924 80B0E6D4 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80B0E6D8: -/* 02928 80B0E6D8 A60D0442 */ sh $t5, 0x0442($s0) ## 00000442 -/* 0292C 80B0E6DC 86030442 */ lh $v1, 0x0442($s0) ## 00000442 -.L80B0E6E0: -/* 02930 80B0E6E0 5460000D */ bnel $v1, $zero, .L80B0E718 -/* 02934 80B0E6E4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02938 80B0E6E8 0C2C37AA */ jal func_80B0DEA8 -/* 0293C 80B0E6EC 8FA5003C */ lw $a1, 0x003C($sp) -/* 02940 80B0E6F0 10400008 */ beq $v0, $zero, .L80B0E714 -/* 02944 80B0E6F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02948 80B0E6F8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0294C 80B0E6FC 240539F2 */ addiu $a1, $zero, 0x39F2 ## $a1 = 000039F2 -/* 02950 80B0E700 3C0F80B1 */ lui $t7, %hi(func_80B0E728) ## $t7 = 80B10000 -/* 02954 80B0E704 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 02958 80B0E708 25EFE728 */ addiu $t7, $t7, %lo(func_80B0E728) ## $t7 = 80B0E728 -/* 0295C 80B0E70C A60E0442 */ sh $t6, 0x0442($s0) ## 00000442 -/* 02960 80B0E710 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 -.L80B0E714: -/* 02964 80B0E714 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B0E718: -/* 02968 80B0E718 8FB00020 */ lw $s0, 0x0020($sp) -/* 0296C 80B0E71C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02970 80B0E720 03E00008 */ jr $ra -/* 02974 80B0E724 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E728.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E728.s deleted file mode 100644 index f4df67eb9d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E728.s +++ /dev/null @@ -1,136 +0,0 @@ -glabel func_80B0E728 -/* 02978 80B0E728 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0297C 80B0E72C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02980 80B0E730 AFB00020 */ sw $s0, 0x0020($sp) -/* 02984 80B0E734 84830442 */ lh $v1, 0x0442($a0) ## 00000442 -/* 02988 80B0E738 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0298C 80B0E73C 8CA71C44 */ lw $a3, 0x1C44($a1) ## 00001C44 -/* 02990 80B0E740 14600003 */ bne $v1, $zero, .L80B0E750 -/* 02994 80B0E744 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 02998 80B0E748 10000003 */ beq $zero, $zero, .L80B0E758 -/* 0299C 80B0E74C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B0E750: -/* 029A0 80B0E750 A60E0442 */ sh $t6, 0x0442($s0) ## 00000442 -/* 029A4 80B0E754 86020442 */ lh $v0, 0x0442($s0) ## 00000442 -.L80B0E758: -/* 029A8 80B0E758 10400024 */ beq $v0, $zero, .L80B0E7EC -/* 029AC 80B0E75C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029B0 80B0E760 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029B4 80B0E764 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 029B8 80B0E768 AFA5003C */ sw $a1, 0x003C($sp) -/* 029BC 80B0E76C 0C2C37AA */ jal func_80B0DEA8 -/* 029C0 80B0E770 AFA70034 */ sw $a3, 0x0034($sp) -/* 029C4 80B0E774 10400019 */ beq $v0, $zero, .L80B0E7DC -/* 029C8 80B0E778 8FA70034 */ lw $a3, 0x0034($sp) -/* 029CC 80B0E77C 8CF80024 */ lw $t8, 0x0024($a3) ## 00000024 -/* 029D0 80B0E780 26050448 */ addiu $a1, $s0, 0x0448 ## $a1 = 00000448 -/* 029D4 80B0E784 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 029D8 80B0E788 ACB80000 */ sw $t8, 0x0000($a1) ## 00000448 -/* 029DC 80B0E78C 8CEF0028 */ lw $t7, 0x0028($a3) ## 00000028 -/* 029E0 80B0E790 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 029E4 80B0E794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029E8 80B0E798 ACAF0004 */ sw $t7, 0x0004($a1) ## 0000044C -/* 029EC 80B0E79C 8CF8002C */ lw $t8, 0x002C($a3) ## 0000002C -/* 029F0 80B0E7A0 ACB80008 */ sw $t8, 0x0008($a1) ## 00000450 -/* 029F4 80B0E7A4 C604044C */ lwc1 $f4, 0x044C($s0) ## 0000044C -/* 029F8 80B0E7A8 46062200 */ add.s $f8, $f4, $f6 -/* 029FC 80B0E7AC 0C2C378D */ jal func_80B0DE34 -/* 02A00 80B0E7B0 E608044C */ swc1 $f8, 0x044C($s0) ## 0000044C -/* 02A04 80B0E7B4 A6020444 */ sh $v0, 0x0444($s0) ## 00000444 -/* 02A08 80B0E7B8 8FB9003C */ lw $t9, 0x003C($sp) -/* 02A0C 80B0E7BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A10 80B0E7C0 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 02A14 80B0E7C4 24060FA0 */ addiu $a2, $zero, 0x0FA0 ## $a2 = 00000FA0 -/* 02A18 80B0E7C8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02A1C 80B0E7CC 0C2C390C */ jal func_80B0E430 -/* 02A20 80B0E7D0 AFB90010 */ sw $t9, 0x0010($sp) -/* 02A24 80B0E7D4 10000049 */ beq $zero, $zero, .L80B0E8FC -/* 02A28 80B0E7D8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B0E7DC: -/* 02A2C 80B0E7DC 3C0880B1 */ lui $t0, %hi(func_80B0E5E0) ## $t0 = 80B10000 -/* 02A30 80B0E7E0 2508E5E0 */ addiu $t0, $t0, %lo(func_80B0E5E0) ## $t0 = 80B0E5E0 -/* 02A34 80B0E7E4 10000044 */ beq $zero, $zero, .L80B0E8F8 -/* 02A38 80B0E7E8 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -.L80B0E7EC: -/* 02A3C 80B0E7EC 0C2C37FF */ jal func_80B0DFFC -/* 02A40 80B0E7F0 AFA5003C */ sw $a1, 0x003C($sp) -/* 02A44 80B0E7F4 14400014 */ bne $v0, $zero, .L80B0E848 -/* 02A48 80B0E7F8 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 -/* 02A4C 80B0E7FC 0C01DF64 */ jal Rand_S16Offset - -/* 02A50 80B0E800 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 02A54 80B0E804 A6020442 */ sh $v0, 0x0442($s0) ## 00000442 -/* 02A58 80B0E808 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 02A5C 80B0E80C AFA50028 */ sw $a1, 0x0028($sp) -/* 02A60 80B0E810 0C2C378D */ jal func_80B0DE34 -/* 02A64 80B0E814 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A68 80B0E818 8FA50028 */ lw $a1, 0x0028($sp) -/* 02A6C 80B0E81C A6020444 */ sh $v0, 0x0444($s0) ## 00000444 -/* 02A70 80B0E820 3C0B80B1 */ lui $t3, %hi(func_80B0E9BC) ## $t3 = 80B10000 -/* 02A74 80B0E824 8CAA0000 */ lw $t2, 0x0000($a1) ## 00000000 -/* 02A78 80B0E828 256BE9BC */ addiu $t3, $t3, %lo(func_80B0E9BC) ## $t3 = 80B0E9BC -/* 02A7C 80B0E82C AE0A0448 */ sw $t2, 0x0448($s0) ## 00000448 -/* 02A80 80B0E830 8CA90004 */ lw $t1, 0x0004($a1) ## 00000004 -/* 02A84 80B0E834 AE09044C */ sw $t1, 0x044C($s0) ## 0000044C -/* 02A88 80B0E838 8CAA0008 */ lw $t2, 0x0008($a1) ## 00000008 -/* 02A8C 80B0E83C AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 02A90 80B0E840 1000002D */ beq $zero, $zero, .L80B0E8F8 -/* 02A94 80B0E844 AE0A0450 */ sw $t2, 0x0450($s0) ## 00000450 -.L80B0E848: -/* 02A98 80B0E848 26020448 */ addiu $v0, $s0, 0x0448 ## $v0 = 00000448 -/* 02A9C 80B0E84C 8C4D0000 */ lw $t5, 0x0000($v0) ## 00000448 -/* 02AA0 80B0E850 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 02AA4 80B0E854 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 02AA8 80B0E858 AFAD0004 */ sw $t5, 0x0004($sp) -/* 02AAC 80B0E85C 8C460004 */ lw $a2, 0x0004($v0) ## 0000044C -/* 02AB0 80B0E860 8FA50004 */ lw $a1, 0x0004($sp) -/* 02AB4 80B0E864 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AB8 80B0E868 AFA60008 */ sw $a2, 0x0008($sp) -/* 02ABC 80B0E86C 8C470008 */ lw $a3, 0x0008($v0) ## 00000450 -/* 02AC0 80B0E870 AFA20028 */ sw $v0, 0x0028($sp) -/* 02AC4 80B0E874 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 02AC8 80B0E878 0C2C38C5 */ jal func_80B0E314 -/* 02ACC 80B0E87C AFA7000C */ sw $a3, 0x000C($sp) -/* 02AD0 80B0E880 86030440 */ lh $v1, 0x0440($s0) ## 00000440 -/* 02AD4 80B0E884 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AD8 80B0E888 14600003 */ bne $v1, $zero, .L80B0E898 -/* 02ADC 80B0E88C 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 02AE0 80B0E890 10000003 */ beq $zero, $zero, .L80B0E8A0 -/* 02AE4 80B0E894 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B0E898: -/* 02AE8 80B0E898 A60E0440 */ sh $t6, 0x0440($s0) ## 00000440 -/* 02AEC 80B0E89C 86020440 */ lh $v0, 0x0440($s0) ## 00000440 -.L80B0E8A0: -/* 02AF0 80B0E8A0 54400006 */ bnel $v0, $zero, .L80B0E8BC -/* 02AF4 80B0E8A4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 02AF8 80B0E8A8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02AFC 80B0E8AC 2405388D */ addiu $a1, $zero, 0x388D ## $a1 = 0000388D -/* 02B00 80B0E8B0 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 02B04 80B0E8B4 A60F0440 */ sh $t7, 0x0440($s0) ## 00000440 -/* 02B08 80B0E8B8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -.L80B0E8BC: -/* 02B0C 80B0E8BC 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 02B10 80B0E8C0 8FA50028 */ lw $a1, 0x0028($sp) -/* 02B14 80B0E8C4 3C014150 */ lui $at, 0x4150 ## $at = 41500000 -/* 02B18 80B0E8C8 44818000 */ mtc1 $at, $f16 ## $f16 = 13.00 -/* 02B1C 80B0E8CC 00000000 */ nop -/* 02B20 80B0E8D0 4600803C */ c.lt.s $f16, $f0 -/* 02B24 80B0E8D4 00000000 */ nop -/* 02B28 80B0E8D8 45000004 */ bc1f .L80B0E8EC -/* 02B2C 80B0E8DC 00000000 */ nop -/* 02B30 80B0E8E0 0C00B77D */ jal func_8002DDF4 -/* 02B34 80B0E8E4 8FA4003C */ lw $a0, 0x003C($sp) -/* 02B38 80B0E8E8 10400003 */ beq $v0, $zero, .L80B0E8F8 -.L80B0E8EC: -/* 02B3C 80B0E8EC 3C1880B1 */ lui $t8, %hi(func_80B0E90C) ## $t8 = 80B10000 -/* 02B40 80B0E8F0 2718E90C */ addiu $t8, $t8, %lo(func_80B0E90C) ## $t8 = 80B0E90C -/* 02B44 80B0E8F4 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -.L80B0E8F8: -/* 02B48 80B0E8F8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B0E8FC: -/* 02B4C 80B0E8FC 8FB00020 */ lw $s0, 0x0020($sp) -/* 02B50 80B0E900 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02B54 80B0E904 03E00008 */ jr $ra -/* 02B58 80B0E908 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E90C.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E90C.s deleted file mode 100644 index ee723bbc68..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E90C.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80B0E90C -/* 02B5C 80B0E90C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02B60 80B0E910 AFBF001C */ sw $ra, 0x001C($sp) -/* 02B64 80B0E914 AFA50034 */ sw $a1, 0x0034($sp) -/* 02B68 80B0E918 24820448 */ addiu $v0, $a0, 0x0448 ## $v0 = 00000448 -/* 02B6C 80B0E91C 8C4F0000 */ lw $t7, 0x0000($v0) ## 00000448 -/* 02B70 80B0E920 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02B74 80B0E924 AFAF0004 */ sw $t7, 0x0004($sp) -/* 02B78 80B0E928 8C460004 */ lw $a2, 0x0004($v0) ## 0000044C -/* 02B7C 80B0E92C 8FA50004 */ lw $a1, 0x0004($sp) -/* 02B80 80B0E930 AFA60008 */ sw $a2, 0x0008($sp) -/* 02B84 80B0E934 8C470008 */ lw $a3, 0x0008($v0) ## 00000450 -/* 02B88 80B0E938 AFA40030 */ sw $a0, 0x0030($sp) -/* 02B8C 80B0E93C AFA20028 */ sw $v0, 0x0028($sp) -/* 02B90 80B0E940 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02B94 80B0E944 0C2C38C5 */ jal func_80B0E314 -/* 02B98 80B0E948 AFA7000C */ sw $a3, 0x000C($sp) -/* 02B9C 80B0E94C 8FA40030 */ lw $a0, 0x0030($sp) -/* 02BA0 80B0E950 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 02BA4 80B0E954 C4880068 */ lwc1 $f8, 0x0068($a0) ## 00000068 -/* 02BA8 80B0E958 24850008 */ addiu $a1, $a0, 0x0008 ## $a1 = 00000008 -/* 02BAC 80B0E95C 46083032 */ c.eq.s $f6, $f8 -/* 02BB0 80B0E960 00000000 */ nop -/* 02BB4 80B0E964 45020012 */ bc1fl .L80B0E9B0 -/* 02BB8 80B0E968 8FBF001C */ lw $ra, 0x001C($sp) -/* 02BBC 80B0E96C AFA40030 */ sw $a0, 0x0030($sp) -/* 02BC0 80B0E970 0C2C378D */ jal func_80B0DE34 -/* 02BC4 80B0E974 AFA50024 */ sw $a1, 0x0024($sp) -/* 02BC8 80B0E978 8FA40030 */ lw $a0, 0x0030($sp) -/* 02BCC 80B0E97C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02BD0 80B0E980 3C0980B1 */ lui $t1, %hi(func_80B0E9BC) ## $t1 = 80B10000 -/* 02BD4 80B0E984 A4820444 */ sh $v0, 0x0444($a0) ## 00000444 -/* 02BD8 80B0E988 8FB80028 */ lw $t8, 0x0028($sp) -/* 02BDC 80B0E98C 8CA80000 */ lw $t0, 0x0000($a1) ## 00000000 -/* 02BE0 80B0E990 2529E9BC */ addiu $t1, $t1, %lo(func_80B0E9BC) ## $t1 = 80B0E9BC -/* 02BE4 80B0E994 AF080000 */ sw $t0, 0x0000($t8) ## 00000000 -/* 02BE8 80B0E998 8CB90004 */ lw $t9, 0x0004($a1) ## 00000004 -/* 02BEC 80B0E99C AF190004 */ sw $t9, 0x0004($t8) ## 00000004 -/* 02BF0 80B0E9A0 8CA80008 */ lw $t0, 0x0008($a1) ## 00000008 -/* 02BF4 80B0E9A4 AF080008 */ sw $t0, 0x0008($t8) ## 00000008 -/* 02BF8 80B0E9A8 AC890190 */ sw $t1, 0x0190($a0) ## 00000190 -/* 02BFC 80B0E9AC 8FBF001C */ lw $ra, 0x001C($sp) -.L80B0E9B0: -/* 02C00 80B0E9B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02C04 80B0E9B4 03E00008 */ jr $ra -/* 02C08 80B0E9B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E9BC.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E9BC.s deleted file mode 100644 index 05902063c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E9BC.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80B0E9BC -/* 02C0C 80B0E9BC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02C10 80B0E9C0 AFA50034 */ sw $a1, 0x0034($sp) -/* 02C14 80B0E9C4 8FAE0034 */ lw $t6, 0x0034($sp) -/* 02C18 80B0E9C8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02C1C 80B0E9CC AFB00020 */ sw $s0, 0x0020($sp) -/* 02C20 80B0E9D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02C24 80B0E9D4 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 02C28 80B0E9D8 240603E8 */ addiu $a2, $zero, 0x03E8 ## $a2 = 000003E8 -/* 02C2C 80B0E9DC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02C30 80B0E9E0 0C2C390C */ jal func_80B0E430 -/* 02C34 80B0E9E4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02C38 80B0E9E8 1040001A */ beq $v0, $zero, .L80B0EA54 -/* 02C3C 80B0E9EC 26020448 */ addiu $v0, $s0, 0x0448 ## $v0 = 00000448 -/* 02C40 80B0E9F0 8C580000 */ lw $t8, 0x0000($v0) ## 00000448 -/* 02C44 80B0E9F4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 02C48 80B0E9F8 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 02C4C 80B0E9FC AFB80004 */ sw $t8, 0x0004($sp) -/* 02C50 80B0EA00 8C460004 */ lw $a2, 0x0004($v0) ## 0000044C -/* 02C54 80B0EA04 8FA50004 */ lw $a1, 0x0004($sp) -/* 02C58 80B0EA08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C5C 80B0EA0C AFA60008 */ sw $a2, 0x0008($sp) -/* 02C60 80B0EA10 8C470008 */ lw $a3, 0x0008($v0) ## 00000450 -/* 02C64 80B0EA14 AFA20028 */ sw $v0, 0x0028($sp) -/* 02C68 80B0EA18 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02C6C 80B0EA1C 0C2C38C5 */ jal func_80B0E314 -/* 02C70 80B0EA20 AFA7000C */ sw $a3, 0x000C($sp) -/* 02C74 80B0EA24 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 02C78 80B0EA28 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 02C7C 80B0EA2C 8FA50028 */ lw $a1, 0x0028($sp) -/* 02C80 80B0EA30 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 02C84 80B0EA34 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 -/* 02C88 80B0EA38 3C1980B1 */ lui $t9, %hi(func_80B0E5E0) ## $t9 = 80B10000 -/* 02C8C 80B0EA3C 2739E5E0 */ addiu $t9, $t9, %lo(func_80B0E5E0) ## $t9 = 80B0E5E0 -/* 02C90 80B0EA40 4600303C */ c.lt.s $f6, $f0 -/* 02C94 80B0EA44 00000000 */ nop -/* 02C98 80B0EA48 45030003 */ bc1tl .L80B0EA58 -/* 02C9C 80B0EA4C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02CA0 80B0EA50 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -.L80B0EA54: -/* 02CA4 80B0EA54 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B0EA58: -/* 02CA8 80B0EA58 8FB00020 */ lw $s0, 0x0020($sp) -/* 02CAC 80B0EA5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02CB0 80B0EA60 03E00008 */ jr $ra -/* 02CB4 80B0EA64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s deleted file mode 100644 index 926c8b74c4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s +++ /dev/null @@ -1,240 +0,0 @@ -.rdata -glabel D_80B0F1A0 - .asciz "../z_en_sw.c" - .balign 4 - -glabel D_80B0F1B0 - .asciz "../z_en_sw.c" - .balign 4 - -.late_rodata -glabel jtbl_80B0F24C -.word L80B0ECAC -.word L80B0EC9C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC2C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC4C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC3C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC7C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC6C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC1C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC5C -.word L80B0ECB8 -.word L80B0ECB8 -.word L80B0EC8C - -.text -glabel func_80B0EAC4 -/* 02D14 80B0EAC4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 02D18 80B0EAC8 3C0F80B1 */ lui $t7, %hi(D_80B0F150) ## $t7 = 80B10000 -/* 02D1C 80B0EACC AFBF001C */ sw $ra, 0x001C($sp) -/* 02D20 80B0EAD0 AFB10018 */ sw $s1, 0x0018($sp) -/* 02D24 80B0EAD4 AFB00014 */ sw $s0, 0x0014($sp) -/* 02D28 80B0EAD8 AFA40088 */ sw $a0, 0x0088($sp) -/* 02D2C 80B0EADC AFA5008C */ sw $a1, 0x008C($sp) -/* 02D30 80B0EAE0 AFA70094 */ sw $a3, 0x0094($sp) -/* 02D34 80B0EAE4 25EFF150 */ addiu $t7, $t7, %lo(D_80B0F150) ## $t7 = 80B0F150 -/* 02D38 80B0EAE8 8DF90000 */ lw $t9, 0x0000($t7) ## 80B0F150 -/* 02D3C 80B0EAEC 27AE007C */ addiu $t6, $sp, 0x007C ## $t6 = FFFFFFF4 -/* 02D40 80B0EAF0 8DF80004 */ lw $t8, 0x0004($t7) ## 80B0F154 -/* 02D44 80B0EAF4 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 02D48 80B0EAF8 8DF90008 */ lw $t9, 0x0008($t7) ## 80B0F158 -/* 02D4C 80B0EAFC 3C0980B1 */ lui $t1, %hi(D_80B0F15C) ## $t1 = 80B10000 -/* 02D50 80B0EB00 2529F15C */ addiu $t1, $t1, %lo(D_80B0F15C) ## $t1 = 80B0F15C -/* 02D54 80B0EB04 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 02D58 80B0EB08 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 02D5C 80B0EB0C 8D2B0000 */ lw $t3, 0x0000($t1) ## 80B0F15C -/* 02D60 80B0EB10 27A80070 */ addiu $t0, $sp, 0x0070 ## $t0 = FFFFFFE8 -/* 02D64 80B0EB14 8D2A0004 */ lw $t2, 0x0004($t1) ## 80B0F160 -/* 02D68 80B0EB18 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFE8 -/* 02D6C 80B0EB1C 8D2B0008 */ lw $t3, 0x0008($t1) ## 80B0F164 -/* 02D70 80B0EB20 3C0D80B1 */ lui $t5, %hi(D_80B0F168) ## $t5 = 80B10000 -/* 02D74 80B0EB24 25ADF168 */ addiu $t5, $t5, %lo(D_80B0F168) ## $t5 = 80B0F168 -/* 02D78 80B0EB28 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFEC -/* 02D7C 80B0EB2C AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFF0 -/* 02D80 80B0EB30 8DAF0000 */ lw $t7, 0x0000($t5) ## 80B0F168 -/* 02D84 80B0EB34 27AC0064 */ addiu $t4, $sp, 0x0064 ## $t4 = FFFFFFDC -/* 02D88 80B0EB38 8DAE0004 */ lw $t6, 0x0004($t5) ## 80B0F16C -/* 02D8C 80B0EB3C AD8F0000 */ sw $t7, 0x0000($t4) ## FFFFFFDC -/* 02D90 80B0EB40 8DAF0008 */ lw $t7, 0x0008($t5) ## 80B0F170 -/* 02D94 80B0EB44 3C1980B1 */ lui $t9, %hi(D_80B0F174) ## $t9 = 80B10000 -/* 02D98 80B0EB48 2739F174 */ addiu $t9, $t9, %lo(D_80B0F174) ## $t9 = 80B0F174 -/* 02D9C 80B0EB4C AD8E0004 */ sw $t6, 0x0004($t4) ## FFFFFFE0 -/* 02DA0 80B0EB50 AD8F0008 */ sw $t7, 0x0008($t4) ## FFFFFFE4 -/* 02DA4 80B0EB54 8F290000 */ lw $t1, 0x0000($t9) ## 80B0F174 -/* 02DA8 80B0EB58 27B80058 */ addiu $t8, $sp, 0x0058 ## $t8 = FFFFFFD0 -/* 02DAC 80B0EB5C 8F280004 */ lw $t0, 0x0004($t9) ## 80B0F178 -/* 02DB0 80B0EB60 AF090000 */ sw $t1, 0x0000($t8) ## FFFFFFD0 -/* 02DB4 80B0EB64 8F290008 */ lw $t1, 0x0008($t9) ## 80B0F17C -/* 02DB8 80B0EB68 3C0B80B1 */ lui $t3, %hi(D_80B0F180) ## $t3 = 80B10000 -/* 02DBC 80B0EB6C 256BF180 */ addiu $t3, $t3, %lo(D_80B0F180) ## $t3 = 80B0F180 -/* 02DC0 80B0EB70 AF080004 */ sw $t0, 0x0004($t8) ## FFFFFFD4 -/* 02DC4 80B0EB74 AF090008 */ sw $t1, 0x0008($t8) ## FFFFFFD8 -/* 02DC8 80B0EB78 8D6D0000 */ lw $t5, 0x0000($t3) ## 80B0F180 -/* 02DCC 80B0EB7C 27AA004C */ addiu $t2, $sp, 0x004C ## $t2 = FFFFFFC4 -/* 02DD0 80B0EB80 8D6C0004 */ lw $t4, 0x0004($t3) ## 80B0F184 -/* 02DD4 80B0EB84 AD4D0000 */ sw $t5, 0x0000($t2) ## FFFFFFC4 -/* 02DD8 80B0EB88 8D6D0008 */ lw $t5, 0x0008($t3) ## 80B0F188 -/* 02DDC 80B0EB8C 3C0F80B1 */ lui $t7, %hi(D_80B0F18C) ## $t7 = 80B10000 -/* 02DE0 80B0EB90 25EFF18C */ addiu $t7, $t7, %lo(D_80B0F18C) ## $t7 = 80B0F18C -/* 02DE4 80B0EB94 AD4C0004 */ sw $t4, 0x0004($t2) ## FFFFFFC8 -/* 02DE8 80B0EB98 AD4D0008 */ sw $t5, 0x0008($t2) ## FFFFFFCC -/* 02DEC 80B0EB9C 8DF90000 */ lw $t9, 0x0000($t7) ## 80B0F18C -/* 02DF0 80B0EBA0 27AE003C */ addiu $t6, $sp, 0x003C ## $t6 = FFFFFFB4 -/* 02DF4 80B0EBA4 8DF80004 */ lw $t8, 0x0004($t7) ## 80B0F190 -/* 02DF8 80B0EBA8 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFB4 -/* 02DFC 80B0EBAC 8DF90008 */ lw $t9, 0x0008($t7) ## 80B0F194 -/* 02E00 80B0EBB0 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFB8 -/* 02E04 80B0EBB4 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 02E08 80B0EBB8 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFBC -/* 02E0C 80B0EBBC 8FA80088 */ lw $t0, 0x0088($sp) -/* 02E10 80B0EBC0 3C0680B1 */ lui $a2, %hi(D_80B0F1A0) ## $a2 = 80B10000 -/* 02E14 80B0EBC4 24C6F1A0 */ addiu $a2, $a2, %lo(D_80B0F1A0) ## $a2 = 80B0F1A0 -/* 02E18 80B0EBC8 8D050000 */ lw $a1, 0x0000($t0) ## FFFFFFE8 -/* 02E1C 80B0EBCC 24070824 */ addiu $a3, $zero, 0x0824 ## $a3 = 00000824 -/* 02E20 80B0EBD0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFA0 -/* 02E24 80B0EBD4 0C031AB1 */ jal Graph_OpenDisps -/* 02E28 80B0EBD8 AFA50038 */ sw $a1, 0x0038($sp) -/* 02E2C 80B0EBDC 8FB1009C */ lw $s1, 0x009C($sp) -/* 02E30 80B0EBE0 8FA6008C */ lw $a2, 0x008C($sp) -/* 02E34 80B0EBE4 8629001C */ lh $t1, 0x001C($s1) ## 0000001C -/* 02E38 80B0EBE8 24CCFFFC */ addiu $t4, $a2, 0xFFFC ## $t4 = FFFFFFFC -/* 02E3C 80B0EBEC 2D81001A */ sltiu $at, $t4, 0x001A -/* 02E40 80B0EBF0 312AE000 */ andi $t2, $t1, 0xE000 ## $t2 = 00000000 -/* 02E44 80B0EBF4 000A5B43 */ sra $t3, $t2, 13 -/* 02E48 80B0EBF8 51600030 */ beql $t3, $zero, .L80B0ECBC -/* 02E4C 80B0EBFC 8FA6008C */ lw $a2, 0x008C($sp) -/* 02E50 80B0EC00 1020002D */ beq $at, $zero, .L80B0ECB8 -/* 02E54 80B0EC04 000C6080 */ sll $t4, $t4, 2 -/* 02E58 80B0EC08 3C0180B1 */ lui $at, %hi(jtbl_80B0F24C) ## $at = 80B10000 -/* 02E5C 80B0EC0C 002C0821 */ addu $at, $at, $t4 -/* 02E60 80B0EC10 8C2CF24C */ lw $t4, %lo(jtbl_80B0F24C)($at) -/* 02E64 80B0EC14 01800008 */ jr $t4 -/* 02E68 80B0EC18 00000000 */ nop -glabel L80B0EC1C -/* 02E6C 80B0EC1C 3C0D0600 */ lui $t5, %hi(D_06004788) ## $t5 = 06000000 -/* 02E70 80B0EC20 25AD4788 */ addiu $t5, $t5, %lo(D_06004788) ## $t5 = 06004788 -/* 02E74 80B0EC24 10000024 */ beq $zero, $zero, .L80B0ECB8 -/* 02E78 80B0EC28 AE0D0000 */ sw $t5, 0x0000($s0) ## 00000000 -glabel L80B0EC2C -/* 02E7C 80B0EC2C 3C0E0600 */ lui $t6, %hi(D_060046F0) ## $t6 = 06000000 -/* 02E80 80B0EC30 25CE46F0 */ addiu $t6, $t6, %lo(D_060046F0) ## $t6 = 060046F0 -/* 02E84 80B0EC34 10000020 */ beq $zero, $zero, .L80B0ECB8 -/* 02E88 80B0EC38 AE0E0000 */ sw $t6, 0x0000($s0) ## 00000000 -glabel L80B0EC3C -/* 02E8C 80B0EC3C 3C0F0600 */ lui $t7, %hi(D_06004658) ## $t7 = 06000000 -/* 02E90 80B0EC40 25EF4658 */ addiu $t7, $t7, %lo(D_06004658) ## $t7 = 06004658 -/* 02E94 80B0EC44 1000001C */ beq $zero, $zero, .L80B0ECB8 -/* 02E98 80B0EC48 AE0F0000 */ sw $t7, 0x0000($s0) ## 00000000 -glabel L80B0EC4C -/* 02E9C 80B0EC4C 3C180600 */ lui $t8, %hi(D_060045C0) ## $t8 = 06000000 -/* 02EA0 80B0EC50 271845C0 */ addiu $t8, $t8, %lo(D_060045C0) ## $t8 = 060045C0 -/* 02EA4 80B0EC54 10000018 */ beq $zero, $zero, .L80B0ECB8 -/* 02EA8 80B0EC58 AE180000 */ sw $t8, 0x0000($s0) ## 00000000 -glabel L80B0EC5C -/* 02EAC 80B0EC5C 3C190600 */ lui $t9, %hi(D_06004820) ## $t9 = 06000000 -/* 02EB0 80B0EC60 27394820 */ addiu $t9, $t9, %lo(D_06004820) ## $t9 = 06004820 -/* 02EB4 80B0EC64 10000014 */ beq $zero, $zero, .L80B0ECB8 -/* 02EB8 80B0EC68 AE190000 */ sw $t9, 0x0000($s0) ## 00000000 -glabel L80B0EC6C -/* 02EBC 80B0EC6C 3C080600 */ lui $t0, %hi(D_060048B8) ## $t0 = 06000000 -/* 02EC0 80B0EC70 250848B8 */ addiu $t0, $t0, %lo(D_060048B8) ## $t0 = 060048B8 -/* 02EC4 80B0EC74 10000010 */ beq $zero, $zero, .L80B0ECB8 -/* 02EC8 80B0EC78 AE080000 */ sw $t0, 0x0000($s0) ## 00000000 -glabel L80B0EC7C -/* 02ECC 80B0EC7C 3C090600 */ lui $t1, %hi(D_06004950) ## $t1 = 06000000 -/* 02ED0 80B0EC80 25294950 */ addiu $t1, $t1, %lo(D_06004950) ## $t1 = 06004950 -/* 02ED4 80B0EC84 1000000C */ beq $zero, $zero, .L80B0ECB8 -/* 02ED8 80B0EC88 AE090000 */ sw $t1, 0x0000($s0) ## 00000000 -glabel L80B0EC8C -/* 02EDC 80B0EC8C 3C0A0600 */ lui $t2, %hi(D_060049E8) ## $t2 = 06000000 -/* 02EE0 80B0EC90 254A49E8 */ addiu $t2, $t2, %lo(D_060049E8) ## $t2 = 060049E8 -/* 02EE4 80B0EC94 10000008 */ beq $zero, $zero, .L80B0ECB8 -/* 02EE8 80B0EC98 AE0A0000 */ sw $t2, 0x0000($s0) ## 00000000 -glabel L80B0EC9C -/* 02EEC 80B0EC9C 3C0B0600 */ lui $t3, %hi(D_06003FB0) ## $t3 = 06000000 -/* 02EF0 80B0ECA0 256B3FB0 */ addiu $t3, $t3, %lo(D_06003FB0) ## $t3 = 06003FB0 -/* 02EF4 80B0ECA4 10000004 */ beq $zero, $zero, .L80B0ECB8 -/* 02EF8 80B0ECA8 AE0B0000 */ sw $t3, 0x0000($s0) ## 00000000 -glabel L80B0ECAC -/* 02EFC 80B0ECAC 3C0C0600 */ lui $t4, %hi(D_060043D8) ## $t4 = 06000000 -/* 02F00 80B0ECB0 258C43D8 */ addiu $t4, $t4, %lo(D_060043D8) ## $t4 = 060043D8 -/* 02F04 80B0ECB4 AE0C0000 */ sw $t4, 0x0000($s0) ## 00000000 -glabel L80B0ECB8 -.L80B0ECB8: -/* 02F08 80B0ECB8 8FA6008C */ lw $a2, 0x008C($sp) -.L80B0ECBC: -/* 02F0C 80B0ECBC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02F10 80B0ECC0 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFF4 -/* 02F14 80B0ECC4 54C10011 */ bnel $a2, $at, .L80B0ED0C -/* 02F18 80B0ECC8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02F1C 80B0ECCC 0C0346BD */ jal Matrix_MultVec3f -/* 02F20 80B0ECD0 26250454 */ addiu $a1, $s1, 0x0454 ## $a1 = 00000454 -/* 02F24 80B0ECD4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE8 -/* 02F28 80B0ECD8 0C0346BD */ jal Matrix_MultVec3f -/* 02F2C 80B0ECDC 26250460 */ addiu $a1, $s1, 0x0460 ## $a1 = 00000460 -/* 02F30 80B0ECE0 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC -/* 02F34 80B0ECE4 0C0346BD */ jal Matrix_MultVec3f -/* 02F38 80B0ECE8 2625046C */ addiu $a1, $s1, 0x046C ## $a1 = 0000046C -/* 02F3C 80B0ECEC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD0 -/* 02F40 80B0ECF0 0C0346BD */ jal Matrix_MultVec3f -/* 02F44 80B0ECF4 26250478 */ addiu $a1, $s1, 0x0478 ## $a1 = 00000478 -/* 02F48 80B0ECF8 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFC4 -/* 02F4C 80B0ECFC 0C0346BD */ jal Matrix_MultVec3f -/* 02F50 80B0ED00 26250484 */ addiu $a1, $s1, 0x0484 ## $a1 = 00000484 -/* 02F54 80B0ED04 8FA6008C */ lw $a2, 0x008C($sp) -/* 02F58 80B0ED08 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L80B0ED0C: -/* 02F5C 80B0ED0C 14C10004 */ bne $a2, $at, .L80B0ED20 -/* 02F60 80B0ED10 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFB4 -/* 02F64 80B0ED14 0C0346BD */ jal Matrix_MultVec3f -/* 02F68 80B0ED18 26250038 */ addiu $a1, $s1, 0x0038 ## $a1 = 00000038 -/* 02F6C 80B0ED1C 8FA6008C */ lw $a2, 0x008C($sp) -.L80B0ED20: -/* 02F70 80B0ED20 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02F74 80B0ED24 14C10010 */ bne $a2, $at, .L80B0ED68 -/* 02F78 80B0ED28 26250194 */ addiu $a1, $s1, 0x0194 ## $a1 = 00000194 -/* 02F7C 80B0ED2C 8FA40038 */ lw $a0, 0x0038($sp) -/* 02F80 80B0ED30 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 02F84 80B0ED34 8C8302C0 */ lw $v1, 0x02C0($a0) ## 000002C0 -/* 02F88 80B0ED38 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 02F8C 80B0ED3C AC8D02C0 */ sw $t5, 0x02C0($a0) ## 000002C0 -/* 02F90 80B0ED40 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 02F94 80B0ED44 922901F5 */ lbu $t1, 0x01F5($s1) ## 000001F5 -/* 02F98 80B0ED48 923801F4 */ lbu $t8, 0x01F4($s1) ## 000001F4 -/* 02F9C 80B0ED4C 922D01F6 */ lbu $t5, 0x01F6($s1) ## 000001F6 -/* 02FA0 80B0ED50 00095400 */ sll $t2, $t1, 16 -/* 02FA4 80B0ED54 0018CE00 */ sll $t9, $t8, 24 -/* 02FA8 80B0ED58 032A5825 */ or $t3, $t9, $t2 ## $t3 = 00000000 -/* 02FAC 80B0ED5C 000D7200 */ sll $t6, $t5, 8 -/* 02FB0 80B0ED60 016E7825 */ or $t7, $t3, $t6 ## $t7 = FB000000 -/* 02FB4 80B0ED64 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -.L80B0ED68: -/* 02FB8 80B0ED68 0C018A29 */ jal Collider_UpdateSpheres -/* 02FBC 80B0ED6C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02FC0 80B0ED70 8FB80088 */ lw $t8, 0x0088($sp) -/* 02FC4 80B0ED74 3C0680B1 */ lui $a2, %hi(D_80B0F1B0) ## $a2 = 80B10000 -/* 02FC8 80B0ED78 24C6F1B0 */ addiu $a2, $a2, %lo(D_80B0F1B0) ## $a2 = 80B0F1B0 -/* 02FCC 80B0ED7C 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFA0 -/* 02FD0 80B0ED80 24070861 */ addiu $a3, $zero, 0x0861 ## $a3 = 00000861 -/* 02FD4 80B0ED84 0C031AD5 */ jal Graph_CloseDisps -/* 02FD8 80B0ED88 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 02FDC 80B0ED8C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02FE0 80B0ED90 8FB00014 */ lw $s0, 0x0014($sp) -/* 02FE4 80B0ED94 8FB10018 */ lw $s1, 0x0018($sp) -/* 02FE8 80B0ED98 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 02FEC 80B0ED9C 03E00008 */ jr $ra -/* 02FF0 80B0EDA0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDA4.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDA4.s deleted file mode 100644 index 6575122a5f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDA4.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80B0EDA4 -/* 02FF4 80B0EDA4 AFA40000 */ sw $a0, 0x0000($sp) -/* 02FF8 80B0EDA8 AFA50004 */ sw $a1, 0x0004($sp) -/* 02FFC 80B0EDAC AFA60008 */ sw $a2, 0x0008($sp) -/* 03000 80B0EDB0 03E00008 */ jr $ra -/* 03004 80B0EDB4 AFA7000C */ sw $a3, 0x000C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s deleted file mode 100644 index 7912cd28a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s +++ /dev/null @@ -1,77 +0,0 @@ -.rdata -glabel D_80B0F1C0 - .asciz "../z_en_sw.c" - .balign 4 - -glabel D_80B0F1D0 - .asciz "../z_en_sw.c" - .balign 4 - -.late_rodata -glabel D_80B0F2B4 - .word 0x4633B000 -glabel D_80B0F2B8 - .word 0x4633B000 - -.text -glabel func_80B0EDB8 -/* 03008 80B0EDB8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0300C 80B0EDBC AFBF0024 */ sw $ra, 0x0024($sp) -/* 03010 80B0EDC0 AFA40048 */ sw $a0, 0x0048($sp) -/* 03014 80B0EDC4 AFA5004C */ sw $a1, 0x004C($sp) -/* 03018 80B0EDC8 AFA60050 */ sw $a2, 0x0050($sp) -/* 0301C 80B0EDCC AFA70054 */ sw $a3, 0x0054($sp) -/* 03020 80B0EDD0 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 03024 80B0EDD4 3C0680B1 */ lui $a2, %hi(D_80B0F1C0) ## $a2 = 80B10000 -/* 03028 80B0EDD8 24C6F1C0 */ addiu $a2, $a2, %lo(D_80B0F1C0) ## $a2 = 80B0F1C0 -/* 0302C 80B0EDDC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 03030 80B0EDE0 24070885 */ addiu $a3, $zero, 0x0885 ## $a3 = 00000885 -/* 03034 80B0EDE4 0C031AB1 */ jal Graph_OpenDisps -/* 03038 80B0EDE8 AFA50040 */ sw $a1, 0x0040($sp) -/* 0303C 80B0EDEC 87A30056 */ lh $v1, 0x0056($sp) -/* 03040 80B0EDF0 3C0180B1 */ lui $at, %hi(D_80B0F2B4) ## $at = 80B10000 -/* 03044 80B0EDF4 C424F2B4 */ lwc1 $f4, %lo(D_80B0F2B4)($at) -/* 03048 80B0EDF8 44833000 */ mtc1 $v1, $f6 ## $f6 = 0.00 -/* 0304C 80B0EDFC 87AF0052 */ lh $t7, 0x0052($sp) -/* 03050 80B0EE00 8FA2004C */ lw $v0, 0x004C($sp) -/* 03054 80B0EE04 46803220 */ cvt.s.w $f8, $f6 -/* 03058 80B0EE08 006FC023 */ subu $t8, $v1, $t7 -/* 0305C 80B0EE0C 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 03060 80B0EE10 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 03064 80B0EE14 3C0180B1 */ lui $at, %hi(D_80B0F2B8) ## $at = 80B10000 -/* 03068 80B0EE18 468084A0 */ cvt.s.w $f18, $f16 -/* 0306C 80B0EE1C 8FB90040 */ lw $t9, 0x0040($sp) -/* 03070 80B0EE20 46082283 */ div.s $f10, $f4, $f8 -/* 03074 80B0EE24 46125082 */ mul.s $f2, $f10, $f18 -/* 03078 80B0EE28 46061032 */ c.eq.s $f2, $f6 -/* 0307C 80B0EE2C 00000000 */ nop -/* 03080 80B0EE30 45020003 */ bc1fl .L80B0EE40 -/* 03084 80B0EE34 4600110D */ trunc.w.s $f4, $f2 -/* 03088 80B0EE38 C422F2B8 */ lwc1 $f2, %lo(D_80B0F2B8)($at) -/* 0308C 80B0EE3C 4600110D */ trunc.w.s $f4, $f2 -.L80B0EE40: -/* 03090 80B0EE40 90480003 */ lbu $t0, 0x0003($v0) ## 00000003 -/* 03094 80B0EE44 8F2402C0 */ lw $a0, 0x02C0($t9) ## 000002C0 -/* 03098 80B0EE48 90450000 */ lbu $a1, 0x0000($v0) ## 00000000 -/* 0309C 80B0EE4C 440A2000 */ mfc1 $t2, $f4 -/* 030A0 80B0EE50 90460001 */ lbu $a2, 0x0001($v0) ## 00000001 -/* 030A4 80B0EE54 90470002 */ lbu $a3, 0x0002($v0) ## 00000002 -/* 030A8 80B0EE58 000A5C00 */ sll $t3, $t2, 16 -/* 030AC 80B0EE5C 000B6403 */ sra $t4, $t3, 16 -/* 030B0 80B0EE60 AFAC0018 */ sw $t4, 0x0018($sp) -/* 030B4 80B0EE64 AFA00014 */ sw $zero, 0x0014($sp) -/* 030B8 80B0EE68 0C024DC2 */ jal Gfx_SetFog2 -/* 030BC 80B0EE6C AFA80010 */ sw $t0, 0x0010($sp) -/* 030C0 80B0EE70 8FAD0040 */ lw $t5, 0x0040($sp) -/* 030C4 80B0EE74 3C0680B1 */ lui $a2, %hi(D_80B0F1D0) ## $a2 = 80B10000 -/* 030C8 80B0EE78 24C6F1D0 */ addiu $a2, $a2, %lo(D_80B0F1D0) ## $a2 = 80B0F1D0 -/* 030CC 80B0EE7C ADA202C0 */ sw $v0, 0x02C0($t5) ## 000002C0 -/* 030D0 80B0EE80 8FAE0048 */ lw $t6, 0x0048($sp) -/* 030D4 80B0EE84 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 030D8 80B0EE88 24070895 */ addiu $a3, $zero, 0x0895 ## $a3 = 00000895 -/* 030DC 80B0EE8C 0C031AD5 */ jal Graph_CloseDisps -/* 030E0 80B0EE90 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 030E4 80B0EE94 8FBF0024 */ lw $ra, 0x0024($sp) -/* 030E8 80B0EE98 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 030EC 80B0EE9C 03E00008 */ jr $ra -/* 030F0 80B0EEA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s deleted file mode 100644 index d9a4dbc4d8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s +++ /dev/null @@ -1,38 +0,0 @@ -.rdata -glabel D_80B0F1E0 - .asciz "../z_en_sw.c" - .balign 4 - -glabel D_80B0F1F0 - .asciz "../z_en_sw.c" - .balign 4 - -.text -glabel func_80B0EEA4 -/* 030F4 80B0EEA4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 030F8 80B0EEA8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 030FC 80B0EEAC AFA40038 */ sw $a0, 0x0038($sp) -/* 03100 80B0EEB0 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 03104 80B0EEB4 3C0680B1 */ lui $a2, %hi(D_80B0F1E0) ## $a2 = 80B10000 -/* 03108 80B0EEB8 24C6F1E0 */ addiu $a2, $a2, %lo(D_80B0F1E0) ## $a2 = 80B0F1E0 -/* 0310C 80B0EEBC 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 -/* 03110 80B0EEC0 2407089D */ addiu $a3, $zero, 0x089D ## $a3 = 0000089D -/* 03114 80B0EEC4 0C031AB1 */ jal Graph_OpenDisps -/* 03118 80B0EEC8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0311C 80B0EECC 8FAF0030 */ lw $t7, 0x0030($sp) -/* 03120 80B0EED0 8FA40038 */ lw $a0, 0x0038($sp) -/* 03124 80B0EED4 0C02F228 */ jal func_800BC8A0 -/* 03128 80B0EED8 8DE502C0 */ lw $a1, 0x02C0($t7) ## 000002C0 -/* 0312C 80B0EEDC 8FB80030 */ lw $t8, 0x0030($sp) -/* 03130 80B0EEE0 3C0680B1 */ lui $a2, %hi(D_80B0F1F0) ## $a2 = 80B10000 -/* 03134 80B0EEE4 24C6F1F0 */ addiu $a2, $a2, %lo(D_80B0F1F0) ## $a2 = 80B0F1F0 -/* 03138 80B0EEE8 AF0202C0 */ sw $v0, 0x02C0($t8) ## 000002C0 -/* 0313C 80B0EEEC 8FB90038 */ lw $t9, 0x0038($sp) -/* 03140 80B0EEF0 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 -/* 03144 80B0EEF4 2407089F */ addiu $a3, $zero, 0x089F ## $a3 = 0000089F -/* 03148 80B0EEF8 0C031AD5 */ jal Graph_CloseDisps -/* 0314C 80B0EEFC 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -/* 03150 80B0EF00 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03154 80B0EF04 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03158 80B0EF08 03E00008 */ jr $ra -/* 0315C 80B0EF0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s index 0de74b7b13..613d093a5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s @@ -1288,16 +1288,16 @@ glabel func_8081BB10 /* 095F8 8081CE18 0019C080 */ sll $t8, $t9, 2 /* 095FC 8081CE1C 30440003 */ andi $a0, $v0, 0x0003 ## $a0 = 00000001 /* 09600 8081CE20 00042080 */ sll $a0, $a0, 2 -/* 09604 8081CE24 3C198012 */ lui $t9, %hi(D_8012723C) +/* 09604 8081CE24 3C198012 */ lui $t9, %hi(gGoldSkullFlgMask) /* 09608 8081CE28 0324C821 */ addu $t9, $t9, $a0 /* 0960C 8081CE2C 02587021 */ addu $t6, $s2, $t8 /* 09610 8081CE30 8DCF0E9C */ lw $t7, 0x0E9C($t6) ## 00000EAA -/* 09614 8081CE34 8F39723C */ lw $t9, %lo(D_8012723C)($t9) -/* 09618 8081CE38 3C0E8012 */ lui $t6, %hi(D_8012724C) +/* 09614 8081CE34 8F39723C */ lw $t9, %lo(gGoldSkullFlgMask)($t9) +/* 09618 8081CE38 3C0E8012 */ lui $t6, %hi(gGoldSkullFlgShift) /* 0961C 8081CE3C 01C47021 */ addu $t6, $t6, $a0 /* 09620 8081CE40 01F9C024 */ and $t8, $t7, $t9 /* 09624 8081CE44 3C198083 */ lui $t9, %hi(D_8082AC7C) ## $t9 = 80830000 -/* 09628 8081CE48 8DCE724C */ lw $t6, %lo(D_8012724C)($t6) +/* 09628 8081CE48 8DCE724C */ lw $t6, %lo(gGoldSkullFlgShift)($t6) /* 0962C 8081CE4C 0322C821 */ addu $t9, $t9, $v0 /* 09630 8081CE50 9339AC7C */ lbu $t9, %lo(D_8082AC7C)($t9) /* 09634 8081CE54 01D87806 */ srlv $t7, $t8, $t6 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s index df2109d62e..3b4003ec63 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s @@ -942,7 +942,7 @@ glabel func_80821C10 /* 0F180 808229A0 3C0A8016 */ lui $t2, %hi(gSaveContext) /* 0F184 808229A4 254AE660 */ addiu $t2, %lo(gSaveContext) /* 0F188 808229A8 870504A0 */ lh $a1, 0x04A0($t8) ## 801604A0 -/* 0F18C 808229AC 3C188012 */ lui $t8, %hi(D_8012723C) +/* 0F18C 808229AC 3C188012 */ lui $t8, %hi(gGoldSkullFlgMask) /* 0F190 808229B0 3C078083 */ lui $a3, %hi(D_8082AC7C) ## $a3 = 80830000 /* 0F194 808229B4 00057883 */ sra $t7, $a1, 2 /* 0F198 808229B8 000F7080 */ sll $t6, $t7, 2 @@ -950,11 +950,11 @@ glabel func_80821C10 /* 0F1A0 808229C0 00031880 */ sll $v1, $v1, 2 /* 0F1A4 808229C4 014EC821 */ addu $t9, $t2, $t6 /* 0F1A8 808229C8 0303C021 */ addu $t8, $t8, $v1 -/* 0F1AC 808229CC 8F18723C */ lw $t8, %lo(D_8012723C)($t8) +/* 0F1AC 808229CC 8F18723C */ lw $t8, %lo(gGoldSkullFlgMask)($t8) /* 0F1B0 808229D0 8F220E9C */ lw $v0, 0x0E9C($t9) ## 00000E9C -/* 0F1B4 808229D4 3C0E8012 */ lui $t6, %hi(D_8012724C) +/* 0F1B4 808229D4 3C0E8012 */ lui $t6, %hi(gGoldSkullFlgShift) /* 0F1B8 808229D8 01C37021 */ addu $t6, $t6, $v1 -/* 0F1BC 808229DC 8DCE724C */ lw $t6, %lo(D_8012724C)($t6) +/* 0F1BC 808229DC 8DCE724C */ lw $t6, %lo(gGoldSkullFlgShift)($t6) /* 0F1C0 808229E0 3C048083 */ lui $a0, %hi(D_8082FC98) ## $a0 = 80830000 /* 0F1C4 808229E4 00E53821 */ addu $a3, $a3, $a1 /* 0F1C8 808229E8 00587824 */ and $t7, $v0, $t8 @@ -986,11 +986,11 @@ glabel func_80821C10 /* 0F228 80822A48 01591821 */ addu $v1, $t2, $t9 /* 0F22C 80822A4C 304F0003 */ andi $t7, $v0, 0x0003 ## $t7 = 00000000 /* 0F230 80822A50 000F7080 */ sll $t6, $t7, 2 -/* 0F234 80822A54 3C198012 */ lui $t9, %hi(D_8012724C) +/* 0F234 80822A54 3C198012 */ lui $t9, %hi(gGoldSkullFlgShift) /* 0F238 80822A58 032EC821 */ addu $t9, $t9, $t6 /* 0F23C 80822A5C 0302C021 */ addu $t8, $t8, $v0 /* 0F240 80822A60 9318AC7C */ lbu $t8, %lo(D_8082AC7C)($t8) -/* 0F244 80822A64 8F39724C */ lw $t9, %lo(D_8012724C)($t9) +/* 0F244 80822A64 8F39724C */ lw $t9, %lo(gGoldSkullFlgShift)($t9) /* 0F248 80822A68 8C6E0E9C */ lw $t6, 0x0E9C($v1) ## 00000E9C /* 0F24C 80822A6C 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 /* 0F250 80822A70 03387804 */ sllv $t7, $t8, $t9 @@ -1015,16 +1015,16 @@ glabel func_80821C10 /* 0F298 80822AB8 0018C880 */ sll $t9, $t8, 2 /* 0F29C 80822ABC 30430003 */ andi $v1, $v0, 0x0003 ## $v1 = 00000000 /* 0F2A0 80822AC0 00031880 */ sll $v1, $v1, 2 -/* 0F2A4 80822AC4 3C188012 */ lui $t8, %hi(D_8012723C) +/* 0F2A4 80822AC4 3C188012 */ lui $t8, %hi(gGoldSkullFlgMask) /* 0F2A8 80822AC8 0303C021 */ addu $t8, $t8, $v1 /* 0F2AC 80822ACC 01597021 */ addu $t6, $t2, $t9 /* 0F2B0 80822AD0 8DCF0E9C */ lw $t7, 0x0E9C($t6) ## 00000E9C -/* 0F2B4 80822AD4 8F18723C */ lw $t8, %lo(D_8012723C)($t8) -/* 0F2B8 80822AD8 3C0E8012 */ lui $t6, %hi(D_8012724C) +/* 0F2B4 80822AD4 8F18723C */ lw $t8, %lo(gGoldSkullFlgMask)($t8) +/* 0F2B8 80822AD8 3C0E8012 */ lui $t6, %hi(gGoldSkullFlgShift) /* 0F2BC 80822ADC 01C37021 */ addu $t6, $t6, $v1 /* 0F2C0 80822AE0 01F8C824 */ and $t9, $t7, $t8 /* 0F2C4 80822AE4 3C188083 */ lui $t8, %hi(D_8082AC7C) ## $t8 = 80830000 -/* 0F2C8 80822AE8 8DCE724C */ lw $t6, %lo(D_8012724C)($t6) +/* 0F2C8 80822AE8 8DCE724C */ lw $t6, %lo(gGoldSkullFlgShift)($t6) /* 0F2CC 80822AEC 0302C021 */ addu $t8, $t8, $v0 /* 0F2D0 80822AF0 9318AC7C */ lbu $t8, %lo(D_8082AC7C)($t8) /* 0F2D4 80822AF4 01D97806 */ srlv $t7, $t9, $t6 diff --git a/data/overlays/actors/z_en_sw.bss.s b/data/overlays/actors/z_en_sw.bss.s deleted file mode 100644 index 3f272959ed..0000000000 --- a/data/overlays/actors/z_en_sw.bss.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 .bss - -.balign 16 - -glabel D_80B0F630 - .space 0x80 diff --git a/data/overlays/actors/z_en_sw.data.s b/data/overlays/actors/z_en_sw.data.s deleted file mode 100644 index bb491ab3d5..0000000000 --- a/data/overlays/actors/z_en_sw.data.s +++ /dev/null @@ -1,65 +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 En_Sw_InitVars - .word 0x00950400, 0x00000015, 0x00240000, 0x000004D8 -.word EnSw_Init -.word EnSw_Destroy -.word EnSw_Update -.word EnSw_Draw -glabel D_80B0F040 - .word 0x00000000, 0xFFCFFFFF, 0x00080000, 0xFFC3FFFE, 0x00000000, 0x01050100, 0x02000000, 0xFED40000, 0x00150064 -glabel D_80B0F064 - .word 0x06110939, 0x10000000, 0x00000001 -.word D_80B0F040 -glabel D_80B0F074 - .word 0x01000002, 0x00190019, 0xFF000000 -glabel D_80B0F080 - .word 0x06000304, 0x3F800000, 0x00000000, 0xBF800000, 0x01000000, 0x00000000, 0x06000304, 0x3F800000, 0x00000000, 0xBF800000, 0x01000000, 0xC1000000, 0x060055A8, 0x3F800000, 0x00000000, 0xBF800000, 0x01000000, 0xC1000000, 0x06005B98, 0x3F800000, 0x00000000, 0xBF800000, 0x01000000, 0xC1000000 -glabel D_80B0F0E0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B0F0EC - .word 0x505032FF -glabel D_80B0F0F0 - .word 0x64645000 -glabel D_80B0F0F4 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B0F100 - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_80B0F10C - .word 0x505032FF -glabel D_80B0F110 - .word 0x64645000 -glabel D_80B0F114 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B0F120 - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_80B0F12C - .word 0x00000000, 0x3F000000, 0x00000000 -glabel D_80B0F138 - .word 0x00000000, 0x3F000000, 0x00000000 -glabel D_80B0F144 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B0F150 - .word 0x44AF0000, 0xC5228000, 0xC4480000 -glabel D_80B0F15C - .word 0x44AF0000, 0xC4C80000, 0x00000000 -glabel D_80B0F168 - .word 0xC4AF0000, 0xC5228000, 0xC4480000 -glabel D_80B0F174 - .word 0xC4AF0000, 0xC4C80000, 0x00000000 -glabel D_80B0F180 - .word 0x00000000, 0x00000000, 0xC4160000 -glabel D_80B0F18C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B0F198 - .word 0xB800E4FF, 0x00000000 - diff --git a/data/overlays/actors/z_en_sw.reloc.s b/data/overlays/actors/z_en_sw.reloc.s deleted file mode 100644 index 9fbcd51cdd..0000000000 --- a/data/overlays/actors/z_en_sw.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_80B0F2C0 - .incbin "baserom/ovl_En_Sw", 0x3510, 0x00000370 diff --git a/include/variables.h b/include/variables.h index 645062121d..3c6b191405 100644 --- a/include/variables.h +++ b/include/variables.h @@ -359,8 +359,8 @@ extern u32 gUpgradeNegMasks[8]; extern u8 gEquipShifts[4]; extern u8 gUpgradeShifts[8]; extern u16 gUpgradeCapacities[8][4]; -extern u32 D_8012723C[4]; -extern u32 D_8012724C[4]; +extern u32 gGoldSkullFlgMask[4]; +extern u32 gGoldSkullFlgShift[4]; extern u32 gItemIcons[0x82]; extern u8 gItemSlots[56]; extern void (*gSceneCmdHandlers[26])(GlobalContext*, SceneCmd*); diff --git a/spec b/spec index 45968bad0a..eeda735d11 100644 --- a/spec +++ b/spec @@ -2945,9 +2945,7 @@ endseg beginseg name "ovl_En_Sw" include "build/src/overlays/actors/ovl_En_Sw/z_en_sw.o" - include "build/data/overlays/actors/z_en_sw.data.o" - include "build/data/overlays/actors/z_en_sw.bss.o" - include "build/data/overlays/actors/z_en_sw.reloc.o" + include "build/src/overlays/actors/ovl_En_Sw/ovl_En_Sw_reloc.o" endseg beginseg diff --git a/src/code/code_80097A00.c b/src/code/code_80097A00.c index 3c8d870825..94e8fa0a1c 100644 --- a/src/code/code_80097A00.c +++ b/src/code/code_80097A00.c @@ -30,8 +30,8 @@ u16 gUpgradeCapacities[][4] = { { 0, 20, 30, 40 }, // Deku Nut Upgrades }; -u32 D_8012723C[] = { 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 }; -u32 D_8012724C[] = { 0, 8, 16, 24 }; +u32 gGoldSkullFlgMask[] = { 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 }; +u32 gGoldSkullFlgShift[] = { 0, 8, 16, 24 }; // TODO: use symbols for these icon textures once textures are properly in C u32 gItemIcons[] = { diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 4843d1f827..cd2028a3b9 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -671,7 +671,8 @@ void func_80A7D460(EnInsect* this, GlobalContext* globalCtx) { temp_a0 = ((this->soilActor->actor.params >> 8) & 0x1F) - 1; temp_a1 = temp_a0 & 3; - if ((((gSaveContext.gsFlags[temp_a0 >> 2] & D_8012723C[temp_a1]) >> D_8012724C[temp_a1]) & + if ((((gSaveContext.gsFlags[temp_a0 >> 2] & gGoldSkullFlgMask[temp_a1]) >> + gGoldSkullFlgShift[temp_a1]) & (this->soilActor->actor.params & 0xFF)) == 0) { func_80078884(NA_SE_SY_TRE_BOX_APPEAR); } diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 2be102d975..199f3a2e1a 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -134,7 +134,7 @@ void func_80AFB950(EnSi* this, GlobalContext* globalCtx) { } else { params = this->actor.params; temp = (params & 0x1F00) >> 8; - gSaveContext.gsFlags[temp >> 2] |= (params & 0xFF) << D_8012724C[temp & 3]; + gSaveContext.gsFlags[temp >> 2] |= (params & 0xFF) << gGoldSkullFlgShift[temp & 3]; Actor_Kill(&this->actor); } diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index b547c8f41f..6713af5ddd 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -8,21 +8,19 @@ void EnSw_Init(Actor* thisx, GlobalContext* globalCtx); void EnSw_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnSw_Update(Actor* thisx, GlobalContext* globalCtx); void EnSw_Draw(Actor* thisx, GlobalContext* globalCtx); +s32 func_80B0DFFC(EnSw* this, GlobalContext* globalCtx); +void func_80B0D364(EnSw* this, GlobalContext* globalCtx); +void func_80B0E5E0(EnSw* this, GlobalContext* globalCtx); +void func_80B0D590(EnSw* this, GlobalContext* globalCtx); +void func_80B0E90C(EnSw* this, GlobalContext* globalCtx); +void func_80B0E9BC(EnSw* this, GlobalContext* globalCtx); +void func_80B0E728(EnSw* this, GlobalContext* globalCtx); +void func_80B0DC7C(EnSw* this, GlobalContext* globalCtx); +s32 func_80B0C0CC(EnSw* this, GlobalContext* globalCtx, s32); +void func_80B0D3AC(EnSw* this, GlobalContext* globalCtx); +void func_80B0DB00(EnSw* this, GlobalContext* globalCtx); +void func_80B0D878(EnSw* this, GlobalContext* globalCtx); -extern UNK_TYPE D_06000304; -extern UNK_TYPE D_06003FB0; -extern UNK_TYPE D_060043D8; -extern UNK_TYPE D_060045C0; -extern UNK_TYPE D_06004658; -extern UNK_TYPE D_060046F0; -extern UNK_TYPE D_06004788; -extern UNK_TYPE D_06004820; -extern UNK_TYPE D_060048B8; -extern UNK_TYPE D_06004950; -extern UNK_TYPE D_060049E8; -extern UNK_TYPE D_06005298; - -/* const ActorInit En_Sw_InitVars = { ACTOR_EN_SW, ACTORCAT_NPC, @@ -35,95 +33,996 @@ const ActorInit En_Sw_InitVars = { (ActorFunc)EnSw_Draw, }; -static ColliderJntSphElementInit D_80B0F040[1] = { +static ColliderJntSphElementInit sJntSphItemsInit[1] = { { - { - ELEMTYPE_UNK0, - { 0xFFCFFFFF, 0x00, 0x08 }, - { 0xFFC3FFFE, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, - OCELEM_ON, - }, + { ELEMTYPE_UNK0, { 0xFFCFFFFF, 0x00, 0x08 }, { 0xFFC3FFFE, 0x00, 0x00 }, 0x01, 0x05, 0x01 }, { 2, { { 0, -300, 0 }, 21 }, 100 }, }, }; -static ColliderJntSphInit D_80B0F064 = { - { - COLTYPE_HIT6, - AT_ON | AT_TYPE_ENEMY, - AC_ON | AC_TYPE_PLAYER, - OC1_ON | OC1_TYPE_ALL, - OC2_TYPE_1, - COLSHAPE_JNTSPH, - }, +static ColliderJntSphInit sJntSphInit = { + { COLTYPE_HIT6, 0x11, 0x09, 0x39, 0x10, COLSHAPE_JNTSPH }, 1, - D_80B0F040, + sJntSphItemsInit, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BDB0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s") +static CollisionCheckInfoInit2 D_80B0F074 = { 1, 2, 25, 25, MASS_IMMOVABLE }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C020.s") +static struct_80034EC0_Entry D_80B0F080[] = { + { 0x06000304, 1.0f, 0.0f, -1.0f, 0x01, 0.0f }, + { 0x06000304, 1.0f, 0.0f, -1.0f, 0x01, -8.0f }, + { 0x060055A8, 1.0f, 0.0f, -1.0f, 0x01, -8.0f }, + { 0x06005B98, 1.0f, 0.0f, -1.0f, 0x01, -8.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C0CC.s") +char D_80B0F630[0x80]; // unused -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Init.s") +extern SkeletonHeader D_06005298; +extern Gfx D_06004788[]; +extern Gfx D_060046F0[]; +extern Gfx D_06004658[]; +extern Gfx D_060045C0[]; +extern Gfx D_06004820[]; +extern Gfx D_060048B8[]; +extern Gfx D_06004950[]; +extern Gfx D_060049E8[]; +extern Gfx D_06003FB0[]; +extern Gfx D_060043D8[]; +extern AnimationHeader D_06000304; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Destroy.s") +void EnSw_CrossProduct(Vec3f* a, Vec3f* b, Vec3f* dst) { + dst->x = (a->y * b->z) - (a->z * b->y); + dst->y = (a->z * b->x) - (a->x * b->z); + dst->z = (a->x * b->y) - (a->y * b->x); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0C9F0.s") +s32 func_80B0BE20(EnSw* this, CollisionPoly* poly) { + Vec3f sp44; + Vec3f sp38; + f32 sp34; + f32 temp_f0; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CBE8.s") + this->actor.floorPoly = poly; + sp44.x = COLPOLY_GET_NORMAL(poly->normal.x); + sp44.y = COLPOLY_GET_NORMAL(poly->normal.y); + sp44.z = COLPOLY_GET_NORMAL(poly->normal.z); + sp34 = Math_FAcosF(DOTXYZ(sp44, this->unk_364)); + EnSw_CrossProduct(&this->unk_364, &sp44, &sp38); + func_800D23FC(sp34, &sp38, MTXMODE_NEW); + Matrix_MultVec3f(&this->unk_370, &sp38); + this->unk_370 = sp38; + EnSw_CrossProduct(&this->unk_370, &sp44, &this->unk_37C); + temp_f0 = Math3D_Vec3fMagnitude(&this->unk_37C); + if (temp_f0 < 0.001f) { + return 0; + } + this->unk_37C.x = this->unk_37C.x * (1.0f / temp_f0); + this->unk_37C.y = this->unk_37C.y * (1.0f / temp_f0); + this->unk_37C.z = this->unk_37C.z * (1.0f / temp_f0); + this->unk_364 = sp44; + this->unk_3D8.xx = this->unk_370.x; + this->unk_3D8.xy = this->unk_370.y; + this->unk_3D8.xz = this->unk_370.z; + this->unk_3D8.xw = 0.0f; + this->unk_3D8.yx = this->unk_364.x; + this->unk_3D8.yy = this->unk_364.y; + this->unk_3D8.yz = this->unk_364.z; + this->unk_3D8.yw = 0.0f; + this->unk_3D8.zx = this->unk_37C.x; + this->unk_3D8.zy = this->unk_37C.y; + this->unk_3D8.zz = this->unk_37C.z; + this->unk_3D8.zw = 0.0f; + this->unk_3D8.wx = 0.0f; + this->unk_3D8.wy = 0.0f; + this->unk_3D8.wz = 0.0f; + this->unk_3D8.ww = 1.0f; + func_800D20CC(&this->unk_3D8, &this->actor.world.rot, 0); + //! @bug: Does not return. +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CCF4.s") +CollisionPoly* func_80B0C020(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3, s32* arg4) { + CollisionPoly* sp3C; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CEA8.s") + if (!BgCheck_EntityLineTest1(&globalCtx->colCtx, arg1, arg2, arg3, &sp3C, 1, 1, 1, 0, arg4)) { + return NULL; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0CF44.s") + if (func_80041DB8(&globalCtx->colCtx, sp3C, *arg4) & 0x30) { + return NULL; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D14C.s") + if (SurfaceType_IsIgnoredByProjectiles(&globalCtx->colCtx, sp3C, *arg4)) { + return NULL; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D364.s") + return sp3C; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D3AC.s") +s32 func_80B0C0CC(EnSw* this, GlobalContext* globalCtx, s32 arg2) { + CollisionPoly* temp_v0_2; + CollisionPoly* temp_s1; + Vec3f sp9C; + Vec3f sp90; + Vec3f sp84; + Vec3f sp78; + s32 pad; + s32 sp70; + s32 sp6C; + s32 phi_s1; + s32 sp64; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D590.s") + sp64 = 0; + this->unk_42C = 1; + sp84 = sp78 = this->actor.world.pos; + sp84.x += this->unk_364.x * 18.0f; + sp84.y += this->unk_364.y * 18.0f; + sp84.z += this->unk_364.z * 18.0f; + sp78.x -= this->unk_364.x * 18.0f; + sp78.y -= this->unk_364.y * 18.0f; + sp78.z -= this->unk_364.z * 18.0f; + temp_s1 = func_80B0C020(globalCtx, &sp84, &sp78, &sp90, &sp70); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s") + if ((temp_s1 != NULL) && (this->unk_360 == 0)) { + sp78.x = sp84.x + (this->unk_37C.x * 24); + sp78.y = sp84.y + (this->unk_37C.y * 24); + sp78.z = sp84.z + (this->unk_37C.z * 24); + temp_v0_2 = func_80B0C020(globalCtx, &sp84, &sp78, &sp9C, &sp6C); + if (temp_v0_2 != NULL) { + if (arg2 == 1) { + func_80B0BE20(this, temp_v0_2); + this->actor.world.pos = sp9C; + this->actor.floorBgId = sp6C; + } + } else { + if (this->actor.floorPoly != temp_s1) { + func_80B0BE20(this, temp_s1); + } + this->actor.world.pos = sp90; + this->actor.floorBgId = sp70; + } + sp64 = 1; + } else { + sp84 = sp78; + for (phi_s1 = 0; phi_s1 < 3; phi_s1++) { + if (phi_s1 == 0) { + sp78.x = sp84.x - (this->unk_37C.x * 24.0f); + sp78.y = sp84.y - (this->unk_37C.y * 24.0f); + if (0) {} + sp78.z = sp84.z - (this->unk_37C.z * 24.0f); + } else if (phi_s1 == 1) { + sp78.x = sp84.x + (this->unk_370.x * 24.0f); + sp78.y = sp84.y + (this->unk_370.y * 24.0f); + sp78.z = sp84.z + (this->unk_370.z * 24.0f); + } else { + sp78.x = sp84.x - (this->unk_370.x * 24.0f); + sp78.y = sp84.y - (this->unk_370.y * 24.0f); + sp78.z = sp84.z - (this->unk_370.z * 24.0f); + } + temp_v0_2 = func_80B0C020(globalCtx, &sp84, &sp78, &sp9C, &sp6C); + if (temp_v0_2 != NULL) { + if (arg2 == 1) { + func_80B0BE20(this, temp_v0_2); + this->actor.world.pos = sp9C; + this->actor.floorBgId = sp6C; + } + sp64 = 1; + break; + } + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DB00.s") + Math_SmoothStepToS(&this->actor.shape.rot.x, this->actor.world.rot.x, 8, 0xFA0, 1); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.world.rot.y, 8, 0xFA0, 1); + Math_SmoothStepToS(&this->actor.shape.rot.z, this->actor.world.rot.z, 8, 0xFA0, 1); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s") + return sp64; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DE34.s") +void EnSw_Init(Actor* thisx, GlobalContext* globalCtx) { + EnSw* this = THIS; + s32 phi_v0; + Vec3f sp4C = { 0.0f, 0.0f, 0.0f }; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DEA8.s") + if (thisx->params & 0x8000) { + phi_v0 = (((thisx->params - 0x8000) & 0xE000) >> 0xD) + 1; + thisx->params = (thisx->params & 0x1FFF) | (phi_v0 << 0xD); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s") + if (((thisx->params & 0xE000) >> 0xD) > 0) { + phi_v0 = ((thisx->params & 0x1F00) >> 8) - 1; + thisx->params = (thisx->params & 0xE0FF) | (phi_v0 << 8); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E314.s") + // Check to see if this gold skull token has already been retrieved. + if (((gSaveContext.gsFlags[((thisx->params & 0x1F00) >> 8) >> 2] & + gGoldSkullFlgMask[((thisx->params & 0x1F00) >> 8) & 3]) >> + gGoldSkullFlgShift[((thisx->params & 0x1F00) >> 8) & 3]) & + (thisx->params & 0xFF)) { + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E430.s") + SkelAnime_Init(globalCtx, &this->skelAnime, &D_06005298, NULL, this->jointTable, this->morphTable, 30); + func_80034EC0(&this->skelAnime, D_80B0F080, 0); + ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f); + Collider_InitJntSph(globalCtx, &this->collider); + Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, this->sphs); + CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(0xE), &D_80B0F074); + this->actor.scale.x = 0.02f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E5E0.s") + if (((thisx->params & 0xE000) >> 0xD) == 0) { + this->actor.world.rot.x = 0; + this->actor.world.rot.z = 0; + thisx->shape.rot = this->actor.world.rot; + this->unk_484.y = this->actor.world.pos.y; + this->unk_484.x = this->actor.world.pos.x + (Math_SinS(this->actor.world.rot.y) * -60.0f); + this->unk_484.z = this->actor.world.pos.z + (Math_CosS(this->actor.world.rot.y) * -60.0f); + func_80B0DFFC(this, globalCtx); + this->actor.home.pos = this->actor.world.pos; + } else { + this->unk_370.x = Math_SinS(thisx->shape.rot.y + 0x4000); + this->unk_370.y = 0.0f; + this->unk_370.z = Math_CosS(thisx->shape.rot.y + 0x4000); + this->unk_364.x = 0.0f; + this->unk_364.y = 1.0f; + this->unk_364.z = 0.0f; + this->unk_37C.x = Math_SinS(thisx->shape.rot.y); + this->unk_37C.y = 0.0f; + this->unk_37C.z = Math_CosS(thisx->shape.rot.y); + func_80B0C0CC(this, globalCtx, 1); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E728.s") + if (((thisx->params & 0xE000) >> 0xD) >= 3) { + Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E90C.s") + switch ((thisx->params & 0xE000) >> 0xD) { + case 3: + case 4: + this->unk_360 = 1; + this->actor.velocity.y = 8.0f; + this->actor.speedXZ = 4.0f; + this->actor.gravity = -1.0f; + case 2: + this->actor.scale.x = 0.0f; + case 1: + this->collider.elements[0].info.toucher.damage *= 2; + this->actor.naviEnemyId = 0x20; + this->actor.colChkInfo.health *= 2; + this->actor.flags &= ~1; + break; + default: + Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORCAT_ENEMY); + this->actor.naviEnemyId = 0x1F; + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0E9BC.s") + this->unk_38E = Rand_S16Offset(0xF, 0x1E); + Actor_SetScale(&this->actor, this->actor.scale.x); + this->actor.home.pos = this->actor.world.pos; + thisx->shape.rot = this->actor.world.rot; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Update.s") + if (((thisx->params & 0xE000) >> 0xD) >= 3) { + this->unk_38C = 0x28; + this->unk_394 = 1; + this->actionFunc = func_80B0D364; + } else if (((thisx->params & 0xE000) >> 0xD) == 0) { + this->actionFunc = func_80B0E5E0; + } else { + this->actionFunc = func_80B0D590; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s") +void EnSw_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnSw* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDA4.s") + Collider_DestroyJntSph(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s") +s32 func_80B0C9F0(EnSw* this, GlobalContext* globalCtx) { + s32 phi_v1 = false; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s") + if (this->actor.xyzDistToPlayerSq < SQ(400.0f) && ((this->actor.params & 0xE000) >> 0xD) == 0 && + globalCtx->actorCtx.unk_02 != 0) { -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sw/EnSw_Draw.s") + this->actor.colChkInfo.damage = this->actor.colChkInfo.health; + phi_v1 = true; + } + + if (this->unk_392 == 0) { + if ((this->collider.base.acFlags & 2) || phi_v1) { + this->collider.base.acFlags &= ~2; + this->unk_392 = 0x10; + func_8003426C(&this->actor, 0x4000, 0xC8, 0, this->unk_392); + if (Actor_ApplyDamage(&this->actor) != 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_DAMAGE); + return true; + } + func_80032C7C(globalCtx, &this->actor); + if (((this->actor.params & 0xE000) >> 0xD) != 0) { + this->skelAnime.playSpeed = 8.0f; + if ((globalCtx->state.frames & 1) == 0) { + this->unk_420 = 0.1f; + } else { + this->unk_420 = -0.1f; + } + this->unk_394 = 0xA; + this->unk_38A = 1; + this->unk_420 *= 4.0f; + this->actionFunc = func_80B0D878; + } else { + this->actor.shape.shadowDraw = ActorShadow_DrawCircle; + this->actor.shape.shadowAlpha = 0xFF; + this->unk_38A = 2; + this->actor.shape.shadowScale = 16.0f; + this->actor.gravity = -1.0f; + this->actor.flags &= ~1; + this->actionFunc = func_80B0DB00; + } + + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALWALL_DEAD); + return true; + } + } + + if ((this->unk_390 == 0) && (this->collider.base.atFlags & 2)) { + this->unk_390 = 30; + } + + return false; +} + +void func_80B0CBE8(EnSw* this, GlobalContext* globalCtx) { + if ((((this->actor.params & 0xE000) >> 0xD) > 0) && (this->actionFunc != func_80B0D590)) { + if (this->unk_392 != 0) { + this->unk_392--; + } + } else { + if ((DECR(this->unk_390) == 0) && (this->actor.colChkInfo.health != 0)) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + + if ((DECR(this->unk_392) == 0) && (this->actor.colChkInfo.health != 0)) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } +} + +s32 func_80B0CCF4(EnSw* this, f32* arg1) { + CollisionPoly* temp_v1; + f32 temp_f0; + Vec3f sp6C; + MtxF sp2C; + + if (this->actor.floorPoly == NULL) { + return false; + } + + temp_v1 = this->actor.floorPoly; + sp6C.x = COLPOLY_GET_NORMAL(temp_v1->normal.x); + sp6C.y = COLPOLY_GET_NORMAL(temp_v1->normal.y); + sp6C.z = COLPOLY_GET_NORMAL(temp_v1->normal.z); + func_800D23FC(*arg1, &sp6C, MTXMODE_NEW); + Matrix_MultVec3f(&this->unk_370, &sp6C); + this->unk_370 = sp6C; + EnSw_CrossProduct(&this->unk_370, &this->unk_364, &this->unk_37C); + temp_f0 = Math3D_Vec3fMagnitude(&this->unk_37C); + if (temp_f0 < 0.001f) { + return false; + } + temp_f0 = 1.0f / temp_f0; + this->unk_37C.x *= temp_f0; + this->unk_37C.y *= temp_f0; + this->unk_37C.z *= temp_f0; + sp2C.xx = this->unk_370.x; + sp2C.xy = this->unk_370.y; + sp2C.xz = this->unk_370.z; + sp2C.xw = 0.0f; + sp2C.yx = this->unk_364.x; + sp2C.yy = this->unk_364.y; + sp2C.yz = this->unk_364.z; + sp2C.yw = 0.0f; + sp2C.zx = this->unk_37C.x; + sp2C.zy = this->unk_37C.y; + sp2C.zz = this->unk_37C.z; + sp2C.zw = 0.0f; + sp2C.wx = 0.0f; + sp2C.wy = 0.0f; + sp2C.wz = 0.0f; + sp2C.ww = 1.0f; + func_800D20CC(&sp2C, &this->actor.world.rot, 0); + return true; +} + +void func_80B0CEA8(EnSw* this, GlobalContext* globalCtx) { + if (!(this->actor.scale.x < 0.0139999995f)) { + Camera* activeCam = ACTIVE_CAM; + + if (!(Math_Vec3f_DistXYZ(&this->actor.world.pos, &activeCam->eye) >= 380.0f)) { + Audio_PlayActorSound2(&this->actor, ((this->actor.params & 0xE000) >> 0xD) > 0 ? NA_SE_EN_STALGOLD_ROLL + : NA_SE_EN_STALWALL_ROLL); + } + } +} + +void func_80B0CF44(EnSw* this, GlobalContext* globalCtx, s32 cnt) { + Color_RGBA8 primColor = { 80, 80, 50, 255 }; + Color_RGBA8 envColor = { 100, 100, 80, 0 }; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.3f, 0.0f }; + Vec3f pos; + s16 angle = (Rand_ZeroOne() - 0.5f) * 65536.0f; + s32 i; + + for (i = cnt; i >= 0; i--, angle += (s16)(0x10000 / cnt)) { + accel.x = (Rand_ZeroOne() - 0.5f) * 2.0f; + accel.z = (Rand_ZeroOne() - 0.5f) * 2.0f; + pos.x = this->actor.world.pos.x + (Math_SinS(angle) * 2.0f); + pos.y = this->actor.world.pos.y; + pos.z = this->actor.world.pos.z + (Math_CosS(angle) * 2.0f); + func_8002836C(globalCtx, &pos, &velocity, &accel, &primColor, &envColor, 20, 30, 12); + } +} + +void func_80B0D14C(EnSw* this, GlobalContext* globalCtx, s32 cnt) { + Color_RGBA8 primColor = { 80, 80, 50, 255 }; + Color_RGBA8 envColor = { 100, 100, 80, 0 }; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.3f, 0.0f }; + Vec3f pos; + s16 angle = (Rand_ZeroOne() - 0.5f) * 65536.0f; + s32 i; + + for (i = cnt; i >= 0; i--, angle += (s16)(0x10000 / cnt)) { + accel.x = (Rand_ZeroOne() - 0.5f) * 2.0f; + accel.z = (Rand_ZeroOne() - 0.5f) * 2.0f; + pos.x = this->actor.world.pos.x + (Math_SinS(angle) * 14.0f); + pos.y = this->actor.world.pos.y; + pos.z = this->actor.world.pos.z + (Math_CosS(angle) * 14.0f); + func_8002836C(globalCtx, &pos, &velocity, &accel, &primColor, &envColor, 20, 40, 10); + } +} + +void func_80B0D364(EnSw* this, GlobalContext* globalCtx) { + if (((this->actor.params & 0xE000) >> 0xD) == 4) { + this->unk_38C = 0; + this->actionFunc = func_80B0D3AC; + } else { + this->unk_38C = 10; + this->actionFunc = func_80B0D3AC; + } +} + +void func_80B0D3AC(EnSw* this, GlobalContext* globalCtx) { + if (this->unk_38C != 0) { + if ((this->unk_38C & 4) != 0) { + func_80B0CF44(this, globalCtx, 5); + } + this->unk_38C--; + if (this->unk_38C == 0) { + Audio_PlaySoundAtPosition(globalCtx, &this->actor.world.pos, 0x28, NA_SE_EN_STALGOLD_UP_CRY); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.world.pos, 0x28, NA_SE_EN_DODO_M_UP); + } else { + return; + } + } + + Math_ApproachF(&this->actor.scale.x, 0.02f, 0.2f, 0.01f); + Actor_SetScale(&this->actor, this->actor.scale.x); + this->actor.world.pos.x += this->unk_364.x * this->actor.velocity.y; + this->actor.world.pos.y += this->unk_364.y * this->actor.velocity.y; + this->actor.world.pos.z += this->unk_364.z * this->actor.velocity.y; + this->actor.world.pos.x += this->unk_37C.x * this->actor.speedXZ; + this->actor.world.pos.y += this->unk_37C.y * this->actor.speedXZ; + this->actor.world.pos.z += this->unk_37C.z * this->actor.speedXZ; + this->actor.velocity.y += this->actor.gravity; + this->actor.velocity.y = CLAMP_MIN(this->actor.velocity.y, this->actor.minVelocityY); + + if (this->actor.velocity.y < 0.0f) { + this->unk_360 = 0; + } + + if (func_80B0C0CC(this, globalCtx, 1) == 1) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); + func_80B0D14C(this, globalCtx, 8); + this->actor.scale.x = 0.02f; + Actor_SetScale(&this->actor, 0.02f); + this->actionFunc = func_80B0D590; + this->actor.velocity.y = 0.0f; + this->actor.speedXZ = 0.0f; + this->actor.gravity = 0.0f; + } +} + +void func_80B0D590(EnSw* this, GlobalContext* globalCtx) { + f32 sp2C; + + if (((this->actor.params & 0xE000) >> 0xD) == 2) { + if (this->actor.scale.x < 0.0139999995f) { + this->collider.elements[0].info.toucherFlags = 0; + this->collider.elements[0].info.bumperFlags = 0; + this->collider.elements[0].info.ocElemFlags = 0; + } + + if (this->actor.scale.x >= 0.0139999995f) { + this->collider.elements[0].info.toucherFlags = 1; + this->collider.elements[0].info.bumperFlags = 1; + this->collider.elements[0].info.ocElemFlags = 1; + } + + Math_ApproachF(&this->actor.scale.x, gSaveContext.nightFlag ? 0.02f : 0.0f, 0.2f, 0.01f); + Actor_SetScale(&this->actor, this->actor.scale.x); + } + + if (this->unk_38E != 0) { + this->unk_38E--; + if (this->unk_38E == 0) { + func_80B0CEA8(this, globalCtx); + this->unk_420 = ((globalCtx->state.frames % 2) == 0) ? 0.1f : -0.1f; + this->unk_38A = 1; + this->unk_38C = Rand_S16Offset(30, 60); + if (((this->actor.params & 0xE000) >> 0xD) != 0) { + this->unk_38C *= 2; + this->unk_420 *= 2.0f; + } + } + } else { + this->unk_38C--; + if (this->unk_38C == 0) { + this->unk_38E = Rand_S16Offset(15, 30); + this->unk_38A = 0; + this->skelAnime.playSpeed = 0.0f; + if (((this->actor.params & 0xE000) >> 0xD) != 0) { + this->unk_38E /= 2; + } + } else if (this->unk_38A != 0) { + this->unk_38A--; + this->skelAnime.playSpeed = (this->unk_38A == 0) ? 4.0f : 0.0f; + + if (this->skelAnime.playSpeed > 0.0f) { + func_80B0CEA8(this, globalCtx); + } + if (((this->actor.params & 0xE000) >> 0xD) != 0) { + this->skelAnime.playSpeed *= 2.0f; + } + } else { + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame) == 1) { + this->unk_38A = 2; + } + sp2C = 32768.0f / this->skelAnime.endFrame; + sp2C *= this->skelAnime.curFrame; + sp2C = Math_SinS(sp2C) * this->unk_420; + func_80B0CCF4(this, &sp2C); + this->actor.shape.rot = this->actor.world.rot; + } + } +} + +void func_80B0D878(EnSw* this, GlobalContext* globalCtx) { + Actor* temp_v0; + Vec3f pos; + Vec3f velAndAccel = { 0.0f, 0.5f, 0.0f }; + f32 x; + f32 y; + f32 z; + + if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame) == 1) { + func_80B0CEA8(this, globalCtx); + } + + func_80B0CCF4(this, &this->unk_420); + this->actor.shape.rot = this->actor.world.rot; + + if ((this->unk_394 == 0) && (this->unk_392 == 0)) { + Audio_PlaySoundGeneral(NA_SE_SY_KINSTA_MARK_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + x = (this->unk_364.x * 10.0f); + y = (this->unk_364.y * 10.0f); + z = (this->unk_364.z * 10.0f); + temp_v0 = + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_SI, this->actor.world.pos.x + x, + this->actor.world.pos.y + y, this->actor.world.pos.z + z, 0, 0, 0, this->actor.params); + if (temp_v0 != NULL) { + temp_v0->parent = NULL; + } + Actor_Kill(&this->actor); + return; + } + + if ((this->unk_392 == 0) && (DECR(this->unk_394) != 0)) { + pos = this->actor.world.pos; + pos.y += 10.0f + ((Rand_ZeroOne() - 0.5f) * 6.0f); + pos.x += (Rand_ZeroOne() - 0.5f) * 32.0f; + pos.z += (Rand_ZeroOne() - 0.5f) * 32.0f; + EffectSsDeadDb_Spawn(globalCtx, &pos, &velAndAccel, &velAndAccel, 42, 0, 255, 255, 255, 255, 255, 0, 0, 1, 9, + true); + } +} + +void func_80B0DB00(EnSw* this, GlobalContext* globalCtx) { + Actor_MoveForward(&this->actor); + this->actor.shape.rot.x += 0x1000; + this->actor.shape.rot.z += 0x1000; + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 0.0f, 5); + + if ((this->actor.bgCheckFlags & 1) && (!(0.0f <= this->actor.velocity.y))) { + if (this->actor.floorHeight <= BGCHECK_Y_MIN || this->actor.floorHeight >= 32000.0f) { + Actor_Kill(&this->actor); + return; + } + + this->actor.bgCheckFlags &= ~1; + + if (this->unk_38A == 0) { + this->actionFunc = func_80B0DC7C; + this->unk_394 = 10; + } else { + this->actor.velocity.y = ((this->unk_38A--) * 8.0f) * 0.5f; + } + + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); + func_80033260(globalCtx, &this->actor, &this->actor.world.pos, 16.0f, 0xC, 2.0f, 0x78, 0xA, 0); + } +} + +void func_80B0DC7C(EnSw* this, GlobalContext* globalCtx) { + Vec3f velAndAccel = { 0.0f, 0.5f, 0.0f }; + Vec3f pos = { 0.0f, 0.0f, 0.0f }; + + if (DECR(this->unk_394) != 0) { + pos.y = ((Rand_ZeroOne() - 0.5f) * 6.0f) + (this->actor.world.pos.y + 10.0f); + pos.x = ((Rand_ZeroOne() - 0.5f) * 32.0f) + this->actor.world.pos.x; + pos.z = ((Rand_ZeroOne() - 0.5f) * 32.0f) + this->actor.world.pos.z; + EffectSsDeadDb_Spawn(globalCtx, &pos, &velAndAccel, &velAndAccel, 42, 0, 255, 255, 255, 255, 255, 0, 0, 1, 9, + 1); + this->actor.shape.rot.x += 0x1000; + this->actor.shape.rot.z += 0x1000; + } else { + Item_DropCollectibleRandom(globalCtx, NULL, &this->actor.world.pos, 0x30); + Actor_Kill(&this->actor); + } +} + +s16 func_80B0DE34(EnSw* this, Vec3f* arg1) { + s16 pitch; + s16 yaw; + + yaw = Math_Vec3f_Yaw(&this->actor.world.pos, arg1) - this->actor.wallYaw; + pitch = Math_Vec3f_Pitch(&this->actor.world.pos, arg1) - 0x4000; + return pitch * (yaw >= 0 ? -1 : 1); +} + +s32 func_80B0DEA8(EnSw* this, GlobalContext* globalCtx, s32 arg2) { + Player* player = PLAYER; + CollisionPoly* sp58; + s32 sp54; + Vec3f sp48; + + if (!(player->stateFlags1 & 0x200000) && arg2) { + return false; + } else if (func_8002DDF4(globalCtx) && arg2) { + return false; + } else if (ABS(func_80B0DE34(this, &player->actor.world.pos) - this->actor.shape.rot.z) >= 0x1FC2) { + return false; + } else if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &player->actor.world.pos) >= 130.0f) { + return false; + } else if (!BgCheck_EntityLineTest1(&globalCtx->colCtx, &this->actor.world.pos, &player->actor.world.pos, &sp48, + &sp58, 1, 0, 0, 1, &sp54)) { + return true; + } else { + return false; + } +} + +s32 func_80B0DFFC(EnSw* this, GlobalContext* globalCtx) { + s32 pad; + CollisionPoly* sp60; + s32 sp5C; + Vec3f sp50; + s32 sp4C = 1; + + if (this->collider.base.ocFlags1 & 2) { + this->collider.base.acFlags &= ~2; + sp4C = 0; + } else if (((globalCtx->state.frames % 4) == 0) && + (BgCheck_EntityLineTest1(&globalCtx->colCtx, &this->actor.world.pos, &this->unk_454, &sp50, &sp60, 1, 0, + 0, 1, &sp5C) == 0)) { + sp4C = 0; + } else if (((globalCtx->state.frames % 4) == 1) && + (BgCheck_EntityLineTest1(&globalCtx->colCtx, &this->actor.world.pos, &this->unk_460, &sp50, &sp60, 1, 0, + 0, 1, &sp5C) != 0)) { + sp4C = 0; + } else if (((globalCtx->state.frames % 4) == 2) && + (BgCheck_EntityLineTest1(&globalCtx->colCtx, &this->actor.world.pos, &this->unk_46C, &sp50, &sp60, 1, 0, + 0, 1, &sp5C) == 0)) { + if (0) {} + sp4C = 0; + } else if (((globalCtx->state.frames % 4) == 3) && + (BgCheck_EntityLineTest1(&globalCtx->colCtx, &this->actor.world.pos, &this->unk_478, &sp50, &sp60, 1, 0, + 0, 1, &sp5C) != 0)) { + sp4C = 0; + } + + if (BgCheck_EntityLineTest1(&globalCtx->colCtx, &this->actor.world.pos, &this->unk_484, &sp50, &this->unk_430, 1, 0, + 0, 1, &sp5C) != 0) { + this->actor.wallYaw = Math_FAtan2F(this->unk_430->normal.x, this->unk_430->normal.z) * (0x8000 / M_PI); + this->actor.world.pos = sp50; + this->actor.world.pos.x += (6.0f * Math_SinS(this->actor.world.rot.y)); + this->actor.world.pos.z += (6.0f * Math_CosS(this->actor.world.rot.y)); + this->unk_434 = sp50; + this->unk_434.x += Math_SinS(this->actor.world.rot.y); + this->unk_434.z += Math_CosS(this->actor.world.rot.y); + } + + return sp4C; +} + +void func_80B0E314(EnSw* this, Vec3f arg1, f32 arg4) { + f32 xDist; + f32 yDist; + f32 zDist; + f32 dist; + f32 xDiff; + f32 yDiff; + f32 zDiff; + + Math_SmoothStepToF(&this->actor.speedXZ, arg4, 0.3f, 100.0f, 0.1f); + xDiff = arg1.x - this->actor.world.pos.x; + yDiff = arg1.y - this->actor.world.pos.y; + zDiff = arg1.z - this->actor.world.pos.z; + dist = sqrtf(SQ(xDiff) + SQ(yDiff) + SQ(zDiff)); + if (dist == 0.0f) { + xDist = yDist = zDist = 0.0f; + } else { + xDist = xDiff / dist; + yDist = yDiff / dist; + zDist = zDiff / dist; + } + xDist *= this->actor.speedXZ; + yDist *= this->actor.speedXZ; + zDist *= this->actor.speedXZ; + this->actor.world.pos.x += xDist; + this->actor.world.pos.y += yDist; + this->actor.world.pos.z += zDist; +} + +s32 func_80B0E430(EnSw* this, f32 arg1, s16 arg2, s32 arg3, GlobalContext* globalCtx) { + Camera* activeCam; + f32 lastFrame = Animation_GetLastFrame(&D_06000304); + + if (DECR(this->unk_388) != 0) { + Math_SmoothStepToF(&this->skelAnime.playSpeed, 0.0f, 0.6f, 1000.0f, 0.01f); + return 0; + } + + Math_SmoothStepToF(&this->skelAnime.playSpeed, arg1, 0.6f, 1000.0f, 0.01f); + + if ((arg3 == 1) && (lastFrame < (this->skelAnime.curFrame + this->skelAnime.playSpeed))) { + return 0; + } + + activeCam = ACTIVE_CAM; + + if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &activeCam->eye) < 380.0f) { + if (DECR(this->unk_440) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALWALL_ROLL); + this->unk_440 = 4; + } + } else { + this->unk_440 = 0; + } + Math_SmoothStepToS(&this->actor.shape.rot.z, this->unk_444, 4, arg2, arg2); + this->actor.world.rot = this->actor.shape.rot; + if (this->actor.shape.rot.z == this->unk_444) { + return 1; + } + return 0; +} + +void func_80B0E5E0(EnSw* this, GlobalContext* globalCtx) { + s32 pad[2]; + f32 rand; + + if (func_80B0E430(this, 6.0f, 0x3E8, 1, globalCtx)) { + rand = Rand_ZeroOne(); + this->unk_444 = + ((s16)(20000.0f * rand) + 0x2EE0) * (Rand_ZeroOne() >= 0.5f ? 1.0f : -1.0f) + this->actor.world.rot.z; + this->unk_388 = Rand_S16Offset(10, 30); + } + + if ((DECR(this->unk_442) == 0) && (func_80B0DEA8(this, globalCtx, 1))) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALWALL_LAUGH); + this->unk_442 = 20; + this->actionFunc = func_80B0E728; + } +} + +void func_80B0E728(EnSw* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 pad; + + if (DECR(this->unk_442) != 0) { + if (func_80B0DEA8(this, globalCtx, 1)) { + this->unk_448 = player->actor.world.pos; + this->unk_448.y += 30.0f; + this->unk_444 = func_80B0DE34(this, &this->unk_448); + func_80B0E430(this, 6.0f, (u16)0xFA0, 0, globalCtx); + } else { + this->actionFunc = func_80B0E5E0; + } + } else { + if (func_80B0DFFC(this, globalCtx) == 0) { + this->unk_442 = Rand_S16Offset(20, 10); + this->unk_444 = func_80B0DE34(this, &this->actor.home.pos); + this->unk_448 = this->actor.home.pos; + this->actionFunc = func_80B0E9BC; + } else { + func_80B0E314(this, this->unk_448, 8.0f); + + if (DECR(this->unk_440) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALWALL_DASH); + this->unk_440 = 4; + } + + if (!(13.0f < Math_Vec3f_DistXYZ(&this->actor.world.pos, &this->unk_448)) || + (func_8002DDF4(globalCtx) != 0)) { + this->actionFunc = func_80B0E90C; + } + } + } +} + +void func_80B0E90C(EnSw* this, GlobalContext* globalCtx) { + s32 pad; + + func_80B0E314(this, this->unk_448, 0.0f); + if (this->actor.speedXZ == 0.0f) { + this->unk_444 = func_80B0DE34(this, &this->actor.home.pos); + this->unk_448 = this->actor.home.pos; + this->actionFunc = func_80B0E9BC; + } +} + +void func_80B0E9BC(EnSw* this, GlobalContext* globalCtx) { + s32 pad; + + if (func_80B0E430(this, 6.0f, 0x3E8, 0, globalCtx)) { + func_80B0E314(this, this->unk_448, 2.0f); + if (!(Math_Vec3f_DistXYZ(&this->actor.world.pos, &this->unk_448) > 4.0f)) { + this->actionFunc = func_80B0E5E0; + } + } +} + +void EnSw_Update(Actor* thisx, GlobalContext* globalCtx) { + EnSw* this = THIS; + + SkelAnime_Update(&this->skelAnime); + func_80B0C9F0(this, globalCtx); + this->actionFunc(this, globalCtx); + func_80B0CBE8(this, globalCtx); +} + +s32 EnSw_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { + Vec3f sp7C = { 1400.0f, -2600.0f, -800.0f }; + Vec3f sp70 = { 1400.0f, -1600.0f, 0.0f }; + Vec3f sp64 = { -1400.0f, -2600.0f, -800.0f }; + Vec3f sp58 = { -1400.0f, -1600.0f, 0.0f }; + Vec3f sp4C = { 0.0, 0.0f, -600.0f }; + EnSw* this = THIS; + Vec3f sp3C = { 0.0f, 0.0f, 0.0f }; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_sw.c", 2084); + + if (((this->actor.params & 0xE000) >> 0xD) != 0) { + switch (limbIndex) { + case 23: + *dList = D_06004788; + break; + case 8: + *dList = D_060046F0; + break; + case 14: + *dList = D_06004658; + break; + case 11: + *dList = D_060045C0; + break; + case 26: + *dList = D_06004820; + break; + case 20: + *dList = D_060048B8; + break; + case 17: + *dList = D_06004950; + break; + case 29: + *dList = D_060049E8; + break; + case 5: + *dList = D_06003FB0; + break; + case 4: + *dList = D_060043D8; + break; + } + } + + if (limbIndex == 1) { + Matrix_MultVec3f(&sp7C, &this->unk_454); + Matrix_MultVec3f(&sp70, &this->unk_460); + Matrix_MultVec3f(&sp64, &this->unk_46C); + Matrix_MultVec3f(&sp58, &this->unk_478); + Matrix_MultVec3f(&sp4C, &this->unk_484); + } + + if (limbIndex == 5) { + Matrix_MultVec3f(&sp3C, &this->actor.focus.pos); + } + + if (limbIndex == 4) { + gDPSetEnvColor(POLY_OPA_DISP++, this->unk_1F4.r, this->unk_1F4.g, this->unk_1F4.b, 0); + } + + Collider_UpdateSpheres(limbIndex, &this->collider); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_sw.c", 2145); + + return false; +} + +void EnSw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { +} + +void func_80B0EDB8(GlobalContext* globalCtx, Color_RGBA8* arg1, s16 arg2, s16 arg3) { + f32 temp_f2; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_sw.c", 2181); + + temp_f2 = (11500.0f / arg3) * (arg3 - arg2); + + if (0.0f == temp_f2) { + temp_f2 = 11500; + } + + POLY_OPA_DISP = Gfx_SetFog2(POLY_OPA_DISP, arg1->r, arg1->g, arg1->b, arg1->a, 0, (s16)temp_f2); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_sw.c", 2197); +} + +void func_80B0EEA4(GlobalContext* globalCtx) { + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_sw.c", 2205); + + POLY_OPA_DISP = func_800BC8A0(globalCtx, POLY_OPA_DISP); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_sw.c", 2207); +} + +void EnSw_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnSw* this = THIS; + Color_RGBA8 sp30 = { 184, 0, 228, 255 }; + + if (((this->actor.params & 0xE000) >> 0xD) != 0) { + Matrix_RotateX(DEGF_TO_RADF(-80), MTXMODE_APPLY); + if (this->actor.colChkInfo.health != 0) { + Matrix_Translate(0.0f, 0.0f, 200.0f, MTXMODE_APPLY); + } + func_8002EBCC(&this->actor, globalCtx, 0); + } else if (this->actionFunc == func_80B0E728) { + func_80B0EDB8(globalCtx, &sp30, 0x14, 0x1E); + } + + func_80093D18(globalCtx->state.gfxCtx); + SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnSw_OverrideLimbDraw, + EnSw_PostLimbDraw, this); + if (this->actionFunc == func_80B0E728) { + func_80B0EEA4(globalCtx); + } +} diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.h b/src/overlays/actors/ovl_En_Sw/z_en_sw.h index 2e83971bb7..3347be4b92 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.h +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h @@ -6,9 +6,47 @@ struct EnSw; +typedef void (*EnSwActionFunc)(struct EnSw* this, GlobalContext* globalCtx); + typedef struct EnSw { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x38C]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnSwActionFunc actionFunc; + /* 0x0194 */ ColliderJntSph collider; + /* 0x01B4 */ ColliderJntSphElement sphs[1]; + /* 0x01F4 */ Color_RGBA8 unk_1F4; + /* 0x01F8 */ Vec3s jointTable[30]; + /* 0x02AC */ Vec3s morphTable[30]; + /* 0x0360 */ u8 unk_360; + /* 0x0364 */ Vec3f unk_364; + /* 0x0370 */ Vec3f unk_370; + /* 0x037C */ Vec3f unk_37C; + /* 0x0388 */ s16 unk_388; + /* 0x038A */ s16 unk_38A; + /* 0x038C */ s16 unk_38C; + /* 0x038E */ s16 unk_38E; + /* 0x0390 */ s16 unk_390; + /* 0x0392 */ s16 unk_392; + /* 0x0394 */ s16 unk_394; + /* 0x0396 */ char unk_396[0x42]; + /* 0x03D8 */ MtxF unk_3D8; + /* 0x0418 */ char unk_418[8]; + /* 0x0420 */ f32 unk_420; + /* 0x0424 */ char unk_424[0x8]; + /* 0x042C */ u8 unk_42C; + /* 0x0430 */ CollisionPoly* unk_430; + /* 0x0434 */ Vec3f unk_434; + /* 0x0440 */ s16 unk_440; + /* 0x0442 */ s16 unk_442; + /* 0x0444 */ s16 unk_444; + /* 0x0446 */ s16 unk_446; + /* 0x0448 */ Vec3f unk_448; + /* 0x0454 */ Vec3f unk_454; + /* 0x0460 */ Vec3f unk_460; + /* 0x046C */ Vec3f unk_46C; + /* 0x0478 */ Vec3f unk_478; + /* 0x0484 */ Vec3f unk_484; + /* 0x0490 */ char unk_490[0x48]; } EnSw; // size = 0x04D8 extern const ActorInit En_Sw_InitVars;