diff options
| author | gamestabled <55638330+gamestabled@users.noreply.github.com> | 2020-05-24 04:30:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-24 04:30:24 -0400 |
| commit | 13b1dc03bb2f26291c68e7d19e4e42625d3a2ec2 (patch) | |
| tree | 2e1c59d139e7e9e0c80942b672dc65ab62507d71 | |
| parent | e6b00f03bfbb71c18d662316368e18a7f18983c4 (diff) | |
EnHintnuts OK (#154)
* merged from upstream
* matching
* named functions
* made suggested changes
35 files changed, 553 insertions, 1833 deletions
diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Destroy.s deleted file mode 100644 index d19a5383a..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel EnHintnuts_Destroy -/* 0019C 80A5739C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001A0 80A573A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001A4 80A573A4 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 001A8 80A573A8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 001AC 80A573AC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 001B0 80A573B0 11C10003 */ beq $t6, $at, .L80A573C0 -/* 001B4 80A573B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001B8 80A573B8 0C0170EB */ jal Collider_DestroyCylinder - -/* 001BC 80A573BC 24C50214 */ addiu $a1, $a2, 0x0214 ## $a1 = 00000214 -.L80A573C0: -/* 001C0 80A573C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001C4 80A573C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001C8 80A573C8 03E00008 */ jr $ra -/* 001CC 80A573CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s deleted file mode 100644 index 55f5193f8..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel EnHintnuts_Draw -/* 01770 80A58970 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01774 80A58974 AFBF001C */ sw $ra, 0x001C($sp) -/* 01778 80A58978 AFA40020 */ sw $a0, 0x0020($sp) -/* 0177C 80A5897C AFA50024 */ sw $a1, 0x0024($sp) -/* 01780 80A58980 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 01784 80A58984 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01788 80A58988 8FA40024 */ lw $a0, 0x0024($sp) -/* 0178C 80A5898C 15E10007 */ bne $t7, $at, .L80A589AC -/* 01790 80A58990 8FB80020 */ lw $t8, 0x0020($sp) -/* 01794 80A58994 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01798 80A58998 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0179C 80A5899C 0C00D498 */ jal Gfx_DrawDListOpa - -/* 017A0 80A589A0 24A514E0 */ addiu $a1, $a1, 0x14E0 ## $a1 = 060014E0 -/* 017A4 80A589A4 10000009 */ beq $zero, $zero, .L80A589CC -/* 017A8 80A589A8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A589AC: -/* 017AC 80A589AC 8F050150 */ lw $a1, 0x0150($t8) ## 00000150 -/* 017B0 80A589B0 8F06016C */ lw $a2, 0x016C($t8) ## 0000016C -/* 017B4 80A589B4 3C0780A6 */ lui $a3, %hi(func_80A58838) ## $a3 = 80A60000 -/* 017B8 80A589B8 24E78838 */ addiu $a3, $a3, %lo(func_80A58838) ## $a3 = 80A58838 -/* 017BC 80A589BC AFB80014 */ sw $t8, 0x0014($sp) -/* 017C0 80A589C0 0C028572 */ jal SkelAnime_Draw - -/* 017C4 80A589C4 AFA00010 */ sw $zero, 0x0010($sp) -/* 017C8 80A589C8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A589CC: -/* 017CC 80A589CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 017D0 80A589D0 03E00008 */ jr $ra -/* 017D4 80A589D4 00000000 */ nop -/* 017D8 80A589D8 00000000 */ nop -/* 017DC 80A589DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s deleted file mode 100644 index 58efe2c71..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s +++ /dev/null @@ -1,117 +0,0 @@ -glabel EnHintnuts_Init -/* 00000 80A57200 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 80A57204 AFB10038 */ sw $s1, 0x0038($sp) -/* 00008 80A57208 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 80A5720C AFBF003C */ sw $ra, 0x003C($sp) -/* 00010 80A57210 AFB00034 */ sw $s0, 0x0034($sp) -/* 00014 80A57214 3C0580A6 */ lui $a1, %hi(D_80A58A38) ## $a1 = 80A60000 -/* 00018 80A57218 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 80A5721C 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 80A57220 24A58A38 */ addiu $a1, $a1, %lo(D_80A58A38) ## $a1 = 80A58A38 -/* 00024 80A57224 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00028 80A57228 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0002C 80A5722C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00030 80A57230 15C10006 */ bne $t6, $at, .L80A5724C -/* 00034 80A57234 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00038 80A57238 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 0003C 80A5723C 2401FFFA */ addiu $at, $zero, 0xFFFA ## $at = FFFFFFFA -/* 00040 80A57240 01E1C024 */ and $t8, $t7, $at -/* 00044 80A57244 10000050 */ beq $zero, $zero, .L80A57388 -/* 00048 80A57248 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -.L80A5724C: -/* 0004C 80A5724C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00050 80A57250 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00054 80A57254 0C00AC78 */ jal ActorShape_Init - -/* 00058 80A57258 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 -/* 0005C 80A5725C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00060 80A57260 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00064 80A57264 2619019A */ addiu $t9, $s0, 0x019A ## $t9 = 0000019A -/* 00068 80A57268 260801D6 */ addiu $t0, $s0, 0x01D6 ## $t0 = 000001D6 -/* 0006C 80A5726C 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 00070 80A57270 AFA90018 */ sw $t1, 0x0018($sp) -/* 00074 80A57274 AFA80014 */ sw $t0, 0x0014($sp) -/* 00078 80A57278 AFB90010 */ sw $t9, 0x0010($sp) -/* 0007C 80A5727C 24E72F7C */ addiu $a3, $a3, 0x2F7C ## $a3 = 06002F7C -/* 00080 80A57280 24C623B8 */ addiu $a2, $a2, 0x23B8 ## $a2 = 060023B8 -/* 00084 80A57284 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00088 80A57288 0C02915F */ jal SkelAnime_Init - -/* 0008C 80A5728C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00090 80A57290 26050214 */ addiu $a1, $s0, 0x0214 ## $a1 = 00000214 -/* 00094 80A57294 AFA50044 */ sw $a1, 0x0044($sp) -/* 00098 80A57298 0C0170D9 */ jal Collider_InitCylinder - -/* 0009C 80A5729C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000A0 80A572A0 3C0780A6 */ lui $a3, %hi(D_80A58A00) ## $a3 = 80A60000 -/* 000A4 80A572A4 8FA50044 */ lw $a1, 0x0044($sp) -/* 000A8 80A572A8 24E78A00 */ addiu $a3, $a3, %lo(D_80A58A00) ## $a3 = 80A58A00 -/* 000AC 80A572AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000B0 80A572B0 0C01712B */ jal Collider_SetCylinder - -/* 000B4 80A572B4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000B8 80A572B8 3C0680A6 */ lui $a2, %hi(D_80A58A2C) ## $a2 = 80A60000 -/* 000BC 80A572BC 24C68A2C */ addiu $a2, $a2, %lo(D_80A58A2C) ## $a2 = 80A58A2C -/* 000C0 80A572C0 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 000C4 80A572C4 0C0187B5 */ jal func_80061ED4 -/* 000C8 80A572C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 000CC 80A572CC 8606001C */ lh $a2, 0x001C($s0) ## 0000001C -/* 000D0 80A572D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000D4 80A572D4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 000D8 80A572D8 00063203 */ sra $a2, $a2, 8 -/* 000DC 80A572DC 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 -/* 000E0 80A572E0 00063400 */ sll $a2, $a2, 16 -/* 000E4 80A572E4 0C00CE50 */ jal Actor_SetTextWithPrefix - -/* 000E8 80A572E8 00063403 */ sra $a2, $a2, 16 -/* 000EC 80A572EC 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 000F0 80A572F0 960A010E */ lhu $t2, 0x010E($s0) ## 0000010E -/* 000F4 80A572F4 3C0180A6 */ lui $at, %hi(D_80A58A34) ## $at = 80A60000 -/* 000F8 80A572F8 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000000 -/* 000FC 80A572FC A60C001C */ sh $t4, 0x001C($s0) ## 0000001C -/* 00100 80A57300 A60A0198 */ sh $t2, 0x0198($s0) ## 00000198 -/* 00104 80A57304 A4208A34 */ sh $zero, %lo(D_80A58A34)($at) -/* 00108 80A57308 960D010E */ lhu $t5, 0x010E($s0) ## 0000010E -/* 0010C 80A5730C 2401109B */ addiu $at, $zero, 0x109B ## $at = 0000109B -/* 00110 80A57310 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00114 80A57314 15A10009 */ bne $t5, $at, .L80A5733C -/* 00118 80A57318 00000000 */ nop -/* 0011C 80A5731C 0C00B337 */ jal Flags_GetClear - -/* 00120 80A57320 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 00124 80A57324 10400005 */ beq $v0, $zero, .L80A5733C -/* 00128 80A57328 00000000 */ nop -/* 0012C 80A5732C 0C00B55C */ jal Actor_Kill - -/* 00130 80A57330 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00134 80A57334 10000015 */ beq $zero, $zero, .L80A5738C -/* 00138 80A57338 8FBF003C */ lw $ra, 0x003C($sp) -.L80A5733C: -/* 0013C 80A5733C 0C295D15 */ jal func_80A57454 -/* 00140 80A57340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00144 80A57344 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00148 80A57348 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 0014C 80A5734C 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00150 80A57350 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00154 80A57354 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 00158 80A57358 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0015C 80A5735C 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 00160 80A57360 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00164 80A57364 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00168 80A57368 AFA0001C */ sw $zero, 0x001C($sp) -/* 0016C 80A5736C 24070192 */ addiu $a3, $zero, 0x0192 ## $a3 = 00000192 -/* 00170 80A57370 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00174 80A57374 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 00178 80A57378 AFAF0028 */ sw $t7, 0x0028($sp) -/* 0017C 80A5737C AFA00024 */ sw $zero, 0x0024($sp) -/* 00180 80A57380 0C00C916 */ jal Actor_SpawnAttached - -/* 00184 80A57384 AFAE0020 */ sw $t6, 0x0020($sp) -.L80A57388: -/* 00188 80A57388 8FBF003C */ lw $ra, 0x003C($sp) -.L80A5738C: -/* 0018C 80A5738C 8FB00034 */ lw $s0, 0x0034($sp) -/* 00190 80A57390 8FB10038 */ lw $s1, 0x0038($sp) -/* 00194 80A57394 03E00008 */ jr $ra -/* 00198 80A57398 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Update.s deleted file mode 100644 index 8dab100e1..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Update.s +++ /dev/null @@ -1,112 +0,0 @@ -glabel EnHintnuts_Update -/* 014B8 80A586B8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 014BC 80A586BC AFBF0024 */ sw $ra, 0x0024($sp) -/* 014C0 80A586C0 AFB10020 */ sw $s1, 0x0020($sp) -/* 014C4 80A586C4 AFB0001C */ sw $s0, 0x001C($sp) -/* 014C8 80A586C8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 014CC 80A586CC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 014D0 80A586D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 014D4 80A586D4 11C10053 */ beq $t6, $at, .L80A58824 -/* 014D8 80A586D8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 014DC 80A586DC 0C296182 */ jal func_80A58608 -/* 014E0 80A586E0 00000000 */ nop -/* 014E4 80A586E4 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 014E8 80A586E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014EC 80A586EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 014F0 80A586F0 0320F809 */ jalr $ra, $t9 -/* 014F4 80A586F4 00000000 */ nop -/* 014F8 80A586F8 8E030190 */ lw $v1, 0x0190($s0) ## 00000190 -/* 014FC 80A586FC 3C0F80A6 */ lui $t7, %hi(func_80A584DC) ## $t7 = 80A60000 -/* 01500 80A58700 25EF84DC */ addiu $t7, $t7, %lo(func_80A584DC) ## $t7 = 80A584DC -/* 01504 80A58704 11E30014 */ beq $t7, $v1, .L80A58758 -/* 01508 80A58708 3C1880A5 */ lui $t8, %hi(func_80A57F5C) ## $t8 = 80A50000 -/* 0150C 80A5870C 27187F5C */ addiu $t8, $t8, %lo(func_80A57F5C) ## $t8 = 80A57F5C -/* 01510 80A58710 53030012 */ beql $t8, $v1, .L80A5875C -/* 01514 80A58714 26050214 */ addiu $a1, $s0, 0x0214 ## $a1 = 00000214 -/* 01518 80A58718 0C00B638 */ jal Actor_MoveForward - -/* 0151C 80A5871C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01520 80A58720 86080254 */ lh $t0, 0x0254($s0) ## 00000254 -/* 01524 80A58724 86090256 */ lh $t1, 0x0256($s0) ## 00000256 -/* 01528 80A58728 240A001D */ addiu $t2, $zero, 0x001D ## $t2 = 0000001D -/* 0152C 80A5872C 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 01530 80A58730 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 -/* 01534 80A58734 AFAA0014 */ sw $t2, 0x0014($sp) -/* 01538 80A58738 46802120 */ cvt.s.w $f4, $f4 -/* 0153C 80A5873C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01540 80A58740 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01544 80A58744 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 01548 80A58748 46803220 */ cvt.s.w $f8, $f6 -/* 0154C 80A5874C 44072000 */ mfc1 $a3, $f4 -/* 01550 80A58750 0C00B92D */ jal func_8002E4B4 -/* 01554 80A58754 E7A80010 */ swc1 $f8, 0x0010($sp) -.L80A58758: -/* 01558 80A58758 26050214 */ addiu $a1, $s0, 0x0214 ## $a1 = 00000214 -.L80A5875C: -/* 0155C 80A5875C AFA50028 */ sw $a1, 0x0028($sp) -/* 01560 80A58760 0C0189B7 */ jal Collider_CylinderUpdate - -/* 01564 80A58764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01568 80A58768 920B0225 */ lbu $t3, 0x0225($s0) ## 00000225 -/* 0156C 80A5876C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01570 80A58770 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01574 80A58774 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 01578 80A58778 11800004 */ beq $t4, $zero, .L80A5878C -/* 0157C 80A5877C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01580 80A58780 02212821 */ addu $a1, $s1, $at -/* 01584 80A58784 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 01588 80A58788 8FA60028 */ lw $a2, 0x0028($sp) -.L80A5878C: -/* 0158C 80A5878C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01590 80A58790 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01594 80A58794 02212821 */ addu $a1, $s1, $at -/* 01598 80A58798 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0159C 80A5879C 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 015A0 80A587A0 8FA60028 */ lw $a2, 0x0028($sp) -/* 015A4 80A587A4 8E030190 */ lw $v1, 0x0190($s0) ## 00000190 -/* 015A8 80A587A8 3C0D80A5 */ lui $t5, %hi(func_80A578FC) ## $t5 = 80A50000 -/* 015AC 80A587AC 25AD78FC */ addiu $t5, $t5, %lo(func_80A578FC) ## $t5 = 80A578FC -/* 015B0 80A587B0 15A30006 */ bne $t5, $v1, .L80A587CC -/* 015B4 80A587B4 3C0E80A5 */ lui $t6, %hi(func_80A57DE4) ## $t6 = 80A50000 -/* 015B8 80A587B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015BC 80A587BC 0C00B56E */ jal Actor_SetHeight - -/* 015C0 80A587C0 8E050164 */ lw $a1, 0x0164($s0) ## 00000164 -/* 015C4 80A587C4 10000018 */ beq $zero, $zero, .L80A58828 -/* 015C8 80A587C8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A587CC: -/* 015CC 80A587CC 25CE7DE4 */ addiu $t6, $t6, %lo(func_80A57DE4) ## $t6 = 00007DE4 -/* 015D0 80A587D0 15C30012 */ bne $t6, $v1, .L80A5881C -/* 015D4 80A587D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015D8 80A587D8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 015DC 80A587DC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 015E0 80A587E0 248424CC */ addiu $a0, $a0, 0x24CC ## $a0 = 060024CC -/* 015E4 80A587E4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 015E8 80A587E8 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 015EC 80A587EC C60A0164 */ lwc1 $f10, 0x0164($s0) ## 00000164 -/* 015F0 80A587F0 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 015F4 80A587F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015F8 80A587F8 46005402 */ mul.s $f16, $f10, $f0 -/* 015FC 80A587FC 46809120 */ cvt.s.w $f4, $f18 -/* 01600 80A58800 46048183 */ div.s $f6, $f16, $f4 -/* 01604 80A58804 46060201 */ sub.s $f8, $f0, $f6 -/* 01608 80A58808 44054000 */ mfc1 $a1, $f8 -/* 0160C 80A5880C 0C00B56E */ jal Actor_SetHeight - -/* 01610 80A58810 00000000 */ nop -/* 01614 80A58814 10000004 */ beq $zero, $zero, .L80A58828 -/* 01618 80A58818 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A5881C: -/* 0161C 80A5881C 0C00B56E */ jal Actor_SetHeight - -/* 01620 80A58820 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -.L80A58824: -/* 01624 80A58824 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A58828: -/* 01628 80A58828 8FB0001C */ lw $s0, 0x001C($sp) -/* 0162C 80A5882C 8FB10020 */ lw $s1, 0x0020($sp) -/* 01630 80A58830 03E00008 */ jr $ra -/* 01634 80A58834 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A573D0.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A573D0.s deleted file mode 100644 index dcf61b162..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A573D0.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80A573D0 -/* 001D0 80A573D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001D4 80A573D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001D8 80A573D8 AFA5001C */ sw $a1, 0x001C($sp) -/* 001DC 80A573DC 948E010E */ lhu $t6, 0x010E($a0) ## 0000010E -/* 001E0 80A573E0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 001E4 80A573E4 51C00018 */ beql $t6, $zero, .L80A57448 -/* 001E8 80A573E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001EC 80A573EC 908F0002 */ lbu $t7, 0x0002($a0) ## 00000002 -/* 001F0 80A573F0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 001F4 80A573F4 55E10014 */ bnel $t7, $at, .L80A57448 -/* 001F8 80A573F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001FC 80A573FC 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 00200 80A57400 3C1980A6 */ lui $t9, %hi(D_80A58A34) ## $t9 = 80A60000 -/* 00204 80A57404 53000006 */ beql $t8, $zero, .L80A57420 -/* 00208 80A57408 8CC80004 */ lw $t0, 0x0004($a2) ## 00000004 -/* 0020C 80A5740C 87398A34 */ lh $t9, %lo(D_80A58A34)($t9) -/* 00210 80A57410 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00214 80A57414 5721000C */ bnel $t9, $at, .L80A57448 -/* 00218 80A57418 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0021C 80A5741C 8CC80004 */ lw $t0, 0x0004($a2) ## 00000004 -.L80A57420: -/* 00220 80A57420 2401FFFA */ addiu $at, $zero, 0xFFFA ## $at = FFFFFFFA -/* 00224 80A57424 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00228 80A57428 01014824 */ and $t1, $t0, $at -/* 0022C 80A5742C ACC90004 */ sw $t1, 0x0004($a2) ## 00000004 -/* 00230 80A57430 352B0009 */ ori $t3, $t1, 0x0009 ## $t3 = 00000009 -/* 00234 80A57434 ACCB0004 */ sw $t3, 0x0004($a2) ## 00000004 -/* 00238 80A57438 8FA4001C */ lw $a0, 0x001C($sp) -/* 0023C 80A5743C 0C00CDD2 */ jal Actor_ChangeType - -/* 00240 80A57440 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 00244 80A57444 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A57448: -/* 00248 80A57448 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0024C 80A5744C 03E00008 */ jr $ra -/* 00250 80A57450 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s deleted file mode 100644 index a98ecb582..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80A57454 -/* 00254 80A57454 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00258 80A57458 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0025C 80A5745C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00260 80A57460 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00264 80A57464 24A52B90 */ addiu $a1, $a1, 0x2B90 ## $a1 = 06002B90 -/* 00268 80A57468 AFA70018 */ sw $a3, 0x0018($sp) -/* 0026C 80A5746C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00270 80A57470 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop -/* 00274 80A57474 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00278 80A57478 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 -/* 0027C 80A5747C 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00280 80A57480 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 -/* 00284 80A57484 8FA70018 */ lw $a3, 0x0018($sp) -/* 00288 80A57488 3C0980A5 */ lui $t1, %hi(func_80A578FC) ## $t1 = 80A50000 -/* 0028C 80A5748C 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00290 80A57490 8CF80008 */ lw $t8, 0x0008($a3) ## 00000008 -/* 00294 80A57494 90F90225 */ lbu $t9, 0x0225($a3) ## 00000225 -/* 00298 80A57498 8CEF000C */ lw $t7, 0x000C($a3) ## 0000000C -/* 0029C 80A5749C ACF80024 */ sw $t8, 0x0024($a3) ## 00000024 -/* 002A0 80A574A0 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 -/* 002A4 80A574A4 252978FC */ addiu $t1, $t1, %lo(func_80A578FC) ## $t1 = 80A578FC -/* 002A8 80A574A8 3328FFFE */ andi $t0, $t9, 0xFFFE ## $t0 = 00000000 -/* 002AC 80A574AC A4E20194 */ sh $v0, 0x0194($a3) ## 00000194 -/* 002B0 80A574B0 A4EE0256 */ sh $t6, 0x0256($a3) ## 00000256 -/* 002B4 80A574B4 A0E80225 */ sb $t0, 0x0225($a3) ## 00000225 -/* 002B8 80A574B8 ACE90190 */ sw $t1, 0x0190($a3) ## 00000190 -/* 002BC 80A574BC ACEF0028 */ sw $t7, 0x0028($a3) ## 00000028 -/* 002C0 80A574C0 ACF8002C */ sw $t8, 0x002C($a3) ## 0000002C -/* 002C4 80A574C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002C8 80A574C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002CC 80A574CC 03E00008 */ jr $ra -/* 002D0 80A574D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s deleted file mode 100644 index b07d60bc1..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80A574D4 -/* 002D4 80A574D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002D8 80A574D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002DC 80A574DC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 002E0 80A574E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 002E4 80A574E4 24A52894 */ addiu $a1, $a1, 0x2894 ## $a1 = 06002894 -/* 002E8 80A574E8 AFA60018 */ sw $a2, 0x0018($sp) -/* 002EC 80A574EC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 002F0 80A574F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002F4 80A574F4 8FA60018 */ lw $a2, 0x0018($sp) -/* 002F8 80A574F8 3C0F80A5 */ lui $t7, %hi(func_80A57B60) ## $t7 = 80A50000 -/* 002FC 80A574FC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00300 80A57500 25EF7B60 */ addiu $t7, $t7, %lo(func_80A57B60) ## $t7 = 80A57B60 -/* 00304 80A57504 A4CE0194 */ sh $t6, 0x0194($a2) ## 00000194 -/* 00308 80A57508 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 0030C 80A5750C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00310 80A57510 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00314 80A57514 03E00008 */ jr $ra -/* 00318 80A57518 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s deleted file mode 100644 index 065776a65..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A5751C -/* 0031C 80A5751C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00320 80A57520 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00324 80A57524 AFA40018 */ sw $a0, 0x0018($sp) -/* 00328 80A57528 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0032C 80A5752C 24A50168 */ addiu $a1, $a1, 0x0168 ## $a1 = 06000168 -/* 00330 80A57530 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 00334 80A57534 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00338 80A57538 8FAF0018 */ lw $t7, 0x0018($sp) -/* 0033C 80A5753C 3C0E80A5 */ lui $t6, %hi(func_80A57CA8) ## $t6 = 80A50000 -/* 00340 80A57540 25CE7CA8 */ addiu $t6, $t6, %lo(func_80A57CA8) ## $t6 = 80A57CA8 -/* 00344 80A57544 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 00348 80A57548 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0034C 80A5754C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00350 80A57550 03E00008 */ jr $ra -/* 00354 80A57554 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s deleted file mode 100644 index 2922f159f..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80A57558 -/* 00358 80A57558 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0035C 80A5755C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00360 80A57560 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00364 80A57564 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00368 80A57568 24A52F7C */ addiu $a1, $a1, 0x2F7C ## $a1 = 06002F7C -/* 0036C 80A5756C AFA70018 */ sw $a3, 0x0018($sp) -/* 00370 80A57570 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00374 80A57574 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 00378 80A57578 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 0037C 80A5757C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00380 80A57580 3C0E80A5 */ lui $t6, %hi(func_80A57CA8) ## $t6 = 80A50000 -/* 00384 80A57584 25CE7CA8 */ addiu $t6, $t6, %lo(func_80A57CA8) ## $t6 = 80A57CA8 -/* 00388 80A57588 8CEF0190 */ lw $t7, 0x0190($a3) ## 00000190 -/* 0038C 80A5758C 3C0880A5 */ lui $t0, %hi(func_80A57BE4) ## $t0 = 80A50000 -/* 00390 80A57590 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00394 80A57594 15CF0004 */ bne $t6, $t7, .L80A575A8 -/* 00398 80A57598 25087BE4 */ addiu $t0, $t0, %lo(func_80A57BE4) ## $t0 = 80A57BE4 -/* 0039C 80A5759C 24181002 */ addiu $t8, $zero, 0x1002 ## $t8 = 00001002 -/* 003A0 80A575A0 10000002 */ beq $zero, $zero, .L80A575AC -/* 003A4 80A575A4 A4F80194 */ sh $t8, 0x0194($a3) ## 00000194 -.L80A575A8: -/* 003A8 80A575A8 A4F90194 */ sh $t9, 0x0194($a3) ## 00000194 -.L80A575AC: -/* 003AC 80A575AC ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -/* 003B0 80A575B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003B4 80A575B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003B8 80A575B8 03E00008 */ jr $ra -/* 003BC 80A575BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s deleted file mode 100644 index a6c16f3b4..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80A575C0 -/* 003C0 80A575C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003C4 80A575C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003C8 80A575C8 AFA40018 */ sw $a0, 0x0018($sp) -/* 003CC 80A575CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003D0 80A575D0 24A524CC */ addiu $a1, $a1, 0x24CC ## $a1 = 060024CC -/* 003D4 80A575D4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003D8 80A575D8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop -/* 003DC 80A575DC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 003E0 80A575E0 8FA40018 */ lw $a0, 0x0018($sp) -/* 003E4 80A575E4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 003E8 80A575E8 2405387D */ addiu $a1, $zero, 0x387D ## $a1 = 0000387D -/* 003EC 80A575EC 8FAF0018 */ lw $t7, 0x0018($sp) -/* 003F0 80A575F0 3C0E80A5 */ lui $t6, %hi(func_80A57DE4) ## $t6 = 80A50000 -/* 003F4 80A575F4 25CE7DE4 */ addiu $t6, $t6, %lo(func_80A57DE4) ## $t6 = 80A57DE4 -/* 003F8 80A575F8 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 003FC 80A575FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00400 80A57600 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00404 80A57604 03E00008 */ jr $ra -/* 00408 80A57608 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s deleted file mode 100644 index b3aaed4d4..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80A5760C -/* 0040C 80A5760C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00410 80A57610 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00414 80A57614 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00418 80A57618 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0041C 80A5761C 24A526C4 */ addiu $a1, $a1, 0x26C4 ## $a1 = 060026C4 -/* 00420 80A57620 AFA70018 */ sw $a3, 0x0018($sp) -/* 00424 80A57624 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00428 80A57628 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop -/* 0042C 80A5762C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00430 80A57630 8FA40018 */ lw $a0, 0x0018($sp) -/* 00434 80A57634 240E0025 */ addiu $t6, $zero, 0x0025 ## $t6 = 00000025 -/* 00438 80A57638 24053880 */ addiu $a1, $zero, 0x3880 ## $a1 = 00003880 -/* 0043C 80A5763C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00440 80A57640 A48E0256 */ sh $t6, 0x0256($a0) ## 00000256 -/* 00444 80A57644 8FA70018 */ lw $a3, 0x0018($sp) -/* 00448 80A57648 3C0D80A5 */ lui $t5, %hi(func_80A57EF8) ## $t5 = 80A50000 -/* 0044C 80A5764C 25AD7EF8 */ addiu $t5, $t5, %lo(func_80A57EF8) ## $t5 = 80A57EF8 -/* 00450 80A57650 90EF0225 */ lbu $t7, 0x0225($a3) ## 00000225 -/* 00454 80A57654 84E3001C */ lh $v1, 0x001C($a3) ## 0000001C -/* 00458 80A57658 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 -/* 0045C 80A5765C 18600022 */ blez $v1, .L80A576E8 -/* 00460 80A57660 A0F80225 */ sb $t8, 0x0225($a3) ## 00000225 -/* 00464 80A57664 28610004 */ slti $at, $v1, 0x0004 -/* 00468 80A57668 50200020 */ beql $at, $zero, .L80A576EC -/* 0046C 80A5766C ACED0190 */ sw $t5, 0x0190($a3) ## 00000190 -/* 00470 80A57670 90F90002 */ lbu $t9, 0x0002($a3) ## 00000002 -/* 00474 80A57674 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00478 80A57678 3C0580A6 */ lui $a1, %hi(D_80A58A34) ## $a1 = 80A60000 -/* 0047C 80A5767C 1721001A */ bne $t9, $at, .L80A576E8 -/* 00480 80A57680 24A58A34 */ addiu $a1, $a1, %lo(D_80A58A34) ## $a1 = 80A58A34 -/* 00484 80A57684 84A20000 */ lh $v0, 0x0000($a1) ## 80A58A34 -/* 00488 80A57688 2401FFFC */ addiu $at, $zero, 0xFFFC ## $at = FFFFFFFC -/* 0048C 80A5768C 3C0C80A5 */ lui $t4, %hi(func_80A57F5C) ## $t4 = 80A50000 -/* 00490 80A57690 54410005 */ bnel $v0, $at, .L80A576A8 -/* 00494 80A57694 24440001 */ addiu $a0, $v0, 0x0001 ## $a0 = 00000001 -/* 00498 80A57698 A4A00000 */ sh $zero, 0x0000($a1) ## 80A58A34 -/* 0049C 80A5769C 84A20000 */ lh $v0, 0x0000($a1) ## 80A58A34 -/* 004A0 80A576A0 84E3001C */ lh $v1, 0x001C($a3) ## 0000001C -/* 004A4 80A576A4 24440001 */ addiu $a0, $v0, 0x0001 ## $a0 = 00000001 -.L80A576A8: -/* 004A8 80A576A8 14830003 */ bne $a0, $v1, .L80A576B8 -/* 004AC 80A576AC 00000000 */ nop -/* 004B0 80A576B0 10000007 */ beq $zero, $zero, .L80A576D0 -/* 004B4 80A576B4 A4A40000 */ sh $a0, 0x0000($a1) ## 80A58A34 -.L80A576B8: -/* 004B8 80A576B8 18400003 */ blez $v0, .L80A576C8 -/* 004BC 80A576BC 00024023 */ subu $t0, $zero, $v0 -/* 004C0 80A576C0 A4A80000 */ sh $t0, 0x0000($a1) ## 80A58A34 -/* 004C4 80A576C4 84A20000 */ lh $v0, 0x0000($a1) ## 80A58A34 -.L80A576C8: -/* 004C8 80A576C8 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 004CC 80A576CC A4A90000 */ sh $t1, 0x0000($a1) ## 80A58A34 -.L80A576D0: -/* 004D0 80A576D0 8CEA0004 */ lw $t2, 0x0004($a3) ## 00000004 -/* 004D4 80A576D4 258C7F5C */ addiu $t4, $t4, %lo(func_80A57F5C) ## $t4 = 80A57F5C -/* 004D8 80A576D8 ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 -/* 004DC 80A576DC 354B0010 */ ori $t3, $t2, 0x0010 ## $t3 = 00000010 -/* 004E0 80A576E0 10000002 */ beq $zero, $zero, .L80A576EC -/* 004E4 80A576E4 ACEB0004 */ sw $t3, 0x0004($a3) ## 00000004 -.L80A576E8: -/* 004E8 80A576E8 ACED0190 */ sw $t5, 0x0190($a3) ## 00000190 -.L80A576EC: -/* 004EC 80A576EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004F0 80A576F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004F4 80A576F4 03E00008 */ jr $ra -/* 004F8 80A576F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s deleted file mode 100644 index 51490d04e..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80A576FC -/* 004FC 80A576FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00500 80A57700 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00504 80A57704 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00508 80A57708 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0050C 80A5770C 24A53128 */ addiu $a1, $a1, 0x3128 ## $a1 = 06003128 -/* 00510 80A57710 AFA60018 */ sw $a2, 0x0018($sp) -/* 00514 80A57714 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 00518 80A57718 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0051C 80A5771C 8FA60018 */ lw $a2, 0x0018($sp) -/* 00520 80A57720 3C0F80A6 */ lui $t7, %hi(func_80A58028) ## $t7 = 80A60000 -/* 00524 80A57724 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00528 80A57728 25EF8028 */ addiu $t7, $t7, %lo(func_80A58028) ## $t7 = 80A58028 -/* 0052C 80A5772C A4CE0194 */ sh $t6, 0x0194($a2) ## 00000194 -/* 00530 80A57730 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 00534 80A57734 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00538 80A57738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0053C 80A5773C 03E00008 */ jr $ra -/* 00540 80A57740 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s deleted file mode 100644 index d8ac77231..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80A57744 -/* 00544 80A57744 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00548 80A57748 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0054C 80A5774C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00550 80A57750 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00554 80A57754 24A52E84 */ addiu $a1, $a1, 0x2E84 ## $a1 = 06002E84 -/* 00558 80A57758 AFA70018 */ sw $a3, 0x0018($sp) -/* 0055C 80A5775C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00560 80A57760 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 00564 80A57764 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00568 80A57768 8FA70018 */ lw $a3, 0x0018($sp) -/* 0056C 80A5776C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00570 80A57770 3C0E80A6 */ lui $t6, %hi(func_80A582B8) ## $t6 = 80A60000 -/* 00574 80A57774 25CE82B8 */ addiu $t6, $t6, %lo(func_80A582B8) ## $t6 = 80A582B8 -/* 00578 80A57778 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 -/* 0057C 80A5777C E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00580 80A57780 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00584 80A57784 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00588 80A57788 03E00008 */ jr $ra -/* 0058C 80A5778C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s deleted file mode 100644 index ed844435d..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80A57790 -/* 00590 80A57790 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00594 80A57794 AFB00030 */ sw $s0, 0x0030($sp) -/* 00598 80A57798 AFA5003C */ sw $a1, 0x003C($sp) -/* 0059C 80A5779C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005A0 80A577A0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 005A4 80A577A4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 005A8 80A577A8 24A53128 */ addiu $a1, $a1, 0x3128 ## $a1 = 06003128 -/* 005AC 80A577AC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005B0 80A577B0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 005B4 80A577B4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 005B8 80A577B8 92180226 */ lbu $t8, 0x0226($s0) ## 00000226 -/* 005BC 80A577BC 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 005C0 80A577C0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 005C4 80A577C4 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 005C8 80A577C8 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 005CC 80A577CC 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 005D0 80A577D0 3319FFFE */ andi $t9, $t8, 0xFFFE ## $t9 = 00000000 -/* 005D4 80A577D4 35090010 */ ori $t1, $t0, 0x0010 ## $t1 = 00000010 -/* 005D8 80A577D8 A60E0194 */ sh $t6, 0x0194($s0) ## 00000194 -/* 005DC 80A577DC A2190226 */ sb $t9, 0x0226($s0) ## 00000226 -/* 005E0 80A577E0 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -/* 005E4 80A577E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005E8 80A577E8 24053880 */ addiu $a1, $zero, 0x3880 ## $a1 = 00003880 -/* 005EC 80A577EC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 005F0 80A577F0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 005F4 80A577F4 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 005F8 80A577F8 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 005FC 80A577FC 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00600 80A57800 8FA5003C */ lw $a1, 0x003C($sp) -/* 00604 80A57804 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00608 80A57808 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 0060C 80A5780C 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 00610 80A57810 AFAA0024 */ sw $t2, 0x0024($sp) -/* 00614 80A57814 AFA00020 */ sw $zero, 0x0020($sp) -/* 00618 80A57818 AFA0001C */ sw $zero, 0x001C($sp) -/* 0061C 80A5781C AFA00018 */ sw $zero, 0x0018($sp) -/* 00620 80A57820 24060015 */ addiu $a2, $zero, 0x0015 ## $a2 = 00000015 -/* 00624 80A57824 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 00628 80A57828 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 0062C 80A5782C E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00630 80A57830 3C0B80A6 */ lui $t3, %hi(func_80A58320) ## $t3 = 80A60000 -/* 00634 80A57834 256B8320 */ addiu $t3, $t3, %lo(func_80A58320) ## $t3 = 80A58320 -/* 00638 80A57838 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 0063C 80A5783C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00640 80A57840 8FB00030 */ lw $s0, 0x0030($sp) -/* 00644 80A57844 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00648 80A57848 03E00008 */ jr $ra -/* 0064C 80A5784C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s deleted file mode 100644 index 0cb3407dc..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80A57850 -/* 00650 80A57850 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00654 80A57854 AFB00020 */ sw $s0, 0x0020($sp) -/* 00658 80A57858 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0065C 80A5785C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00660 80A57860 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00664 80A57864 24A529BC */ addiu $a1, $a1, 0x29BC ## $a1 = 060029BC -/* 00668 80A57868 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 0066C 80A5786C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00670 80A57870 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 00674 80A57874 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00678 80A57878 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 0067C 80A5787C 01C17824 */ and $t7, $t6, $at -/* 00680 80A57880 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00684 80A57884 AFB80010 */ sw $t8, 0x0010($sp) -/* 00688 80A57888 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0068C 80A5788C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00690 80A57890 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00694 80A57894 0C00D09B */ jal func_8003426C -/* 00698 80A57898 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0069C 80A5789C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 006A0 80A578A0 A2190114 */ sb $t9, 0x0114($s0) ## 00000114 -/* 006A4 80A578A4 A6000194 */ sh $zero, 0x0194($s0) ## 00000194 -/* 006A8 80A578A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006AC 80A578AC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 006B0 80A578B0 24053882 */ addiu $a1, $zero, 0x3882 ## $a1 = 00003882 -/* 006B4 80A578B4 3C0880A6 */ lui $t0, %hi(D_80A58A34) ## $t0 = 80A60000 -/* 006B8 80A578B8 85088A34 */ lh $t0, %lo(D_80A58A34)($t0) -/* 006BC 80A578BC 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD -/* 006C0 80A578C0 15010006 */ bne $t0, $at, .L80A578DC -/* 006C4 80A578C4 00000000 */ nop -/* 006C8 80A578C8 0C01E221 */ jal func_80078884 -/* 006CC 80A578CC 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 006D0 80A578D0 2409FFFC */ addiu $t1, $zero, 0xFFFC ## $t1 = FFFFFFFC -/* 006D4 80A578D4 3C0180A6 */ lui $at, %hi(D_80A58A34) ## $at = 80A60000 -/* 006D8 80A578D8 A4298A34 */ sh $t1, %lo(D_80A58A34)($at) -.L80A578DC: -/* 006DC 80A578DC 3C0A80A6 */ lui $t2, %hi(func_80A584DC) ## $t2 = 80A60000 -/* 006E0 80A578E0 254A84DC */ addiu $t2, $t2, %lo(func_80A584DC) ## $t2 = 80A584DC -/* 006E4 80A578E4 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 006E8 80A578E8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006EC 80A578EC 8FB00020 */ lw $s0, 0x0020($sp) -/* 006F0 80A578F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006F4 80A578F4 03E00008 */ jr $ra -/* 006F8 80A578F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A578FC.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A578FC.s deleted file mode 100644 index fe78b1a40..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A578FC.s +++ /dev/null @@ -1,172 +0,0 @@ -glabel func_80A578FC -/* 006FC 80A578FC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00700 80A57900 AFBF001C */ sw $ra, 0x001C($sp) -/* 00704 80A57904 AFB00018 */ sw $s0, 0x0018($sp) -/* 00708 80A57908 AFA50034 */ sw $a1, 0x0034($sp) -/* 0070C 80A5790C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00710 80A57910 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00714 80A57914 C4840168 */ lwc1 $f4, 0x0168($a0) ## 00000168 -/* 00718 80A57918 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0071C 80A5791C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00720 80A57920 4606203C */ c.lt.s $f4, $f6 -/* 00724 80A57924 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00728 80A57928 3C054110 */ lui $a1, 0x4110 ## $a1 = 41100000 -/* 0072C 80A5792C 45000002 */ bc1f .L80A57938 -/* 00730 80A57930 00000000 */ nop -/* 00734 80A57934 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80A57938: -/* 00738 80A57938 50600006 */ beql $v1, $zero, .L80A57954 -/* 0073C 80A5793C AFA3002C */ sw $v1, 0x002C($sp) -/* 00740 80A57940 86020194 */ lh $v0, 0x0194($s0) ## 00000194 -/* 00744 80A57944 10400002 */ beq $v0, $zero, .L80A57950 -/* 00748 80A57948 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 0074C 80A5794C A60E0194 */ sh $t6, 0x0194($s0) ## 00000194 -.L80A57950: -/* 00750 80A57950 AFA3002C */ sw $v1, 0x002C($sp) -.L80A57954: -/* 00754 80A57954 0C0295B2 */ jal func_800A56C8 -/* 00758 80A57958 AFA40020 */ sw $a0, 0x0020($sp) -/* 0075C 80A5795C 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 00760 80A57960 44816000 */ mtc1 $at, $f12 ## $f12 = 9.00 -/* 00764 80A57964 10400005 */ beq $v0, $zero, .L80A5797C -/* 00768 80A57968 8FA40020 */ lw $a0, 0x0020($sp) -/* 0076C 80A5796C 920F0225 */ lbu $t7, 0x0225($s0) ## 00000225 -/* 00770 80A57970 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00774 80A57974 1000000C */ beq $zero, $zero, .L80A579A8 -/* 00778 80A57978 A2180225 */ sb $t8, 0x0225($s0) ## 00000225 -.L80A5797C: -/* 0077C 80A5797C 0C0295B2 */ jal func_800A56C8 -/* 00780 80A57980 3C054100 */ lui $a1, 0x4100 ## $a1 = 41000000 -/* 00784 80A57984 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 00788 80A57988 44816000 */ mtc1 $at, $f12 ## $f12 = 9.00 -/* 0078C 80A5798C 10400006 */ beq $v0, $zero, .L80A579A8 -/* 00790 80A57990 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00794 80A57994 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00798 80A57998 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C -/* 0079C 80A5799C 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 007A0 80A579A0 44816000 */ mtc1 $at, $f12 ## $f12 = 9.00 -/* 007A4 80A579A4 00000000 */ nop -.L80A579A8: -/* 007A8 80A579A8 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 007AC 80A579AC 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 007B0 80A579B0 460C003C */ c.lt.s $f0, $f12 -/* 007B4 80A579B4 00000000 */ nop -/* 007B8 80A579B8 45020004 */ bc1fl .L80A579CC -/* 007BC 80A579BC 44817000 */ mtc1 $at, $f14 ## $f14 = 12.00 -/* 007C0 80A579C0 1000000B */ beq $zero, $zero, .L80A579F0 -/* 007C4 80A579C4 46006006 */ mov.s $f0, $f12 -/* 007C8 80A579C8 44817000 */ mtc1 $at, $f14 ## $f14 = 12.00 -.L80A579CC: -/* 007CC 80A579CC 00000000 */ nop -/* 007D0 80A579D0 4600703C */ c.lt.s $f14, $f0 -/* 007D4 80A579D4 00000000 */ nop -/* 007D8 80A579D8 45020004 */ bc1fl .L80A579EC -/* 007DC 80A579DC 46000086 */ mov.s $f2, $f0 -/* 007E0 80A579E0 10000002 */ beq $zero, $zero, .L80A579EC -/* 007E4 80A579E4 46007086 */ mov.s $f2, $f14 -/* 007E8 80A579E8 46000086 */ mov.s $f2, $f0 -.L80A579EC: -/* 007EC 80A579EC 46001006 */ mov.s $f0, $f2 -.L80A579F0: -/* 007F0 80A579F0 460C0201 */ sub.s $f8, $f0, $f12 -/* 007F4 80A579F4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 007F8 80A579F8 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 007FC 80A579FC 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 00800 80A57A00 460C4282 */ mul.s $f10, $f8, $f12 -/* 00804 80A57A04 46105480 */ add.s $f18, $f10, $f16 -/* 00808 80A57A08 4600910D */ trunc.w.s $f4, $f18 -/* 0080C 80A57A0C 44082000 */ mfc1 $t0, $f4 -/* 00810 80A57A10 00000000 */ nop -/* 00814 80A57A14 A6080256 */ sh $t0, 0x0256($s0) ## 00000256 -/* 00818 80A57A18 8FA9002C */ lw $t1, 0x002C($sp) -/* 0081C 80A57A1C 1520000C */ bne $t1, $zero, .L80A57A50 -/* 00820 80A57A20 00000000 */ nop -/* 00824 80A57A24 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 00828 80A57A28 44814000 */ mtc1 $at, $f8 ## $f8 = 120.00 -/* 0082C 80A57A2C 00000000 */ nop -/* 00830 80A57A30 4608303C */ c.lt.s $f6, $f8 -/* 00834 80A57A34 00000000 */ nop -/* 00838 80A57A38 45000005 */ bc1f .L80A57A50 -/* 0083C 80A57A3C 00000000 */ nop -/* 00840 80A57A40 0C295D70 */ jal func_80A575C0 -/* 00844 80A57A44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00848 80A57A48 10000021 */ beq $zero, $zero, .L80A57AD0 -/* 0084C 80A57A4C 8FAB002C */ lw $t3, 0x002C($sp) -.L80A57A50: -/* 00850 80A57A50 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00854 80A57A54 8FA40020 */ lw $a0, 0x0020($sp) -/* 00858 80A57A58 1040001C */ beq $v0, $zero, .L80A57ACC -/* 0085C 80A57A5C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 00860 80A57A60 C6020090 */ lwc1 $f2, 0x0090($s0) ## 00000090 -/* 00864 80A57A64 44815000 */ mtc1 $at, $f10 ## $f10 = 120.00 -/* 00868 80A57A68 00000000 */ nop -/* 0086C 80A57A6C 460A103C */ c.lt.s $f2, $f10 -/* 00870 80A57A70 00000000 */ nop -/* 00874 80A57A74 45020006 */ bc1fl .L80A57A90 -/* 00878 80A57A78 860A0194 */ lh $t2, 0x0194($s0) ## 00000194 -/* 0087C 80A57A7C 0C295D70 */ jal func_80A575C0 -/* 00880 80A57A80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00884 80A57A84 10000012 */ beq $zero, $zero, .L80A57AD0 -/* 00888 80A57A88 8FAB002C */ lw $t3, 0x002C($sp) -/* 0088C 80A57A8C 860A0194 */ lh $t2, 0x0194($s0) ## 00000194 -.L80A57A90: -/* 00890 80A57A90 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 -/* 00894 80A57A94 1540000B */ bne $t2, $zero, .L80A57AC4 -/* 00898 80A57A98 00000000 */ nop -/* 0089C 80A57A9C 44818000 */ mtc1 $at, $f16 ## $f16 = 320.00 -/* 008A0 80A57AA0 00000000 */ nop -/* 008A4 80A57AA4 4602803C */ c.lt.s $f16, $f2 -/* 008A8 80A57AA8 00000000 */ nop -/* 008AC 80A57AAC 45000005 */ bc1f .L80A57AC4 -/* 008B0 80A57AB0 00000000 */ nop -/* 008B4 80A57AB4 0C295D35 */ jal func_80A574D4 -/* 008B8 80A57AB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008BC 80A57ABC 10000004 */ beq $zero, $zero, .L80A57AD0 -/* 008C0 80A57AC0 8FAB002C */ lw $t3, 0x002C($sp) -.L80A57AC4: -/* 008C4 80A57AC4 0C295D56 */ jal func_80A57558 -/* 008C8 80A57AC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A57ACC: -/* 008CC 80A57ACC 8FAB002C */ lw $t3, 0x002C($sp) -.L80A57AD0: -/* 008D0 80A57AD0 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 008D4 80A57AD4 5160001E */ beql $t3, $zero, .L80A57B50 -/* 008D8 80A57AD8 8FBF001C */ lw $ra, 0x001C($sp) -/* 008DC 80A57ADC C6020090 */ lwc1 $f2, 0x0090($s0) ## 00000090 -/* 008E0 80A57AE0 44819000 */ mtc1 $at, $f18 ## $f18 = 160.00 -/* 008E4 80A57AE4 00000000 */ nop -/* 008E8 80A57AE8 4602903C */ c.lt.s $f18, $f2 -/* 008EC 80A57AEC 00000000 */ nop -/* 008F0 80A57AF0 45020017 */ bc1fl .L80A57B50 -/* 008F4 80A57AF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 008F8 80A57AF8 C6000094 */ lwc1 $f0, 0x0094($s0) ## 00000094 -/* 008FC 80A57AFC 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 00900 80A57B00 44812000 */ mtc1 $at, $f4 ## $f4 = 120.00 -/* 00904 80A57B04 46000005 */ abs.s $f0, $f0 -/* 00908 80A57B08 4604003C */ c.lt.s $f0, $f4 -/* 0090C 80A57B0C 00000000 */ nop -/* 00910 80A57B10 4502000F */ bc1fl .L80A57B50 -/* 00914 80A57B14 8FBF001C */ lw $ra, 0x001C($sp) -/* 00918 80A57B18 860C0194 */ lh $t4, 0x0194($s0) ## 00000194 -/* 0091C 80A57B1C 3C0143F0 */ lui $at, 0x43F0 ## $at = 43F00000 -/* 00920 80A57B20 51800007 */ beql $t4, $zero, .L80A57B40 -/* 00924 80A57B24 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00928 80A57B28 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0092C 80A57B2C 00000000 */ nop -/* 00930 80A57B30 4606103C */ c.lt.s $f2, $f6 -/* 00934 80A57B34 00000000 */ nop -/* 00938 80A57B38 45000004 */ bc1f .L80A57B4C -/* 0093C 80A57B3C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -.L80A57B40: -/* 00940 80A57B40 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 00944 80A57B44 00000000 */ nop -/* 00948 80A57B48 E6080168 */ swc1 $f8, 0x0168($s0) ## 00000168 -.L80A57B4C: -/* 0094C 80A57B4C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A57B50: -/* 00950 80A57B50 8FB00018 */ lw $s0, 0x0018($sp) -/* 00954 80A57B54 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00958 80A57B58 03E00008 */ jr $ra -/* 0095C 80A57B5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57B60.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57B60.s deleted file mode 100644 index e856e6632..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57B60.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80A57B60 -/* 00960 80A57B60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00964 80A57B64 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00968 80A57B68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0096C 80A57B6C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00970 80A57B70 AFA50024 */ sw $a1, 0x0024($sp) -/* 00974 80A57B74 AFA4001C */ sw $a0, 0x001C($sp) -/* 00978 80A57B78 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0097C 80A57B7C AFA60020 */ sw $a2, 0x0020($sp) -/* 00980 80A57B80 8FA4001C */ lw $a0, 0x001C($sp) -/* 00984 80A57B84 0C0295B2 */ jal func_800A56C8 -/* 00988 80A57B88 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0098C 80A57B8C 10400005 */ beq $v0, $zero, .L80A57BA4 -/* 00990 80A57B90 8FA60020 */ lw $a2, 0x0020($sp) -/* 00994 80A57B94 84C20194 */ lh $v0, 0x0194($a2) ## 00000194 -/* 00998 80A57B98 10400002 */ beq $v0, $zero, .L80A57BA4 -/* 0099C 80A57B9C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 009A0 80A57BA0 A4CE0194 */ sh $t6, 0x0194($a2) ## 00000194 -.L80A57BA4: -/* 009A4 80A57BA4 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 009A8 80A57BA8 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 -/* 009AC 80A57BAC C4C40090 */ lwc1 $f4, 0x0090($a2) ## 00000090 -/* 009B0 80A57BB0 4606203C */ c.lt.s $f4, $f6 -/* 009B4 80A57BB4 00000000 */ nop -/* 009B8 80A57BB8 45010004 */ bc1t .L80A57BCC -/* 009BC 80A57BBC 00000000 */ nop -/* 009C0 80A57BC0 84CF0194 */ lh $t7, 0x0194($a2) ## 00000194 -/* 009C4 80A57BC4 55E00004 */ bnel $t7, $zero, .L80A57BD8 -/* 009C8 80A57BC8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A57BCC: -/* 009CC 80A57BCC 0C295D70 */ jal func_80A575C0 -/* 009D0 80A57BD0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 009D4 80A57BD4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A57BD8: -/* 009D8 80A57BD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 009DC 80A57BDC 03E00008 */ jr $ra -/* 009E0 80A57BE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57BE4.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57BE4.s deleted file mode 100644 index 3c018adfc..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57BE4.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80A57BE4 -/* 009E4 80A57BE4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 009E8 80A57BE8 AFB00018 */ sw $s0, 0x0018($sp) -/* 009EC 80A57BEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009F0 80A57BF0 AFBF001C */ sw $ra, 0x001C($sp) -/* 009F4 80A57BF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 009F8 80A57BF8 AFA5002C */ sw $a1, 0x002C($sp) -/* 009FC 80A57BFC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00A00 80A57C00 AFA40024 */ sw $a0, 0x0024($sp) -/* 00A04 80A57C04 8FA40024 */ lw $a0, 0x0024($sp) -/* 00A08 80A57C08 0C0295B2 */ jal func_800A56C8 -/* 00A0C 80A57C0C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00A10 80A57C10 10400005 */ beq $v0, $zero, .L80A57C28 -/* 00A14 80A57C14 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00A18 80A57C18 86020194 */ lh $v0, 0x0194($s0) ## 00000194 -/* 00A1C 80A57C1C 10400002 */ beq $v0, $zero, .L80A57C28 -/* 00A20 80A57C20 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00A24 80A57C24 A60E0194 */ sh $t6, 0x0194($s0) ## 00000194 -.L80A57C28: -/* 00A28 80A57C28 860F0194 */ lh $t7, 0x0194($s0) ## 00000194 -/* 00A2C 80A57C2C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00A30 80A57C30 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 -/* 00A34 80A57C34 31F81000 */ andi $t8, $t7, 0x1000 ## $t8 = 00000000 -/* 00A38 80A57C38 57000004 */ bnel $t8, $zero, .L80A57C4C -/* 00A3C 80A57C3C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 00A40 80A57C40 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 00A44 80A57C44 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00A48 80A57C48 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -.L80A57C4C: -/* 00A4C 80A57C4C 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 -/* 00A50 80A57C50 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 00A54 80A57C54 4606203C */ c.lt.s $f4, $f6 -/* 00A58 80A57C58 00000000 */ nop -/* 00A5C 80A57C5C 45010005 */ bc1t .L80A57C74 -/* 00A60 80A57C60 00000000 */ nop -/* 00A64 80A57C64 86020194 */ lh $v0, 0x0194($s0) ## 00000194 -/* 00A68 80A57C68 24011000 */ addiu $at, $zero, 0x1000 ## $at = 00001000 -/* 00A6C 80A57C6C 14410005 */ bne $v0, $at, .L80A57C84 -/* 00A70 80A57C70 00000000 */ nop -.L80A57C74: -/* 00A74 80A57C74 0C295D70 */ jal func_80A575C0 -/* 00A78 80A57C78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A7C 80A57C7C 10000006 */ beq $zero, $zero, .L80A57C98 -/* 00A80 80A57C80 8FBF001C */ lw $ra, 0x001C($sp) -.L80A57C84: -/* 00A84 80A57C84 54400004 */ bnel $v0, $zero, .L80A57C98 -/* 00A88 80A57C88 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A8C 80A57C8C 0C295D47 */ jal func_80A5751C -/* 00A90 80A57C90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A94 80A57C94 8FBF001C */ lw $ra, 0x001C($sp) -.L80A57C98: -/* 00A98 80A57C98 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A9C 80A57C9C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AA0 80A57CA0 03E00008 */ jr $ra -/* 00AA4 80A57CA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57CA8.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57CA8.s deleted file mode 100644 index 75f0d1b93..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57CA8.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_80A57CA8 -/* 00AA8 80A57CA8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00AAC 80A57CAC AFB00030 */ sw $s0, 0x0030($sp) -/* 00AB0 80A57CB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AB4 80A57CB4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00AB8 80A57CB8 AFA5004C */ sw $a1, 0x004C($sp) -/* 00ABC 80A57CBC 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00AC0 80A57CC0 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 00AC4 80A57CC4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00AC8 80A57CC8 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 00ACC 80A57CCC 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 -/* 00AD0 80A57CD0 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 00AD4 80A57CD4 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 -/* 00AD8 80A57CD8 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 00ADC 80A57CDC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00AE0 80A57CE0 4606203C */ c.lt.s $f4, $f6 -/* 00AE4 80A57CE4 00000000 */ nop -/* 00AE8 80A57CE8 45000005 */ bc1f .L80A57D00 -/* 00AEC 80A57CEC 00000000 */ nop -/* 00AF0 80A57CF0 0C295D70 */ jal func_80A575C0 -/* 00AF4 80A57CF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AF8 80A57CF8 10000036 */ beq $zero, $zero, .L80A57DD4 -/* 00AFC 80A57CFC 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A57D00: -/* 00B00 80A57D00 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00B04 80A57D04 AFA40038 */ sw $a0, 0x0038($sp) -/* 00B08 80A57D08 10400005 */ beq $v0, $zero, .L80A57D20 -/* 00B0C 80A57D0C 8FA40038 */ lw $a0, 0x0038($sp) -/* 00B10 80A57D10 0C295D56 */ jal func_80A57558 -/* 00B14 80A57D14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B18 80A57D18 1000002E */ beq $zero, $zero, .L80A57DD4 -/* 00B1C 80A57D1C 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A57D20: -/* 00B20 80A57D20 0C0295B2 */ jal func_800A56C8 -/* 00B24 80A57D24 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 00B28 80A57D28 5040002A */ beql $v0, $zero, .L80A57DD4 -/* 00B2C 80A57D2C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00B30 80A57D30 0C01DE1C */ jal Math_Sins - ## sins? -/* 00B34 80A57D34 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00B38 80A57D38 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 00B3C 80A57D3C 44814000 */ mtc1 $at, $f8 ## $f8 = 23.00 -/* 00B40 80A57D40 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 00B44 80A57D44 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 00B48 80A57D48 46080282 */ mul.s $f10, $f0, $f8 -/* 00B4C 80A57D4C 44813000 */ mtc1 $at, $f6 ## $f6 = 12.00 -/* 00B50 80A57D50 46105480 */ add.s $f18, $f10, $f16 -/* 00B54 80A57D54 E7B2003C */ swc1 $f18, 0x003C($sp) -/* 00B58 80A57D58 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00B5C 80A57D5C 46062200 */ add.s $f8, $f4, $f6 -/* 00B60 80A57D60 E7A80040 */ swc1 $f8, 0x0040($sp) -/* 00B64 80A57D64 0C01DE0D */ jal Math_Coss - ## coss? -/* 00B68 80A57D68 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00B6C 80A57D6C 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 00B70 80A57D70 44815000 */ mtc1 $at, $f10 ## $f10 = 23.00 -/* 00B74 80A57D74 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00B78 80A57D78 C7A40040 */ lwc1 $f4, 0x0040($sp) -/* 00B7C 80A57D7C 460A0402 */ mul.s $f16, $f0, $f10 -/* 00B80 80A57D80 8FA5004C */ lw $a1, 0x004C($sp) -/* 00B84 80A57D84 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00B88 80A57D88 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00B8C 80A57D8C 24060193 */ addiu $a2, $zero, 0x0193 ## $a2 = 00000193 -/* 00B90 80A57D90 8FA7003C */ lw $a3, 0x003C($sp) -/* 00B94 80A57D94 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 00B98 80A57D98 46128080 */ add.s $f2, $f16, $f18 -/* 00B9C 80A57D9C E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00BA0 80A57DA0 860E00B4 */ lh $t6, 0x00B4($s0) ## 000000B4 -/* 00BA4 80A57DA4 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00BA8 80A57DA8 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 00BAC 80A57DAC AFAF001C */ sw $t7, 0x001C($sp) -/* 00BB0 80A57DB0 861800B8 */ lh $t8, 0x00B8($s0) ## 000000B8 -/* 00BB4 80A57DB4 AFB90024 */ sw $t9, 0x0024($sp) -/* 00BB8 80A57DB8 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00BBC 80A57DBC AFB80020 */ sw $t8, 0x0020($sp) -/* 00BC0 80A57DC0 10400003 */ beq $v0, $zero, .L80A57DD0 -/* 00BC4 80A57DC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BC8 80A57DC8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00BCC 80A57DCC 2405387E */ addiu $a1, $zero, 0x387E ## $a1 = 0000387E -.L80A57DD0: -/* 00BD0 80A57DD0 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A57DD4: -/* 00BD4 80A57DD4 8FB00030 */ lw $s0, 0x0030($sp) -/* 00BD8 80A57DD8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00BDC 80A57DDC 03E00008 */ jr $ra -/* 00BE0 80A57DE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57DE4.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57DE4.s deleted file mode 100644 index 15421820c..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57DE4.s +++ /dev/null @@ -1,79 +0,0 @@ -glabel func_80A57DE4 -/* 00BE4 80A57DE4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00BE8 80A57DE8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00BEC 80A57DEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00BF0 80A57DF0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00BF4 80A57DF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00BF8 80A57DF8 AFA50034 */ sw $a1, 0x0034($sp) -/* 00BFC 80A57DFC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00C00 80A57E00 AFA40024 */ sw $a0, 0x0024($sp) -/* 00C04 80A57E04 10400005 */ beq $v0, $zero, .L80A57E1C -/* 00C08 80A57E08 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00C0C 80A57E0C 0C295D15 */ jal func_80A57454 -/* 00C10 80A57E10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C14 80A57E14 10000023 */ beq $zero, $zero, .L80A57EA4 -/* 00C18 80A57E18 8FA40024 */ lw $a0, 0x0024($sp) -.L80A57E1C: -/* 00C1C 80A57E1C 44811000 */ mtc1 $at, $f2 ## $f2 = 0.00 -/* 00C20 80A57E20 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 00C24 80A57E24 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00C28 80A57E28 4602003C */ c.lt.s $f0, $f2 -/* 00C2C 80A57E2C 00000000 */ nop -/* 00C30 80A57E30 45020004 */ bc1fl .L80A57E44 -/* 00C34 80A57E34 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 00C38 80A57E38 1000000C */ beq $zero, $zero, .L80A57E6C -/* 00C3C 80A57E3C 46001006 */ mov.s $f0, $f2 -/* 00C40 80A57E40 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -.L80A57E44: -/* 00C44 80A57E44 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00C48 80A57E48 4600203C */ c.lt.s $f4, $f0 -/* 00C4C 80A57E4C 00000000 */ nop -/* 00C50 80A57E50 45020005 */ bc1fl .L80A57E68 -/* 00C54 80A57E54 46000086 */ mov.s $f2, $f0 -/* 00C58 80A57E58 44811000 */ mtc1 $at, $f2 ## $f2 = 3.00 -/* 00C5C 80A57E5C 10000003 */ beq $zero, $zero, .L80A57E6C -/* 00C60 80A57E60 46001006 */ mov.s $f0, $f2 -/* 00C64 80A57E64 46000086 */ mov.s $f2, $f0 -.L80A57E68: -/* 00C68 80A57E68 46001006 */ mov.s $f0, $f2 -.L80A57E6C: -/* 00C6C 80A57E6C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00C70 80A57E70 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 00C74 80A57E74 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 00C78 80A57E78 44815000 */ mtc1 $at, $f10 ## $f10 = 12.00 -/* 00C7C 80A57E7C 46003201 */ sub.s $f8, $f6, $f0 -/* 00C80 80A57E80 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00C84 80A57E84 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 00C88 80A57E88 460A4402 */ mul.s $f16, $f8, $f10 -/* 00C8C 80A57E8C 46128100 */ add.s $f4, $f16, $f18 -/* 00C90 80A57E90 4600218D */ trunc.w.s $f6, $f4 -/* 00C94 80A57E94 440F3000 */ mfc1 $t7, $f6 -/* 00C98 80A57E98 00000000 */ nop -/* 00C9C 80A57E9C A60F0256 */ sh $t7, 0x0256($s0) ## 00000256 -/* 00CA0 80A57EA0 8FA40024 */ lw $a0, 0x0024($sp) -.L80A57EA4: -/* 00CA4 80A57EA4 0C0295B2 */ jal func_800A56C8 -/* 00CA8 80A57EA8 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 -/* 00CAC 80A57EAC 10400004 */ beq $v0, $zero, .L80A57EC0 -/* 00CB0 80A57EB0 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00CB4 80A57EB4 92180225 */ lbu $t8, 0x0225($s0) ## 00000225 -/* 00CB8 80A57EB8 3319FFFE */ andi $t9, $t8, 0xFFFE ## $t9 = 00000000 -/* 00CBC 80A57EBC A2190225 */ sb $t9, 0x0225($s0) ## 00000225 -.L80A57EC0: -/* 00CC0 80A57EC0 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 -/* 00CC4 80A57EC4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00CC8 80A57EC8 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00CCC 80A57ECC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 00CD0 80A57ED0 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 00CD4 80A57ED4 8E050010 */ lw $a1, 0x0010($s0) ## 00000010 -/* 00CD8 80A57ED8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00CDC 80A57EDC 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00CE0 80A57EE0 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 00CE4 80A57EE4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CE8 80A57EE8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00CEC 80A57EEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00CF0 80A57EF0 03E00008 */ jr $ra -/* 00CF4 80A57EF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57EF8.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57EF8.s deleted file mode 100644 index c9d46befc..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57EF8.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80A57EF8 -/* 00CF8 80A57EF8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00CFC 80A57EFC AFB00018 */ sw $s0, 0x0018($sp) -/* 00D00 80A57F00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D04 80A57F04 AFBF001C */ sw $ra, 0x001C($sp) -/* 00D08 80A57F08 AFA50024 */ sw $a1, 0x0024($sp) -/* 00D0C 80A57F0C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00D10 80A57F10 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00D14 80A57F14 50400008 */ beql $v0, $zero, .L80A57F38 -/* 00D18 80A57F18 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00D1C 80A57F1C 860E008A */ lh $t6, 0x008A($s0) ## 0000008A -/* 00D20 80A57F20 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00D24 80A57F24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D28 80A57F28 01C17821 */ addu $t7, $t6, $at -/* 00D2C 80A57F2C 0C295DBF */ jal func_80A576FC -/* 00D30 80A57F30 A60F0196 */ sh $t7, 0x0196($s0) ## 00000196 -/* 00D34 80A57F34 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -.L80A57F38: -/* 00D38 80A57F38 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00D3C 80A57F3C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00D40 80A57F40 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 00D44 80A57F44 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 -/* 00D48 80A57F48 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D4C 80A57F4C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00D50 80A57F50 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00D54 80A57F54 03E00008 */ jr $ra -/* 00D58 80A57F58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F5C.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F5C.s deleted file mode 100644 index 40d78c258..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F5C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A57F5C -/* 00D5C 80A57F5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D60 80A57F60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D64 80A57F64 AFA40018 */ sw $a0, 0x0018($sp) -/* 00D68 80A57F68 AFA5001C */ sw $a1, 0x001C($sp) -/* 00D6C 80A57F6C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00D70 80A57F70 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00D74 80A57F74 50400004 */ beql $v0, $zero, .L80A57F88 -/* 00D78 80A57F78 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D7C 80A57F7C 0C295E14 */ jal func_80A57850 -/* 00D80 80A57F80 8FA40018 */ lw $a0, 0x0018($sp) -/* 00D84 80A57F84 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A57F88: -/* 00D88 80A57F88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D8C 80A57F8C 03E00008 */ jr $ra -/* 00D90 80A57F90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F94.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F94.s deleted file mode 100644 index 783df26db..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F94.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80A57F94 -/* 00D94 80A57F94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D98 80A57F98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D9C 80A57F9C 908E0002 */ lbu $t6, 0x0002($a0) ## 00000002 -/* 00DA0 80A57FA0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00DA4 80A57FA4 51C1001D */ beql $t6, $at, .L80A5801C -/* 00DA8 80A57FA8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00DAC 80A57FAC 908F0226 */ lbu $t7, 0x0226($a0) ## 00000226 -/* 00DB0 80A57FB0 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 00DB4 80A57FB4 57000005 */ bnel $t8, $zero, .L80A57FCC -/* 00DB8 80A57FB8 8C880004 */ lw $t0, 0x0004($a0) ## 00000004 -/* 00DBC 80A57FBC 9099010C */ lbu $t9, 0x010C($a0) ## 0000010C -/* 00DC0 80A57FC0 53200007 */ beql $t9, $zero, .L80A57FE0 -/* 00DC4 80A57FC4 8C8A0004 */ lw $t2, 0x0004($a0) ## 00000004 -/* 00DC8 80A57FC8 8C880004 */ lw $t0, 0x0004($a0) ## 00000004 -.L80A57FCC: -/* 00DCC 80A57FCC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00DD0 80A57FD0 01014825 */ or $t1, $t0, $at ## $t1 = 00010000 -/* 00DD4 80A57FD4 10000006 */ beq $zero, $zero, .L80A57FF0 -/* 00DD8 80A57FD8 AC890004 */ sw $t1, 0x0004($a0) ## 00000004 -/* 00DDC 80A57FDC 8C8A0004 */ lw $t2, 0x0004($a0) ## 00000004 -.L80A57FE0: -/* 00DE0 80A57FE0 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 00DE4 80A57FE4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 00DE8 80A57FE8 01415824 */ and $t3, $t2, $at -/* 00DEC 80A57FEC AC8B0004 */ sw $t3, 0x0004($a0) ## 00000004 -.L80A57FF0: -/* 00DF0 80A57FF0 3C014302 */ lui $at, 0x4302 ## $at = 43020000 -/* 00DF4 80A57FF4 44813000 */ mtc1 $at, $f6 ## $f6 = 130.00 -/* 00DF8 80A57FF8 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00DFC 80A57FFC 4606203C */ c.lt.s $f4, $f6 -/* 00E00 80A58000 00000000 */ nop -/* 00E04 80A58004 45020005 */ bc1fl .L80A5801C -/* 00E08 80A58008 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E0C 80A5800C 948C0198 */ lhu $t4, 0x0198($a0) ## 00000198 -/* 00E10 80A58010 0C00BCBD */ jal func_8002F2F4 -/* 00E14 80A58014 A48C010E */ sh $t4, 0x010E($a0) ## 0000010E -/* 00E18 80A58018 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A5801C: -/* 00E1C 80A5801C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E20 80A58020 03E00008 */ jr $ra -/* 00E24 80A58024 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58028.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58028.s deleted file mode 100644 index 097a7c24d..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58028.s +++ /dev/null @@ -1,186 +0,0 @@ -glabel func_80A58028 -/* 00E28 80A58028 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00E2C 80A5802C AFB00020 */ sw $s0, 0x0020($sp) -/* 00E30 80A58030 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E34 80A58034 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00E38 80A58038 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E3C 80A5803C AFA50044 */ sw $a1, 0x0044($sp) -/* 00E40 80A58040 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00E44 80A58044 AFA4002C */ sw $a0, 0x002C($sp) -/* 00E48 80A58048 8FA4002C */ lw $a0, 0x002C($sp) -/* 00E4C 80A5804C 0C0295B2 */ jal func_800A56C8 -/* 00E50 80A58050 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00E54 80A58054 10400005 */ beq $v0, $zero, .L80A5806C -/* 00E58 80A58058 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 00E5C 80A5805C 86030194 */ lh $v1, 0x0194($s0) ## 00000194 -/* 00E60 80A58060 10600002 */ beq $v1, $zero, .L80A5806C -/* 00E64 80A58064 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 00E68 80A58068 A60E0194 */ sh $t6, 0x0194($s0) ## 00000194 -.L80A5806C: -/* 00E6C 80A5806C 54400005 */ bnel $v0, $zero, .L80A58084 -/* 00E70 80A58070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E74 80A58074 0C0295B2 */ jal func_800A56C8 -/* 00E78 80A58078 8FA4002C */ lw $a0, 0x002C($sp) -/* 00E7C 80A5807C 10400003 */ beq $v0, $zero, .L80A5808C -/* 00E80 80A58080 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A58084: -/* 00E84 80A58084 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00E88 80A58088 2405387F */ addiu $a1, $zero, 0x387F ## $a1 = 0000387F -.L80A5808C: -/* 00E8C 80A5808C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00E90 80A58090 3C0540F0 */ lui $a1, 0x40F0 ## $a1 = 40F00000 -/* 00E94 80A58094 0C01DE80 */ jal Math_ApproxF - -/* 00E98 80A58098 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00E9C 80A5809C 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -/* 00EA0 80A580A0 240F00B6 */ addiu $t7, $zero, 0x00B6 ## $t7 = 000000B6 -/* 00EA4 80A580A4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00EA8 80A580A8 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00EAC 80A580AC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00EB0 80A580B0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00EB4 80A580B4 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 -/* 00EB8 80A580B8 5440003F */ bnel $v0, $zero, .L80A581B8 -/* 00EBC 80A580BC 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 00EC0 80A580C0 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 00EC4 80A580C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EC8 80A580C8 30580020 */ andi $t8, $v0, 0x0020 ## $t8 = 00000000 -/* 00ECC 80A580CC 13000005 */ beq $t8, $zero, .L80A580E4 -/* 00ED0 80A580D0 30590008 */ andi $t9, $v0, 0x0008 ## $t9 = 00000000 -/* 00ED4 80A580D4 0C00B6B0 */ jal func_8002DAC0 -/* 00ED8 80A580D8 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 00EDC 80A580DC 10000035 */ beq $zero, $zero, .L80A581B4 -/* 00EE0 80A580E0 A6020196 */ sh $v0, 0x0196($s0) ## 00000196 -.L80A580E4: -/* 00EE4 80A580E4 53200005 */ beql $t9, $zero, .L80A580FC -/* 00EE8 80A580E8 86090194 */ lh $t1, 0x0194($s0) ## 00000194 -/* 00EEC 80A580EC 8608007E */ lh $t0, 0x007E($s0) ## 0000007E -/* 00EF0 80A580F0 10000030 */ beq $zero, $zero, .L80A581B4 -/* 00EF4 80A580F4 A6080196 */ sh $t0, 0x0196($s0) ## 00000196 -/* 00EF8 80A580F8 86090194 */ lh $t1, 0x0194($s0) ## 00000194 -.L80A580FC: -/* 00EFC 80A580FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F00 80A58100 55200029 */ bnel $t1, $zero, .L80A581A8 -/* 00F04 80A58104 860C008A */ lh $t4, 0x008A($s0) ## 0000008A -/* 00F08 80A58108 0C00B6B0 */ jal func_8002DAC0 -/* 00F0C 80A5810C 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 00F10 80A58110 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00F14 80A58114 00451823 */ subu $v1, $v0, $a1 -/* 00F18 80A58118 00031C00 */ sll $v1, $v1, 16 -/* 00F1C 80A5811C 00031C03 */ sra $v1, $v1, 16 -/* 00F20 80A58120 04600003 */ bltz $v1, .L80A58130 -/* 00F24 80A58124 00032023 */ subu $a0, $zero, $v1 -/* 00F28 80A58128 10000001 */ beq $zero, $zero, .L80A58130 -/* 00F2C 80A5812C 00602025 */ or $a0, $v1, $zero ## $a0 = 00000000 -.L80A58130: -/* 00F30 80A58130 28812001 */ slti $at, $a0, 0x2001 -/* 00F34 80A58134 54200004 */ bnel $at, $zero, .L80A58148 -/* 00F38 80A58138 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -/* 00F3C 80A5813C 1000001D */ beq $zero, $zero, .L80A581B4 -/* 00F40 80A58140 A6020196 */ sh $v0, 0x0196($s0) ## 00000196 -/* 00F44 80A58144 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -.L80A58148: -/* 00F48 80A58148 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00F4C 80A5814C 44859000 */ mtc1 $a1, $f18 ## $f18 = 0.00 -/* 00F50 80A58150 468021A0 */ cvt.s.w $f6, $f4 -/* 00F54 80A58154 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00F58 80A58158 4606403E */ c.le.s $f8, $f6 -/* 00F5C 80A5815C 00000000 */ nop -/* 00F60 80A58160 45020006 */ bc1fl .L80A5817C -/* 00F64 80A58164 44810000 */ mtc1 $at, $f0 ## $f0 = -1.00 -/* 00F68 80A58168 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00F6C 80A5816C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00F70 80A58170 10000004 */ beq $zero, $zero, .L80A58184 -/* 00F74 80A58174 3C01C600 */ lui $at, 0xC600 ## $at = C6000000 -/* 00F78 80A58178 44810000 */ mtc1 $at, $f0 ## $f0 = -8192.00 -.L80A5817C: -/* 00F7C 80A5817C 00000000 */ nop -/* 00F80 80A58180 3C01C600 */ lui $at, 0xC600 ## $at = C6000000 -.L80A58184: -/* 00F84 80A58184 44815000 */ mtc1 $at, $f10 ## $f10 = -8192.00 -/* 00F88 80A58188 46809120 */ cvt.s.w $f4, $f18 -/* 00F8C 80A5818C 460A0402 */ mul.s $f16, $f0, $f10 -/* 00F90 80A58190 46048180 */ add.s $f6, $f16, $f4 -/* 00F94 80A58194 4600320D */ trunc.w.s $f8, $f6 -/* 00F98 80A58198 440B4000 */ mfc1 $t3, $f8 -/* 00F9C 80A5819C 10000005 */ beq $zero, $zero, .L80A581B4 -/* 00FA0 80A581A0 A60B0196 */ sh $t3, 0x0196($s0) ## 00000196 -/* 00FA4 80A581A4 860C008A */ lh $t4, 0x008A($s0) ## 0000008A -.L80A581A8: -/* 00FA8 80A581A8 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00FAC 80A581AC 01816821 */ addu $t5, $t4, $at -/* 00FB0 80A581B0 A60D0196 */ sh $t5, 0x0196($s0) ## 00000196 -.L80A581B4: -/* 00FB4 80A581B4 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -.L80A581B8: -/* 00FB8 80A581B8 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00FBC 80A581BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FC0 80A581C0 01C17821 */ addu $t7, $t6, $at -/* 00FC4 80A581C4 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 00FC8 80A581C8 0C00BC65 */ jal func_8002F194 -/* 00FCC 80A581CC 8FA50044 */ lw $a1, 0x0044($sp) -/* 00FD0 80A581D0 50400006 */ beql $v0, $zero, .L80A581EC -/* 00FD4 80A581D4 86180194 */ lh $t8, 0x0194($s0) ## 00000194 -/* 00FD8 80A581D8 0C295DD1 */ jal func_80A57744 -/* 00FDC 80A581DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FE0 80A581E0 10000031 */ beq $zero, $zero, .L80A582A8 -/* 00FE4 80A581E4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00FE8 80A581E8 86180194 */ lh $t8, 0x0194($s0) ## 00000194 -.L80A581EC: -/* 00FEC 80A581EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FF0 80A581F0 5700002A */ bnel $t8, $zero, .L80A5829C -/* 00FF4 80A581F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FF8 80A581F8 0C00B6EC */ jal func_8002DBB0 -/* 00FFC 80A581FC 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 01000 80A58200 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01004 80A58204 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 01008 80A58208 00000000 */ nop -/* 0100C 80A5820C 460A003C */ c.lt.s $f0, $f10 -/* 01010 80A58210 00000000 */ nop -/* 01014 80A58214 45020021 */ bc1fl .L80A5829C -/* 01018 80A58218 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0101C 80A5821C C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 01020 80A58220 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -/* 01024 80A58224 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01028 80A58228 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 0102C 80A5822C 46109001 */ sub.s $f0, $f18, $f16 -/* 01030 80A58230 46000005 */ abs.s $f0, $f0 -/* 01034 80A58234 4604003C */ c.lt.s $f0, $f4 -/* 01038 80A58238 00000000 */ nop -/* 0103C 80A5823C 45020017 */ bc1fl .L80A5829C -/* 01040 80A58240 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01044 80A58244 92190002 */ lbu $t9, 0x0002($s0) ## 00000002 -/* 01048 80A58248 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0104C 80A5824C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01050 80A58250 1721000D */ bne $t9, $at, .L80A58288 -/* 01054 80A58254 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 01058 80A58258 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 0105C 80A5825C 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 01060 80A58260 3421FFF6 */ ori $at, $at, 0xFFF6 ## $at = FFFEFFF6 -/* 01064 80A58264 8FA40044 */ lw $a0, 0x0044($sp) -/* 01068 80A58268 01014824 */ and $t1, $t0, $at -/* 0106C 80A5826C AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -/* 01070 80A58270 352B0005 */ ori $t3, $t1, 0x0005 ## $t3 = 00000005 -/* 01074 80A58274 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 01078 80A58278 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0107C 80A5827C 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 01080 80A58280 0C00CDD2 */ jal Actor_ChangeType - -/* 01084 80A58284 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -.L80A58288: -/* 01088 80A58288 0C295D70 */ jal func_80A575C0 -/* 0108C 80A5828C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01090 80A58290 10000005 */ beq $zero, $zero, .L80A582A8 -/* 01094 80A58294 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01098 80A58298 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A5829C: -/* 0109C 80A5829C 0C295FE5 */ jal func_80A57F94 -/* 010A0 80A582A0 8FA50044 */ lw $a1, 0x0044($sp) -/* 010A4 80A582A4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A582A8: -/* 010A8 80A582A8 8FB00020 */ lw $s0, 0x0020($sp) -/* 010AC 80A582AC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 010B0 80A582B0 03E00008 */ jr $ra -/* 010B4 80A582B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A582B8.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A582B8.s deleted file mode 100644 index 26d7e5d49..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A582B8.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80A582B8 -/* 010B8 80A582B8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 010BC 80A582BC AFBF001C */ sw $ra, 0x001C($sp) -/* 010C0 80A582C0 AFA40020 */ sw $a0, 0x0020($sp) -/* 010C4 80A582C4 AFA50024 */ sw $a1, 0x0024($sp) -/* 010C8 80A582C8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 010CC 80A582CC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010D0 80A582D0 8FA30020 */ lw $v1, 0x0020($sp) -/* 010D4 80A582D4 240E0100 */ addiu $t6, $zero, 0x0100 ## $t6 = 00000100 -/* 010D8 80A582D8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 010DC 80A582DC 8465008A */ lh $a1, 0x008A($v1) ## 0000008A -/* 010E0 80A582E0 AFAE0010 */ sw $t6, 0x0010($sp) -/* 010E4 80A582E4 24070400 */ addiu $a3, $zero, 0x0400 ## $a3 = 00000400 -/* 010E8 80A582E8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 010EC 80A582EC 246400B6 */ addiu $a0, $v1, 0x00B6 ## $a0 = 000000B6 -/* 010F0 80A582F0 8FA40024 */ lw $a0, 0x0024($sp) -/* 010F4 80A582F4 0C042F6F */ jal func_8010BDBC -/* 010F8 80A582F8 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 010FC 80A582FC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01100 80A58300 14410003 */ bne $v0, $at, .L80A58310 -/* 01104 80A58304 8FA40020 */ lw $a0, 0x0020($sp) -/* 01108 80A58308 0C295DE4 */ jal func_80A57790 -/* 0110C 80A5830C 8FA50024 */ lw $a1, 0x0024($sp) -.L80A58310: -/* 01110 80A58310 8FBF001C */ lw $ra, 0x001C($sp) -/* 01114 80A58314 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01118 80A58318 03E00008 */ jr $ra -/* 0111C 80A5831C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58320.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58320.s deleted file mode 100644 index cae012036..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58320.s +++ /dev/null @@ -1,129 +0,0 @@ -glabel func_80A58320 -/* 01120 80A58320 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01124 80A58324 AFB00014 */ sw $s0, 0x0014($sp) -/* 01128 80A58328 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0112C 80A5832C AFBF001C */ sw $ra, 0x001C($sp) -/* 01130 80A58330 AFB10018 */ sw $s1, 0x0018($sp) -/* 01134 80A58334 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01138 80A58338 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0113C 80A5833C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01140 80A58340 AFA40024 */ sw $a0, 0x0024($sp) -/* 01144 80A58344 86030194 */ lh $v1, 0x0194($s0) ## 00000194 -/* 01148 80A58348 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0114C 80A5834C 10600002 */ beq $v1, $zero, .L80A58358 -/* 01150 80A58350 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 01154 80A58354 A60E0194 */ sh $t6, 0x0194($s0) ## 00000194 -.L80A58358: -/* 01158 80A58358 0C0295B2 */ jal func_800A56C8 -/* 0115C 80A5835C 8FA40024 */ lw $a0, 0x0024($sp) -/* 01160 80A58360 14400004 */ bne $v0, $zero, .L80A58374 -/* 01164 80A58364 8FA40024 */ lw $a0, 0x0024($sp) -/* 01168 80A58368 0C0295B2 */ jal func_800A56C8 -/* 0116C 80A5836C 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 01170 80A58370 10400003 */ beq $v0, $zero, .L80A58380 -.L80A58374: -/* 01174 80A58374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01178 80A58378 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0117C 80A5837C 2405387F */ addiu $a1, $zero, 0x387F ## $a1 = 0000387F -.L80A58380: -/* 01180 80A58380 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 01184 80A58384 31F80008 */ andi $t8, $t7, 0x0008 ## $t8 = 00000000 -/* 01188 80A58388 53000004 */ beql $t8, $zero, .L80A5839C -/* 0118C 80A5838C 863907A0 */ lh $t9, 0x07A0($s1) ## 000007A0 -/* 01190 80A58390 1000002A */ beq $zero, $zero, .L80A5843C -/* 01194 80A58394 8605007E */ lh $a1, 0x007E($s0) ## 0000007E -/* 01198 80A58398 863907A0 */ lh $t9, 0x07A0($s1) ## 000007A0 -.L80A5839C: -/* 0119C 80A5839C 00194080 */ sll $t0, $t9, 2 -/* 011A0 80A583A0 02284821 */ addu $t1, $s1, $t0 -/* 011A4 80A583A4 0C016A7D */ jal func_8005A9F4 -/* 011A8 80A583A8 8D240790 */ lw $a0, 0x0790($t1) ## 00000790 -/* 011AC 80A583AC 860A008A */ lh $t2, 0x008A($s0) ## 0000008A -/* 011B0 80A583B0 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 011B4 80A583B4 01422823 */ subu $a1, $t2, $v0 -/* 011B8 80A583B8 00A12821 */ addu $a1, $a1, $at -/* 011BC 80A583BC 00052C00 */ sll $a1, $a1, 16 -/* 011C0 80A583C0 00052C03 */ sra $a1, $a1, 16 -/* 011C4 80A583C4 04A00003 */ bltz $a1, .L80A583D4 -/* 011C8 80A583C8 00051023 */ subu $v0, $zero, $a1 -/* 011CC 80A583CC 10000001 */ beq $zero, $zero, .L80A583D4 -/* 011D0 80A583D0 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 -.L80A583D4: -/* 011D4 80A583D4 28414001 */ slti $at, $v0, 0x4001 -/* 011D8 80A583D8 5420000C */ bnel $at, $zero, .L80A5840C -/* 011DC 80A583DC 862E07A0 */ lh $t6, 0x07A0($s1) ## 000007A0 -/* 011E0 80A583E0 862B07A0 */ lh $t3, 0x07A0($s1) ## 000007A0 -/* 011E4 80A583E4 000B6080 */ sll $t4, $t3, 2 -/* 011E8 80A583E8 022C6821 */ addu $t5, $s1, $t4 -/* 011EC 80A583EC 0C016A7D */ jal func_8005A9F4 -/* 011F0 80A583F0 8DA40790 */ lw $a0, 0x0790($t5) ## 00000790 -/* 011F4 80A583F4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 011F8 80A583F8 00412821 */ addu $a1, $v0, $at -/* 011FC 80A583FC 00052C00 */ sll $a1, $a1, 16 -/* 01200 80A58400 1000000E */ beq $zero, $zero, .L80A5843C -/* 01204 80A58404 00052C03 */ sra $a1, $a1, 16 -/* 01208 80A58408 862E07A0 */ lh $t6, 0x07A0($s1) ## 000007A0 -.L80A5840C: -/* 0120C 80A5840C 000E7880 */ sll $t7, $t6, 2 -/* 01210 80A58410 022FC021 */ addu $t8, $s1, $t7 -/* 01214 80A58414 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 -/* 01218 80A58418 0C016A7D */ jal func_8005A9F4 -/* 0121C 80A5841C A7A5002E */ sh $a1, 0x002E($sp) -/* 01220 80A58420 87A5002E */ lh $a1, 0x002E($sp) -/* 01224 80A58424 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01228 80A58428 0005C843 */ sra $t9, $a1, 1 -/* 0122C 80A5842C 00592823 */ subu $a1, $v0, $t9 -/* 01230 80A58430 00A12821 */ addu $a1, $a1, $at -/* 01234 80A58434 00052C00 */ sll $a1, $a1, 16 -/* 01238 80A58438 00052C03 */ sra $a1, $a1, 16 -.L80A5843C: -/* 0123C 80A5843C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01240 80A58440 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 01244 80A58444 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 01248 80A58448 86090194 */ lh $t1, 0x0194($s0) ## 00000194 -/* 0124C 80A5844C 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 01250 80A58450 11200008 */ beq $t1, $zero, .L80A58474 -/* 01254 80A58454 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -/* 01258 80A58458 C60400EC */ lwc1 $f4, 0x00EC($s0) ## 000000EC -/* 0125C 80A5845C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01260 80A58460 00000000 */ nop -/* 01264 80A58464 4606203C */ c.lt.s $f4, $f6 -/* 01268 80A58468 00000000 */ nop -/* 0126C 80A5846C 45020017 */ bc1fl .L80A584CC -/* 01270 80A58470 8FBF001C */ lw $ra, 0x001C($sp) -.L80A58474: -/* 01274 80A58474 0C041B33 */ jal func_80106CCC -/* 01278 80A58478 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0127C 80A5847C 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 01280 80A58480 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01284 80A58484 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01288 80A58488 55410007 */ bnel $t2, $at, .L80A584A8 -/* 0128C 80A5848C 8E06011C */ lw $a2, 0x011C($s0) ## 0000011C -/* 01290 80A58490 0C00B33C */ jal Flags_SetClear - -/* 01294 80A58494 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 01298 80A58498 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 -/* 0129C 80A5849C 3C0180A6 */ lui $at, %hi(D_80A58A34) ## $at = 80A60000 -/* 012A0 80A584A0 A42B8A34 */ sh $t3, %lo(D_80A58A34)($at) -/* 012A4 80A584A4 8E06011C */ lw $a2, 0x011C($s0) ## 0000011C -.L80A584A8: -/* 012A8 80A584A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 012AC 80A584AC 26251C24 */ addiu $a1, $s1, 0x1C24 ## $a1 = 00001C24 -/* 012B0 80A584B0 10C00003 */ beq $a2, $zero, .L80A584C0 -/* 012B4 80A584B4 00000000 */ nop -/* 012B8 80A584B8 0C00CDD2 */ jal Actor_ChangeType - -/* 012BC 80A584BC 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -.L80A584C0: -/* 012C0 80A584C0 0C00B55C */ jal Actor_Kill - -/* 012C4 80A584C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012C8 80A584C8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A584CC: -/* 012CC 80A584CC 8FB00014 */ lw $s0, 0x0014($sp) -/* 012D0 80A584D0 8FB10018 */ lw $s1, 0x0018($sp) -/* 012D4 80A584D4 03E00008 */ jr $ra -/* 012D8 80A584D8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A584DC.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A584DC.s deleted file mode 100644 index 28afd07fc..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A584DC.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel func_80A584DC -/* 012DC 80A584DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 012E0 80A584E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 012E4 80A584E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 012E8 80A584E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 012EC 80A584EC AFA5002C */ sw $a1, 0x002C($sp) -/* 012F0 80A584F0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 012F4 80A584F4 A08E0114 */ sb $t6, 0x0114($a0) ## 00000114 -/* 012F8 80A584F8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 012FC 80A584FC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01300 80A58500 AFA40024 */ sw $a0, 0x0024($sp) -/* 01304 80A58504 8FA40024 */ lw $a0, 0x0024($sp) -/* 01308 80A58508 0C0295B2 */ jal func_800A56C8 -/* 0130C 80A5850C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01310 80A58510 10400003 */ beq $v0, $zero, .L80A58520 -/* 01314 80A58514 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01318 80A58518 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0131C 80A5851C 24053882 */ addiu $a1, $zero, 0x3882 ## $a1 = 00003882 -.L80A58520: -/* 01320 80A58520 860F0194 */ lh $t7, 0x0194($s0) ## 00000194 -/* 01324 80A58524 3C0280A6 */ lui $v0, %hi(D_80A58A34) ## $v0 = 80A60000 -/* 01328 80A58528 3C01420C */ lui $at, 0x420C ## $at = 420C0000 -/* 0132C 80A5852C 55E00014 */ bnel $t7, $zero, .L80A58580 -/* 01330 80A58530 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 01334 80A58534 84428A34 */ lh $v0, %lo(D_80A58A34)($v0) -/* 01338 80A58538 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0133C 80A5853C 5441000B */ bnel $v0, $at, .L80A5856C -/* 01340 80A58540 2401FFFC */ addiu $at, $zero, 0xFFFC ## $at = FFFFFFFC -/* 01344 80A58544 8E06011C */ lw $a2, 0x011C($s0) ## 0000011C -/* 01348 80A58548 8FA4002C */ lw $a0, 0x002C($sp) -/* 0134C 80A5854C 10C00003 */ beq $a2, $zero, .L80A5855C -/* 01350 80A58550 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 01354 80A58554 0C00CDD2 */ jal Actor_ChangeType - -/* 01358 80A58558 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -.L80A5855C: -/* 0135C 80A5855C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01360 80A58560 10000024 */ beq $zero, $zero, .L80A585F4 -/* 01364 80A58564 A6180194 */ sh $t8, 0x0194($s0) ## 00000194 -/* 01368 80A58568 2401FFFC */ addiu $at, $zero, 0xFFFC ## $at = FFFFFFFC -.L80A5856C: -/* 0136C 80A5856C 14410021 */ bne $v0, $at, .L80A585F4 -/* 01370 80A58570 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 01374 80A58574 1000001F */ beq $zero, $zero, .L80A585F4 -/* 01378 80A58578 A6190194 */ sh $t9, 0x0194($s0) ## 00000194 -/* 0137C 80A5857C C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -.L80A58580: -/* 01380 80A58580 44813000 */ mtc1 $at, $f6 ## $f6 = NaN -/* 01384 80A58584 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 01388 80A58588 3C0640E0 */ lui $a2, 0x40E0 ## $a2 = 40E00000 -/* 0138C 80A5858C 46062201 */ sub.s $f8, $f4, $f6 -/* 01390 80A58590 44054000 */ mfc1 $a1, $f8 -/* 01394 80A58594 0C01DE80 */ jal Math_ApproxF - -/* 01398 80A58598 00000000 */ nop -/* 0139C 80A5859C 50400016 */ beql $v0, $zero, .L80A585F8 -/* 013A0 80A585A0 8FBF001C */ lw $ra, 0x001C($sp) -/* 013A4 80A585A4 86080194 */ lh $t0, 0x0194($s0) ## 00000194 -/* 013A8 80A585A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 013AC 80A585AC 3C0D80A6 */ lui $t5, %hi(D_80A58A2C) ## $t5 = 80A60000 -/* 013B0 80A585B0 55010006 */ bnel $t0, $at, .L80A585CC -/* 013B4 80A585B4 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 013B8 80A585B8 0C00B55C */ jal Actor_Kill - -/* 013BC 80A585BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013C0 80A585C0 1000000D */ beq $zero, $zero, .L80A585F8 -/* 013C4 80A585C4 8FBF001C */ lw $ra, 0x001C($sp) -/* 013C8 80A585C8 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -.L80A585CC: -/* 013CC 80A585CC 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 013D0 80A585D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013D4 80A585D4 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 013D8 80A585D8 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 013DC 80A585DC 01416024 */ and $t4, $t2, $at -/* 013E0 80A585E0 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -/* 013E4 80A585E4 91AD8A2C */ lbu $t5, %lo(D_80A58A2C)($t5) -/* 013E8 80A585E8 A2000114 */ sb $zero, 0x0114($s0) ## 00000114 -/* 013EC 80A585EC 0C295D15 */ jal func_80A57454 -/* 013F0 80A585F0 A20D00AF */ sb $t5, 0x00AF($s0) ## 000000AF -.L80A585F4: -/* 013F4 80A585F4 8FBF001C */ lw $ra, 0x001C($sp) -.L80A585F8: -/* 013F8 80A585F8 8FB00018 */ lw $s0, 0x0018($sp) -/* 013FC 80A585FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01400 80A58600 03E00008 */ jr $ra -/* 01404 80A58604 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58608.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58608.s deleted file mode 100644 index 9d168fdda..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58608.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80A58608 -/* 01408 80A58608 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0140C 80A5860C AFBF001C */ sw $ra, 0x001C($sp) -/* 01410 80A58610 AFB00018 */ sw $s0, 0x0018($sp) -/* 01414 80A58614 90820225 */ lbu $v0, 0x0225($a0) ## 00000225 -/* 01418 80A58618 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0141C 80A5861C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 01420 80A58620 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 01424 80A58624 11C00017 */ beq $t6, $zero, .L80A58684 -/* 01428 80A58628 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 0142C 80A5862C A08F0225 */ sb $t7, 0x0225($a0) ## 00000225 -/* 01430 80A58630 AFA70024 */ sw $a3, 0x0024($sp) -/* 01434 80A58634 2605022C */ addiu $a1, $s0, 0x022C ## $a1 = 0000022C -/* 01438 80A58638 0C00D594 */ jal func_80035650 -/* 0143C 80A5863C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01440 80A58640 8E18021C */ lw $t8, 0x021C($s0) ## 0000021C -/* 01444 80A58644 24010193 */ addiu $at, $zero, 0x0193 ## $at = 00000193 -/* 01448 80A58648 8FA70024 */ lw $a3, 0x0024($sp) -/* 0144C 80A5864C 87190000 */ lh $t9, 0x0000($t8) ## 00000000 -/* 01450 80A58650 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01454 80A58654 13210005 */ beq $t9, $at, .L80A5866C -/* 01458 80A58658 00000000 */ nop -/* 0145C 80A5865C 0C295D70 */ jal func_80A575C0 -/* 01460 80A58660 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01464 80A58664 10000010 */ beq $zero, $zero, .L80A586A8 -/* 01468 80A58668 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5866C: -/* 0146C 80A5866C 0C295CF4 */ jal func_80A573D0 -/* 01470 80A58670 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 01474 80A58674 0C295D83 */ jal func_80A5760C -/* 01478 80A58678 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0147C 80A5867C 1000000A */ beq $zero, $zero, .L80A586A8 -/* 01480 80A58680 8FBF001C */ lw $ra, 0x001C($sp) -.L80A58684: -/* 01484 80A58684 90E81C26 */ lbu $t0, 0x1C26($a3) ## 00001C26 -/* 01488 80A58688 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0148C 80A5868C 51000006 */ beql $t0, $zero, .L80A586A8 -/* 01490 80A58690 8FBF001C */ lw $ra, 0x001C($sp) -/* 01494 80A58694 0C295CF4 */ jal func_80A573D0 -/* 01498 80A58698 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 0149C 80A5869C 0C295D83 */ jal func_80A5760C -/* 014A0 80A586A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014A4 80A586A4 8FBF001C */ lw $ra, 0x001C($sp) -.L80A586A8: -/* 014A8 80A586A8 8FB00018 */ lw $s0, 0x0018($sp) -/* 014AC 80A586AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 014B0 80A586B0 03E00008 */ jr $ra -/* 014B4 80A586B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58838.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58838.s deleted file mode 100644 index 91c75d526..000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58838.s +++ /dev/null @@ -1,98 +0,0 @@ -.late_rodata -glabel D_80A58A50 - .float 0.0833 -glabel D_80A58A54 - .float 0.1167 -glabel D_80A58A58 - .float 1.7 -glabel D_80A58A5C - .float 0.7 -glabel D_80A58A60 - .float 0.1667 - -.text -glabel func_80A58838 -/* 01638 80A58838 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0163C 80A5883C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01640 80A58840 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01644 80A58844 AFA40018 */ sw $a0, 0x0018($sp) -/* 01648 80A58848 AFA60020 */ sw $a2, 0x0020($sp) -/* 0164C 80A5884C 14A10043 */ bne $a1, $at, .L80A5895C -/* 01650 80A58850 AFA70024 */ sw $a3, 0x0024($sp) -/* 01654 80A58854 8FA2002C */ lw $v0, 0x002C($sp) -/* 01658 80A58858 3C0E80A5 */ lui $t6, %hi(func_80A57CA8) ## $t6 = 80A50000 -/* 0165C 80A5885C 25CE7CA8 */ addiu $t6, $t6, %lo(func_80A57CA8) ## $t6 = 80A57CA8 -/* 01660 80A58860 8C4F0190 */ lw $t7, 0x0190($v0) ## 00000190 -/* 01664 80A58864 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 01668 80A58868 55CF003D */ bnel $t6, $t7, .L80A58960 -/* 0166C 80A5886C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01670 80A58870 44819000 */ mtc1 $at, $f18 ## $f18 = 6.00 -/* 01674 80A58874 C4400164 */ lwc1 $f0, 0x0164($v0) ## 00000164 -/* 01678 80A58878 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 0167C 80A5887C 4612003E */ c.le.s $f0, $f18 -/* 01680 80A58880 00000000 */ nop -/* 01684 80A58884 4502000F */ bc1fl .L80A588C4 -/* 01688 80A58888 44811000 */ mtc1 $at, $f2 ## $f2 = 7.00 -/* 0168C 80A5888C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01690 80A58890 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 01694 80A58894 3C0180A6 */ lui $at, %hi(D_80A58A50) ## $at = 80A60000 -/* 01698 80A58898 C4248A50 */ lwc1 $f4, %lo(D_80A58A50)($at) -/* 0169C 80A5889C 3C0180A6 */ lui $at, %hi(D_80A58A54) ## $at = 80A60000 -/* 016A0 80A588A0 C4288A54 */ lwc1 $f8, %lo(D_80A58A54)($at) -/* 016A4 80A588A4 46040182 */ mul.s $f6, $f0, $f4 -/* 016A8 80A588A8 00000000 */ nop -/* 016AC 80A588AC 46080282 */ mul.s $f10, $f0, $f8 -/* 016B0 80A588B0 46069381 */ sub.s $f14, $f18, $f6 -/* 016B4 80A588B4 46125300 */ add.s $f12, $f10, $f18 -/* 016B8 80A588B8 10000025 */ beq $zero, $zero, .L80A58950 -/* 016BC 80A588BC 46006406 */ mov.s $f16, $f12 -/* 016C0 80A588C0 44811000 */ mtc1 $at, $f2 ## $f2 = -0.00 -.L80A588C4: -/* 016C4 80A588C4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 016C8 80A588C8 4602003E */ c.le.s $f0, $f2 -/* 016CC 80A588CC 00000000 */ nop -/* 016D0 80A588D0 4502000E */ bc1fl .L80A5890C -/* 016D4 80A588D4 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 016D8 80A588D8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 016DC 80A588DC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 016E0 80A588E0 3C0180A6 */ lui $at, %hi(D_80A58A58) ## $at = 80A60000 -/* 016E4 80A588E4 C4268A58 */ lwc1 $f6, %lo(D_80A58A58)($at) -/* 016E8 80A588E8 46120001 */ sub.s $f0, $f0, $f18 -/* 016EC 80A588EC 3C0180A6 */ lui $at, %hi(D_80A58A5C) ## $at = 80A60000 -/* 016F0 80A588F0 C4288A5C */ lwc1 $f8, %lo(D_80A58A5C)($at) -/* 016F4 80A588F4 46002380 */ add.s $f14, $f4, $f0 -/* 016F8 80A588F8 46080282 */ mul.s $f10, $f0, $f8 -/* 016FC 80A588FC 460A3301 */ sub.s $f12, $f6, $f10 -/* 01700 80A58900 10000013 */ beq $zero, $zero, .L80A58950 -/* 01704 80A58904 46006406 */ mov.s $f16, $f12 -/* 01708 80A58908 44812000 */ mtc1 $at, $f4 ## $f4 = -0.00 -.L80A5890C: -/* 0170C 80A5890C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01710 80A58910 4604003E */ c.le.s $f0, $f4 -/* 01714 80A58914 00000000 */ nop -/* 01718 80A58918 4500000B */ bc1f .L80A58948 -/* 0171C 80A5891C 00000000 */ nop -/* 01720 80A58920 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01724 80A58924 46020201 */ sub.s $f8, $f0, $f2 -/* 01728 80A58928 3C0180A6 */ lui $at, %hi(D_80A58A60) ## $at = 80A60000 -/* 0172C 80A5892C C4268A60 */ lwc1 $f6, %lo(D_80A58A60)($at) -/* 01730 80A58930 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 01734 80A58934 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 01738 80A58938 46064282 */ mul.s $f10, $f8, $f6 -/* 0173C 80A5893C 46006406 */ mov.s $f16, $f12 -/* 01740 80A58940 10000003 */ beq $zero, $zero, .L80A58950 -/* 01744 80A58944 460A2381 */ sub.s $f14, $f4, $f10 -.L80A58948: -/* 01748 80A58948 10000005 */ beq $zero, $zero, .L80A58960 -/* 0174C 80A5894C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A58950: -/* 01750 80A58950 44068000 */ mfc1 $a2, $f16 -/* 01754 80A58954 0C0342A3 */ jal Matrix_Scale -/* 01758 80A58958 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80A5895C: -/* 0175C 80A5895C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A58960: -/* 01760 80A58960 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01764 80A58964 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01768 80A58968 03E00008 */ jr $ra -/* 0176C 80A5896C 00000000 */ nop diff --git a/data/overlays/actors/z_en_hintnuts.data.s b/data/overlays/actors/z_en_hintnuts.data.s deleted file mode 100644 index b4ab88e5c..000000000 --- a/data/overlays/actors/z_en_hintnuts.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel En_Hintnuts_InitVars - .word 0x01920500, 0x00000005, 0x01640000, 0x00000260 -.word EnHintnuts_Init -.word EnHintnuts_Destroy -.word EnHintnuts_Update -.word EnHintnuts_Draw -glabel D_80A58A00 - .word 0x06000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00120020, 0x00000000, 0x00000000 -glabel D_80A58A2C - .word 0x01000012, 0x0020FE00 -glabel D_80A58A34 - .word 0x00000000 -glabel D_80A58A38 - .word 0xB06CFFFF, 0x8917000A, 0x304C0A28, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_hintnuts.reloc.s b/data/overlays/actors/z_en_hintnuts.reloc.s deleted file mode 100644 index b7eb2f76f..000000000 --- a/data/overlays/actors/z_en_hintnuts.reloc.s +++ /dev/null @@ -1,11 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata -glabel D_80A58A70 - -.incbin "baserom/ovl_En_Hintnuts", 0x1870, 0x000001A0 @@ -2653,8 +2653,7 @@ endseg beginseg name "ovl_En_Hintnuts" include "build/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.o" - include "build/data/overlays/actors/z_en_hintnuts.data.o" - include "build/data/overlays/actors/z_en_hintnuts.reloc.o" + include "build/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index c44e49ee3..20a90a02a 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -15,7 +15,31 @@ void EnHintnuts_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnHintnuts_Update(Actor* thisx, GlobalContext* globalCtx); void EnHintnuts_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void EnHintnuts_SetupWait(EnHintnuts* this); +void EnHintnuts_Wait(EnHintnuts* this, GlobalContext* globalCtx); +void EnHintnuts_LookAround(EnHintnuts* this, GlobalContext* globalCtx); +void EnHintnuts_Stand(EnHintnuts* this, GlobalContext* globalCtx); +void EnHintnuts_ThrowNut(EnHintnuts* this, GlobalContext* globalCtx); +void EnHintnuts_Burrow(EnHintnuts* this, GlobalContext* globalCtx); +void EnHintnuts_BeginRun(EnHintnuts* this, GlobalContext* globalCtx); +void EnHintnuts_BeginFreeze(EnHintnuts* this, GlobalContext* globalCtx); +void EnHintnuts_Run(EnHintnuts* this, GlobalContext* globalCtx); +void EnHintnuts_Talk(EnHintnuts* this, GlobalContext* globalCtx); +void EnHintnuts_Leave(EnHintnuts* this, GlobalContext* globalCtx); +void EnHintnuts_Freeze(EnHintnuts* this, GlobalContext* globalCtx); + +extern AnimationHeader D_06000168; +extern Gfx D_060014E0[]; +extern SkeletonHeader D_060023B8; +extern AnimationHeader D_060024CC; +extern AnimationHeader D_060026C4; +extern AnimationHeader D_06002B90; +extern AnimationHeader D_06002894; +extern AnimationHeader D_060029BC; +extern AnimationHeader D_06002E84; +extern AnimationHeader D_06002F7C; +extern AnimationHeader D_06003128; + const ActorInit En_Hintnuts_InitVars = { ACTOR_EN_HINTNUTS, ACTORTYPE_ENEMY, @@ -27,61 +51,512 @@ const ActorInit En_Hintnuts_InitVars = { (ActorFunc)EnHintnuts_Update, (ActorFunc)EnHintnuts_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A573D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A578FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57B60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57BE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57CA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57DE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57EF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58028.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A582B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58320.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A584DC.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK6, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 18, 32, 0, { 0, 0, 0 } } +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58608.s") +static CollisionCheckInfoInit sColChkInfoInit = { + 0x01, + 0x0012, + 0x0020, + 0xFE, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Update.s") +static s16 sPuzzleCounter = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58838.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(gravity, -1, ICHAIN_CONTINUE), + ICHAIN_S8(naviEnemyId, 10, ICHAIN_CONTINUE), + ICHAIN_F32(unk_4C, 2600, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s") +void EnHintnuts_Init(Actor* thisx, GlobalContext* globalCtx) { + EnHintnuts* this = THIS; + s32 pad; + + Actor_ProcessInitChain(&this->actor, sInitChain); + if (this->actor.params == 0xA) { + this->actor.flags &= ~5; + } else { + ActorShape_Init(&this->actor.shape, 0x0, ActorShadow_DrawFunc_Circle, 35.0f); + SkelAnime_Init(globalCtx, &this->skelAnime, &D_060023B8, &D_06002F7C, this->limbDrawTable, + this->transitionDrawTable, 10); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + func_80061ED4(&this->actor.colChkInfo, NULL, &sColChkInfoInit); + Actor_SetTextWithPrefix(globalCtx, &this->actor, (this->actor.params >> 8) & 0xFF); + this->textIdCopy = this->actor.textId; + this->actor.params &= 0xFF; + sPuzzleCounter = 0; + if (this->actor.textId == 0x109B) { // "Please forgive me, master!..." + if (Flags_GetClear(globalCtx, 0x9) != 0) { + Actor_Kill(&this->actor); + return; + } + } + EnHintnuts_SetupWait(this); + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_HINTNUTS, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.posRot.rot.y, 0, 0xA); + } +} + +void EnHintnuts_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnHintnuts* this = THIS; + if (this->actor.params != 0xA) { + Collider_DestroyCylinder(globalCtx, &this->collider); + } +} + +void EnHintnuts_HitByScrubProjectile1(EnHintnuts* this, GlobalContext* globalCtx) { + if (this->actor.textId != 0 && this->actor.type == ACTORTYPE_ENEMY && + ((this->actor.params == 0) || (sPuzzleCounter == 2))) { + this->actor.flags &= ~0x5; + this->actor.flags |= 0x9; + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_BG); + } +} + +void EnHintnuts_SetupWait(EnHintnuts* this) { + SkelAnime_ChangeAnimPlaybackStop(&this->skelAnime, &D_06002B90, 0.0f); + this->animFlagAndTimer = Math_Rand_S16Offset(100, 50); + this->collider.dim.height = 5; + this->actor.posRot.pos = this->actor.initPosRot.pos; + this->collider.base.acFlags &= ~1; + this->actionFunc = EnHintnuts_Wait; +} + +void EnHintnuts_SetupLookAround(EnHintnuts* this) { + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_06002894); + this->animFlagAndTimer = 2; + this->actionFunc = EnHintnuts_LookAround; +} + +void EnHintnuts_SetupThrowScrubProjectile(EnHintnuts* this) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06000168); + this->actionFunc = EnHintnuts_ThrowNut; +} + +void EnHintnuts_SetupStand(EnHintnuts* this) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06002F7C, -3.0f); + if (this->actionFunc == EnHintnuts_ThrowNut) { + this->animFlagAndTimer = 2 | 0x1000; // sets timer and flag + } else { + this->animFlagAndTimer = 1; + } + this->actionFunc = EnHintnuts_Stand; +} + +void EnHintnuts_SetupBurrow(EnHintnuts* this) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_060024CC, -5.0f); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DOWN); + this->actionFunc = EnHintnuts_Burrow; +} + +void EnHintnuts_HitByScrubProjectile2(EnHintnuts* this) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_060026C4, -3.0f); + this->collider.dim.height = 0x25; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DAMAGE); + this->collider.base.acFlags &= ~1; + + if (this->actor.params > 0 && this->actor.params < 4 && this->actor.type == ACTORTYPE_ENEMY) { + if (sPuzzleCounter == -4) { + sPuzzleCounter = 0; + } + if (this->actor.params == sPuzzleCounter + 1) { + sPuzzleCounter++; + } else { + if (sPuzzleCounter > 0) { + sPuzzleCounter = -sPuzzleCounter; + } + sPuzzleCounter--; + } + this->actor.flags |= 0x10; + this->actionFunc = EnHintnuts_BeginFreeze; + } else { + this->actionFunc = EnHintnuts_BeginRun; + } +} + +void EnHintnuts_SetupRun(EnHintnuts* this) { + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_06003128); + this->animFlagAndTimer = 5; + this->actionFunc = EnHintnuts_Run; +} + +void EnHintnuts_SetupTalk(EnHintnuts* this) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06002E84, -5.0f); + this->actionFunc = EnHintnuts_Talk; + this->actor.speedXZ = 0.0f; +} + +void EnHintnuts_SetupLeave(EnHintnuts* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06003128, -5.0f); + this->actor.speedXZ = 3.0f; + this->animFlagAndTimer = 100; + this->actor.posRot.rot.y = this->actor.shape.rot.y; + this->collider.base.maskA &= ~1; + this->actor.flags |= 0x10; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DAMAGE); + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, 0x0, 0x0, 0x0, 0x3); // recovery heart + this->actionFunc = EnHintnuts_Leave; +} + +void EnHintnuts_SetupFreeze(EnHintnuts* this) { + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_060029BC); + this->actor.flags &= ~1; + func_8003426C(&this->actor, 0, 0xFF, 0, 100); + this->actor.unk_114 = 1; + this->animFlagAndTimer = 0; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_FAINT); + if (sPuzzleCounter == -3) { + func_80078884(NA_SE_SY_ERROR); + sPuzzleCounter = -4; + } + this->actionFunc = EnHintnuts_Freeze; +} + +void EnHintnuts_Wait(EnHintnuts* this, GlobalContext* globalCtx) { + s32 hasSlowPlaybackSpeed; + f32 boundedCurrentFrame; + f32 boundedCurrentFrameTemp; + + hasSlowPlaybackSpeed = 0; + if (this->skelAnime.animPlaybackSpeed < 0.5f) { + hasSlowPlaybackSpeed = 1; + } + if (hasSlowPlaybackSpeed && this->animFlagAndTimer != 0) { + this->animFlagAndTimer--; + } + if (func_800A56C8(&this->skelAnime, 9.0f) != 0) { + this->collider.base.acFlags |= 1; + } else if (func_800A56C8(&this->skelAnime, 8.0f) != 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_UP); + } + if (this->skelAnime.animCurrentFrame < 9.0f) { + boundedCurrentFrame = 9.0f; + } else { + if (this->skelAnime.animCurrentFrame > 12.0f) { + boundedCurrentFrameTemp = 12.0f; + } else { + boundedCurrentFrameTemp = this->skelAnime.animCurrentFrame; + } + boundedCurrentFrame = boundedCurrentFrameTemp; + } + this->collider.dim.height = (((boundedCurrentFrame - 9.0f) * 9.0f) + 5.0f); + if (!hasSlowPlaybackSpeed && (this->actor.xzDistanceFromLink < 120.0f)) { + EnHintnuts_SetupBurrow(this); + } else if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { + if (this->actor.xzDistanceFromLink < 120.0f) { + EnHintnuts_SetupBurrow(this); + } else if ((this->animFlagAndTimer == 0) && (320.0f < this->actor.xzDistanceFromLink)) { + EnHintnuts_SetupLookAround(this); + } else { + EnHintnuts_SetupStand(this); + } + } + if (hasSlowPlaybackSpeed && 160.0f < this->actor.xzDistanceFromLink && + fabsf(this->actor.yDistanceFromLink) < 120.0f && + ((this->animFlagAndTimer == 0) || (this->actor.xzDistanceFromLink < 480.0f))) { + this->skelAnime.animPlaybackSpeed = 1.0f; + } +} + +void EnHintnuts_LookAround(EnHintnuts* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (func_800A56C8(&this->skelAnime, 0.0f) != 0 && this->animFlagAndTimer != 0) { + this->animFlagAndTimer--; + } + if ((this->actor.xzDistanceFromLink < 120.0f) || (this->animFlagAndTimer == 0)) { + EnHintnuts_SetupBurrow(this); + } +} + +void EnHintnuts_Stand(EnHintnuts* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (func_800A56C8(&this->skelAnime, 0.0f) != 0 && this->animFlagAndTimer != 0) { + this->animFlagAndTimer--; + } + if (!(this->animFlagAndTimer & 0x1000)) { + Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.rotTowardsLinkY, 2, 0xE38); + } + if (this->actor.xzDistanceFromLink < 120.0f || this->animFlagAndTimer == 0x1000) { + EnHintnuts_SetupBurrow(this); + } else if (this->animFlagAndTimer == 0) { + EnHintnuts_SetupThrowScrubProjectile(this); + } +} + +void EnHintnuts_ThrowNut(EnHintnuts* this, GlobalContext* globalCtx) { + Vec3f nutPos; + + Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.rotTowardsLinkY, 2, 0xE38); + if (this->actor.xzDistanceFromLink < 120.0f) { + EnHintnuts_SetupBurrow(this); + } else if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { + EnHintnuts_SetupStand(this); + } else if (func_800A56C8(&this->skelAnime, 6.0f) != 0) { + nutPos.x = (Math_Sins(this->actor.shape.rot.y) * 23.0f) + this->actor.posRot.pos.x; + nutPos.y = this->actor.posRot.pos.y + 12.0f; + nutPos.z = (Math_Coss(this->actor.shape.rot.y) * 23.0f) + this->actor.posRot.pos.z; + if (Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_NUTSBALL, nutPos.x, nutPos.y, nutPos.z, + this->actor.shape.rot.x, this->actor.shape.rot.y, this->actor.shape.rot.z, 1) != NULL) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_THROW); + } + } +} + +void EnHintnuts_Burrow(EnHintnuts* this, GlobalContext* globalCtx) { + f32 boundedCurrentFrame; + + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { + EnHintnuts_SetupWait(this); + } else { + boundedCurrentFrame = this->skelAnime.animCurrentFrame < 1.0f + ? 1.0f + : this->skelAnime.animCurrentFrame > 3.0f ? 3.0f : this->skelAnime.animCurrentFrame; + this->collider.dim.height = (((3.0f - boundedCurrentFrame) * 12.0f) + 5.0f); + } + if (func_800A56C8(&this->skelAnime, 4.0f) != 0) { + this->collider.base.acFlags &= ~1; + } + + Math_SmoothScaleMaxF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 0.5f, 3.0f); + Math_SmoothScaleMaxF(&this->actor.posRot.pos.z, this->actor.initPosRot.pos.z, 0.5f, 3.0f); +} + +void EnHintnuts_BeginRun(EnHintnuts* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { + this->unk_196 = this->actor.rotTowardsLinkY + 0x8000; + EnHintnuts_SetupRun(this); + } + Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.rotTowardsLinkY, 2, 0xE38); +} + +void EnHintnuts_BeginFreeze(EnHintnuts* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { + EnHintnuts_SetupFreeze(this); + } +} + +void EnHintnuts_CheckProximity(EnHintnuts* this, GlobalContext* globalCtx) { + if (this->actor.type != ACTORTYPE_ENEMY) { + if ((this->collider.base.maskA & 2) || (this->actor.unk_10C != 0)) { + this->actor.flags |= 0x10000; + } else { + this->actor.flags &= ~0x10000; + } + if (this->actor.xzDistanceFromLink < 130.0f) { + this->actor.textId = this->textIdCopy; + func_8002F2F4(&this->actor, globalCtx); + } + } +} + +void EnHintnuts_Run(EnHintnuts* this, GlobalContext* globalCtx) { + s32 temp_ret; + s16 diffRotInit; + s16 diffRot; + f32 phi_f0; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + temp_ret = func_800A56C8(&this->skelAnime, 0.0f); + if (temp_ret != 0 && this->animFlagAndTimer != 0) { + this->animFlagAndTimer--; + } + if ((temp_ret != 0) || (func_800A56C8(&this->skelAnime, 6.0f) != 0)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_WALK); + } + + Math_ApproxF(&this->actor.speedXZ, 7.5f, 1.0f); + if (Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->unk_196, 1, 0xE38, 0xB6) == 0) { + if (this->actor.bgCheckFlags & 0x20) { + this->unk_196 = func_8002DAC0(&this->actor, &this->actor.initPosRot.pos); + } else if (this->actor.bgCheckFlags & 8) { + this->unk_196 = this->actor.wallPolyRot; + } else if (this->animFlagAndTimer == 0) { + diffRotInit = func_8002DAC0(&this->actor, &this->actor.initPosRot.pos); + diffRot = diffRotInit - this->actor.rotTowardsLinkY; + if (ABS(diffRot) >= 0x2001) { + this->unk_196 = diffRotInit; + } else { + phi_f0 = (0.0f <= (f32)diffRot) ? 1.0f : -1.0f; + this->unk_196 = (s16)((phi_f0 * -8192.0f) + (f32)this->actor.rotTowardsLinkY); + } + } else { + this->unk_196 = (s16)(this->actor.rotTowardsLinkY + 0x8000); + } + } + + this->actor.shape.rot.y = this->actor.posRot.rot.y + 0x8000; + if (func_8002F194(&this->actor, globalCtx) != 0) { + EnHintnuts_SetupTalk(this); + } else if (this->animFlagAndTimer == 0 && func_8002DBB0(&this->actor, &this->actor.initPosRot.pos) < 20.0f && + fabsf(this->actor.posRot.pos.y - this->actor.initPosRot.pos.y) < 2.0f) { + this->actor.speedXZ = 0.0f; + if (this->actor.type == ACTORTYPE_BG) { + this->actor.flags &= ~0x00010009; + this->actor.flags |= 0x5; + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_ENEMY); + } + EnHintnuts_SetupBurrow(this); + } else { + EnHintnuts_CheckProximity(this, globalCtx); + } +} + +void EnHintnuts_Talk(EnHintnuts* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.rotTowardsLinkY, 0x3, 0x400, 0x100); + if (func_8010BDBC(&globalCtx->msgCtx) == 5) { + EnHintnuts_SetupLeave(this, globalCtx); + } +} + +void EnHintnuts_Leave(EnHintnuts* this, GlobalContext* globalCtx) { + s16 temp_a1; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->animFlagAndTimer != 0) { + this->animFlagAndTimer--; + } + if ((func_800A56C8(&this->skelAnime, 0.0f) != 0) || (func_800A56C8(&this->skelAnime, 6.0f) != 0)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_WALK); + } + if (this->actor.bgCheckFlags & 8) { + temp_a1 = this->actor.wallPolyRot; + } else { + temp_a1 = this->actor.rotTowardsLinkY - func_8005A9F4(globalCtx->cameraPtrs[globalCtx->activeCamera]) - 0x8000; + if (ABS(temp_a1) >= 0x4001) { + temp_a1 = func_8005A9F4(globalCtx->cameraPtrs[globalCtx->activeCamera]) + 0x8000; + } else { + temp_a1 = func_8005A9F4(globalCtx->cameraPtrs[globalCtx->activeCamera]) - (temp_a1 >> 1) + 0x8000; + } + } + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, temp_a1, 0x800); + this->actor.posRot.rot.y = this->actor.shape.rot.y; + if ((this->animFlagAndTimer == 0) || (this->actor.unk_E4.z < 0.0f)) { + func_80106CCC(globalCtx); + if (this->actor.params == 3) { + Flags_SetClear(globalCtx, this->actor.room); + sPuzzleCounter = 3; + } + if (this->actor.attachedB != NULL) { + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, this->actor.attachedB, ACTORTYPE_PROP); + } + Actor_Kill(&this->actor); + } +} + +void EnHintnuts_Freeze(EnHintnuts* this, GlobalContext* globalCtx) { + this->actor.unk_114 = 1; + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (func_800A56C8(&this->skelAnime, 0.0f) != 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_FAINT); + } + if (this->animFlagAndTimer == 0) { + if (sPuzzleCounter == 3) { + if (this->actor.attachedB != NULL) { + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, this->actor.attachedB, ACTORTYPE_PROP); + } + this->animFlagAndTimer = 1; + } else if (sPuzzleCounter == -4) { + this->animFlagAndTimer = 2; + } + } else if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y - 35.0f, 7.0f) != 0) { + if (this->animFlagAndTimer == 1) { + Actor_Kill(&this->actor); + } else { + this->actor.flags |= 1; + this->actor.flags &= ~0x10; + this->actor.colChkInfo.health = sColChkInfoInit.health; + this->actor.unk_114 = 0; + EnHintnuts_SetupWait(this); + } + } +} + +void EnHintnuts_ColliderCheck(EnHintnuts* this, GlobalContext* globalCtx) { + if (this->collider.base.acFlags & 2) { + this->collider.base.acFlags &= ~2; + func_80035650(&this->actor, &this->collider.body, 1); + if (this->collider.base.ac->id != ACTOR_EN_NUTSBALL) { + EnHintnuts_SetupBurrow(this); + } else { + EnHintnuts_HitByScrubProjectile1(this, globalCtx); + EnHintnuts_HitByScrubProjectile2(this); + } + } else if (globalCtx->actorCtx.unk_02 != 0) { + EnHintnuts_HitByScrubProjectile1(this, globalCtx); + EnHintnuts_HitByScrubProjectile2(this); + } +} + +void EnHintnuts_Update(Actor* thisx, GlobalContext* globalCtx) { + EnHintnuts* this = THIS; + s32 pad; + + if (this->actor.params != 0xA) { + EnHintnuts_ColliderCheck(this, globalCtx); + this->actionFunc(this, globalCtx); + if (this->actionFunc != EnHintnuts_Freeze && this->actionFunc != EnHintnuts_BeginFreeze) { + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx, &this->actor, 20.0f, this->collider.dim.radius, this->collider.dim.height, 0x1D); + } + Collider_CylinderUpdate(&this->actor, &this->collider); + if (this->collider.base.acFlags & 1) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + if (this->actionFunc == EnHintnuts_Wait) { + Actor_SetHeight(&this->actor, this->skelAnime.animCurrentFrame); + } else if (this->actionFunc == EnHintnuts_Burrow) { + Actor_SetHeight(&this->actor, 20.0f - ((this->skelAnime.animCurrentFrame * 20.0f) / + (f32)SkelAnime_GetFrameCount(&D_060024CC.genericHeader))); + } else { + Actor_SetHeight(&this->actor, 20.0f); + } + } +} + +s32 EnHintnuts_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + Actor* thisx) { + Vec3f vec; + f32 animCurrentFrame; + EnHintnuts* this = THIS; + + if (limbIndex == 5 && this->actionFunc == EnHintnuts_ThrowNut) { + animCurrentFrame = this->skelAnime.animCurrentFrame; + if (animCurrentFrame <= 6.0f) { + vec.y = 1.0f - (animCurrentFrame * 0.0833f); + vec.z = 1.0f + (animCurrentFrame * 0.1167f); + vec.x = 1.0f + (animCurrentFrame * 0.1167f); + } else if (animCurrentFrame <= 7.0f) { + animCurrentFrame -= 6.0f; + vec.y = 0.5f + animCurrentFrame; + vec.z = 1.7f - (animCurrentFrame * 0.7f); + vec.x = 1.7f - (animCurrentFrame * 0.7f); + } else if (animCurrentFrame <= 10.0f) { + vec.y = 1.5f - ((animCurrentFrame - 7.0f) * 0.1667f); + vec.z = 1.0f; + vec.x = 1.0f; + } else { + return 0; + } + Matrix_Scale(vec.x, vec.y, vec.z, MTXMODE_APPLY); + } + return 0; +} + +void EnHintnuts_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnHintnuts* this = THIS; + if (this->actor.params == 0xA) { + Gfx_DrawDListOpa(globalCtx, D_060014E0); + } else { + SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, EnHintnuts_OverrideLimbDraw, + NULL, &this->actor); + } +} diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h index bbe7e33b7..aa97beb7a 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h @@ -6,9 +6,18 @@ struct EnHintnuts; +typedef void (*EnHintnutsActionFunc)(struct EnHintnuts*, GlobalContext*); + typedef struct EnHintnuts { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x114]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnHintnutsActionFunc actionFunc; + /* 0x0194 */ s16 animFlagAndTimer; // 0x1000 bit denotes which animation + /* 0x0196 */ s16 unk_196; + /* 0x0198 */ u16 textIdCopy; + /* 0x019A */ Vec3s limbDrawTable[10]; + /* 0x01D6 */ Vec3s transitionDrawTable[10]; + /* 0x0214 */ ColliderCylinder collider; } EnHintnuts; // size = 0x0260 extern const ActorInit En_Hintnuts_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index a288ad52f..ddc68b6b7 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -581,6 +581,19 @@ D_0F000000 = 0x0F000000; D_06000BD8 = 0x06000BD8; D_060015B0 = 0x060015B0; +// z_en_hintnuts +D_06000168 = 0x06000168; +D_060014E0 = 0x060014E0; +D_060023B8 = 0x060023B8; +D_060024CC = 0x060024CC; +D_060026C4 = 0x060026C4; +D_06002894 = 0x06002894; +D_060029BC = 0x060029BC; +D_06002B90 = 0x06002B90; +D_06002E84 = 0x06002E84; +D_06002F7C = 0x06002F7C; +D_06003128 = 0x06003128; + // z_en_guest D_060042AC = 0x060042AC; D_060005FC = 0x060005FC; |