From bbbf657b4b15ee2c7dbf76ef34df5170ff6fd475 Mon Sep 17 00:00:00 2001 From: mzxrules Date: Sun, 21 Feb 2021 09:25:53 -0500 Subject: [PATCH] z_en_peehat (#660) * decomp most of En_Peehat * z_en_peehat code decomp'd and OK * complete data migration * first pass at documentation * minor code clean-up * documentation pass * fix spec (hopefully), implement some of petrie's suggestions * implement requested changes * fix compiler warnings * implement fig's changes * implement roman's changes --- .../actors/ovl_En_Peehat/EnPeehat_Destroy.s | 32 - .../actors/ovl_En_Peehat/EnPeehat_Draw.s | 66 -- .../actors/ovl_En_Peehat/EnPeehat_Init.s | 176 --- .../actors/ovl_En_Peehat/EnPeehat_Update.s | 320 ----- .../actors/ovl_En_Peehat/func_80ACF4A0.s | 3 - .../actors/ovl_En_Peehat/func_80ACF788.s | 113 -- .../actors/ovl_En_Peehat/func_80ACF920.s | 153 --- .../actors/ovl_En_Peehat/func_80ACFB34.s | 41 - .../actors/ovl_En_Peehat/func_80ACFBCC.s | 96 -- .../actors/ovl_En_Peehat/func_80ACFD20.s | 38 - .../actors/ovl_En_Peehat/func_80ACFDAC.s | 73 -- .../actors/ovl_En_Peehat/func_80ACFEB0.s | 19 - .../actors/ovl_En_Peehat/func_80ACFEF8.s | 111 -- .../actors/ovl_En_Peehat/func_80AD0070.s | 47 - .../actors/ovl_En_Peehat/func_80AD0118.s | 130 -- .../actors/ovl_En_Peehat/func_80AD02E4.s | 47 - .../actors/ovl_En_Peehat/func_80AD038C.s | 130 -- .../actors/ovl_En_Peehat/func_80AD0558.s | 21 - .../actors/ovl_En_Peehat/func_80AD05A8.s | 108 -- .../actors/ovl_En_Peehat/func_80AD0720.s | 20 - .../actors/ovl_En_Peehat/func_80AD076C.s | 284 ----- .../actors/ovl_En_Peehat/func_80AD0B3C.s | 19 - .../actors/ovl_En_Peehat/func_80AD0B84.s | 125 -- .../actors/ovl_En_Peehat/func_80AD0D3C.s | 19 - .../actors/ovl_En_Peehat/func_80AD0D84.s | 125 -- .../actors/ovl_En_Peehat/func_80AD0F38.s | 39 - .../actors/ovl_En_Peehat/func_80AD0FC8.s | 176 --- .../actors/ovl_En_Peehat/func_80AD1220.s | 15 - .../actors/ovl_En_Peehat/func_80AD1258.s | 145 --- .../actors/ovl_En_Peehat/func_80AD1440.s | 25 - .../actors/ovl_En_Peehat/func_80AD14A0.s | 130 -- .../actors/ovl_En_Peehat/func_80AD167C.s | 36 - .../actors/ovl_En_Peehat/func_80AD1700.s | 35 - .../actors/ovl_En_Peehat/func_80AD177C.s | 28 - .../actors/ovl_En_Peehat/func_80AD17E8.s | 202 ---- .../actors/ovl_En_Peehat/func_80AD1AA8.s | 23 - .../actors/ovl_En_Peehat/func_80AD1B00.s | 63 - .../actors/ovl_En_Peehat/func_80AD1BD8.s | 138 --- .../actors/ovl_En_Peehat/func_80AD2224.s | 168 --- .../actors/ovl_En_Peehat/func_80AD2438.s | 156 --- data/overlays/actors/z_en_peehat.data.s | 51 - data/overlays/actors/z_en_peehat.reloc.s | 13 - spec | 3 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 1055 +++++++++++++++-- .../actors/ovl_En_Peehat/z_en_peehat.h | 35 +- undefined_syms.txt | 7 + 46 files changed, 1025 insertions(+), 3834 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF4A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0118.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD038C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B84.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D84.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1220.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD167C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1700.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD177C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1B00.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s delete mode 100644 data/overlays/actors/z_en_peehat.data.s delete mode 100644 data/overlays/actors/z_en_peehat.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Destroy.s deleted file mode 100644 index a8ec60605a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Destroy.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel EnPeehat_Destroy -/* 00274 80ACF714 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00278 80ACF718 AFA40018 */ sw $a0, 0x0018($sp) -/* 0027C 80ACF71C AFA5001C */ sw $a1, 0x001C($sp) -/* 00280 80ACF720 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00284 80ACF724 8FA50018 */ lw $a1, 0x0018($sp) -/* 00288 80ACF728 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0028C 80ACF72C 0C0170EB */ jal Collider_DestroyCylinder - -/* 00290 80ACF730 24A50300 */ addiu $a1, $a1, 0x0300 ## $a1 = 00000300 -/* 00294 80ACF734 8FA50018 */ lw $a1, 0x0018($sp) -/* 00298 80ACF738 8FA4001C */ lw $a0, 0x001C($sp) -/* 0029C 80ACF73C 0C016F32 */ jal Collider_DestroyJntSph -/* 002A0 80ACF740 24A5034C */ addiu $a1, $a1, 0x034C ## $a1 = 0000034C -/* 002A4 80ACF744 8FA30018 */ lw $v1, 0x0018($sp) -/* 002A8 80ACF748 846E001C */ lh $t6, 0x001C($v1) ## 0000001C -/* 002AC 80ACF74C 59C0000B */ blezl $t6, .L80ACF77C -/* 002B0 80ACF750 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002B4 80ACF754 8C620118 */ lw $v0, 0x0118($v1) ## 00000118 -/* 002B8 80ACF758 50400008 */ beql $v0, $zero, .L80ACF77C -/* 002BC 80ACF75C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002C0 80ACF760 8C4F0130 */ lw $t7, 0x0130($v0) ## 00000130 -/* 002C4 80ACF764 51E00005 */ beql $t7, $zero, .L80ACF77C -/* 002C8 80ACF768 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002CC 80ACF76C 845802FA */ lh $t8, 0x02FA($v0) ## 000002FA -/* 002D0 80ACF770 2719FFFF */ addiu $t9, $t8, 0xFFFF ## $t9 = FFFFFFFF -/* 002D4 80ACF774 A45902FA */ sh $t9, 0x02FA($v0) ## 000002FA -/* 002D8 80ACF778 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACF77C: -/* 002DC 80ACF77C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002E0 80ACF780 03E00008 */ jr $ra -/* 002E4 80ACF784 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Draw.s deleted file mode 100644 index 95d123955c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Draw.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel EnPeehat_Draw -/* 03188 80AD2628 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0318C 80AD262C AFB00020 */ sw $s0, 0x0020($sp) -/* 03190 80AD2630 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03194 80AD2634 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03198 80AD2638 AFA50044 */ sw $a1, 0x0044($sp) -/* 0319C 80AD263C 0C024F46 */ jal func_80093D18 -/* 031A0 80AD2640 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 031A4 80AD2644 3C0F80AD */ lui $t7, %hi(func_80AD2438) ## $t7 = 80AD0000 -/* 031A8 80AD2648 25EF2438 */ addiu $t7, $t7, %lo(func_80AD2438) ## $t7 = 80AD2438 -/* 031AC 80AD264C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 031B0 80AD2650 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 031B4 80AD2654 3C0780AD */ lui $a3, %hi(func_80AD2224) ## $a3 = 80AD0000 -/* 031B8 80AD2658 24E72224 */ addiu $a3, $a3, %lo(func_80AD2224) ## $a3 = 80AD2224 -/* 031BC 80AD265C AFB00014 */ sw $s0, 0x0014($sp) -/* 031C0 80AD2660 AFAF0010 */ sw $t7, 0x0010($sp) -/* 031C4 80AD2664 0C028572 */ jal SkelAnime_DrawOpa - -/* 031C8 80AD2668 8FA40044 */ lw $a0, 0x0044($sp) -/* 031CC 80AD266C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 031D0 80AD2670 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 031D4 80AD2674 3C0480AD */ lui $a0, %hi(D_80AD285C) ## $a0 = 80AD0000 -/* 031D8 80AD2678 2484285C */ addiu $a0, $a0, %lo(D_80AD285C) ## $a0 = 80AD285C -/* 031DC 80AD267C 46040032 */ c.eq.s $f0, $f4 -/* 031E0 80AD2680 260503F8 */ addiu $a1, $s0, 0x03F8 ## $a1 = 000003F8 -/* 031E4 80AD2684 45000006 */ bc1f .L80AD26A0 -/* 031E8 80AD2688 00000000 */ nop -/* 031EC 80AD268C C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 -/* 031F0 80AD2690 46060032 */ c.eq.s $f0, $f6 -/* 031F4 80AD2694 00000000 */ nop -/* 031F8 80AD2698 4503001B */ bc1tl .L80AD2708 -/* 031FC 80AD269C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AD26A0: -/* 03200 80AD26A0 0C0346BD */ jal Matrix_MultVec3f -/* 03204 80AD26A4 AFA50034 */ sw $a1, 0x0034($sp) -/* 03208 80AD26A8 3C0480AD */ lui $a0, %hi(D_80AD2868) ## $a0 = 80AD0000 -/* 0320C 80AD26AC 260503EC */ addiu $a1, $s0, 0x03EC ## $a1 = 000003EC -/* 03210 80AD26B0 AFA50038 */ sw $a1, 0x0038($sp) -/* 03214 80AD26B4 0C0346BD */ jal Matrix_MultVec3f -/* 03218 80AD26B8 24842868 */ addiu $a0, $a0, %lo(D_80AD2868) ## $a0 = 80AD2868 -/* 0321C 80AD26BC 3C0480AD */ lui $a0, %hi(D_80AD2874) ## $a0 = 80AD0000 -/* 03220 80AD26C0 26050410 */ addiu $a1, $s0, 0x0410 ## $a1 = 00000410 -/* 03224 80AD26C4 AFA5002C */ sw $a1, 0x002C($sp) -/* 03228 80AD26C8 0C0346BD */ jal Matrix_MultVec3f -/* 0322C 80AD26CC 24842874 */ addiu $a0, $a0, %lo(D_80AD2874) ## $a0 = 80AD2874 -/* 03230 80AD26D0 3C0480AD */ lui $a0, %hi(D_80AD2880) ## $a0 = 80AD0000 -/* 03234 80AD26D4 26070404 */ addiu $a3, $s0, 0x0404 ## $a3 = 00000404 -/* 03238 80AD26D8 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000404 -/* 0323C 80AD26DC AFA70030 */ sw $a3, 0x0030($sp) -/* 03240 80AD26E0 0C0346BD */ jal Matrix_MultVec3f -/* 03244 80AD26E4 24842880 */ addiu $a0, $a0, %lo(D_80AD2880) ## $a0 = 80AD2880 -/* 03248 80AD26E8 8FB8002C */ lw $t8, 0x002C($sp) -/* 0324C 80AD26EC 8FA70030 */ lw $a3, 0x0030($sp) -/* 03250 80AD26F0 260403AC */ addiu $a0, $s0, 0x03AC ## $a0 = 000003AC -/* 03254 80AD26F4 8FA50038 */ lw $a1, 0x0038($sp) -/* 03258 80AD26F8 8FA60034 */ lw $a2, 0x0034($sp) -/* 0325C 80AD26FC 0C0189CD */ jal Collider_SetQuadVertices -/* 03260 80AD2700 AFB80010 */ sw $t8, 0x0010($sp) -/* 03264 80AD2704 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AD2708: -/* 03268 80AD2708 8FB00020 */ lw $s0, 0x0020($sp) -/* 0326C 80AD270C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 03270 80AD2710 03E00008 */ jr $ra -/* 03274 80AD2714 00000000 */ nop -/* 03278 80AD2718 00000000 */ nop -/* 0327C 80AD271C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s deleted file mode 100644 index 768ca36983..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s +++ /dev/null @@ -1,176 +0,0 @@ -.late_rodata -glabel D_80AD2908 - .word 0x45834000 -glabel D_80AD290C - .word 0x3BC49BA6 -glabel D_80AD2910 - .word 0x3B449BA6 - -.text -glabel EnPeehat_Init -/* 00008 80ACF4A8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0000C 80ACF4AC AFB10028 */ sw $s1, 0x0028($sp) -/* 00010 80ACF4B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00014 80ACF4B4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 80ACF4B8 AFB00024 */ sw $s0, 0x0024($sp) -/* 0001C 80ACF4BC 3C0580AD */ lui $a1, %hi(D_80AD2810) ## $a1 = 80AD0000 -/* 00020 80ACF4C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00024 80ACF4C4 0C01E037 */ jal Actor_ProcessInitChain - -/* 00028 80ACF4C8 24A52810 */ addiu $a1, $a1, %lo(D_80AD2810) ## $a1 = 80AD2810 -/* 0002C 80ACF4CC 3C053D13 */ lui $a1, 0x3D13 ## $a1 = 3D130000 -/* 00030 80ACF4D0 34A574BD */ ori $a1, $a1, 0x74BD ## $a1 = 3D1374BD -/* 00034 80ACF4D4 0C00B58B */ jal Actor_SetScale - -/* 00038 80ACF4D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0003C 80ACF4DC 3C060600 */ lui $a2, %hi(D_06001C80) ## $a2 = 06000000 -/* 00040 80ACF4E0 3C070600 */ lui $a3, %hi(D_060009C4) ## $a3 = 06000000 -/* 00044 80ACF4E4 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 -/* 00048 80ACF4E8 260F0220 */ addiu $t7, $s0, 0x0220 ## $t7 = 00000220 -/* 0004C 80ACF4EC 24180018 */ addiu $t8, $zero, 0x0018 ## $t8 = 00000018 -/* 00050 80ACF4F0 AFB80018 */ sw $t8, 0x0018($sp) -/* 00054 80ACF4F4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00058 80ACF4F8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0005C 80ACF4FC 24E709C4 */ addiu $a3, $a3, %lo(D_060009C4) ## $a3 = 060009C4 -/* 00060 80ACF500 24C61C80 */ addiu $a2, $a2, %lo(D_06001C80) ## $a2 = 06001C80 -/* 00064 80ACF504 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00068 80ACF508 0C02915F */ jal SkelAnime_Init - -/* 0006C 80ACF50C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00070 80ACF510 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 00074 80ACF514 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 00078 80ACF518 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 0007C 80ACF51C 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 -/* 00080 80ACF520 0C00AC78 */ jal ActorShape_Init - -/* 00084 80ACF524 3C0741D8 */ lui $a3, 0x41D8 ## $a3 = 41D80000 -/* 00088 80ACF528 8E080024 */ lw $t0, 0x0024($s0) ## 00000024 -/* 0008C 80ACF52C 8E190028 */ lw $t9, 0x0028($s0) ## 00000028 -/* 00090 80ACF530 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00094 80ACF534 AE080038 */ sw $t0, 0x0038($s0) ## 00000038 -/* 00098 80ACF538 8E08002C */ lw $t0, 0x002C($s0) ## 0000002C -/* 0009C 80ACF53C 3C0B80AD */ lui $t3, %hi(D_80AD27F0) ## $t3 = 80AD0000 -/* 000A0 80ACF540 240900FE */ addiu $t1, $zero, 0x00FE ## $t1 = 000000FE -/* 000A4 80ACF544 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 000A8 80ACF548 256B27F0 */ addiu $t3, $t3, %lo(D_80AD27F0) ## $t3 = 80AD27F0 -/* 000AC 80ACF54C AE0002D4 */ sw $zero, 0x02D4($s0) ## 000002D4 -/* 000B0 80ACF550 A6000032 */ sh $zero, 0x0032($s0) ## 00000032 -/* 000B4 80ACF554 A20900AE */ sb $t1, 0x00AE($s0) ## 000000AE -/* 000B8 80ACF558 A20A00AF */ sb $t2, 0x00AF($s0) ## 000000AF -/* 000BC 80ACF55C AE0B0098 */ sw $t3, 0x0098($s0) ## 00000098 -/* 000C0 80ACF560 26050300 */ addiu $a1, $s0, 0x0300 ## $a1 = 00000300 -/* 000C4 80ACF564 AE19003C */ sw $t9, 0x003C($s0) ## 0000003C -/* 000C8 80ACF568 E6040080 */ swc1 $f4, 0x0080($s0) ## 00000080 -/* 000CC 80ACF56C AE080040 */ sw $t0, 0x0040($s0) ## 00000040 -/* 000D0 80ACF570 AFA50034 */ sw $a1, 0x0034($sp) -/* 000D4 80ACF574 0C0170D9 */ jal Collider_InitCylinder - -/* 000D8 80ACF578 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000DC 80ACF57C 3C0780AD */ lui $a3, %hi(D_80AD2740) ## $a3 = 80AD0000 -/* 000E0 80ACF580 8FA50034 */ lw $a1, 0x0034($sp) -/* 000E4 80ACF584 24E72740 */ addiu $a3, $a3, %lo(D_80AD2740) ## $a3 = 80AD2740 -/* 000E8 80ACF588 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000EC 80ACF58C 0C01712B */ jal Collider_SetCylinder - -/* 000F0 80ACF590 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000F4 80ACF594 260503AC */ addiu $a1, $s0, 0x03AC ## $a1 = 000003AC -/* 000F8 80ACF598 AFA50034 */ sw $a1, 0x0034($sp) -/* 000FC 80ACF59C 0C017406 */ jal Collider_InitQuad -/* 00100 80ACF5A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00104 80ACF5A4 3C0780AD */ lui $a3, %hi(D_80AD27A0) ## $a3 = 80AD0000 -/* 00108 80ACF5A8 8FA50034 */ lw $a1, 0x0034($sp) -/* 0010C 80ACF5AC 24E727A0 */ addiu $a3, $a3, %lo(D_80AD27A0) ## $a3 = 80AD27A0 -/* 00110 80ACF5B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00114 80ACF5B4 0C017441 */ jal Collider_SetQuad -/* 00118 80ACF5B8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0011C 80ACF5BC 2605034C */ addiu $a1, $s0, 0x034C ## $a1 = 0000034C -/* 00120 80ACF5C0 AFA50034 */ sw $a1, 0x0034($sp) -/* 00124 80ACF5C4 0C016EFE */ jal Collider_InitJntSph -/* 00128 80ACF5C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0012C 80ACF5CC 3C0780AD */ lui $a3, %hi(D_80AD2790) ## $a3 = 80AD0000 -/* 00130 80ACF5D0 260C036C */ addiu $t4, $s0, 0x036C ## $t4 = 0000036C -/* 00134 80ACF5D4 8FA50034 */ lw $a1, 0x0034($sp) -/* 00138 80ACF5D8 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0013C 80ACF5DC 24E72790 */ addiu $a3, $a3, %lo(D_80AD2790) ## $a3 = 80AD2790 -/* 00140 80ACF5E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00144 80ACF5E4 0C017014 */ jal Collider_SetJntSph -/* 00148 80ACF5E8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0014C 80ACF5EC 3C014439 */ lui $at, 0x4439 ## $at = 44390000 -/* 00150 80ACF5F0 44813000 */ mtc1 $at, $f6 ## $f6 = 740.00 -/* 00154 80ACF5F4 3C014496 */ lui $at, 0x4496 ## $at = 44960000 -/* 00158 80ACF5F8 44814000 */ mtc1 $at, $f8 ## $f8 = 1200.00 -/* 0015C 80ACF5FC 3C01457A */ lui $at, 0x457A ## $at = 457A0000 -/* 00160 80ACF600 44815000 */ mtc1 $at, $f10 ## $f10 = 4000.00 -/* 00164 80ACF604 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 00168 80ACF608 44818000 */ mtc1 $at, $f16 ## $f16 = 800.00 -/* 0016C 80ACF60C 3C0144E1 */ lui $at, 0x44E1 ## $at = 44E10000 -/* 00170 80ACF610 44819000 */ mtc1 $at, $f18 ## $f18 = 1800.00 -/* 00174 80ACF614 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00178 80ACF618 240D0048 */ addiu $t5, $zero, 0x0048 ## $t5 = 00000048 -/* 0017C 80ACF61C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00180 80ACF620 A20D0117 */ sb $t5, 0x0117($s0) ## 00000117 -/* 00184 80ACF624 E60602DC */ swc1 $f6, 0x02DC($s0) ## 000002DC -/* 00188 80ACF628 E60802D8 */ swc1 $f8, 0x02D8($s0) ## 000002D8 -/* 0018C 80ACF62C E60A00F4 */ swc1 $f10, 0x00F4($s0) ## 000000F4 -/* 00190 80ACF630 E61000F8 */ swc1 $f16, 0x00F8($s0) ## 000000F8 -/* 00194 80ACF634 10410008 */ beq $v0, $at, .L80ACF658 -/* 00198 80ACF638 E61200FC */ swc1 $f18, 0x00FC($s0) ## 000000FC -/* 0019C 80ACF63C 1040000A */ beq $v0, $zero, .L80ACF668 -/* 001A0 80ACF640 3C0180AD */ lui $at, %hi(D_80AD2908) ## $at = 80AD0000 -/* 001A4 80ACF644 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 001A8 80ACF648 10410016 */ beq $v0, $at, .L80ACF6A4 -/* 001AC 80ACF64C 24180019 */ addiu $t8, $zero, 0x0019 ## $t8 = 00000019 -/* 001B0 80ACF650 1000002C */ beq $zero, $zero, .L80ACF704 -/* 001B4 80ACF654 8FBF002C */ lw $ra, 0x002C($sp) -.L80ACF658: -/* 001B8 80ACF658 0C2B3ECD */ jal func_80ACFB34 -/* 001BC 80ACF65C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001C0 80ACF660 10000028 */ beq $zero, $zero, .L80ACF704 -/* 001C4 80ACF664 8FBF002C */ lw $ra, 0x002C($sp) -.L80ACF668: -/* 001C8 80ACF668 C4242908 */ lwc1 $f4, %lo(D_80AD2908)($at) -/* 001CC 80ACF66C 3C01452F */ lui $at, 0x452F ## $at = 452F0000 -/* 001D0 80ACF670 44813000 */ mtc1 $at, $f6 ## $f6 = 2800.00 -/* 001D4 80ACF674 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 -/* 001D8 80ACF678 44814000 */ mtc1 $at, $f8 ## $f8 = 1400.00 -/* 001DC 80ACF67C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001E0 80ACF680 E60400F4 */ swc1 $f4, 0x00F4($s0) ## 000000F4 -/* 001E4 80ACF684 E60602DC */ swc1 $f6, 0x02DC($s0) ## 000002DC -/* 001E8 80ACF688 0C2B3F48 */ jal func_80ACFD20 -/* 001EC 80ACF68C E60802D8 */ swc1 $f8, 0x02D8($s0) ## 000002D8 -/* 001F0 80ACF690 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 001F4 80ACF694 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 001F8 80ACF698 01C17824 */ and $t7, $t6, $at -/* 001FC 80ACF69C 10000018 */ beq $zero, $zero, .L80ACF700 -/* 00200 80ACF6A0 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -.L80ACF6A4: -/* 00204 80ACF6A4 3C0180AD */ lui $at, %hi(D_80AD290C) ## $at = 80AD0000 -/* 00208 80ACF6A8 C420290C */ lwc1 $f0, %lo(D_80AD290C)($at) -/* 0020C 80ACF6AC 3C0180AD */ lui $at, %hi(D_80AD2910) ## $at = 80AD0000 -/* 00210 80ACF6B0 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 00214 80ACF6B4 E6000058 */ swc1 $f0, 0x0058($s0) ## 00000058 -/* 00218 80ACF6B8 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 -/* 0021C 80ACF6BC C42A2910 */ lwc1 $f10, %lo(D_80AD2910)($at) -/* 00220 80ACF6C0 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F -/* 00224 80ACF6C4 2408FFFB */ addiu $t0, $zero, 0xFFFB ## $t0 = FFFFFFFB -/* 00228 80ACF6C8 3529F824 */ ori $t1, $t1, 0xF824 ## $t1 = 0001F824 -/* 0022C 80ACF6CC 240A0011 */ addiu $t2, $zero, 0x0011 ## $t2 = 00000011 -/* 00230 80ACF6D0 240B0009 */ addiu $t3, $zero, 0x0009 ## $t3 = 00000009 -/* 00234 80ACF6D4 240C0049 */ addiu $t4, $zero, 0x0049 ## $t4 = 00000049 -/* 00238 80ACF6D8 A6180340 */ sh $t8, 0x0340($s0) ## 00000340 -/* 0023C 80ACF6DC A6190342 */ sh $t9, 0x0342($s0) ## 00000342 -/* 00240 80ACF6E0 A6080344 */ sh $t0, 0x0344($s0) ## 00000344 -/* 00244 80ACF6E4 AE090320 */ sw $t1, 0x0320($s0) ## 00000320 -/* 00248 80ACF6E8 A20A03BC */ sb $t2, 0x03BC($s0) ## 000003BC -/* 0024C 80ACF6EC A20B03BD */ sb $t3, 0x03BD($s0) ## 000003BD -/* 00250 80ACF6F0 A20C0117 */ sb $t4, 0x0117($s0) ## 00000117 -/* 00254 80ACF6F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00258 80ACF6F8 0C2B41C8 */ jal func_80AD0720 -/* 0025C 80ACF6FC E60A0054 */ swc1 $f10, 0x0054($s0) ## 00000054 -.L80ACF700: -/* 00260 80ACF700 8FBF002C */ lw $ra, 0x002C($sp) -.L80ACF704: -/* 00264 80ACF704 8FB00024 */ lw $s0, 0x0024($sp) -/* 00268 80ACF708 8FB10028 */ lw $s1, 0x0028($sp) -/* 0026C 80ACF70C 03E00008 */ jr $ra -/* 00270 80ACF710 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s deleted file mode 100644 index b6654e41de..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s +++ /dev/null @@ -1,320 +0,0 @@ -.late_rodata -glabel D_80AD2958 - .word 0x3F866666 - -.text -glabel EnPeehat_Update -/* 02924 80AD1DC4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 02928 80AD1DC8 AFBF004C */ sw $ra, 0x004C($sp) -/* 0292C 80AD1DCC AFB40048 */ sw $s4, 0x0048($sp) -/* 02930 80AD1DD0 AFB30044 */ sw $s3, 0x0044($sp) -/* 02934 80AD1DD4 AFB20040 */ sw $s2, 0x0040($sp) -/* 02938 80AD1DD8 AFB1003C */ sw $s1, 0x003C($sp) -/* 0293C 80AD1DDC AFB00038 */ sw $s0, 0x0038($sp) -/* 02940 80AD1DE0 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 02944 80AD1DE4 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 02948 80AD1DE8 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 0294C 80AD1DEC 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 02950 80AD1DF0 AFAE007C */ sw $t6, 0x007C($sp) -/* 02954 80AD1DF4 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 02958 80AD1DF8 5DE00004 */ bgtzl $t7, .L80AD1E0C -/* 0295C 80AD1DFC 927800B1 */ lbu $t8, 0x00B1($s3) ## 000000B1 -/* 02960 80AD1E00 0C2B46F6 */ jal func_80AD1BD8 -/* 02964 80AD1E04 00000000 */ nop -/* 02968 80AD1E08 927800B1 */ lbu $t8, 0x00B1($s3) ## 000000B1 -.L80AD1E0C: -/* 0296C 80AD1E0C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 02970 80AD1E10 53010031 */ beql $t8, $at, .L80AD1ED8 -/* 02974 80AD1E14 866A001C */ lh $t2, 0x001C($s3) ## 0000001C -/* 02978 80AD1E18 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 0297C 80AD1E1C C6640068 */ lwc1 $f4, 0x0068($s3) ## 00000068 -/* 02980 80AD1E20 4604A032 */ c.eq.s $f20, $f4 -/* 02984 80AD1E24 00000000 */ nop -/* 02988 80AD1E28 45000006 */ bc1f .L80AD1E44 -/* 0298C 80AD1E2C 00000000 */ nop -/* 02990 80AD1E30 C6660060 */ lwc1 $f6, 0x0060($s3) ## 00000060 -/* 02994 80AD1E34 4606A032 */ c.eq.s $f20, $f6 -/* 02998 80AD1E38 00000000 */ nop -/* 0299C 80AD1E3C 4503000E */ bc1tl .L80AD1E78 -/* 029A0 80AD1E40 8E7902B8 */ lw $t9, 0x02B8($s3) ## 000002B8 -.L80AD1E44: -/* 029A4 80AD1E44 0C00B638 */ jal Actor_MoveForward - -/* 029A8 80AD1E48 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 029AC 80AD1E4C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 029B0 80AD1E50 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 029B4 80AD1E54 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 029B8 80AD1E58 AFB90014 */ sw $t9, 0x0014($sp) -/* 029BC 80AD1E5C 44070000 */ mfc1 $a3, $f0 -/* 029C0 80AD1E60 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 029C4 80AD1E64 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 029C8 80AD1E68 3C0641C8 */ lui $a2, 0x41C8 ## $a2 = 41C80000 -/* 029CC 80AD1E6C 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 029D0 80AD1E70 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 029D4 80AD1E74 8E7902B8 */ lw $t9, 0x02B8($s3) ## 000002B8 -.L80AD1E78: -/* 029D8 80AD1E78 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 029DC 80AD1E7C 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 029E0 80AD1E80 0320F809 */ jalr $ra, $t9 -/* 029E4 80AD1E84 00000000 */ nop -/* 029E8 80AD1E88 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 029EC 80AD1E8C 01144021 */ addu $t0, $t0, $s4 -/* 029F0 80AD1E90 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 -/* 029F4 80AD1E94 3109007F */ andi $t1, $t0, 0x007F ## $t1 = 00000000 -/* 029F8 80AD1E98 5520000B */ bnel $t1, $zero, .L80AD1EC8 -/* 029FC 80AD1E9C C66402E4 */ lwc1 $f4, 0x02E4($s3) ## 000002E4 -/* 02A00 80AD1EA0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02A04 80AD1EA4 00000000 */ nop -/* 02A08 80AD1EA8 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 02A0C 80AD1EAC 44814000 */ mtc1 $at, $f8 ## $f8 = 0.25 -/* 02A10 80AD1EB0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 02A14 80AD1EB4 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 02A18 80AD1EB8 46080282 */ mul.s $f10, $f0, $f8 -/* 02A1C 80AD1EBC 46105480 */ add.s $f18, $f10, $f16 -/* 02A20 80AD1EC0 E67202E8 */ swc1 $f18, 0x02E8($s3) ## 000002E8 -/* 02A24 80AD1EC4 C66402E4 */ lwc1 $f4, 0x02E4($s3) ## 000002E4 -.L80AD1EC8: -/* 02A28 80AD1EC8 C66602E8 */ lwc1 $f6, 0x02E8($s3) ## 000002E8 -/* 02A2C 80AD1ECC 46062200 */ add.s $f8, $f4, $f6 -/* 02A30 80AD1ED0 E66802E4 */ swc1 $f8, 0x02E4($s3) ## 000002E4 -/* 02A34 80AD1ED4 866A001C */ lh $t2, 0x001C($s3) ## 0000001C -.L80AD1ED8: -/* 02A38 80AD1ED8 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 02A3C 80AD1EDC 05430026 */ bgezl $t2, .L80AD1F78 -/* 02A40 80AD1EE0 8E690024 */ lw $t1, 0x0024($s3) ## 00000024 -/* 02A44 80AD1EE4 8E6B0368 */ lw $t3, 0x0368($s3) ## 00000368 -/* 02A48 80AD1EE8 8E6D0368 */ lw $t5, 0x0368($s3) ## 00000368 -/* 02A4C 80AD1EEC 8E6F0368 */ lw $t7, 0x0368($s3) ## 00000368 -/* 02A50 80AD1EF0 856C0030 */ lh $t4, 0x0030($t3) ## 00000030 -/* 02A54 80AD1EF4 8E7902B0 */ lw $t9, 0x02B0($s3) ## 000002B0 -/* 02A58 80AD1EF8 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 02A5C 80AD1EFC 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 02A60 80AD1F00 266400B4 */ addiu $a0, $s3, 0x00B4 ## $a0 = 000000B4 -/* 02A64 80AD1F04 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02A68 80AD1F08 46805420 */ cvt.s.w $f16, $f10 -/* 02A6C 80AD1F0C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02A70 80AD1F10 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C -/* 02A74 80AD1F14 E6700038 */ swc1 $f16, 0x0038($s3) ## 00000038 -/* 02A78 80AD1F18 85AE0032 */ lh $t6, 0x0032($t5) ## 00000032 -/* 02A7C 80AD1F1C 448E9000 */ mtc1 $t6, $f18 ## $f18 = 0.00 -/* 02A80 80AD1F20 00000000 */ nop -/* 02A84 80AD1F24 46809120 */ cvt.s.w $f4, $f18 -/* 02A88 80AD1F28 E664003C */ swc1 $f4, 0x003C($s3) ## 0000003C -/* 02A8C 80AD1F2C 85F80034 */ lh $t8, 0x0034($t7) ## 00000034 -/* 02A90 80AD1F30 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 02A94 80AD1F34 00000000 */ nop -/* 02A98 80AD1F38 46803220 */ cvt.s.w $f8, $f6 -/* 02A9C 80AD1F3C 17210009 */ bne $t9, $at, .L80AD1F64 -/* 02AA0 80AD1F40 E6680040 */ swc1 $f8, 0x0040($s3) ## 00000040 -/* 02AA4 80AD1F44 266400B4 */ addiu $a0, $s3, 0x00B4 ## $a0 = 000000B4 -/* 02AA8 80AD1F48 24051770 */ addiu $a1, $zero, 0x1770 ## $a1 = 00001770 -/* 02AAC 80AD1F4C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02AB0 80AD1F50 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C -/* 02AB4 80AD1F54 0C01E1A7 */ jal Math_SmoothStepToS - -/* 02AB8 80AD1F58 AFA00010 */ sw $zero, 0x0010($sp) -/* 02ABC 80AD1F5C 1000000C */ beq $zero, $zero, .L80AD1F90 -/* 02AC0 80AD1F60 26720300 */ addiu $s2, $s3, 0x0300 ## $s2 = 00000300 -.L80AD1F64: -/* 02AC4 80AD1F64 0C01E1A7 */ jal Math_SmoothStepToS - -/* 02AC8 80AD1F68 AFA00010 */ sw $zero, 0x0010($sp) -/* 02ACC 80AD1F6C 10000008 */ beq $zero, $zero, .L80AD1F90 -/* 02AD0 80AD1F70 26720300 */ addiu $s2, $s3, 0x0300 ## $s2 = 00000300 -/* 02AD4 80AD1F74 8E690024 */ lw $t1, 0x0024($s3) ## 00000024 -.L80AD1F78: -/* 02AD8 80AD1F78 8E680028 */ lw $t0, 0x0028($s3) ## 00000028 -/* 02ADC 80AD1F7C AE690038 */ sw $t1, 0x0038($s3) ## 00000038 -/* 02AE0 80AD1F80 8E69002C */ lw $t1, 0x002C($s3) ## 0000002C -/* 02AE4 80AD1F84 AE68003C */ sw $t0, 0x003C($s3) ## 0000003C -/* 02AE8 80AD1F88 AE690040 */ sw $t1, 0x0040($s3) ## 00000040 -/* 02AEC 80AD1F8C 26720300 */ addiu $s2, $s3, 0x0300 ## $s2 = 00000300 -.L80AD1F90: -/* 02AF0 80AD1F90 02402825 */ or $a1, $s2, $zero ## $a1 = 00000300 -/* 02AF4 80AD1F94 0C0189B7 */ jal Collider_UpdateCylinder - -/* 02AF8 80AD1F98 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 02AFC 80AD1F9C 926A00AF */ lbu $t2, 0x00AF($s3) ## 000000AF -/* 02B00 80AD1FA0 5940002C */ blezl $t2, .L80AD2054 -/* 02B04 80AD1FA4 8E6202B0 */ lw $v0, 0x02B0($s3) ## 000002B0 -/* 02B08 80AD1FA8 866B001C */ lh $t3, 0x001C($s3) ## 0000001C -/* 02B0C 80AD1FAC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02B10 80AD1FB0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02B14 80AD1FB4 1D600018 */ bgtz $t3, .L80AD2018 -/* 02B18 80AD1FB8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 02B1C 80AD1FBC 02818021 */ addu $s0, $s4, $at -/* 02B20 80AD1FC0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02B24 80AD1FC4 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 02B28 80AD1FC8 02403025 */ or $a2, $s2, $zero ## $a2 = 00000300 -/* 02B2C 80AD1FCC 2671034C */ addiu $s1, $s3, 0x034C ## $s1 = 0000034C -/* 02B30 80AD1FD0 02203025 */ or $a2, $s1, $zero ## $a2 = 0000034C -/* 02B34 80AD1FD4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 02B38 80AD1FD8 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 02B3C 80AD1FDC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02B40 80AD1FE0 926C0114 */ lbu $t4, 0x0114($s3) ## 00000114 -/* 02B44 80AD1FE4 51800006 */ beql $t4, $zero, .L80AD2000 -/* 02B48 80AD1FE8 8E6F02B0 */ lw $t7, 0x02B0($s3) ## 000002B0 -/* 02B4C 80AD1FEC 966D0112 */ lhu $t5, 0x0112($s3) ## 00000112 -/* 02B50 80AD1FF0 31AE4000 */ andi $t6, $t5, 0x4000 ## $t6 = 00000000 -/* 02B54 80AD1FF4 55C00009 */ bnel $t6, $zero, .L80AD201C -/* 02B58 80AD1FF8 8678001C */ lh $t8, 0x001C($s3) ## 0000001C -/* 02B5C 80AD1FFC 8E6F02B0 */ lw $t7, 0x02B0($s3) ## 000002B0 -.L80AD2000: -/* 02B60 80AD2000 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02B64 80AD2004 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 02B68 80AD2008 11E10003 */ beq $t7, $at, .L80AD2018 -/* 02B6C 80AD200C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02B70 80AD2010 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 02B74 80AD2014 02203025 */ or $a2, $s1, $zero ## $a2 = 0000034C -.L80AD2018: -/* 02B78 80AD2018 8678001C */ lh $t8, 0x001C($s3) ## 0000001C -.L80AD201C: -/* 02B7C 80AD201C 5300000D */ beql $t8, $zero, .L80AD2054 -/* 02B80 80AD2020 8E6202B0 */ lw $v0, 0x02B0($s3) ## 000002B0 -/* 02B84 80AD2024 926203BC */ lbu $v0, 0x03BC($s3) ## 000003BC -/* 02B88 80AD2028 30590002 */ andi $t9, $v0, 0x0002 ## $t9 = 00000000 -/* 02B8C 80AD202C 13200008 */ beq $t9, $zero, .L80AD2050 -/* 02B90 80AD2030 3048FFFD */ andi $t0, $v0, 0xFFFD ## $t0 = 00000000 -/* 02B94 80AD2034 A26803BC */ sb $t0, 0x03BC($s3) ## 000003BC -/* 02B98 80AD2038 8FA9007C */ lw $t1, 0x007C($sp) -/* 02B9C 80AD203C 8E6A03B0 */ lw $t2, 0x03B0($s3) ## 000003B0 -/* 02BA0 80AD2040 552A0004 */ bnel $t1, $t2, .L80AD2054 -/* 02BA4 80AD2044 8E6202B0 */ lw $v0, 0x02B0($s3) ## 000002B0 -/* 02BA8 80AD2048 0C2B4510 */ jal func_80AD1440 -/* 02BAC 80AD204C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -.L80AD2050: -/* 02BB0 80AD2050 8E6202B0 */ lw $v0, 0x02B0($s3) ## 000002B0 -.L80AD2054: -/* 02BB4 80AD2054 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 02BB8 80AD2058 10410009 */ beq $v0, $at, .L80AD2080 -/* 02BBC 80AD205C 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 02BC0 80AD2060 10410007 */ beq $v0, $at, .L80AD2080 -/* 02BC4 80AD2064 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02BC8 80AD2068 10410005 */ beq $v0, $at, .L80AD2080 -/* 02BCC 80AD206C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 02BD0 80AD2070 10410003 */ beq $v0, $at, .L80AD2080 -/* 02BD4 80AD2074 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02BD8 80AD2078 14410055 */ bne $v0, $at, .L80AD21D0 -/* 02BDC 80AD207C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -.L80AD2080: -/* 02BE0 80AD2080 8663001C */ lh $v1, 0x001C($s3) ## 0000001C -/* 02BE4 80AD2084 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02BE8 80AD2088 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02BEC 80AD208C 1060000B */ beq $v1, $zero, .L80AD20BC -/* 02BF0 80AD2090 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 02BF4 80AD2094 02818021 */ addu $s0, $s4, $at -/* 02BF8 80AD2098 267103AC */ addiu $s1, $s3, 0x03AC ## $s1 = 000003AC -/* 02BFC 80AD209C 02203025 */ or $a2, $s1, $zero ## $a2 = 000003AC -/* 02C00 80AD20A0 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 02C04 80AD20A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02C08 80AD20A8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 02C0C 80AD20AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02C10 80AD20B0 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 02C14 80AD20B4 02203025 */ or $a2, $s1, $zero ## $a2 = 000003AC -/* 02C18 80AD20B8 8663001C */ lh $v1, 0x001C($s3) ## 0000001C -.L80AD20BC: -/* 02C1C 80AD20BC 0461003B */ bgez $v1, .L80AD21AC -/* 02C20 80AD20C0 00000000 */ nop -/* 02C24 80AD20C4 8E6B0004 */ lw $t3, 0x0004($s3) ## 00000004 -/* 02C28 80AD20C8 26650024 */ addiu $a1, $s3, 0x0024 ## $a1 = 00000024 -/* 02C2C 80AD20CC 2410000C */ addiu $s0, $zero, 0x000C ## $s0 = 0000000C -/* 02C30 80AD20D0 316C0040 */ andi $t4, $t3, 0x0040 ## $t4 = 00000000 -/* 02C34 80AD20D4 11800035 */ beq $t4, $zero, .L80AD21AC -/* 02C38 80AD20D8 268407C0 */ addiu $a0, $s4, 0x07C0 ## $a0 = 000007C0 -/* 02C3C 80AD20DC 267102C8 */ addiu $s1, $s3, 0x02C8 ## $s1 = 000002C8 -/* 02C40 80AD20E0 AFA40058 */ sw $a0, 0x0058($sp) -/* 02C44 80AD20E4 AFA50060 */ sw $a1, 0x0060($sp) -/* 02C48 80AD20E8 27B20070 */ addiu $s2, $sp, 0x0070 ## $s2 = FFFFFFE8 -.L80AD20EC: -/* 02C4C 80AD20EC 27AD006C */ addiu $t5, $sp, 0x006C ## $t5 = FFFFFFE4 -/* 02C50 80AD20F0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 02C54 80AD20F4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02C58 80AD20F8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 02C5C 80AD20FC 27B90068 */ addiu $t9, $sp, 0x0068 ## $t9 = FFFFFFE0 -/* 02C60 80AD2100 8FA40058 */ lw $a0, 0x0058($sp) -/* 02C64 80AD2104 8FA50060 */ lw $a1, 0x0060($sp) -/* 02C68 80AD2108 AFA0006C */ sw $zero, 0x006C($sp) -/* 02C6C 80AD210C AFB90024 */ sw $t9, 0x0024($sp) -/* 02C70 80AD2110 AFB80020 */ sw $t8, 0x0020($sp) -/* 02C74 80AD2114 AFAF0018 */ sw $t7, 0x0018($sp) -/* 02C78 80AD2118 AFAE0014 */ sw $t6, 0x0014($sp) -/* 02C7C 80AD211C AFAD0010 */ sw $t5, 0x0010($sp) -/* 02C80 80AD2120 02203025 */ or $a2, $s1, $zero ## $a2 = 000002C8 -/* 02C84 80AD2124 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFFE8 -/* 02C88 80AD2128 0C00F7A1 */ jal BgCheck_EntityLineTest1 -/* 02C8C 80AD212C AFA0001C */ sw $zero, 0x001C($sp) -/* 02C90 80AD2130 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02C94 80AD2134 14410018 */ bne $v0, $at, .L80AD2198 -/* 02C98 80AD2138 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 02C9C 80AD213C 4406A000 */ mfc1 $a2, $f20 -/* 02CA0 80AD2140 2408012C */ addiu $t0, $zero, 0x012C ## $t0 = 0000012C -/* 02CA4 80AD2144 24090096 */ addiu $t1, $zero, 0x0096 ## $t1 = 00000096 -/* 02CA8 80AD2148 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 02CAC 80AD214C AFAA0018 */ sw $t2, 0x0018($sp) -/* 02CB0 80AD2150 AFA90014 */ sw $t1, 0x0014($sp) -/* 02CB4 80AD2154 AFA80010 */ sw $t0, 0x0010($sp) -/* 02CB8 80AD2158 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFE8 -/* 02CBC 80AD215C 0C00CD20 */ jal func_80033480 -/* 02CC0 80AD2160 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02CC4 80AD2164 3C0180AD */ lui $at, %hi(D_80AD2958) ## $at = 80AD0000 -/* 02CC8 80AD2168 C42A2958 */ lwc1 $f10, %lo(D_80AD2958)($at) -/* 02CCC 80AD216C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 02CD0 80AD2170 44818000 */ mtc1 $at, $f16 ## $f16 = 1.50 -/* 02CD4 80AD2174 4407A000 */ mfc1 $a3, $f20 -/* 02CD8 80AD2178 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 -/* 02CDC 80AD217C AFAB0010 */ sw $t3, 0x0010($sp) -/* 02CE0 80AD2180 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 02CE4 80AD2184 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 02CE8 80AD2188 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFE8 -/* 02CEC 80AD218C E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 02CF0 80AD2190 0C2B3DE2 */ jal func_80ACF788 -/* 02CF4 80AD2194 E7B00018 */ swc1 $f16, 0x0018($sp) -.L80AD2198: -/* 02CF8 80AD2198 2610FFF4 */ addiu $s0, $s0, 0xFFF4 ## $s0 = 00000000 -/* 02CFC 80AD219C 0601FFD3 */ bgez $s0, .L80AD20EC -/* 02D00 80AD21A0 2631FFF4 */ addiu $s1, $s1, 0xFFF4 ## $s1 = 000002BC -/* 02D04 80AD21A4 10000010 */ beq $zero, $zero, .L80AD21E8 -/* 02D08 80AD21A8 4405A000 */ mfc1 $a1, $f20 -.L80AD21AC: -/* 02D0C 80AD21AC 1060000D */ beq $v1, $zero, .L80AD21E4 -/* 02D10 80AD21B0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 02D14 80AD21B4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02D18 80AD21B8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02D1C 80AD21BC 02812821 */ addu $a1, $s4, $at -/* 02D20 80AD21C0 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 02D24 80AD21C4 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFE8 -/* 02D28 80AD21C8 10000007 */ beq $zero, $zero, .L80AD21E8 -/* 02D2C 80AD21CC 4405A000 */ mfc1 $a1, $f20 -.L80AD21D0: -/* 02D30 80AD21D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02D34 80AD21D4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02D38 80AD21D8 02812821 */ addu $a1, $s4, $at -/* 02D3C 80AD21DC 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 02D40 80AD21E0 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFE8 -.L80AD21E4: -/* 02D44 80AD21E4 4405A000 */ mfc1 $a1, $f20 -.L80AD21E8: -/* 02D48 80AD21E8 3C073A83 */ lui $a3, 0x3A83 ## $a3 = 3A830000 -/* 02D4C 80AD21EC 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A83126F -/* 02D50 80AD21F0 266402EC */ addiu $a0, $s3, 0x02EC ## $a0 = 000002EC -/* 02D54 80AD21F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02D58 80AD21F8 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02D5C 80AD21FC E7B40010 */ swc1 $f20, 0x0010($sp) -/* 02D60 80AD2200 8FBF004C */ lw $ra, 0x004C($sp) -/* 02D64 80AD2204 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 02D68 80AD2208 8FB00038 */ lw $s0, 0x0038($sp) -/* 02D6C 80AD220C 8FB1003C */ lw $s1, 0x003C($sp) -/* 02D70 80AD2210 8FB20040 */ lw $s2, 0x0040($sp) -/* 02D74 80AD2214 8FB30044 */ lw $s3, 0x0044($sp) -/* 02D78 80AD2218 8FB40048 */ lw $s4, 0x0048($sp) -/* 02D7C 80AD221C 03E00008 */ jr $ra -/* 02D80 80AD2220 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF4A0.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF4A0.s deleted file mode 100644 index 396da407da..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF4A0.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80ACF4A0 -/* 00000 80ACF4A0 03E00008 */ jr $ra -/* 00004 80ACF4A4 AC8502B8 */ sw $a1, 0x02B8($a0) ## 000002B8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s deleted file mode 100644 index 11cd642b8a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s +++ /dev/null @@ -1,113 +0,0 @@ -.late_rodata -glabel D_80AD2914 - .float 6.28 - -.text -glabel func_80ACF788 -/* 002E8 80ACF788 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 002EC 80ACF78C 3C0F80AD */ lui $t7, %hi(D_80AD2814) ## $t7 = 80AD0000 -/* 002F0 80ACF790 AFBF002C */ sw $ra, 0x002C($sp) -/* 002F4 80ACF794 AFA40068 */ sw $a0, 0x0068($sp) -/* 002F8 80ACF798 AFA5006C */ sw $a1, 0x006C($sp) -/* 002FC 80ACF79C AFA60070 */ sw $a2, 0x0070($sp) -/* 00300 80ACF7A0 AFA70074 */ sw $a3, 0x0074($sp) -/* 00304 80ACF7A4 25EF2814 */ addiu $t7, $t7, %lo(D_80AD2814) ## $t7 = 80AD2814 -/* 00308 80ACF7A8 8DF90000 */ lw $t9, 0x0000($t7) ## 80AD2814 -/* 0030C 80ACF7AC 27AE0050 */ addiu $t6, $sp, 0x0050 ## $t6 = FFFFFFE8 -/* 00310 80ACF7B0 8DF80004 */ lw $t8, 0x0004($t7) ## 80AD2818 -/* 00314 80ACF7B4 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFE8 -/* 00318 80ACF7B8 8DF90008 */ lw $t9, 0x0008($t7) ## 80AD281C -/* 0031C 80ACF7BC 3C0980AD */ lui $t1, %hi(D_80AD2820) ## $t1 = 80AD0000 -/* 00320 80ACF7C0 25292820 */ addiu $t1, $t1, %lo(D_80AD2820) ## $t1 = 80AD2820 -/* 00324 80ACF7C4 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFEC -/* 00328 80ACF7C8 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF0 -/* 0032C 80ACF7CC 8D2B0000 */ lw $t3, 0x0000($t1) ## 80AD2820 -/* 00330 80ACF7D0 27A80044 */ addiu $t0, $sp, 0x0044 ## $t0 = FFFFFFDC -/* 00334 80ACF7D4 8D2A0004 */ lw $t2, 0x0004($t1) ## 80AD2824 -/* 00338 80ACF7D8 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFDC -/* 0033C 80ACF7DC 8D2B0008 */ lw $t3, 0x0008($t1) ## 80AD2828 -/* 00340 80ACF7E0 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFE0 -/* 00344 80ACF7E4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00348 80ACF7E8 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE4 -/* 0034C 80ACF7EC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00350 80ACF7F0 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00354 80ACF7F4 3C0180AD */ lui $at, %hi(D_80AD2914) ## $at = 80AD0000 -/* 00358 80ACF7F8 C4282914 */ lwc1 $f8, %lo(D_80AD2914)($at) -/* 0035C 80ACF7FC 46040181 */ sub.s $f6, $f0, $f4 -/* 00360 80ACF800 8FAC006C */ lw $t4, 0x006C($sp) -/* 00364 80ACF804 46083302 */ mul.s $f12, $f6, $f8 -/* 00368 80ACF808 E7AC0040 */ swc1 $f12, 0x0040($sp) -/* 0036C 80ACF80C C58A0080 */ lwc1 $f10, 0x0080($t4) ## 00000080 -/* 00370 80ACF810 0C0329C8 */ jal Math_SinF -/* 00374 80ACF814 E7AA0060 */ swc1 $f10, 0x0060($sp) -/* 00378 80ACF818 C7B00074 */ lwc1 $f16, 0x0074($sp) -/* 0037C 80ACF81C 8FAD0070 */ lw $t5, 0x0070($sp) -/* 00380 80ACF820 C7AC0040 */ lwc1 $f12, 0x0040($sp) -/* 00384 80ACF824 46100482 */ mul.s $f18, $f0, $f16 -/* 00388 80ACF828 C5A40000 */ lwc1 $f4, 0x0000($t5) ## 00000000 -/* 0038C 80ACF82C 46049180 */ add.s $f6, $f18, $f4 -/* 00390 80ACF830 0C0329DD */ jal Math_CosF -/* 00394 80ACF834 E7A6005C */ swc1 $f6, 0x005C($sp) -/* 00398 80ACF838 C7A80074 */ lwc1 $f8, 0x0074($sp) -/* 0039C 80ACF83C 8FAE0070 */ lw $t6, 0x0070($sp) -/* 003A0 80ACF840 46080282 */ mul.s $f10, $f0, $f8 -/* 003A4 80ACF844 C5D00008 */ lwc1 $f16, 0x0008($t6) ## 00000008 -/* 003A8 80ACF848 46105480 */ add.s $f18, $f10, $f16 -/* 003AC 80ACF84C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 003B0 80ACF850 E7B20064 */ swc1 $f18, 0x0064($sp) -/* 003B4 80ACF854 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 003B8 80ACF858 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 003BC 80ACF85C C7A8007C */ lwc1 $f8, 0x007C($sp) -/* 003C0 80ACF860 46040181 */ sub.s $f6, $f0, $f4 -/* 003C4 80ACF864 46083282 */ mul.s $f10, $f6, $f8 -/* 003C8 80ACF868 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 003CC 80ACF86C E7AA0044 */ swc1 $f10, 0x0044($sp) -/* 003D0 80ACF870 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 003D4 80ACF874 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 003D8 80ACF878 C7A4007C */ lwc1 $f4, 0x007C($sp) -/* 003DC 80ACF87C 46100481 */ sub.s $f18, $f0, $f16 -/* 003E0 80ACF880 46049182 */ mul.s $f6, $f18, $f4 -/* 003E4 80ACF884 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 003E8 80ACF888 E7A6004C */ swc1 $f6, 0x004C($sp) -/* 003EC 80ACF88C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 003F0 80ACF890 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 003F4 80ACF894 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 003F8 80ACF898 44818000 */ mtc1 $at, $f16 ## $f16 = 4.00 -/* 003FC 80ACF89C 46080281 */ sub.s $f10, $f0, $f8 -/* 00400 80ACF8A0 C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 00404 80ACF8A4 46105482 */ mul.s $f18, $f10, $f16 -/* 00408 80ACF8A8 46122180 */ add.s $f6, $f4, $f18 -/* 0040C 80ACF8AC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00410 80ACF8B0 E7A60054 */ swc1 $f6, 0x0054($sp) -/* 00414 80ACF8B4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00418 80ACF8B8 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 0041C 80ACF8BC 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 00420 80ACF8C0 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 00424 80ACF8C4 46080282 */ mul.s $f10, $f0, $f8 -/* 00428 80ACF8C8 C7B20080 */ lwc1 $f18, 0x0080($sp) -/* 0042C 80ACF8CC 8FAF0078 */ lw $t7, 0x0078($sp) -/* 00430 80ACF8D0 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 00434 80ACF8D4 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 00438 80ACF8D8 AFA9001C */ sw $t1, 0x001C($sp) -/* 0043C 80ACF8DC AFA80018 */ sw $t0, 0x0018($sp) -/* 00440 80ACF8E0 46105100 */ add.s $f4, $f10, $f16 -/* 00444 80ACF8E4 8FA40068 */ lw $a0, 0x0068($sp) -/* 00448 80ACF8E8 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFFF4 -/* 0044C 80ACF8EC 27A60050 */ addiu $a2, $sp, 0x0050 ## $a2 = FFFFFFE8 -/* 00450 80ACF8F0 46122182 */ mul.s $f6, $f4, $f18 -/* 00454 80ACF8F4 27A70044 */ addiu $a3, $sp, 0x0044 ## $a3 = FFFFFFDC -/* 00458 80ACF8F8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0045C 80ACF8FC AFAF0010 */ sw $t7, 0x0010($sp) -/* 00460 80ACF900 4600320D */ trunc.w.s $f8, $f6 -/* 00464 80ACF904 44194000 */ mfc1 $t9, $f8 -/* 00468 80ACF908 0C00A5C9 */ jal EffectSsHahen_Spawn -/* 0046C 80ACF90C AFB90014 */ sw $t9, 0x0014($sp) -/* 00470 80ACF910 8FBF002C */ lw $ra, 0x002C($sp) -/* 00474 80ACF914 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 00478 80ACF918 03E00008 */ jr $ra -/* 0047C 80ACF91C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s deleted file mode 100644 index efc3d68686..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s +++ /dev/null @@ -1,153 +0,0 @@ -.late_rodata -glabel D_80AD2918 - .word 0x477FFF00 - -.text -glabel func_80ACF920 -/* 00480 80ACF920 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 -/* 00484 80ACF924 AFBF007C */ sw $ra, 0x007C($sp) -/* 00488 80ACF928 AFB40078 */ sw $s4, 0x0078($sp) -/* 0048C 80ACF92C AFB30074 */ sw $s3, 0x0074($sp) -/* 00490 80ACF930 AFB20070 */ sw $s2, 0x0070($sp) -/* 00494 80ACF934 AFB1006C */ sw $s1, 0x006C($sp) -/* 00498 80ACF938 AFB00068 */ sw $s0, 0x0068($sp) -/* 0049C 80ACF93C F7BE0060 */ sdc1 $f30, 0x0060($sp) -/* 004A0 80ACF940 F7BC0058 */ sdc1 $f28, 0x0058($sp) -/* 004A4 80ACF944 F7BA0050 */ sdc1 $f26, 0x0050($sp) -/* 004A8 80ACF948 F7B80048 */ sdc1 $f24, 0x0048($sp) -/* 004AC 80ACF94C F7B60040 */ sdc1 $f22, 0x0040($sp) -/* 004B0 80ACF950 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 004B4 80ACF954 908E0311 */ lbu $t6, 0x0311($a0) ## 00000311 -/* 004B8 80ACF958 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 004BC 80ACF95C 0305C021 */ addu $t8, $t8, $a1 -/* 004C0 80ACF960 31CFFFFD */ andi $t7, $t6, 0xFFFD ## $t7 = 00000000 -/* 004C4 80ACF964 A08F0311 */ sb $t7, 0x0311($a0) ## 00000311 -/* 004C8 80ACF968 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 -/* 004CC 80ACF96C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 004D0 80ACF970 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 004D4 80ACF974 3319000F */ andi $t9, $t8, 0x000F ## $t9 = 00000000 -/* 004D8 80ACF978 1720001F */ bne $t9, $zero, .L80ACF9F8 -/* 004DC 80ACF97C 2402FFFD */ addiu $v0, $zero, 0xFFFD ## $v0 = FFFFFFFD -/* 004E0 80ACF980 8C890024 */ lw $t1, 0x0024($a0) ## 00000024 -/* 004E4 80ACF984 27B0009C */ addiu $s0, $sp, 0x009C ## $s0 = FFFFFFF4 -/* 004E8 80ACF988 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 004EC 80ACF98C AE090000 */ sw $t1, 0x0000($s0) ## FFFFFFF4 -/* 004F0 80ACF990 8C880028 */ lw $t0, 0x0028($a0) ## 00000028 -/* 004F4 80ACF994 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 -/* 004F8 80ACF998 02003025 */ or $a2, $s0, $zero ## $a2 = FFFFFFF4 -/* 004FC 80ACF99C AE080004 */ sw $t0, 0x0004($s0) ## FFFFFFF8 -/* 00500 80ACF9A0 8C89002C */ lw $t1, 0x002C($a0) ## 0000002C -/* 00504 80ACF9A4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00508 80ACF9A8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0050C 80ACF9AC AE090008 */ sw $t1, 0x0008($s0) ## FFFFFFFC -/* 00510 80ACF9B0 C7A400A0 */ lwc1 $f4, 0x00A0($sp) -/* 00514 80ACF9B4 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 -/* 00518 80ACF9B8 46062200 */ add.s $f8, $f4, $f6 -/* 0051C 80ACF9BC 0C007E50 */ jal Item_DropCollectibleRandom - -/* 00520 80ACF9C0 E7A800A0 */ swc1 $f8, 0x00A0($sp) -/* 00524 80ACF9C4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00528 80ACF9C8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0052C 80ACF9CC 02003025 */ or $a2, $s0, $zero ## $a2 = FFFFFFF4 -/* 00530 80ACF9D0 0C007E50 */ jal Item_DropCollectibleRandom - -/* 00534 80ACF9D4 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 -/* 00538 80ACF9D8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 0053C 80ACF9DC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00540 80ACF9E0 02003025 */ or $a2, $s0, $zero ## $a2 = FFFFFFF4 -/* 00544 80ACF9E4 0C007E50 */ jal Item_DropCollectibleRandom - -/* 00548 80ACF9E8 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 -/* 0054C 80ACF9EC 240A00F0 */ addiu $t2, $zero, 0x00F0 ## $t2 = 000000F0 -/* 00550 80ACF9F0 1000003F */ beq $zero, $zero, .L80ACFAF0 -/* 00554 80ACF9F4 AE2A02D4 */ sw $t2, 0x02D4($s1) ## 000002D4 -.L80ACF9F8: -/* 00558 80ACF9F8 922B0311 */ lbu $t3, 0x0311($s1) ## 00000311 -/* 0055C 80ACF9FC 862D02FA */ lh $t5, 0x02FA($s1) ## 000002FA -/* 00560 80ACFA00 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00564 80ACFA04 01626024 */ and $t4, $t3, $v0 -/* 00568 80ACFA08 01CD9023 */ subu $s2, $t6, $t5 -/* 0056C 80ACFA0C 1A400036 */ blez $s2, .L80ACFAE8 -/* 00570 80ACFA10 A22C0311 */ sb $t4, 0x0311($s1) ## 00000311 -/* 00574 80ACFA14 3C0180AD */ lui $at, %hi(D_80AD2918) ## $at = 80AD0000 -/* 00578 80ACFA18 C43E2918 */ lwc1 $f30, %lo(D_80AD2918)($at) -/* 0057C 80ACFA1C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00580 80ACFA20 4481E000 */ mtc1 $at, $f28 ## $f28 = 6.00 -/* 00584 80ACFA24 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00588 80ACFA28 4481D000 */ mtc1 $at, $f26 ## $f26 = 50.00 -/* 0058C 80ACFA2C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 00590 80ACFA30 4481C000 */ mtc1 $at, $f24 ## $f24 = 25.00 -/* 00594 80ACFA34 26931C24 */ addiu $s3, $s4, 0x1C24 ## $s3 = 00001C24 -.L80ACFA38: -/* 00598 80ACFA38 0C00CFC8 */ jal Rand_CenteredFloat - -/* 0059C 80ACFA3C 4600C306 */ mov.s $f12, $f24 -/* 005A0 80ACFA40 46000506 */ mov.s $f20, $f0 -/* 005A4 80ACFA44 0C00CFC8 */ jal Rand_CenteredFloat - -/* 005A8 80ACFA48 4600C306 */ mov.s $f12, $f24 -/* 005AC 80ACFA4C 46000586 */ mov.s $f22, $f0 -/* 005B0 80ACFA50 0C00CFC8 */ jal Rand_CenteredFloat - -/* 005B4 80ACFA54 4600C306 */ mov.s $f12, $f24 -/* 005B8 80ACFA58 C62A0024 */ lwc1 $f10, 0x0024($s1) ## 00000024 -/* 005BC 80ACFA5C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 005C0 80ACFA60 02602025 */ or $a0, $s3, $zero ## $a0 = 00001C24 -/* 005C4 80ACFA64 460AA400 */ add.s $f16, $f20, $f10 -/* 005C8 80ACFA68 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 005CC 80ACFA6C 02803025 */ or $a2, $s4, $zero ## $a2 = 00000000 -/* 005D0 80ACFA70 2407001D */ addiu $a3, $zero, 0x001D ## $a3 = 0000001D -/* 005D4 80ACFA74 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 005D8 80ACFA78 C6320028 */ lwc1 $f18, 0x0028($s1) ## 00000028 -/* 005DC 80ACFA7C 461A9100 */ add.s $f4, $f18, $f26 -/* 005E0 80ACFA80 4604B180 */ add.s $f6, $f22, $f4 -/* 005E4 80ACFA84 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 005E8 80ACFA88 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C -/* 005EC 80ACFA8C AFAF0028 */ sw $t7, 0x0028($sp) -/* 005F0 80ACFA90 AFA00024 */ sw $zero, 0x0024($sp) -/* 005F4 80ACFA94 46080280 */ add.s $f10, $f0, $f8 -/* 005F8 80ACFA98 AFA00020 */ sw $zero, 0x0020($sp) -/* 005FC 80ACFA9C AFA0001C */ sw $zero, 0x001C($sp) -/* 00600 80ACFAA0 0C00C916 */ jal Actor_SpawnAsChild - -/* 00604 80ACFAA4 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 00608 80ACFAA8 1040000C */ beq $v0, $zero, .L80ACFADC -/* 0060C 80ACFAAC 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00610 80ACFAB0 E45C0060 */ swc1 $f28, 0x0060($v0) ## 00000060 -/* 00614 80ACFAB4 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00618 80ACFAB8 4600F306 */ mov.s $f12, $f30 -/* 0061C 80ACFABC 4600040D */ trunc.w.s $f16, $f0 -/* 00620 80ACFAC0 44028000 */ mfc1 $v0, $f16 -/* 00624 80ACFAC4 00000000 */ nop -/* 00628 80ACFAC8 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 0062C 80ACFACC A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00630 80ACFAD0 863902FA */ lh $t9, 0x02FA($s1) ## 000002FA -/* 00634 80ACFAD4 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 00638 80ACFAD8 A62802FA */ sh $t0, 0x02FA($s1) ## 000002FA -.L80ACFADC: -/* 0063C 80ACFADC 2652FFFF */ addiu $s2, $s2, 0xFFFF ## $s2 = FFFFFFFF -/* 00640 80ACFAE0 1E40FFD5 */ bgtz $s2, .L80ACFA38 -/* 00644 80ACFAE4 00000000 */ nop -.L80ACFAE8: -/* 00648 80ACFAE8 24090008 */ addiu $t1, $zero, 0x0008 ## $t1 = 00000008 -/* 0064C 80ACFAEC AE2902D4 */ sw $t1, 0x02D4($s1) ## 000002D4 -.L80ACFAF0: -/* 00650 80ACFAF0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00654 80ACFAF4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00658 80ACFAF8 24053956 */ addiu $a1, $zero, 0x3956 ## $a1 = 00003956 -/* 0065C 80ACFAFC 8FBF007C */ lw $ra, 0x007C($sp) -/* 00660 80ACFB00 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 00664 80ACFB04 D7B60040 */ ldc1 $f22, 0x0040($sp) -/* 00668 80ACFB08 D7B80048 */ ldc1 $f24, 0x0048($sp) -/* 0066C 80ACFB0C D7BA0050 */ ldc1 $f26, 0x0050($sp) -/* 00670 80ACFB10 D7BC0058 */ ldc1 $f28, 0x0058($sp) -/* 00674 80ACFB14 D7BE0060 */ ldc1 $f30, 0x0060($sp) -/* 00678 80ACFB18 8FB00068 */ lw $s0, 0x0068($sp) -/* 0067C 80ACFB1C 8FB1006C */ lw $s1, 0x006C($sp) -/* 00680 80ACFB20 8FB20070 */ lw $s2, 0x0070($sp) -/* 00684 80ACFB24 8FB30074 */ lw $s3, 0x0074($sp) -/* 00688 80ACFB28 8FB40078 */ lw $s4, 0x0078($sp) -/* 0068C 80ACFB2C 03E00008 */ jr $ra -/* 00690 80ACFB30 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s deleted file mode 100644 index 3905e652c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80ACFB34 -/* 00694 80ACFB34 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00698 80ACFB38 AFB00028 */ sw $s0, 0x0028($sp) -/* 0069C 80ACFB3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006A0 80ACFB40 AFBF002C */ sw $ra, 0x002C($sp) -/* 006A4 80ACFB44 3C040600 */ lui $a0, %hi(D_060009C4) ## $a0 = 06000000 -/* 006A8 80ACFB48 0C028800 */ jal Animation_GetLastFrame - -/* 006AC 80ACFB4C 248409C4 */ addiu $a0, $a0, %lo(D_060009C4) ## $a0 = 060009C4 -/* 006B0 80ACFB50 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 006B4 80ACFB54 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006B8 80ACFB58 3C050600 */ lui $a1, %hi(D_060009C4) ## $a1 = 06000000 -/* 006BC 80ACFB5C 468021A0 */ cvt.s.w $f6, $f4 -/* 006C0 80ACFB60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 006C4 80ACFB64 44060000 */ mfc1 $a2, $f0 -/* 006C8 80ACFB68 AFAE0014 */ sw $t6, 0x0014($sp) -/* 006CC 80ACFB6C 24A509C4 */ addiu $a1, $a1, %lo(D_060009C4) ## $a1 = 060009C4 -/* 006D0 80ACFB70 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 006D4 80ACFB74 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 006D8 80ACFB78 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 006DC 80ACFB7C 0C029468 */ jal Animation_Change - -/* 006E0 80ACFB80 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 006E4 80ACFB84 92190311 */ lbu $t9, 0x0311($s0) ## 00000311 -/* 006E8 80ACFB88 240F0258 */ addiu $t7, $zero, 0x0258 ## $t7 = 00000258 -/* 006EC 80ACFB8C 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 006F0 80ACFB90 3C0580AD */ lui $a1, %hi(func_80ACFBCC) ## $a1 = 80AD0000 -/* 006F4 80ACFB94 3328FFFD */ andi $t0, $t9, 0xFFFD ## $t0 = 00000000 -/* 006F8 80ACFB98 A60F02F8 */ sh $t7, 0x02F8($s0) ## 000002F8 -/* 006FC 80ACFB9C AE0002D4 */ sw $zero, 0x02D4($s0) ## 000002D4 -/* 00700 80ACFBA0 A60002FA */ sh $zero, 0x02FA($s0) ## 000002FA -/* 00704 80ACFBA4 AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 -/* 00708 80ACFBA8 A2080311 */ sb $t0, 0x0311($s0) ## 00000311 -/* 0070C 80ACFBAC 24A5FBCC */ addiu $a1, $a1, %lo(func_80ACFBCC) ## $a1 = 80ACFBCC -/* 00710 80ACFBB0 0C2B3D28 */ jal func_80ACF4A0 -/* 00714 80ACFBB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00718 80ACFBB8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0071C 80ACFBBC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00720 80ACFBC0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00724 80ACFBC4 03E00008 */ jr $ra -/* 00728 80ACFBC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s deleted file mode 100644 index a5bf53e88d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s +++ /dev/null @@ -1,96 +0,0 @@ -glabel func_80ACFBCC -/* 0072C 80ACFBCC 3C0E8016 */ lui $t6, %hi(gSaveContext+0x10) -/* 00730 80ACFBD0 8DCEE670 */ lw $t6, %lo(gSaveContext+0x10)($t6) -/* 00734 80ACFBD4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00738 80ACFBD8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0073C 80ACFBDC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00740 80ACFBE0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00744 80ACFBE4 15C0001B */ bne $t6, $zero, .L80ACFC54 -/* 00748 80ACFBE8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0074C 80ACFBEC 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 00750 80ACFBF0 849902F6 */ lh $t9, 0x02F6($a0) ## 000002F6 -/* 00754 80ACFBF4 3C05C47A */ lui $a1, 0xC47A ## $a1 = C47A0000 -/* 00758 80ACFBF8 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 0075C 80ACFBFC 1720000B */ bne $t9, $zero, .L80ACFC2C -/* 00760 80ACFC00 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 00764 80ACFC04 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00768 80ACFC08 C48602DC */ lwc1 $f6, 0x02DC($a0) ## 000002DC -/* 0076C 80ACFC0C 4606203C */ c.lt.s $f4, $f6 -/* 00770 80ACFC10 00000000 */ nop -/* 00774 80ACFC14 4502003E */ bc1fl .L80ACFD10 -/* 00778 80ACFC18 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0077C 80ACFC1C 0C2B401C */ jal func_80AD0070 -/* 00780 80ACFC20 00000000 */ nop -/* 00784 80ACFC24 1000003A */ beq $zero, $zero, .L80ACFD10 -/* 00788 80ACFC28 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ACFC2C: -/* 0078C 80ACFC2C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00790 80ACFC30 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 00794 80ACFC34 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00798 80ACFC38 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 0079C 80ACFC3C 0C01E0C4 */ jal Math_SmoothStepToF - -/* 007A0 80ACFC40 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 007A4 80ACFC44 860802F6 */ lh $t0, 0x02F6($s0) ## 000002F6 -/* 007A8 80ACFC48 2509FFFF */ addiu $t1, $t0, 0xFFFF ## $t1 = FFFFFFFF -/* 007AC 80ACFC4C 1000002F */ beq $zero, $zero, .L80ACFD0C -/* 007B0 80ACFC50 A60902F6 */ sh $t1, 0x02F6($s0) ## 000002F6 -.L80ACFC54: -/* 007B4 80ACFC54 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -/* 007B8 80ACFC58 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 007BC 80ACFC5C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 007C0 80ACFC60 01415824 */ and $t3, $t2, $at -/* 007C4 80ACFC64 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 007C8 80ACFC68 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 007CC 80ACFC6C 3C05C47A */ lui $a1, 0xC47A ## $a1 = C47A0000 -/* 007D0 80ACFC70 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 007D4 80ACFC74 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 007D8 80ACFC78 0C01E0C4 */ jal Math_SmoothStepToF - -/* 007DC 80ACFC7C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 007E0 80ACFC80 8E0202D4 */ lw $v0, 0x02D4($s0) ## 000002D4 -/* 007E4 80ACFC84 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 007E8 80ACFC88 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 007EC 80ACFC8C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 007F0 80ACFC90 10400017 */ beq $v0, $zero, .L80ACFCF0 -/* 007F4 80ACFC94 244CFFFF */ addiu $t4, $v0, 0xFFFF ## $t4 = FFFFFFFF -/* 007F8 80ACFC98 318E0004 */ andi $t6, $t4, 0x0004 ## $t6 = 00000004 -/* 007FC 80ACFC9C 11C0000B */ beq $t6, $zero, .L80ACFCCC -/* 00800 80ACFCA0 AE0C02D4 */ sw $t4, 0x02D4($s0) ## 000002D4 -/* 00804 80ACFCA4 3C053E51 */ lui $a1, 0x3E51 ## $a1 = 3E510000 -/* 00808 80ACFCA8 44061000 */ mfc1 $a2, $f2 -/* 0080C 80ACFCAC 3C073E70 */ lui $a3, 0x3E70 ## $a3 = 3E700000 -/* 00810 80ACFCB0 34E7A3D7 */ ori $a3, $a3, 0xA3D7 ## $a3 = 3E70A3D7 -/* 00814 80ACFCB4 34A5EB85 */ ori $a1, $a1, 0xEB85 ## $a1 = 3E51EB85 -/* 00818 80ACFCB8 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 0081C 80ACFCBC 0C01E0C4 */ jal Math_SmoothStepToF - -/* 00820 80ACFCC0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00824 80ACFCC4 10000012 */ beq $zero, $zero, .L80ACFD10 -/* 00828 80ACFCC8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ACFCCC: -/* 0082C 80ACFCCC 44050000 */ mfc1 $a1, $f0 -/* 00830 80ACFCD0 44061000 */ mfc1 $a2, $f2 -/* 00834 80ACFCD4 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 -/* 00838 80ACFCD8 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A -/* 0083C 80ACFCDC 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 00840 80ACFCE0 0C01E0C4 */ jal Math_SmoothStepToF - -/* 00844 80ACFCE4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00848 80ACFCE8 10000009 */ beq $zero, $zero, .L80ACFD10 -/* 0084C 80ACFCEC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ACFCF0: -/* 00850 80ACFCF0 920F0311 */ lbu $t7, 0x0311($s0) ## 00000311 -/* 00854 80ACFCF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00858 80ACFCF8 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 0085C 80ACFCFC 53000004 */ beql $t8, $zero, .L80ACFD10 -/* 00860 80ACFD00 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00864 80ACFD04 0C2B3E48 */ jal func_80ACF920 -/* 00868 80ACFD08 8FA5002C */ lw $a1, 0x002C($sp) -.L80ACFD0C: -/* 0086C 80ACFD0C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ACFD10: -/* 00870 80ACFD10 8FB00020 */ lw $s0, 0x0020($sp) -/* 00874 80ACFD14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00878 80ACFD18 03E00008 */ jr $ra -/* 0087C 80ACFD1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s deleted file mode 100644 index 0a421d444d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80ACFD20 -/* 00880 80ACFD20 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00884 80ACFD24 AFB00028 */ sw $s0, 0x0028($sp) -/* 00888 80ACFD28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0088C 80ACFD2C AFBF002C */ sw $ra, 0x002C($sp) -/* 00890 80ACFD30 3C040600 */ lui $a0, %hi(D_060009C4) ## $a0 = 06000000 -/* 00894 80ACFD34 0C028800 */ jal Animation_GetLastFrame - -/* 00898 80ACFD38 248409C4 */ addiu $a0, $a0, %lo(D_060009C4) ## $a0 = 060009C4 -/* 0089C 80ACFD3C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 008A0 80ACFD40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 008A4 80ACFD44 3C050600 */ lui $a1, %hi(D_060009C4) ## $a1 = 06000000 -/* 008A8 80ACFD48 468021A0 */ cvt.s.w $f6, $f4 -/* 008AC 80ACFD4C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 008B0 80ACFD50 44060000 */ mfc1 $a2, $f0 -/* 008B4 80ACFD54 AFAE0014 */ sw $t6, 0x0014($sp) -/* 008B8 80ACFD58 24A509C4 */ addiu $a1, $a1, %lo(D_060009C4) ## $a1 = 060009C4 -/* 008BC 80ACFD5C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 008C0 80ACFD60 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 008C4 80ACFD64 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 008C8 80ACFD68 0C029468 */ jal Animation_Change - -/* 008CC 80ACFD6C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 008D0 80ACFD70 240F0190 */ addiu $t7, $zero, 0x0190 ## $t7 = 00000190 -/* 008D4 80ACFD74 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 008D8 80ACFD78 3C0580AD */ lui $a1, %hi(func_80ACFDAC) ## $a1 = 80AD0000 -/* 008DC 80ACFD7C A60F02F8 */ sh $t7, 0x02F8($s0) ## 000002F8 -/* 008E0 80ACFD80 AE0002D4 */ sw $zero, 0x02D4($s0) ## 000002D4 -/* 008E4 80ACFD84 A60002FA */ sh $zero, 0x02FA($s0) ## 000002FA -/* 008E8 80ACFD88 AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 -/* 008EC 80ACFD8C 24A5FDAC */ addiu $a1, $a1, %lo(func_80ACFDAC) ## $a1 = 80ACFDAC -/* 008F0 80ACFD90 0C2B3D28 */ jal func_80ACF4A0 -/* 008F4 80ACFD94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008F8 80ACFD98 8FBF002C */ lw $ra, 0x002C($sp) -/* 008FC 80ACFD9C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00900 80ACFDA0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00904 80ACFDA4 03E00008 */ jr $ra -/* 00908 80ACFDA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s deleted file mode 100644 index 1f97746fc5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_80ACFDAC -/* 0090C 80ACFDAC 3C0E8016 */ lui $t6, %hi(gSaveContext+0x10) -/* 00910 80ACFDB0 8DCEE670 */ lw $t6, %lo(gSaveContext+0x10)($t6) -/* 00914 80ACFDB4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00918 80ACFDB8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0091C 80ACFDBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00920 80ACFDC0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00924 80ACFDC4 15C0000B */ bne $t6, $zero, .L80ACFDF4 -/* 00928 80ACFDC8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0092C 80ACFDCC C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00930 80ACFDD0 C48602DC */ lwc1 $f6, 0x02DC($a0) ## 000002DC -/* 00934 80ACFDD4 4606203C */ c.lt.s $f4, $f6 -/* 00938 80ACFDD8 00000000 */ nop -/* 0093C 80ACFDDC 45020030 */ bc1fl .L80ACFEA0 -/* 00940 80ACFDE0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00944 80ACFDE4 0C2B40B9 */ jal func_80AD02E4 -/* 00948 80ACFDE8 00000000 */ nop -/* 0094C 80ACFDEC 1000002C */ beq $zero, $zero, .L80ACFEA0 -/* 00950 80ACFDF0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ACFDF4: -/* 00954 80ACFDF4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00958 80ACFDF8 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 0095C 80ACFDFC 3C05C47A */ lui $a1, 0xC47A ## $a1 = C47A0000 -/* 00960 80ACFE00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00964 80ACFE04 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 00968 80ACFE08 0C01E0C4 */ jal Math_SmoothStepToF - -/* 0096C 80ACFE0C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00970 80ACFE10 8E0202D4 */ lw $v0, 0x02D4($s0) ## 000002D4 -/* 00974 80ACFE14 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00978 80ACFE18 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 0097C 80ACFE1C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00980 80ACFE20 10400017 */ beq $v0, $zero, .L80ACFE80 -/* 00984 80ACFE24 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 00988 80ACFE28 31F90004 */ andi $t9, $t7, 0x0004 ## $t9 = 00000004 -/* 0098C 80ACFE2C 1320000B */ beq $t9, $zero, .L80ACFE5C -/* 00990 80ACFE30 AE0F02D4 */ sw $t7, 0x02D4($s0) ## 000002D4 -/* 00994 80ACFE34 3C053E51 */ lui $a1, 0x3E51 ## $a1 = 3E510000 -/* 00998 80ACFE38 44061000 */ mfc1 $a2, $f2 -/* 0099C 80ACFE3C 3C073E70 */ lui $a3, 0x3E70 ## $a3 = 3E700000 -/* 009A0 80ACFE40 34E7A3D7 */ ori $a3, $a3, 0xA3D7 ## $a3 = 3E70A3D7 -/* 009A4 80ACFE44 34A5EB85 */ ori $a1, $a1, 0xEB85 ## $a1 = 3E51EB85 -/* 009A8 80ACFE48 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 009AC 80ACFE4C 0C01E0C4 */ jal Math_SmoothStepToF - -/* 009B0 80ACFE50 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 009B4 80ACFE54 10000012 */ beq $zero, $zero, .L80ACFEA0 -/* 009B8 80ACFE58 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ACFE5C: -/* 009BC 80ACFE5C 44050000 */ mfc1 $a1, $f0 -/* 009C0 80ACFE60 44061000 */ mfc1 $a2, $f2 -/* 009C4 80ACFE64 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 -/* 009C8 80ACFE68 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A -/* 009CC 80ACFE6C 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 009D0 80ACFE70 0C01E0C4 */ jal Math_SmoothStepToF - -/* 009D4 80ACFE74 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 009D8 80ACFE78 10000009 */ beq $zero, $zero, .L80ACFEA0 -/* 009DC 80ACFE7C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ACFE80: -/* 009E0 80ACFE80 92080311 */ lbu $t0, 0x0311($s0) ## 00000311 -/* 009E4 80ACFE84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009E8 80ACFE88 31090002 */ andi $t1, $t0, 0x0002 ## $t1 = 00000000 -/* 009EC 80ACFE8C 51200004 */ beql $t1, $zero, .L80ACFEA0 -/* 009F0 80ACFE90 8FBF0024 */ lw $ra, 0x0024($sp) -/* 009F4 80ACFE94 0C2B3E48 */ jal func_80ACF920 -/* 009F8 80ACFE98 8FA5002C */ lw $a1, 0x002C($sp) -/* 009FC 80ACFE9C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ACFEA0: -/* 00A00 80ACFEA0 8FB00020 */ lw $s0, 0x0020($sp) -/* 00A04 80ACFEA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A08 80ACFEA8 03E00008 */ jr $ra -/* 00A0C 80ACFEAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s deleted file mode 100644 index 1e952e1b47..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80ACFEB0 -/* 00A10 80ACFEB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A14 80ACFEB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A18 80ACFEB8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00A1C 80ACFEBC 3C050600 */ lui $a1, %hi(D_060005C4) ## $a1 = 06000000 -/* 00A20 80ACFEC0 24A505C4 */ addiu $a1, $a1, %lo(D_060005C4) ## $a1 = 060005C4 -/* 00A24 80ACFEC4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00A28 80ACFEC8 0C0294BE */ jal Animation_PlayLoop -/* 00A2C 80ACFECC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A30 80ACFED0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A34 80ACFED4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00A38 80ACFED8 3C0580AD */ lui $a1, %hi(func_80ACFEF8) ## $a1 = 80AD0000 -/* 00A3C 80ACFEDC 24A5FEF8 */ addiu $a1, $a1, %lo(func_80ACFEF8) ## $a1 = 80ACFEF8 -/* 00A40 80ACFEE0 0C2B3D28 */ jal func_80ACF4A0 -/* 00A44 80ACFEE4 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 00A48 80ACFEE8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A4C 80ACFEEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A50 80ACFEF0 03E00008 */ jr $ra -/* 00A54 80ACFEF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s deleted file mode 100644 index 13af93cbd1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s +++ /dev/null @@ -1,111 +0,0 @@ -.late_rodata -glabel D_80AD291C - .word 0x477FFF00 - -.text -glabel func_80ACFEF8 -/* 00A58 80ACFEF8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00A5C 80ACFEFC AFBF003C */ sw $ra, 0x003C($sp) -/* 00A60 80ACFF00 AFB00038 */ sw $s0, 0x0038($sp) -/* 00A64 80ACFF04 AFA50054 */ sw $a1, 0x0054($sp) -/* 00A68 80ACFF08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A6C 80ACFF0C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A70 80ACFF10 24053155 */ addiu $a1, $zero, 0x3155 ## $a1 = 00003155 -/* 00A74 80ACFF14 0C02927F */ jal SkelAnime_Update - -/* 00A78 80ACFF18 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00A7C 80ACFF1C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x10) -/* 00A80 80ACFF20 8DCEE670 */ lw $t6, %lo(gSaveContext+0x10)($t6) -/* 00A84 80ACFF24 15C00007 */ bne $t6, $zero, .L80ACFF44 -/* 00A88 80ACFF28 00000000 */ nop -/* 00A8C 80ACFF2C C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 00A90 80ACFF30 C60402DC */ lwc1 $f4, 0x02DC($s0) ## 000002DC -/* 00A94 80ACFF34 4600203C */ c.lt.s $f4, $f0 -/* 00A98 80ACFF38 00000000 */ nop -/* 00A9C 80ACFF3C 45020006 */ bc1fl .L80ACFF58 -/* 00AA0 80ACFF40 C60602D8 */ lwc1 $f6, 0x02D8($s0) ## 000002D8 -.L80ACFF44: -/* 00AA4 80ACFF44 0C2B434F */ jal func_80AD0D3C -/* 00AA8 80ACFF48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AAC 80ACFF4C 10000040 */ beq $zero, $zero, .L80AD0050 -/* 00AB0 80ACFF50 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 -/* 00AB4 80ACFF54 C60602D8 */ lwc1 $f6, 0x02D8($s0) ## 000002D8 -.L80ACFF58: -/* 00AB8 80ACFF58 4606003C */ c.lt.s $f0, $f6 -/* 00ABC 80ACFF5C 00000000 */ nop -/* 00AC0 80ACFF60 4502003B */ bc1fl .L80AD0050 -/* 00AC4 80ACFF64 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 -/* 00AC8 80ACFF68 860F02FA */ lh $t7, 0x02FA($s0) ## 000002FA -/* 00ACC 80ACFF6C 8FB80054 */ lw $t8, 0x0054($sp) -/* 00AD0 80ACFF70 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 00AD4 80ACFF74 29E10003 */ slti $at, $t7, 0x0003 -/* 00AD8 80ACFF78 10200034 */ beq $at, $zero, .L80AD004C -/* 00ADC 80ACFF7C 0338C821 */ addu $t9, $t9, $t8 -/* 00AE0 80ACFF80 8F391DE4 */ lw $t9, 0x1DE4($t9) ## 00011DE4 -/* 00AE4 80ACFF84 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 00AE8 80ACFF88 33280007 */ andi $t0, $t9, 0x0007 ## $t0 = 00000000 -/* 00AEC 80ACFF8C 55000030 */ bnel $t0, $zero, .L80AD0050 -/* 00AF0 80ACFF90 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 -/* 00AF4 80ACFF94 44816000 */ mtc1 $at, $f12 ## $f12 = 25.00 -/* 00AF8 80ACFF98 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00AFC 80ACFF9C 00000000 */ nop -/* 00B00 80ACFFA0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00B04 80ACFFA4 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 00B08 80ACFFA8 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00B0C 80ACFFAC E7A00040 */ swc1 $f0, 0x0040($sp) -/* 00B10 80ACFFB0 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 00B14 80ACFFB4 44816000 */ mtc1 $at, $f12 ## $f12 = 25.00 -/* 00B18 80ACFFB8 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00B1C 80ACFFBC E7A00044 */ swc1 $f0, 0x0044($sp) -/* 00B20 80ACFFC0 C7A80040 */ lwc1 $f8, 0x0040($sp) -/* 00B24 80ACFFC4 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 00B28 80ACFFC8 C7B20044 */ lwc1 $f18, 0x0044($sp) -/* 00B2C 80ACFFCC 8FA60054 */ lw $a2, 0x0054($sp) -/* 00B30 80ACFFD0 460A4400 */ add.s $f16, $f8, $f10 -/* 00B34 80ACFFD4 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00B38 80ACFFD8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B3C 80ACFFDC 2407001D */ addiu $a3, $zero, 0x001D ## $a3 = 0000001D -/* 00B40 80ACFFE0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00B44 80ACFFE4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00B48 80ACFFE8 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00B4C 80ACFFEC 46049180 */ add.s $f6, $f18, $f4 -/* 00B50 80ACFFF0 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00B54 80ACFFF4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00B58 80ACFFF8 AFAA0028 */ sw $t2, 0x0028($sp) -/* 00B5C 80ACFFFC AFA00024 */ sw $zero, 0x0024($sp) -/* 00B60 80AD0000 46080280 */ add.s $f10, $f0, $f8 -/* 00B64 80AD0004 AFA00020 */ sw $zero, 0x0020($sp) -/* 00B68 80AD0008 AFA0001C */ sw $zero, 0x001C($sp) -/* 00B6C 80AD000C 0C00C916 */ jal Actor_SpawnAsChild - -/* 00B70 80AD0010 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 00B74 80AD0014 1040000D */ beq $v0, $zero, .L80AD004C -/* 00B78 80AD0018 3C0180AD */ lui $at, %hi(D_80AD291C) ## $at = 80AD0000 -/* 00B7C 80AD001C C42C291C */ lwc1 $f12, %lo(D_80AD291C)($at) -/* 00B80 80AD0020 0C00CFC8 */ jal Rand_CenteredFloat - -/* 00B84 80AD0024 AFA2004C */ sw $v0, 0x004C($sp) -/* 00B88 80AD0028 4600040D */ trunc.w.s $f16, $f0 -/* 00B8C 80AD002C 8FA3004C */ lw $v1, 0x004C($sp) -/* 00B90 80AD0030 44028000 */ mfc1 $v0, $f16 -/* 00B94 80AD0034 00000000 */ nop -/* 00B98 80AD0038 A4620032 */ sh $v0, 0x0032($v1) ## 00000032 -/* 00B9C 80AD003C A46200B6 */ sh $v0, 0x00B6($v1) ## 000000B6 -/* 00BA0 80AD0040 860C02FA */ lh $t4, 0x02FA($s0) ## 000002FA -/* 00BA4 80AD0044 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00BA8 80AD0048 A60D02FA */ sh $t5, 0x02FA($s0) ## 000002FA -.L80AD004C: -/* 00BAC 80AD004C 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 -.L80AD0050: -/* 00BB0 80AD0050 860F02F0 */ lh $t7, 0x02F0($s0) ## 000002F0 -/* 00BB4 80AD0054 01CFC021 */ addu $t8, $t6, $t7 -/* 00BB8 80AD0058 A61802F2 */ sh $t8, 0x02F2($s0) ## 000002F2 -/* 00BBC 80AD005C 8FBF003C */ lw $ra, 0x003C($sp) -/* 00BC0 80AD0060 8FB00038 */ lw $s0, 0x0038($sp) -/* 00BC4 80AD0064 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00BC8 80AD0068 03E00008 */ jr $ra -/* 00BCC 80AD006C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s deleted file mode 100644 index 4762b57484..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80AD0070 -/* 00BD0 80AD0070 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00BD4 80AD0074 AFB00028 */ sw $s0, 0x0028($sp) -/* 00BD8 80AD0078 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00BDC 80AD007C AFBF002C */ sw $ra, 0x002C($sp) -/* 00BE0 80AD0080 3C040600 */ lui $a0, %hi(D_060009C4) ## $a0 = 06000000 -/* 00BE4 80AD0084 0C028800 */ jal Animation_GetLastFrame - -/* 00BE8 80AD0088 248409C4 */ addiu $a0, $a0, %lo(D_060009C4) ## $a0 = 060009C4 -/* 00BEC 80AD008C 8E0E02B0 */ lw $t6, 0x02B0($s0) ## 000002B0 -/* 00BF0 80AD0090 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00BF4 80AD0094 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00BF8 80AD0098 11C1000E */ beq $t6, $at, .L80AD00D4 -/* 00BFC 80AD009C 46802020 */ cvt.s.w $f0, $f4 -/* 00C00 80AD00A0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00C04 80AD00A4 3C050600 */ lui $a1, %hi(D_060009C4) ## $a1 = 06000000 -/* 00C08 80AD00A8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00C0C 80AD00AC 44061000 */ mfc1 $a2, $f2 -/* 00C10 80AD00B0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00C14 80AD00B4 24A509C4 */ addiu $a1, $a1, %lo(D_060009C4) ## $a1 = 060009C4 -/* 00C18 80AD00B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00C1C 80AD00BC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 00C20 80AD00C0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00C24 80AD00C4 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 00C28 80AD00C8 0C029468 */ jal Animation_Change - -/* 00C2C 80AD00CC E7A20018 */ swc1 $f2, 0x0018($sp) -/* 00C30 80AD00D0 C7A00034 */ lwc1 $f0, 0x0034($sp) -.L80AD00D4: -/* 00C34 80AD00D4 4600018D */ trunc.w.s $f6, $f0 -/* 00C38 80AD00D8 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 00C3C 80AD00DC AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 -/* 00C40 80AD00E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C44 80AD00E4 44083000 */ mfc1 $t0, $f6 -/* 00C48 80AD00E8 24053954 */ addiu $a1, $zero, 0x3954 ## $a1 = 00003954 -/* 00C4C 80AD00EC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00C50 80AD00F0 A60802FC */ sh $t0, 0x02FC($s0) ## 000002FC -/* 00C54 80AD00F4 3C0580AD */ lui $a1, %hi(func_80AD0118) ## $a1 = 80AD0000 -/* 00C58 80AD00F8 24A50118 */ addiu $a1, $a1, %lo(func_80AD0118) ## $a1 = 80AD0118 -/* 00C5C 80AD00FC 0C2B3D28 */ jal func_80ACF4A0 -/* 00C60 80AD0100 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C64 80AD0104 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C68 80AD0108 8FB00028 */ lw $s0, 0x0028($sp) -/* 00C6C 80AD010C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00C70 80AD0110 03E00008 */ jr $ra -/* 00C74 80AD0114 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0118.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0118.s deleted file mode 100644 index 92f6985521..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0118.s +++ /dev/null @@ -1,130 +0,0 @@ -.late_rodata -glabel D_80AD2920 - .word 0x3F866666 - -.text -glabel func_80AD0118 -/* 00C78 80AD0118 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00C7C 80AD011C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00C80 80AD0120 AFB00028 */ sw $s0, 0x0028($sp) -/* 00C84 80AD0124 AFA50044 */ sw $a1, 0x0044($sp) -/* 00C88 80AD0128 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C8C 80AD012C AFBF002C */ sw $ra, 0x002C($sp) -/* 00C90 80AD0130 44050000 */ mfc1 $a1, $f0 -/* 00C94 80AD0134 248400BC */ addiu $a0, $a0, 0x00BC ## $a0 = 000000BC -/* 00C98 80AD0138 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C9C 80AD013C 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 00CA0 80AD0140 0C01E0C4 */ jal Math_SmoothStepToF - -/* 00CA4 80AD0144 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00CA8 80AD0148 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -/* 00CAC 80AD014C 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 -/* 00CB0 80AD0150 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00CB4 80AD0154 24070320 */ addiu $a3, $zero, 0x0320 ## $a3 = 00000320 -/* 00CB8 80AD0158 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00CBC 80AD015C AFA00010 */ sw $zero, 0x0010($sp) -/* 00CC0 80AD0160 14400041 */ bne $v0, $zero, .L80AD0268 -/* 00CC4 80AD0164 00000000 */ nop -/* 00CC8 80AD0168 860202FC */ lh $v0, 0x02FC($s0) ## 000002FC -/* 00CCC 80AD016C 10400011 */ beq $v0, $zero, .L80AD01B4 -/* 00CD0 80AD0170 00000000 */ nop -/* 00CD4 80AD0174 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00CD8 80AD0178 C6060168 */ lwc1 $f6, 0x0168($s0) ## 00000168 -/* 00CDC 80AD017C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00CE0 80AD0180 A60E02FC */ sh $t6, 0x02FC($s0) ## 000002FC -/* 00CE4 80AD0184 46062032 */ c.eq.s $f4, $f6 -/* 00CE8 80AD0188 00000000 */ nop -/* 00CEC 80AD018C 45000009 */ bc1f .L80AD01B4 -/* 00CF0 80AD0190 00000000 */ nop -/* 00CF4 80AD0194 860F02FC */ lh $t7, 0x02FC($s0) ## 000002FC -/* 00CF8 80AD0198 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00CFC 80AD019C 15E00005 */ bne $t7, $zero, .L80AD01B4 -/* 00D00 80AD01A0 00000000 */ nop -/* 00D04 80AD01A4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 00D08 80AD01A8 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 -/* 00D0C 80AD01AC A61802FC */ sh $t8, 0x02FC($s0) ## 000002FC -/* 00D10 80AD01B0 E6080168 */ swc1 $f8, 0x0168($s0) ## 00000168 -.L80AD01B4: -/* 00D14 80AD01B4 0C02927F */ jal SkelAnime_Update - -/* 00D18 80AD01B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00D1C 80AD01BC 14400005 */ bne $v0, $zero, .L80AD01D4 -/* 00D20 80AD01C0 00000000 */ nop -/* 00D24 80AD01C4 861902FC */ lh $t9, 0x02FC($s0) ## 000002FC -/* 00D28 80AD01C8 3C0140D0 */ lui $at, 0x40D0 ## $at = 40D00000 -/* 00D2C 80AD01CC 57200006 */ bnel $t9, $zero, .L80AD01E8 -/* 00D30 80AD01D0 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -.L80AD01D4: -/* 00D34 80AD01D4 0C2B43CE */ jal func_80AD0F38 -/* 00D38 80AD01D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D3C 80AD01DC 10000007 */ beq $zero, $zero, .L80AD01FC -/* 00D40 80AD01E0 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00D44 80AD01E4 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -.L80AD01E8: -/* 00D48 80AD01E8 44818000 */ mtc1 $at, $f16 ## $f16 = 0.00 -/* 00D4C 80AD01EC 00000000 */ nop -/* 00D50 80AD01F0 46105480 */ add.s $f18, $f10, $f16 -/* 00D54 80AD01F4 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 00D58 80AD01F8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -.L80AD01FC: -/* 00D5C 80AD01FC C6060080 */ lwc1 $f6, 0x0080($s0) ## 00000080 -/* 00D60 80AD0200 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00D64 80AD0204 44815000 */ mtc1 $at, $f10 ## $f10 = 80.00 -/* 00D68 80AD0208 46062201 */ sub.s $f8, $f4, $f6 -/* 00D6C 80AD020C 460A403C */ c.lt.s $f8, $f10 -/* 00D70 80AD0210 00000000 */ nop -/* 00D74 80AD0214 45000014 */ bc1f .L80AD0268 -/* 00D78 80AD0218 00000000 */ nop -/* 00D7C 80AD021C 8E090024 */ lw $t1, 0x0024($s0) ## 00000024 -/* 00D80 80AD0220 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 -/* 00D84 80AD0224 240A0096 */ addiu $t2, $zero, 0x0096 ## $t2 = 00000096 -/* 00D88 80AD0228 ACA90000 */ sw $t1, 0x0000($a1) ## FFFFFFF4 -/* 00D8C 80AD022C 8E080028 */ lw $t0, 0x0028($s0) ## 00000028 -/* 00D90 80AD0230 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 00D94 80AD0234 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00D98 80AD0238 ACA80004 */ sw $t0, 0x0004($a1) ## FFFFFFF8 -/* 00D9C 80AD023C 8E09002C */ lw $t1, 0x002C($s0) ## 0000002C -/* 00DA0 80AD0240 3C0642B4 */ lui $a2, 0x42B4 ## $a2 = 42B40000 -/* 00DA4 80AD0244 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00DA8 80AD0248 ACA90008 */ sw $t1, 0x0008($a1) ## FFFFFFFC -/* 00DAC 80AD024C C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 -/* 00DB0 80AD0250 AFAC0018 */ sw $t4, 0x0018($sp) -/* 00DB4 80AD0254 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00DB8 80AD0258 AFAA0010 */ sw $t2, 0x0010($sp) -/* 00DBC 80AD025C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00DC0 80AD0260 0C00CD20 */ jal func_80033480 -/* 00DC4 80AD0264 E7B00038 */ swc1 $f16, 0x0038($sp) -.L80AD0268: -/* 00DC8 80AD0268 3C0180AD */ lui $at, %hi(D_80AD2920) ## $at = 80AD0000 -/* 00DCC 80AD026C C4322920 */ lwc1 $f18, %lo(D_80AD2920)($at) -/* 00DD0 80AD0270 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00DD4 80AD0274 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 00DD8 80AD0278 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 00DDC 80AD027C AFAD0010 */ sw $t5, 0x0010($sp) -/* 00DE0 80AD0280 8FA40044 */ lw $a0, 0x0044($sp) -/* 00DE4 80AD0284 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00DE8 80AD0288 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 00DEC 80AD028C 3C074296 */ lui $a3, 0x4296 ## $a3 = 42960000 -/* 00DF0 80AD0290 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 00DF4 80AD0294 0C2B3DE2 */ jal func_80ACF788 -/* 00DF8 80AD0298 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 00DFC 80AD029C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00E00 80AD02A0 3C053D99 */ lui $a1, 0x3D99 ## $a1 = 3D990000 -/* 00E04 80AD02A4 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 -/* 00E08 80AD02A8 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A -/* 00E0C 80AD02AC 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3D99999A -/* 00E10 80AD02B0 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 00E14 80AD02B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00E18 80AD02B8 0C01E0C4 */ jal Math_SmoothStepToF - -/* 00E1C 80AD02BC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00E20 80AD02C0 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 -/* 00E24 80AD02C4 860F02F0 */ lh $t7, 0x02F0($s0) ## 000002F0 -/* 00E28 80AD02C8 01CFC021 */ addu $t8, $t6, $t7 -/* 00E2C 80AD02CC A61802F2 */ sh $t8, 0x02F2($s0) ## 000002F2 -/* 00E30 80AD02D0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E34 80AD02D4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00E38 80AD02D8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00E3C 80AD02DC 03E00008 */ jr $ra -/* 00E40 80AD02E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s deleted file mode 100644 index 428d49500c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80AD02E4 -/* 00E44 80AD02E4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00E48 80AD02E8 AFB00028 */ sw $s0, 0x0028($sp) -/* 00E4C 80AD02EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E50 80AD02F0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00E54 80AD02F4 3C040600 */ lui $a0, %hi(D_060009C4) ## $a0 = 06000000 -/* 00E58 80AD02F8 0C028800 */ jal Animation_GetLastFrame - -/* 00E5C 80AD02FC 248409C4 */ addiu $a0, $a0, %lo(D_060009C4) ## $a0 = 060009C4 -/* 00E60 80AD0300 8E0E02B0 */ lw $t6, 0x02B0($s0) ## 000002B0 -/* 00E64 80AD0304 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00E68 80AD0308 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00E6C 80AD030C 11C1000E */ beq $t6, $at, .L80AD0348 -/* 00E70 80AD0310 46802020 */ cvt.s.w $f0, $f4 -/* 00E74 80AD0314 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00E78 80AD0318 3C050600 */ lui $a1, %hi(D_060009C4) ## $a1 = 06000000 -/* 00E7C 80AD031C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00E80 80AD0320 44061000 */ mfc1 $a2, $f2 -/* 00E84 80AD0324 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00E88 80AD0328 24A509C4 */ addiu $a1, $a1, %lo(D_060009C4) ## $a1 = 060009C4 -/* 00E8C 80AD032C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00E90 80AD0330 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 00E94 80AD0334 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00E98 80AD0338 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 00E9C 80AD033C 0C029468 */ jal Animation_Change - -/* 00EA0 80AD0340 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 00EA4 80AD0344 C7A00034 */ lwc1 $f0, 0x0034($sp) -.L80AD0348: -/* 00EA8 80AD0348 4600018D */ trunc.w.s $f6, $f0 -/* 00EAC 80AD034C 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 -/* 00EB0 80AD0350 AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 -/* 00EB4 80AD0354 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EB8 80AD0358 44083000 */ mfc1 $t0, $f6 -/* 00EBC 80AD035C 24053954 */ addiu $a1, $zero, 0x3954 ## $a1 = 00003954 -/* 00EC0 80AD0360 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00EC4 80AD0364 A60802FC */ sh $t0, 0x02FC($s0) ## 000002FC -/* 00EC8 80AD0368 3C0580AD */ lui $a1, %hi(func_80AD038C) ## $a1 = 80AD0000 -/* 00ECC 80AD036C 24A5038C */ addiu $a1, $a1, %lo(func_80AD038C) ## $a1 = 80AD038C -/* 00ED0 80AD0370 0C2B3D28 */ jal func_80ACF4A0 -/* 00ED4 80AD0374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ED8 80AD0378 8FBF002C */ lw $ra, 0x002C($sp) -/* 00EDC 80AD037C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00EE0 80AD0380 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00EE4 80AD0384 03E00008 */ jr $ra -/* 00EE8 80AD0388 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD038C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD038C.s deleted file mode 100644 index 68a090114d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD038C.s +++ /dev/null @@ -1,130 +0,0 @@ -.late_rodata -glabel D_80AD2924 - .word 0x3F866666 - -.text -glabel func_80AD038C -/* 00EEC 80AD038C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00EF0 80AD0390 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00EF4 80AD0394 AFB00028 */ sw $s0, 0x0028($sp) -/* 00EF8 80AD0398 AFA50044 */ sw $a1, 0x0044($sp) -/* 00EFC 80AD039C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F00 80AD03A0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00F04 80AD03A4 44050000 */ mfc1 $a1, $f0 -/* 00F08 80AD03A8 248400BC */ addiu $a0, $a0, 0x00BC ## $a0 = 000000BC -/* 00F0C 80AD03AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00F10 80AD03B0 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 00F14 80AD03B4 0C01E0C4 */ jal Math_SmoothStepToF - -/* 00F18 80AD03B8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00F1C 80AD03BC 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -/* 00F20 80AD03C0 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 -/* 00F24 80AD03C4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00F28 80AD03C8 24070320 */ addiu $a3, $zero, 0x0320 ## $a3 = 00000320 -/* 00F2C 80AD03CC 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00F30 80AD03D0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00F34 80AD03D4 14400041 */ bne $v0, $zero, .L80AD04DC -/* 00F38 80AD03D8 00000000 */ nop -/* 00F3C 80AD03DC 860202FC */ lh $v0, 0x02FC($s0) ## 000002FC -/* 00F40 80AD03E0 10400011 */ beq $v0, $zero, .L80AD0428 -/* 00F44 80AD03E4 00000000 */ nop -/* 00F48 80AD03E8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00F4C 80AD03EC C6060168 */ lwc1 $f6, 0x0168($s0) ## 00000168 -/* 00F50 80AD03F0 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00F54 80AD03F4 A60E02FC */ sh $t6, 0x02FC($s0) ## 000002FC -/* 00F58 80AD03F8 46062032 */ c.eq.s $f4, $f6 -/* 00F5C 80AD03FC 00000000 */ nop -/* 00F60 80AD0400 45000009 */ bc1f .L80AD0428 -/* 00F64 80AD0404 00000000 */ nop -/* 00F68 80AD0408 860F02FC */ lh $t7, 0x02FC($s0) ## 000002FC -/* 00F6C 80AD040C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00F70 80AD0410 15E00005 */ bne $t7, $zero, .L80AD0428 -/* 00F74 80AD0414 00000000 */ nop -/* 00F78 80AD0418 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 00F7C 80AD041C 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 -/* 00F80 80AD0420 A61802FC */ sh $t8, 0x02FC($s0) ## 000002FC -/* 00F84 80AD0424 E6080168 */ swc1 $f8, 0x0168($s0) ## 00000168 -.L80AD0428: -/* 00F88 80AD0428 0C02927F */ jal SkelAnime_Update - -/* 00F8C 80AD042C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00F90 80AD0430 14400005 */ bne $v0, $zero, .L80AD0448 -/* 00F94 80AD0434 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F98 80AD0438 861902FC */ lh $t9, 0x02FC($s0) ## 000002FC -/* 00F9C 80AD043C 3C014190 */ lui $at, 0x4190 ## $at = 41900000 -/* 00FA0 80AD0440 57200006 */ bnel $t9, $zero, .L80AD045C -/* 00FA4 80AD0444 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -.L80AD0448: -/* 00FA8 80AD0448 0C2B3FAC */ jal func_80ACFEB0 -/* 00FAC 80AD044C A60002FA */ sh $zero, 0x02FA($s0) ## 000002FA -/* 00FB0 80AD0450 10000007 */ beq $zero, $zero, .L80AD0470 -/* 00FB4 80AD0454 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00FB8 80AD0458 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -.L80AD045C: -/* 00FBC 80AD045C 44818000 */ mtc1 $at, $f16 ## $f16 = 0.00 -/* 00FC0 80AD0460 00000000 */ nop -/* 00FC4 80AD0464 46105480 */ add.s $f18, $f10, $f16 -/* 00FC8 80AD0468 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 00FCC 80AD046C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -.L80AD0470: -/* 00FD0 80AD0470 C6060080 */ lwc1 $f6, 0x0080($s0) ## 00000080 -/* 00FD4 80AD0474 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00FD8 80AD0478 44815000 */ mtc1 $at, $f10 ## $f10 = 80.00 -/* 00FDC 80AD047C 46062201 */ sub.s $f8, $f4, $f6 -/* 00FE0 80AD0480 460A403C */ c.lt.s $f8, $f10 -/* 00FE4 80AD0484 00000000 */ nop -/* 00FE8 80AD0488 45000014 */ bc1f .L80AD04DC -/* 00FEC 80AD048C 00000000 */ nop -/* 00FF0 80AD0490 8E090024 */ lw $t1, 0x0024($s0) ## 00000024 -/* 00FF4 80AD0494 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 -/* 00FF8 80AD0498 240A0096 */ addiu $t2, $zero, 0x0096 ## $t2 = 00000096 -/* 00FFC 80AD049C ACA90000 */ sw $t1, 0x0000($a1) ## FFFFFFF4 -/* 01000 80AD04A0 8E080028 */ lw $t0, 0x0028($s0) ## 00000028 -/* 01004 80AD04A4 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 01008 80AD04A8 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 0100C 80AD04AC ACA80004 */ sw $t0, 0x0004($a1) ## FFFFFFF8 -/* 01010 80AD04B0 8E09002C */ lw $t1, 0x002C($s0) ## 0000002C -/* 01014 80AD04B4 3C0642B4 */ lui $a2, 0x42B4 ## $a2 = 42B40000 -/* 01018 80AD04B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0101C 80AD04BC ACA90008 */ sw $t1, 0x0008($a1) ## FFFFFFFC -/* 01020 80AD04C0 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 -/* 01024 80AD04C4 AFAC0018 */ sw $t4, 0x0018($sp) -/* 01028 80AD04C8 AFAB0014 */ sw $t3, 0x0014($sp) -/* 0102C 80AD04CC AFAA0010 */ sw $t2, 0x0010($sp) -/* 01030 80AD04D0 8FA40044 */ lw $a0, 0x0044($sp) -/* 01034 80AD04D4 0C00CD20 */ jal func_80033480 -/* 01038 80AD04D8 E7B00038 */ swc1 $f16, 0x0038($sp) -.L80AD04DC: -/* 0103C 80AD04DC 3C0180AD */ lui $at, %hi(D_80AD2924) ## $at = 80AD0000 -/* 01040 80AD04E0 C4322924 */ lwc1 $f18, %lo(D_80AD2924)($at) -/* 01044 80AD04E4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01048 80AD04E8 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 0104C 80AD04EC 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 01050 80AD04F0 AFAD0010 */ sw $t5, 0x0010($sp) -/* 01054 80AD04F4 8FA40044 */ lw $a0, 0x0044($sp) -/* 01058 80AD04F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0105C 80AD04FC 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 01060 80AD0500 3C074296 */ lui $a3, 0x4296 ## $a3 = 42960000 -/* 01064 80AD0504 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 01068 80AD0508 0C2B3DE2 */ jal func_80ACF788 -/* 0106C 80AD050C E7A40018 */ swc1 $f4, 0x0018($sp) -/* 01070 80AD0510 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01074 80AD0514 3C053D99 */ lui $a1, 0x3D99 ## $a1 = 3D990000 -/* 01078 80AD0518 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 -/* 0107C 80AD051C 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A -/* 01080 80AD0520 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3D99999A -/* 01084 80AD0524 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 01088 80AD0528 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0108C 80AD052C 0C01E0C4 */ jal Math_SmoothStepToF - -/* 01090 80AD0530 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01094 80AD0534 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 -/* 01098 80AD0538 860F02F0 */ lh $t7, 0x02F0($s0) ## 000002F0 -/* 0109C 80AD053C 01CFC021 */ addu $t8, $t6, $t7 -/* 010A0 80AD0540 A61802F2 */ sh $t8, 0x02F2($s0) ## 000002F2 -/* 010A4 80AD0544 8FBF002C */ lw $ra, 0x002C($sp) -/* 010A8 80AD0548 8FB00028 */ lw $s0, 0x0028($sp) -/* 010AC 80AD054C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 010B0 80AD0550 03E00008 */ jr $ra -/* 010B4 80AD0554 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s deleted file mode 100644 index 5c95898d4a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AD0558 -/* 010B8 80AD0558 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010BC 80AD055C AFBF0014 */ sw $ra, 0x0014($sp) -/* 010C0 80AD0560 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 010C4 80AD0564 3C050600 */ lui $a1, %hi(D_060005C4) ## $a1 = 06000000 -/* 010C8 80AD0568 24A505C4 */ addiu $a1, $a1, %lo(D_060005C4) ## $a1 = 060005C4 -/* 010CC 80AD056C AFA60018 */ sw $a2, 0x0018($sp) -/* 010D0 80AD0570 0C0294BE */ jal Animation_PlayLoop -/* 010D4 80AD0574 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010D8 80AD0578 8FA40018 */ lw $a0, 0x0018($sp) -/* 010DC 80AD057C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 010E0 80AD0580 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 010E4 80AD0584 3C0580AD */ lui $a1, %hi(func_80AD05A8) ## $a1 = 80AD0000 -/* 010E8 80AD0588 24A505A8 */ addiu $a1, $a1, %lo(func_80AD05A8) ## $a1 = 80AD05A8 -/* 010EC 80AD058C AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 010F0 80AD0590 0C2B3D28 */ jal func_80ACF4A0 -/* 010F4 80AD0594 E48402E0 */ swc1 $f4, 0x02E0($a0) ## 000002E0 -/* 010F8 80AD0598 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010FC 80AD059C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01100 80AD05A0 03E00008 */ jr $ra -/* 01104 80AD05A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s deleted file mode 100644 index c7b37c62e7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s +++ /dev/null @@ -1,108 +0,0 @@ -glabel func_80AD05A8 -/* 01108 80AD05A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0110C 80AD05AC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01110 80AD05B0 AFB00020 */ sw $s0, 0x0020($sp) -/* 01114 80AD05B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 01118 80AD05B8 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 0111C 80AD05BC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01120 80AD05C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01124 80AD05C4 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 01128 80AD05C8 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 -/* 0112C 80AD05CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01130 80AD05D0 3C073E80 */ lui $a3, 0x3E80 ## $a3 = 3E800000 -/* 01134 80AD05D4 AFAF002C */ sw $t7, 0x002C($sp) -/* 01138 80AD05D8 0C01E0C4 */ jal Math_SmoothStepToF - -/* 0113C 80AD05DC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01140 80AD05E0 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 01144 80AD05E4 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 -/* 01148 80AD05E8 C6060080 */ lwc1 $f6, 0x0080($s0) ## 00000080 -/* 0114C 80AD05EC 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01150 80AD05F0 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 01154 80AD05F4 46083280 */ add.s $f10, $f6, $f8 -/* 01158 80AD05F8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0115C 80AD05FC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 01160 80AD0600 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01164 80AD0604 44055000 */ mfc1 $a1, $f10 -/* 01168 80AD0608 0C01E0C4 */ jal Math_SmoothStepToF - -/* 0116C 80AD060C 00000000 */ nop -/* 01170 80AD0610 860202F8 */ lh $v0, 0x02F8($s0) ## 000002F8 -/* 01174 80AD0614 1C400006 */ bgtz $v0, .L80AD0630 -/* 01178 80AD0618 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 0117C 80AD061C 0C2B42CF */ jal func_80AD0B3C -/* 01180 80AD0620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01184 80AD0624 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 -/* 01188 80AD0628 10000002 */ beq $zero, $zero, .L80AD0634 -/* 0118C 80AD062C A61802F6 */ sh $t8, 0x02F6($s0) ## 000002F6 -.L80AD0630: -/* 01190 80AD0630 A61902F8 */ sh $t9, 0x02F8($s0) ## 000002F8 -.L80AD0634: -/* 01194 80AD0634 3C088016 */ lui $t0, %hi(gSaveContext+0x10) -/* 01198 80AD0638 8D08E670 */ lw $t0, %lo(gSaveContext+0x10)($t0) -/* 0119C 80AD063C 8FA5002C */ lw $a1, 0x002C($sp) -/* 011A0 80AD0640 15000018 */ bne $t0, $zero, .L80AD06A4 -/* 011A4 80AD0644 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 011A8 80AD0648 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 011AC 80AD064C 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 -/* 011B0 80AD0650 C61202D8 */ lwc1 $f18, 0x02D8($s0) ## 000002D8 -/* 011B4 80AD0654 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 011B8 80AD0658 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 011BC 80AD065C 4612003C */ c.lt.s $f0, $f18 -/* 011C0 80AD0660 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 011C4 80AD0664 4500000F */ bc1f .L80AD06A4 -/* 011C8 80AD0668 00000000 */ nop -/* 011CC 80AD066C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 011D0 80AD0670 0C01E1A7 */ jal Math_SmoothStepToS - -/* 011D4 80AD0674 AFA00010 */ sw $zero, 0x0010($sp) -/* 011D8 80AD0678 860902FA */ lh $t1, 0x02FA($s0) ## 000002FA -/* 011DC 80AD067C 51200006 */ beql $t1, $zero, .L80AD0698 -/* 011E0 80AD0680 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 011E4 80AD0684 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 011E8 80AD0688 254B01C2 */ addiu $t3, $t2, 0x01C2 ## $t3 = 000001C2 -/* 011EC 80AD068C 10000007 */ beq $zero, $zero, .L80AD06AC -/* 011F0 80AD0690 A60B00B6 */ sh $t3, 0x00B6($s0) ## 000000B6 -/* 011F4 80AD0694 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -.L80AD0698: -/* 011F8 80AD0698 258DFE3E */ addiu $t5, $t4, 0xFE3E ## $t5 = FFFFFE3E -/* 011FC 80AD069C 10000003 */ beq $zero, $zero, .L80AD06AC -/* 01200 80AD06A0 A60D00B6 */ sh $t5, 0x00B6($s0) ## 000000B6 -.L80AD06A4: -/* 01204 80AD06A4 0C2B4488 */ jal func_80AD1220 -/* 01208 80AD06A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD06AC: -/* 0120C 80AD06AC 0C02927F */ jal SkelAnime_Update - -/* 01210 80AD06B0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01214 80AD06B4 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -/* 01218 80AD06B8 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 -/* 0121C 80AD06BC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01220 80AD06C0 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 01224 80AD06C4 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01228 80AD06C8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0122C 80AD06CC 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 -/* 01230 80AD06D0 860F02F0 */ lh $t7, 0x02F0($s0) ## 000002F0 -/* 01234 80AD06D4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01238 80AD06D8 3C053D99 */ lui $a1, 0x3D99 ## $a1 = 3D990000 -/* 0123C 80AD06DC 01CFC021 */ addu $t8, $t6, $t7 -/* 01240 80AD06E0 A61802F2 */ sh $t8, 0x02F2($s0) ## 000002F2 -/* 01244 80AD06E4 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 -/* 01248 80AD06E8 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A -/* 0124C 80AD06EC 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3D99999A -/* 01250 80AD06F0 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 01254 80AD06F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01258 80AD06F8 0C01E0C4 */ jal Math_SmoothStepToF - -/* 0125C 80AD06FC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01260 80AD0700 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01264 80AD0704 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01268 80AD0708 24053155 */ addiu $a1, $zero, 0x3155 ## $a1 = 00003155 -/* 0126C 80AD070C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01270 80AD0710 8FB00020 */ lw $s0, 0x0020($sp) -/* 01274 80AD0714 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01278 80AD0718 03E00008 */ jr $ra -/* 0127C 80AD071C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s deleted file mode 100644 index 6ad08e010d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AD0720 -/* 01280 80AD0720 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01284 80AD0724 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01288 80AD0728 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0128C 80AD072C 3C050600 */ lui $a1, %hi(D_060005C4) ## $a1 = 06000000 -/* 01290 80AD0730 24A505C4 */ addiu $a1, $a1, %lo(D_060005C4) ## $a1 = 060005C4 -/* 01294 80AD0734 AFA60018 */ sw $a2, 0x0018($sp) -/* 01298 80AD0738 0C0294BE */ jal Animation_PlayLoop -/* 0129C 80AD073C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 012A0 80AD0740 8FA40018 */ lw $a0, 0x0018($sp) -/* 012A4 80AD0744 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 012A8 80AD0748 3C0580AD */ lui $a1, %hi(func_80AD076C) ## $a1 = 80AD0000 -/* 012AC 80AD074C 24A5076C */ addiu $a1, $a1, %lo(func_80AD076C) ## $a1 = 80AD076C -/* 012B0 80AD0750 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 012B4 80AD0754 0C2B3D28 */ jal func_80ACF4A0 -/* 012B8 80AD0758 AC8002D4 */ sw $zero, 0x02D4($a0) ## 000002D4 -/* 012BC 80AD075C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012C0 80AD0760 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012C4 80AD0764 03E00008 */ jr $ra -/* 012C8 80AD0768 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s deleted file mode 100644 index f1d9ae741a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s +++ /dev/null @@ -1,284 +0,0 @@ -.late_rodata -glabel D_80AD2928 - .word 0x40A9999A -glabel D_80AD292C - .word 0x3A03126F - -.text -glabel func_80AD076C -/* 012CC 80AD076C 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 012D0 80AD0770 AFBF005C */ sw $ra, 0x005C($sp) -/* 012D4 80AD0774 AFB20058 */ sw $s2, 0x0058($sp) -/* 012D8 80AD0778 AFB10054 */ sw $s1, 0x0054($sp) -/* 012DC 80AD077C AFB00050 */ sw $s0, 0x0050($sp) -/* 012E0 80AD0780 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 012E4 80AD0784 AFA50094 */ sw $a1, 0x0094($sp) -/* 012E8 80AD0788 3C0180AD */ lui $at, %hi(D_80AD2928) ## $at = 80AD0000 -/* 012EC 80AD078C C4222928 */ lwc1 $f2, %lo(D_80AD2928)($at) -/* 012F0 80AD0790 C4800090 */ lwc1 $f0, 0x0090($a0) ## 00000090 -/* 012F4 80AD0794 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 012F8 80AD0798 3C0180AD */ lui $at, %hi(D_80AD292C) ## $at = 80AD0000 -/* 012FC 80AD079C 4602003E */ c.le.s $f0, $f2 -/* 01300 80AD07A0 00000000 */ nop -/* 01304 80AD07A4 45020004 */ bc1fl .L80AD07B8 -/* 01308 80AD07A8 8E420118 */ lw $v0, 0x0118($s2) ## 00000118 -/* 0130C 80AD07AC C424292C */ lwc1 $f4, %lo(D_80AD292C)($at) -/* 01310 80AD07B0 46040080 */ add.s $f2, $f0, $f4 -/* 01314 80AD07B4 8E420118 */ lw $v0, 0x0118($s2) ## 00000118 -.L80AD07B8: -/* 01318 80AD07B8 3C05BE0A */ lui $a1, 0xBE0A ## $a1 = BE0A0000 -/* 0131C 80AD07BC 34A53D71 */ ori $a1, $a1, 0x3D71 ## $a1 = BE0A3D71 -/* 01320 80AD07C0 10400005 */ beq $v0, $zero, .L80AD07D8 -/* 01324 80AD07C4 26440060 */ addiu $a0, $s2, 0x0060 ## $a0 = 00000060 -/* 01328 80AD07C8 8C4E0130 */ lw $t6, 0x0130($v0) ## 00000130 -/* 0132C 80AD07CC 55C00003 */ bnel $t6, $zero, .L80AD07DC -/* 01330 80AD07D0 C6460028 */ lwc1 $f6, 0x0028($s2) ## 00000028 -/* 01334 80AD07D4 AE400118 */ sw $zero, 0x0118($s2) ## 00000118 -.L80AD07D8: -/* 01338 80AD07D8 C6460028 */ lwc1 $f6, 0x0028($s2) ## 00000028 -.L80AD07DC: -/* 0133C 80AD07DC C6480080 */ lwc1 $f8, 0x0080($s2) ## 00000080 -/* 01340 80AD07E0 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 01344 80AD07E4 44818000 */ mtc1 $at, $f16 ## $f16 = 70.00 -/* 01348 80AD07E8 46083281 */ sub.s $f10, $f6, $f8 -/* 0134C 80AD07EC E6420068 */ swc1 $f2, 0x0068($s2) ## 00000068 -/* 01350 80AD07F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01354 80AD07F4 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 -/* 01358 80AD07F8 460A803E */ c.le.s $f16, $f10 -/* 0135C 80AD07FC 00000000 */ nop -/* 01360 80AD0800 4502000E */ bc1fl .L80AD083C -/* 01364 80AD0804 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 -/* 01368 80AD0808 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0136C 80AD080C 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 -/* 01370 80AD0810 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 01374 80AD0814 3C05BFA6 */ lui $a1, 0xBFA6 ## $a1 = BFA60000 -/* 01378 80AD0818 4406A000 */ mfc1 $a2, $f20 -/* 0137C 80AD081C 34A56666 */ ori $a1, $a1, 0x6666 ## $a1 = BFA66666 -/* 01380 80AD0820 26440060 */ addiu $a0, $s2, 0x0060 ## $a0 = 00000060 -/* 01384 80AD0824 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 01388 80AD0828 0C01E0C4 */ jal Math_SmoothStepToF - -/* 0138C 80AD082C E7B20010 */ swc1 $f18, 0x0010($sp) -/* 01390 80AD0830 10000008 */ beq $zero, $zero, .L80AD0854 -/* 01394 80AD0834 8E4202D4 */ lw $v0, 0x02D4($s2) ## 000002D4 -/* 01398 80AD0838 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.00 -.L80AD083C: -/* 0139C 80AD083C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 013A0 80AD0840 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD -/* 013A4 80AD0844 4406A000 */ mfc1 $a2, $f20 -/* 013A8 80AD0848 0C01E0C4 */ jal Math_SmoothStepToF - -/* 013AC 80AD084C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 013B0 80AD0850 8E4202D4 */ lw $v0, 0x02D4($s2) ## 000002D4 -.L80AD0854: -/* 013B4 80AD0854 26440032 */ addiu $a0, $s2, 0x0032 ## $a0 = 00000032 -/* 013B8 80AD0858 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 013BC 80AD085C 14400007 */ bne $v0, $zero, .L80AD087C -/* 013C0 80AD0860 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 013C4 80AD0864 8645008A */ lh $a1, 0x008A($s2) ## 0000008A -/* 013C8 80AD0868 AFA00010 */ sw $zero, 0x0010($sp) -/* 013CC 80AD086C 0C01E1A7 */ jal Math_SmoothStepToS - -/* 013D0 80AD0870 2407033E */ addiu $a3, $zero, 0x033E ## $a3 = 0000033E -/* 013D4 80AD0874 10000003 */ beq $zero, $zero, .L80AD0884 -/* 013D8 80AD0878 865800B6 */ lh $t8, 0x00B6($s2) ## 000000B6 -.L80AD087C: -/* 013DC 80AD087C AE4F02D4 */ sw $t7, 0x02D4($s2) ## 000002D4 -/* 013E0 80AD0880 865800B6 */ lh $t8, 0x00B6($s2) ## 000000B6 -.L80AD0884: -/* 013E4 80AD0884 2644014C */ addiu $a0, $s2, 0x014C ## $a0 = 0000014C -/* 013E8 80AD0888 2719015E */ addiu $t9, $t8, 0x015E ## $t9 = 0000015E -/* 013EC 80AD088C 0C02927F */ jal SkelAnime_Update - -/* 013F0 80AD0890 A65900B6 */ sh $t9, 0x00B6($s2) ## 000000B6 -/* 013F4 80AD0894 264402F0 */ addiu $a0, $s2, 0x02F0 ## $a0 = 000002F0 -/* 013F8 80AD0898 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 -/* 013FC 80AD089C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01400 80AD08A0 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 01404 80AD08A4 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01408 80AD08A8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0140C 80AD08AC 864802F2 */ lh $t0, 0x02F2($s2) ## 000002F2 -/* 01410 80AD08B0 864902F0 */ lh $t1, 0x02F0($s2) ## 000002F0 -/* 01414 80AD08B4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01418 80AD08B8 3C053D99 */ lui $a1, 0x3D99 ## $a1 = 3D990000 -/* 0141C 80AD08BC 01095021 */ addu $t2, $t0, $t1 -/* 01420 80AD08C0 A64A02F2 */ sh $t2, 0x02F2($s2) ## 000002F2 -/* 01424 80AD08C4 4406A000 */ mfc1 $a2, $f20 -/* 01428 80AD08C8 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 -/* 0142C 80AD08CC 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A -/* 01430 80AD08D0 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3D99999A -/* 01434 80AD08D4 264402EC */ addiu $a0, $s2, 0x02EC ## $a0 = 000002EC -/* 01438 80AD08D8 0C01E0C4 */ jal Math_SmoothStepToF - -/* 0143C 80AD08DC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01440 80AD08E0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01444 80AD08E4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01448 80AD08E8 24053184 */ addiu $a1, $zero, 0x3184 ## $a1 = 00003184 -/* 0144C 80AD08EC 924303BC */ lbu $v1, 0x03BC($s2) ## 000003BC -/* 01450 80AD08F0 306B0004 */ andi $t3, $v1, 0x0004 ## $t3 = 00000000 -/* 01454 80AD08F4 11600009 */ beq $t3, $zero, .L80AD091C -/* 01458 80AD08F8 306E0002 */ andi $t6, $v1, 0x0002 ## $t6 = 00000000 -/* 0145C 80AD08FC 924C03BD */ lbu $t4, 0x03BD($s2) ## 000003BD -/* 01460 80AD0900 A24000AF */ sb $zero, 0x00AF($s2) ## 000000AF -/* 01464 80AD0904 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01468 80AD0908 318DFF7F */ andi $t5, $t4, 0xFF7F ## $t5 = 00000000 -/* 0146C 80AD090C 0C2B4510 */ jal func_80AD1440 -/* 01470 80AD0910 A24D03BD */ sb $t5, 0x03BD($s2) ## 000003BD -/* 01474 80AD0914 10000083 */ beq $zero, $zero, .L80AD0B24 -/* 01478 80AD0918 8FBF005C */ lw $ra, 0x005C($sp) -.L80AD091C: -/* 0147C 80AD091C 15C00009 */ bne $t6, $zero, .L80AD0944 -/* 01480 80AD0920 8FA90094 */ lw $t1, 0x0094($sp) -/* 01484 80AD0924 924F0311 */ lbu $t7, 0x0311($s2) ## 00000311 -/* 01488 80AD0928 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 0148C 80AD092C 57000006 */ bnel $t8, $zero, .L80AD0948 -/* 01490 80AD0930 8D2A1C44 */ lw $t2, 0x1C44($t1) ## 00001C44 -/* 01494 80AD0934 96590088 */ lhu $t9, 0x0088($s2) ## 00000088 -/* 01498 80AD0938 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 0149C 80AD093C 51000079 */ beql $t0, $zero, .L80AD0B24 -/* 014A0 80AD0940 8FBF005C */ lw $ra, 0x005C($sp) -.L80AD0944: -/* 014A4 80AD0944 8D2A1C44 */ lw $t2, 0x1C44($t1) ## 00001C44 -.L80AD0948: -/* 014A8 80AD0948 306BFFFD */ andi $t3, $v1, 0xFFFD ## $t3 = 00000000 -/* 014AC 80AD094C AFAA0088 */ sw $t2, 0x0088($sp) -/* 014B0 80AD0950 92420311 */ lbu $v0, 0x0311($s2) ## 00000311 -/* 014B4 80AD0954 A24B03BC */ sb $t3, 0x03BC($s2) ## 000003BC -/* 014B8 80AD0958 8FAC0088 */ lw $t4, 0x0088($sp) -/* 014BC 80AD095C 30420002 */ andi $v0, $v0, 0x0002 ## $v0 = 00000000 -/* 014C0 80AD0960 14400016 */ bne $v0, $zero, .L80AD09BC -/* 014C4 80AD0964 00000000 */ nop -/* 014C8 80AD0968 8E4D03B0 */ lw $t5, 0x03B0($s2) ## 000003B0 -/* 014CC 80AD096C 158D0013 */ bne $t4, $t5, .L80AD09BC -/* 014D0 80AD0970 00000000 */ nop -/* 014D4 80AD0974 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 014D8 80AD0978 00000000 */ nop -/* 014DC 80AD097C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 014E0 80AD0980 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 014E4 80AD0984 24080028 */ addiu $t0, $zero, 0x0028 ## $t0 = 00000028 -/* 014E8 80AD0988 4600403C */ c.lt.s $f8, $f0 -/* 014EC 80AD098C 00000000 */ nop -/* 014F0 80AD0990 45020006 */ bc1fl .L80AD09AC -/* 014F4 80AD0994 86580032 */ lh $t8, 0x0032($s2) ## 00000032 -/* 014F8 80AD0998 864E0032 */ lh $t6, 0x0032($s2) ## 00000032 -/* 014FC 80AD099C 25CF2000 */ addiu $t7, $t6, 0x2000 ## $t7 = 00002000 -/* 01500 80AD09A0 10000004 */ beq $zero, $zero, .L80AD09B4 -/* 01504 80AD09A4 A64F0032 */ sh $t7, 0x0032($s2) ## 00000032 -/* 01508 80AD09A8 86580032 */ lh $t8, 0x0032($s2) ## 00000032 -.L80AD09AC: -/* 0150C 80AD09AC 2719E000 */ addiu $t9, $t8, 0xE000 ## $t9 = FFFFE000 -/* 01510 80AD09B0 A6590032 */ sh $t9, 0x0032($s2) ## 00000032 -.L80AD09B4: -/* 01514 80AD09B4 1000003F */ beq $zero, $zero, .L80AD0AB4 -/* 01518 80AD09B8 AE4802D4 */ sw $t0, 0x02D4($s2) ## 000002D4 -.L80AD09BC: -/* 0151C 80AD09BC 14400004 */ bne $v0, $zero, .L80AD09D0 -/* 01520 80AD09C0 3C0B80AD */ lui $t3, %hi(D_80AD282C) ## $t3 = 80AD0000 -/* 01524 80AD09C4 96490088 */ lhu $t1, 0x0088($s2) ## 00000088 -/* 01528 80AD09C8 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 0152C 80AD09CC 11400039 */ beq $t2, $zero, .L80AD0AB4 -.L80AD09D0: -/* 01530 80AD09D0 256B282C */ addiu $t3, $t3, %lo(D_80AD282C) ## $t3 = 80AD282C -/* 01534 80AD09D4 8D6D0000 */ lw $t5, 0x0000($t3) ## 80AD282C -/* 01538 80AD09D8 27B1007C */ addiu $s1, $sp, 0x007C ## $s1 = FFFFFFEC -/* 0153C 80AD09DC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01540 80AD09E0 AE2D0000 */ sw $t5, 0x0000($s1) ## FFFFFFEC -/* 01544 80AD09E4 8D6C0004 */ lw $t4, 0x0004($t3) ## 80AD2830 -/* 01548 80AD09E8 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 -/* 0154C 80AD09EC 24100004 */ addiu $s0, $zero, 0x0004 ## $s0 = 00000004 -/* 01550 80AD09F0 AE2C0004 */ sw $t4, 0x0004($s1) ## FFFFFFF0 -/* 01554 80AD09F4 8D6D0008 */ lw $t5, 0x0008($t3) ## 80AD2834 -/* 01558 80AD09F8 AE2D0008 */ sw $t5, 0x0008($s1) ## FFFFFFF4 -.L80AD09FC: -/* 0155C 80AD09FC 0C00CFC8 */ jal Rand_CenteredFloat - -/* 01560 80AD0A00 4600A306 */ mov.s $f12, $f20 -/* 01564 80AD0A04 C64A0024 */ lwc1 $f10, 0x0024($s2) ## 00000024 -/* 01568 80AD0A08 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0156C 80AD0A0C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 01570 80AD0A10 460A0400 */ add.s $f16, $f0, $f10 -/* 01574 80AD0A14 0C00CFC8 */ jal Rand_CenteredFloat - -/* 01578 80AD0A18 E7B0006C */ swc1 $f16, 0x006C($sp) -/* 0157C 80AD0A1C C6520028 */ lwc1 $f18, 0x0028($s2) ## 00000028 -/* 01580 80AD0A20 4600A306 */ mov.s $f12, $f20 -/* 01584 80AD0A24 46120100 */ add.s $f4, $f0, $f18 -/* 01588 80AD0A28 0C00CFC8 */ jal Rand_CenteredFloat - -/* 0158C 80AD0A2C E7A40070 */ swc1 $f4, 0x0070($sp) -/* 01590 80AD0A30 C646002C */ lwc1 $f6, 0x002C($s2) ## 0000002C -/* 01594 80AD0A34 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 -/* 01598 80AD0A38 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 -/* 0159C 80AD0A3C 46060200 */ add.s $f8, $f0, $f6 -/* 015A0 80AD0A40 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 015A4 80AD0A44 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 015A8 80AD0A48 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 015AC 80AD0A4C 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 015B0 80AD0A50 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 015B4 80AD0A54 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 015B8 80AD0A58 240C0009 */ addiu $t4, $zero, 0x0009 ## $t4 = 00000009 -/* 015BC 80AD0A5C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 015C0 80AD0A60 E7A80074 */ swc1 $f8, 0x0074($sp) -/* 015C4 80AD0A64 AFAD003C */ sw $t5, 0x003C($sp) -/* 015C8 80AD0A68 AFAC0038 */ sw $t4, 0x0038($sp) -/* 015CC 80AD0A6C AFAB0034 */ sw $t3, 0x0034($sp) -/* 015D0 80AD0A70 AFAA0028 */ sw $t2, 0x0028($sp) -/* 015D4 80AD0A74 AFA90024 */ sw $t1, 0x0024($sp) -/* 015D8 80AD0A78 AFA80020 */ sw $t0, 0x0020($sp) -/* 015DC 80AD0A7C AFB9001C */ sw $t9, 0x001C($sp) -/* 015E0 80AD0A80 AFB80018 */ sw $t8, 0x0018($sp) -/* 015E4 80AD0A84 AFAF0014 */ sw $t7, 0x0014($sp) -/* 015E8 80AD0A88 AFAE0010 */ sw $t6, 0x0010($sp) -/* 015EC 80AD0A8C AFA00030 */ sw $zero, 0x0030($sp) -/* 015F0 80AD0A90 AFA0002C */ sw $zero, 0x002C($sp) -/* 015F4 80AD0A94 8FA40094 */ lw $a0, 0x0094($sp) -/* 015F8 80AD0A98 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFDC -/* 015FC 80AD0A9C 02203025 */ or $a2, $s1, $zero ## $a2 = FFFFFFEC -/* 01600 80AD0AA0 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 01604 80AD0AA4 02203825 */ or $a3, $s1, $zero ## $a3 = FFFFFFEC -/* 01608 80AD0AA8 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000003 -/* 0160C 80AD0AAC 0601FFD3 */ bgez $s0, .L80AD09FC -/* 01610 80AD0AB0 00000000 */ nop -.L80AD0AB4: -/* 01614 80AD0AB4 8FAE0088 */ lw $t6, 0x0088($sp) -/* 01618 80AD0AB8 8E4F03B0 */ lw $t7, 0x03B0($s2) ## 000003B0 -/* 0161C 80AD0ABC 55CF0006 */ bnel $t6, $t7, .L80AD0AD8 -/* 01620 80AD0AC0 96480088 */ lhu $t0, 0x0088($s2) ## 00000088 -/* 01624 80AD0AC4 92580311 */ lbu $t8, 0x0311($s2) ## 00000311 -/* 01628 80AD0AC8 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 0162C 80AD0ACC 53200015 */ beql $t9, $zero, .L80AD0B24 -/* 01630 80AD0AD0 8FBF005C */ lw $ra, 0x005C($sp) -/* 01634 80AD0AD4 96480088 */ lhu $t0, 0x0088($s2) ## 00000088 -.L80AD0AD8: -/* 01638 80AD0AD8 8FA40094 */ lw $a0, 0x0094($sp) -/* 0163C 80AD0ADC 264500E4 */ addiu $a1, $s2, 0x00E4 ## $a1 = 000000E4 -/* 01640 80AD0AE0 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 01644 80AD0AE4 15200007 */ bne $t1, $zero, .L80AD0B04 -/* 01648 80AD0AE8 24063985 */ addiu $a2, $zero, 0x3985 ## $a2 = 00003985 -/* 0164C 80AD0AEC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 01650 80AD0AF0 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 -/* 01654 80AD0AF4 AFAB0014 */ sw $t3, 0x0014($sp) -/* 01658 80AD0AF8 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0165C 80AD0AFC 0C00AA7D */ jal EffectSsDeadSound_SpawnStationary -/* 01660 80AD0B00 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80AD0B04: -/* 01664 80AD0B04 8FA40094 */ lw $a0, 0x0094($sp) -/* 01668 80AD0B08 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 0166C 80AD0B0C 26460024 */ addiu $a2, $s2, 0x0024 ## $a2 = 00000024 -/* 01670 80AD0B10 0C007E50 */ jal Item_DropCollectibleRandom - -/* 01674 80AD0B14 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 01678 80AD0B18 0C00B55C */ jal Actor_Kill - -/* 0167C 80AD0B1C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01680 80AD0B20 8FBF005C */ lw $ra, 0x005C($sp) -.L80AD0B24: -/* 01684 80AD0B24 D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 01688 80AD0B28 8FB00050 */ lw $s0, 0x0050($sp) -/* 0168C 80AD0B2C 8FB10054 */ lw $s1, 0x0054($sp) -/* 01690 80AD0B30 8FB20058 */ lw $s2, 0x0058($sp) -/* 01694 80AD0B34 03E00008 */ jr $ra -/* 01698 80AD0B38 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s deleted file mode 100644 index 85f5b6654b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AD0B3C -/* 0169C 80AD0B3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 016A0 80AD0B40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 016A4 80AD0B44 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 016A8 80AD0B48 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 016AC 80AD0B4C AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 016B0 80AD0B50 3C050600 */ lui $a1, %hi(D_06000350) ## $a1 = 06000000 -/* 016B4 80AD0B54 24A50350 */ addiu $a1, $a1, %lo(D_06000350) ## $a1 = 06000350 -/* 016B8 80AD0B58 AFA60018 */ sw $a2, 0x0018($sp) -/* 016BC 80AD0B5C 0C02947A */ jal Animation_PlayOnce -/* 016C0 80AD0B60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 016C4 80AD0B64 3C0580AD */ lui $a1, %hi(func_80AD0B84) ## $a1 = 80AD0000 -/* 016C8 80AD0B68 8FA40018 */ lw $a0, 0x0018($sp) -/* 016CC 80AD0B6C 0C2B3D28 */ jal func_80ACF4A0 -/* 016D0 80AD0B70 24A50B84 */ addiu $a1, $a1, %lo(func_80AD0B84) ## $a1 = 80AD0B84 -/* 016D4 80AD0B74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 016D8 80AD0B78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 016DC 80AD0B7C 03E00008 */ jr $ra -/* 016E0 80AD0B80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B84.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B84.s deleted file mode 100644 index 57001f38e7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B84.s +++ /dev/null @@ -1,125 +0,0 @@ -.late_rodata -glabel D_80AD2930 - .word 0x3F866666 - -.text -glabel func_80AD0B84 -/* 016E4 80AD0B84 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 016E8 80AD0B88 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 016EC 80AD0B8C AFB00028 */ sw $s0, 0x0028($sp) -/* 016F0 80AD0B90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 016F4 80AD0B94 AFBF002C */ sw $ra, 0x002C($sp) -/* 016F8 80AD0B98 AFA50044 */ sw $a1, 0x0044($sp) -/* 016FC 80AD0B9C 3C05C47A */ lui $a1, 0xC47A ## $a1 = C47A0000 -/* 01700 80AD0BA0 248400BC */ addiu $a0, $a0, 0x00BC ## $a0 = 000000BC -/* 01704 80AD0BA4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01708 80AD0BA8 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 0170C 80AD0BAC 0C01E0C4 */ jal Math_SmoothStepToF - -/* 01710 80AD0BB0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01714 80AD0BB4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01718 80AD0BB8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 0171C 80AD0BBC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01720 80AD0BC0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 01724 80AD0BC4 44060000 */ mfc1 $a2, $f0 -/* 01728 80AD0BC8 44070000 */ mfc1 $a3, $f0 -/* 0172C 80AD0BCC 44051000 */ mfc1 $a1, $f2 -/* 01730 80AD0BD0 0C01E0C4 */ jal Math_SmoothStepToF - -/* 01734 80AD0BD4 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01738 80AD0BD8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 0173C 80AD0BDC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01740 80AD0BE0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01744 80AD0BE4 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 -/* 01748 80AD0BE8 0C01E1A7 */ jal Math_SmoothStepToS - -/* 0174C 80AD0BEC AFA00010 */ sw $zero, 0x0010($sp) -/* 01750 80AD0BF0 0C02927F */ jal SkelAnime_Update - -/* 01754 80AD0BF4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01758 80AD0BF8 5040000B */ beql $v0, $zero, .L80AD0C28 -/* 0175C 80AD0BFC C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 -/* 01760 80AD0C00 0C2B3ECD */ jal func_80ACFB34 -/* 01764 80AD0C04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01768 80AD0C08 C6060080 */ lwc1 $f6, 0x0080($s0) ## 00000080 -/* 0176C 80AD0C0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01770 80AD0C10 24053957 */ addiu $a1, $zero, 0x3957 ## $a1 = 00003957 -/* 01774 80AD0C14 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01778 80AD0C18 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 0177C 80AD0C1C 10000039 */ beq $zero, $zero, .L80AD0D04 -/* 01780 80AD0C20 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -/* 01784 80AD0C24 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 -.L80AD0C28: -/* 01788 80AD0C28 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 0178C 80AD0C2C 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 01790 80AD0C30 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 01794 80AD0C34 4608003C */ c.lt.s $f0, $f8 -/* 01798 80AD0C38 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 0179C 80AD0C3C 3C074060 */ lui $a3, 0x4060 ## $a3 = 40600000 -/* 017A0 80AD0C40 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 017A4 80AD0C44 4502002F */ bc1fl .L80AD0D04 -/* 017A8 80AD0C48 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -/* 017AC 80AD0C4C 44815000 */ mtc1 $at, $f10 ## $f10 = 0.25 -/* 017B0 80AD0C50 44050000 */ mfc1 $a1, $f0 -/* 017B4 80AD0C54 0C01E0C4 */ jal Math_SmoothStepToF - -/* 017B8 80AD0C58 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 017BC 80AD0C5C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 017C0 80AD0C60 C6120080 */ lwc1 $f18, 0x0080($s0) ## 00000080 -/* 017C4 80AD0C64 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 017C8 80AD0C68 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 -/* 017CC 80AD0C6C 46128101 */ sub.s $f4, $f16, $f18 -/* 017D0 80AD0C70 4606203C */ c.lt.s $f4, $f6 -/* 017D4 80AD0C74 00000000 */ nop -/* 017D8 80AD0C78 45020022 */ bc1fl .L80AD0D04 -/* 017DC 80AD0C7C 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -/* 017E0 80AD0C80 8E0F0024 */ lw $t7, 0x0024($s0) ## 00000024 -/* 017E4 80AD0C84 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 -/* 017E8 80AD0C88 24180096 */ addiu $t8, $zero, 0x0096 ## $t8 = 00000096 -/* 017EC 80AD0C8C ACAF0000 */ sw $t7, 0x0000($a1) ## FFFFFFF4 -/* 017F0 80AD0C90 8E0E0028 */ lw $t6, 0x0028($s0) ## 00000028 -/* 017F4 80AD0C94 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 017F8 80AD0C98 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 017FC 80AD0C9C ACAE0004 */ sw $t6, 0x0004($a1) ## FFFFFFF8 -/* 01800 80AD0CA0 8E0F002C */ lw $t7, 0x002C($s0) ## 0000002C -/* 01804 80AD0CA4 3C0642A0 */ lui $a2, 0x42A0 ## $a2 = 42A00000 -/* 01808 80AD0CA8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0180C 80AD0CAC ACAF0008 */ sw $t7, 0x0008($a1) ## FFFFFFFC -/* 01810 80AD0CB0 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 -/* 01814 80AD0CB4 AFA80018 */ sw $t0, 0x0018($sp) -/* 01818 80AD0CB8 AFB90014 */ sw $t9, 0x0014($sp) -/* 0181C 80AD0CBC AFB80010 */ sw $t8, 0x0010($sp) -/* 01820 80AD0CC0 8FA40044 */ lw $a0, 0x0044($sp) -/* 01824 80AD0CC4 0C00CD20 */ jal func_80033480 -/* 01828 80AD0CC8 E7A80038 */ swc1 $f8, 0x0038($sp) -/* 0182C 80AD0CCC 3C0180AD */ lui $at, %hi(D_80AD2930) ## $at = 80AD0000 -/* 01830 80AD0CD0 C42A2930 */ lwc1 $f10, %lo(D_80AD2930)($at) -/* 01834 80AD0CD4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01838 80AD0CD8 44818000 */ mtc1 $at, $f16 ## $f16 = 2.00 -/* 0183C 80AD0CDC 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 01840 80AD0CE0 AFA90010 */ sw $t1, 0x0010($sp) -/* 01844 80AD0CE4 8FA40044 */ lw $a0, 0x0044($sp) -/* 01848 80AD0CE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0184C 80AD0CEC 27A60034 */ addiu $a2, $sp, 0x0034 ## $a2 = FFFFFFF4 -/* 01850 80AD0CF0 3C074296 */ lui $a3, 0x4296 ## $a3 = 42960000 -/* 01854 80AD0CF4 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 01858 80AD0CF8 0C2B3DE2 */ jal func_80ACF788 -/* 0185C 80AD0CFC E7B00018 */ swc1 $f16, 0x0018($sp) -/* 01860 80AD0D00 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -.L80AD0D04: -/* 01864 80AD0D04 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01868 80AD0D08 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0186C 80AD0D0C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 01870 80AD0D10 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01874 80AD0D14 AFA00010 */ sw $zero, 0x0010($sp) -/* 01878 80AD0D18 860A02F2 */ lh $t2, 0x02F2($s0) ## 000002F2 -/* 0187C 80AD0D1C 860B02F0 */ lh $t3, 0x02F0($s0) ## 000002F0 -/* 01880 80AD0D20 014B6021 */ addu $t4, $t2, $t3 -/* 01884 80AD0D24 A60C02F2 */ sh $t4, 0x02F2($s0) ## 000002F2 -/* 01888 80AD0D28 8FBF002C */ lw $ra, 0x002C($sp) -/* 0188C 80AD0D2C 8FB00028 */ lw $s0, 0x0028($sp) -/* 01890 80AD0D30 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01894 80AD0D34 03E00008 */ jr $ra -/* 01898 80AD0D38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s deleted file mode 100644 index 21328d01fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AD0D3C -/* 0189C 80AD0D3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018A0 80AD0D40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018A4 80AD0D44 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 018A8 80AD0D48 3C050600 */ lui $a1, %hi(D_06000350) ## $a1 = 06000000 -/* 018AC 80AD0D4C 24A50350 */ addiu $a1, $a1, %lo(D_06000350) ## $a1 = 06000350 -/* 018B0 80AD0D50 AFA60018 */ sw $a2, 0x0018($sp) -/* 018B4 80AD0D54 0C02947A */ jal Animation_PlayOnce -/* 018B8 80AD0D58 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 018BC 80AD0D5C 8FA40018 */ lw $a0, 0x0018($sp) -/* 018C0 80AD0D60 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 018C4 80AD0D64 3C0580AD */ lui $a1, %hi(func_80AD0D84) ## $a1 = 80AD0000 -/* 018C8 80AD0D68 24A50D84 */ addiu $a1, $a1, %lo(func_80AD0D84) ## $a1 = 80AD0D84 -/* 018CC 80AD0D6C 0C2B3D28 */ jal func_80ACF4A0 -/* 018D0 80AD0D70 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 018D4 80AD0D74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018D8 80AD0D78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018DC 80AD0D7C 03E00008 */ jr $ra -/* 018E0 80AD0D80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D84.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D84.s deleted file mode 100644 index e2f2048cb1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D84.s +++ /dev/null @@ -1,125 +0,0 @@ -.late_rodata -glabel D_80AD2934 - .word 0x3F866666 - -.text -glabel func_80AD0D84 -/* 018E4 80AD0D84 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 018E8 80AD0D88 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 018EC 80AD0D8C AFB00028 */ sw $s0, 0x0028($sp) -/* 018F0 80AD0D90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 018F4 80AD0D94 AFBF002C */ sw $ra, 0x002C($sp) -/* 018F8 80AD0D98 AFA50044 */ sw $a1, 0x0044($sp) -/* 018FC 80AD0D9C 3C05C47A */ lui $a1, 0xC47A ## $a1 = C47A0000 -/* 01900 80AD0DA0 248400BC */ addiu $a0, $a0, 0x00BC ## $a0 = 000000BC -/* 01904 80AD0DA4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01908 80AD0DA8 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 0190C 80AD0DAC 0C01E0C4 */ jal Math_SmoothStepToF - -/* 01910 80AD0DB0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01914 80AD0DB4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01918 80AD0DB8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 0191C 80AD0DBC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01920 80AD0DC0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 01924 80AD0DC4 44060000 */ mfc1 $a2, $f0 -/* 01928 80AD0DC8 44070000 */ mfc1 $a3, $f0 -/* 0192C 80AD0DCC 44051000 */ mfc1 $a1, $f2 -/* 01930 80AD0DD0 0C01E0C4 */ jal Math_SmoothStepToF - -/* 01934 80AD0DD4 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01938 80AD0DD8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 0193C 80AD0DDC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01940 80AD0DE0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01944 80AD0DE4 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 -/* 01948 80AD0DE8 0C01E1A7 */ jal Math_SmoothStepToS - -/* 0194C 80AD0DEC AFA00010 */ sw $zero, 0x0010($sp) -/* 01950 80AD0DF0 0C02927F */ jal SkelAnime_Update - -/* 01954 80AD0DF4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01958 80AD0DF8 5040000A */ beql $v0, $zero, .L80AD0E24 -/* 0195C 80AD0DFC C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 -/* 01960 80AD0E00 0C2B3F48 */ jal func_80ACFD20 -/* 01964 80AD0E04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01968 80AD0E08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0196C 80AD0E0C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01970 80AD0E10 24053957 */ addiu $a1, $zero, 0x3957 ## $a1 = 00003957 -/* 01974 80AD0E14 C6060080 */ lwc1 $f6, 0x0080($s0) ## 00000080 -/* 01978 80AD0E18 10000038 */ beq $zero, $zero, .L80AD0EFC -/* 0197C 80AD0E1C E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 01980 80AD0E20 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 -.L80AD0E24: -/* 01984 80AD0E24 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 01988 80AD0E28 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 0198C 80AD0E2C 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 01990 80AD0E30 4608003C */ c.lt.s $f0, $f8 -/* 01994 80AD0E34 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 01998 80AD0E38 3C074158 */ lui $a3, 0x4158 ## $a3 = 41580000 -/* 0199C 80AD0E3C 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 019A0 80AD0E40 4502002F */ bc1fl .L80AD0F00 -/* 019A4 80AD0E44 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -/* 019A8 80AD0E48 44815000 */ mtc1 $at, $f10 ## $f10 = 0.25 -/* 019AC 80AD0E4C 44050000 */ mfc1 $a1, $f0 -/* 019B0 80AD0E50 0C01E0C4 */ jal Math_SmoothStepToF - -/* 019B4 80AD0E54 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 019B8 80AD0E58 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 019BC 80AD0E5C C6120080 */ lwc1 $f18, 0x0080($s0) ## 00000080 -/* 019C0 80AD0E60 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 019C4 80AD0E64 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 -/* 019C8 80AD0E68 46128101 */ sub.s $f4, $f16, $f18 -/* 019CC 80AD0E6C 4606203C */ c.lt.s $f4, $f6 -/* 019D0 80AD0E70 00000000 */ nop -/* 019D4 80AD0E74 45020022 */ bc1fl .L80AD0F00 -/* 019D8 80AD0E78 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -/* 019DC 80AD0E7C 8E0F0024 */ lw $t7, 0x0024($s0) ## 00000024 -/* 019E0 80AD0E80 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 -/* 019E4 80AD0E84 24180096 */ addiu $t8, $zero, 0x0096 ## $t8 = 00000096 -/* 019E8 80AD0E88 ACAF0000 */ sw $t7, 0x0000($a1) ## FFFFFFF4 -/* 019EC 80AD0E8C 8E0E0028 */ lw $t6, 0x0028($s0) ## 00000028 -/* 019F0 80AD0E90 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 019F4 80AD0E94 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 019F8 80AD0E98 ACAE0004 */ sw $t6, 0x0004($a1) ## FFFFFFF8 -/* 019FC 80AD0E9C 8E0F002C */ lw $t7, 0x002C($s0) ## 0000002C -/* 01A00 80AD0EA0 3C0642A0 */ lui $a2, 0x42A0 ## $a2 = 42A00000 -/* 01A04 80AD0EA4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01A08 80AD0EA8 ACAF0008 */ sw $t7, 0x0008($a1) ## FFFFFFFC -/* 01A0C 80AD0EAC C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 -/* 01A10 80AD0EB0 AFA80018 */ sw $t0, 0x0018($sp) -/* 01A14 80AD0EB4 AFB90014 */ sw $t9, 0x0014($sp) -/* 01A18 80AD0EB8 AFB80010 */ sw $t8, 0x0010($sp) -/* 01A1C 80AD0EBC 8FA40044 */ lw $a0, 0x0044($sp) -/* 01A20 80AD0EC0 0C00CD20 */ jal func_80033480 -/* 01A24 80AD0EC4 E7A80038 */ swc1 $f8, 0x0038($sp) -/* 01A28 80AD0EC8 3C0180AD */ lui $at, %hi(D_80AD2934) ## $at = 80AD0000 -/* 01A2C 80AD0ECC C42A2934 */ lwc1 $f10, %lo(D_80AD2934)($at) -/* 01A30 80AD0ED0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01A34 80AD0ED4 44818000 */ mtc1 $at, $f16 ## $f16 = 2.00 -/* 01A38 80AD0ED8 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 01A3C 80AD0EDC AFA90010 */ sw $t1, 0x0010($sp) -/* 01A40 80AD0EE0 8FA40044 */ lw $a0, 0x0044($sp) -/* 01A44 80AD0EE4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01A48 80AD0EE8 27A60034 */ addiu $a2, $sp, 0x0034 ## $a2 = FFFFFFF4 -/* 01A4C 80AD0EEC 3C074296 */ lui $a3, 0x4296 ## $a3 = 42960000 -/* 01A50 80AD0EF0 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 01A54 80AD0EF4 0C2B3DE2 */ jal func_80ACF788 -/* 01A58 80AD0EF8 E7B00018 */ swc1 $f16, 0x0018($sp) -.L80AD0EFC: -/* 01A5C 80AD0EFC 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -.L80AD0F00: -/* 01A60 80AD0F00 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01A64 80AD0F04 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01A68 80AD0F08 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 01A6C 80AD0F0C 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01A70 80AD0F10 AFA00010 */ sw $zero, 0x0010($sp) -/* 01A74 80AD0F14 860A02F2 */ lh $t2, 0x02F2($s0) ## 000002F2 -/* 01A78 80AD0F18 860B02F0 */ lh $t3, 0x02F0($s0) ## 000002F0 -/* 01A7C 80AD0F1C 014B6021 */ addu $t4, $t2, $t3 -/* 01A80 80AD0F20 A60C02F2 */ sh $t4, 0x02F2($s0) ## 000002F2 -/* 01A84 80AD0F24 8FBF002C */ lw $ra, 0x002C($sp) -/* 01A88 80AD0F28 8FB00028 */ lw $s0, 0x0028($sp) -/* 01A8C 80AD0F2C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01A90 80AD0F30 03E00008 */ jr $ra -/* 01A94 80AD0F34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s deleted file mode 100644 index 8085b9180a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80AD0F38 -/* 01A98 80AD0F38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01A9C 80AD0F3C AFB00018 */ sw $s0, 0x0018($sp) -/* 01AA0 80AD0F40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01AA4 80AD0F44 AFBF001C */ sw $ra, 0x001C($sp) -/* 01AA8 80AD0F48 3C050600 */ lui $a1, %hi(D_060005C4) ## $a1 = 06000000 -/* 01AAC 80AD0F4C 24A505C4 */ addiu $a1, $a1, %lo(D_060005C4) ## $a1 = 060005C4 -/* 01AB0 80AD0F50 0C0294BE */ jal Animation_PlayLoop -/* 01AB4 80AD0F54 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01AB8 80AD0F58 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01ABC 80AD0F5C 00000000 */ nop -/* 01AC0 80AD0F60 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01AC4 80AD0F64 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 01AC8 80AD0F68 3C014020 */ lui $at, 0x4020 ## $at = 40200000 -/* 01ACC 80AD0F6C 44814000 */ mtc1 $at, $f8 ## $f8 = 2.50 -/* 01AD0 80AD0F70 46040182 */ mul.s $f6, $f0, $f4 -/* 01AD4 80AD0F74 46083280 */ add.s $f10, $f6, $f8 -/* 01AD8 80AD0F78 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01ADC 80AD0F7C E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 01AE0 80AD0F80 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01AE4 80AD0F84 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 01AE8 80AD0F88 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F -/* 01AEC 80AD0F8C 3C0580AD */ lui $a1, %hi(func_80AD0FC8) ## $a1 = 80AD0000 -/* 01AF0 80AD0F90 46020402 */ mul.s $f16, $f0, $f2 -/* 01AF4 80AD0F94 AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 -/* 01AF8 80AD0F98 24A50FC8 */ addiu $a1, $a1, %lo(func_80AD0FC8) ## $a1 = 80AD0FC8 -/* 01AFC 80AD0F9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B00 80AD0FA0 46028480 */ add.s $f18, $f16, $f2 -/* 01B04 80AD0FA4 4600910D */ trunc.w.s $f4, $f18 -/* 01B08 80AD0FA8 440F2000 */ mfc1 $t7, $f4 -/* 01B0C 80AD0FAC 0C2B3D28 */ jal func_80ACF4A0 -/* 01B10 80AD0FB0 AE0F02D4 */ sw $t7, 0x02D4($s0) ## 000002D4 -/* 01B14 80AD0FB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01B18 80AD0FB8 8FB00018 */ lw $s0, 0x0018($sp) -/* 01B1C 80AD0FBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01B20 80AD0FC0 03E00008 */ jr $ra -/* 01B24 80AD0FC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s deleted file mode 100644 index 925e223330..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s +++ /dev/null @@ -1,176 +0,0 @@ -.late_rodata -glabel D_80AD2938 - .float 1.4 - -glabel D_80AD293C - .word 0x3E3851EC -glabel D_80AD2940 - .word 0x3D8F5C29 - -.text -glabel func_80AD0FC8 -/* 01B28 80AD0FC8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01B2C 80AD0FCC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01B30 80AD0FD0 AFB00020 */ sw $s0, 0x0020($sp) -/* 01B34 80AD0FD4 AFA50034 */ sw $a1, 0x0034($sp) -/* 01B38 80AD0FD8 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 01B3C 80AD0FDC 3C014296 */ lui $at, 0x4296 ## $at = 42960000 -/* 01B40 80AD0FE0 44812000 */ mtc1 $at, $f4 ## $f4 = 75.00 -/* 01B44 80AD0FE4 AFAF0028 */ sw $t7, 0x0028($sp) -/* 01B48 80AD0FE8 C4860080 */ lwc1 $f6, 0x0080($a0) ## 00000080 -/* 01B4C 80AD0FEC C4800028 */ lwc1 $f0, 0x0028($a0) ## 00000028 -/* 01B50 80AD0FF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01B54 80AD0FF4 46060201 */ sub.s $f8, $f0, $f6 -/* 01B58 80AD0FF8 4608203C */ c.lt.s $f4, $f8 -/* 01B5C 80AD0FFC 00000000 */ nop -/* 01B60 80AD1000 45000005 */ bc1f .L80AD1018 -/* 01B64 80AD1004 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01B68 80AD1008 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 01B6C 80AD100C 00000000 */ nop -/* 01B70 80AD1010 460A0401 */ sub.s $f16, $f0, $f10 -/* 01B74 80AD1014 E4900028 */ swc1 $f16, 0x0028($a0) ## 00000028 -.L80AD1018: -/* 01B78 80AD1018 0C0329DD */ jal Math_CosF -/* 01B7C 80AD101C C60C02E0 */ lwc1 $f12, 0x02E0($s0) ## 000002E0 -/* 01B80 80AD1020 3C0180AD */ lui $at, %hi(D_80AD2938) ## $at = 80AD0000 -/* 01B84 80AD1024 C4262938 */ lwc1 $f6, %lo(D_80AD2938)($at) -/* 01B88 80AD1028 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 01B8C 80AD102C C60C02E0 */ lwc1 $f12, 0x02E0($s0) ## 000002E0 -/* 01B90 80AD1030 46060102 */ mul.s $f4, $f0, $f6 -/* 01B94 80AD1034 46049200 */ add.s $f8, $f18, $f4 -/* 01B98 80AD1038 0C0329DD */ jal Math_CosF -/* 01B9C 80AD103C E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 01BA0 80AD1040 3C0180AD */ lui $at, %hi(D_80AD293C) ## $at = 80AD0000 -/* 01BA4 80AD1044 C42A293C */ lwc1 $f10, %lo(D_80AD293C)($at) -/* 01BA8 80AD1048 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01BAC 80AD104C 3C0180AD */ lui $at, %hi(D_80AD2940) ## $at = 80AD0000 -/* 01BB0 80AD1050 460A0082 */ mul.s $f2, $f0, $f10 -/* 01BB4 80AD1054 4602803E */ c.le.s $f16, $f2 -/* 01BB8 80AD1058 00000000 */ nop -/* 01BBC 80AD105C 45020004 */ bc1fl .L80AD1070 -/* 01BC0 80AD1060 46001007 */ neg.s $f0, $f2 -/* 01BC4 80AD1064 10000002 */ beq $zero, $zero, .L80AD1070 -/* 01BC8 80AD1068 46001006 */ mov.s $f0, $f2 -/* 01BCC 80AD106C 46001007 */ neg.s $f0, $f2 -.L80AD1070: -/* 01BD0 80AD1070 C4322940 */ lwc1 $f18, %lo(D_80AD2940)($at) -/* 01BD4 80AD1074 C60602E0 */ lwc1 $f6, 0x02E0($s0) ## 000002E0 -/* 01BD8 80AD1078 8E1802D4 */ lw $t8, 0x02D4($s0) ## 000002D4 -/* 01BDC 80AD107C 46120100 */ add.s $f4, $f0, $f18 -/* 01BE0 80AD1080 2719FFFF */ addiu $t9, $t8, 0xFFFF ## $t9 = FFFFFFFF -/* 01BE4 80AD1084 AE1902D4 */ sw $t9, 0x02D4($s0) ## 000002D4 -/* 01BE8 80AD1088 46043200 */ add.s $f8, $f6, $f4 -/* 01BEC 80AD108C 1F20001E */ bgtz $t9, .L80AD1108 -/* 01BF0 80AD1090 E60802E0 */ swc1 $f8, 0x02E0($s0) ## 000002E0 -/* 01BF4 80AD1094 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01BF8 80AD1098 00000000 */ nop -/* 01BFC 80AD109C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01C00 80AD10A0 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 01C04 80AD10A4 3C014020 */ lui $at, 0x4020 ## $at = 40200000 -/* 01C08 80AD10A8 44819000 */ mtc1 $at, $f18 ## $f18 = 2.50 -/* 01C0C 80AD10AC 460A0402 */ mul.s $f16, $f0, $f10 -/* 01C10 80AD10B0 46128180 */ add.s $f6, $f16, $f18 -/* 01C14 80AD10B4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01C18 80AD10B8 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 01C1C 80AD10BC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01C20 80AD10C0 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 01C24 80AD10C4 00000000 */ nop -/* 01C28 80AD10C8 46020102 */ mul.s $f4, $f0, $f2 -/* 01C2C 80AD10CC 46022200 */ add.s $f8, $f4, $f2 -/* 01C30 80AD10D0 4600428D */ trunc.w.s $f10, $f8 -/* 01C34 80AD10D4 440A5000 */ mfc1 $t2, $f10 -/* 01C38 80AD10D8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01C3C 80AD10DC AE0A02D4 */ sw $t2, 0x02D4($s0) ## 000002D4 -/* 01C40 80AD10E0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01C44 80AD10E4 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 01C48 80AD10E8 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 01C4C 80AD10EC 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 -/* 01C50 80AD10F0 46100481 */ sub.s $f18, $f0, $f16 -/* 01C54 80AD10F4 46069102 */ mul.s $f4, $f18, $f6 -/* 01C58 80AD10F8 4600220D */ trunc.w.s $f8, $f4 -/* 01C5C 80AD10FC 440C4000 */ mfc1 $t4, $f8 -/* 01C60 80AD1100 00000000 */ nop -/* 01C64 80AD1104 A60C02F4 */ sh $t4, 0x02F4($s0) ## 000002F4 -.L80AD1108: -/* 01C68 80AD1108 0C02927F */ jal SkelAnime_Update - -/* 01C6C 80AD110C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01C70 80AD1110 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 -/* 01C74 80AD1114 860E02F4 */ lh $t6, 0x02F4($s0) ## 000002F4 -/* 01C78 80AD1118 860202F8 */ lh $v0, 0x02F8($s0) ## 000002F8 -/* 01C7C 80AD111C 01AE7821 */ addu $t7, $t5, $t6 -/* 01C80 80AD1120 1C400006 */ bgtz $v0, .L80AD113C -/* 01C84 80AD1124 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 01C88 80AD1128 0C2B42CF */ jal func_80AD0B3C -/* 01C8C 80AD112C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C90 80AD1130 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 -/* 01C94 80AD1134 10000003 */ beq $zero, $zero, .L80AD1144 -/* 01C98 80AD1138 A61802F6 */ sh $t8, 0x02F6($s0) ## 000002F6 -.L80AD113C: -/* 01C9C 80AD113C 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 01CA0 80AD1140 A61902F8 */ sh $t9, 0x02F8($s0) ## 000002F8 -.L80AD1144: -/* 01CA4 80AD1144 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 01CA8 80AD1148 3C0A8016 */ lui $t2, %hi(gSaveContext+0x10) -/* 01CAC 80AD114C 2509015E */ addiu $t1, $t0, 0x015E ## $t1 = 0000015E -/* 01CB0 80AD1150 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -/* 01CB4 80AD1154 8D4AE670 */ lw $t2, %lo(gSaveContext+0x10)($t2) -/* 01CB8 80AD1158 8FA50028 */ lw $a1, 0x0028($sp) -/* 01CBC 80AD115C 15400013 */ bne $t2, $zero, .L80AD11AC -/* 01CC0 80AD1160 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 01CC4 80AD1164 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 01CC8 80AD1168 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 -/* 01CCC 80AD116C C60A02D8 */ lwc1 $f10, 0x02D8($s0) ## 000002D8 -/* 01CD0 80AD1170 460A003C */ c.lt.s $f0, $f10 -/* 01CD4 80AD1174 00000000 */ nop -/* 01CD8 80AD1178 4500000C */ bc1f .L80AD11AC -/* 01CDC 80AD117C 00000000 */ nop -/* 01CE0 80AD1180 860B008A */ lh $t3, 0x008A($s0) ## 0000008A -/* 01CE4 80AD1184 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CE8 80AD1188 0C2B4156 */ jal func_80AD0558 -/* 01CEC 80AD118C A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 -/* 01CF0 80AD1190 8FAC0034 */ lw $t4, 0x0034($sp) -/* 01CF4 80AD1194 3C0D0001 */ lui $t5, 0x0001 ## $t5 = 00010000 -/* 01CF8 80AD1198 01AC6821 */ addu $t5, $t5, $t4 -/* 01CFC 80AD119C 8DAD1DE4 */ lw $t5, 0x1DE4($t5) ## 00011DE4 -/* 01D00 80AD11A0 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 01D04 80AD11A4 10000003 */ beq $zero, $zero, .L80AD11B4 -/* 01D08 80AD11A8 A60E02FA */ sh $t6, 0x02FA($s0) ## 000002FA -.L80AD11AC: -/* 01D0C 80AD11AC 0C2B4488 */ jal func_80AD1220 -/* 01D10 80AD11B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD11B4: -/* 01D14 80AD11B4 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -/* 01D18 80AD11B8 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 -/* 01D1C 80AD11BC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01D20 80AD11C0 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 01D24 80AD11C4 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01D28 80AD11C8 AFA00010 */ sw $zero, 0x0010($sp) -/* 01D2C 80AD11CC 860F02F2 */ lh $t7, 0x02F2($s0) ## 000002F2 -/* 01D30 80AD11D0 861802F0 */ lh $t8, 0x02F0($s0) ## 000002F0 -/* 01D34 80AD11D4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01D38 80AD11D8 3C053D99 */ lui $a1, 0x3D99 ## $a1 = 3D990000 -/* 01D3C 80AD11DC 01F8C821 */ addu $t9, $t7, $t8 -/* 01D40 80AD11E0 A61902F2 */ sh $t9, 0x02F2($s0) ## 000002F2 -/* 01D44 80AD11E4 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 -/* 01D48 80AD11E8 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A -/* 01D4C 80AD11EC 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3D99999A -/* 01D50 80AD11F0 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 01D54 80AD11F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01D58 80AD11F8 0C01E0C4 */ jal Math_SmoothStepToF - -/* 01D5C 80AD11FC E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01D60 80AD1200 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D64 80AD1204 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01D68 80AD1208 24053155 */ addiu $a1, $zero, 0x3155 ## $a1 = 00003155 -/* 01D6C 80AD120C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01D70 80AD1210 8FB00020 */ lw $s0, 0x0020($sp) -/* 01D74 80AD1214 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01D78 80AD1218 03E00008 */ jr $ra -/* 01D7C 80AD121C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1220.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1220.s deleted file mode 100644 index a5379f3f26..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1220.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AD1220 -/* 01D80 80AD1220 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D84 80AD1224 3C014020 */ lui $at, 0x4020 ## $at = 40200000 -/* 01D88 80AD1228 44812000 */ mtc1 $at, $f4 ## $f4 = 2.50 -/* 01D8C 80AD122C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D90 80AD1230 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 01D94 80AD1234 3C0580AD */ lui $a1, %hi(func_80AD1258) ## $a1 = 80AD0000 -/* 01D98 80AD1238 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 01D9C 80AD123C 24A51258 */ addiu $a1, $a1, %lo(func_80AD1258) ## $a1 = 80AD1258 -/* 01DA0 80AD1240 0C2B3D28 */ jal func_80ACF4A0 -/* 01DA4 80AD1244 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01DA8 80AD1248 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01DAC 80AD124C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01DB0 80AD1250 03E00008 */ jr $ra -/* 01DB4 80AD1254 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s deleted file mode 100644 index bc0eebd872..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s +++ /dev/null @@ -1,145 +0,0 @@ -.late_rodata -glabel D_80AD2944 - .float 1.4 - -glabel D_80AD2948 - .word 0x3E3851EC -glabel D_80AD294C - .word 0x3D8F5C29 - -.text -glabel func_80AD1258 -/* 01DB8 80AD1258 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01DBC 80AD125C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01DC0 80AD1260 AFB00020 */ sw $s0, 0x0020($sp) -/* 01DC4 80AD1264 AFA50044 */ sw $a1, 0x0044($sp) -/* 01DC8 80AD1268 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 01DCC 80AD126C 3C014296 */ lui $at, 0x4296 ## $at = 42960000 -/* 01DD0 80AD1270 44812000 */ mtc1 $at, $f4 ## $f4 = 75.00 -/* 01DD4 80AD1274 AFAF0034 */ sw $t7, 0x0034($sp) -/* 01DD8 80AD1278 C4860080 */ lwc1 $f6, 0x0080($a0) ## 00000080 -/* 01DDC 80AD127C C4800028 */ lwc1 $f0, 0x0028($a0) ## 00000028 -/* 01DE0 80AD1280 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01DE4 80AD1284 46060201 */ sub.s $f8, $f0, $f6 -/* 01DE8 80AD1288 4608203C */ c.lt.s $f4, $f8 -/* 01DEC 80AD128C 00000000 */ nop -/* 01DF0 80AD1290 45000006 */ bc1f .L80AD12AC -/* 01DF4 80AD1294 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01DF8 80AD1298 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 01DFC 80AD129C 00000000 */ nop -/* 01E00 80AD12A0 460A0401 */ sub.s $f16, $f0, $f10 -/* 01E04 80AD12A4 10000006 */ beq $zero, $zero, .L80AD12C0 -/* 01E08 80AD12A8 E4900028 */ swc1 $f16, 0x0028($a0) ## 00000028 -.L80AD12AC: -/* 01E0C 80AD12AC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01E10 80AD12B0 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 01E14 80AD12B4 00000000 */ nop -/* 01E18 80AD12B8 46120180 */ add.s $f6, $f0, $f18 -/* 01E1C 80AD12BC E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -.L80AD12C0: -/* 01E20 80AD12C0 0C0329DD */ jal Math_CosF -/* 01E24 80AD12C4 C60C02E0 */ lwc1 $f12, 0x02E0($s0) ## 000002E0 -/* 01E28 80AD12C8 3C0180AD */ lui $at, %hi(D_80AD2944) ## $at = 80AD0000 -/* 01E2C 80AD12CC C4282944 */ lwc1 $f8, %lo(D_80AD2944)($at) -/* 01E30 80AD12D0 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 01E34 80AD12D4 C60C02E0 */ lwc1 $f12, 0x02E0($s0) ## 000002E0 -/* 01E38 80AD12D8 46080282 */ mul.s $f10, $f0, $f8 -/* 01E3C 80AD12DC 460A2400 */ add.s $f16, $f4, $f10 -/* 01E40 80AD12E0 0C0329DD */ jal Math_CosF -/* 01E44 80AD12E4 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 01E48 80AD12E8 3C0180AD */ lui $at, %hi(D_80AD2948) ## $at = 80AD0000 -/* 01E4C 80AD12EC C4322948 */ lwc1 $f18, %lo(D_80AD2948)($at) -/* 01E50 80AD12F0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01E54 80AD12F4 3C0180AD */ lui $at, %hi(D_80AD294C) ## $at = 80AD0000 -/* 01E58 80AD12F8 46120082 */ mul.s $f2, $f0, $f18 -/* 01E5C 80AD12FC 4602303E */ c.le.s $f6, $f2 -/* 01E60 80AD1300 00000000 */ nop -/* 01E64 80AD1304 45020004 */ bc1fl .L80AD1318 -/* 01E68 80AD1308 46001007 */ neg.s $f0, $f2 -/* 01E6C 80AD130C 10000002 */ beq $zero, $zero, .L80AD1318 -/* 01E70 80AD1310 46001006 */ mov.s $f0, $f2 -/* 01E74 80AD1314 46001007 */ neg.s $f0, $f2 -.L80AD1318: -/* 01E78 80AD1318 C424294C */ lwc1 $f4, %lo(D_80AD294C)($at) -/* 01E7C 80AD131C C60802E0 */ lwc1 $f8, 0x02E0($s0) ## 000002E0 -/* 01E80 80AD1320 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 01E84 80AD1324 46040280 */ add.s $f10, $f0, $f4 -/* 01E88 80AD1328 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 01E8C 80AD132C 460A4400 */ add.s $f16, $f8, $f10 -/* 01E90 80AD1330 E61002E0 */ swc1 $f16, 0x02E0($s0) ## 000002E0 -/* 01E94 80AD1334 AFA50028 */ sw $a1, 0x0028($sp) -/* 01E98 80AD1338 0C01E01A */ jal Math_Vec3f_Yaw - -/* 01E9C 80AD133C AFA4002C */ sw $a0, 0x002C($sp) -/* 01EA0 80AD1340 00022C00 */ sll $a1, $v0, 16 -/* 01EA4 80AD1344 00052C03 */ sra $a1, $a1, 16 -/* 01EA8 80AD1348 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 01EAC 80AD134C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01EB0 80AD1350 24070258 */ addiu $a3, $zero, 0x0258 ## $a3 = 00000258 -/* 01EB4 80AD1354 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01EB8 80AD1358 AFA00010 */ sw $zero, 0x0010($sp) -/* 01EBC 80AD135C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 01EC0 80AD1360 24051194 */ addiu $a1, $zero, 0x1194 ## $a1 = 00001194 -/* 01EC4 80AD1364 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01EC8 80AD1368 24070258 */ addiu $a3, $zero, 0x0258 ## $a3 = 00000258 -/* 01ECC 80AD136C 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01ED0 80AD1370 AFA00010 */ sw $zero, 0x0010($sp) -/* 01ED4 80AD1374 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 01ED8 80AD1378 860802F2 */ lh $t0, 0x02F2($s0) ## 000002F2 -/* 01EDC 80AD137C 860902F0 */ lh $t1, 0x02F0($s0) ## 000002F0 -/* 01EE0 80AD1380 2719015E */ addiu $t9, $t8, 0x015E ## $t9 = 0000015E -/* 01EE4 80AD1384 A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 -/* 01EE8 80AD1388 01095021 */ addu $t2, $t0, $t1 -/* 01EEC 80AD138C A60A02F2 */ sh $t2, 0x02F2($s0) ## 000002F2 -/* 01EF0 80AD1390 8FA50028 */ lw $a1, 0x0028($sp) -/* 01EF4 80AD1394 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 01EF8 80AD1398 8FA4002C */ lw $a0, 0x002C($sp) -/* 01EFC 80AD139C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01F00 80AD13A0 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 -/* 01F04 80AD13A4 00000000 */ nop -/* 01F08 80AD13A8 4612003C */ c.lt.s $f0, $f18 -/* 01F0C 80AD13AC 00000000 */ nop -/* 01F10 80AD13B0 45000005 */ bc1f .L80AD13C8 -/* 01F14 80AD13B4 00000000 */ nop -/* 01F18 80AD13B8 0C2B42CF */ jal func_80AD0B3C -/* 01F1C 80AD13BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F20 80AD13C0 240B003C */ addiu $t3, $zero, 0x003C ## $t3 = 0000003C -/* 01F24 80AD13C4 A60B02F6 */ sh $t3, 0x02F6($s0) ## 000002F6 -.L80AD13C8: -/* 01F28 80AD13C8 3C0C8016 */ lui $t4, %hi(gSaveContext+0x10) -/* 01F2C 80AD13CC 8D8CE670 */ lw $t4, %lo(gSaveContext+0x10)($t4) -/* 01F30 80AD13D0 8FA50034 */ lw $a1, 0x0034($sp) -/* 01F34 80AD13D4 15800012 */ bne $t4, $zero, .L80AD1420 -/* 01F38 80AD13D8 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 01F3C 80AD13DC 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 01F40 80AD13E0 8FA40028 */ lw $a0, 0x0028($sp) -/* 01F44 80AD13E4 C60602D8 */ lwc1 $f6, 0x02D8($s0) ## 000002D8 -/* 01F48 80AD13E8 240D0190 */ addiu $t5, $zero, 0x0190 ## $t5 = 00000190 -/* 01F4C 80AD13EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F50 80AD13F0 4606003C */ c.lt.s $f0, $f6 -/* 01F54 80AD13F4 00000000 */ nop -/* 01F58 80AD13F8 4502000A */ bc1fl .L80AD1424 -/* 01F5C 80AD13FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F60 80AD1400 0C2B4156 */ jal func_80AD0558 -/* 01F64 80AD1404 A60D02F8 */ sh $t5, 0x02F8($s0) ## 000002F8 -/* 01F68 80AD1408 8FAE0044 */ lw $t6, 0x0044($sp) -/* 01F6C 80AD140C 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 01F70 80AD1410 01EE7821 */ addu $t7, $t7, $t6 -/* 01F74 80AD1414 8DEF1DE4 */ lw $t7, 0x1DE4($t7) ## 00011DE4 -/* 01F78 80AD1418 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 01F7C 80AD141C A61802FA */ sh $t8, 0x02FA($s0) ## 000002FA -.L80AD1420: -/* 01F80 80AD1420 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD1424: -/* 01F84 80AD1424 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01F88 80AD1428 24053155 */ addiu $a1, $zero, 0x3155 ## $a1 = 00003155 -/* 01F8C 80AD142C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01F90 80AD1430 8FB00020 */ lw $s0, 0x0020($sp) -/* 01F94 80AD1434 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01F98 80AD1438 03E00008 */ jr $ra -/* 01F9C 80AD143C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s deleted file mode 100644 index e472c6ef1c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AD1440 -/* 01FA0 80AD1440 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01FA4 80AD1444 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01FA8 80AD1448 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01FAC 80AD144C 3C050600 */ lui $a1, %hi(D_06000844) ## $a1 = 06000000 -/* 01FB0 80AD1450 24A50844 */ addiu $a1, $a1, %lo(D_06000844) ## $a1 = 06000844 -/* 01FB4 80AD1454 AFA70018 */ sw $a3, 0x0018($sp) -/* 01FB8 80AD1458 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01FBC 80AD145C 0C029490 */ jal Animation_MorphToPlayOnce -/* 01FC0 80AD1460 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 01FC4 80AD1464 8FA40018 */ lw $a0, 0x0018($sp) -/* 01FC8 80AD1468 3C01C110 */ lui $at, 0xC110 ## $at = C1100000 -/* 01FCC 80AD146C 44812000 */ mtc1 $at, $f4 ## $f4 = -9.00 -/* 01FD0 80AD1470 848F008A */ lh $t7, 0x008A($a0) ## 0000008A -/* 01FD4 80AD1474 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 01FD8 80AD1478 3C0580AD */ lui $a1, %hi(func_80AD14A0) ## $a1 = 80AD0000 -/* 01FDC 80AD147C 24A514A0 */ addiu $a1, $a1, %lo(func_80AD14A0) ## $a1 = 80AD14A0 -/* 01FE0 80AD1480 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 01FE4 80AD1484 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01FE8 80AD1488 0C2B3D28 */ jal func_80ACF4A0 -/* 01FEC 80AD148C A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 01FF0 80AD1490 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01FF4 80AD1494 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01FF8 80AD1498 03E00008 */ jr $ra -/* 01FFC 80AD149C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s deleted file mode 100644 index 424500334d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s +++ /dev/null @@ -1,130 +0,0 @@ -glabel func_80AD14A0 -/* 02000 80AD14A0 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 02004 80AD14A4 AFBF006C */ sw $ra, 0x006C($sp) -/* 02008 80AD14A8 AFB40068 */ sw $s4, 0x0068($sp) -/* 0200C 80AD14AC AFB30064 */ sw $s3, 0x0064($sp) -/* 02010 80AD14B0 AFB20060 */ sw $s2, 0x0060($sp) -/* 02014 80AD14B4 AFB1005C */ sw $s1, 0x005C($sp) -/* 02018 80AD14B8 AFB00058 */ sw $s0, 0x0058($sp) -/* 0201C 80AD14BC F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 02020 80AD14C0 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 02024 80AD14C4 848E02F2 */ lh $t6, 0x02F2($a0) ## 000002F2 -/* 02028 80AD14C8 848F02F0 */ lh $t7, 0x02F0($a0) ## 000002F0 -/* 0202C 80AD14CC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 02030 80AD14D0 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 02034 80AD14D4 01CFC021 */ addu $t8, $t6, $t7 -/* 02038 80AD14D8 A49802F2 */ sh $t8, 0x02F2($a0) ## 000002F2 -/* 0203C 80AD14DC 0C02927F */ jal SkelAnime_Update - -/* 02040 80AD14E0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02044 80AD14E4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 02048 80AD14E8 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 0204C 80AD14EC C6240068 */ lwc1 $f4, 0x0068($s1) ## 00000068 -/* 02050 80AD14F0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 02054 80AD14F4 46062200 */ add.s $f8, $f4, $f6 -/* 02058 80AD14F8 E6280068 */ swc1 $f8, 0x0068($s1) ## 00000068 -/* 0205C 80AD14FC C6300068 */ lwc1 $f16, 0x0068($s1) ## 00000068 -/* 02060 80AD1500 46105032 */ c.eq.s $f10, $f16 -/* 02064 80AD1504 00000000 */ nop -/* 02068 80AD1508 45020050 */ bc1fl .L80AD164C -/* 0206C 80AD150C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02070 80AD1510 8639001C */ lh $t9, 0x001C($s1) ## 0000001C -/* 02074 80AD1514 3C0880AD */ lui $t0, %hi(D_80AD2838) ## $t0 = 80AD0000 -/* 02078 80AD1518 27B20084 */ addiu $s2, $sp, 0x0084 ## $s2 = FFFFFFF4 -/* 0207C 80AD151C 1B20003E */ blez $t9, .L80AD1618 -/* 02080 80AD1520 25082838 */ addiu $t0, $t0, %lo(D_80AD2838) ## $t0 = 80AD2838 -/* 02084 80AD1524 8D0A0000 */ lw $t2, 0x0000($t0) ## 80AD2838 -/* 02088 80AD1528 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0208C 80AD152C 4481B000 */ mtc1 $at, $f22 ## $f22 = 10.00 -/* 02090 80AD1530 AE4A0000 */ sw $t2, 0x0000($s2) ## FFFFFFF4 -/* 02094 80AD1534 8D090004 */ lw $t1, 0x0004($t0) ## 80AD283C -/* 02098 80AD1538 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0209C 80AD153C 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 -/* 020A0 80AD1540 AE490004 */ sw $t1, 0x0004($s2) ## FFFFFFF8 -/* 020A4 80AD1544 8D0A0008 */ lw $t2, 0x0008($t0) ## 80AD2840 -/* 020A8 80AD1548 24100004 */ addiu $s0, $zero, 0x0004 ## $s0 = 00000004 -/* 020AC 80AD154C 27B30074 */ addiu $s3, $sp, 0x0074 ## $s3 = FFFFFFE4 -/* 020B0 80AD1550 AE4A0008 */ sw $t2, 0x0008($s2) ## FFFFFFFC -.L80AD1554: -/* 020B4 80AD1554 0C00CFC8 */ jal Rand_CenteredFloat - -/* 020B8 80AD1558 4600A306 */ mov.s $f12, $f20 -/* 020BC 80AD155C C6320024 */ lwc1 $f18, 0x0024($s1) ## 00000024 -/* 020C0 80AD1560 4600B306 */ mov.s $f12, $f22 -/* 020C4 80AD1564 46120100 */ add.s $f4, $f0, $f18 -/* 020C8 80AD1568 0C00CFC8 */ jal Rand_CenteredFloat - -/* 020CC 80AD156C E7A40074 */ swc1 $f4, 0x0074($sp) -/* 020D0 80AD1570 C6260028 */ lwc1 $f6, 0x0028($s1) ## 00000028 -/* 020D4 80AD1574 4600A306 */ mov.s $f12, $f20 -/* 020D8 80AD1578 46060200 */ add.s $f8, $f0, $f6 -/* 020DC 80AD157C 0C00CFC8 */ jal Rand_CenteredFloat - -/* 020E0 80AD1580 E7A80078 */ swc1 $f8, 0x0078($sp) -/* 020E4 80AD1584 C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C -/* 020E8 80AD1588 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 -/* 020EC 80AD158C 240C0007 */ addiu $t4, $zero, 0x0007 ## $t4 = 00000007 -/* 020F0 80AD1590 460A0400 */ add.s $f16, $f0, $f10 -/* 020F4 80AD1594 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 020F8 80AD1598 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 020FC 80AD159C 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 02100 80AD15A0 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02104 80AD15A4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 02108 80AD15A8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0210C 80AD15AC 24090009 */ addiu $t1, $zero, 0x0009 ## $t1 = 00000009 -/* 02110 80AD15B0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 02114 80AD15B4 E7B0007C */ swc1 $f16, 0x007C($sp) -/* 02118 80AD15B8 AFAA003C */ sw $t2, 0x003C($sp) -/* 0211C 80AD15BC AFA90038 */ sw $t1, 0x0038($sp) -/* 02120 80AD15C0 AFA80034 */ sw $t0, 0x0034($sp) -/* 02124 80AD15C4 AFB90028 */ sw $t9, 0x0028($sp) -/* 02128 80AD15C8 AFB80024 */ sw $t8, 0x0024($sp) -/* 0212C 80AD15CC AFAF0020 */ sw $t7, 0x0020($sp) -/* 02130 80AD15D0 AFAE001C */ sw $t6, 0x001C($sp) -/* 02134 80AD15D4 AFAD0018 */ sw $t5, 0x0018($sp) -/* 02138 80AD15D8 AFAC0014 */ sw $t4, 0x0014($sp) -/* 0213C 80AD15DC AFAB0010 */ sw $t3, 0x0010($sp) -/* 02140 80AD15E0 AFA00030 */ sw $zero, 0x0030($sp) -/* 02144 80AD15E4 AFA0002C */ sw $zero, 0x002C($sp) -/* 02148 80AD15E8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 0214C 80AD15EC 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFE4 -/* 02150 80AD15F0 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFF4 -/* 02154 80AD15F4 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 02158 80AD15F8 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFFF4 -/* 0215C 80AD15FC 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000003 -/* 02160 80AD1600 0601FFD4 */ bgez $s0, .L80AD1554 -/* 02164 80AD1604 00000000 */ nop -/* 02168 80AD1608 0C00B55C */ jal Actor_Kill - -/* 0216C 80AD160C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02170 80AD1610 1000000E */ beq $zero, $zero, .L80AD164C -/* 02174 80AD1614 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80AD1618: -/* 02178 80AD1618 0C2B4156 */ jal func_80AD0558 -/* 0217C 80AD161C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02180 80AD1620 862B001C */ lh $t3, 0x001C($s1) ## 0000001C -/* 02184 80AD1624 05630009 */ bgezl $t3, .L80AD164C -/* 02188 80AD1628 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0218C 80AD162C 862C02FA */ lh $t4, 0x02FA($s1) ## 000002FA -/* 02190 80AD1630 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 02194 80AD1634 51800004 */ beql $t4, $zero, .L80AD1648 -/* 02198 80AD1638 A62D02FA */ sh $t5, 0x02FA($s1) ## 000002FA -/* 0219C 80AD163C 10000002 */ beq $zero, $zero, .L80AD1648 -/* 021A0 80AD1640 A62002FA */ sh $zero, 0x02FA($s1) ## 000002FA -/* 021A4 80AD1644 A62D02FA */ sh $t5, 0x02FA($s1) ## 000002FA -.L80AD1648: -/* 021A8 80AD1648 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80AD164C: -/* 021AC 80AD164C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 021B0 80AD1650 24053155 */ addiu $a1, $zero, 0x3155 ## $a1 = 00003155 -/* 021B4 80AD1654 8FBF006C */ lw $ra, 0x006C($sp) -/* 021B8 80AD1658 D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 021BC 80AD165C D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 021C0 80AD1660 8FB00058 */ lw $s0, 0x0058($sp) -/* 021C4 80AD1664 8FB1005C */ lw $s1, 0x005C($sp) -/* 021C8 80AD1668 8FB20060 */ lw $s2, 0x0060($sp) -/* 021CC 80AD166C 8FB30064 */ lw $s3, 0x0064($sp) -/* 021D0 80AD1670 8FB40068 */ lw $s4, 0x0068($sp) -/* 021D4 80AD1674 03E00008 */ jr $ra -/* 021D8 80AD1678 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD167C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD167C.s deleted file mode 100644 index fbb8ac92e2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD167C.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AD167C -/* 021DC 80AD167C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 021E0 80AD1680 AFBF001C */ sw $ra, 0x001C($sp) -/* 021E4 80AD1684 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 021E8 80AD1688 C4840080 */ lwc1 $f4, 0x0080($a0) ## 00000080 -/* 021EC 80AD168C 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 021F0 80AD1690 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 021F4 80AD1694 4606203C */ c.lt.s $f4, $f6 -/* 021F8 80AD1698 3C01C110 */ lui $at, 0xC110 ## $at = C1100000 -/* 021FC 80AD169C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02200 80AD16A0 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 02204 80AD16A4 45000004 */ bc1f .L80AD16B8 -/* 02208 80AD16A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0220C 80AD16AC 44814000 */ mtc1 $at, $f8 ## $f8 = -9.00 -/* 02210 80AD16B0 00000000 */ nop -/* 02214 80AD16B4 E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 -.L80AD16B8: -/* 02218 80AD16B8 848F008A */ lh $t7, 0x008A($a0) ## 0000008A -/* 0221C 80AD16BC A48002F0 */ sh $zero, 0x02F0($a0) ## 000002F0 -/* 02220 80AD16C0 24180050 */ addiu $t8, $zero, 0x0050 ## $t8 = 00000050 -/* 02224 80AD16C4 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 02228 80AD16C8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0222C 80AD16CC 0C00D09B */ jal Actor_SetColorFilter -/* 02230 80AD16D0 AFB80010 */ sw $t8, 0x0010($sp) -/* 02234 80AD16D4 8FA40020 */ lw $a0, 0x0020($sp) -/* 02238 80AD16D8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0223C 80AD16DC 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E -/* 02240 80AD16E0 3C0580AD */ lui $a1, %hi(func_80AD1700) ## $a1 = 80AD0000 -/* 02244 80AD16E4 8FA40020 */ lw $a0, 0x0020($sp) -/* 02248 80AD16E8 0C2B3D28 */ jal func_80ACF4A0 -/* 0224C 80AD16EC 24A51700 */ addiu $a1, $a1, %lo(func_80AD1700) ## $a1 = 80AD1700 -/* 02250 80AD16F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02254 80AD16F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02258 80AD16F8 03E00008 */ jr $ra -/* 0225C 80AD16FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1700.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1700.s deleted file mode 100644 index 4637a5d6ae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1700.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80AD1700 -/* 02260 80AD1700 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02264 80AD1704 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 02268 80AD1708 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0226C 80AD170C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02270 80AD1710 AFB00020 */ sw $s0, 0x0020($sp) -/* 02274 80AD1714 AFA5002C */ sw $a1, 0x002C($sp) -/* 02278 80AD1718 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0227C 80AD171C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02280 80AD1720 44061000 */ mfc1 $a2, $f2 -/* 02284 80AD1724 44071000 */ mfc1 $a3, $f2 -/* 02288 80AD1728 44050000 */ mfc1 $a1, $f0 -/* 0228C 80AD172C 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 02290 80AD1730 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02294 80AD1734 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02298 80AD1738 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0229C 80AD173C 8E050080 */ lw $a1, 0x0080($s0) ## 00000080 -/* 022A0 80AD1740 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 022A4 80AD1744 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 022A8 80AD1748 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 022AC 80AD174C 0C01E0C4 */ jal Math_SmoothStepToF - -/* 022B0 80AD1750 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 022B4 80AD1754 920E0114 */ lbu $t6, 0x0114($s0) ## 00000114 -/* 022B8 80AD1758 55C00004 */ bnel $t6, $zero, .L80AD176C -/* 022BC 80AD175C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 022C0 80AD1760 0C2B401C */ jal func_80AD0070 -/* 022C4 80AD1764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022C8 80AD1768 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AD176C: -/* 022CC 80AD176C 8FB00020 */ lw $s0, 0x0020($sp) -/* 022D0 80AD1770 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 022D4 80AD1774 03E00008 */ jr $ra -/* 022D8 80AD1778 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD177C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD177C.s deleted file mode 100644 index 1d45ced596..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD177C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80AD177C -/* 022DC 80AD177C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 022E0 80AD1780 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 022E4 80AD1784 AFBF001C */ sw $ra, 0x001C($sp) -/* 022E8 80AD1788 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 022EC 80AD178C A48002F0 */ sh $zero, 0x02F0($a0) ## 000002F0 -/* 022F0 80AD1790 AC8E02B4 */ sw $t6, 0x02B4($a0) ## 000002B4 -/* 022F4 80AD1794 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 022F8 80AD1798 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 022FC 80AD179C AFA40020 */ sw $a0, 0x0020($sp) -/* 02300 80AD17A0 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02304 80AD17A4 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 02308 80AD17A8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0230C 80AD17AC 0C00D09B */ jal Actor_SetColorFilter -/* 02310 80AD17B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02314 80AD17B4 8FA40020 */ lw $a0, 0x0020($sp) -/* 02318 80AD17B8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0231C 80AD17BC 3C0580AD */ lui $a1, %hi(func_80AD17E8) ## $a1 = 80AD0000 -/* 02320 80AD17C0 8498008A */ lh $t8, 0x008A($a0) ## 0000008A -/* 02324 80AD17C4 24A517E8 */ addiu $a1, $a1, %lo(func_80AD17E8) ## $a1 = 80AD17E8 -/* 02328 80AD17C8 AC8002B0 */ sw $zero, 0x02B0($a0) ## 000002B0 -/* 0232C 80AD17CC E48602EC */ swc1 $f6, 0x02EC($a0) ## 000002EC -/* 02330 80AD17D0 0C2B3D28 */ jal func_80ACF4A0 -/* 02334 80AD17D4 A4980032 */ sh $t8, 0x0032($a0) ## 00000032 -/* 02338 80AD17D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0233C 80AD17DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02340 80AD17E0 03E00008 */ jr $ra -/* 02344 80AD17E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s deleted file mode 100644 index 21c6b419a5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s +++ /dev/null @@ -1,202 +0,0 @@ -.late_rodata -glabel D_80AD2950 - .float 0.0015 - -glabel D_80AD2954 - .word 0x3F866666 - -.text -glabel func_80AD17E8 -/* 02348 80AD17E8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0234C 80AD17EC AFBF002C */ sw $ra, 0x002C($sp) -/* 02350 80AD17F0 AFB00028 */ sw $s0, 0x0028($sp) -/* 02354 80AD17F4 AFA50044 */ sw $a1, 0x0044($sp) -/* 02358 80AD17F8 8C8E02B4 */ lw $t6, 0x02B4($a0) ## 000002B4 -/* 0235C 80AD17FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02360 80AD1800 11C00032 */ beq $t6, $zero, .L80AD18CC -/* 02364 80AD1804 00000000 */ nop -/* 02368 80AD1808 8C8F02D4 */ lw $t7, 0x02D4($a0) ## 000002D4 -/* 0236C 80AD180C 3C050600 */ lui $a1, %hi(D_06000844) ## $a1 = 06000000 -/* 02370 80AD1810 24A50844 */ addiu $a1, $a1, %lo(D_06000844) ## $a1 = 06000844 -/* 02374 80AD1814 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 02378 80AD1818 1B000003 */ blez $t8, .L80AD1828 -/* 0237C 80AD181C AC9802D4 */ sw $t8, 0x02D4($a0) ## 000002D4 -/* 02380 80AD1820 908800AF */ lbu $t0, 0x00AF($a0) ## 000000AF -/* 02384 80AD1824 15000011 */ bne $t0, $zero, .L80AD186C -.L80AD1828: -/* 02388 80AD1828 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0238C 80AD182C 0C029490 */ jal Animation_MorphToPlayOnce -/* 02390 80AD1830 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 02394 80AD1834 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 02398 80AD1838 A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -/* 0239C 80AD183C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 023A0 80AD1840 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 023A4 80AD1844 860B00B4 */ lh $t3, 0x00B4($s0) ## 000000B4 -/* 023A8 80AD1848 24090FA0 */ addiu $t1, $zero, 0x0FA0 ## $t1 = 00000FA0 -/* 023AC 80AD184C 240A000E */ addiu $t2, $zero, 0x000E ## $t2 = 0000000E -/* 023B0 80AD1850 A60902F0 */ sh $t1, 0x02F0($s0) ## 000002F0 -/* 023B4 80AD1854 AE0A02D4 */ sw $t2, 0x02D4($s0) ## 000002D4 -/* 023B8 80AD1858 AE0002B4 */ sw $zero, 0x02B4($s0) ## 000002B4 -/* 023BC 80AD185C E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 023C0 80AD1860 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 023C4 80AD1864 1000008B */ beq $zero, $zero, .L80AD1A94 -/* 023C8 80AD1868 A60B00B8 */ sh $t3, 0x00B8($s0) ## 000000B8 -.L80AD186C: -/* 023CC 80AD186C 920C0114 */ lbu $t4, 0x0114($s0) ## 00000114 -/* 023D0 80AD1870 3C053E51 */ lui $a1, 0x3E51 ## $a1 = 3E510000 -/* 023D4 80AD1874 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 023D8 80AD1878 318D0004 */ andi $t5, $t4, 0x0004 ## $t5 = 00000000 -/* 023DC 80AD187C 11A0000B */ beq $t5, $zero, .L80AD18AC -/* 023E0 80AD1880 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 023E4 80AD1884 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 023E8 80AD1888 3C073E70 */ lui $a3, 0x3E70 ## $a3 = 3E700000 -/* 023EC 80AD188C 34E7A3D7 */ ori $a3, $a3, 0xA3D7 ## $a3 = 3E70A3D7 -/* 023F0 80AD1890 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC -/* 023F4 80AD1894 34A5EB85 */ ori $a1, $a1, 0xEB85 ## $a1 = 3E51EB85 -/* 023F8 80AD1898 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 023FC 80AD189C 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02400 80AD18A0 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 02404 80AD18A4 1000007C */ beq $zero, $zero, .L80AD1A98 -/* 02408 80AD18A8 8FBF002C */ lw $ra, 0x002C($sp) -.L80AD18AC: -/* 0240C 80AD18AC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 02410 80AD18B0 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 -/* 02414 80AD18B4 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A -/* 02418 80AD18B8 44051000 */ mfc1 $a1, $f2 -/* 0241C 80AD18BC 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02420 80AD18C0 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 02424 80AD18C4 10000074 */ beq $zero, $zero, .L80AD1A98 -/* 02428 80AD18C8 8FBF002C */ lw $ra, 0x002C($sp) -.L80AD18CC: -/* 0242C 80AD18CC 0C02927F */ jal SkelAnime_Update - -/* 02430 80AD18D0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02434 80AD18D4 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 -/* 02438 80AD18D8 860F02F0 */ lh $t7, 0x02F0($s0) ## 000002F0 -/* 0243C 80AD18DC 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 -/* 02440 80AD18E0 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 -/* 02444 80AD18E4 01CFC021 */ addu $t8, $t6, $t7 -/* 02448 80AD18E8 A61802F2 */ sh $t8, 0x02F2($s0) ## 000002F2 -/* 0244C 80AD18EC AFA00010 */ sw $zero, 0x0010($sp) -/* 02450 80AD18F0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02454 80AD18F4 0C01E1A7 */ jal Math_SmoothStepToS - -/* 02458 80AD18F8 240700FA */ addiu $a3, $zero, 0x00FA ## $a3 = 000000FA -/* 0245C 80AD18FC 921900AF */ lbu $t9, 0x00AF($s0) ## 000000AF -/* 02460 80AD1900 3C0180AD */ lui $at, %hi(D_80AD2950) ## $at = 80AD0000 -/* 02464 80AD1904 57200009 */ bnel $t9, $zero, .L80AD192C -/* 02468 80AD1908 3C0142B1 */ lui $at, 0x42B1 ## $at = 42B10000 -/* 0246C 80AD190C C6060050 */ lwc1 $f6, 0x0050($s0) ## 00000050 -/* 02470 80AD1910 C4282950 */ lwc1 $f8, %lo(D_80AD2950)($at) -/* 02474 80AD1914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02478 80AD1918 46083281 */ sub.s $f10, $f6, $f8 -/* 0247C 80AD191C E60A0050 */ swc1 $f10, 0x0050($s0) ## 00000050 -/* 02480 80AD1920 0C00B58B */ jal Actor_SetScale - -/* 02484 80AD1924 8E050050 */ lw $a1, 0x0050($s0) ## 00000050 -/* 02488 80AD1928 3C0142B1 */ lui $at, 0x42B1 ## $at = 42B10000 -.L80AD192C: -/* 0248C 80AD192C 44819000 */ mtc1 $at, $f18 ## $f18 = 88.50 -/* 02490 80AD1930 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 -/* 02494 80AD1934 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 02498 80AD1938 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 0249C 80AD193C 46128100 */ add.s $f4, $f16, $f18 -/* 024A0 80AD1940 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 024A4 80AD1944 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 024A8 80AD1948 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 024AC 80AD194C 44052000 */ mfc1 $a1, $f4 -/* 024B0 80AD1950 0C01E0C4 */ jal Math_SmoothStepToF - -/* 024B4 80AD1954 00000000 */ nop -/* 024B8 80AD1958 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 024BC 80AD195C 00000000 */ nop -/* 024C0 80AD1960 46080032 */ c.eq.s $f0, $f8 -/* 024C4 80AD1964 00000000 */ nop -/* 024C8 80AD1968 4502002B */ bc1fl .L80AD1A18 -/* 024CC 80AD196C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 024D0 80AD1970 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 024D4 80AD1974 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 -/* 024D8 80AD1978 3C01426C */ lui $at, 0x426C ## $at = 426C0000 -/* 024DC 80AD197C 44812000 */ mtc1 $at, $f4 ## $f4 = 59.00 -/* 024E0 80AD1980 46105481 */ sub.s $f18, $f10, $f16 -/* 024E4 80AD1984 4604903C */ c.lt.s $f18, $f4 -/* 024E8 80AD1988 00000000 */ nop -/* 024EC 80AD198C 45020022 */ bc1fl .L80AD1A18 -/* 024F0 80AD1990 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 024F4 80AD1994 8E090024 */ lw $t1, 0x0024($s0) ## 00000024 -/* 024F8 80AD1998 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 -/* 024FC 80AD199C 240A0096 */ addiu $t2, $zero, 0x0096 ## $t2 = 00000096 -/* 02500 80AD19A0 ACA90000 */ sw $t1, 0x0000($a1) ## FFFFFFF4 -/* 02504 80AD19A4 8E080028 */ lw $t0, 0x0028($s0) ## 00000028 -/* 02508 80AD19A8 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 0250C 80AD19AC 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 02510 80AD19B0 ACA80004 */ sw $t0, 0x0004($a1) ## FFFFFFF8 -/* 02514 80AD19B4 8E09002C */ lw $t1, 0x002C($s0) ## 0000002C -/* 02518 80AD19B8 3C0642A0 */ lui $a2, 0x42A0 ## $a2 = 42A00000 -/* 0251C 80AD19BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02520 80AD19C0 ACA90008 */ sw $t1, 0x0008($a1) ## FFFFFFFC -/* 02524 80AD19C4 C6060080 */ lwc1 $f6, 0x0080($s0) ## 00000080 -/* 02528 80AD19C8 AFAC0018 */ sw $t4, 0x0018($sp) -/* 0252C 80AD19CC AFAB0014 */ sw $t3, 0x0014($sp) -/* 02530 80AD19D0 AFAA0010 */ sw $t2, 0x0010($sp) -/* 02534 80AD19D4 8FA40044 */ lw $a0, 0x0044($sp) -/* 02538 80AD19D8 0C00CD20 */ jal func_80033480 -/* 0253C 80AD19DC E7A60038 */ swc1 $f6, 0x0038($sp) -/* 02540 80AD19E0 3C0180AD */ lui $at, %hi(D_80AD2954) ## $at = 80AD0000 -/* 02544 80AD19E4 C4282954 */ lwc1 $f8, %lo(D_80AD2954)($at) -/* 02548 80AD19E8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0254C 80AD19EC 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 -/* 02550 80AD19F0 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 02554 80AD19F4 AFAD0010 */ sw $t5, 0x0010($sp) -/* 02558 80AD19F8 8FA40044 */ lw $a0, 0x0044($sp) -/* 0255C 80AD19FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02560 80AD1A00 27A60034 */ addiu $a2, $sp, 0x0034 ## $a2 = FFFFFFF4 -/* 02564 80AD1A04 3C074296 */ lui $a3, 0x4296 ## $a3 = 42960000 -/* 02568 80AD1A08 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 0256C 80AD1A0C 0C2B3DE2 */ jal func_80ACF788 -/* 02570 80AD1A10 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 02574 80AD1A14 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -.L80AD1A18: -/* 02578 80AD1A18 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 0257C 80AD1A1C 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 02580 80AD1A20 4602003C */ c.lt.s $f0, $f2 -/* 02584 80AD1A24 00000000 */ nop -/* 02588 80AD1A28 45020006 */ bc1fl .L80AD1A44 -/* 0258C 80AD1A2C 8E0E02D4 */ lw $t6, 0x02D4($s0) ## 000002D4 -/* 02590 80AD1A30 44818000 */ mtc1 $at, $f16 ## $f16 = 0.25 -/* 02594 80AD1A34 00000000 */ nop -/* 02598 80AD1A38 46100480 */ add.s $f18, $f0, $f16 -/* 0259C 80AD1A3C E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 025A0 80AD1A40 8E0E02D4 */ lw $t6, 0x02D4($s0) ## 000002D4 -.L80AD1A44: -/* 025A4 80AD1A44 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 025A8 80AD1A48 1DE00012 */ bgtz $t7, .L80AD1A94 -/* 025AC 80AD1A4C AE0F02D4 */ sw $t7, 0x02D4($s0) ## 000002D4 -/* 025B0 80AD1A50 921900AF */ lbu $t9, 0x00AF($s0) ## 000000AF -/* 025B4 80AD1A54 57200006 */ bnel $t9, $zero, .L80AD1A70 -/* 025B8 80AD1A58 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 025BC 80AD1A5C 0C2B46AA */ jal func_80AD1AA8 -/* 025C0 80AD1A60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025C4 80AD1A64 1000000C */ beq $zero, $zero, .L80AD1A98 -/* 025C8 80AD1A68 8FBF002C */ lw $ra, 0x002C($sp) -/* 025CC 80AD1A6C 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -.L80AD1A70: -/* 025D0 80AD1A70 05010006 */ bgez $t0, .L80AD1A8C -/* 025D4 80AD1A74 00000000 */ nop -/* 025D8 80AD1A78 0C2B43CE */ jal func_80AD0F38 -/* 025DC 80AD1A7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025E0 80AD1A80 2409003C */ addiu $t1, $zero, 0x003C ## $t1 = 0000003C -/* 025E4 80AD1A84 10000003 */ beq $zero, $zero, .L80AD1A94 -/* 025E8 80AD1A88 A60902F6 */ sh $t1, 0x02F6($s0) ## 000002F6 -.L80AD1A8C: -/* 025EC 80AD1A8C 0C2B3FAC */ jal func_80ACFEB0 -/* 025F0 80AD1A90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD1A94: -/* 025F4 80AD1A94 8FBF002C */ lw $ra, 0x002C($sp) -.L80AD1A98: -/* 025F8 80AD1A98 8FB00028 */ lw $s0, 0x0028($sp) -/* 025FC 80AD1A9C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02600 80AD1AA0 03E00008 */ jr $ra -/* 02604 80AD1AA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s deleted file mode 100644 index ec76ffa869..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AD1AA8 -/* 02608 80AD1AA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0260C 80AD1AAC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02610 80AD1AB0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02614 80AD1AB4 3C050600 */ lui $a1, %hi(D_060005C4) ## $a1 = 06000000 -/* 02618 80AD1AB8 24A505C4 */ addiu $a1, $a1, %lo(D_060005C4) ## $a1 = 060005C4 -/* 0261C 80AD1ABC AFA60018 */ sw $a2, 0x0018($sp) -/* 02620 80AD1AC0 0C0294BE */ jal Animation_PlayLoop -/* 02624 80AD1AC4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02628 80AD1AC8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0262C 80AD1ACC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02630 80AD1AD0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 02634 80AD1AD4 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 02638 80AD1AD8 3C0580AD */ lui $a1, %hi(func_80AD1B00) ## $a1 = 80AD0000 -/* 0263C 80AD1ADC 24A51B00 */ addiu $a1, $a1, %lo(func_80AD1B00) ## $a1 = 80AD1B00 -/* 02640 80AD1AE0 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 02644 80AD1AE4 A48F02FC */ sh $t7, 0x02FC($a0) ## 000002FC -/* 02648 80AD1AE8 0C2B3D28 */ jal func_80ACF4A0 -/* 0264C 80AD1AEC E48402E0 */ swc1 $f4, 0x02E0($a0) ## 000002E0 -/* 02650 80AD1AF0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02654 80AD1AF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02658 80AD1AF8 03E00008 */ jr $ra -/* 0265C 80AD1AFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1B00.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1B00.s deleted file mode 100644 index d1c0ac5067..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1B00.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_80AD1B00 -/* 02660 80AD1B00 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 02664 80AD1B04 AFBF0034 */ sw $ra, 0x0034($sp) -/* 02668 80AD1B08 AFB10030 */ sw $s1, 0x0030($sp) -/* 0266C 80AD1B0C AFB0002C */ sw $s0, 0x002C($sp) -/* 02670 80AD1B10 848E02FC */ lh $t6, 0x02FC($a0) ## 000002FC -/* 02674 80AD1B14 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02678 80AD1B18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0267C 80AD1B1C 15C10011 */ bne $t6, $at, .L80AD1B64 -/* 02680 80AD1B20 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02684 80AD1B24 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 02688 80AD1B28 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 0268C 80AD1B2C 240F0602 */ addiu $t7, $zero, 0x0602 ## $t7 = 00000602 -/* 02690 80AD1B30 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02694 80AD1B34 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 02698 80AD1B38 AFA00024 */ sw $zero, 0x0024($sp) -/* 0269C 80AD1B3C AFAF0020 */ sw $t7, 0x0020($sp) -/* 026A0 80AD1B40 AFA0001C */ sw $zero, 0x001C($sp) -/* 026A4 80AD1B44 AFA00018 */ sw $zero, 0x0018($sp) -/* 026A8 80AD1B48 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 026AC 80AD1B4C 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 026B0 80AD1B50 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 026B4 80AD1B54 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 026B8 80AD1B58 50400003 */ beql $v0, $zero, .L80AD1B68 -/* 026BC 80AD1B5C 861802FC */ lh $t8, 0x02FC($s0) ## 000002FC -/* 026C0 80AD1B60 A44001F8 */ sh $zero, 0x01F8($v0) ## 000001F8 -.L80AD1B64: -/* 026C4 80AD1B64 861802FC */ lh $t8, 0x02FC($s0) ## 000002FC -.L80AD1B68: -/* 026C8 80AD1B68 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 026CC 80AD1B6C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 026D0 80AD1B70 2719FFFF */ addiu $t9, $t8, 0xFFFF ## $t9 = FFFFFFFF -/* 026D4 80AD1B74 A61902FC */ sh $t9, 0x02FC($s0) ## 000002FC -/* 026D8 80AD1B78 860802FC */ lh $t0, 0x02FC($s0) ## 000002FC -/* 026DC 80AD1B7C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 026E0 80AD1B80 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 -/* 026E4 80AD1B84 55000010 */ bnel $t0, $zero, .L80AD1BC8 -/* 026E8 80AD1B88 8FBF0034 */ lw $ra, 0x0034($sp) -/* 026EC 80AD1B8C 0C007E50 */ jal Item_DropCollectibleRandom - -/* 026F0 80AD1B90 AFA60038 */ sw $a2, 0x0038($sp) -/* 026F4 80AD1B94 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 026F8 80AD1B98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 026FC 80AD1B9C 8FA60038 */ lw $a2, 0x0038($sp) -/* 02700 80AD1BA0 0C007E50 */ jal Item_DropCollectibleRandom - -/* 02704 80AD1BA4 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 -/* 02708 80AD1BA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0270C 80AD1BAC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02710 80AD1BB0 8FA60038 */ lw $a2, 0x0038($sp) -/* 02714 80AD1BB4 0C007E50 */ jal Item_DropCollectibleRandom - -/* 02718 80AD1BB8 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 -/* 0271C 80AD1BBC 0C00B55C */ jal Actor_Kill - -/* 02720 80AD1BC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02724 80AD1BC4 8FBF0034 */ lw $ra, 0x0034($sp) -.L80AD1BC8: -/* 02728 80AD1BC8 8FB0002C */ lw $s0, 0x002C($sp) -/* 0272C 80AD1BCC 8FB10030 */ lw $s1, 0x0030($sp) -/* 02730 80AD1BD0 03E00008 */ jr $ra -/* 02734 80AD1BD4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s deleted file mode 100644 index fe660d4a21..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s +++ /dev/null @@ -1,138 +0,0 @@ -glabel func_80AD1BD8 -/* 02738 80AD1BD8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 0273C 80AD1BDC AFBF0044 */ sw $ra, 0x0044($sp) -/* 02740 80AD1BE0 AFB30040 */ sw $s3, 0x0040($sp) -/* 02744 80AD1BE4 AFB2003C */ sw $s2, 0x003C($sp) -/* 02748 80AD1BE8 AFB10038 */ sw $s1, 0x0038($sp) -/* 0274C 80AD1BEC AFB00034 */ sw $s0, 0x0034($sp) -/* 02750 80AD1BF0 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 02754 80AD1BF4 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 02758 80AD1BF8 90820311 */ lbu $v0, 0x0311($a0) ## 00000311 -/* 0275C 80AD1BFC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 02760 80AD1C00 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 02764 80AD1C04 304E0080 */ andi $t6, $v0, 0x0080 ## $t6 = 00000000 -/* 02768 80AD1C08 15C00005 */ bne $t6, $zero, .L80AD1C20 -/* 0276C 80AD1C0C 3049FF7F */ andi $t1, $v0, 0xFF7F ## $t1 = 00000000 -/* 02770 80AD1C10 908F03BD */ lbu $t7, 0x03BD($a0) ## 000003BD -/* 02774 80AD1C14 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 02778 80AD1C18 5300000A */ beql $t8, $zero, .L80AD1C44 -/* 0277C 80AD1C1C 9222035D */ lbu $v0, 0x035D($s1) ## 0000035D -.L80AD1C20: -/* 02780 80AD1C20 923903BD */ lbu $t9, 0x03BD($s1) ## 000003BD -/* 02784 80AD1C24 922A035D */ lbu $t2, 0x035D($s1) ## 0000035D -/* 02788 80AD1C28 A2290311 */ sb $t1, 0x0311($s1) ## 00000311 -/* 0278C 80AD1C2C 3328FF7F */ andi $t0, $t9, 0xFF7F ## $t0 = 00000000 -/* 02790 80AD1C30 314BFFFD */ andi $t3, $t2, 0xFFFD ## $t3 = 00000000 -/* 02794 80AD1C34 A22803BD */ sb $t0, 0x03BD($s1) ## 000003BD -/* 02798 80AD1C38 10000059 */ beq $zero, $zero, .L80AD1DA0 -/* 0279C 80AD1C3C A22B035D */ sb $t3, 0x035D($s1) ## 0000035D -/* 027A0 80AD1C40 9222035D */ lbu $v0, 0x035D($s1) ## 0000035D -.L80AD1C44: -/* 027A4 80AD1C44 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 027A8 80AD1C48 2625034C */ addiu $a1, $s1, 0x034C ## $a1 = 0000034C -/* 027AC 80AD1C4C 304C0002 */ andi $t4, $v0, 0x0002 ## $t4 = 00000000 -/* 027B0 80AD1C50 11800053 */ beq $t4, $zero, .L80AD1DA0 -/* 027B4 80AD1C54 304DFFFD */ andi $t5, $v0, 0xFFFD ## $t5 = 00000000 -/* 027B8 80AD1C58 A22D035D */ sb $t5, 0x035D($s1) ## 0000035D -/* 027BC 80AD1C5C 0C00D5CF */ jal func_8003573C -/* 027C0 80AD1C60 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 027C4 80AD1C64 922200B1 */ lbu $v0, 0x00B1($s1) ## 000000B1 -/* 027C8 80AD1C68 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 027CC 80AD1C6C 1041004C */ beq $v0, $at, .L80AD1DA0 -/* 027D0 80AD1C70 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 027D4 80AD1C74 1041004A */ beq $v0, $at, .L80AD1DA0 -/* 027D8 80AD1C78 2403000D */ addiu $v1, $zero, 0x000D ## $v1 = 0000000D -/* 027DC 80AD1C7C 14620003 */ bne $v1, $v0, .L80AD1C8C -/* 027E0 80AD1C80 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 027E4 80AD1C84 10000016 */ beq $zero, $zero, .L80AD1CE0 -/* 027E8 80AD1C88 A22000AF */ sb $zero, 0x00AF($s1) ## 000000AF -.L80AD1C8C: -/* 027EC 80AD1C8C 14410008 */ bne $v0, $at, .L80AD1CB0 -/* 027F0 80AD1C90 00000000 */ nop -/* 027F4 80AD1C94 8E2E02B0 */ lw $t6, 0x02B0($s1) ## 000002B0 -/* 027F8 80AD1C98 506E0042 */ beql $v1, $t6, .L80AD1DA4 -/* 027FC 80AD1C9C 8FBF0044 */ lw $ra, 0x0044($sp) -/* 02800 80AD1CA0 0C2B459F */ jal func_80AD167C -/* 02804 80AD1CA4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02808 80AD1CA8 1000003E */ beq $zero, $zero, .L80AD1DA4 -/* 0280C 80AD1CAC 8FBF0044 */ lw $ra, 0x0044($sp) -.L80AD1CB0: -/* 02810 80AD1CB0 0C00D58A */ jal Actor_ApplyDamage - -/* 02814 80AD1CB4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02818 80AD1CB8 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 0281C 80AD1CBC AFAF0010 */ sw $t7, 0x0010($sp) -/* 02820 80AD1CC0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02824 80AD1CC4 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 02828 80AD1CC8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0282C 80AD1CCC 0C00D09B */ jal Actor_SetColorFilter -/* 02830 80AD1CD0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02834 80AD1CD4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02838 80AD1CD8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0283C 80AD1CDC 24053956 */ addiu $a1, $zero, 0x3956 ## $a1 = 00003956 -.L80AD1CE0: -/* 02840 80AD1CE0 923800B1 */ lbu $t8, 0x00B1($s1) ## 000000B1 -/* 02844 80AD1CE4 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 02848 80AD1CE8 24100004 */ addiu $s0, $zero, 0x0004 ## $s0 = 00000004 -/* 0284C 80AD1CEC 17010027 */ bne $t8, $at, .L80AD1D8C -/* 02850 80AD1CF0 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 02854 80AD1CF4 4481B000 */ mtc1 $at, $f22 ## $f22 = 25.00 -/* 02858 80AD1CF8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0285C 80AD1CFC 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 -/* 02860 80AD1D00 27B20054 */ addiu $s2, $sp, 0x0054 ## $s2 = FFFFFFF4 -.L80AD1D04: -/* 02864 80AD1D04 0C00CFC8 */ jal Rand_CenteredFloat - -/* 02868 80AD1D08 4600A306 */ mov.s $f12, $f20 -/* 0286C 80AD1D0C C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 -/* 02870 80AD1D10 46040180 */ add.s $f6, $f0, $f4 -/* 02874 80AD1D14 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02878 80AD1D18 E7A60054 */ swc1 $f6, 0x0054($sp) -/* 0287C 80AD1D1C 46160202 */ mul.s $f8, $f0, $f22 -/* 02880 80AD1D20 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 -/* 02884 80AD1D24 4600A306 */ mov.s $f12, $f20 -/* 02888 80AD1D28 460A4400 */ add.s $f16, $f8, $f10 -/* 0288C 80AD1D2C 0C00CFC8 */ jal Rand_CenteredFloat - -/* 02890 80AD1D30 E7B00058 */ swc1 $f16, 0x0058($sp) -/* 02894 80AD1D34 C632002C */ lwc1 $f18, 0x002C($s1) ## 0000002C -/* 02898 80AD1D38 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 0289C 80AD1D3C AFB90018 */ sw $t9, 0x0018($sp) -/* 028A0 80AD1D40 46120100 */ add.s $f4, $f0, $f18 -/* 028A4 80AD1D44 AFA00014 */ sw $zero, 0x0014($sp) -/* 028A8 80AD1D48 AFA00010 */ sw $zero, 0x0010($sp) -/* 028AC 80AD1D4C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 028B0 80AD1D50 E7A4005C */ swc1 $f4, 0x005C($sp) -/* 028B4 80AD1D54 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028B8 80AD1D58 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFF4 -/* 028BC 80AD1D5C 0C00A935 */ jal EffectSsEnFire_SpawnVec3f -/* 028C0 80AD1D60 24070046 */ addiu $a3, $zero, 0x0046 ## $a3 = 00000046 -/* 028C4 80AD1D64 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000003 -/* 028C8 80AD1D68 0601FFE6 */ bgez $s0, .L80AD1D04 -/* 028CC 80AD1D6C 00000000 */ nop -/* 028D0 80AD1D70 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 -/* 028D4 80AD1D74 AFA80010 */ sw $t0, 0x0010($sp) -/* 028D8 80AD1D78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 028DC 80AD1D7C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 028E0 80AD1D80 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 028E4 80AD1D84 0C00D09B */ jal Actor_SetColorFilter -/* 028E8 80AD1D88 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -.L80AD1D8C: -/* 028EC 80AD1D8C 922900AF */ lbu $t1, 0x00AF($s1) ## 000000AF -/* 028F0 80AD1D90 55200004 */ bnel $t1, $zero, .L80AD1DA4 -/* 028F4 80AD1D94 8FBF0044 */ lw $ra, 0x0044($sp) -/* 028F8 80AD1D98 0C2B45DF */ jal func_80AD177C -/* 028FC 80AD1D9C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80AD1DA0: -/* 02900 80AD1DA0 8FBF0044 */ lw $ra, 0x0044($sp) -.L80AD1DA4: -/* 02904 80AD1DA4 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 02908 80AD1DA8 D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 0290C 80AD1DAC 8FB00034 */ lw $s0, 0x0034($sp) -/* 02910 80AD1DB0 8FB10038 */ lw $s1, 0x0038($sp) -/* 02914 80AD1DB4 8FB2003C */ lw $s2, 0x003C($sp) -/* 02918 80AD1DB8 8FB30040 */ lw $s3, 0x0040($sp) -/* 0291C 80AD1DBC 03E00008 */ jr $ra -/* 02920 80AD1DC0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s deleted file mode 100644 index 5d57a6dd0b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s +++ /dev/null @@ -1,168 +0,0 @@ -.rdata -glabel D_80AD2890 - .asciz "../z_en_peehat.c" - .balign 4 - -glabel D_80AD28A4 - .asciz "../z_en_peehat.c" - .balign 4 - -glabel D_80AD28B8 - .asciz "../z_en_peehat.c" - .balign 4 - -.late_rodata -glabel D_80AD295C - .word 0x3DEB851F -glabel D_80AD2960 - .word 0x3E051EB8 -glabel D_80AD2964 - .float 0.1 - -glabel D_80AD2968 - .float 0.1 - -glabel D_80AD296C - .word 0x3E051EB8 -glabel D_80AD2970 - .word 0x3DEB851F - -.text -glabel func_80AD2224 -/* 02D84 80AD2224 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 02D88 80AD2228 AFA70054 */ sw $a3, 0x0054($sp) -/* 02D8C 80AD222C 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 02D90 80AD2230 AFBF001C */ sw $ra, 0x001C($sp) -/* 02D94 80AD2234 AFB00018 */ sw $s0, 0x0018($sp) -/* 02D98 80AD2238 AFA40048 */ sw $a0, 0x0048($sp) -/* 02D9C 80AD223C 14A70006 */ bne $a1, $a3, .L80AD2258 -/* 02DA0 80AD2240 AFA60050 */ sw $a2, 0x0050($sp) -/* 02DA4 80AD2244 8FB0005C */ lw $s0, 0x005C($sp) -/* 02DA8 80AD2248 8FB80058 */ lw $t8, 0x0058($sp) -/* 02DAC 80AD224C 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 -/* 02DB0 80AD2250 000E7823 */ subu $t7, $zero, $t6 -/* 02DB4 80AD2254 A70F0000 */ sh $t7, 0x0000($t8) ## 00000000 -.L80AD2258: -/* 02DB8 80AD2258 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 02DBC 80AD225C 10A3000B */ beq $a1, $v1, .L80AD228C -/* 02DC0 80AD2260 8FB0005C */ lw $s0, 0x005C($sp) -/* 02DC4 80AD2264 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 -/* 02DC8 80AD2268 54A1006E */ bnel $a1, $at, .L80AD2424 -/* 02DCC 80AD226C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02DD0 80AD2270 8E0202B0 */ lw $v0, 0x02B0($s0) ## 000002B0 -/* 02DD4 80AD2274 50400006 */ beql $v0, $zero, .L80AD2290 -/* 02DD8 80AD2278 8FB90048 */ lw $t9, 0x0048($sp) -/* 02DDC 80AD227C 50620004 */ beql $v1, $v0, .L80AD2290 -/* 02DE0 80AD2280 8FB90048 */ lw $t9, 0x0048($sp) -/* 02DE4 80AD2284 54E20067 */ bnel $a3, $v0, .L80AD2424 -/* 02DE8 80AD2288 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AD228C: -/* 02DEC 80AD228C 8FB90048 */ lw $t9, 0x0048($sp) -.L80AD2290: -/* 02DF0 80AD2290 3C0680AD */ lui $a2, %hi(D_80AD2890) ## $a2 = 80AD0000 -/* 02DF4 80AD2294 24C62890 */ addiu $a2, $a2, %lo(D_80AD2890) ## $a2 = 80AD2890 -/* 02DF8 80AD2298 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -/* 02DFC 80AD229C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 02E00 80AD22A0 2407079A */ addiu $a3, $zero, 0x079A ## $a3 = 0000079A -/* 02E04 80AD22A4 0C031AB1 */ jal Graph_OpenDisps -/* 02E08 80AD22A8 AFA50040 */ sw $a1, 0x0040($sp) -/* 02E0C 80AD22AC 0C034213 */ jal Matrix_Push -/* 02E10 80AD22B0 00000000 */ nop -/* 02E14 80AD22B4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02E18 80AD22B8 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 02E1C 80AD22BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02E20 80AD22C0 44066000 */ mfc1 $a2, $f12 -/* 02E24 80AD22C4 0C0342A3 */ jal Matrix_Scale -/* 02E28 80AD22C8 46006386 */ mov.s $f14, $f12 -/* 02E2C 80AD22CC 3C0180AD */ lui $at, %hi(D_80AD295C) ## $at = 80AD0000 -/* 02E30 80AD22D0 C426295C */ lwc1 $f6, %lo(D_80AD295C)($at) -/* 02E34 80AD22D4 C60402E4 */ lwc1 $f4, 0x02E4($s0) ## 000002E4 -/* 02E38 80AD22D8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02E3C 80AD22DC 46062302 */ mul.s $f12, $f4, $f6 -/* 02E40 80AD22E0 0C0342DC */ jal Matrix_RotateX -/* 02E44 80AD22E4 00000000 */ nop -/* 02E48 80AD22E8 3C0180AD */ lui $at, %hi(D_80AD2960) ## $at = 80AD0000 -/* 02E4C 80AD22EC C42A2960 */ lwc1 $f10, %lo(D_80AD2960)($at) -/* 02E50 80AD22F0 C60802E4 */ lwc1 $f8, 0x02E4($s0) ## 000002E4 -/* 02E54 80AD22F4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02E58 80AD22F8 460A4302 */ mul.s $f12, $f8, $f10 -/* 02E5C 80AD22FC 0C034348 */ jal Matrix_RotateY -/* 02E60 80AD2300 00000000 */ nop -/* 02E64 80AD2304 3C0180AD */ lui $at, %hi(D_80AD2964) ## $at = 80AD0000 -/* 02E68 80AD2308 C4322964 */ lwc1 $f18, %lo(D_80AD2964)($at) -/* 02E6C 80AD230C C61002E4 */ lwc1 $f16, 0x02E4($s0) ## 000002E4 -/* 02E70 80AD2310 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02E74 80AD2314 46128302 */ mul.s $f12, $f16, $f18 -/* 02E78 80AD2318 0C0343B5 */ jal Matrix_RotateZ -/* 02E7C 80AD231C 00000000 */ nop -/* 02E80 80AD2320 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02E84 80AD2324 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 02E88 80AD2328 C60002EC */ lwc1 $f0, 0x02EC($s0) ## 000002EC -/* 02E8C 80AD232C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02E90 80AD2330 46001301 */ sub.s $f12, $f2, $f0 -/* 02E94 80AD2334 46020380 */ add.s $f14, $f0, $f2 -/* 02E98 80AD2338 44066000 */ mfc1 $a2, $f12 -/* 02E9C 80AD233C 0C0342A3 */ jal Matrix_Scale -/* 02EA0 80AD2340 00000000 */ nop -/* 02EA4 80AD2344 3C0180AD */ lui $at, %hi(D_80AD2968) ## $at = 80AD0000 -/* 02EA8 80AD2348 C4262968 */ lwc1 $f6, %lo(D_80AD2968)($at) -/* 02EAC 80AD234C C60402E4 */ lwc1 $f4, 0x02E4($s0) ## 000002E4 -/* 02EB0 80AD2350 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02EB4 80AD2354 46062302 */ mul.s $f12, $f4, $f6 -/* 02EB8 80AD2358 0C0343B5 */ jal Matrix_RotateZ -/* 02EBC 80AD235C 46006307 */ neg.s $f12, $f12 -/* 02EC0 80AD2360 3C0180AD */ lui $at, %hi(D_80AD296C) ## $at = 80AD0000 -/* 02EC4 80AD2364 C42A296C */ lwc1 $f10, %lo(D_80AD296C)($at) -/* 02EC8 80AD2368 C60802E4 */ lwc1 $f8, 0x02E4($s0) ## 000002E4 -/* 02ECC 80AD236C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02ED0 80AD2370 460A4302 */ mul.s $f12, $f8, $f10 -/* 02ED4 80AD2374 0C034348 */ jal Matrix_RotateY -/* 02ED8 80AD2378 46006307 */ neg.s $f12, $f12 -/* 02EDC 80AD237C 3C0180AD */ lui $at, %hi(D_80AD2970) ## $at = 80AD0000 -/* 02EE0 80AD2380 C4322970 */ lwc1 $f18, %lo(D_80AD2970)($at) -/* 02EE4 80AD2384 C61002E4 */ lwc1 $f16, 0x02E4($s0) ## 000002E4 -/* 02EE8 80AD2388 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02EEC 80AD238C 46128302 */ mul.s $f12, $f16, $f18 -/* 02EF0 80AD2390 0C0342DC */ jal Matrix_RotateX -/* 02EF4 80AD2394 46006307 */ neg.s $f12, $f12 -/* 02EF8 80AD2398 8FA30040 */ lw $v1, 0x0040($sp) -/* 02EFC 80AD239C 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 02F00 80AD23A0 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 02F04 80AD23A4 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 -/* 02F08 80AD23A8 3C0580AD */ lui $a1, %hi(D_80AD28A4) ## $a1 = 80AD0000 -/* 02F0C 80AD23AC 24A528A4 */ addiu $a1, $a1, %lo(D_80AD28A4) ## $a1 = 80AD28A4 -/* 02F10 80AD23B0 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 02F14 80AD23B4 AC6802C0 */ sw $t0, 0x02C0($v1) ## 000002C0 -/* 02F18 80AD23B8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 02F1C 80AD23BC 8FAA0048 */ lw $t2, 0x0048($sp) -/* 02F20 80AD23C0 240607A7 */ addiu $a2, $zero, 0x07A7 ## $a2 = 000007A7 -/* 02F24 80AD23C4 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 02F28 80AD23C8 0C0346A2 */ jal Matrix_NewMtx -/* 02F2C 80AD23CC 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 02F30 80AD23D0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 02F34 80AD23D4 8FAB0040 */ lw $t3, 0x0040($sp) -/* 02F38 80AD23D8 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 02F3C 80AD23DC 8D6202C0 */ lw $v0, 0x02C0($t3) ## 000002C0 -/* 02F40 80AD23E0 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 02F44 80AD23E4 AD6C02C0 */ sw $t4, 0x02C0($t3) ## 000002C0 -/* 02F48 80AD23E8 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 02F4C 80AD23EC 8FAE0050 */ lw $t6, 0x0050($sp) -/* 02F50 80AD23F0 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 02F54 80AD23F4 0C034221 */ jal Matrix_Pull -/* 02F58 80AD23F8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 02F5C 80AD23FC 8FB80048 */ lw $t8, 0x0048($sp) -/* 02F60 80AD2400 3C0680AD */ lui $a2, %hi(D_80AD28B8) ## $a2 = 80AD0000 -/* 02F64 80AD2404 24C628B8 */ addiu $a2, $a2, %lo(D_80AD28B8) ## $a2 = 80AD28B8 -/* 02F68 80AD2408 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 02F6C 80AD240C 240707AB */ addiu $a3, $zero, 0x07AB ## $a3 = 000007AB -/* 02F70 80AD2410 0C031AD5 */ jal Graph_CloseDisps -/* 02F74 80AD2414 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 02F78 80AD2418 10000002 */ beq $zero, $zero, .L80AD2424 -/* 02F7C 80AD241C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02F80 80AD2420 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AD2424: -/* 02F84 80AD2424 8FBF001C */ lw $ra, 0x001C($sp) -/* 02F88 80AD2428 8FB00018 */ lw $s0, 0x0018($sp) -/* 02F8C 80AD242C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 02F90 80AD2430 03E00008 */ jr $ra -/* 02F94 80AD2434 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s deleted file mode 100644 index fe4db347e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s +++ /dev/null @@ -1,156 +0,0 @@ -.rdata -glabel D_80AD28CC - .asciz "../z_en_peehat.c" - .balign 4 - -glabel D_80AD28E0 - .asciz "../z_en_peehat.c" - .balign 4 - -glabel D_80AD28F4 - .asciz "../z_en_peehat.c" - .balign 4 - -.late_rodata -glabel D_80AD2974 - .word 0x3EB33333 -glabel D_80AD2978 - .float 3.2 - -glabel D_80AD297C - .float 0.2 - -glabel D_80AD2980 - .float 0.3 - -.text -glabel func_80AD2438 -/* 02F98 80AD2438 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 02F9C 80AD243C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02FA0 80AD2440 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02FA4 80AD2444 AFA40040 */ sw $a0, 0x0040($sp) -/* 02FA8 80AD2448 AFA60048 */ sw $a2, 0x0048($sp) -/* 02FAC 80AD244C 14A1000D */ bne $a1, $at, .L80AD2484 -/* 02FB0 80AD2450 AFA7004C */ sw $a3, 0x004C($sp) -/* 02FB4 80AD2454 8FA50050 */ lw $a1, 0x0050($sp) -/* 02FB8 80AD2458 3C0480AD */ lui $a0, %hi(D_80AD2844) ## $a0 = 80AD0000 -/* 02FBC 80AD245C 24842844 */ addiu $a0, $a0, %lo(D_80AD2844) ## $a0 = 80AD2844 -/* 02FC0 80AD2460 0C0346BD */ jal Matrix_MultVec3f -/* 02FC4 80AD2464 24A502BC */ addiu $a1, $a1, 0x02BC ## $a1 = 000002BC -/* 02FC8 80AD2468 8FA50050 */ lw $a1, 0x0050($sp) -/* 02FCC 80AD246C 3C0480AD */ lui $a0, %hi(D_80AD2850) ## $a0 = 80AD0000 -/* 02FD0 80AD2470 24842850 */ addiu $a0, $a0, %lo(D_80AD2850) ## $a0 = 80AD2850 -/* 02FD4 80AD2474 0C0346BD */ jal Matrix_MultVec3f -/* 02FD8 80AD2478 24A502C8 */ addiu $a1, $a1, 0x02C8 ## $a1 = 000002C8 -/* 02FDC 80AD247C 10000067 */ beq $zero, $zero, .L80AD261C -/* 02FE0 80AD2480 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AD2484: -/* 02FE4 80AD2484 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02FE8 80AD2488 14A10063 */ bne $a1, $at, .L80AD2618 -/* 02FEC 80AD248C 8FAE0050 */ lw $t6, 0x0050($sp) -/* 02FF0 80AD2490 85CF001C */ lh $t7, 0x001C($t6) ## 0000001C -/* 02FF4 80AD2494 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 -/* 02FF8 80AD2498 3C0680AD */ lui $a2, %hi(D_80AD28CC) ## $a2 = 80AD0000 -/* 02FFC 80AD249C 5DE0005F */ bgtzl $t7, .L80AD261C -/* 03000 80AD24A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03004 80AD24A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 03008 80AD24A8 8FB80040 */ lw $t8, 0x0040($sp) -/* 0300C 80AD24AC 24C628CC */ addiu $a2, $a2, %lo(D_80AD28CC) ## $a2 = 80AD28CC -/* 03010 80AD24B0 E7A40038 */ swc1 $f4, 0x0038($sp) -/* 03014 80AD24B4 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 03018 80AD24B8 240707BD */ addiu $a3, $zero, 0x07BD ## $a3 = 000007BD -/* 0301C 80AD24BC 0C031AB1 */ jal Graph_OpenDisps -/* 03020 80AD24C0 AFA50034 */ sw $a1, 0x0034($sp) -/* 03024 80AD24C4 0C034213 */ jal Matrix_Push -/* 03028 80AD24C8 00000000 */ nop -/* 0302C 80AD24CC 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 03030 80AD24D0 3C01C47A */ lui $at, 0xC47A ## $at = C47A0000 -/* 03034 80AD24D4 44816000 */ mtc1 $at, $f12 ## $f12 = -1000.00 -/* 03038 80AD24D8 44067000 */ mfc1 $a2, $f14 -/* 0303C 80AD24DC 0C034261 */ jal Matrix_Translate -/* 03040 80AD24E0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 03044 80AD24E4 8FA50050 */ lw $a1, 0x0050($sp) -/* 03048 80AD24E8 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 0304C 80AD24EC 0C018A29 */ jal Collider_UpdateSpheres -/* 03050 80AD24F0 24A5034C */ addiu $a1, $a1, 0x034C ## $a1 = 0000034C -/* 03054 80AD24F4 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 03058 80AD24F8 44816000 */ mtc1 $at, $f12 ## $f12 = 500.00 -/* 0305C 80AD24FC 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 03060 80AD2500 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 03064 80AD2504 0C034261 */ jal Matrix_Translate -/* 03068 80AD2508 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0306C 80AD250C 8FA30050 */ lw $v1, 0x0050($sp) -/* 03070 80AD2510 90620114 */ lbu $v0, 0x0114($v1) ## 00000114 -/* 03074 80AD2514 10400012 */ beq $v0, $zero, .L80AD2560 -/* 03078 80AD2518 00000000 */ nop -/* 0307C 80AD251C 94790112 */ lhu $t9, 0x0112($v1) ## 00000112 -/* 03080 80AD2520 00022080 */ sll $a0, $v0, 2 -/* 03084 80AD2524 00822021 */ addu $a0, $a0, $v0 -/* 03088 80AD2528 33284000 */ andi $t0, $t9, 0x4000 ## $t0 = 00000000 -/* 0308C 80AD252C 1100000C */ beq $t0, $zero, .L80AD2560 -/* 03090 80AD2530 000420C0 */ sll $a0, $a0, 3 -/* 03094 80AD2534 00822023 */ subu $a0, $a0, $v0 -/* 03098 80AD2538 00042100 */ sll $a0, $a0, 4 -/* 0309C 80AD253C 00822021 */ addu $a0, $a0, $v0 -/* 030A0 80AD2540 00042140 */ sll $a0, $a0, 5 -/* 030A4 80AD2544 00042400 */ sll $a0, $a0, 16 -/* 030A8 80AD2548 0C01DE1C */ jal Math_SinS - ## sins? -/* 030AC 80AD254C 00042403 */ sra $a0, $a0, 16 -/* 030B0 80AD2550 3C0180AD */ lui $at, %hi(D_80AD2974) ## $at = 80AD0000 -/* 030B4 80AD2554 C4262974 */ lwc1 $f6, %lo(D_80AD2974)($at) -/* 030B8 80AD2558 46060202 */ mul.s $f8, $f0, $f6 -/* 030BC 80AD255C E7A80038 */ swc1 $f8, 0x0038($sp) -.L80AD2560: -/* 030C0 80AD2560 3C0180AD */ lui $at, %hi(D_80AD2978) ## $at = 80AD0000 -/* 030C4 80AD2564 C42A2978 */ lwc1 $f10, %lo(D_80AD2978)($at) -/* 030C8 80AD2568 C7B00038 */ lwc1 $f16, 0x0038($sp) -/* 030CC 80AD256C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 030D0 80AD2570 0C034348 */ jal Matrix_RotateY -/* 030D4 80AD2574 46105300 */ add.s $f12, $f10, $f16 -/* 030D8 80AD2578 3C0180AD */ lui $at, %hi(D_80AD297C) ## $at = 80AD0000 -/* 030DC 80AD257C C42E297C */ lwc1 $f14, %lo(D_80AD297C)($at) -/* 030E0 80AD2580 3C0180AD */ lui $at, %hi(D_80AD2980) ## $at = 80AD0000 -/* 030E4 80AD2584 C42C2980 */ lwc1 $f12, %lo(D_80AD2980)($at) -/* 030E8 80AD2588 44067000 */ mfc1 $a2, $f14 -/* 030EC 80AD258C 0C0342A3 */ jal Matrix_Scale -/* 030F0 80AD2590 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 030F4 80AD2594 8FA70034 */ lw $a3, 0x0034($sp) -/* 030F8 80AD2598 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 030FC 80AD259C 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 03100 80AD25A0 8CE202C0 */ lw $v0, 0x02C0($a3) ## 000002C0 -/* 03104 80AD25A4 3C0580AD */ lui $a1, %hi(D_80AD28E0) ## $a1 = 80AD0000 -/* 03108 80AD25A8 24A528E0 */ addiu $a1, $a1, %lo(D_80AD28E0) ## $a1 = 80AD28E0 -/* 0310C 80AD25AC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 03110 80AD25B0 ACE902C0 */ sw $t1, 0x02C0($a3) ## 000002C0 -/* 03114 80AD25B4 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 03118 80AD25B8 8FAB0040 */ lw $t3, 0x0040($sp) -/* 0311C 80AD25BC 240607C6 */ addiu $a2, $zero, 0x07C6 ## $a2 = 000007C6 -/* 03120 80AD25C0 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 03124 80AD25C4 0C0346A2 */ jal Matrix_NewMtx -/* 03128 80AD25C8 AFA20020 */ sw $v0, 0x0020($sp) -/* 0312C 80AD25CC 8FA30020 */ lw $v1, 0x0020($sp) -/* 03130 80AD25D0 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 03134 80AD25D4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03138 80AD25D8 8FAC0034 */ lw $t4, 0x0034($sp) -/* 0313C 80AD25DC 8D8202C0 */ lw $v0, 0x02C0($t4) ## 000002C0 -/* 03140 80AD25E0 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 03144 80AD25E4 AD8D02C0 */ sw $t5, 0x02C0($t4) ## 000002C0 -/* 03148 80AD25E8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0314C 80AD25EC 8FAF0048 */ lw $t7, 0x0048($sp) -/* 03150 80AD25F0 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 03154 80AD25F4 0C034221 */ jal Matrix_Pull -/* 03158 80AD25F8 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 0315C 80AD25FC 8FB90040 */ lw $t9, 0x0040($sp) -/* 03160 80AD2600 3C0680AD */ lui $a2, %hi(D_80AD28F4) ## $a2 = 80AD0000 -/* 03164 80AD2604 24C628F4 */ addiu $a2, $a2, %lo(D_80AD28F4) ## $a2 = 80AD28F4 -/* 03168 80AD2608 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 -/* 0316C 80AD260C 240707CA */ addiu $a3, $zero, 0x07CA ## $a3 = 000007CA -/* 03170 80AD2610 0C031AD5 */ jal Graph_CloseDisps -/* 03174 80AD2614 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -.L80AD2618: -/* 03178 80AD2618 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AD261C: -/* 0317C 80AD261C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 03180 80AD2620 03E00008 */ jr $ra -/* 03184 80AD2624 00000000 */ nop diff --git a/data/overlays/actors/z_en_peehat.data.s b/data/overlays/actors/z_en_peehat.data.s deleted file mode 100644 index 5d83481e71..0000000000 --- a/data/overlays/actors/z_en_peehat.data.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Peehat_InitVars - .word 0x001D0500, 0x01000015, 0x00180000, 0x0000042C -.word EnPeehat_Init -.word EnPeehat_Destroy -.word EnPeehat_Update -.word EnPeehat_Draw -glabel D_80AD2740 - .word 0x0B000909, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00050100, 0x003200A0, 0xFFBA0000, 0x00000000 -glabel D_80AD276C - .word 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00000000, 0x00000000, 0x00140064 -glabel D_80AD2790 - .word 0x06000909, 0x10000000, 0x00000001 -.word D_80AD276C -glabel D_80AD27A0 - .word 0x09110D00, 0x00030000, 0x00000000, 0xFFCFFFFF, 0x00100000, 0xFFCFFFFF, 0x00000000, 0x01010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_80AD27F0 - .word 0xF0020102, 0xE00202D2, 0x010204C4, 0x02020202, 0x02C36060, 0x00000104, 0x02020804, 0x00000400 -glabel D_80AD2810 - .word 0x304C02BC -glabel D_80AD2814 - .word 0x00000000, 0x41000000, 0x00000000 -glabel D_80AD2820 - .word 0x00000000, 0xBFC00000, 0x00000000 -glabel D_80AD282C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80AD2838 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80AD2844 - .word 0x00000000, 0x00000000, 0x45ABE000 -glabel D_80AD2850 - .word 0x00000000, 0x00000000, 0xC5ABE000 -glabel D_80AD285C - .word 0x00000000, 0x00000000, 0xC58CA000 -glabel D_80AD2868 - .word 0xC58CA000, 0x00000000, 0x00000000 -glabel D_80AD2874 - .word 0x458CA000, 0x00000000, 0x00000000 -glabel D_80AD2880 - .word 0x00000000, 0x00000000, 0x458CA000, 0x00000000 - diff --git a/data/overlays/actors/z_en_peehat.reloc.s b/data/overlays/actors/z_en_peehat.reloc.s deleted file mode 100644 index f0c796e2d6..0000000000 --- a/data/overlays/actors/z_en_peehat.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80AD2990 - .incbin "baserom/ovl_En_Peehat", 0x34F0, 0x00000320 diff --git a/spec b/spec index 9aa536744e..79d6feb84f 100644 --- a/spec +++ b/spec @@ -2760,8 +2760,7 @@ endseg beginseg name "ovl_En_Peehat" include "build/src/overlays/actors/ovl_En_Peehat/z_en_peehat.o" - include "build/data/overlays/actors/z_en_peehat.data.o" - include "build/data/overlays/actors/z_en_peehat.reloc.o" + include "build/src/overlays/actors/ovl_En_Peehat/ovl_En_Peehat_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 5385b049d0..43c46d8ace 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -1,21 +1,52 @@ #include "z_en_peehat.h" +#include "overlays/actors/ovl_En_Bom/z_en_bom.h" +#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #define FLAGS 0x01000015 #define THIS ((EnPeehat*)thisx) +#define GROUND_HOVER_HEIGHT 75.0f +#define MAX_LARVA 3 + void EnPeehat_Init(Actor* thisx, GlobalContext* globalCtx); void EnPeehat_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnPeehat_Update(Actor* thisx, GlobalContext* globalCtx); void EnPeehat_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06000350; -extern UNK_TYPE D_060005C4; -extern UNK_TYPE D_06000844; -extern UNK_TYPE D_060009C4; -extern UNK_TYPE D_06001C80; +void EnPeehat_Ground_SetStateGround(EnPeehat* this); +void EnPeehat_Flying_SetStateGround(EnPeehat* this); +void EnPeehat_Larva_SetStateSeekPlayer(EnPeehat* this); +void EnPeehat_Ground_StateGround(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_Ground_SetStateRise(EnPeehat* this); +void EnPeehat_Flying_StateGrounded(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_Flying_SetStateRise(EnPeehat* this); +void EnPeehat_Flying_StateFly(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_Flying_SetStateLanding(EnPeehat* this); +void EnPeehat_Ground_StateRise(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_Ground_SetStateHover(EnPeehat* this); +void EnPeehat_Flying_StateRise(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_Ground_StateSeekPlayer(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_Ground_SetStateReturnHome(EnPeehat* this); +void EnPeehat_Ground_SetStateLanding(EnPeehat* this); +void EnPeehat_Larva_StateSeekPlayer(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_SetStateAttackRecoil(EnPeehat* this); +void EnPeehat_Ground_StateLanding(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_Flying_StateLanding(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_Ground_StateHover(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_Ground_StateReturnHome(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_StateAttackRecoil(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_StateBoomerangStunned(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_Adult_StateDie(EnPeehat* this, GlobalContext* globalCtx); +void EnPeehat_SetStateExplode(EnPeehat* this); +void EnPeehat_StateExplode(EnPeehat* this, GlobalContext* globalCtx); + +extern SkeletonHeader D_06001C80; +extern AnimationHeader D_060009C4; +extern AnimationHeader D_06000844; +extern AnimationHeader D_060005C4; +extern AnimationHeader D_06000350; -/* const ActorInit En_Peehat_InitVars = { ACTOR_EN_PEEHAT, ACTORCAT_ENEMY, @@ -28,7 +59,7 @@ const ActorInit En_Peehat_InitVars = { (ActorFunc)EnPeehat_Draw, }; -static ColliderCylinderInit D_80AD2740 = { +static ColliderCylinderInit sCylinderInit = { { COLTYPE_WOOD, AT_NONE, @@ -48,7 +79,34 @@ static ColliderCylinderInit D_80AD2740 = { { 50, 160, -70, { 0, 0, 0 } }, }; -static ColliderQuadInit D_80AD27A0 = { +static ColliderJntSphElementInit sJntSphElemInit[1] = { + { + { + ELEMTYPE_UNK0, + { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_NONE, + BUMP_ON, + OCELEM_ON, + }, + { 0, { { 0, 0, 0 }, 20 }, 100 }, + }, +}; + +static ColliderJntSphInit sJntSphInit = { + { + COLTYPE_HIT6, + AT_NONE, + AC_ON | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_PLAYER, + OC2_TYPE_1, + COLSHAPE_JNTSPH, + }, + 1, + sJntSphElemInit, +}; + +static ColliderQuadInit sQuadInit = { { COLTYPE_METAL, AT_ON | AT_TYPE_ENEMY, @@ -68,109 +126,962 @@ static ColliderQuadInit D_80AD27A0 = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -static ColliderJntSphElementInit D_80AD276C[1] = { - { - { - ELEMTYPE_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_NONE, - BUMP_ON, - OCELEM_ON, - }, - { 0, { { 0, 0, 0 }, 20 }, 100 }, - }, +typedef enum { + /* 00 */ PEAHAT_DMG_EFF_ATTACK = 0, + /* 06 */ PEAHAT_DMG_EFF_LIGHT_ICE_ARROW = 6, + /* 12 */ PEAHAT_DMG_EFF_FIRE = 12, + /* 13 */ PEAHAT_DMG_EFF_HOOKSHOT = 13, + /* 14 */ PEAHAT_DMG_EFF_BOOMERANG = 14, + /* 15 */ PEAHAT_DMG_EFF_NUT = 15 +} DamageEffect; + +static DamageTable sDamageTable = { + /* Deku nut */ DMG_ENTRY(0, PEAHAT_DMG_EFF_NUT), + /* Deku stick */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), + /* Slingshot */ DMG_ENTRY(1, PEAHAT_DMG_EFF_ATTACK), + /* Explosive */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), + /* Boomerang */ DMG_ENTRY(0, PEAHAT_DMG_EFF_BOOMERANG), + /* Normal arrow */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), + /* Hammer swing */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), + /* Hookshot */ DMG_ENTRY(2, PEAHAT_DMG_EFF_HOOKSHOT), + /* Kokiri sword */ DMG_ENTRY(1, PEAHAT_DMG_EFF_ATTACK), + /* Master sword */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), + /* Giant's Knife */ DMG_ENTRY(4, PEAHAT_DMG_EFF_ATTACK), + /* Fire arrow */ DMG_ENTRY(4, PEAHAT_DMG_EFF_FIRE), + /* Ice arrow */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), + /* Light arrow */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), + /* Unk arrow 1 */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), + /* Unk arrow 2 */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), + /* Unk arrow 3 */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), + /* Fire magic */ DMG_ENTRY(3, PEAHAT_DMG_EFF_FIRE), + /* Ice magic */ DMG_ENTRY(0, PEAHAT_DMG_EFF_LIGHT_ICE_ARROW), + /* Light magic */ DMG_ENTRY(0, PEAHAT_DMG_EFF_LIGHT_ICE_ARROW), + /* Shield */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK), + /* Mirror Ray */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK), + /* Kokiri spin */ DMG_ENTRY(1, PEAHAT_DMG_EFF_ATTACK), + /* Giant spin */ DMG_ENTRY(4, PEAHAT_DMG_EFF_ATTACK), + /* Master spin */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), + /* Kokiri jump */ DMG_ENTRY(2, PEAHAT_DMG_EFF_ATTACK), + /* Giant jump */ DMG_ENTRY(8, PEAHAT_DMG_EFF_ATTACK), + /* Master jump */ DMG_ENTRY(4, PEAHAT_DMG_EFF_ATTACK), + /* Unknown 1 */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK), + /* Unblockable */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK), + /* Hammer jump */ DMG_ENTRY(4, PEAHAT_DMG_EFF_ATTACK), + /* Unknown 2 */ DMG_ENTRY(0, PEAHAT_DMG_EFF_ATTACK), }; -static ColliderJntSphInit D_80AD2790 = { - { - COLTYPE_HIT6, - AT_NONE, - AC_ON | AC_TYPE_PLAYER, - OC1_ON | OC1_TYPE_PLAYER, - OC2_TYPE_1, - COLSHAPE_JNTSPH, - }, - 1, - D_80AD276C, +typedef enum { + /* 00 */ PEAHAT_STATE_DYING, + /* 01 */ PEAHAT_STATE_EXPLODE, + /* 03 */ PEAHAT_STATE_3 = 3, + /* 04 */ PEAHAT_STATE_4, + /* 05 */ PEAHAT_STATE_FLY, + /* 07 */ PEAHAT_STATE_ATTACK_RECOIL = 7, + /* 08 */ PEAHAT_STATE_8, + /* 09 */ PEAHAT_STATE_9, + /* 10 */ PEAHAT_STATE_LANDING, + /* 12 */ PEAHAT_STATE_RETURN_HOME = 12, + /* 13 */ PEAHAT_STATE_STUNNED, + /* 14 */ PEAHAT_STATE_SEEK_PLAYER, + /* 15 */ PEAHAT_STATE_15 +} PeahatState; + +static InitChainEntry sInitChain[] = { + ICHAIN_F32(targetArrowOffset, 700, ICHAIN_STOP), }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF4A0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Init.s") +void EnPeehat_SetupAction(EnPeehat* this, EnPeehatActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Destroy.s") +void EnPeehat_Init(Actor* thisx, GlobalContext* globalCtx) { + EnPeehat* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s") + Actor_ProcessInitChain(thisx, sInitChain); + Actor_SetScale(thisx, 36.0f * 0.001f); + SkelAnime_Init(globalCtx, &this->skelAnime, &D_06001C80, &D_060009C4, this->jointTable, this->morphTable, 24); + ActorShape_Init(&this->actor.shape, 100.0f, ActorShadow_DrawCircle, 27.0f); + this->actor.focus.pos = this->actor.world.pos; + this->unk2D4 = 0; + this->actor.world.rot.y = 0; + this->actor.colChkInfo.mass = MASS_HEAVY; + this->actor.colChkInfo.health = 6; + this->actor.colChkInfo.damageTable = &sDamageTable; + this->actor.floorHeight = this->actor.world.pos.y; + Collider_InitCylinder(globalCtx, &this->colCylinder); + Collider_SetCylinder(globalCtx, &this->colCylinder, thisx, &sCylinderInit); + Collider_InitQuad(globalCtx, &this->colQuad); + Collider_SetQuad(globalCtx, &this->colQuad, thisx, &sQuadInit); + Collider_InitJntSph(globalCtx, &this->colJntSph); + Collider_SetJntSph(globalCtx, &this->colJntSph, thisx, &sJntSphInit, this->colJntSphItemList); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF920.s") + this->actor.naviEnemyId = 0x48; + this->xzDistToRise = 740.0f; + this->xzDistMax = 1200.0f; + this->actor.uncullZoneForward = 4000.0f; + this->actor.uncullZoneScale = 800.0f; + this->actor.uncullZoneDownward = 1800.0f; + switch (this->actor.params) { + case PEAHAT_TYPE_GROUNDED: + EnPeehat_Ground_SetStateGround(this); + break; + case PEAHAT_TYPE_FLYING: + this->actor.uncullZoneForward = 4200.0f; + this->xzDistToRise = 2800.0f; + this->xzDistMax = 1400.0f; + EnPeehat_Flying_SetStateGround(this); + this->actor.flags &= ~1; + break; + case PEAHAT_TYPE_LARVA: + this->actor.scale.x = this->actor.scale.z = 0.006f; + this->actor.scale.y = 0.003f; + this->colCylinder.dim.radius = 25; + this->colCylinder.dim.height = 15; + this->colCylinder.dim.yShift = -5; + this->colCylinder.info.bumper.dmgFlags = 0x1F824; + this->colQuad.base.atFlags = AT_ON | AT_TYPE_ENEMY; + this->colQuad.base.acFlags = AC_ON | AC_TYPE_PLAYER; + this->actor.naviEnemyId = 0x49; // Larva + EnPeehat_Larva_SetStateSeekPlayer(this); + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s") +void EnPeehat_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnPeehat* this = THIS; + EnPeehat* parent; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFBCC.s") + Collider_DestroyCylinder(globalCtx, &this->colCylinder); + Collider_DestroyJntSph(globalCtx, &this->colJntSph); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s") + // If PEAHAT_TYPE_LARVA, decrement total larva spawned + if (this->actor.params > 0) { + parent = (EnPeehat*)this->actor.parent; + if (parent != NULL && parent->actor.update != NULL) { + parent->unk2FA--; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFDAC.s") +void EnPeehat_SpawnDust(GlobalContext* globalCtx, EnPeehat* this, Vec3f* pos, f32 arg3, s32 arg4, f32 arg5, f32 arg6) { + Vec3f dustPos; + Vec3f dustVel = { 0.0f, 8.0f, 0.0f }; + Vec3f dustAccel = { 0.0f, -1.5f, 0.0f }; + f32 rot; // radians + s32 pScale; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s") + rot = (Rand_ZeroOne() - 0.5f) * 6.28f; + dustPos.y = this->actor.floorHeight; + dustPos.x = Math_SinF(rot) * arg3 + pos->x; + dustPos.z = Math_CosF(rot) * arg3 + pos->z; + dustAccel.x = (Rand_ZeroOne() - 0.5f) * arg5; + dustAccel.z = (Rand_ZeroOne() - 0.5f) * arg5; + dustVel.y += (Rand_ZeroOne() - 0.5f) * 4.0f; + pScale = (Rand_ZeroOne() * 5 + 12) * arg6; + EffectSsHahen_Spawn(globalCtx, &dustPos, &dustVel, &dustAccel, arg4, pScale, HAHEN_OBJECT_DEFAULT, 10, NULL); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEF8.s") +/** + * Handles being hit when on the ground + */ +void EnPeehat_HitWhenGrounded(EnPeehat* this, GlobalContext* globalCtx) { + this->colCylinder.base.acFlags &= ~AC_HIT; + if ((globalCtx->gameplayFrames & 0xF) == 0) { + Vec3f itemDropPos = this->actor.world.pos; + itemDropPos.y += 70.0f; + Item_DropCollectibleRandom(globalCtx, &this->actor, &itemDropPos, 0x40); + Item_DropCollectibleRandom(globalCtx, &this->actor, &itemDropPos, 0x40); + Item_DropCollectibleRandom(globalCtx, &this->actor, &itemDropPos, 0x40); + this->unk2D4 = 240; + } else { + s32 i; + this->colCylinder.base.acFlags &= ~AC_HIT; + for (i = MAX_LARVA - this->unk2FA; i > 0; i--) { + Actor* larva = + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_PEEHAT, + Rand_CenteredFloat(25.0f) + this->actor.world.pos.x, + Rand_CenteredFloat(25.0f) + (this->actor.world.pos.y + 50.0f), + Rand_CenteredFloat(25.0f) + this->actor.world.pos.z, 0, 0, 0, PEAHAT_TYPE_LARVA); + if (larva != NULL) { + larva->velocity.y = 6.0f; + larva->shape.rot.y = larva->world.rot.y = Rand_CenteredFloat(0xFFFF); + this->unk2FA++; + } + } + this->unk2D4 = 8; + } + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_DAMAGE); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s") +void EnPeehat_Ground_SetStateGround(EnPeehat* this) { + Animation_Change(&this->skelAnime, &D_060009C4, 0.0f, 3.0f, Animation_GetLastFrame(&D_060009C4), 2, 0.0f); + this->seekPlayerTimer = 600; + this->unk2D4 = 0; + this->unk2FA = 0; + this->state = PEAHAT_STATE_3; + this->colCylinder.base.acFlags &= ~AC_HIT; + EnPeehat_SetupAction(this, EnPeehat_Ground_StateGround); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0118.s") +void EnPeehat_Ground_StateGround(EnPeehat* this, GlobalContext* globalCtx) { + if (gSaveContext.nightFlag == 0) { + this->actor.flags |= 1; + if (this->riseDelayTimer == 0) { + if (this->actor.xzDistToPlayer < this->xzDistToRise) { + EnPeehat_Ground_SetStateRise(this); + } + } else { + Math_SmoothStepToF(&this->actor.shape.yOffset, -1000.0f, 1.0f, 10.0f, 0.0f); + this->riseDelayTimer--; + } + } else { + this->actor.flags &= ~1; + Math_SmoothStepToF(&this->actor.shape.yOffset, -1000.0f, 1.0f, 50.0f, 0.0f); + if (this->unk2D4 != 0) { + this->unk2D4--; + if (this->unk2D4 & 4) { + Math_SmoothStepToF(&this->scaleShift, 0.205f, 1.0f, 0.235f, 0.0f); + } else { + Math_SmoothStepToF(&this->scaleShift, 0.0f, 1.0f, 0.005f, 0.0f); + } + } else if (this->colCylinder.base.acFlags & AC_HIT) { + EnPeehat_HitWhenGrounded(this, globalCtx); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s") +void EnPeehat_Flying_SetStateGround(EnPeehat* this) { + Animation_Change(&this->skelAnime, &D_060009C4, 0.0f, 3.0f, Animation_GetLastFrame(&D_060009C4), 2, 0.0f); + this->seekPlayerTimer = 400; + this->unk2D4 = 0; + this->unk2FA = 0; // @bug: overwrites number of child larva spawned, allowing for more than MAX_LARVA spawns + this->state = PEAHAT_STATE_4; + EnPeehat_SetupAction(this, EnPeehat_Flying_StateGrounded); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD038C.s") +void EnPeehat_Flying_StateGrounded(EnPeehat* this, GlobalContext* globalCtx) { + if (gSaveContext.nightFlag == 0) { + if (this->actor.xzDistToPlayer < this->xzDistToRise) { + EnPeehat_Flying_SetStateRise(this); + } + } else { + Math_SmoothStepToF(&this->actor.shape.yOffset, -1000.0f, 1.0f, 50.0f, 0.0f); + if (this->unk2D4 != 0) { + this->unk2D4--; + if (this->unk2D4 & 4) { + Math_SmoothStepToF(&this->scaleShift, 0.205f, 1.0f, 0.235f, 0.0f); + } else { + Math_SmoothStepToF(&this->scaleShift, 0.0f, 1.0f, 0.005f, 0.0f); + } + } else if (this->colCylinder.base.acFlags & AC_HIT) { + EnPeehat_HitWhenGrounded(this, globalCtx); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s") +void EnPeehat_Flying_SetStateFly(EnPeehat* this) { + Animation_PlayLoop(&this->skelAnime, &D_060005C4); + this->state = PEAHAT_STATE_FLY; + EnPeehat_SetupAction(this, EnPeehat_Flying_StateFly); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD05A8.s") +void EnPeehat_Flying_StateFly(EnPeehat* this, GlobalContext* globalCtx) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG); + SkelAnime_Update(&this->skelAnime); + if ((gSaveContext.nightFlag != 0) || this->xzDistToRise < this->actor.xzDistToPlayer) { + EnPeehat_Flying_SetStateLanding(this); + } else if (this->actor.xzDistToPlayer < this->xzDistMax) { + if (this->unk2FA < MAX_LARVA && (globalCtx->gameplayFrames & 7) == 0) { + Actor* larva = Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_PEEHAT, + Rand_CenteredFloat(25.0f) + this->actor.world.pos.x, + Rand_CenteredFloat(5.0f) + this->actor.world.pos.y, + Rand_CenteredFloat(25.0f) + this->actor.world.pos.z, 0, 0, 0, 1); + if (larva != NULL) { + larva->shape.rot.y = larva->world.rot.y = Rand_CenteredFloat(0xFFFF); + this->unk2FA++; + } + } + } + this->bladeRot += this->bladeRotVel; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s") +void EnPeehat_Ground_SetStateRise(EnPeehat* this) { + f32 lastFrame; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s") + lastFrame = Animation_GetLastFrame(&D_060009C4); + if (this->state != PEAHAT_STATE_STUNNED) { + Animation_Change(&this->skelAnime, &D_060009C4, 0.0f, 3.0f, lastFrame, 2, 0.0f); + } + this->state = PEAHAT_STATE_8; + this->animTimer = lastFrame; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_UP); + EnPeehat_SetupAction(this, EnPeehat_Ground_StateRise); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s") +void EnPeehat_Ground_StateRise(EnPeehat* this, GlobalContext* globalCtx) { + Math_SmoothStepToF(&this->actor.shape.yOffset, 0.0f, 1.0f, 50.0f, 0.0f); + if (Math_SmoothStepToS(&this->bladeRotVel, 4000, 1, 800, 0) == 0) { + if (this->animTimer != 0) { + this->animTimer--; + if (this->skelAnime.playSpeed == 0.0f) { + if (this->animTimer == 0) { + this->animTimer = 40; + this->skelAnime.playSpeed = 1.0f; + } + } + } + if (SkelAnime_Update(&this->skelAnime) || this->animTimer == 0) { + EnPeehat_Ground_SetStateHover(this); + } else { + this->actor.world.pos.y += 6.5f; + } + if (this->actor.world.pos.y - this->actor.floorHeight < 80.0f) { + Vec3f pos = this->actor.world.pos; + pos.y = this->actor.floorHeight; + func_80033480(globalCtx, &pos, 90.0f, 1, 0x96, 100, 1); + } + } + EnPeehat_SpawnDust(globalCtx, this, &this->actor.world.pos, 75.0f, 2, 1.05f, 2.0f); + Math_SmoothStepToF(&this->scaleShift, 0.075f, 1.0f, 0.005f, 0.0f); + this->bladeRot += this->bladeRotVel; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B84.s") +void EnPeehat_Flying_SetStateRise(EnPeehat* this) { + f32 lastFrame; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s") + lastFrame = Animation_GetLastFrame(&D_060009C4); + if (this->state != PEAHAT_STATE_STUNNED) { + Animation_Change(&this->skelAnime, &D_060009C4, 0.0f, 3.0f, lastFrame, 2, 0.0f); + } + this->state = PEAHAT_STATE_9; + this->animTimer = lastFrame; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_UP); + EnPeehat_SetupAction(this, EnPeehat_Flying_StateRise); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D84.s") +void EnPeehat_Flying_StateRise(EnPeehat* this, GlobalContext* globalCtx) { + Math_SmoothStepToF(&this->actor.shape.yOffset, 0.0f, 1.0f, 50.0f, 0.0f); + if (Math_SmoothStepToS(&this->bladeRotVel, 4000, 1, 800, 0) == 0) { + if (this->animTimer != 0) { + this->animTimer--; + if (this->skelAnime.playSpeed == 0.0f) { + if (this->animTimer == 0) { + this->animTimer = 40; + this->skelAnime.playSpeed = 1.0f; + } + } + } + if (SkelAnime_Update(&this->skelAnime) || this->animTimer == 0) { + this->unk2FA = 0; // @bug: overwrites number of child larva spawned, allowing for more than MAX_LARVA spawns + EnPeehat_Flying_SetStateFly(this); + } else { + this->actor.world.pos.y += 18.0f; + } + if (this->actor.world.pos.y - this->actor.floorHeight < 80.0f) { + Vec3f pos = this->actor.world.pos; + pos.y = this->actor.floorHeight; + func_80033480(globalCtx, &pos, 90.0f, 1, 0x96, 100, 1); + } + } + EnPeehat_SpawnDust(globalCtx, this, &this->actor.world.pos, 75.0f, 2, 1.05f, 2.0f); + Math_SmoothStepToF(&this->scaleShift, 0.075f, 1.0f, 0.005f, 0.0f); + this->bladeRot += this->bladeRotVel; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s") +void EnPeehat_Ground_SetStateSeekPlayer(EnPeehat* this) { + Animation_PlayLoop(&this->skelAnime, &D_060005C4); + this->state = PEAHAT_STATE_SEEK_PLAYER; + this->unk2E0 = 0.0f; + EnPeehat_SetupAction(this, EnPeehat_Ground_StateSeekPlayer); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0FC8.s") +void EnPeehat_Ground_StateSeekPlayer(EnPeehat* this, GlobalContext* globalCtx) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1220.s") + Math_SmoothStepToF(&this->actor.speedXZ, 3.0f, 1.0f, 0.25f, 0.0f); + Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.floorHeight + 80.0f, 1.0f, 3.0f, 0.0f); + if (this->seekPlayerTimer <= 0) { + EnPeehat_Ground_SetStateLanding(this); + this->riseDelayTimer = 40; + } else { + this->seekPlayerTimer--; + } + if ((gSaveContext.nightFlag == 0) && + (Math_Vec3f_DistXZ(&this->actor.home.pos, &player->actor.world.pos) < this->xzDistMax)) { + Math_SmoothStepToS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 1, 1000, 0); + if (this->unk2FA != 0) { + this->actor.shape.rot.y += 0x1C2; + } else { + this->actor.shape.rot.y -= 0x1C2; + } + } else { + EnPeehat_Ground_SetStateReturnHome(this); + } + SkelAnime_Update(&this->skelAnime); + Math_SmoothStepToS(&this->bladeRotVel, 4000, 1, 500, 0); + this->bladeRot += this->bladeRotVel; + Math_SmoothStepToF(&this->scaleShift, 0.075f, 1.0f, 0.005f, 0.0f); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1258.s") +void EnPeehat_Larva_SetStateSeekPlayer(EnPeehat* this) { + Animation_PlayLoop(&this->skelAnime, &D_060005C4); + this->state = PEAHAT_STATE_SEEK_PLAYER; + this->unk2D4 = 0; + EnPeehat_SetupAction(this, EnPeehat_Larva_StateSeekPlayer); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s") +void EnPeehat_Larva_StateSeekPlayer(EnPeehat* this, GlobalContext* globalCtx) { + f32 speedXZ = 5.3f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s") + if (this->actor.xzDistToPlayer <= 5.3f) { + speedXZ = this->actor.xzDistToPlayer + 0.0005f; + } + if (this->actor.parent != NULL && this->actor.parent->update == NULL) { + this->actor.parent = NULL; + } + this->actor.speedXZ = speedXZ; + if (this->actor.world.pos.y - this->actor.floorHeight >= 70.0f) { + Math_SmoothStepToF(&this->actor.velocity.y, -1.3f, 1.0f, 0.5f, 0.0f); + } else { + Math_SmoothStepToF(&this->actor.velocity.y, -0.135f, 1.0f, 0.05f, 0.0f); + } + if (this->unk2D4 == 0) { + Math_SmoothStepToS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 1, 830, 0); + } else { + this->unk2D4--; + } + this->actor.shape.rot.y += 0x15E; + SkelAnime_Update(&this->skelAnime); + Math_SmoothStepToS(&this->bladeRotVel, 4000, 1, 500, 0); + this->bladeRot += this->bladeRotVel; + Math_SmoothStepToF(&this->scaleShift, 0.075f, 1.0f, 0.005f, 0.0f); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_SM_FLY - SFX_FLAG); + if (this->colQuad.base.atFlags & AT_BOUNCED) { + this->actor.colChkInfo.health = 0; + this->colQuad.base.acFlags = this->colQuad.base.acFlags & ~AC_BOUNCED; + EnPeehat_SetStateAttackRecoil(this); + } else if ((this->colQuad.base.atFlags & AT_HIT) || (this->colCylinder.base.acFlags & AC_HIT) || + (this->actor.bgCheckFlags & 1)) { + Player* player = PLAYER; + this->colQuad.base.atFlags &= ~AT_HIT; + if (!(this->colCylinder.base.acFlags & AC_HIT) && &player->actor == this->colQuad.base.at) { + if (Rand_ZeroOne() > 0.5f) { + this->actor.world.rot.y += 0x2000; + } else { + this->actor.world.rot.y -= 0x2000; + } + this->unk2D4 = 40; + } else if (this->colCylinder.base.acFlags & AC_HIT || this->actor.bgCheckFlags & 1) { + Vec3f zeroVec = { 0, 0, 0 }; + s32 i; + for (i = 4; i >= 0; i--) { + Vec3f pos; + pos.x = Rand_CenteredFloat(20.0f) + this->actor.world.pos.x; + pos.y = Rand_CenteredFloat(10.0f) + this->actor.world.pos.y; + pos.z = Rand_CenteredFloat(20.0f) + this->actor.world.pos.z; + EffectSsDeadDb_Spawn(globalCtx, &pos, &zeroVec, &zeroVec, 40, 7, 255, 255, 255, 255, 255, 0, 0, 1, 9, + 1); + } + } + if (&player->actor != this->colQuad.base.at || this->colCylinder.base.acFlags & AC_HIT) { + if (!(this->actor.bgCheckFlags & 1)) { + EffectSsDeadSound_SpawnStationary(globalCtx, &this->actor.projectedPos, NA_SE_EN_PIHAT_SM_DEAD, 1, 1, + 40); + } + Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0x20); + Actor_Kill(&this->actor); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD167C.s") +void EnPeehat_Ground_SetStateLanding(EnPeehat* this) { + this->state = PEAHAT_STATE_LANDING; + Animation_PlayOnce(&this->skelAnime, &D_06000350); + EnPeehat_SetupAction(this, EnPeehat_Ground_StateLanding); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1700.s") +void EnPeehat_Ground_StateLanding(EnPeehat* this, GlobalContext* globalCtx) { + Math_SmoothStepToF(&this->actor.shape.yOffset, -1000.0f, 1.0f, 50.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); + Math_SmoothStepToS(&this->actor.shape.rot.x, 0, 1, 50, 0); + if (SkelAnime_Update(&this->skelAnime)) { + EnPeehat_Ground_SetStateGround(this); + this->actor.world.pos.y = this->actor.floorHeight; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_LAND); + } else if (this->actor.floorHeight < this->actor.world.pos.y) { + Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.floorHeight, 0.3f, 3.5f, 0.25f); + if (this->actor.world.pos.y - this->actor.floorHeight < 60.0f) { + Vec3f pos = this->actor.world.pos; + pos.y = this->actor.floorHeight; + func_80033480(globalCtx, &pos, 80.0f, 1, 150, 100, 1); + EnPeehat_SpawnDust(globalCtx, this, &pos, 75.0f, 2, 1.05f, 2.0f); + } + } + Math_SmoothStepToS(&this->bladeRotVel, 0, 1, 100, 0); + this->bladeRot += this->bladeRotVel; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD177C.s") +void EnPeehat_Flying_SetStateLanding(EnPeehat* this) { + Animation_PlayOnce(&this->skelAnime, &D_06000350); + this->state = PEAHAT_STATE_LANDING; + EnPeehat_SetupAction(this, EnPeehat_Flying_StateLanding); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s") +void EnPeehat_Flying_StateLanding(EnPeehat* this, GlobalContext* globalCtx) { + Math_SmoothStepToF(&this->actor.shape.yOffset, -1000.0f, 1.0f, 50.0f, 0.0f); + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); + Math_SmoothStepToS(&this->actor.shape.rot.x, 0, 1, 50, 0); + if (SkelAnime_Update(&this->skelAnime)) { + EnPeehat_Flying_SetStateGround(this); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_LAND); + this->actor.world.pos.y = this->actor.floorHeight; + } else if (this->actor.floorHeight < this->actor.world.pos.y) { + Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.floorHeight, 0.3f, 13.5f, 0.25f); + if (this->actor.world.pos.y - this->actor.floorHeight < 60.0f) { + Vec3f pos = this->actor.world.pos; + pos.y = this->actor.floorHeight; + func_80033480(globalCtx, &pos, 80.0f, 1, 150, 100, 1); + EnPeehat_SpawnDust(globalCtx, this, &pos, 75.0f, 2, 1.05f, 2.0f); + } + } + Math_SmoothStepToS(&this->bladeRotVel, 0, 1, 100, 0); + this->bladeRot += this->bladeRotVel; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s") +void EnPeehat_Ground_SetStateHover(EnPeehat* this) { + Animation_PlayLoop(&this->skelAnime, &D_060005C4); + this->actor.speedXZ = Rand_ZeroOne() * 0.5f + 2.5f; + this->unk2D4 = Rand_ZeroOne() * 10 + 10; + this->state = PEAHAT_STATE_15; + EnPeehat_SetupAction(this, EnPeehat_Ground_StateHover); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1B00.s") +void EnPeehat_Ground_StateHover(EnPeehat* this, GlobalContext* globalCtx) { + f32 cos; + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s") + // hover but don't gain altitude + if (this->actor.world.pos.y - this->actor.floorHeight > 75.0f) { + this->actor.world.pos.y -= 1.0f; + } + this->actor.world.pos.y += Math_CosF(this->unk2E0) * 1.4f; + cos = Math_CosF(this->unk2E0) * 0.18f; + this->unk2E0 += ((0.0f <= cos) ? cos : -cos) + 0.07f; + this->unk2D4--; + if (this->unk2D4 <= 0) { + this->actor.speedXZ = Rand_ZeroOne() * 0.5f + 2.5f; + this->unk2D4 = Rand_ZeroOne() * 10.0f + 10.0f; + this->unk2F4 = (Rand_ZeroOne() - 0.5f) * 1000.0f; + } + SkelAnime_Update(&this->skelAnime); + this->actor.world.rot.y += this->unk2F4; + if (this->seekPlayerTimer <= 0) { + EnPeehat_Ground_SetStateLanding(this); + this->riseDelayTimer = 40; + } else { + this->seekPlayerTimer--; + } + this->actor.shape.rot.y += 0x15E; + // if daytime, and the player is close to the initial spawn position + if ((gSaveContext.nightFlag == 0) && + Math_Vec3f_DistXZ(&this->actor.home.pos, &player->actor.world.pos) < this->xzDistMax) { + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + EnPeehat_Ground_SetStateSeekPlayer(this); + this->unk2FA = globalCtx->gameplayFrames & 1; + } else { + EnPeehat_Ground_SetStateReturnHome(this); + } + Math_SmoothStepToS(&this->bladeRotVel, 4000, 1, 500, 0); + this->bladeRot += this->bladeRotVel; + Math_SmoothStepToF(&this->scaleShift, 0.075f, 1.0f, 0.005f, 0.0f); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Update.s") +void EnPeehat_Ground_SetStateReturnHome(EnPeehat* this) { + this->state = PEAHAT_STATE_RETURN_HOME; + this->actor.speedXZ = 2.5f; + EnPeehat_SetupAction(this, EnPeehat_Ground_StateReturnHome); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s") +void EnPeehat_Ground_StateReturnHome(EnPeehat* this, GlobalContext* globalCtx) { + f32 cos; + s16 yRot; + Player* player; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s") + player = PLAYER; + if (this->actor.world.pos.y - this->actor.floorHeight > 75.0f) { + this->actor.world.pos.y -= 1.0f; + } else { + this->actor.world.pos.y += 1.0f; + } + this->actor.world.pos.y += Math_CosF(this->unk2E0) * 1.4f; + cos = Math_CosF(this->unk2E0) * 0.18f; + this->unk2E0 += ((0.0f <= cos) ? cos : -cos) + 0.07f; + yRot = Math_Vec3f_Yaw(&this->actor.world.pos, &this->actor.home.pos); + Math_SmoothStepToS(&this->actor.world.rot.y, yRot, 1, 600, 0); + Math_SmoothStepToS(&this->actor.shape.rot.x, 4500, 1, 600, 0); + this->actor.shape.rot.y += 0x15E; + this->bladeRot += this->bladeRotVel; + if (Math_Vec3f_DistXZ(&this->actor.world.pos, &this->actor.home.pos) < 2.0f) { + EnPeehat_Ground_SetStateLanding(this); + this->riseDelayTimer = 60; + } + if (gSaveContext.nightFlag == 0 && + Math_Vec3f_DistXZ(&this->actor.home.pos, &player->actor.world.pos) < this->xzDistMax) { + this->seekPlayerTimer = 400; + EnPeehat_Ground_SetStateSeekPlayer(this); + this->unk2FA = (globalCtx->gameplayFrames & 1); + } + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Peehat/EnPeehat_Draw.s") +void EnPeehat_SetStateAttackRecoil(EnPeehat* this) { + Animation_MorphToPlayOnce(&this->skelAnime, &D_06000844, -4.0f); + this->state = PEAHAT_STATE_ATTACK_RECOIL; + this->actor.speedXZ = -9.0f; + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + EnPeehat_SetupAction(this, EnPeehat_StateAttackRecoil); +} + +void EnPeehat_StateAttackRecoil(EnPeehat* this, GlobalContext* globalCtx) { + this->bladeRot += this->bladeRotVel; + SkelAnime_Update(&this->skelAnime); + this->actor.speedXZ += 0.5f; + if (this->actor.speedXZ == 0.0f) { + // Is PEAHAT_TYPE_LARVA + if (this->actor.params > 0) { + Vec3f zeroVec = { 0, 0, 0 }; + s32 i; + for (i = 4; i >= 0; i--) { + Vec3f pos; + pos.x = Rand_CenteredFloat(20.0f) + this->actor.world.pos.x; + pos.y = Rand_CenteredFloat(10.0f) + this->actor.world.pos.y; + pos.z = Rand_CenteredFloat(20.0f) + this->actor.world.pos.z; + EffectSsDeadDb_Spawn(globalCtx, &pos, &zeroVec, &zeroVec, 40, 7, 255, 255, 255, 255, 255, 0, 0, 1, 9, + 1); + } + Actor_Kill(&this->actor); + } else { + EnPeehat_Ground_SetStateSeekPlayer(this); + // Is PEAHAT_TYPE_GROUNDED + if (this->actor.params < 0) { + this->unk2FA = (this->unk2FA != 0) ? 0 : 1; + } + } + } + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_FLY - SFX_FLAG); +} + +void EnPeehat_SetStateBoomerangStunned(EnPeehat* this) { + this->state = PEAHAT_STATE_STUNNED; + if (this->actor.floorHeight < this->actor.world.pos.y) { + this->actor.speedXZ = -9.0f; + } + this->bladeRotVel = 0; + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + Actor_SetColorFilter(&this->actor, 0, 200, 0, 80); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); + EnPeehat_SetupAction(this, EnPeehat_StateBoomerangStunned); +} + +void EnPeehat_StateBoomerangStunned(EnPeehat* this, GlobalContext* globalCtx) { + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); + Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.floorHeight, 1.0f, 8.0f, 0.0f); + if (this->actor.colorFilterTimer == 0) { + EnPeehat_Ground_SetStateRise(this); + } +} + +void EnPeehat_Adult_SetStateDie(EnPeehat* this) { + this->bladeRotVel = 0; + this->isStateDieFirstUpdate = 1; + this->actor.speedXZ = 0.0f; + Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8); + this->state = PEAHAT_STATE_DYING; + this->scaleShift = 0.0f; + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + EnPeehat_SetupAction(this, EnPeehat_Adult_StateDie); +} + +void EnPeehat_Adult_StateDie(EnPeehat* this, GlobalContext* globalCtx) { + if (this->isStateDieFirstUpdate) { + this->unk2D4--; + if (this->unk2D4 <= 0 || this->actor.colChkInfo.health == 0) { + Animation_MorphToPlayOnce(&this->skelAnime, &D_06000844, -4.0f); + this->bladeRotVel = 4000; + this->unk2D4 = 14; + this->actor.speedXZ = 0; + this->actor.velocity.y = 6; + this->isStateDieFirstUpdate = 0; + this->actor.shape.rot.z = this->actor.shape.rot.x = 0; + } else if (this->actor.colorFilterTimer & 4) { + Math_SmoothStepToF(&this->scaleShift, 0.205f, 1.0f, 0.235f, 0); + } else { + Math_SmoothStepToF(&this->scaleShift, 0, 1.0f, 0.005f, 0); + } + } else { + SkelAnime_Update(&this->skelAnime); + this->bladeRot += this->bladeRotVel; + Math_SmoothStepToS(&this->bladeRotVel, 4000, 1, 250, 0); + if (this->actor.colChkInfo.health == 0) { + this->actor.scale.x -= 0.0015f; + Actor_SetScale(&this->actor, this->actor.scale.x); + } + if (Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.floorHeight + 88.5f, 1.0f, 3.0f, 0.0f) == 0.0f && + this->actor.world.pos.y - this->actor.floorHeight < 59.0f) { + Vec3f pos = this->actor.world.pos; + pos.y = this->actor.floorHeight; + func_80033480(globalCtx, &pos, 80.0f, 1, 150, 100, 1); + EnPeehat_SpawnDust(globalCtx, this, &pos, 75.0f, 2, 1.05f, 2.0f); + } + if (this->actor.speedXZ < 0) { + this->actor.speedXZ += 0.25f; + } + this->unk2D4--; + if (this->unk2D4 <= 0) { + if (this->actor.colChkInfo.health == 0) { + EnPeehat_SetStateExplode(this); + // if PEAHAT_TYPE_GROUNDED + } else if (this->actor.params < 0) { + EnPeehat_Ground_SetStateHover(this); + this->riseDelayTimer = 60; + } else { + EnPeehat_Flying_SetStateFly(this); + } + } + } +} + +void EnPeehat_SetStateExplode(EnPeehat* this) { + Animation_PlayLoop(&this->skelAnime, &D_060005C4); + this->state = PEAHAT_STATE_EXPLODE; + this->animTimer = 5; + this->unk2E0 = 0.0f; + EnPeehat_SetupAction(this, &EnPeehat_StateExplode); +} + +void EnPeehat_StateExplode(EnPeehat* this, GlobalContext* globalCtx) { + EnBom* bomb; + s32 pad[2]; + + if (this->animTimer == 5) { + bomb = (EnBom*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOM, this->actor.world.pos.x, + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0x602, 0); + if (bomb != NULL) { + bomb->timer = 0; + } + } + this->animTimer--; + if (this->animTimer == 0) { + Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0x40); + Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0x40); + Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0x40); + Actor_Kill(&this->actor); + } +} + +void EnPeehat_Adult_CollisionCheck(EnPeehat* this, GlobalContext* globalCtx) { + if ((this->colCylinder.base.acFlags & AC_BOUNCED) || (this->colQuad.base.acFlags & AC_BOUNCED)) { + this->colQuad.base.acFlags &= ~AC_BOUNCED; + this->colCylinder.base.acFlags &= ~AC_BOUNCED; + this->colJntSph.base.acFlags &= ~AC_HIT; + } else if (this->colJntSph.base.acFlags & AC_HIT) { + this->colJntSph.base.acFlags &= ~AC_HIT; + func_8003573C(&this->actor, &this->colJntSph, 1); + if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_NUT || + this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) { + return; + } + if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_HOOKSHOT) { + this->actor.colChkInfo.health = 0; + } else if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_BOOMERANG) { + if (this->state != PEAHAT_STATE_STUNNED) { + EnPeehat_SetStateBoomerangStunned(this); + } + return; + } else { + Actor_ApplyDamage(&this->actor); + Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 8); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PIHAT_DAMAGE); + } + + if (this->actor.colChkInfo.damageEffect == PEAHAT_DMG_EFF_FIRE) { + Vec3f pos; + s32 i; + for (i = 4; i >= 0; i--) { + pos.x = Rand_CenteredFloat(20.0f) + this->actor.world.pos.x; + pos.y = Rand_ZeroOne() * 25.0f + this->actor.world.pos.y; + pos.z = Rand_CenteredFloat(20.0f) + this->actor.world.pos.z; + EffectSsEnFire_SpawnVec3f(globalCtx, &this->actor, &pos, 70, 0, 0, -1); + } + Actor_SetColorFilter(&this->actor, 0x4000, 200, 0, 100); + } + if (this->actor.colChkInfo.health == 0) { + EnPeehat_Adult_SetStateDie(this); + } + } +} + +void EnPeehat_Update(Actor* thisx, GlobalContext* globalCtx) { + EnPeehat* this = THIS; + s32 i; + Player* player = PLAYER; + + // If Adult Peahat + if (thisx->params <= 0) { + EnPeehat_Adult_CollisionCheck(this, globalCtx); + } + if (thisx->colChkInfo.damageEffect != PEAHAT_DMG_EFF_LIGHT_ICE_ARROW) { + if (thisx->speedXZ != 0.0f || thisx->velocity.y != 0.0f) { + Actor_MoveForward(thisx); + Actor_UpdateBgCheckInfo(globalCtx, thisx, 25.0f, 30.0f, 30.0f, 5); + } + + this->actionFunc(this, globalCtx); + if ((globalCtx->gameplayFrames & 0x7F) == 0) { + this->jiggleRotInc = (Rand_ZeroOne() * 0.25f) + 0.5f; + } + this->jiggleRot += this->jiggleRotInc; + } + // if PEAHAT_TYPE_GROUNDED + if (thisx->params < 0) { + // Set the Z-Target point on the Peahat's weak point + thisx->focus.pos.x = this->colJntSph.elements[0].dim.worldSphere.center.x; + thisx->focus.pos.y = this->colJntSph.elements[0].dim.worldSphere.center.y; + thisx->focus.pos.z = this->colJntSph.elements[0].dim.worldSphere.center.z; + if (this->state == PEAHAT_STATE_SEEK_PLAYER) { + Math_SmoothStepToS(&thisx->shape.rot.x, 6000, 1, 300, 0); + } else { + Math_SmoothStepToS(&thisx->shape.rot.x, 0, 1, 300, 0); + } + } else { + thisx->focus.pos = thisx->world.pos; + } + Collider_UpdateCylinder(thisx, &this->colCylinder); + if (thisx->colChkInfo.health > 0) { + // If Adult Peahat + if (thisx->params <= 0) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colCylinder.base); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colJntSph.base); + if (thisx->colorFilterTimer == 0 || !(thisx->colorFilterParams & 0x4000)) { + if (this->state != PEAHAT_STATE_EXPLODE) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colJntSph.base); + } + } + } + if (thisx->params != PEAHAT_TYPE_FLYING && this->colQuad.base.atFlags & AT_HIT) { + this->colQuad.base.atFlags &= ~AT_HIT; + if (&player->actor == this->colQuad.base.at) { + EnPeehat_SetStateAttackRecoil(this); + } + } + } + if (this->state == PEAHAT_STATE_15 || this->state == PEAHAT_STATE_SEEK_PLAYER || this->state == PEAHAT_STATE_FLY || + this->state == PEAHAT_STATE_RETURN_HOME || this->state == PEAHAT_STATE_EXPLODE) { + if (thisx->params != PEAHAT_TYPE_FLYING) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->colQuad.base); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colQuad.base); + } + // if PEAHAT_TYPE_GROUNDED + if (thisx->params < 0 && (thisx->flags & 0x40)) { + for (i = 1; i >= 0; i--) { + Vec3f posResult; + CollisionPoly* poly = NULL; + s32 bgId; + Vec3f* posB = &this->bladeTip[i]; + + if (BgCheck_EntityLineTest1(&globalCtx->colCtx, &thisx->world.pos, posB, &posResult, &poly, true, true, + false, true, &bgId) == true) { + func_80033480(globalCtx, &posResult, 0.0f, 1, 300, 150, 1); + EnPeehat_SpawnDust(globalCtx, this, &posResult, 0.0f, 3, 1.05f, 1.5f); + } + } + } else if (thisx->params != PEAHAT_TYPE_FLYING) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colCylinder.base); + } + } else { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colCylinder.base); + } + Math_SmoothStepToF(&this->scaleShift, 0.0f, 1.0f, 0.001f, 0.0f); +} + +s32 EnPeehat_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx) { + EnPeehat* this = THIS; + + if (limbIndex == 4) { + rot->x = -this->bladeRot; + } + if (limbIndex == 3 || (limbIndex == 23 && (this->state == PEAHAT_STATE_DYING || this->state == PEAHAT_STATE_3 || + this->state == PEAHAT_STATE_4))) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1946); + Matrix_Push(); + Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); + Matrix_RotateX(this->jiggleRot * 0.115f, MTXMODE_APPLY); + Matrix_RotateY(this->jiggleRot * 0.13f, MTXMODE_APPLY); + Matrix_RotateZ(this->jiggleRot * 0.1f, MTXMODE_APPLY); + Matrix_Scale(1.0f - this->scaleShift, this->scaleShift + 1.0f, 1.0f - this->scaleShift, MTXMODE_APPLY); + Matrix_RotateZ(-(this->jiggleRot * 0.1f), MTXMODE_APPLY); + Matrix_RotateY(-(this->jiggleRot * 0.13f), MTXMODE_APPLY); + Matrix_RotateX(-(this->jiggleRot * 0.115f), MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1959), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, *dList); + Matrix_Pull(); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1963); + return true; + } + return false; +} + +void EnPeehat_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + static Vec3f peahatBladeTip[] = { { 0.0f, 0.0f, 5500.0f }, { 0.0f, 0.0f, -5500.0f } }; + + EnPeehat* this = THIS; + f32 damageYRot; + + if (limbIndex == 4) { + Matrix_MultVec3f(&peahatBladeTip[0], &this->bladeTip[0]); + Matrix_MultVec3f(&peahatBladeTip[1], &this->bladeTip[1]); + return; + } + // is Adult Peahat + if (limbIndex == 3 && this->actor.params <= 0) { + damageYRot = 0.0f; + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1981); + Matrix_Push(); + Matrix_Translate(-1000.0f, 0.0f, 0.0f, MTXMODE_APPLY); + Collider_UpdateSpheres(0, &this->colJntSph); + Matrix_Translate(500.0f, 0.0f, 0.0f, MTXMODE_APPLY); + if (this->actor.colorFilterTimer != 0 && (this->actor.colorFilterParams & 0x4000)) { + damageYRot = Math_SinS(this->actor.colorFilterTimer * 0x4E20) * 0.35f; + } + Matrix_RotateY(3.2f + damageYRot, MTXMODE_APPLY); + Matrix_Scale(0.3f, 0.2f, 0.2f, MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1990), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, *dList); + Matrix_Pull(); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1994); + } +} + +void EnPeehat_Draw(Actor* thisx, GlobalContext* globalCtx) { + static Vec3f D_80AD285C[] = { + { 0.0f, 0.0f, -4500.0f }, { -4500.0f, 0.0f, 0.0f }, { 4500.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 4500.0f } + }; + EnPeehat* this = THIS; + + func_80093D18(globalCtx->state.gfxCtx); + SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnPeehat_OverrideLimbDraw, + EnPeehat_PostLimbDraw, this); + if (this->actor.speedXZ != 0.0f || this->actor.velocity.y != 0.0f) { + Matrix_MultVec3f(&D_80AD285C[0], &this->colQuad.dim.quad[1]); + Matrix_MultVec3f(&D_80AD285C[1], &this->colQuad.dim.quad[0]); + Matrix_MultVec3f(&D_80AD285C[2], &this->colQuad.dim.quad[3]); + Matrix_MultVec3f(&D_80AD285C[3], &this->colQuad.dim.quad[2]); + Collider_SetQuadVertices(&this->colQuad, &this->colQuad.dim.quad[0], &this->colQuad.dim.quad[1], + &this->colQuad.dim.quad[2], &this->colQuad.dim.quad[3]); + } +} diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h index c2dc45ddd2..c04c61ea36 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h @@ -4,11 +4,44 @@ #include "ultra64.h" #include "global.h" +typedef enum { + /* -1 */ PEAHAT_TYPE_GROUNDED = -1, + /* 0 */ PEAHAT_TYPE_FLYING = 0, + /* 1 */ PEAHAT_TYPE_LARVA = 1 +} PeahatType; + struct EnPeehat; +typedef void (*EnPeehatActionFunc)(struct EnPeehat*, GlobalContext*); + typedef struct EnPeehat { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x2E0]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s jointTable[24]; + /* 0x0220 */ Vec3s morphTable[24]; + /* 0x02B0 */ s32 state; + /* 0x02B4 */ s32 isStateDieFirstUpdate; + /* 0x02B8 */ EnPeehatActionFunc actionFunc; + /* 0x02BC */ Vec3f bladeTip[2]; // used to simulate the peahat's blades "digging up" earth + /* 0x02D4 */ s32 unk2D4; + /* 0x02D8 */ f32 xzDistMax; // max xz dist to follow Link (PEAHAT_TYPE_GROUNDED) or spawn larva (PEAHAT_TYPE_FLYING) + /* 0x02DC */ f32 xzDistToRise; // xz dist needed to rise from the ground + /* 0x02E0 */ f32 unk2E0; // rot? + /* 0x02E4 */ f32 jiggleRot; + /* 0x02E8 */ f32 jiggleRotInc; + /* 0x02EC */ f32 scaleShift; // 0.0f for no distortion. used for "jiggle" effect when stabbed on ground + /* 0x02F0 */ s16 bladeRotVel; // spinning blades rotational velocity + /* 0x02F2 */ s16 bladeRot; // spinning blades rotation component + /* 0x02F4 */ s16 unk2F4; + /* 0x02F6 */ s16 riseDelayTimer; // countdown timer until peahat is allowed to rise up from the ground + /* 0x02F8 */ s16 seekPlayerTimer; // number of frames the peahat should seek the player before landing to rest + /* 0x02FA */ s16 unk2FA; // larva count (PEAHAT_TYPE_FLYING, PEAHAT_TYPE_GROUNDED), + // shape rotation direction (PEAHAT_TYPE_GROUNDED) + /* 0x02FC */ s16 animTimer; + /* 0x0300 */ ColliderCylinder colCylinder; + /* 0x034C */ ColliderJntSph colJntSph; + /* 0x036C */ ColliderJntSphElement colJntSphItemList[1]; + /* 0x03AC */ ColliderQuad colQuad; } EnPeehat; // size = 0x042C extern const ActorInit En_Peehat_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index a0c359710a..6a7f7dde25 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -2720,3 +2720,10 @@ D_06000B30 = 0x06000B30; D_060041A8 = 0x060041A8; D_060009A0 = 0x060009A0; D_06004404 = 0x06004404; + +// z_en_peehat +D_06001C80 = 0x06001C80; +D_060009C4 = 0x060009C4; +D_06000844 = 0x06000844; +D_060005C4 = 0x060005C4; +D_06000350 = 0x06000350;