diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Destroy.s deleted file mode 100644 index cbe31a9fe8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Destroy.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel EnSkb_Destroy -/* 0036C 80AFCD0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00370 80AFCD10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00374 80AFCD14 8C830118 */ lw $v1, 0x0118($a0) ## 00000118 -/* 00378 80AFCD18 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0037C 80AFCD1C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00380 80AFCD20 10600009 */ beq $v1, $zero, .L80AFCD48 -/* 00384 80AFCD24 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00388 80AFCD28 8C6E0130 */ lw $t6, 0x0130($v1) ## 00000130 -/* 0038C 80AFCD2C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 00390 80AFCD30 11C00005 */ beq $t6, $zero, .L80AFCD48 -/* 00394 80AFCD34 00000000 */ nop -/* 00398 80AFCD38 84630152 */ lh $v1, 0x0152($v1) ## 00000152 -/* 0039C 80AFCD3C 18600002 */ blez $v1, .L80AFCD48 -/* 003A0 80AFCD40 246FFFFF */ addiu $t7, $v1, 0xFFFF ## $t7 = FFFFFFFF -/* 003A4 80AFCD44 A44F0152 */ sh $t7, 0x0152($v0) ## 00000152 -.L80AFCD48: -/* 003A8 80AFCD48 0C016F32 */ jal Collider_DestroyJntSph -/* 003AC 80AFCD4C 24C502A4 */ addiu $a1, $a2, 0x02A4 ## $a1 = 000002A4 -/* 003B0 80AFCD50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003B4 80AFCD54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003B8 80AFCD58 03E00008 */ jr $ra -/* 003BC 80AFCD5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Draw.s deleted file mode 100644 index d2bf23dcc3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Draw.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel EnSkb_Draw -/* 0162C 80AFDFCC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01630 80AFDFD0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01634 80AFDFD4 AFA40020 */ sw $a0, 0x0020($sp) -/* 01638 80AFDFD8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0163C 80AFDFDC 0C024F46 */ jal func_80093D18 -/* 01640 80AFDFE0 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01644 80AFDFE4 8FA20020 */ lw $v0, 0x0020($sp) -/* 01648 80AFDFE8 3C0F80B0 */ lui $t7, %hi(func_80AFDF24) ## $t7 = 80B00000 -/* 0164C 80AFDFEC 25EFDF24 */ addiu $t7, $t7, %lo(func_80AFDF24) ## $t7 = 80AFDF24 -/* 01650 80AFDFF0 3C0780B0 */ lui $a3, %hi(func_80AFDD30) ## $a3 = 80B00000 -/* 01654 80AFDFF4 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 -/* 01658 80AFDFF8 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C -/* 0165C 80AFDFFC AFAF0010 */ sw $t7, 0x0010($sp) -/* 01660 80AFE000 24E7DD30 */ addiu $a3, $a3, %lo(func_80AFDD30) ## $a3 = 80AFDD30 -/* 01664 80AFE004 8FA40024 */ lw $a0, 0x0024($sp) -/* 01668 80AFE008 0C028572 */ jal SkelAnime_DrawOpa - -/* 0166C 80AFE00C AFA20014 */ sw $v0, 0x0014($sp) -/* 01670 80AFE010 8FBF001C */ lw $ra, 0x001C($sp) -/* 01674 80AFE014 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01678 80AFE018 03E00008 */ jr $ra -/* 0167C 80AFE01C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s deleted file mode 100644 index 732575175f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s +++ /dev/null @@ -1,122 +0,0 @@ -.late_rodata -glabel D_80AFE108 - .float 0.1 - -glabel D_80AFE10C - .float 0.01 - -.text -glabel EnSkb_Init -/* 001B8 80AFCB58 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 001BC 80AFCB5C AFA50044 */ sw $a1, 0x0044($sp) -/* 001C0 80AFCB60 AFBF002C */ sw $ra, 0x002C($sp) -/* 001C4 80AFCB64 AFB00028 */ sw $s0, 0x0028($sp) -/* 001C8 80AFCB68 3C0580B0 */ lui $a1, %hi(D_80AFE0D0) ## $a1 = 80B00000 -/* 001CC 80AFCB6C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001D0 80AFCB70 0C01E037 */ jal Actor_ProcessInitChain - -/* 001D4 80AFCB74 24A5E0D0 */ addiu $a1, $a1, %lo(D_80AFE0D0) ## $a1 = 80AFE0D0 -/* 001D8 80AFCB78 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 001DC 80AFCB7C 3C0E80B0 */ lui $t6, %hi(D_80AFE078) ## $t6 = 80B00000 -/* 001E0 80AFCB80 25CEE078 */ addiu $t6, $t6, %lo(D_80AFE078) ## $t6 = 80AFE078 -/* 001E4 80AFCB84 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 001E8 80AFCB88 44050000 */ mfc1 $a1, $f0 -/* 001EC 80AFCB8C 44070000 */ mfc1 $a3, $f0 -/* 001F0 80AFCB90 AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 -/* 001F4 80AFCB94 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 001F8 80AFCB98 0C00AC78 */ jal ActorShape_Init - -/* 001FC 80AFCB9C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00200 80AFCBA0 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 -/* 00204 80AFCBA4 8C580000 */ lw $t8, 0x0000($v0) ## 00000024 -/* 00208 80AFCBA8 3C01C5FA */ lui $at, 0xC5FA ## $at = C5FA0000 -/* 0020C 80AFCBAC 44812000 */ mtc1 $at, $f4 ## $f4 = -8000.00 -/* 00210 80AFCBB0 AE180038 */ sw $t8, 0x0038($s0) ## 00000038 -/* 00214 80AFCBB4 8C4F0004 */ lw $t7, 0x0004($v0) ## 00000028 -/* 00218 80AFCBB8 241900FE */ addiu $t9, $zero, 0x00FE ## $t9 = 000000FE -/* 0021C 80AFCBBC 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 00220 80AFCBC0 AE0F003C */ sw $t7, 0x003C($s0) ## 0000003C -/* 00224 80AFCBC4 8C580008 */ lw $t8, 0x0008($v0) ## 0000002C -/* 00228 80AFCBC8 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE -/* 0022C 80AFCBCC A20800AF */ sb $t0, 0x00AF($s0) ## 000000AF -/* 00230 80AFCBD0 E60400BC */ swc1 $f4, 0x00BC($s0) ## 000000BC -/* 00234 80AFCBD4 AE180040 */ sw $t8, 0x0040($s0) ## 00000040 -/* 00238 80AFCBD8 3C060600 */ lui $a2, %hi(D_060041F8) ## $a2 = 06000000 -/* 0023C 80AFCBDC 3C070600 */ lui $a3, %hi(D_06001854) ## $a3 = 06000000 -/* 00240 80AFCBE0 26090190 */ addiu $t1, $s0, 0x0190 ## $t1 = 00000190 -/* 00244 80AFCBE4 260A0208 */ addiu $t2, $s0, 0x0208 ## $t2 = 00000208 -/* 00248 80AFCBE8 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 0024C 80AFCBEC AFAB0018 */ sw $t3, 0x0018($sp) -/* 00250 80AFCBF0 AFAA0014 */ sw $t2, 0x0014($sp) -/* 00254 80AFCBF4 AFA90010 */ sw $t1, 0x0010($sp) -/* 00258 80AFCBF8 24E71854 */ addiu $a3, $a3, %lo(D_06001854) ## $a3 = 06001854 -/* 0025C 80AFCBFC 24C641F8 */ addiu $a2, $a2, %lo(D_060041F8) ## $a2 = 060041F8 -/* 00260 80AFCC00 AFA20034 */ sw $v0, 0x0034($sp) -/* 00264 80AFCC04 8FA40044 */ lw $a0, 0x0044($sp) -/* 00268 80AFCC08 0C02915F */ jal SkelAnime_Init - -/* 0026C 80AFCC0C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00270 80AFCC10 240C0055 */ addiu $t4, $zero, 0x0055 ## $t4 = 00000055 -/* 00274 80AFCC14 A20C0117 */ sb $t4, 0x0117($s0) ## 00000117 -/* 00278 80AFCC18 260502A4 */ addiu $a1, $s0, 0x02A4 ## $a1 = 000002A4 -/* 0027C 80AFCC1C AFA50030 */ sw $a1, 0x0030($sp) -/* 00280 80AFCC20 0C016EFE */ jal Collider_InitJntSph -/* 00284 80AFCC24 8FA40044 */ lw $a0, 0x0044($sp) -/* 00288 80AFCC28 3C0780B0 */ lui $a3, %hi(D_80AFE068) ## $a3 = 80B00000 -/* 0028C 80AFCC2C 260D02C4 */ addiu $t5, $s0, 0x02C4 ## $t5 = 000002C4 -/* 00290 80AFCC30 8FA50030 */ lw $a1, 0x0030($sp) -/* 00294 80AFCC34 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00298 80AFCC38 24E7E068 */ addiu $a3, $a3, %lo(D_80AFE068) ## $a3 = 80AFE068 -/* 0029C 80AFCC3C 8FA40044 */ lw $a0, 0x0044($sp) -/* 002A0 80AFCC40 0C017014 */ jal Collider_SetJntSph -/* 002A4 80AFCC44 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 002A8 80AFCC48 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 002AC 80AFCC4C 3C0180B0 */ lui $at, %hi(D_80AFE108) ## $at = 80B00000 -/* 002B0 80AFCC50 C42AE108 */ lwc1 $f10, %lo(D_80AFE108)($at) -/* 002B4 80AFCC54 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 002B8 80AFCC58 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 002BC 80AFCC5C 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 002C0 80AFCC60 46803220 */ cvt.s.w $f8, $f6 -/* 002C4 80AFCC64 3C0180B0 */ lui $at, %hi(D_80AFE10C) ## $at = 80B00000 -/* 002C8 80AFCC68 C426E10C */ lwc1 $f6, %lo(D_80AFE10C)($at) -/* 002CC 80AFCC6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002D0 80AFCC70 460A4402 */ mul.s $f16, $f8, $f10 -/* 002D4 80AFCC74 46128100 */ add.s $f4, $f16, $f18 -/* 002D8 80AFCC78 46062202 */ mul.s $f8, $f4, $f6 -/* 002DC 80AFCC7C 44054000 */ mfc1 $a1, $f8 -/* 002E0 80AFCC80 0C00B58B */ jal Actor_SetScale - -/* 002E4 80AFCC84 00000000 */ nop -/* 002E8 80AFCC88 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 002EC 80AFCC8C 8E0F02C0 */ lw $t7, 0x02C0($s0) ## 000002C0 -/* 002F0 80AFCC90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002F4 80AFCC94 2442000A */ addiu $v0, $v0, 0x000A ## $v0 = 0000000A -/* 002F8 80AFCC98 00021400 */ sll $v0, $v0, 16 -/* 002FC 80AFCC9C 00021403 */ sra $v0, $v0, 16 -/* 00300 80AFCCA0 A5E20036 */ sh $v0, 0x0036($t7) ## 00000036 -/* 00304 80AFCCA4 8E1802C0 */ lw $t8, 0x02C0($s0) ## 000002C0 -/* 00308 80AFCCA8 A702002E */ sh $v0, 0x002E($t8) ## 0000002E -/* 0030C 80AFCCAC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00310 80AFCCB0 8E1902C0 */ lw $t9, 0x02C0($s0) ## 000002C0 -/* 00314 80AFCCB4 00021040 */ sll $v0, $v0, 1 -/* 00318 80AFCCB8 24420014 */ addiu $v0, $v0, 0x0014 ## $v0 = 0000001E -/* 0031C 80AFCCBC 00021400 */ sll $v0, $v0, 16 -/* 00320 80AFCCC0 00021403 */ sra $v0, $v0, 16 -/* 00324 80AFCCC4 A7220076 */ sh $v0, 0x0076($t9) ## 00000076 -/* 00328 80AFCCC8 8E0802C0 */ lw $t0, 0x02C0($s0) ## 000002C0 -/* 0032C 80AFCCCC A502006E */ sh $v0, 0x006E($t0) ## 0000006E -/* 00330 80AFCCD0 8FA90034 */ lw $t1, 0x0034($sp) -/* 00334 80AFCCD4 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 00338 80AFCCD8 8D2B0000 */ lw $t3, 0x0000($t1) ## 00000000 -/* 0033C 80AFCCDC AE0B0008 */ sw $t3, 0x0008($s0) ## 00000008 -/* 00340 80AFCCE0 8D2A0004 */ lw $t2, 0x0004($t1) ## 00000004 -/* 00344 80AFCCE4 AE0A000C */ sw $t2, 0x000C($s0) ## 0000000C -/* 00348 80AFCCE8 8D2B0008 */ lw $t3, 0x0008($t1) ## 00000008 -/* 0034C 80AFCCEC E60A0080 */ swc1 $f10, 0x0080($s0) ## 00000080 -/* 00350 80AFCCF0 0C2BF37E */ jal func_80AFCDF8 -/* 00354 80AFCCF4 AE0B0010 */ sw $t3, 0x0010($s0) ## 00000010 -/* 00358 80AFCCF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0035C 80AFCCFC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00360 80AFCD00 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00364 80AFCD04 03E00008 */ jr $ra -/* 00368 80AFCD08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDF24.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_PostLimbDraw.s similarity index 99% rename from asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDF24.s rename to asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_PostLimbDraw.s index b46bcd2227..785ce21e34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDF24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_PostLimbDraw.s @@ -1,4 +1,4 @@ -glabel func_80AFDF24 +glabel EnSkb_PostLimbDraw /* 01584 80AFDF24 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01588 80AFDF28 AFA40028 */ sw $a0, 0x0028($sp) /* 0158C 80AFDF2C AFA5002C */ sw $a1, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Update.s deleted file mode 100644 index f9ef234c22..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Update.s +++ /dev/null @@ -1,85 +0,0 @@ -.late_rodata -glabel D_80AFE128 - .float 3000.0 - -.text -glabel EnSkb_Update -/* 01270 80AFDC10 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01274 80AFDC14 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01278 80AFDC18 AFB10020 */ sw $s1, 0x0020($sp) -/* 0127C 80AFDC1C AFB0001C */ sw $s0, 0x001C($sp) -/* 01280 80AFDC20 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01284 80AFDC24 0C2BF65A */ jal func_80AFD968 -/* 01288 80AFDC28 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0128C 80AFDC2C 0C00B638 */ jal Actor_MoveForward - -/* 01290 80AFDC30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01294 80AFDC34 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01298 80AFDC38 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 -/* 0129C 80AFDC3C 240E001D */ addiu $t6, $zero, 0x001D ## $t6 = 0000001D -/* 012A0 80AFDC40 AFAE0014 */ sw $t6, 0x0014($sp) -/* 012A4 80AFDC44 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 012A8 80AFDC48 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 012AC 80AFDC4C 3C064170 */ lui $a2, 0x4170 ## $a2 = 41700000 -/* 012B0 80AFDC50 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 012B4 80AFDC54 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 012B8 80AFDC58 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 012BC 80AFDC5C 8E190284 */ lw $t9, 0x0284($s0) ## 00000284 -/* 012C0 80AFDC60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012C4 80AFDC64 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 012C8 80AFDC68 0320F809 */ jalr $ra, $t9 -/* 012CC 80AFDC6C 00000000 */ nop -/* 012D0 80AFDC70 8E180024 */ lw $t8, 0x0024($s0) ## 00000024 -/* 012D4 80AFDC74 8E0F0028 */ lw $t7, 0x0028($s0) ## 00000028 -/* 012D8 80AFDC78 3C0180B0 */ lui $at, %hi(D_80AFE128) ## $at = 80B00000 -/* 012DC 80AFDC7C AE180038 */ sw $t8, 0x0038($s0) ## 00000038 -/* 012E0 80AFDC80 8E18002C */ lw $t8, 0x002C($s0) ## 0000002C -/* 012E4 80AFDC84 AE0F003C */ sw $t7, 0x003C($s0) ## 0000003C -/* 012E8 80AFDC88 C6080054 */ lwc1 $f8, 0x0054($s0) ## 00000054 -/* 012EC 80AFDC8C AE180040 */ sw $t8, 0x0040($s0) ## 00000040 -/* 012F0 80AFDC90 C426E128 */ lwc1 $f6, %lo(D_80AFE128)($at) -/* 012F4 80AFDC94 C610003C */ lwc1 $f16, 0x003C($s0) ## 0000003C -/* 012F8 80AFDC98 92080281 */ lbu $t0, 0x0281($s0) ## 00000281 -/* 012FC 80AFDC9C 46083282 */ mul.s $f10, $f6, $f8 -/* 01300 80AFDCA0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01304 80AFDCA4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01308 80AFDCA8 02212821 */ addu $a1, $s1, $at -/* 0130C 80AFDCAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01310 80AFDCB0 460A8480 */ add.s $f18, $f16, $f10 -/* 01314 80AFDCB4 11000003 */ beq $t0, $zero, .L80AFDCC4 -/* 01318 80AFDCB8 E612003C */ swc1 $f18, 0x003C($s0) ## 0000003C -/* 0131C 80AFDCBC 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 01320 80AFDCC0 260602A4 */ addiu $a2, $s0, 0x02A4 ## $a2 = 000002A4 -.L80AFDCC4: -/* 01324 80AFDCC4 92090280 */ lbu $t1, 0x0280($s0) ## 00000280 -/* 01328 80AFDCC8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0132C 80AFDCCC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01330 80AFDCD0 02212821 */ addu $a1, $s1, $at -/* 01334 80AFDCD4 29210003 */ slti $at, $t1, 0x0003 -/* 01338 80AFDCD8 1420000E */ bne $at, $zero, .L80AFDD14 -/* 0133C 80AFDCDC 260602A4 */ addiu $a2, $s0, 0x02A4 ## $a2 = 000002A4 -/* 01340 80AFDCE0 920A0114 */ lbu $t2, 0x0114($s0) ## 00000114 -/* 01344 80AFDCE4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01348 80AFDCE8 51400006 */ beql $t2, $zero, .L80AFDD04 -/* 0134C 80AFDCEC AFA5002C */ sw $a1, 0x002C($sp) -/* 01350 80AFDCF0 960B0112 */ lhu $t3, 0x0112($s0) ## 00000112 -/* 01354 80AFDCF4 316C4000 */ andi $t4, $t3, 0x4000 ## $t4 = 00000000 -/* 01358 80AFDCF8 15800006 */ bne $t4, $zero, .L80AFDD14 -/* 0135C 80AFDCFC 00000000 */ nop -/* 01360 80AFDD00 AFA5002C */ sw $a1, 0x002C($sp) -.L80AFDD04: -/* 01364 80AFDD04 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 01368 80AFDD08 AFA60028 */ sw $a2, 0x0028($sp) -/* 0136C 80AFDD0C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01370 80AFDD10 8FA60028 */ lw $a2, 0x0028($sp) -.L80AFDD14: -/* 01374 80AFDD14 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 01378 80AFDD18 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0137C 80AFDD1C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01380 80AFDD20 8FB0001C */ lw $s0, 0x001C($sp) -/* 01384 80AFDD24 8FB10020 */ lw $s1, 0x0020($sp) -/* 01388 80AFDD28 03E00008 */ jr $ra -/* 0138C 80AFDD2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A0.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A0.s deleted file mode 100644 index 202fb028cf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A0.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80AFC9A0 -/* 00000 80AFC9A0 03E00008 */ jr $ra -/* 00004 80AFC9A4 AC850284 */ sw $a1, 0x0284($a0) ## 00000284 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s deleted file mode 100644 index 5b071a003a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s +++ /dev/null @@ -1,122 +0,0 @@ -.late_rodata -glabel D_80AFE100 - .float 6.28 - -glabel D_80AFE104 - .float 0.8 - -.text -glabel func_80AFC9A8 -/* 00008 80AFC9A8 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 0000C 80AFC9AC 3C0F80B0 */ lui $t7, %hi(D_80AFE0B8) ## $t7 = 80B00000 -/* 00010 80AFC9B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00014 80AFC9B4 AFA40068 */ sw $a0, 0x0068($sp) -/* 00018 80AFC9B8 AFA5006C */ sw $a1, 0x006C($sp) -/* 0001C 80AFC9BC AFA60070 */ sw $a2, 0x0070($sp) -/* 00020 80AFC9C0 25EFE0B8 */ addiu $t7, $t7, %lo(D_80AFE0B8) ## $t7 = 80AFE0B8 -/* 00024 80AFC9C4 8DF90000 */ lw $t9, 0x0000($t7) ## 80AFE0B8 -/* 00028 80AFC9C8 27AE0050 */ addiu $t6, $sp, 0x0050 ## $t6 = FFFFFFE8 -/* 0002C 80AFC9CC 8DF80004 */ lw $t8, 0x0004($t7) ## 80AFE0BC -/* 00030 80AFC9D0 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFE8 -/* 00034 80AFC9D4 8DF90008 */ lw $t9, 0x0008($t7) ## 80AFE0C0 -/* 00038 80AFC9D8 3C0980B0 */ lui $t1, %hi(D_80AFE0C4) ## $t1 = 80B00000 -/* 0003C 80AFC9DC 2529E0C4 */ addiu $t1, $t1, %lo(D_80AFE0C4) ## $t1 = 80AFE0C4 -/* 00040 80AFC9E0 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFEC -/* 00044 80AFC9E4 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF0 -/* 00048 80AFC9E8 8D2B0000 */ lw $t3, 0x0000($t1) ## 80AFE0C4 -/* 0004C 80AFC9EC 27A80044 */ addiu $t0, $sp, 0x0044 ## $t0 = FFFFFFDC -/* 00050 80AFC9F0 8D2A0004 */ lw $t2, 0x0004($t1) ## 80AFE0C8 -/* 00054 80AFC9F4 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFDC -/* 00058 80AFC9F8 8D2B0008 */ lw $t3, 0x0008($t1) ## 80AFE0CC -/* 0005C 80AFC9FC AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFE0 -/* 00060 80AFCA00 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00064 80AFCA04 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE4 -/* 00068 80AFCA08 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0006C 80AFCA0C 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00070 80AFCA10 3C0180B0 */ lui $at, %hi(D_80AFE100) ## $at = 80B00000 -/* 00074 80AFCA14 C428E100 */ lwc1 $f8, %lo(D_80AFE100)($at) -/* 00078 80AFCA18 46040181 */ sub.s $f6, $f0, $f4 -/* 0007C 80AFCA1C 8FAC006C */ lw $t4, 0x006C($sp) -/* 00080 80AFCA20 46083302 */ mul.s $f12, $f6, $f8 -/* 00084 80AFCA24 E7AC0040 */ swc1 $f12, 0x0040($sp) -/* 00088 80AFCA28 C58A0080 */ lwc1 $f10, 0x0080($t4) ## 00000080 -/* 0008C 80AFCA2C 0C0329C8 */ jal Math_SinF -/* 00090 80AFCA30 E7AA0060 */ swc1 $f10, 0x0060($sp) -/* 00094 80AFCA34 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00098 80AFCA38 44818000 */ mtc1 $at, $f16 ## $f16 = 15.00 -/* 0009C 80AFCA3C 8FAD0070 */ lw $t5, 0x0070($sp) -/* 000A0 80AFCA40 C7AC0040 */ lwc1 $f12, 0x0040($sp) -/* 000A4 80AFCA44 46100482 */ mul.s $f18, $f0, $f16 -/* 000A8 80AFCA48 C5A40000 */ lwc1 $f4, 0x0000($t5) ## 00000000 -/* 000AC 80AFCA4C 46049180 */ add.s $f6, $f18, $f4 -/* 000B0 80AFCA50 0C0329DD */ jal Math_CosF -/* 000B4 80AFCA54 E7A6005C */ swc1 $f6, 0x005C($sp) -/* 000B8 80AFCA58 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 000BC 80AFCA5C 44814000 */ mtc1 $at, $f8 ## $f8 = 15.00 -/* 000C0 80AFCA60 8FAE0070 */ lw $t6, 0x0070($sp) -/* 000C4 80AFCA64 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 000C8 80AFCA68 46080282 */ mul.s $f10, $f0, $f8 -/* 000CC 80AFCA6C C5D00008 */ lwc1 $f16, 0x0008($t6) ## 00000008 -/* 000D0 80AFCA70 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 000D4 80AFCA74 46105480 */ add.s $f18, $f10, $f16 -/* 000D8 80AFCA78 0C00CFC8 */ jal Rand_CenteredFloat - -/* 000DC 80AFCA7C E7B20064 */ swc1 $f18, 0x0064($sp) -/* 000E0 80AFCA80 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 000E4 80AFCA84 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 000E8 80AFCA88 0C00CFC8 */ jal Rand_CenteredFloat - -/* 000EC 80AFCA8C E7A00044 */ swc1 $f0, 0x0044($sp) -/* 000F0 80AFCA90 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 000F4 80AFCA94 E7A0004C */ swc1 $f0, 0x004C($sp) -/* 000F8 80AFCA98 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 000FC 80AFCA9C 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00100 80AFCAA0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00104 80AFCAA4 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 00108 80AFCAA8 46040181 */ sub.s $f6, $f0, $f4 -/* 0010C 80AFCAAC C7B00054 */ lwc1 $f16, 0x0054($sp) -/* 00110 80AFCAB0 46083282 */ mul.s $f10, $f6, $f8 -/* 00114 80AFCAB4 460A8480 */ add.s $f18, $f16, $f10 -/* 00118 80AFCAB8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0011C 80AFCABC E7B20054 */ swc1 $f18, 0x0054($sp) -/* 00120 80AFCAC0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00124 80AFCAC4 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 00128 80AFCAC8 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 0012C 80AFCACC 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 -/* 00130 80AFCAD0 46040182 */ mul.s $f6, $f0, $f4 -/* 00134 80AFCAD4 3C0180B0 */ lui $at, %hi(D_80AFE104) ## $at = 80B00000 -/* 00138 80AFCAD8 C42AE104 */ lwc1 $f10, %lo(D_80AFE104)($at) -/* 0013C 80AFCADC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00140 80AFCAE0 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 00144 80AFCAE4 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 00148 80AFCAE8 AFA9001C */ sw $t1, 0x001C($sp) -/* 0014C 80AFCAEC 46083400 */ add.s $f16, $f6, $f8 -/* 00150 80AFCAF0 AFA80018 */ sw $t0, 0x0018($sp) -/* 00154 80AFCAF4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00158 80AFCAF8 8FA40068 */ lw $a0, 0x0068($sp) -/* 0015C 80AFCAFC 460A8482 */ mul.s $f18, $f16, $f10 -/* 00160 80AFCB00 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFFF4 -/* 00164 80AFCB04 27A60050 */ addiu $a2, $sp, 0x0050 ## $a2 = FFFFFFE8 -/* 00168 80AFCB08 27A70044 */ addiu $a3, $sp, 0x0044 ## $a3 = FFFFFFDC -/* 0016C 80AFCB0C AFA00020 */ sw $zero, 0x0020($sp) -/* 00170 80AFCB10 4600910D */ trunc.w.s $f4, $f18 -/* 00174 80AFCB14 44192000 */ mfc1 $t9, $f4 -/* 00178 80AFCB18 0C00A5C9 */ jal EffectSsHahen_Spawn -/* 0017C 80AFCB1C AFB90014 */ sw $t9, 0x0014($sp) -/* 00180 80AFCB20 240A0096 */ addiu $t2, $zero, 0x0096 ## $t2 = 00000096 -/* 00184 80AFCB24 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00188 80AFCB28 AFAB0018 */ sw $t3, 0x0018($sp) -/* 0018C 80AFCB2C AFAA0010 */ sw $t2, 0x0010($sp) -/* 00190 80AFCB30 8FA40068 */ lw $a0, 0x0068($sp) -/* 00194 80AFCB34 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFFF4 -/* 00198 80AFCB38 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 0019C 80AFCB3C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 001A0 80AFCB40 0C00CD20 */ jal func_80033480 -/* 001A4 80AFCB44 AFA00014 */ sw $zero, 0x0014($sp) -/* 001A8 80AFCB48 8FBF002C */ lw $ra, 0x002C($sp) -/* 001AC 80AFCB4C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 001B0 80AFCB50 03E00008 */ jr $ra -/* 001B4 80AFCB54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCD60.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCD60.s deleted file mode 100644 index 26f4a11760..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCD60.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AFCD60 -/* 003C0 80AFCD60 3C0E8016 */ lui $t6, %hi(gSaveContext+0x10) -/* 003C4 80AFCD64 8DCEE670 */ lw $t6, %lo(gSaveContext+0x10)($t6) -/* 003C8 80AFCD68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003CC 80AFCD6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 003D0 80AFCD70 15C00005 */ bne $t6, $zero, .L80AFCD88 -/* 003D4 80AFCD74 240511C7 */ addiu $a1, $zero, 0x11C7 ## $a1 = 000011C7 -/* 003D8 80AFCD78 0C2BF3D2 */ jal func_80AFCF48 -/* 003DC 80AFCD7C 00000000 */ nop -/* 003E0 80AFCD80 1000001A */ beq $zero, $zero, .L80AFCDEC -/* 003E4 80AFCD84 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AFCD88: -/* 003E8 80AFCD88 0C00B821 */ jal func_8002E084 -/* 003EC 80AFCD8C AFA40018 */ sw $a0, 0x0018($sp) -/* 003F0 80AFCD90 10400013 */ beq $v0, $zero, .L80AFCDE0 -/* 003F4 80AFCD94 8FA40018 */ lw $a0, 0x0018($sp) -/* 003F8 80AFCD98 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 003FC 80AFCD9C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00400 80AFCDA0 44815000 */ mtc1 $at, $f10 ## $f10 = 6.00 -/* 00404 80AFCDA4 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 00408 80AFCDA8 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 0040C 80AFCDAC 44819000 */ mtc1 $at, $f18 ## $f18 = 60.00 -/* 00410 80AFCDB0 46803220 */ cvt.s.w $f8, $f6 -/* 00414 80AFCDB4 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00418 80AFCDB8 460A4402 */ mul.s $f16, $f8, $f10 -/* 0041C 80AFCDBC 46109180 */ add.s $f6, $f18, $f16 -/* 00420 80AFCDC0 4606203C */ c.lt.s $f4, $f6 -/* 00424 80AFCDC4 00000000 */ nop -/* 00428 80AFCDC8 45000005 */ bc1f .L80AFCDE0 -/* 0042C 80AFCDCC 00000000 */ nop -/* 00430 80AFCDD0 0C2BF4CF */ jal func_80AFD33C -/* 00434 80AFCDD4 00000000 */ nop -/* 00438 80AFCDD8 10000004 */ beq $zero, $zero, .L80AFCDEC -/* 0043C 80AFCDDC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AFCDE0: -/* 00440 80AFCDE0 0C2BF429 */ jal func_80AFD0A4 -/* 00444 80AFCDE4 00000000 */ nop -/* 00448 80AFCDE8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AFCDEC: -/* 0044C 80AFCDEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00450 80AFCDF0 03E00008 */ jr $ra -/* 00454 80AFCDF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s deleted file mode 100644 index 0da8291aa0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80AFCDF8 -/* 00458 80AFCDF8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0045C 80AFCDFC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00460 80AFCE00 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00464 80AFCE04 3C050600 */ lui $a1, %hi(D_06001854) ## $a1 = 06000000 -/* 00468 80AFCE08 24A51854 */ addiu $a1, $a1, %lo(D_06001854) ## $a1 = 06001854 -/* 0046C 80AFCE0C AFA70018 */ sw $a3, 0x0018($sp) -/* 00470 80AFCE10 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00474 80AFCE14 0C0294A7 */ jal Animation_PlayOnceSetSpeed -/* 00478 80AFCE18 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0047C 80AFCE1C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00480 80AFCE20 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00484 80AFCE24 24053986 */ addiu $a1, $zero, 0x3986 ## $a1 = 00003986 -/* 00488 80AFCE28 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 0048C 80AFCE2C A0800280 */ sb $zero, 0x0280($a0) ## 00000280 -/* 00490 80AFCE30 01C17824 */ and $t7, $t6, $at -/* 00494 80AFCE34 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00498 80AFCE38 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 0049C 80AFCE3C 3C0580B0 */ lui $a1, %hi(func_80AFCE5C) ## $a1 = 80B00000 -/* 004A0 80AFCE40 8FA40018 */ lw $a0, 0x0018($sp) -/* 004A4 80AFCE44 0C2BF268 */ jal func_80AFC9A0 -/* 004A8 80AFCE48 24A5CE5C */ addiu $a1, $a1, %lo(func_80AFCE5C) ## $a1 = 80AFCE5C -/* 004AC 80AFCE4C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004B0 80AFCE50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004B4 80AFCE54 03E00008 */ jr $ra -/* 004B8 80AFCE58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCE5C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCE5C.s deleted file mode 100644 index aa43166c0d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCE5C.s +++ /dev/null @@ -1,67 +0,0 @@ -glabel func_80AFCE5C -/* 004BC 80AFCE5C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 004C0 80AFCE60 AFBF0024 */ sw $ra, 0x0024($sp) -/* 004C4 80AFCE64 AFB00020 */ sw $s0, 0x0020($sp) -/* 004C8 80AFCE68 AFA5002C */ sw $a1, 0x002C($sp) -/* 004CC 80AFCE6C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 004D0 80AFCE70 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 -/* 004D4 80AFCE74 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 004D8 80AFCE78 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 004DC 80AFCE7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004E0 80AFCE80 4606203C */ c.lt.s $f4, $f6 -/* 004E4 80AFCE84 44050000 */ mfc1 $a1, $f0 -/* 004E8 80AFCE88 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 004EC 80AFCE8C 3C074448 */ lui $a3, 0x4448 ## $a3 = 44480000 -/* 004F0 80AFCE90 45020006 */ bc1fl .L80AFCEAC -/* 004F4 80AFCE94 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 004F8 80AFCE98 8482008A */ lh $v0, 0x008A($a0) ## 0000008A -/* 004FC 80AFCE9C A4820032 */ sh $v0, 0x0032($a0) ## 00000032 -/* 00500 80AFCEA0 10000004 */ beq $zero, $zero, .L80AFCEB4 -/* 00504 80AFCEA4 A48200B6 */ sh $v0, 0x00B6($a0) ## 000000B6 -/* 00508 80AFCEA8 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -.L80AFCEAC: -/* 0050C 80AFCEAC 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00510 80AFCEB0 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -.L80AFCEB4: -/* 00514 80AFCEB4 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 00518 80AFCEB8 0C01E0C4 */ jal Math_SmoothStepToF - -/* 0051C 80AFCEBC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00520 80AFCEC0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00524 80AFCEC4 260400C4 */ addiu $a0, $s0, 0x00C4 ## $a0 = 000000C4 -/* 00528 80AFCEC8 3C0541C8 */ lui $a1, 0x41C8 ## $a1 = 41C80000 -/* 0052C 80AFCECC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00530 80AFCED0 3C074020 */ lui $a3, 0x4020 ## $a3 = 40200000 -/* 00534 80AFCED4 0C01E0C4 */ jal Math_SmoothStepToF - -/* 00538 80AFCED8 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 0053C 80AFCEDC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00540 80AFCEE0 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 00544 80AFCEE4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00548 80AFCEE8 0304C021 */ addu $t8, $t8, $a0 -/* 0054C 80AFCEEC 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 -/* 00550 80AFCEF0 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 00554 80AFCEF4 13200003 */ beq $t9, $zero, .L80AFCF04 -/* 00558 80AFCEF8 00000000 */ nop -/* 0055C 80AFCEFC 0C2BF26A */ jal func_80AFC9A8 -/* 00560 80AFCF00 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -.L80AFCF04: -/* 00564 80AFCF04 0C02927F */ jal SkelAnime_Update - -/* 00568 80AFCF08 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0056C 80AFCF0C 5040000A */ beql $v0, $zero, .L80AFCF38 -/* 00570 80AFCF10 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00574 80AFCF14 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00578 80AFCF18 C61000BC */ lwc1 $f16, 0x00BC($s0) ## 000000BC -/* 0057C 80AFCF1C 46105032 */ c.eq.s $f10, $f16 -/* 00580 80AFCF20 00000000 */ nop -/* 00584 80AFCF24 45020004 */ bc1fl .L80AFCF38 -/* 00588 80AFCF28 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0058C 80AFCF2C 0C2BF358 */ jal func_80AFCD60 -/* 00590 80AFCF30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00594 80AFCF34 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AFCF38: -/* 00598 80AFCF38 8FB00020 */ lw $s0, 0x0020($sp) -/* 0059C 80AFCF3C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 005A0 80AFCF40 03E00008 */ jr $ra -/* 005A4 80AFCF44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s deleted file mode 100644 index ae63fbf601..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80AFCF48 -/* 005A8 80AFCF48 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 005AC 80AFCF4C AFB00028 */ sw $s0, 0x0028($sp) -/* 005B0 80AFCF50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005B4 80AFCF54 AFBF002C */ sw $ra, 0x002C($sp) -/* 005B8 80AFCF58 3C040600 */ lui $a0, %hi(D_06001854) ## $a0 = 06000000 -/* 005BC 80AFCF5C 0C028800 */ jal Animation_GetLastFrame - -/* 005C0 80AFCF60 24841854 */ addiu $a0, $a0, %lo(D_06001854) ## $a0 = 06001854 -/* 005C4 80AFCF64 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 005C8 80AFCF68 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 005CC 80AFCF6C 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 005D0 80AFCF70 46802120 */ cvt.s.w $f4, $f4 -/* 005D4 80AFCF74 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 005D8 80AFCF78 3C050600 */ lui $a1, %hi(D_06001854) ## $a1 = 06000000 -/* 005DC 80AFCF7C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 005E0 80AFCF80 AFAE0014 */ sw $t6, 0x0014($sp) -/* 005E4 80AFCF84 24A51854 */ addiu $a1, $a1, %lo(D_06001854) ## $a1 = 06001854 -/* 005E8 80AFCF88 44072000 */ mfc1 $a3, $f4 -/* 005EC 80AFCF8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 005F0 80AFCF90 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 005F4 80AFCF94 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 005F8 80AFCF98 0C029468 */ jal Animation_Change - -/* 005FC 80AFCF9C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00600 80AFCFA0 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 00604 80AFCFA4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00608 80AFCFA8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0060C 80AFCFAC 01E1C024 */ and $t8, $t7, $at -/* 00610 80AFCFB0 A2000280 */ sb $zero, 0x0280($s0) ## 00000280 -/* 00614 80AFCFB4 A2000281 */ sb $zero, 0x0281($s0) ## 00000281 -/* 00618 80AFCFB8 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -/* 0061C 80AFCFBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00620 80AFCFC0 24053987 */ addiu $a1, $zero, 0x3987 ## $a1 = 00003987 -/* 00624 80AFCFC4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00628 80AFCFC8 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 0062C 80AFCFCC 3C0580B0 */ lui $a1, %hi(func_80AFCFF0) ## $a1 = 80B00000 -/* 00630 80AFCFD0 24A5CFF0 */ addiu $a1, $a1, %lo(func_80AFCFF0) ## $a1 = 80AFCFF0 -/* 00634 80AFCFD4 0C2BF268 */ jal func_80AFC9A0 -/* 00638 80AFCFD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0063C 80AFCFDC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00640 80AFCFE0 8FB00028 */ lw $s0, 0x0028($sp) -/* 00644 80AFCFE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00648 80AFCFE8 03E00008 */ jr $ra -/* 0064C 80AFCFEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCFF0.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCFF0.s deleted file mode 100644 index 9318bd0fc1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCFF0.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80AFCFF0 -/* 00650 80AFCFF0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00654 80AFCFF4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00658 80AFCFF8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0065C 80AFCFFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00660 80AFD000 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00664 80AFD004 AFA5002C */ sw $a1, 0x002C($sp) -/* 00668 80AFD008 3C05C5FA */ lui $a1, 0xC5FA ## $a1 = C5FA0000 -/* 0066C 80AFD00C 248400BC */ addiu $a0, $a0, 0x00BC ## $a0 = 000000BC -/* 00670 80AFD010 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00674 80AFD014 3C0743FA */ lui $a3, 0x43FA ## $a3 = 43FA0000 -/* 00678 80AFD018 0C01E0C4 */ jal Math_SmoothStepToF - -/* 0067C 80AFD01C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00680 80AFD020 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00684 80AFD024 8FA4002C */ lw $a0, 0x002C($sp) -/* 00688 80AFD028 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 0068C 80AFD02C 46020032 */ c.eq.s $f0, $f2 -/* 00690 80AFD030 01C47021 */ addu $t6, $t6, $a0 -/* 00694 80AFD034 4503000B */ bc1tl .L80AFD064 -/* 00698 80AFD038 44051000 */ mfc1 $a1, $f2 -/* 0069C 80AFD03C 8DCE1DE4 */ lw $t6, 0x1DE4($t6) ## 00011DE4 -/* 006A0 80AFD040 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 006A4 80AFD044 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 006A8 80AFD048 51E00006 */ beql $t7, $zero, .L80AFD064 -/* 006AC 80AFD04C 44051000 */ mfc1 $a1, $f2 -/* 006B0 80AFD050 0C2BF26A */ jal func_80AFC9A8 -/* 006B4 80AFD054 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 006B8 80AFD058 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 006BC 80AFD05C 00000000 */ nop -/* 006C0 80AFD060 44051000 */ mfc1 $a1, $f2 -.L80AFD064: -/* 006C4 80AFD064 260400C4 */ addiu $a0, $s0, 0x00C4 ## $a0 = 000000C4 -/* 006C8 80AFD068 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006CC 80AFD06C 3C074020 */ lui $a3, 0x4020 ## $a3 = 40200000 -/* 006D0 80AFD070 0C01E0C4 */ jal Math_SmoothStepToF - -/* 006D4 80AFD074 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 006D8 80AFD078 0C02927F */ jal SkelAnime_Update - -/* 006DC 80AFD07C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 006E0 80AFD080 50400004 */ beql $v0, $zero, .L80AFD094 -/* 006E4 80AFD084 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006E8 80AFD088 0C00B55C */ jal Actor_Kill - -/* 006EC 80AFD08C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006F0 80AFD090 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AFD094: -/* 006F4 80AFD094 8FB00020 */ lw $s0, 0x0020($sp) -/* 006F8 80AFD098 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006FC 80AFD09C 03E00008 */ jr $ra -/* 00700 80AFD0A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s deleted file mode 100644 index 99a2840e04..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80AFD0A4 -/* 00704 80AFD0A4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00708 80AFD0A8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0070C 80AFD0AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00710 80AFD0B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00714 80AFD0B4 3C040600 */ lui $a0, %hi(D_060047E0) ## $a0 = 06000000 -/* 00718 80AFD0B8 0C028800 */ jal Animation_GetLastFrame - -/* 0071C 80AFD0BC 248447E0 */ addiu $a0, $a0, %lo(D_060047E0) ## $a0 = 060047E0 -/* 00720 80AFD0C0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00724 80AFD0C4 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00728 80AFD0C8 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 0072C 80AFD0CC 468021A0 */ cvt.s.w $f6, $f4 -/* 00730 80AFD0D0 3C050600 */ lui $a1, %hi(D_060047E0) ## $a1 = 06000000 -/* 00734 80AFD0D4 3C063F75 */ lui $a2, 0x3F75 ## $a2 = 3F750000 -/* 00738 80AFD0D8 34C6C290 */ ori $a2, $a2, 0xC290 ## $a2 = 3F75C290 -/* 0073C 80AFD0DC 24A547E0 */ addiu $a1, $a1, %lo(D_060047E0) ## $a1 = 060047E0 -/* 00740 80AFD0E0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00744 80AFD0E4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00748 80AFD0E8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0074C 80AFD0EC AFA00014 */ sw $zero, 0x0014($sp) -/* 00750 80AFD0F0 0C029468 */ jal Animation_Change - -/* 00754 80AFD0F4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00758 80AFD0F8 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 0075C 80AFD0FC 44818000 */ mtc1 $at, $f16 ## $f16 = 160.00 -/* 00760 80AFD100 C60A0054 */ lwc1 $f10, 0x0054($s0) ## 00000054 -/* 00764 80AFD104 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00768 80AFD108 3C0580B0 */ lui $a1, %hi(func_80AFD13C) ## $a1 = 80B00000 -/* 0076C 80AFD10C 46105482 */ mul.s $f18, $f10, $f16 -/* 00770 80AFD110 A20E0280 */ sb $t6, 0x0280($s0) ## 00000280 -/* 00774 80AFD114 A6000288 */ sh $zero, 0x0288($s0) ## 00000288 -/* 00778 80AFD118 24A5D13C */ addiu $a1, $a1, %lo(func_80AFD13C) ## $a1 = 80AFD13C -/* 0077C 80AFD11C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00780 80AFD120 0C2BF268 */ jal func_80AFC9A0 -/* 00784 80AFD124 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 00788 80AFD128 8FBF002C */ lw $ra, 0x002C($sp) -/* 0078C 80AFD12C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00790 80AFD130 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00794 80AFD134 03E00008 */ jr $ra -/* 00798 80AFD138 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s deleted file mode 100644 index de4f2d8ee3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s +++ /dev/null @@ -1,149 +0,0 @@ -.late_rodata -glabel D_80AFE110 - .word 0x47435000 - -.text -glabel func_80AFD13C -/* 0079C 80AFD13C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 007A0 80AFD140 AFBF0024 */ sw $ra, 0x0024($sp) -/* 007A4 80AFD144 AFB00020 */ sw $s0, 0x0020($sp) -/* 007A8 80AFD148 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 007AC 80AFD14C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 007B0 80AFD150 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 007B4 80AFD154 AFAE0028 */ sw $t6, 0x0028($sp) -/* 007B8 80AFD158 908F0283 */ lbu $t7, 0x0283($a0) ## 00000283 -/* 007BC 80AFD15C 0305C021 */ addu $t8, $t8, $a1 -/* 007C0 80AFD160 51E0000D */ beql $t7, $zero, .L80AFD198 -/* 007C4 80AFD164 860A008A */ lh $t2, 0x008A($s0) ## 0000008A -/* 007C8 80AFD168 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 -/* 007CC 80AFD16C 3C0180B0 */ lui $at, %hi(D_80AFE110) ## $at = 80B00000 -/* 007D0 80AFD170 3319000F */ andi $t9, $t8, 0x000F ## $t9 = 00000000 -/* 007D4 80AFD174 57200008 */ bnel $t9, $zero, .L80AFD198 -/* 007D8 80AFD178 860A008A */ lh $t2, 0x008A($s0) ## 0000008A -/* 007DC 80AFD17C 0C00CFC8 */ jal Rand_CenteredFloat - -/* 007E0 80AFD180 C42CE110 */ lwc1 $f12, %lo(D_80AFE110)($at) -/* 007E4 80AFD184 4600010D */ trunc.w.s $f4, $f0 -/* 007E8 80AFD188 44092000 */ mfc1 $t1, $f4 -/* 007EC 80AFD18C 00000000 */ nop -/* 007F0 80AFD190 A6090288 */ sh $t1, 0x0288($s0) ## 00000288 -/* 007F4 80AFD194 860A008A */ lh $t2, 0x008A($s0) ## 0000008A -.L80AFD198: -/* 007F8 80AFD198 860B0288 */ lh $t3, 0x0288($s0) ## 00000288 -/* 007FC 80AFD19C AFA00010 */ sw $zero, 0x0010($sp) -/* 00800 80AFD1A0 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00804 80AFD1A4 014B2821 */ addu $a1, $t2, $t3 -/* 00808 80AFD1A8 00052C00 */ sll $a1, $a1, 16 -/* 0080C 80AFD1AC 00052C03 */ sra $a1, $a1, 16 -/* 00810 80AFD1B0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00814 80AFD1B4 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00818 80AFD1B8 240702EE */ addiu $a3, $zero, 0x02EE ## $a3 = 000002EE -/* 0081C 80AFD1BC C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 -/* 00820 80AFD1C0 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 00824 80AFD1C4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00828 80AFD1C8 4600320D */ trunc.w.s $f8, $f6 -/* 0082C 80AFD1CC A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 -/* 00830 80AFD1D0 44034000 */ mfc1 $v1, $f8 -/* 00834 80AFD1D4 0C02927F */ jal SkelAnime_Update - -/* 00838 80AFD1D8 AFA30034 */ sw $v1, 0x0034($sp) -/* 0083C 80AFD1DC 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 00840 80AFD1E0 C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 -/* 00844 80AFD1E4 8FA30034 */ lw $v1, 0x0034($sp) -/* 00848 80AFD1E8 4600703E */ c.le.s $f14, $f0 -/* 0084C 80AFD1EC 00000000 */ nop -/* 00850 80AFD1F0 45020004 */ bc1fl .L80AFD204 -/* 00854 80AFD1F4 46000087 */ neg.s $f2, $f0 -/* 00858 80AFD1F8 10000002 */ beq $zero, $zero, .L80AFD204 -/* 0085C 80AFD1FC 46000086 */ mov.s $f2, $f0 -/* 00860 80AFD200 46000087 */ neg.s $f2, $f0 -.L80AFD204: -/* 00864 80AFD204 C60C0164 */ lwc1 $f12, 0x0164($s0) ## 00000164 -/* 00868 80AFD208 4600703E */ c.le.s $f14, $f0 -/* 0086C 80AFD20C 46026281 */ sub.s $f10, $f12, $f2 -/* 00870 80AFD210 4600648D */ trunc.w.s $f18, $f12 -/* 00874 80AFD214 4600540D */ trunc.w.s $f16, $f10 -/* 00878 80AFD218 44189000 */ mfc1 $t8, $f18 -/* 0087C 80AFD21C 44028000 */ mfc1 $v0, $f16 -/* 00880 80AFD220 45020004 */ bc1fl .L80AFD234 -/* 00884 80AFD224 46000087 */ neg.s $f2, $f0 -/* 00888 80AFD228 10000002 */ beq $zero, $zero, .L80AFD234 -/* 0088C 80AFD22C 46000086 */ mov.s $f2, $f0 -/* 00890 80AFD230 46000087 */ neg.s $f2, $f0 -.L80AFD234: -/* 00894 80AFD234 10780015 */ beq $v1, $t8, .L80AFD28C -/* 00898 80AFD238 28410009 */ slti $at, $v0, 0x0009 -/* 0089C 80AFD23C 50200008 */ beql $at, $zero, .L80AFD260 -/* 008A0 80AFD240 28410010 */ slti $at, $v0, 0x0010 -/* 008A4 80AFD244 4600110D */ trunc.w.s $f4, $f2 -/* 008A8 80AFD248 44082000 */ mfc1 $t0, $f4 -/* 008AC 80AFD24C 00000000 */ nop -/* 008B0 80AFD250 01034821 */ addu $t1, $t0, $v1 -/* 008B4 80AFD254 29210008 */ slti $at, $t1, 0x0008 -/* 008B8 80AFD258 10200009 */ beq $at, $zero, .L80AFD280 -/* 008BC 80AFD25C 28410010 */ slti $at, $v0, 0x0010 -.L80AFD260: -/* 008C0 80AFD260 5020000B */ beql $at, $zero, .L80AFD290 -/* 008C4 80AFD264 8FA50028 */ lw $a1, 0x0028($sp) -/* 008C8 80AFD268 4600118D */ trunc.w.s $f6, $f2 -/* 008CC 80AFD26C 440B3000 */ mfc1 $t3, $f6 -/* 008D0 80AFD270 00000000 */ nop -/* 008D4 80AFD274 01636021 */ addu $t4, $t3, $v1 -/* 008D8 80AFD278 2981000F */ slti $at, $t4, 0x000F -/* 008DC 80AFD27C 14200003 */ bne $at, $zero, .L80AFD28C -.L80AFD280: -/* 008E0 80AFD280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008E4 80AFD284 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 008E8 80AFD288 24053830 */ addiu $a1, $zero, 0x3830 ## $a1 = 00003830 -.L80AFD28C: -/* 008EC 80AFD28C 8FA50028 */ lw $a1, 0x0028($sp) -.L80AFD290: -/* 008F0 80AFD290 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 -/* 008F4 80AFD294 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 008F8 80AFD298 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 008FC 80AFD29C 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 00900 80AFD2A0 44814000 */ mtc1 $at, $f8 ## $f8 = 800.00 -/* 00904 80AFD2A4 3C0D8016 */ lui $t5, %hi(gSaveContext+0x10) -/* 00908 80AFD2A8 4600403C */ c.lt.s $f8, $f0 -/* 0090C 80AFD2AC 00000000 */ nop -/* 00910 80AFD2B0 45010005 */ bc1t .L80AFD2C8 -/* 00914 80AFD2B4 00000000 */ nop -/* 00918 80AFD2B8 8DADE670 */ lw $t5, %lo(gSaveContext+0x10)($t5) -/* 0091C 80AFD2BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00920 80AFD2C0 15A00005 */ bne $t5, $zero, .L80AFD2D8 -/* 00924 80AFD2C4 00000000 */ nop -.L80AFD2C8: -/* 00928 80AFD2C8 0C2BF3D2 */ jal func_80AFCF48 -/* 0092C 80AFD2CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00930 80AFD2D0 10000016 */ beq $zero, $zero, .L80AFD32C -/* 00934 80AFD2D4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AFD2D8: -/* 00938 80AFD2D8 0C00B821 */ jal func_8002E084 -/* 0093C 80AFD2DC 240511C7 */ addiu $a1, $zero, 0x11C7 ## $a1 = 000011C7 -/* 00940 80AFD2E0 50400012 */ beql $v0, $zero, .L80AFD32C -/* 00944 80AFD2E4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00948 80AFD2E8 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 0094C 80AFD2EC 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00950 80AFD2F0 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 00954 80AFD2F4 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 00958 80AFD2F8 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 0095C 80AFD2FC 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 00960 80AFD300 468084A0 */ cvt.s.w $f18, $f16 -/* 00964 80AFD304 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 -/* 00968 80AFD308 46049182 */ mul.s $f6, $f18, $f4 -/* 0096C 80AFD30C 46064400 */ add.s $f16, $f8, $f6 -/* 00970 80AFD310 4610503C */ c.lt.s $f10, $f16 -/* 00974 80AFD314 00000000 */ nop -/* 00978 80AFD318 45020004 */ bc1fl .L80AFD32C -/* 0097C 80AFD31C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00980 80AFD320 0C2BF4CF */ jal func_80AFD33C -/* 00984 80AFD324 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00988 80AFD328 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AFD32C: -/* 0098C 80AFD32C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00990 80AFD330 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00994 80AFD334 03E00008 */ jr $ra -/* 00998 80AFD338 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s deleted file mode 100644 index f633794c03..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80AFD33C -/* 0099C 80AFD33C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 009A0 80AFD340 AFB00028 */ sw $s0, 0x0028($sp) -/* 009A4 80AFD344 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009A8 80AFD348 AFBF002C */ sw $ra, 0x002C($sp) -/* 009AC 80AFD34C 3C040600 */ lui $a0, %hi(D_06000460) ## $a0 = 06000000 -/* 009B0 80AFD350 0C028800 */ jal Animation_GetLastFrame - -/* 009B4 80AFD354 24840460 */ addiu $a0, $a0, %lo(D_06000460) ## $a0 = 06000460 -/* 009B8 80AFD358 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 009BC 80AFD35C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 009C0 80AFD360 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 009C4 80AFD364 468021A0 */ cvt.s.w $f6, $f4 -/* 009C8 80AFD368 3C050600 */ lui $a1, %hi(D_06000460) ## $a1 = 06000000 -/* 009CC 80AFD36C 3C063F19 */ lui $a2, 0x3F19 ## $a2 = 3F190000 -/* 009D0 80AFD370 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 009D4 80AFD374 AFAE0014 */ sw $t6, 0x0014($sp) -/* 009D8 80AFD378 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3F19999A -/* 009DC 80AFD37C 24A50460 */ addiu $a1, $a1, %lo(D_06000460) ## $a1 = 06000460 -/* 009E0 80AFD380 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 009E4 80AFD384 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 009E8 80AFD388 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 009EC 80AFD38C 0C029468 */ jal Animation_Change - -/* 009F0 80AFD390 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 009F4 80AFD394 920F02B4 */ lbu $t7, 0x02B4($s0) ## 000002B4 -/* 009F8 80AFD398 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 009FC 80AFD39C 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 00A00 80AFD3A0 3C0580B0 */ lui $a1, %hi(func_80AFD3D4) ## $a1 = 80B00000 -/* 00A04 80AFD3A4 31F8FFFB */ andi $t8, $t7, 0xFFFB ## $t8 = 00000000 -/* 00A08 80AFD3A8 A21802B4 */ sb $t8, 0x02B4($s0) ## 000002B4 -/* 00A0C 80AFD3AC A2190280 */ sb $t9, 0x0280($s0) ## 00000280 -/* 00A10 80AFD3B0 24A5D3D4 */ addiu $a1, $a1, %lo(func_80AFD3D4) ## $a1 = 80AFD3D4 -/* 00A14 80AFD3B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A18 80AFD3B8 0C2BF268 */ jal func_80AFC9A0 -/* 00A1C 80AFD3BC E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 00A20 80AFD3C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A24 80AFD3C4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00A28 80AFD3C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A2C 80AFD3CC 03E00008 */ jr $ra -/* 00A30 80AFD3D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD3D4.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD3D4.s deleted file mode 100644 index 7069d84aec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD3D4.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80AFD3D4 -/* 00A34 80AFD3D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A38 80AFD3D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A3C 80AFD3DC AFA5001C */ sw $a1, 0x001C($sp) -/* 00A40 80AFD3E0 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 00A44 80AFD3E4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00A48 80AFD3E8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00A4C 80AFD3EC 4600218D */ trunc.w.s $f6, $f4 -/* 00A50 80AFD3F0 24053831 */ addiu $a1, $zero, 0x3831 ## $a1 = 00003831 -/* 00A54 80AFD3F4 44023000 */ mfc1 $v0, $f6 -/* 00A58 80AFD3F8 00000000 */ nop -/* 00A5C 80AFD3FC 54410008 */ bnel $v0, $at, .L80AFD420 -/* 00A60 80AFD400 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00A64 80AFD404 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A68 80AFD408 AFA60018 */ sw $a2, 0x0018($sp) -/* 00A6C 80AFD40C 8FA60018 */ lw $a2, 0x0018($sp) -/* 00A70 80AFD410 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00A74 80AFD414 10000005 */ beq $zero, $zero, .L80AFD42C -/* 00A78 80AFD418 A0CF0281 */ sb $t7, 0x0281($a2) ## 00000281 -/* 00A7C 80AFD41C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -.L80AFD420: -/* 00A80 80AFD420 54410003 */ bnel $v0, $at, .L80AFD430 -/* 00A84 80AFD424 90C202B4 */ lbu $v0, 0x02B4($a2) ## 000002B4 -/* 00A88 80AFD428 A0C00281 */ sb $zero, 0x0281($a2) ## 00000281 -.L80AFD42C: -/* 00A8C 80AFD42C 90C202B4 */ lbu $v0, 0x02B4($a2) ## 000002B4 -.L80AFD430: -/* 00A90 80AFD430 24C4014C */ addiu $a0, $a2, 0x014C ## $a0 = 0000014C -/* 00A94 80AFD434 30580004 */ andi $t8, $v0, 0x0004 ## $t8 = 00000000 -/* 00A98 80AFD438 13000006 */ beq $t8, $zero, .L80AFD454 -/* 00A9C 80AFD43C 3059FFF9 */ andi $t9, $v0, 0xFFF9 ## $t9 = 00000000 -/* 00AA0 80AFD440 A0D902B4 */ sb $t9, 0x02B4($a2) ## 000002B4 -/* 00AA4 80AFD444 0C2BF51F */ jal func_80AFD47C -/* 00AA8 80AFD448 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00AAC 80AFD44C 10000008 */ beq $zero, $zero, .L80AFD470 -/* 00AB0 80AFD450 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AFD454: -/* 00AB4 80AFD454 0C02927F */ jal SkelAnime_Update - -/* 00AB8 80AFD458 AFA60018 */ sw $a2, 0x0018($sp) -/* 00ABC 80AFD45C 10400003 */ beq $v0, $zero, .L80AFD46C -/* 00AC0 80AFD460 8FA60018 */ lw $a2, 0x0018($sp) -/* 00AC4 80AFD464 0C2BF358 */ jal func_80AFCD60 -/* 00AC8 80AFD468 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L80AFD46C: -/* 00ACC 80AFD46C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AFD470: -/* 00AD0 80AFD470 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AD4 80AFD474 03E00008 */ jr $ra -/* 00AD8 80AFD478 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s deleted file mode 100644 index 871202803b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80AFD47C -/* 00ADC 80AFD47C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00AE0 80AFD480 AFB00028 */ sw $s0, 0x0028($sp) -/* 00AE4 80AFD484 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AE8 80AFD488 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AEC 80AFD48C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00AF0 80AFD490 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00AF4 80AFD494 C6040164 */ lwc1 $f4, 0x0164($s0) ## 00000164 -/* 00AF8 80AFD498 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00AFC 80AFD49C 3C050600 */ lui $a1, %hi(D_06000460) ## $a1 = 06000000 -/* 00B00 80AFD4A0 46062201 */ sub.s $f8, $f4, $f6 -/* 00B04 80AFD4A4 3C06BECC */ lui $a2, 0xBECC ## $a2 = BECC0000 -/* 00B08 80AFD4A8 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00B0C 80AFD4AC AFAE0014 */ sw $t6, 0x0014($sp) -/* 00B10 80AFD4B0 44074000 */ mfc1 $a3, $f8 -/* 00B14 80AFD4B4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = BECCCCCD -/* 00B18 80AFD4B8 24A50460 */ addiu $a1, $a1, %lo(D_06000460) ## $a1 = 06000460 -/* 00B1C 80AFD4BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00B20 80AFD4C0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00B24 80AFD4C4 0C029468 */ jal Animation_Change - -/* 00B28 80AFD4C8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00B2C 80AFD4CC 920F02B4 */ lbu $t7, 0x02B4($s0) ## 000002B4 -/* 00B30 80AFD4D0 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 00B34 80AFD4D4 3C0580B0 */ lui $a1, %hi(func_80AFD508) ## $a1 = 80B00000 -/* 00B38 80AFD4D8 31F8FFFB */ andi $t8, $t7, 0xFFFB ## $t8 = 00000000 -/* 00B3C 80AFD4DC A21802B4 */ sb $t8, 0x02B4($s0) ## 000002B4 -/* 00B40 80AFD4E0 A2190280 */ sb $t9, 0x0280($s0) ## 00000280 -/* 00B44 80AFD4E4 A2000281 */ sb $zero, 0x0281($s0) ## 00000281 -/* 00B48 80AFD4E8 24A5D508 */ addiu $a1, $a1, %lo(func_80AFD508) ## $a1 = 80AFD508 -/* 00B4C 80AFD4EC 0C2BF268 */ jal func_80AFC9A0 -/* 00B50 80AFD4F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B54 80AFD4F4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B58 80AFD4F8 8FB00028 */ lw $s0, 0x0028($sp) -/* 00B5C 80AFD4FC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B60 80AFD500 03E00008 */ jr $ra -/* 00B64 80AFD504 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD508.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD508.s deleted file mode 100644 index e700972ff2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD508.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AFD508 -/* 00B68 80AFD508 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B6C 80AFD50C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B70 80AFD510 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B74 80AFD514 AFA5001C */ sw $a1, 0x001C($sp) -/* 00B78 80AFD518 0C02927F */ jal SkelAnime_Update - -/* 00B7C 80AFD51C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00B80 80AFD520 50400004 */ beql $v0, $zero, .L80AFD534 -/* 00B84 80AFD524 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B88 80AFD528 0C2BF358 */ jal func_80AFCD60 -/* 00B8C 80AFD52C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B90 80AFD530 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AFD534: -/* 00B94 80AFD534 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B98 80AFD538 03E00008 */ jr $ra -/* 00B9C 80AFD53C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD540.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD540.s deleted file mode 100644 index c1760e0d2c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD540.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AFD540 -/* 00BA0 80AFD540 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BA4 80AFD544 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BA8 80AFD548 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 00BAC 80AFD54C 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E -/* 00BB0 80AFD550 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00BB4 80AFD554 11E00004 */ beq $t7, $zero, .L80AFD568 -/* 00BB8 80AFD558 00000000 */ nop -/* 00BBC 80AFD55C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00BC0 80AFD560 00000000 */ nop -/* 00BC4 80AFD564 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -.L80AFD568: -/* 00BC8 80AFD568 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00BCC 80AFD56C AFA40018 */ sw $a0, 0x0018($sp) -/* 00BD0 80AFD570 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BD4 80AFD574 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00BD8 80AFD578 3C0580B0 */ lui $a1, %hi(func_80AFD59C) ## $a1 = 80B00000 -/* 00BDC 80AFD57C 24A5D59C */ addiu $a1, $a1, %lo(func_80AFD59C) ## $a1 = 80AFD59C -/* 00BE0 80AFD580 A0800281 */ sb $zero, 0x0281($a0) ## 00000281 -/* 00BE4 80AFD584 0C2BF268 */ jal func_80AFC9A0 -/* 00BE8 80AFD588 A0980280 */ sb $t8, 0x0280($a0) ## 00000280 -/* 00BEC 80AFD58C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BF0 80AFD590 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BF4 80AFD594 03E00008 */ jr $ra -/* 00BF8 80AFD598 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD59C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD59C.s deleted file mode 100644 index 21ac44c809..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD59C.s +++ /dev/null @@ -1,52 +0,0 @@ -.late_rodata -glabel D_80AFE114 - .float 0.05 - -.text -glabel func_80AFD59C -/* 00BFC 80AFD59C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C00 80AFD5A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C04 80AFD5A4 94820088 */ lhu $v0, 0x0088($a0) ## 00000088 -/* 00C08 80AFD5A8 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 00C0C 80AFD5AC 51C00005 */ beql $t6, $zero, .L80AFD5C4 -/* 00C10 80AFD5B0 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 00C14 80AFD5B4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00C18 80AFD5B8 94820088 */ lhu $v0, 0x0088($a0) ## 00000088 -/* 00C1C 80AFD5BC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00C20 80AFD5C0 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -.L80AFD5C4: -/* 00C24 80AFD5C4 51E0000C */ beql $t7, $zero, .L80AFD5F8 -/* 00C28 80AFD5C8 90980114 */ lbu $t8, 0x0114($a0) ## 00000114 -/* 00C2C 80AFD5CC C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 00C30 80AFD5D0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00C34 80AFD5D4 3C0180B0 */ lui $at, %hi(D_80AFE114) ## $at = 80B00000 -/* 00C38 80AFD5D8 4606003C */ c.lt.s $f0, $f6 -/* 00C3C 80AFD5DC 00000000 */ nop -/* 00C40 80AFD5E0 45020005 */ bc1fl .L80AFD5F8 -/* 00C44 80AFD5E4 90980114 */ lbu $t8, 0x0114($a0) ## 00000114 -/* 00C48 80AFD5E8 C428E114 */ lwc1 $f8, %lo(D_80AFE114)($at) -/* 00C4C 80AFD5EC 46080280 */ add.s $f10, $f0, $f8 -/* 00C50 80AFD5F0 E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 -/* 00C54 80AFD5F4 90980114 */ lbu $t8, 0x0114($a0) ## 00000114 -.L80AFD5F8: -/* 00C58 80AFD5F8 5700000F */ bnel $t8, $zero, .L80AFD638 -/* 00C5C 80AFD5FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C60 80AFD600 94990088 */ lhu $t9, 0x0088($a0) ## 00000088 -/* 00C64 80AFD604 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 00C68 80AFD608 5100000B */ beql $t0, $zero, .L80AFD638 -/* 00C6C 80AFD60C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C70 80AFD610 908900AF */ lbu $t1, 0x00AF($a0) ## 000000AF -/* 00C74 80AFD614 15200005 */ bne $t1, $zero, .L80AFD62C -/* 00C78 80AFD618 00000000 */ nop -/* 00C7C 80AFD61C 0C2BF5ED */ jal func_80AFD7B4 -/* 00C80 80AFD620 00000000 */ nop -/* 00C84 80AFD624 10000004 */ beq $zero, $zero, .L80AFD638 -/* 00C88 80AFD628 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AFD62C: -/* 00C8C 80AFD62C 0C2BF358 */ jal func_80AFCD60 -/* 00C90 80AFD630 00000000 */ nop -/* 00C94 80AFD634 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AFD638: -/* 00C98 80AFD638 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C9C 80AFD63C 03E00008 */ jr $ra -/* 00CA0 80AFD640 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s deleted file mode 100644 index 5437f6460c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80AFD644 -/* 00CA4 80AFD644 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CA8 80AFD648 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CAC 80AFD64C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00CB0 80AFD650 3C050600 */ lui $a1, %hi(D_06000D98) ## $a1 = 06000000 -/* 00CB4 80AFD654 24A50D98 */ addiu $a1, $a1, %lo(D_06000D98) ## $a1 = 06000D98 -/* 00CB8 80AFD658 AFA70018 */ sw $a3, 0x0018($sp) -/* 00CBC 80AFD65C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00CC0 80AFD660 0C029490 */ jal Animation_MorphToPlayOnce -/* 00CC4 80AFD664 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 00CC8 80AFD668 8FA70018 */ lw $a3, 0x0018($sp) -/* 00CCC 80AFD66C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00CD0 80AFD670 94EE0088 */ lhu $t6, 0x0088($a3) ## 00000088 -/* 00CD4 80AFD674 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00CD8 80AFD678 51E00005 */ beql $t7, $zero, .L80AFD690 -/* 00CDC 80AFD67C 84F8008A */ lh $t8, 0x008A($a3) ## 0000008A -/* 00CE0 80AFD680 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 -/* 00CE4 80AFD684 00000000 */ nop -/* 00CE8 80AFD688 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00CEC 80AFD68C 84F8008A */ lh $t8, 0x008A($a3) ## 0000008A -.L80AFD690: -/* 00CF0 80AFD690 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00CF4 80AFD694 24053832 */ addiu $a1, $zero, 0x3832 ## $a1 = 00003832 -/* 00CF8 80AFD698 A4F80032 */ sh $t8, 0x0032($a3) ## 00000032 -/* 00CFC 80AFD69C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00D00 80AFD6A0 AFA70018 */ sw $a3, 0x0018($sp) -/* 00D04 80AFD6A4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00D08 80AFD6A8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00D0C 80AFD6AC 3C0580B0 */ lui $a1, %hi(func_80AFD6CC) ## $a1 = 80B00000 -/* 00D10 80AFD6B0 24A5D6CC */ addiu $a1, $a1, %lo(func_80AFD6CC) ## $a1 = 80AFD6CC -/* 00D14 80AFD6B4 0C2BF268 */ jal func_80AFC9A0 -/* 00D18 80AFD6B8 A0990280 */ sb $t9, 0x0280($a0) ## 00000280 -/* 00D1C 80AFD6BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D20 80AFD6C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D24 80AFD6C4 03E00008 */ jr $ra -/* 00D28 80AFD6C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD6CC.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD6CC.s deleted file mode 100644 index 09c9ed8fd7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD6CC.s +++ /dev/null @@ -1,71 +0,0 @@ -.late_rodata -glabel D_80AFE118 - .float 0.05 - -.text -glabel func_80AFD6CC -/* 00D2C 80AFD6CC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D30 80AFD6D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D34 80AFD6D4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00D38 80AFD6D8 908E0283 */ lbu $t6, 0x0283($a0) ## 00000283 -/* 00D3C 80AFD6DC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00D40 80AFD6E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D44 80AFD6E4 15C10006 */ bne $t6, $at, .L80AFD700 -/* 00D48 80AFD6E8 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00D4C 80AFD6EC 2605028C */ addiu $a1, $s0, 0x028C ## $a1 = 0000028C -/* 00D50 80AFD6F0 0C00CC17 */ jal func_8003305C -/* 00D54 80AFD6F4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00D58 80AFD6F8 5040002A */ beql $v0, $zero, .L80AFD7A4 -/* 00D5C 80AFD6FC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AFD700: -/* 00D60 80AFD700 92020283 */ lbu $v0, 0x0283($s0) ## 00000283 -/* 00D64 80AFD704 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00D68 80AFD708 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00D6C 80AFD70C 10400003 */ beq $v0, $zero, .L80AFD71C -/* 00D70 80AFD710 24071194 */ addiu $a3, $zero, 0x1194 ## $a3 = 00001194 -/* 00D74 80AFD714 344F0002 */ ori $t7, $v0, 0x0002 ## $t7 = 00000002 -/* 00D78 80AFD718 A20F0283 */ sb $t7, 0x0283($s0) ## 00000283 -.L80AFD71C: -/* 00D7C 80AFD71C 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 00D80 80AFD720 30580002 */ andi $t8, $v0, 0x0002 ## $t8 = 00000000 -/* 00D84 80AFD724 53000005 */ beql $t8, $zero, .L80AFD73C -/* 00D88 80AFD728 30590001 */ andi $t9, $v0, 0x0001 ## $t9 = 00000000 -/* 00D8C 80AFD72C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00D90 80AFD730 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 00D94 80AFD734 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00D98 80AFD738 30590001 */ andi $t9, $v0, 0x0001 ## $t9 = 00000000 -.L80AFD73C: -/* 00D9C 80AFD73C 5320000C */ beql $t9, $zero, .L80AFD770 -/* 00DA0 80AFD740 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00DA4 80AFD744 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 00DA8 80AFD748 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00DAC 80AFD74C 3C0180B0 */ lui $at, %hi(D_80AFE118) ## $at = 80B00000 -/* 00DB0 80AFD750 4606003C */ c.lt.s $f0, $f6 -/* 00DB4 80AFD754 00000000 */ nop -/* 00DB8 80AFD758 45020005 */ bc1fl .L80AFD770 -/* 00DBC 80AFD75C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00DC0 80AFD760 C428E118 */ lwc1 $f8, %lo(D_80AFE118)($at) -/* 00DC4 80AFD764 46080280 */ add.s $f10, $f0, $f8 -/* 00DC8 80AFD768 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 00DCC 80AFD76C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -.L80AFD770: -/* 00DD0 80AFD770 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00DD4 80AFD774 AFA00010 */ sw $zero, 0x0010($sp) -/* 00DD8 80AFD778 0C02927F */ jal SkelAnime_Update - -/* 00DDC 80AFD77C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00DE0 80AFD780 50400008 */ beql $v0, $zero, .L80AFD7A4 -/* 00DE4 80AFD784 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00DE8 80AFD788 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 -/* 00DEC 80AFD78C 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 00DF0 80AFD790 51200004 */ beql $t1, $zero, .L80AFD7A4 -/* 00DF4 80AFD794 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00DF8 80AFD798 0C2BF358 */ jal func_80AFCD60 -/* 00DFC 80AFD79C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E00 80AFD7A0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AFD7A4: -/* 00E04 80AFD7A4 8FB00020 */ lw $s0, 0x0020($sp) -/* 00E08 80AFD7A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E0C 80AFD7AC 03E00008 */ jr $ra -/* 00E10 80AFD7B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s deleted file mode 100644 index b3a2ee03f8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80AFD7B4 -/* 00E14 80AFD7B4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00E18 80AFD7B8 AFB00020 */ sw $s0, 0x0020($sp) -/* 00E1C 80AFD7BC AFA5002C */ sw $a1, 0x002C($sp) -/* 00E20 80AFD7C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E24 80AFD7C4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00E28 80AFD7C8 3C050600 */ lui $a1, %hi(D_060009DC) ## $a1 = 06000000 -/* 00E2C 80AFD7CC 24A509DC */ addiu $a1, $a1, %lo(D_060009DC) ## $a1 = 060009DC -/* 00E30 80AFD7D0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E34 80AFD7D4 0C029490 */ jal Animation_MorphToPlayOnce -/* 00E38 80AFD7D8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 00E3C 80AFD7DC 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 00E40 80AFD7E0 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -/* 00E44 80AFD7E4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00E48 80AFD7E8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00E4C 80AFD7EC A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00E50 80AFD7F0 11E00005 */ beq $t7, $zero, .L80AFD808 -/* 00E54 80AFD7F4 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 00E58 80AFD7F8 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 00E5C 80AFD7FC 44812000 */ mtc1 $at, $f4 ## $f4 = -6.00 -/* 00E60 80AFD800 00000000 */ nop -/* 00E64 80AFD804 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L80AFD808: -/* 00E68 80AFD808 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 00E6C 80AFD80C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00E70 80AFD810 A2180280 */ sb $t8, 0x0280($s0) ## 00000280 -/* 00E74 80AFD814 03214024 */ and $t0, $t9, $at -/* 00E78 80AFD818 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 00E7C 80AFD81C 8FA6002C */ lw $a2, 0x002C($sp) -/* 00E80 80AFD820 2604028C */ addiu $a0, $s0, 0x028C ## $a0 = 0000028C -/* 00E84 80AFD824 0C00CB89 */ jal func_80032E24 -/* 00E88 80AFD828 24050012 */ addiu $a1, $zero, 0x0012 ## $a1 = 00000012 -/* 00E8C 80AFD82C 92090283 */ lbu $t1, 0x0283($s0) ## 00000283 -/* 00E90 80AFD830 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00E94 80AFD834 240C0028 */ addiu $t4, $zero, 0x0028 ## $t4 = 00000028 -/* 00E98 80AFD838 352A0004 */ ori $t2, $t1, 0x0004 ## $t2 = 00000004 -/* 00E9C 80AFD83C A20A0283 */ sb $t2, 0x0283($s0) ## 00000283 -/* 00EA0 80AFD840 AFAC0014 */ sw $t4, 0x0014($sp) -/* 00EA4 80AFD844 AFAB0010 */ sw $t3, 0x0010($sp) -/* 00EA8 80AFD848 8FA4002C */ lw $a0, 0x002C($sp) -/* 00EAC 80AFD84C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 00EB0 80AFD850 24063833 */ addiu $a2, $zero, 0x3833 ## $a2 = 00003833 -/* 00EB4 80AFD854 0C00AA7D */ jal EffectSsDeadSound_SpawnStationary -/* 00EB8 80AFD858 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00EBC 80AFD85C 3C0580B0 */ lui $a1, %hi(func_80AFD880) ## $a1 = 80B00000 -/* 00EC0 80AFD860 24A5D880 */ addiu $a1, $a1, %lo(func_80AFD880) ## $a1 = 80AFD880 -/* 00EC4 80AFD864 0C2BF268 */ jal func_80AFC9A0 -/* 00EC8 80AFD868 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ECC 80AFD86C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00ED0 80AFD870 8FB00020 */ lw $s0, 0x0020($sp) -/* 00ED4 80AFD874 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00ED8 80AFD878 03E00008 */ jr $ra -/* 00EDC 80AFD87C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD880.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD880.s deleted file mode 100644 index 66cdeccf84..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD880.s +++ /dev/null @@ -1,77 +0,0 @@ -.late_rodata -glabel D_80AFE11C - .float 0.01 - -glabel D_80AFE120 - .word 0x3C75C28F - -.text -glabel func_80AFD880 -/* 00EE0 80AFD880 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00EE4 80AFD884 AFB10018 */ sw $s1, 0x0018($sp) -/* 00EE8 80AFD888 AFB00014 */ sw $s0, 0x0014($sp) -/* 00EEC 80AFD88C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EF0 80AFD890 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00EF4 80AFD894 AFBF001C */ sw $ra, 0x001C($sp) -/* 00EF8 80AFD898 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 00EFC 80AFD89C 2605028C */ addiu $a1, $s0, 0x028C ## $a1 = 0000028C -/* 00F00 80AFD8A0 0C00CC17 */ jal func_8003305C -/* 00F04 80AFD8A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00F08 80AFD8A8 1040002A */ beq $v0, $zero, .L80AFD954 -/* 00F0C 80AFD8AC 3C0180B0 */ lui $at, %hi(D_80AFE11C) ## $at = 80B00000 -/* 00F10 80AFD8B0 C6000050 */ lwc1 $f0, 0x0050($s0) ## 00000050 -/* 00F14 80AFD8B4 C424E11C */ lwc1 $f4, %lo(D_80AFE11C)($at) -/* 00F18 80AFD8B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F1C 80AFD8BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00F20 80AFD8C0 46002032 */ c.eq.s $f4, $f0 -/* 00F24 80AFD8C4 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 00F28 80AFD8C8 3C0180B0 */ lui $at, %hi(D_80AFE120) ## $at = 80B00000 -/* 00F2C 80AFD8CC 45000005 */ bc1f .L80AFD8E4 -/* 00F30 80AFD8D0 00000000 */ nop -/* 00F34 80AFD8D4 0C007E50 */ jal Item_DropCollectibleRandom - -/* 00F38 80AFD8D8 24070010 */ addiu $a3, $zero, 0x0010 ## $a3 = 00000010 -/* 00F3C 80AFD8DC 10000019 */ beq $zero, $zero, .L80AFD944 -/* 00F40 80AFD8E0 920E0283 */ lbu $t6, 0x0283($s0) ## 00000283 -.L80AFD8E4: -/* 00F44 80AFD8E4 C426E120 */ lwc1 $f6, %lo(D_80AFE120)($at) -/* 00F48 80AFD8E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F4C 80AFD8EC 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00F50 80AFD8F0 4606003E */ c.le.s $f0, $f6 -/* 00F54 80AFD8F4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00F58 80AFD8F8 45000007 */ bc1f .L80AFD918 -/* 00F5C 80AFD8FC 00000000 */ nop -/* 00F60 80AFD900 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F64 80AFD904 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00F68 80AFD908 0C007D52 */ jal Item_DropCollectible - -/* 00F6C 80AFD90C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00F70 80AFD910 1000000C */ beq $zero, $zero, .L80AFD944 -/* 00F74 80AFD914 920E0283 */ lbu $t6, 0x0283($s0) ## 00000283 -.L80AFD918: -/* 00F78 80AFD918 0C007D52 */ jal Item_DropCollectible - -/* 00F7C 80AFD91C AFA50024 */ sw $a1, 0x0024($sp) -/* 00F80 80AFD920 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F84 80AFD924 8FA50024 */ lw $a1, 0x0024($sp) -/* 00F88 80AFD928 0C007D52 */ jal Item_DropCollectible - -/* 00F8C 80AFD92C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00F90 80AFD930 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F94 80AFD934 8FA50024 */ lw $a1, 0x0024($sp) -/* 00F98 80AFD938 0C007D52 */ jal Item_DropCollectible - -/* 00F9C 80AFD93C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00FA0 80AFD940 920E0283 */ lbu $t6, 0x0283($s0) ## 00000283 -.L80AFD944: -/* 00FA4 80AFD944 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FA8 80AFD948 35CF0008 */ ori $t7, $t6, 0x0008 ## $t7 = 00000008 -/* 00FAC 80AFD94C 0C00B55C */ jal Actor_Kill - -/* 00FB0 80AFD950 A20F0283 */ sb $t7, 0x0283($s0) ## 00000283 -.L80AFD954: -/* 00FB4 80AFD954 8FBF001C */ lw $ra, 0x001C($sp) -/* 00FB8 80AFD958 8FB00014 */ lw $s0, 0x0014($sp) -/* 00FBC 80AFD95C 8FB10018 */ lw $s1, 0x0018($sp) -/* 00FC0 80AFD960 03E00008 */ jr $ra -/* 00FC4 80AFD964 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s deleted file mode 100644 index 050a14f0ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s +++ /dev/null @@ -1,192 +0,0 @@ -.late_rodata -glabel D_80AFE124 - .word 0x45EA6000 - -.text -glabel func_80AFD968 -/* 00FC8 80AFD968 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00FCC 80AFD96C AFBF003C */ sw $ra, 0x003C($sp) -/* 00FD0 80AFD970 AFB30038 */ sw $s3, 0x0038($sp) -/* 00FD4 80AFD974 AFB20034 */ sw $s2, 0x0034($sp) -/* 00FD8 80AFD978 AFB10030 */ sw $s1, 0x0030($sp) -/* 00FDC 80AFD97C AFB0002C */ sw $s0, 0x002C($sp) -/* 00FE0 80AFD980 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 00FE4 80AFD984 90820280 */ lbu $v0, 0x0280($a0) ## 00000280 -/* 00FE8 80AFD988 24110001 */ addiu $s1, $zero, 0x0001 ## $s1 = 00000001 -/* 00FEC 80AFD98C 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 00FF0 80AFD990 12220012 */ beq $s1, $v0, .L80AFD9DC -/* 00FF4 80AFD994 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 00FF8 80AFD998 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 00FFC 80AFD99C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 01000 80AFD9A0 31CF0060 */ andi $t7, $t6, 0x0060 ## $t7 = 00000000 -/* 01004 80AFD9A4 51E0000E */ beql $t7, $zero, .L80AFD9E0 -/* 01008 80AFD9A8 28410003 */ slti $at, $v0, 0x0003 -/* 0100C 80AFD9AC C4840084 */ lwc1 $f4, 0x0084($a0) ## 00000084 -/* 01010 80AFD9B0 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 01014 80AFD9B4 00000000 */ nop -/* 01018 80AFD9B8 4604303E */ c.le.s $f6, $f4 -/* 0101C 80AFD9BC 00000000 */ nop -/* 01020 80AFD9C0 45020007 */ bc1fl .L80AFD9E0 -/* 01024 80AFD9C4 28410003 */ slti $at, $v0, 0x0003 -/* 01028 80AFD9C8 A08000AF */ sb $zero, 0x00AF($a0) ## 000000AF -/* 0102C 80AFD9CC 0C2BF5ED */ jal func_80AFD7B4 -/* 01030 80AFD9D0 A0800281 */ sb $zero, 0x0281($a0) ## 00000281 -/* 01034 80AFD9D4 10000087 */ beq $zero, $zero, .L80AFDBF4 -/* 01038 80AFD9D8 8FBF003C */ lw $ra, 0x003C($sp) -.L80AFD9DC: -/* 0103C 80AFD9DC 28410003 */ slti $at, $v0, 0x0003 -.L80AFD9E0: -/* 01040 80AFD9E0 54200084 */ bnel $at, $zero, .L80AFDBF4 -/* 01044 80AFD9E4 8FBF003C */ lw $ra, 0x003C($sp) -/* 01048 80AFD9E8 924202B5 */ lbu $v0, 0x02B5($s2) ## 000002B5 -/* 0104C 80AFD9EC 30580002 */ andi $t8, $v0, 0x0002 ## $t8 = 00000000 -/* 01050 80AFD9F0 53000080 */ beql $t8, $zero, .L80AFDBF4 -/* 01054 80AFD9F4 8FBF003C */ lw $ra, 0x003C($sp) -/* 01058 80AFD9F8 924300B1 */ lbu $v1, 0x00B1($s2) ## 000000B1 -/* 0105C 80AFD9FC 24100006 */ addiu $s0, $zero, 0x0006 ## $s0 = 00000006 -/* 01060 80AFDA00 3059FFFD */ andi $t9, $v0, 0xFFFD ## $t9 = 00000000 -/* 01064 80AFDA04 1203007A */ beq $s0, $v1, .L80AFDBF0 -/* 01068 80AFDA08 A25902B5 */ sb $t9, 0x02B5($s2) ## 000002B5 -/* 0106C 80AFDA0C 8E4502C0 */ lw $a1, 0x02C0($s2) ## 000002C0 -/* 01070 80AFDA10 A2430282 */ sb $v1, 0x0282($s2) ## 00000282 -/* 01074 80AFDA14 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01078 80AFDA18 02203025 */ or $a2, $s1, $zero ## $a2 = 00000001 -/* 0107C 80AFDA1C 0C00D594 */ jal func_80035650 -/* 01080 80AFDA20 24A50040 */ addiu $a1, $a1, 0x0040 ## $a1 = 00000040 -/* 01084 80AFDA24 924200B1 */ lbu $v0, 0x00B1($s2) ## 000000B1 -/* 01088 80AFDA28 A2400281 */ sb $zero, 0x0281($s2) ## 00000281 -/* 0108C 80AFDA2C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01090 80AFDA30 16220010 */ bne $s1, $v0, .L80AFDA74 -/* 01094 80AFDA34 00000000 */ nop -/* 01098 80AFDA38 92480280 */ lbu $t0, 0x0280($s2) ## 00000280 -/* 0109C 80AFDA3C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 010A0 80AFDA40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 010A4 80AFDA44 1208006A */ beq $s0, $t0, .L80AFDBF0 -/* 010A8 80AFDA48 24060078 */ addiu $a2, $zero, 0x0078 ## $a2 = 00000078 -/* 010AC 80AFDA4C 24090050 */ addiu $t1, $zero, 0x0050 ## $t1 = 00000050 -/* 010B0 80AFDA50 AFA90010 */ sw $t1, 0x0010($sp) -/* 010B4 80AFDA54 0C00D09B */ jal Actor_SetColorFilter -/* 010B8 80AFDA58 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 010BC 80AFDA5C 0C00D58A */ jal Actor_ApplyDamage - -/* 010C0 80AFDA60 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 010C4 80AFDA64 0C2BF550 */ jal func_80AFD540 -/* 010C8 80AFDA68 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 010CC 80AFDA6C 10000061 */ beq $zero, $zero, .L80AFDBF4 -/* 010D0 80AFDA70 8FBF003C */ lw $ra, 0x003C($sp) -.L80AFDA74: -/* 010D4 80AFDA74 14410034 */ bne $v0, $at, .L80AFDB48 -/* 010D8 80AFDA78 24030008 */ addiu $v1, $zero, 0x0008 ## $v1 = 00000008 -/* 010DC 80AFDA7C 3C0180B0 */ lui $at, %hi(D_80AFE124) ## $at = 80B00000 -/* 010E0 80AFDA80 C42AE124 */ lwc1 $f10, %lo(D_80AFE124)($at) -/* 010E4 80AFDA84 C6480054 */ lwc1 $f8, 0x0054($s2) ## 00000054 -/* 010E8 80AFDA88 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 010EC 80AFDA8C 26420024 */ addiu $v0, $s2, 0x0024 ## $v0 = 00000024 -/* 010F0 80AFDA90 460A4402 */ mul.s $f16, $f8, $f10 -/* 010F4 80AFDA94 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 -/* 010F8 80AFDA98 AFA20044 */ sw $v0, 0x0044($sp) -/* 010FC 80AFDA9C 24100004 */ addiu $s0, $zero, 0x0004 ## $s0 = 00000004 -/* 01100 80AFDAA0 27B10054 */ addiu $s1, $sp, 0x0054 ## $s1 = FFFFFFEC -/* 01104 80AFDAA4 4600848D */ trunc.w.s $f18, $f16 -/* 01108 80AFDAA8 440B9000 */ mfc1 $t3, $f18 -/* 0110C 80AFDAAC 00000000 */ nop -/* 01110 80AFDAB0 A7AB0052 */ sh $t3, 0x0052($sp) -/* 01114 80AFDAB4 8FA20044 */ lw $v0, 0x0044($sp) -.L80AFDAB8: -/* 01118 80AFDAB8 4600A306 */ mov.s $f12, $f20 -/* 0111C 80AFDABC 8C4D0000 */ lw $t5, 0x0000($v0) ## 00000024 -/* 01120 80AFDAC0 AE2D0000 */ sw $t5, 0x0000($s1) ## FFFFFFEC -/* 01124 80AFDAC4 8C4C0004 */ lw $t4, 0x0004($v0) ## 00000028 -/* 01128 80AFDAC8 AE2C0004 */ sw $t4, 0x0004($s1) ## FFFFFFF0 -/* 0112C 80AFDACC 8C4D0008 */ lw $t5, 0x0008($v0) ## 0000002C -/* 01130 80AFDAD0 0C00CFC8 */ jal Rand_CenteredFloat - -/* 01134 80AFDAD4 AE2D0008 */ sw $t5, 0x0008($s1) ## FFFFFFF4 -/* 01138 80AFDAD8 C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 0113C 80AFDADC 4600A306 */ mov.s $f12, $f20 -/* 01140 80AFDAE0 46002180 */ add.s $f6, $f4, $f0 -/* 01144 80AFDAE4 0C00CFC8 */ jal Rand_CenteredFloat - -/* 01148 80AFDAE8 E7A60054 */ swc1 $f6, 0x0054($sp) -/* 0114C 80AFDAEC C7A8005C */ lwc1 $f8, 0x005C($sp) -/* 01150 80AFDAF0 46004280 */ add.s $f10, $f8, $f0 -/* 01154 80AFDAF4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01158 80AFDAF8 E7AA005C */ swc1 $f10, 0x005C($sp) -/* 0115C 80AFDAFC 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 01160 80AFDB00 44819000 */ mtc1 $at, $f18 ## $f18 = 25.00 -/* 01164 80AFDB04 C7B00058 */ lwc1 $f16, 0x0058($sp) -/* 01168 80AFDB08 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 0116C 80AFDB0C 46120102 */ mul.s $f4, $f0, $f18 -/* 01170 80AFDB10 AFAE0018 */ sw $t6, 0x0018($sp) -/* 01174 80AFDB14 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01178 80AFDB18 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 0117C 80AFDB1C 02203025 */ or $a2, $s1, $zero ## $a2 = FFFFFFEC -/* 01180 80AFDB20 87A70052 */ lh $a3, 0x0052($sp) -/* 01184 80AFDB24 AFA00010 */ sw $zero, 0x0010($sp) -/* 01188 80AFDB28 46048180 */ add.s $f6, $f16, $f4 -/* 0118C 80AFDB2C AFA00014 */ sw $zero, 0x0014($sp) -/* 01190 80AFDB30 0C00A935 */ jal EffectSsEnFire_SpawnVec3f -/* 01194 80AFDB34 E7A60058 */ swc1 $f6, 0x0058($sp) -/* 01198 80AFDB38 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000003 -/* 0119C 80AFDB3C 0603FFDE */ bgezl $s0, .L80AFDAB8 -/* 011A0 80AFDB40 8FA20044 */ lw $v0, 0x0044($sp) -/* 011A4 80AFDB44 24030019 */ addiu $v1, $zero, 0x0019 ## $v1 = 00000019 -.L80AFDB48: -/* 011A8 80AFDB48 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 011AC 80AFDB4C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 011B0 80AFDB50 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 011B4 80AFDB54 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 011B8 80AFDB58 0C00D09B */ jal Actor_SetColorFilter -/* 011BC 80AFDB5C AFA30010 */ sw $v1, 0x0010($sp) -/* 011C0 80AFDB60 0C00D58A */ jal Actor_ApplyDamage - -/* 011C4 80AFDB64 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 011C8 80AFDB68 14400005 */ bne $v0, $zero, .L80AFDB80 -/* 011CC 80AFDB6C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 011D0 80AFDB70 0C2BF5ED */ jal func_80AFD7B4 -/* 011D4 80AFDB74 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 011D8 80AFDB78 1000001E */ beq $zero, $zero, .L80AFDBF4 -/* 011DC 80AFDB7C 8FBF003C */ lw $ra, 0x003C($sp) -.L80AFDB80: -/* 011E0 80AFDB80 924F0283 */ lbu $t7, 0x0283($s2) ## 00000283 -/* 011E4 80AFDB84 8E631C44 */ lw $v1, 0x1C44($s3) ## 00001C44 -/* 011E8 80AFDB88 15E00017 */ bne $t7, $zero, .L80AFDBE8 -/* 011EC 80AFDB8C 00000000 */ nop -/* 011F0 80AFDB90 924200B1 */ lbu $v0, 0x00B1($s2) ## 000000B1 -/* 011F4 80AFDB94 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 011F8 80AFDB98 2644028C */ addiu $a0, $s2, 0x028C ## $a0 = 0000028C -/* 011FC 80AFDB9C 1041000E */ beq $v0, $at, .L80AFDBD8 -/* 01200 80AFDBA0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01204 80AFDBA4 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 01208 80AFDBA8 1441000F */ bne $v0, $at, .L80AFDBE8 -/* 0120C 80AFDBAC 00000000 */ nop -/* 01210 80AFDBB0 80620842 */ lb $v0, 0x0842($v1) ## 00000842 -/* 01214 80AFDBB4 28410004 */ slti $at, $v0, 0x0004 -/* 01218 80AFDBB8 14200002 */ bne $at, $zero, .L80AFDBC4 -/* 0121C 80AFDBBC 2841000C */ slti $at, $v0, 0x000C -/* 01220 80AFDBC0 14200005 */ bne $at, $zero, .L80AFDBD8 -.L80AFDBC4: -/* 01224 80AFDBC4 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 01228 80AFDBC8 10410003 */ beq $v0, $at, .L80AFDBD8 -/* 0122C 80AFDBCC 24010015 */ addiu $at, $zero, 0x0015 ## $at = 00000015 -/* 01230 80AFDBD0 14410005 */ bne $v0, $at, .L80AFDBE8 -/* 01234 80AFDBD4 00000000 */ nop -.L80AFDBD8: -/* 01238 80AFDBD8 0C00CB89 */ jal func_80032E24 -/* 0123C 80AFDBDC 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 -/* 01240 80AFDBE0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01244 80AFDBE4 A2580283 */ sb $t8, 0x0283($s2) ## 00000283 -.L80AFDBE8: -/* 01248 80AFDBE8 0C2BF591 */ jal func_80AFD644 -/* 0124C 80AFDBEC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -.L80AFDBF0: -/* 01250 80AFDBF0 8FBF003C */ lw $ra, 0x003C($sp) -.L80AFDBF4: -/* 01254 80AFDBF4 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 01258 80AFDBF8 8FB0002C */ lw $s0, 0x002C($sp) -/* 0125C 80AFDBFC 8FB10030 */ lw $s1, 0x0030($sp) -/* 01260 80AFDC00 8FB20034 */ lw $s2, 0x0034($sp) -/* 01264 80AFDC04 8FB30038 */ lw $s3, 0x0038($sp) -/* 01268 80AFDC08 03E00008 */ jr $ra -/* 0126C 80AFDC0C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s deleted file mode 100644 index 823ce6bf0e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s +++ /dev/null @@ -1,145 +0,0 @@ -.rdata -glabel D_80AFE0E0 - .asciz "../z_en_skb.c" - .balign 4 - -glabel D_80AFE0F0 - .asciz "../z_en_skb.c" - .balign 4 - -.text -glabel func_80AFDD30 -/* 01390 80AFDD30 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01394 80AFDD34 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 01398 80AFDD38 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0139C 80AFDD3C AFA40048 */ sw $a0, 0x0048($sp) -/* 013A0 80AFDD40 14A1006B */ bne $a1, $at, .L80AFDEF0 -/* 013A4 80AFDD44 AFA70054 */ sw $a3, 0x0054($sp) -/* 013A8 80AFDD48 8FAE005C */ lw $t6, 0x005C($sp) -/* 013AC 80AFDD4C 240703CC */ addiu $a3, $zero, 0x03CC ## $a3 = 000003CC -/* 013B0 80AFDD50 91CF0283 */ lbu $t7, 0x0283($t6) ## 00000283 -/* 013B4 80AFDD54 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 013B8 80AFDD58 17000063 */ bne $t8, $zero, .L80AFDEE8 -/* 013BC 80AFDD5C 00000000 */ nop -/* 013C0 80AFDD60 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 013C4 80AFDD64 3C0680B0 */ lui $a2, %hi(D_80AFE0E0) ## $a2 = 80B00000 -/* 013C8 80AFDD68 24C6E0E0 */ addiu $a2, $a2, %lo(D_80AFE0E0) ## $a2 = 80AFE0E0 -/* 013CC 80AFDD6C 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 -/* 013D0 80AFDD70 0C031AB1 */ jal Graph_OpenDisps -/* 013D4 80AFDD74 AFA50038 */ sw $a1, 0x0038($sp) -/* 013D8 80AFDD78 8FA20048 */ lw $v0, 0x0048($sp) -/* 013DC 80AFDD7C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 013E0 80AFDD80 00411021 */ addu $v0, $v0, $at -/* 013E4 80AFDD84 8C441DE4 */ lw $a0, 0x1DE4($v0) ## 00001DE4 -/* 013E8 80AFDD88 AFA20018 */ sw $v0, 0x0018($sp) -/* 013EC 80AFDD8C 00800821 */ addu $at, $a0, $zero -/* 013F0 80AFDD90 00042080 */ sll $a0, $a0, 2 -/* 013F4 80AFDD94 00812023 */ subu $a0, $a0, $at -/* 013F8 80AFDD98 00042100 */ sll $a0, $a0, 4 -/* 013FC 80AFDD9C 00812023 */ subu $a0, $a0, $at -/* 01400 80AFDDA0 000420C0 */ sll $a0, $a0, 3 -/* 01404 80AFDDA4 00812023 */ subu $a0, $a0, $at -/* 01408 80AFDDA8 00042100 */ sll $a0, $a0, 4 -/* 0140C 80AFDDAC 00042400 */ sll $a0, $a0, 16 -/* 01410 80AFDDB0 0C01DE1C */ jal Math_SinS - ## sins? -/* 01414 80AFDDB4 00042403 */ sra $a0, $a0, 16 -/* 01418 80AFDDB8 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 -/* 0141C 80AFDDBC 44812000 */ mtc1 $at, $f4 ## $f4 = 95.00 -/* 01420 80AFDDC0 8FA20018 */ lw $v0, 0x0018($sp) -/* 01424 80AFDDC4 24031770 */ addiu $v1, $zero, 0x1770 ## $v1 = 00001770 -/* 01428 80AFDDC8 46040182 */ mul.s $f6, $f0, $f4 -/* 0142C 80AFDDCC 4600320D */ trunc.w.s $f8, $f6 -/* 01430 80AFDDD0 44094000 */ mfc1 $t1, $f8 -/* 01434 80AFDDD4 00000000 */ nop -/* 01438 80AFDDD8 00095400 */ sll $t2, $t1, 16 -/* 0143C 80AFDDDC 000A5C03 */ sra $t3, $t2, 16 -/* 01440 80AFDDE0 05620012 */ bltzl $t3, .L80AFDE2C -/* 01444 80AFDDE4 8C4E1DE4 */ lw $t6, 0x1DE4($v0) ## 00001DE4 -/* 01448 80AFDDE8 8C4C1DE4 */ lw $t4, 0x1DE4($v0) ## 00001DE4 -/* 0144C 80AFDDEC 01830019 */ multu $t4, $v1 -/* 01450 80AFDDF0 00002012 */ mflo $a0 -/* 01454 80AFDDF4 00042400 */ sll $a0, $a0, 16 -/* 01458 80AFDDF8 0C01DE1C */ jal Math_SinS - ## sins? -/* 0145C 80AFDDFC 00042403 */ sra $a0, $a0, 16 -/* 01460 80AFDE00 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 -/* 01464 80AFDE04 44815000 */ mtc1 $at, $f10 ## $f10 = 95.00 -/* 01468 80AFDE08 00000000 */ nop -/* 0146C 80AFDE0C 460A0402 */ mul.s $f16, $f0, $f10 -/* 01470 80AFDE10 4600848D */ trunc.w.s $f18, $f16 -/* 01474 80AFDE14 44059000 */ mfc1 $a1, $f18 -/* 01478 80AFDE18 00000000 */ nop -/* 0147C 80AFDE1C 00052C00 */ sll $a1, $a1, 16 -/* 01480 80AFDE20 10000011 */ beq $zero, $zero, .L80AFDE68 -/* 01484 80AFDE24 00052C03 */ sra $a1, $a1, 16 -/* 01488 80AFDE28 8C4E1DE4 */ lw $t6, 0x1DE4($v0) ## 00001DE4 -.L80AFDE2C: -/* 0148C 80AFDE2C 01C30019 */ multu $t6, $v1 -/* 01490 80AFDE30 00002012 */ mflo $a0 -/* 01494 80AFDE34 00042400 */ sll $a0, $a0, 16 -/* 01498 80AFDE38 0C01DE1C */ jal Math_SinS - ## sins? -/* 0149C 80AFDE3C 00042403 */ sra $a0, $a0, 16 -/* 014A0 80AFDE40 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 -/* 014A4 80AFDE44 44812000 */ mtc1 $at, $f4 ## $f4 = 95.00 -/* 014A8 80AFDE48 00000000 */ nop -/* 014AC 80AFDE4C 46040182 */ mul.s $f6, $f0, $f4 -/* 014B0 80AFDE50 4600320D */ trunc.w.s $f8, $f6 -/* 014B4 80AFDE54 44054000 */ mfc1 $a1, $f8 -/* 014B8 80AFDE58 00000000 */ nop -/* 014BC 80AFDE5C 00052C00 */ sll $a1, $a1, 16 -/* 014C0 80AFDE60 00052C03 */ sra $a1, $a1, 16 -/* 014C4 80AFDE64 00052823 */ subu $a1, $zero, $a1 -.L80AFDE68: -/* 014C8 80AFDE68 8FA60038 */ lw $a2, 0x0038($sp) -/* 014CC 80AFDE6C 24A200A0 */ addiu $v0, $a1, 0x00A0 ## $v0 = 000000A0 -/* 014D0 80AFDE70 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 014D4 80AFDE74 8CC302C0 */ lw $v1, 0x02C0($a2) ## 000002C0 -/* 014D8 80AFDE78 00021400 */ sll $v0, $v0, 16 -/* 014DC 80AFDE7C 00021403 */ sra $v0, $v0, 16 -/* 014E0 80AFDE80 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 014E4 80AFDE84 ACD802C0 */ sw $t8, 0x02C0($a2) ## 000002C0 -/* 014E8 80AFDE88 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 014EC 80AFDE8C AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 014F0 80AFDE90 8CC302C0 */ lw $v1, 0x02C0($a2) ## 000002C0 -/* 014F4 80AFDE94 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 000000A0 -/* 014F8 80AFDE98 00025600 */ sll $t2, $v0, 24 -/* 014FC 80AFDE9C 00025C00 */ sll $t3, $v0, 16 -/* 01500 80AFDEA0 014B6025 */ or $t4, $t2, $t3 ## $t4 = 00000000 -/* 01504 80AFDEA4 00026A00 */ sll $t5, $v0, 8 -/* 01508 80AFDEA8 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 -/* 0150C 80AFDEAC 018D7025 */ or $t6, $t4, $t5 ## $t6 = 00000000 -/* 01510 80AFDEB0 ACC802C0 */ sw $t0, 0x02C0($a2) ## 000002C0 -/* 01514 80AFDEB4 35CF00FF */ ori $t7, $t6, 0x00FF ## $t7 = 000000FF -/* 01518 80AFDEB8 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 0151C 80AFDEBC AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 01520 80AFDEC0 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 01524 80AFDEC4 8FB80048 */ lw $t8, 0x0048($sp) -/* 01528 80AFDEC8 3C0680B0 */ lui $a2, %hi(D_80AFE0F0) ## $a2 = 80B00000 -/* 0152C 80AFDECC 24C6E0F0 */ addiu $a2, $a2, %lo(D_80AFE0F0) ## $a2 = 80AFE0F0 -/* 01530 80AFDED0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 -/* 01534 80AFDED4 240703D2 */ addiu $a3, $zero, 0x03D2 ## $a3 = 000003D2 -/* 01538 80AFDED8 0C031AD5 */ jal Graph_CloseDisps -/* 0153C 80AFDEDC 8F050000 */ lw $a1, 0x0000($t8) ## 00000008 -/* 01540 80AFDEE0 1000000C */ beq $zero, $zero, .L80AFDF14 -/* 01544 80AFDEE4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AFDEE8: -/* 01548 80AFDEE8 10000009 */ beq $zero, $zero, .L80AFDF10 -/* 0154C 80AFDEEC ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -.L80AFDEF0: -/* 01550 80AFDEF0 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01554 80AFDEF4 14A10006 */ bne $a1, $at, .L80AFDF10 -/* 01558 80AFDEF8 8FB9005C */ lw $t9, 0x005C($sp) -/* 0155C 80AFDEFC 93280283 */ lbu $t0, 0x0283($t9) ## 00000283 -/* 01560 80AFDF00 31090002 */ andi $t1, $t0, 0x0002 ## $t1 = 00000000 -/* 01564 80AFDF04 51200003 */ beql $t1, $zero, .L80AFDF14 -/* 01568 80AFDF08 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0156C 80AFDF0C ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -.L80AFDF10: -/* 01570 80AFDF10 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AFDF14: -/* 01574 80AFDF14 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 01578 80AFDF18 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0157C 80AFDF1C 03E00008 */ jr $ra -/* 01580 80AFDF20 00000000 */ nop diff --git a/data/overlays/actors/z_en_skb.data.s b/data/overlays/actors/z_en_skb.data.s deleted file mode 100644 index 44c8847a7b..0000000000 --- a/data/overlays/actors/z_en_skb.data.s +++ /dev/null @@ -1,31 +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 D_80AFE020 - .word 0x00000000, 0xFFCFFFFF, 0x00040000, 0x00000000, 0x00000000, 0x01000000, 0x0F000000, 0x00000000, 0x000A0064, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00050100, 0x01000000, 0x00000000, 0x00140064 -glabel D_80AFE068 - .word 0x06110939, 0x10000000, 0x00000002 -.word D_80AFE020 -glabel D_80AFE078 - .word 0x10F2F1F2, 0x10F2F210, 0xE1F2F474, 0xF2F2F200, 0x007460D3, 0x0000D1F4, 0xF2F2F8F4, 0x0000F400 -glabel En_Skb_InitVars - .word 0x01B00500, 0x00000015, 0x01840000, 0x00000344 -.word EnSkb_Init -.word EnSkb_Destroy -.word EnSkb_Update -.word EnSkb_Draw -glabel D_80AFE0B8 - .word 0x00000000, 0x41000000, 0x00000000 -glabel D_80AFE0C4 - .word 0x00000000, 0xBFC00000, 0x00000000 -glabel D_80AFE0D0 - .word 0xB04C07D0, 0x386CF830, 0x00000000, 0x00000000 - diff --git a/spec b/spec index e73cf4f89c..7ac9689352 100644 --- a/spec +++ b/spec @@ -2893,8 +2893,11 @@ endseg beginseg name "ovl_En_Skb" include "build/src/overlays/actors/ovl_En_Skb/z_en_skb.o" - include "build/data/overlays/actors/z_en_skb.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_En_Skb/ovl_En_Skb_reloc.o" +#else include "build/data/overlays/actors/z_en_skb.reloc.o" +#endif endseg beginseg diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 309d4f140c..69a8926bb5 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -1,4 +1,5 @@ #include "z_en_skb.h" +#include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #define FLAGS 0x00000015 @@ -9,27 +10,32 @@ void EnSkb_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnSkb_Update(Actor* thisx, GlobalContext* globalCtx); void EnSkb_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06000460; -extern UNK_TYPE D_060009DC; -extern UNK_TYPE D_06000D98; -extern UNK_TYPE D_06001854; -extern UNK_TYPE D_060041F8; -extern UNK_TYPE D_060047E0; +void func_80AFCD60(EnSkb* this); +void func_80AFCDF8(EnSkb* this); +void func_80AFCE5C(EnSkb* this, GlobalContext* globalCtx); +void func_80AFCF48(EnSkb* this); +void func_80AFCFF0(EnSkb* this, GlobalContext* globalCtx); +void func_80AFD0A4(EnSkb* this); +void EnSkb_Advance(EnSkb* this, GlobalContext* globalCtx); +void func_80AFD33C(EnSkb* this); +void EnSkb_SetupAttack(EnSkb* this, GlobalContext* globalCtx); +void func_80AFD47C(EnSkb* this); +void func_80AFD508(EnSkb* this, GlobalContext* globalCtx); +void EnSkb_SetupStunned(EnSkb* this); +void func_80AFD59C(EnSkb* this, GlobalContext* globalCtx); +void func_80AFD6CC(EnSkb* this, GlobalContext* globalCtx); +void func_80AFD7B4(EnSkb* this, GlobalContext* globalCtx); +void func_80AFD880(EnSkb* this, GlobalContext* globalCtx); +void func_80AFD968(EnSkb* this, GlobalContext* globalCtx); -/* -const ActorInit En_Skb_InitVars = { - ACTOR_EN_SKB, - ACTORCAT_ENEMY, - FLAGS, - OBJECT_SKB, - sizeof(EnSkb), - (ActorFunc)EnSkb_Init, - (ActorFunc)EnSkb_Destroy, - (ActorFunc)EnSkb_Update, - (ActorFunc)EnSkb_Draw, -}; +extern SkeletonHeader D_060041F8; +extern AnimationHeader D_06001854; +extern AnimationHeader D_060009DC; +extern AnimationHeader D_06000D98; +extern AnimationHeader D_060047E0; +extern AnimationHeader D_06000460; -static ColliderJntSphElementInit D_80AFE020[2] = { +static ColliderJntSphElementInit sJntSphElementsInit[2] = { { { ELEMTYPE_UNK0, @@ -54,7 +60,7 @@ static ColliderJntSphElementInit D_80AFE020[2] = { }, }; -static ColliderJntSphInit D_80AFE068 = { +static ColliderJntSphInit sJntSphInit = { { COLTYPE_HIT6, AT_ON | AT_TYPE_ENEMY, @@ -64,57 +70,495 @@ static ColliderJntSphInit D_80AFE068 = { COLSHAPE_JNTSPH, }, 2, - D_80AFE020, + sJntSphElementsInit, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s") +static DamageTable sDamageTable = { + /* Deku nut */ DMG_ENTRY(0, 0x1), + /* Deku stick */ DMG_ENTRY(2, 0xF), + /* Slingshot */ DMG_ENTRY(1, 0xF), + /* Explosive */ DMG_ENTRY(2, 0xF), + /* Boomerang */ DMG_ENTRY(0, 0x1), + /* Normal arrow */ DMG_ENTRY(2, 0xF), + /* Hammer swing */ DMG_ENTRY(2, 0xF), + /* Hookshot */ DMG_ENTRY(0, 0x1), + /* Kokiri sword */ DMG_ENTRY(1, 0xE), + /* Master sword */ DMG_ENTRY(2, 0xF), + /* Giant's Knife */ DMG_ENTRY(4, 0xF), + /* Fire arrow */ DMG_ENTRY(4, 0x7), + /* Ice arrow */ DMG_ENTRY(2, 0xF), + /* Light arrow */ DMG_ENTRY(2, 0xF), + /* Unk arrow 1 */ DMG_ENTRY(2, 0xF), + /* Unk arrow 2 */ DMG_ENTRY(0, 0x0), + /* Unk arrow 3 */ DMG_ENTRY(0, 0x0), + /* Fire magic */ DMG_ENTRY(4, 0x7), + /* Ice magic */ DMG_ENTRY(0, 0x6), + /* Light magic */ DMG_ENTRY(3, 0xD), + /* Shield */ DMG_ENTRY(0, 0x0), + /* Mirror Ray */ DMG_ENTRY(0, 0x0), + /* Kokiri spin */ DMG_ENTRY(1, 0xD), + /* Giant spin */ DMG_ENTRY(4, 0xF), + /* Master spin */ DMG_ENTRY(2, 0xF), + /* Kokiri jump */ DMG_ENTRY(2, 0xF), + /* Giant jump */ DMG_ENTRY(8, 0xF), + /* Master jump */ DMG_ENTRY(4, 0xF), + /* Unknown 1 */ DMG_ENTRY(0, 0x0), + /* Unblockable */ DMG_ENTRY(0, 0x0), + /* Hammer jump */ DMG_ENTRY(4, 0xF), + /* Unknown 2 */ DMG_ENTRY(0, 0x0), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Init.s") +const ActorInit En_Skb_InitVars = { + ACTOR_EN_SKB, + ACTORCAT_ENEMY, + FLAGS, + OBJECT_SKB, + sizeof(EnSkb), + (ActorFunc)EnSkb_Init, + (ActorFunc)EnSkb_Destroy, + (ActorFunc)EnSkb_Update, + (ActorFunc)EnSkb_Draw, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Destroy.s") +void EnSkb_SetupAction(EnSkb* this, EnSkbActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCD60.s") +void EnSkb_SpawnDebris(GlobalContext* globalCtx, EnSkb* this, Vec3f* spawnPos) { + Vec3f pos; + Vec3f vel = { 0.0f, 8.0f, 0.0f }; + Vec3f accel = { 0.0f, -1.5f, 0.0f }; + f32 spreadAngle; + f32 scale; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s") + spreadAngle = (Rand_ZeroOne() - 0.5f) * 6.28f; + pos.y = this->actor.floorHeight; + pos.x = (Math_SinF(spreadAngle) * 15.0f) + spawnPos->x; + pos.z = (Math_CosF(spreadAngle) * 15.0f) + spawnPos->z; + accel.x = Rand_CenteredFloat(1.0f); + accel.z = Rand_CenteredFloat(1.0f); + vel.y += (Rand_ZeroOne() - 0.5f) * 4.0f; + scale = (Rand_ZeroOne() * 5.0f) + 12.0f; + EffectSsHahen_Spawn(globalCtx, &pos, &vel, &accel, 2, scale * 0.8f, -1, 10, 0); + func_80033480(globalCtx, &pos, 10.0f, 1, 150, 0, 1); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCE5C.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s") +void EnSkb_Init(Actor* thisx, GlobalContext* globalCtx) { + EnSkb* this = THIS; + s16 paramOffsetBody; + s16 paramOffsetArm; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCFF0.s") + Actor_ProcessInitChain(&this->actor, sInitChain); + this->actor.colChkInfo.damageTable = &sDamageTable; + ActorShape_Init(&this->actor.shape, 0.0f, &ActorShadow_DrawCircle, 0.0f); + this->actor.focus.pos = this->actor.world.pos; + this->actor.colChkInfo.mass = 0xFE; + this->actor.colChkInfo.health = 2; + this->actor.shape.yOffset = -8000.0f; + SkelAnime_Init(globalCtx, &this->skelAnime, &D_060041F8, &D_06001854, this->limbDrawTable, + this->transitionDrawTable, 20); + this->actor.naviEnemyId = 0x55; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s") + Collider_InitJntSph(globalCtx, &this->collider); + Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, this->colliderItem); + Actor_SetScale(&this->actor, ((this->actor.params * 0.1f) + 1.0f) * 0.01f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD13C.s") + paramOffsetBody = this->actor.params + 0xA; + this->collider.elements[0].dim.worldSphere.radius = paramOffsetBody; + this->collider.elements[0].dim.modelSphere.radius = paramOffsetBody; + if (1) {}; + paramOffsetArm = (this->actor.params * 2) + 0x14; + this->collider.elements[1].dim.worldSphere.radius = paramOffsetArm; + this->collider.elements[1].dim.modelSphere.radius = paramOffsetArm; + this->actor.home.pos = this->actor.world.pos; + this->actor.floorHeight = this->actor.world.pos.y; + func_80AFCDF8(this); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s") +void EnSkb_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnSkb* this = THIS; + if (this->actor.parent != NULL) { + EnEncount1* spawner = (EnEncount1*)this->actor.parent; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD3D4.s") + if (spawner->actor.update != NULL) { + if (spawner->curNumSpawn > 0) { + spawner->curNumSpawn--; + } + } + } + Collider_DestroyJntSph(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s") +void func_80AFCD60(EnSkb* this) { + if (gSaveContext.nightFlag == 0) { + func_80AFCF48(this); + } else if ((func_8002E084(&this->actor, 0x11C7) != 0) && + (this->actor.xzDistToPlayer < (60.0f + (this->actor.params * 6.0f)))) { + func_80AFD33C(this); + } else { + func_80AFD0A4(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD508.s") +void func_80AFCDF8(EnSkb* this) { + Animation_PlayOnceSetSpeed(&this->skelAnime, &D_06001854, 1.0f); + this->unk_280 = 0; + this->actor.flags &= ~1; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_APPEAR); + EnSkb_SetupAction(this, func_80AFCE5C); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD540.s") +void func_80AFCE5C(EnSkb* this, GlobalContext* globalCtx) { + if (this->skelAnime.curFrame < 4.0f) { + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + this->actor.shape.rot.y = this->actor.yawTowardsPlayer; + } else { + this->actor.flags |= 1; + } + Math_SmoothStepToF(&this->actor.shape.yOffset, 0.0f, 1.0f, 800.0f, 0.0f); + Math_SmoothStepToF(&this->actor.shape.shadowScale, 25.0f, 1.0f, 2.5f, 0.0f); + if ((globalCtx->gameplayFrames & 1) != 0) { + EnSkb_SpawnDebris(globalCtx, this, &this->actor.world.pos); + } + if ((SkelAnime_Update(&this->skelAnime) != 0) && (0.0f == this->actor.shape.yOffset)) { + func_80AFCD60(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD59C.s") +void func_80AFCF48(EnSkb* this) { + Animation_Change(&this->skelAnime, &D_06001854, -1.0f, Animation_GetLastFrame(&D_06001854), 0.0f, 2, -4.0f); + this->unk_280 = 0; + this->unk_281 = 0; + this->actor.flags &= ~1; + this->actor.speedXZ = 0.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + EnSkb_SetupAction(this, func_80AFCFF0); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s") +void func_80AFCFF0(EnSkb* this, GlobalContext* globalCtx) { + if ((Math_SmoothStepToF(&this->actor.shape.yOffset, -8000.0f, 1.0f, 500.0f, 0.0f) != 0.0f) && + (globalCtx->gameplayFrames & 1)) { + EnSkb_SpawnDebris(globalCtx, this, &this->actor.world.pos); + } + Math_SmoothStepToF(&this->actor.shape.shadowScale, 0.0f, 1.0f, 2.5f, 0.0f); + if (SkelAnime_Update(&this->skelAnime) != 0) { + Actor_Kill(&this->actor); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD6CC.s") +void func_80AFD0A4(EnSkb* this) { + Animation_Change(&this->skelAnime, &D_060047E0, 0.96000004f, 0.0f, Animation_GetLastFrame(&D_060047E0), 0, -4.0f); + this->unk_280 = 4; + this->unk_288 = 0; + this->actor.speedXZ = this->actor.scale.y * 160.0f; + EnSkb_SetupAction(this, EnSkb_Advance); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s") +void EnSkb_Advance(EnSkb* this, GlobalContext* globalCtx) { + s32 thisKeyFrame; + s32 prevKeyFrame; + f32 playSpeed; + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD880.s") + if ((this->unk_283 != 0) && ((globalCtx->gameplayFrames & 0xF) == 0)) { + this->unk_288 = Rand_CenteredFloat(50000.0f); + } + Math_SmoothStepToS(&this->actor.shape.rot.y, (this->actor.yawTowardsPlayer + this->unk_288), 1, 0x2EE, 0); + this->actor.world.rot.y = this->actor.shape.rot.y; + thisKeyFrame = this->skelAnime.curFrame; + SkelAnime_Update(&this->skelAnime); + if (this->skelAnime.playSpeed >= 0.0f) { + playSpeed = this->skelAnime.playSpeed; + } else { + playSpeed = -this->skelAnime.playSpeed; + } + prevKeyFrame = (this->skelAnime.curFrame - playSpeed); + if (this->skelAnime.playSpeed >= 0.0f) { + playSpeed = this->skelAnime.playSpeed; + } else { + playSpeed = -this->skelAnime.playSpeed; + } + if (thisKeyFrame != (s32)this->skelAnime.curFrame) { + if (((prevKeyFrame < 9) && (((s32)playSpeed + thisKeyFrame) >= 8)) || + !((prevKeyFrame >= 16) || (((s32)playSpeed + thisKeyFrame) < 15))) { -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s") + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALKID_WALK); + } + } + if (Math_Vec3f_DistXZ(&this->actor.home.pos, &player->actor.world.pos) > 800.0f || gSaveContext.nightFlag == 0) { + func_80AFCF48(this); + } else if ((func_8002E084(&this->actor, 0x11C7) != 0) && + (this->actor.xzDistToPlayer < (60.0f + (this->actor.params * 6.0f)))) { + func_80AFD33C(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Update.s") +void func_80AFD33C(EnSkb* this) { + Animation_Change(&this->skelAnime, &D_06000460, 0.6f, 0.0f, Animation_GetLastFrame(&D_06000460), 3, 4.0f); + this->collider.base.atFlags &= ~4; + this->unk_280 = 3; + this->actor.speedXZ = 0.0f; + EnSkb_SetupAction(this, EnSkb_SetupAttack); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s") +void EnSkb_SetupAttack(EnSkb* this, GlobalContext* globalCtx) { + s32 frameData; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDF24.s") + frameData = this->skelAnime.curFrame; + if (frameData == 3) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALKID_ATTACK); + this->unk_281 = 1; + } else if (frameData == 6) { + this->unk_281 = 0; + } + if (this->collider.base.atFlags & 4) { + this->collider.base.atFlags &= ~6; + func_80AFD47C(this); + } else if (SkelAnime_Update(&this->skelAnime) != 0) { + func_80AFCD60(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_Draw.s") +void func_80AFD47C(EnSkb* this) { + Animation_Change(&this->skelAnime, &D_06000460, -0.4f, this->skelAnime.curFrame - 1.0f, 0.0f, 3, 0.0f); + this->collider.base.atFlags &= ~4; + this->unk_280 = 5; + this->unk_281 = 0; + EnSkb_SetupAction(this, func_80AFD508); +} + +void func_80AFD508(EnSkb* this, GlobalContext* globalCtx) { + if (SkelAnime_Update(&this->skelAnime) != 0) { + func_80AFCD60(this); + } +} + +void EnSkb_SetupStunned(EnSkb* this) { + if (this->actor.bgCheckFlags & 1) { + this->actor.speedXZ = 0.0f; + } + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); + this->unk_281 = 0; + this->unk_280 = 6; + EnSkb_SetupAction(this, func_80AFD59C); +} + +void func_80AFD59C(EnSkb* this, GlobalContext* globalCtx) { + if (this->actor.bgCheckFlags & 2) { + this->actor.speedXZ = 0.0f; + } + if (this->actor.bgCheckFlags & 1) { + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ += 0.05f; + } + } + if ((this->actor.colorFilterTimer == 0) && (this->actor.bgCheckFlags & 1)) { + if (this->actor.colChkInfo.health == 0) { + func_80AFD7B4(this, globalCtx); + } else { + func_80AFCD60(this); + } + } +} + +void func_80AFD644(EnSkb* this) { + Animation_MorphToPlayOnce(&this->skelAnime, &D_06000D98, -4.0f); + if (this->actor.bgCheckFlags & 1) { + this->actor.speedXZ = -4.0f; + } + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALKID_DAMAGE); + this->unk_280 = 2; + EnSkb_SetupAction(this, func_80AFD6CC); +} + +void func_80AFD6CC(EnSkb* this, GlobalContext* globalCtx) { + // this cast is likely not real, but allows for a match + u8* new_var; + new_var = &this->unk_283; + if ((this->unk_283 != 1) || func_8003305C(&this->actor, &this->unk_28C, globalCtx, 1)) { + if ((*new_var) != 0) { + this->unk_283 = (*new_var) | 2; + } + if (this->actor.bgCheckFlags & 2) { + this->actor.speedXZ = 0; + } + if (this->actor.bgCheckFlags & 1) { + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ += 0.05f; + } + } + + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 1, 0x1194, 0); + if (SkelAnime_Update(&this->skelAnime) && (this->actor.bgCheckFlags & 1)) { + func_80AFCD60(this); + } + } +} + +void func_80AFD7B4(EnSkb* this, GlobalContext* globalCtx) { + Animation_MorphToPlayOnce(&this->skelAnime, &D_060009DC, -4.0f); + this->actor.shape.rot.y = this->actor.yawTowardsPlayer; + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + if (this->actor.bgCheckFlags & 1) { + this->actor.speedXZ = -6.0f; + } + this->unk_280 = 1; + this->actor.flags &= ~1; + func_80032E24(&this->unk_28C, 18, globalCtx); + this->unk_283 |= 4; + EffectSsDeadSound_SpawnStationary(globalCtx, &this->actor.projectedPos, NA_SE_EN_STALKID_DEAD, 1, 1, 0x28); + EnSkb_SetupAction(this, func_80AFD880); +} + +void func_80AFD880(EnSkb* this, GlobalContext* globalCtx) { + if (func_8003305C(&this->actor, &this->unk_28C, globalCtx, 1) != 0) { + if (this->actor.scale.x == 0.01f) { + Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0x10); + } else { + if (this->actor.scale.x <= 0.015f) { + Item_DropCollectible(globalCtx, &this->actor.world.pos, ITEM00_RUPEE_BLUE); + } else { + Item_DropCollectible(globalCtx, &this->actor.world.pos, ITEM00_RUPEE_RED); + Item_DropCollectible(globalCtx, &this->actor.world.pos, ITEM00_RUPEE_RED); + Item_DropCollectible(globalCtx, &this->actor.world.pos, ITEM00_RUPEE_RED); + } + } + this->unk_283 |= 8; + Actor_Kill(&this->actor); + } +} + +void func_80AFD968(EnSkb* this, GlobalContext* globalCtx) { + s16 pad; + s32 i; + Vec3f flamePos; + s16 scale; + s16 phi_v1; + Player* player; + + if ((this->unk_280 != 1) && (this->actor.bgCheckFlags & 0x60) && (this->actor.yDistToWater >= 40.0f)) { + this->actor.colChkInfo.health = 0; + this->unk_281 = 0; + func_80AFD7B4(this, globalCtx); + } else if (this->unk_280 >= 3) { + if ((this->collider.base.acFlags & 2) != 0) { + this->collider.base.acFlags &= ~2; + if (this->actor.colChkInfo.damageEffect != 6) { + this->unk_282 = this->actor.colChkInfo.damageEffect; + func_80035650(&this->actor, &this->collider.elements[1].info, 1); + this->unk_281 = 0; + if (this->actor.colChkInfo.damageEffect == 1) { + if (this->unk_280 != 6) { + Actor_SetColorFilter(&this->actor, 0, 0x78, 0, 0x50); + Actor_ApplyDamage(&this->actor); + EnSkb_SetupStunned(this); + } + } else { + phi_v1 = 8; + if (this->actor.colChkInfo.damageEffect == 7) { + scale = this->actor.scale.y * 7500.0f; + for (i = 4; i >= 0; i--) { + flamePos = this->actor.world.pos; + flamePos.x += Rand_CenteredFloat(20.0f); + flamePos.z += Rand_CenteredFloat(20.0f); + flamePos.y += (Rand_ZeroOne() * 25.0f); + EffectSsEnFire_SpawnVec3f(globalCtx, &this->actor, &flamePos, scale, 0, 0, -1); + } + phi_v1 = 25; + } + Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, phi_v1); + if (!Actor_ApplyDamage(&this->actor)) { + func_80AFD7B4(this, globalCtx); + return; + } + player = PLAYER; + if (this->unk_283 == 0) { + if ((this->actor.colChkInfo.damageEffect == 0xD) || + ((this->actor.colChkInfo.damageEffect == 0xE) && + ((player->swordAnimation >= 4 && player->swordAnimation <= 11) || + (player->swordAnimation == 20 || player->swordAnimation == 21)))) { + func_80032E24(&this->unk_28C, 2, globalCtx); + this->unk_283 = 1; + } + } + func_80AFD644(this); + } + } + } + } +} + +void EnSkb_Update(Actor* thisx, GlobalContext* globalCtx) { + EnSkb* this = THIS; + s32 pad; + + func_80AFD968(this, globalCtx); + Actor_MoveForward(&this->actor); + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 15.0f, 30.0f, 60.0f, 0x1D); + this->actionFunc(this, globalCtx); + this->actor.focus.pos = this->actor.world.pos; + this->actor.focus.pos.y += (3000.0f * this->actor.scale.y); + if (this->unk_281 != 0) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + + if (this->unk_280 >= 3) { + if ((this->actor.colorFilterTimer == 0) || ((this->actor.colorFilterParams & 0x4000) == 0)) { + + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + } + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); +} + +s32 EnSkb_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { + EnSkb* this = THIS; + s16 color; + s16 pad[2]; + + if (limbIndex == 11) { + if ((this->unk_283 & 2) == 0) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_skb.c", 972); + color = ABS((s16)(Math_SinS((globalCtx->gameplayFrames * 0x1770)) * 95.0f)) + 160; + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, color, color, color, 255); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_skb.c", 978); + } else { + *dList = NULL; + } + } else if ((limbIndex == 12) && ((this->unk_283 & 2) != 0)) { + *dList = NULL; + } + return 0; +} + +#ifdef NON_MATCHING +// t1 needs to be skipped when storing the args for the second function call +void EnSkb_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + EnSkb* this = THIS; + + Collider_UpdateSpheres(limbIndex, &this->collider); + + if ((this->unk_283 ^ 1) == 0) { + func_80032F54(&this->unk_28C, limbIndex, 0xB, 0xC, 0x12, dList, -1); + } else if ((this->unk_283 | 4) == this->unk_283) { + func_80032F54(&this->unk_28C, limbIndex, 0, 0x12, 0x12, dList, -1); + } +} +#else +void EnSkb_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx); +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skb/EnSkb_PostLimbDraw.s") +#endif + +void EnSkb_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnSkb* this = THIS; + func_80093D18(globalCtx->state.gfxCtx); + SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnSkb_OverrideLimbDraw, + EnSkb_PostLimbDraw, &this->actor); +} diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h index b8d4ff12e5..d79b5f8d15 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h @@ -6,9 +6,22 @@ struct EnSkb; +typedef void (*EnSkbActionFunc)(struct EnSkb*, GlobalContext*); + typedef struct EnSkb { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1F8]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s limbDrawTable[20]; + /* 0x0208 */ Vec3s transitionDrawTable[20]; + /* 0x0280 */ u8 unk_280; + /* 0x0281 */ u8 unk_281; + /* 0x0282 */ u8 unk_282; + /* 0x0283 */ u8 unk_283; + /* 0x0284 */ EnSkbActionFunc actionFunc; + /* 0x0288 */ s16 unk_288; + /* 0x028C */ struct_80032E24 unk_28C; + /* 0x02A4 */ ColliderJntSph collider; + /* 0x02C4 */ ColliderJntSphElement colliderItem[2]; } EnSkb; // size = 0x0344 extern const ActorInit En_Skb_InitVars;