diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s deleted file mode 100644 index 5dc319613e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnDodojr_Destroy -/* 000E8 809F64A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000EC 809F64AC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 000F0 809F64B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000F4 809F64B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000F8 809F64B8 0C0170EB */ jal Collider_DestroyCylinder - -/* 000FC 809F64BC 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 -/* 00100 809F64C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00104 809F64C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00108 809F64C8 03E00008 */ jr $ra -/* 0010C 809F64CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Draw.s deleted file mode 100644 index 785a19214f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Draw.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel EnDodojr_Draw -/* 01A50 809F7E10 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01A54 809F7E14 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A58 809F7E18 AFB00020 */ sw $s0, 0x0020($sp) -/* 01A5C 809F7E1C AFA5002C */ sw $a1, 0x002C($sp) -/* 01A60 809F7E20 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 01A64 809F7E24 3C0E809F */ lui $t6, %hi(func_809F73AC) ## $t6 = 809F0000 -/* 01A68 809F7E28 25CE73AC */ addiu $t6, $t6, %lo(func_809F73AC) ## $t6 = 809F73AC -/* 01A6C 809F7E2C 11C20011 */ beq $t6, $v0, .L809F7E74 -/* 01A70 809F7E30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01A74 809F7E34 3C0F809F */ lui $t7, %hi(func_809F7BE4) ## $t7 = 809F0000 -/* 01A78 809F7E38 25EF7BE4 */ addiu $t7, $t7, %lo(func_809F7BE4) ## $t7 = 809F7BE4 -/* 01A7C 809F7E3C 51E2000E */ beql $t7, $v0, .L809F7E78 -/* 01A80 809F7E40 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01A84 809F7E44 0C024F46 */ jal func_80093D18 -/* 01A88 809F7E48 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01A8C 809F7E4C 3C19809F */ lui $t9, %hi(func_809F7DFC) ## $t9 = 809F0000 -/* 01A90 809F7E50 27397DFC */ addiu $t9, $t9, %lo(func_809F7DFC) ## $t9 = 809F7DFC -/* 01A94 809F7E54 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 01A98 809F7E58 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 01A9C 809F7E5C 3C07809F */ lui $a3, %hi(func_809F7D50) ## $a3 = 809F0000 -/* 01AA0 809F7E60 24E77D50 */ addiu $a3, $a3, %lo(func_809F7D50) ## $a3 = 809F7D50 -/* 01AA4 809F7E64 AFB00014 */ sw $s0, 0x0014($sp) -/* 01AA8 809F7E68 AFB90010 */ sw $t9, 0x0010($sp) -/* 01AAC 809F7E6C 0C028572 */ jal SkelAnime_DrawOpa - -/* 01AB0 809F7E70 8FA4002C */ lw $a0, 0x002C($sp) -.L809F7E74: -/* 01AB4 809F7E74 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F7E78: -/* 01AB8 809F7E78 8FB00020 */ lw $s0, 0x0020($sp) -/* 01ABC 809F7E7C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01AC0 809F7E80 03E00008 */ jr $ra -/* 01AC4 809F7E84 00000000 */ nop -/* 01AC8 809F7E88 00000000 */ nop -/* 01ACC 809F7E8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s deleted file mode 100644 index b8fb93d85f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel EnDodojr_Init -/* 00000 809F63C0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 809F63C4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00008 809F63C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 809F63CC AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 809F63D0 AFA50044 */ sw $a1, 0x0044($sp) -/* 00014 809F63D4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00018 809F63D8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 0001C 809F63DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00020 809F63E0 0C00AC78 */ jal ActorShape_Init - -/* 00024 809F63E4 3C074190 */ lui $a3, 0x4190 ## $a3 = 41900000 -/* 00028 809F63E8 3C060600 */ lui $a2, %hi(D_060020E0) ## $a2 = 06000000 -/* 0002C 809F63EC 3C070600 */ lui $a3, %hi(D_060009D4) ## $a3 = 06000000 -/* 00030 809F63F0 260E020C */ addiu $t6, $s0, 0x020C ## $t6 = 0000020C -/* 00034 809F63F4 260F0266 */ addiu $t7, $s0, 0x0266 ## $t7 = 00000266 -/* 00038 809F63F8 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F -/* 0003C 809F63FC AFB80018 */ sw $t8, 0x0018($sp) -/* 00040 809F6400 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00044 809F6404 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00048 809F6408 24E709D4 */ addiu $a3, $a3, %lo(D_060009D4) ## $a3 = 060009D4 -/* 0004C 809F640C 24C620E0 */ addiu $a2, $a2, %lo(D_060020E0) ## $a2 = 060020E0 -/* 00050 809F6410 8FA40044 */ lw $a0, 0x0044($sp) -/* 00054 809F6414 0C02915F */ jal SkelAnime_Init - -/* 00058 809F6418 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0005C 809F641C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00060 809F6420 AFA50034 */ sw $a1, 0x0034($sp) -/* 00064 809F6424 0C0170D9 */ jal Collider_InitCylinder - -/* 00068 809F6428 8FA40044 */ lw $a0, 0x0044($sp) -/* 0006C 809F642C 3C07809F */ lui $a3, %hi(D_809F7EB0) ## $a3 = 809F0000 -/* 00070 809F6430 8FA50034 */ lw $a1, 0x0034($sp) -/* 00074 809F6434 24E77EB0 */ addiu $a3, $a3, %lo(D_809F7EB0) ## $a3 = 809F7EB0 -/* 00078 809F6438 8FA40044 */ lw $a0, 0x0044($sp) -/* 0007C 809F643C 0C01712B */ jal Collider_SetCylinder - -/* 00080 809F6440 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00084 809F6444 0C016C80 */ jal DamageTable_Get - -/* 00088 809F6448 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 0008C 809F644C 3C06809F */ lui $a2, %hi(D_809F7EDC) ## $a2 = 809F0000 -/* 00090 809F6450 24C67EDC */ addiu $a2, $a2, %lo(D_809F7EDC) ## $a2 = 809F7EDC -/* 00094 809F6454 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00098 809F6458 0C0187BF */ jal CollisionCheck_SetInfo2 -/* 0009C 809F645C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 000A0 809F6460 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 000A4 809F6464 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 000A8 809F6468 2419000E */ addiu $t9, $zero, 0x000E ## $t9 = 0000000E -/* 000AC 809F646C 3C053CA3 */ lui $a1, 0x3CA3 ## $a1 = 3CA30000 -/* 000B0 809F6470 01014824 */ and $t1, $t0, $at -/* 000B4 809F6474 A2190117 */ sb $t9, 0x0117($s0) ## 00000117 -/* 000B8 809F6478 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -/* 000BC 809F647C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3CA3D70A -/* 000C0 809F6480 0C00B58B */ jal Actor_SetScale - -/* 000C4 809F6484 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000C8 809F6488 3C0A809F */ lui $t2, %hi(func_809F73AC) ## $t2 = 809F0000 -/* 000CC 809F648C 254A73AC */ addiu $t2, $t2, %lo(func_809F73AC) ## $t2 = 809F73AC -/* 000D0 809F6490 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 000D4 809F6494 8FBF002C */ lw $ra, 0x002C($sp) -/* 000D8 809F6498 8FB00028 */ lw $s0, 0x0028($sp) -/* 000DC 809F649C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 000E0 809F64A0 03E00008 */ jr $ra -/* 000E4 809F64A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Update.s deleted file mode 100644 index 1692b97aea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Update.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel EnDodojr_Update -/* 018D0 809F7C90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 018D4 809F7C94 AFB00020 */ sw $s0, 0x0020($sp) -/* 018D8 809F7C98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 018DC 809F7C9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 018E0 809F7CA0 AFA5002C */ sw $a1, 0x002C($sp) -/* 018E4 809F7CA4 0C02927F */ jal SkelAnime_Update - -/* 018E8 809F7CA8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 018EC 809F7CAC 0C00B638 */ jal Actor_MoveForward - -/* 018F0 809F7CB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018F4 809F7CB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018F8 809F7CB8 0C27DC3A */ jal func_809F70E8 -/* 018FC 809F7CBC 8FA5002C */ lw $a1, 0x002C($sp) -/* 01900 809F7CC0 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 01904 809F7CC4 3C0E809F */ lui $t6, %hi(func_809F73AC) ## $t6 = 809F0000 -/* 01908 809F7CC8 25CE73AC */ addiu $t6, $t6, %lo(func_809F73AC) ## $t6 = 809F73AC -/* 0190C 809F7CCC 51C20013 */ beql $t6, $v0, .L809F7D1C -/* 01910 809F7CD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01914 809F7CD4 860F01D4 */ lh $t7, 0x01D4($s0) ## 000001D4 -/* 01918 809F7CD8 861801D6 */ lh $t8, 0x01D6($s0) ## 000001D6 -/* 0191C 809F7CDC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01920 809F7CE0 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 01924 809F7CE4 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 01928 809F7CE8 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 0192C 809F7CEC 46802120 */ cvt.s.w $f4, $f4 -/* 01930 809F7CF0 AFB90014 */ sw $t9, 0x0014($sp) -/* 01934 809F7CF4 8FA4002C */ lw $a0, 0x002C($sp) -/* 01938 809F7CF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0193C 809F7CFC E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01940 809F7D00 468031A0 */ cvt.s.w $f6, $f6 -/* 01944 809F7D04 44062000 */ mfc1 $a2, $f4 -/* 01948 809F7D08 44073000 */ mfc1 $a3, $f6 -/* 0194C 809F7D0C 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 01950 809F7D10 00000000 */ nop -/* 01954 809F7D14 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 01958 809F7D18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809F7D1C: -/* 0195C 809F7D1C 0040F809 */ jalr $ra, $v0 -/* 01960 809F7D20 8FA5002C */ lw $a1, 0x002C($sp) -/* 01964 809F7D24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01968 809F7D28 0C00B56E */ jal Actor_SetFocus - -/* 0196C 809F7D2C 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 01970 809F7D30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01974 809F7D34 0C27DCA9 */ jal func_809F72A4 -/* 01978 809F7D38 8FA5002C */ lw $a1, 0x002C($sp) -/* 0197C 809F7D3C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01980 809F7D40 8FB00020 */ lw $s0, 0x0020($sp) -/* 01984 809F7D44 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01988 809F7D48 03E00008 */ jr $ra -/* 0198C 809F7D4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F64D0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F64D0.s deleted file mode 100644 index f0f6095371..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F64D0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_809F64D0 -/* 00110 809F64D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00114 809F64D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00118 809F64D8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0011C 809F64DC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00120 809F64E0 2405180E */ addiu $a1, $zero, 0x180E ## $a1 = 0000180E -/* 00124 809F64E4 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 00128 809F64E8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0012C 809F64EC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00130 809F64F0 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00134 809F64F4 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 00138 809F64F8 0C00D09B */ jal func_8003426C -/* 0013C 809F64FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00140 809F6500 8FBF001C */ lw $ra, 0x001C($sp) -/* 00144 809F6504 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00148 809F6508 03E00008 */ jr $ra -/* 0014C 809F650C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s deleted file mode 100644 index 7fd307f57b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s +++ /dev/null @@ -1,146 +0,0 @@ -glabel func_809F6510 -/* 00150 809F6510 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 -/* 00154 809F6514 3C0E809F */ lui $t6, %hi(D_809F7EE8) ## $t6 = 809F0000 -/* 00158 809F6518 AFBF006C */ sw $ra, 0x006C($sp) -/* 0015C 809F651C AFBE0068 */ sw $s8, 0x0068($sp) -/* 00160 809F6520 AFB70064 */ sw $s7, 0x0064($sp) -/* 00164 809F6524 AFB60060 */ sw $s6, 0x0060($sp) -/* 00168 809F6528 AFB5005C */ sw $s5, 0x005C($sp) -/* 0016C 809F652C AFB40058 */ sw $s4, 0x0058($sp) -/* 00170 809F6530 AFB30054 */ sw $s3, 0x0054($sp) -/* 00174 809F6534 AFB20050 */ sw $s2, 0x0050($sp) -/* 00178 809F6538 AFB1004C */ sw $s1, 0x004C($sp) -/* 0017C 809F653C AFB00048 */ sw $s0, 0x0048($sp) -/* 00180 809F6540 F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 00184 809F6544 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 00188 809F6548 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 0018C 809F654C 25CE7EE8 */ addiu $t6, $t6, %lo(D_809F7EE8) ## $t6 = 809F7EE8 -/* 00190 809F6550 8DD80000 */ lw $t8, 0x0000($t6) ## 809F7EE8 -/* 00194 809F6554 27B500A4 */ addiu $s5, $sp, 0x00A4 ## $s5 = FFFFFFFC -/* 00198 809F6558 3C19809F */ lui $t9, %hi(D_809F7EEC) ## $t9 = 809F0000 -/* 0019C 809F655C 27397EEC */ addiu $t9, $t9, %lo(D_809F7EEC) ## $t9 = 809F7EEC -/* 001A0 809F6560 AEB80000 */ sw $t8, 0x0000($s5) ## FFFFFFFC -/* 001A4 809F6564 8F290000 */ lw $t1, 0x0000($t9) ## 809F7EEC -/* 001A8 809F6568 27B600A0 */ addiu $s6, $sp, 0x00A0 ## $s6 = FFFFFFF8 -/* 001AC 809F656C 3C0A809F */ lui $t2, %hi(D_809F7EF0) ## $t2 = 809F0000 -/* 001B0 809F6570 254A7EF0 */ addiu $t2, $t2, %lo(D_809F7EF0) ## $t2 = 809F7EF0 -/* 001B4 809F6574 AEC90000 */ sw $t1, 0x0000($s6) ## FFFFFFF8 -/* 001B8 809F6578 8D4C0000 */ lw $t4, 0x0000($t2) ## 809F7EF0 -/* 001BC 809F657C 27B70094 */ addiu $s7, $sp, 0x0094 ## $s7 = FFFFFFEC -/* 001C0 809F6580 3C0D809F */ lui $t5, %hi(D_809F7EFC) ## $t5 = 809F0000 -/* 001C4 809F6584 AEEC0000 */ sw $t4, 0x0000($s7) ## FFFFFFEC -/* 001C8 809F6588 8D4B0004 */ lw $t3, 0x0004($t2) ## 809F7EF4 -/* 001CC 809F658C 25AD7EFC */ addiu $t5, $t5, %lo(D_809F7EFC) ## $t5 = 809F7EFC -/* 001D0 809F6590 27BE0088 */ addiu $s8, $sp, 0x0088 ## $s8 = FFFFFFE0 -/* 001D4 809F6594 AEEB0004 */ sw $t3, 0x0004($s7) ## FFFFFFF0 -/* 001D8 809F6598 8D4C0008 */ lw $t4, 0x0008($t2) ## 809F7EF8 -/* 001DC 809F659C 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 001E0 809F65A0 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 001E4 809F65A4 AEEC0008 */ sw $t4, 0x0008($s7) ## FFFFFFF4 -/* 001E8 809F65A8 8DAF0000 */ lw $t7, 0x0000($t5) ## 809F7EFC -/* 001EC 809F65AC AFCF0000 */ sw $t7, 0x0000($s8) ## FFFFFFE0 -/* 001F0 809F65B0 8DAE0004 */ lw $t6, 0x0004($t5) ## 809F7F00 -/* 001F4 809F65B4 AFCE0004 */ sw $t6, 0x0004($s8) ## FFFFFFE4 -/* 001F8 809F65B8 8DAF0008 */ lw $t7, 0x0008($t5) ## 809F7F04 -/* 001FC 809F65BC AFCF0008 */ sw $t7, 0x0008($s8) ## FFFFFFE8 -/* 00200 809F65C0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00204 809F65C4 AFA600B0 */ sw $a2, 0x00B0($sp) -/* 00208 809F65C8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0020C 809F65CC 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 -/* 00210 809F65D0 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 00214 809F65D4 44813000 */ mtc1 $at, $f6 ## $f6 = 65536.00 -/* 00218 809F65D8 46140101 */ sub.s $f4, $f0, $f20 -/* 0021C 809F65DC 8FA600B0 */ lw $a2, 0x00B0($sp) -/* 00220 809F65E0 C65001F4 */ lwc1 $f16, 0x01F4($s2) ## 000001F4 -/* 00224 809F65E4 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 00228 809F65E8 46062202 */ mul.s $f8, $f4, $f6 -/* 0022C 809F65EC 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 00230 809F65F0 E7B00080 */ swc1 $f16, 0x0080($sp) -/* 00234 809F65F4 4600428D */ trunc.w.s $f10, $f8 -/* 00238 809F65F8 44105000 */ mfc1 $s0, $f10 -/* 0023C 809F65FC 00000000 */ nop -/* 00240 809F6600 00108400 */ sll $s0, $s0, 16 -/* 00244 809F6604 04C0003B */ bltz $a2, .L809F66F4 -/* 00248 809F6608 00108403 */ sra $s0, $s0, 16 -/* 0024C 809F660C 0326001A */ div $zero, $t9, $a2 -/* 00250 809F6610 14C00002 */ bne $a2, $zero, .L809F661C -/* 00254 809F6614 00000000 */ nop -/* 00258 809F6618 0007000D */ break 7 -.L809F661C: -/* 0025C 809F661C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00260 809F6620 14C10004 */ bne $a2, $at, .L809F6634 -/* 00264 809F6624 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00268 809F6628 17210002 */ bne $t9, $at, .L809F6634 -/* 0026C 809F662C 00000000 */ nop -/* 00270 809F6630 0006000D */ break 6 -.L809F6634: -/* 00274 809F6634 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 00278 809F6638 4481C000 */ mtc1 $at, $f24 ## $f24 = 22.00 -/* 0027C 809F663C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00280 809F6640 00009812 */ mflo $s3 -/* 00284 809F6644 00139C00 */ sll $s3, $s3, 16 -/* 00288 809F6648 4481B000 */ mtc1 $at, $f22 ## $f22 = 4.00 -/* 0028C 809F664C 00139C03 */ sra $s3, $s3, 16 -.L809F6650: -/* 00290 809F6650 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00294 809F6654 00000000 */ nop -/* 00298 809F6658 46140481 */ sub.s $f18, $f0, $f20 -/* 0029C 809F665C 46169102 */ mul.s $f4, $f18, $f22 -/* 002A0 809F6660 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 002A4 809F6664 E7A40088 */ swc1 $f4, 0x0088($sp) -/* 002A8 809F6668 46140181 */ sub.s $f6, $f0, $f20 -/* 002AC 809F666C 00102400 */ sll $a0, $s0, 16 -/* 002B0 809F6670 00042403 */ sra $a0, $a0, 16 -/* 002B4 809F6674 46163202 */ mul.s $f8, $f6, $f22 -/* 002B8 809F6678 0C01DE1C */ jal Math_SinS - ## sins? -/* 002BC 809F667C E7A80090 */ swc1 $f8, 0x0090($sp) -/* 002C0 809F6680 46180282 */ mul.s $f10, $f0, $f24 -/* 002C4 809F6684 C65001F0 */ lwc1 $f16, 0x01F0($s2) ## 000001F0 -/* 002C8 809F6688 00102400 */ sll $a0, $s0, 16 -/* 002CC 809F668C 00042403 */ sra $a0, $a0, 16 -/* 002D0 809F6690 46105480 */ add.s $f18, $f10, $f16 -/* 002D4 809F6694 0C01DE0D */ jal Math_CosS - ## coss? -/* 002D8 809F6698 E7B2007C */ swc1 $f18, 0x007C($sp) -/* 002DC 809F669C 46180102 */ mul.s $f4, $f0, $f24 -/* 002E0 809F66A0 C64601F8 */ lwc1 $f6, 0x01F8($s2) ## 000001F8 -/* 002E4 809F66A4 24080078 */ addiu $t0, $zero, 0x0078 ## $t0 = 00000078 -/* 002E8 809F66A8 24090028 */ addiu $t1, $zero, 0x0028 ## $t1 = 00000028 -/* 002EC 809F66AC 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 002F0 809F66B0 AFAA0020 */ sw $t2, 0x0020($sp) -/* 002F4 809F66B4 AFA9001C */ sw $t1, 0x001C($sp) -/* 002F8 809F66B8 46062200 */ add.s $f8, $f4, $f6 -/* 002FC 809F66BC AFA80018 */ sw $t0, 0x0018($sp) -/* 00300 809F66C0 AFB60014 */ sw $s6, 0x0014($sp) -/* 00304 809F66C4 AFB50010 */ sw $s5, 0x0010($sp) -/* 00308 809F66C8 E7A80084 */ swc1 $f8, 0x0084($sp) -/* 0030C 809F66CC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00310 809F66D0 27A5007C */ addiu $a1, $sp, 0x007C ## $a1 = FFFFFFD4 -/* 00314 809F66D4 02E03025 */ or $a2, $s7, $zero ## $a2 = FFFFFFEC -/* 00318 809F66D8 0C00A0DB */ jal func_8002836C -/* 0031C 809F66DC 03C03825 */ or $a3, $s8, $zero ## $a3 = FFFFFFE0 -/* 00320 809F66E0 02138021 */ addu $s0, $s0, $s3 -/* 00324 809F66E4 00108400 */ sll $s0, $s0, 16 -/* 00328 809F66E8 2631FFFF */ addiu $s1, $s1, 0xFFFF ## $s1 = FFFFFFFF -/* 0032C 809F66EC 0621FFD8 */ bgez $s1, .L809F6650 -/* 00330 809F66F0 00108403 */ sra $s0, $s0, 16 -.L809F66F4: -/* 00334 809F66F4 8FBF006C */ lw $ra, 0x006C($sp) -/* 00338 809F66F8 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 0033C 809F66FC D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 00340 809F6700 D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 00344 809F6704 8FB00048 */ lw $s0, 0x0048($sp) -/* 00348 809F6708 8FB1004C */ lw $s1, 0x004C($sp) -/* 0034C 809F670C 8FB20050 */ lw $s2, 0x0050($sp) -/* 00350 809F6710 8FB30054 */ lw $s3, 0x0054($sp) -/* 00354 809F6714 8FB40058 */ lw $s4, 0x0058($sp) -/* 00358 809F6718 8FB5005C */ lw $s5, 0x005C($sp) -/* 0035C 809F671C 8FB60060 */ lw $s6, 0x0060($sp) -/* 00360 809F6720 8FB70064 */ lw $s7, 0x0064($sp) -/* 00364 809F6724 8FBE0068 */ lw $s8, 0x0068($sp) -/* 00368 809F6728 03E00008 */ jr $ra -/* 0036C 809F672C 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s deleted file mode 100644 index e08f319fc7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s +++ /dev/null @@ -1,102 +0,0 @@ -glabel func_809F6730 -/* 00370 809F6730 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 00374 809F6734 3C0E809F */ lui $t6, %hi(D_809F7F08) ## $t6 = 809F0000 -/* 00378 809F6738 3C0F809F */ lui $t7, %hi(D_809F7F0C) ## $t7 = 809F0000 -/* 0037C 809F673C 8DCE7F08 */ lw $t6, %lo(D_809F7F08)($t6) -/* 00380 809F6740 8DEF7F0C */ lw $t7, %lo(D_809F7F0C)($t7) -/* 00384 809F6744 3C19809F */ lui $t9, %hi(D_809F7F10) ## $t9 = 809F0000 -/* 00388 809F6748 AFBF002C */ sw $ra, 0x002C($sp) -/* 0038C 809F674C AFA40060 */ sw $a0, 0x0060($sp) -/* 00390 809F6750 AFA50064 */ sw $a1, 0x0064($sp) -/* 00394 809F6754 AFA60068 */ sw $a2, 0x0068($sp) -/* 00398 809F6758 27397F10 */ addiu $t9, $t9, %lo(D_809F7F10) ## $t9 = 809F7F10 -/* 0039C 809F675C AFAE005C */ sw $t6, 0x005C($sp) -/* 003A0 809F6760 AFAF0058 */ sw $t7, 0x0058($sp) -/* 003A4 809F6764 8F290000 */ lw $t1, 0x0000($t9) ## 809F7F10 -/* 003A8 809F6768 27B8004C */ addiu $t8, $sp, 0x004C ## $t8 = FFFFFFEC -/* 003AC 809F676C 8F280004 */ lw $t0, 0x0004($t9) ## 809F7F14 -/* 003B0 809F6770 AF090000 */ sw $t1, 0x0000($t8) ## FFFFFFEC -/* 003B4 809F6774 8F290008 */ lw $t1, 0x0008($t9) ## 809F7F18 -/* 003B8 809F6778 3C0B809F */ lui $t3, %hi(D_809F7F1C) ## $t3 = 809F0000 -/* 003BC 809F677C 256B7F1C */ addiu $t3, $t3, %lo(D_809F7F1C) ## $t3 = 809F7F1C -/* 003C0 809F6780 AF080004 */ sw $t0, 0x0004($t8) ## FFFFFFF0 -/* 003C4 809F6784 AF090008 */ sw $t1, 0x0008($t8) ## FFFFFFF4 -/* 003C8 809F6788 8D6D0000 */ lw $t5, 0x0000($t3) ## 809F7F1C -/* 003CC 809F678C 27AA0040 */ addiu $t2, $sp, 0x0040 ## $t2 = FFFFFFE0 -/* 003D0 809F6790 8D6C0004 */ lw $t4, 0x0004($t3) ## 809F7F20 -/* 003D4 809F6794 AD4D0000 */ sw $t5, 0x0000($t2) ## FFFFFFE0 -/* 003D8 809F6798 8D6D0008 */ lw $t5, 0x0008($t3) ## 809F7F24 -/* 003DC 809F679C AD4C0004 */ sw $t4, 0x0004($t2) ## FFFFFFE4 -/* 003E0 809F67A0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 003E4 809F67A4 AD4D0008 */ sw $t5, 0x0008($t2) ## FFFFFFE8 -/* 003E8 809F67A8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 003EC 809F67AC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 003F0 809F67B0 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 003F4 809F67B4 44814000 */ mtc1 $at, $f8 ## $f8 = 65536.00 -/* 003F8 809F67B8 46040181 */ sub.s $f6, $f0, $f4 -/* 003FC 809F67BC 8FB80060 */ lw $t8, 0x0060($sp) -/* 00400 809F67C0 46083282 */ mul.s $f10, $f6, $f8 -/* 00404 809F67C4 4600540D */ trunc.w.s $f16, $f10 -/* 00408 809F67C8 440F8000 */ mfc1 $t7, $f16 -/* 0040C 809F67CC 00000000 */ nop -/* 00410 809F67D0 A7AF0032 */ sh $t7, 0x0032($sp) -/* 00414 809F67D4 C7120080 */ lwc1 $f18, 0x0080($t8) ## 00000080 -/* 00418 809F67D8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0041C 809F67DC E7B20038 */ swc1 $f18, 0x0038($sp) -/* 00420 809F67E0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00424 809F67E4 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00428 809F67E8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0042C 809F67EC 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 00430 809F67F0 46040181 */ sub.s $f6, $f0, $f4 -/* 00434 809F67F4 46083282 */ mul.s $f10, $f6, $f8 -/* 00438 809F67F8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0043C 809F67FC E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 00440 809F6800 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00444 809F6804 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 00448 809F6808 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0044C 809F680C 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 00450 809F6810 46100481 */ sub.s $f18, $f0, $f16 -/* 00454 809F6814 87A40032 */ lh $a0, 0x0032($sp) -/* 00458 809F6818 46049182 */ mul.s $f6, $f18, $f4 -/* 0045C 809F681C 0C01DE1C */ jal Math_SinS - ## sins? -/* 00460 809F6820 E7A60048 */ swc1 $f6, 0x0048($sp) -/* 00464 809F6824 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 00468 809F6828 44814000 */ mtc1 $at, $f8 ## $f8 = 11.00 -/* 0046C 809F682C 8FB90068 */ lw $t9, 0x0068($sp) -/* 00470 809F6830 87A40032 */ lh $a0, 0x0032($sp) -/* 00474 809F6834 46080282 */ mul.s $f10, $f0, $f8 -/* 00478 809F6838 C7300000 */ lwc1 $f16, 0x0000($t9) ## 00000000 -/* 0047C 809F683C 46105480 */ add.s $f18, $f10, $f16 -/* 00480 809F6840 0C01DE0D */ jal Math_CosS - ## coss? -/* 00484 809F6844 E7B20034 */ swc1 $f18, 0x0034($sp) -/* 00488 809F6848 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 0048C 809F684C 44812000 */ mtc1 $at, $f4 ## $f4 = 11.00 -/* 00490 809F6850 8FA80068 */ lw $t0, 0x0068($sp) -/* 00494 809F6854 27A9005C */ addiu $t1, $sp, 0x005C ## $t1 = FFFFFFFC -/* 00498 809F6858 46040182 */ mul.s $f6, $f0, $f4 -/* 0049C 809F685C C5080008 */ lwc1 $f8, 0x0008($t0) ## 00000008 -/* 004A0 809F6860 27AA0058 */ addiu $t2, $sp, 0x0058 ## $t2 = FFFFFFF8 -/* 004A4 809F6864 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 004A8 809F6868 240C003C */ addiu $t4, $zero, 0x003C ## $t4 = 0000003C -/* 004AC 809F686C 240D0008 */ addiu $t5, $zero, 0x0008 ## $t5 = 00000008 -/* 004B0 809F6870 AFAD0020 */ sw $t5, 0x0020($sp) -/* 004B4 809F6874 46083280 */ add.s $f10, $f6, $f8 -/* 004B8 809F6878 AFAC001C */ sw $t4, 0x001C($sp) -/* 004BC 809F687C AFAB0018 */ sw $t3, 0x0018($sp) -/* 004C0 809F6880 AFAA0014 */ sw $t2, 0x0014($sp) -/* 004C4 809F6884 E7AA003C */ swc1 $f10, 0x003C($sp) -/* 004C8 809F6888 AFA90010 */ sw $t1, 0x0010($sp) -/* 004CC 809F688C 8FA40064 */ lw $a0, 0x0064($sp) -/* 004D0 809F6890 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFD4 -/* 004D4 809F6894 27A6004C */ addiu $a2, $sp, 0x004C ## $a2 = FFFFFFEC -/* 004D8 809F6898 0C00A0DB */ jal func_8002836C -/* 004DC 809F689C 27A70040 */ addiu $a3, $sp, 0x0040 ## $a3 = FFFFFFE0 -/* 004E0 809F68A0 8FBF002C */ lw $ra, 0x002C($sp) -/* 004E4 809F68A4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 004E8 809F68A8 03E00008 */ jr $ra -/* 004EC 809F68AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F68B0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F68B0.s deleted file mode 100644 index 506006d569..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F68B0.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_809F68B0 -/* 004F0 809F68B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004F4 809F68B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004F8 809F68B8 AFA5001C */ sw $a1, 0x001C($sp) -/* 004FC 809F68BC C4840060 */ lwc1 $f4, 0x0060($a0) ## 00000060 -/* 00500 809F68C0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00504 809F68C4 00000000 */ nop -/* 00508 809F68C8 4604303E */ c.le.s $f6, $f4 -/* 0050C 809F68CC 00000000 */ nop -/* 00510 809F68D0 45020004 */ bc1fl .L809F68E4 -/* 00514 809F68D4 848E01FC */ lh $t6, 0x01FC($a0) ## 000001FC -/* 00518 809F68D8 1000002A */ beq $zero, $zero, .L809F6984 -/* 0051C 809F68DC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00520 809F68E0 848E01FC */ lh $t6, 0x01FC($a0) ## 000001FC -.L809F68E4: -/* 00524 809F68E4 55C00004 */ bnel $t6, $zero, .L809F68F8 -/* 00528 809F68E8 948F0088 */ lhu $t7, 0x0088($a0) ## 00000088 -/* 0052C 809F68EC 10000025 */ beq $zero, $zero, .L809F6984 -/* 00530 809F68F0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00534 809F68F4 948F0088 */ lhu $t7, 0x0088($a0) ## 00000088 -.L809F68F8: -/* 00538 809F68F8 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B -/* 0053C 809F68FC 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 00540 809F6900 53000020 */ beql $t8, $zero, .L809F6984 -/* 00544 809F6904 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00548 809F6908 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0054C 809F690C AFA40018 */ sw $a0, 0x0018($sp) -/* 00550 809F6910 8FA40018 */ lw $a0, 0x0018($sp) -/* 00554 809F6914 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00558 809F6918 8C880024 */ lw $t0, 0x0024($a0) ## 00000024 -/* 0055C 809F691C 8C990028 */ lw $t9, 0x0028($a0) ## 00000028 -/* 00560 809F6920 AC8801F0 */ sw $t0, 0x01F0($a0) ## 000001F0 -/* 00564 809F6924 8C88002C */ lw $t0, 0x002C($a0) ## 0000002C -/* 00568 809F6928 AC9901F4 */ sw $t9, 0x01F4($a0) ## 000001F4 -/* 0056C 809F692C AC8801F8 */ sw $t0, 0x01F8($a0) ## 000001F8 -/* 00570 809F6930 0C27D944 */ jal func_809F6510 -/* 00574 809F6934 8FA5001C */ lw $a1, 0x001C($sp) -/* 00578 809F6938 8FA40018 */ lw $a0, 0x0018($sp) -/* 0057C 809F693C 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 00580 809F6940 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00584 809F6944 848201FC */ lh $v0, 0x01FC($a0) ## 000001FC -/* 00588 809F6948 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 0058C 809F694C 01225023 */ subu $t2, $t1, $v0 -/* 00590 809F6950 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 00594 809F6954 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = FFFFFFFF -/* 00598 809F6958 A48B01FC */ sh $t3, 0x01FC($a0) ## 000001FC -/* 0059C 809F695C 46805420 */ cvt.s.w $f16, $f10 -/* 005A0 809F6960 848C01FC */ lh $t4, 0x01FC($a0) ## 000001FC -/* 005A4 809F6964 46104483 */ div.s $f18, $f8, $f16 -/* 005A8 809F6968 15800005 */ bne $t4, $zero, .L809F6980 -/* 005AC 809F696C E4920060 */ swc1 $f18, 0x0060($a0) ## 00000060 -/* 005B0 809F6970 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 005B4 809F6974 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 005B8 809F6978 10000002 */ beq $zero, $zero, .L809F6984 -/* 005BC 809F697C E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 -.L809F6980: -/* 005C0 809F6980 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809F6984: -/* 005C4 809F6984 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005C8 809F6988 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005CC 809F698C 03E00008 */ jr $ra -/* 005D0 809F6990 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s deleted file mode 100644 index 566a115da0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s +++ /dev/null @@ -1,45 +0,0 @@ -.late_rodata -glabel D_809F7F70 - .word 0x40266666 -glabel D_809F7F74 - .float -0.8 - -.text -glabel func_809F6994 -/* 005D4 809F6994 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 005D8 809F6998 AFA40028 */ sw $a0, 0x0028($sp) -/* 005DC 809F699C AFBF0024 */ sw $ra, 0x0024($sp) -/* 005E0 809F69A0 3C040600 */ lui $a0, %hi(D_06000860) ## $a0 = 06000000 -/* 005E4 809F69A4 0C028800 */ jal Animation_GetLastFrame - -/* 005E8 809F69A8 24840860 */ addiu $a0, $a0, %lo(D_06000860) ## $a0 = 06000860 -/* 005EC 809F69AC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 005F0 809F69B0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 005F4 809F69B4 8FA30028 */ lw $v1, 0x0028($sp) -/* 005F8 809F69B8 468021A0 */ cvt.s.w $f6, $f4 -/* 005FC 809F69BC 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00600 809F69C0 3C050600 */ lui $a1, %hi(D_06000860) ## $a1 = 06000000 -/* 00604 809F69C4 3C063FE6 */ lui $a2, 0x3FE6 ## $a2 = 3FE60000 -/* 00608 809F69C8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0060C 809F69CC AFAE0014 */ sw $t6, 0x0014($sp) -/* 00610 809F69D0 34C66666 */ ori $a2, $a2, 0x6666 ## $a2 = 3FE66666 -/* 00614 809F69D4 24A50860 */ addiu $a1, $a1, %lo(D_06000860) ## $a1 = 06000860 -/* 00618 809F69D8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0061C 809F69DC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00620 809F69E0 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00624 809F69E4 0C029468 */ jal Animation_Change - -/* 00628 809F69E8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0062C 809F69EC 8FA30028 */ lw $v1, 0x0028($sp) -/* 00630 809F69F0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00634 809F69F4 3C01809F */ lui $at, %hi(D_809F7F70) ## $at = 809F0000 -/* 00638 809F69F8 E46A0060 */ swc1 $f10, 0x0060($v1) ## 00000060 -/* 0063C 809F69FC C4307F70 */ lwc1 $f16, %lo(D_809F7F70)($at) -/* 00640 809F6A00 3C01809F */ lui $at, %hi(D_809F7F74) ## $at = 809F0000 -/* 00644 809F6A04 E4700068 */ swc1 $f16, 0x0068($v1) ## 00000068 -/* 00648 809F6A08 C4327F74 */ lwc1 $f18, %lo(D_809F7F74)($at) -/* 0064C 809F6A0C E472006C */ swc1 $f18, 0x006C($v1) ## 0000006C -/* 00650 809F6A10 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00654 809F6A14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00658 809F6A18 03E00008 */ jr $ra -/* 0065C 809F6A1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s deleted file mode 100644 index eba32065ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s +++ /dev/null @@ -1,50 +0,0 @@ -.late_rodata -glabel D_809F7F78 - .float -0.8 - -.text -glabel func_809F6A20 -/* 00660 809F6A20 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00664 809F6A24 AFB00028 */ sw $s0, 0x0028($sp) -/* 00668 809F6A28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0066C 809F6A2C AFBF002C */ sw $ra, 0x002C($sp) -/* 00670 809F6A30 3C040600 */ lui $a0, %hi(D_060004A0) ## $a0 = 06000000 -/* 00674 809F6A34 0C028800 */ jal Animation_GetLastFrame - -/* 00678 809F6A38 248404A0 */ addiu $a0, $a0, %lo(D_060004A0) ## $a0 = 060004A0 -/* 0067C 809F6A3C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00680 809F6A40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00684 809F6A44 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00688 809F6A48 468021A0 */ cvt.s.w $f6, $f4 -/* 0068C 809F6A4C 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00690 809F6A50 3C050600 */ lui $a1, %hi(D_060004A0) ## $a1 = 06000000 -/* 00694 809F6A54 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00698 809F6A58 44070000 */ mfc1 $a3, $f0 -/* 0069C 809F6A5C AFAE0014 */ sw $t6, 0x0014($sp) -/* 006A0 809F6A60 24A504A0 */ addiu $a1, $a1, %lo(D_060004A0) ## $a1 = 060004A0 -/* 006A4 809F6A64 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 006A8 809F6A68 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 006AC 809F6A6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006B0 809F6A70 0C029468 */ jal Animation_Change - -/* 006B4 809F6A74 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 006B8 809F6A78 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006BC 809F6A7C 860F01FC */ lh $t7, 0x01FC($s0) ## 000001FC -/* 006C0 809F6A80 3C01809F */ lui $at, %hi(D_809F7F78) ## $at = 809F0000 -/* 006C4 809F6A84 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 006C8 809F6A88 E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C -/* 006CC 809F6A8C E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 -/* 006D0 809F6A90 C42A7F78 */ lwc1 $f10, %lo(D_809F7F78)($at) -/* 006D4 809F6A94 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 006D8 809F6A98 15E00005 */ bne $t7, $zero, .L809F6AB0 -/* 006DC 809F6A9C E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 006E0 809F6AA0 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 006E4 809F6AA4 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 006E8 809F6AA8 A61801FC */ sh $t8, 0x01FC($s0) ## 000001FC -/* 006EC 809F6AAC E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 -.L809F6AB0: -/* 006F0 809F6AB0 8FBF002C */ lw $ra, 0x002C($sp) -/* 006F4 809F6AB4 8FB00028 */ lw $s0, 0x0028($sp) -/* 006F8 809F6AB8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 006FC 809F6ABC 03E00008 */ jr $ra -/* 00700 809F6AC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s deleted file mode 100644 index 2829bcaae2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s +++ /dev/null @@ -1,37 +0,0 @@ -.late_rodata -glabel D_809F7F7C - .float -0.8 - -.text -glabel func_809F6AC4 -/* 00704 809F6AC4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00708 809F6AC8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0070C 809F6ACC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00710 809F6AD0 3C040600 */ lui $a0, %hi(D_060005F0) ## $a0 = 06000000 -/* 00714 809F6AD4 0C028800 */ jal Animation_GetLastFrame - -/* 00718 809F6AD8 248405F0 */ addiu $a0, $a0, %lo(D_060005F0) ## $a0 = 060005F0 -/* 0071C 809F6ADC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00720 809F6AE0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00724 809F6AE4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00728 809F6AE8 468021A0 */ cvt.s.w $f6, $f4 -/* 0072C 809F6AEC 3C050600 */ lui $a1, %hi(D_060005F0) ## $a1 = 06000000 -/* 00730 809F6AF0 44070000 */ mfc1 $a3, $f0 -/* 00734 809F6AF4 24A505F0 */ addiu $a1, $a1, %lo(D_060005F0) ## $a1 = 060005F0 -/* 00738 809F6AF8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0073C 809F6AFC AFA00014 */ sw $zero, 0x0014($sp) -/* 00740 809F6B00 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00744 809F6B04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00748 809F6B08 0C029468 */ jal Animation_Change - -/* 0074C 809F6B0C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00750 809F6B10 8FA20028 */ lw $v0, 0x0028($sp) -/* 00754 809F6B14 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00758 809F6B18 3C01809F */ lui $at, %hi(D_809F7F7C) ## $at = 809F0000 -/* 0075C 809F6B1C E4480060 */ swc1 $f8, 0x0060($v0) ## 00000060 -/* 00760 809F6B20 C42A7F7C */ lwc1 $f10, %lo(D_809F7F7C)($at) -/* 00764 809F6B24 E44A006C */ swc1 $f10, 0x006C($v0) ## 0000006C -/* 00768 809F6B28 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0076C 809F6B2C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00770 809F6B30 03E00008 */ jr $ra -/* 00774 809F6B34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s deleted file mode 100644 index bfefe9cde2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s +++ /dev/null @@ -1,41 +0,0 @@ -.late_rodata -glabel D_809F7F80 - .float -0.8 - -.text -glabel func_809F6B38 -/* 00778 809F6B38 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0077C 809F6B3C AFA40028 */ sw $a0, 0x0028($sp) -/* 00780 809F6B40 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00784 809F6B44 3C040600 */ lui $a0, %hi(D_06000724) ## $a0 = 06000000 -/* 00788 809F6B48 0C028800 */ jal Animation_GetLastFrame - -/* 0078C 809F6B4C 24840724 */ addiu $a0, $a0, %lo(D_06000724) ## $a0 = 06000724 -/* 00790 809F6B50 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00794 809F6B54 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00798 809F6B58 8FA30028 */ lw $v1, 0x0028($sp) -/* 0079C 809F6B5C 468021A0 */ cvt.s.w $f6, $f4 -/* 007A0 809F6B60 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 007A4 809F6B64 3C050600 */ lui $a1, %hi(D_06000724) ## $a1 = 06000000 -/* 007A8 809F6B68 24A50724 */ addiu $a1, $a1, %lo(D_06000724) ## $a1 = 06000724 -/* 007AC 809F6B6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 007B0 809F6B70 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 007B4 809F6B74 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 007B8 809F6B78 AFA00014 */ sw $zero, 0x0014($sp) -/* 007BC 809F6B7C 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 007C0 809F6B80 0C029468 */ jal Animation_Change - -/* 007C4 809F6B84 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 007C8 809F6B88 3C01809F */ lui $at, %hi(D_809F7F80) ## $at = 809F0000 -/* 007CC 809F6B8C 8FA30028 */ lw $v1, 0x0028($sp) -/* 007D0 809F6B90 C42A7F80 */ lwc1 $f10, %lo(D_809F7F80)($at) -/* 007D4 809F6B94 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 007D8 809F6B98 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 007DC 809F6B9C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 007E0 809F6BA0 A46E01FC */ sh $t6, 0x01FC($v1) ## 000001FC -/* 007E4 809F6BA4 E46A006C */ swc1 $f10, 0x006C($v1) ## 0000006C -/* 007E8 809F6BA8 E4700060 */ swc1 $f16, 0x0060($v1) ## 00000060 -/* 007EC 809F6BAC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 007F0 809F6BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 007F4 809F6BB4 03E00008 */ jr $ra -/* 007F8 809F6BB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6BBC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6BBC.s deleted file mode 100644 index 322a32879c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6BBC.s +++ /dev/null @@ -1,32 +0,0 @@ -.late_rodata -glabel D_809F7F84 - .float -0.8 - -.text -glabel func_809F6BBC -/* 007FC 809F6BBC 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00800 809F6BC0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00804 809F6BC4 AC8000C0 */ sw $zero, 0x00C0($a0) ## 000000C0 -/* 00808 809F6BC8 01C17824 */ and $t7, $t6, $at -/* 0080C 809F6BCC AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 00810 809F6BD0 24820024 */ addiu $v0, $a0, 0x0024 ## $v0 = 00000024 -/* 00814 809F6BD4 8C590000 */ lw $t9, 0x0000($v0) ## 00000024 -/* 00818 809F6BD8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0081C 809F6BDC 3C01809F */ lui $at, %hi(D_809F7F84) ## $at = 809F0000 -/* 00820 809F6BE0 AC990008 */ sw $t9, 0x0008($a0) ## 00000008 -/* 00824 809F6BE4 8C580004 */ lw $t8, 0x0004($v0) ## 00000028 -/* 00828 809F6BE8 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 0082C 809F6BEC AC98000C */ sw $t8, 0x000C($a0) ## 0000000C -/* 00830 809F6BF0 8C590008 */ lw $t9, 0x0008($v0) ## 0000002C -/* 00834 809F6BF4 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00838 809F6BF8 AC990010 */ sw $t9, 0x0010($a0) ## 00000010 -/* 0083C 809F6BFC C4267F84 */ lwc1 $f6, %lo(D_809F7F84)($at) -/* 00840 809F6C00 A4880202 */ sh $t0, 0x0202($a0) ## 00000202 -/* 00844 809F6C04 E486006C */ swc1 $f6, 0x006C($a0) ## 0000006C -/* 00848 809F6C08 8C4A0000 */ lw $t2, 0x0000($v0) ## 00000024 -/* 0084C 809F6C0C AC8A01F0 */ sw $t2, 0x01F0($a0) ## 000001F0 -/* 00850 809F6C10 8C490004 */ lw $t1, 0x0004($v0) ## 00000028 -/* 00854 809F6C14 AC8901F4 */ sw $t1, 0x01F4($a0) ## 000001F4 -/* 00858 809F6C18 8C4A0008 */ lw $t2, 0x0008($v0) ## 0000002C -/* 0085C 809F6C1C 03E00008 */ jr $ra -/* 00860 809F6C20 AC8A01F8 */ sw $t2, 0x01F8($a0) ## 000001F8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s deleted file mode 100644 index 39276efc10..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s +++ /dev/null @@ -1,40 +0,0 @@ -.late_rodata -glabel D_809F7F88 - .float -0.8 - -.text -glabel func_809F6C24 -/* 00864 809F6C24 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00868 809F6C28 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 0086C 809F6C2C 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 00870 809F6C30 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00874 809F6C34 AFB00028 */ sw $s0, 0x0028($sp) -/* 00878 809F6C38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0087C 809F6C3C AFBF002C */ sw $ra, 0x002C($sp) -/* 00880 809F6C40 3C050600 */ lui $a1, %hi(D_06000724) ## $a1 = 06000000 -/* 00884 809F6C44 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00888 809F6C48 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0088C 809F6C4C 24A50724 */ addiu $a1, $a1, %lo(D_06000724) ## $a1 = 06000724 -/* 00890 809F6C50 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00894 809F6C54 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00898 809F6C58 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 0089C 809F6C5C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 008A0 809F6C60 0C029468 */ jal Animation_Change - -/* 008A4 809F6C64 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 008A8 809F6C68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008AC 809F6C6C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 008B0 809F6C70 24053826 */ addiu $a1, $zero, 0x3826 ## $a1 = 00003826 -/* 008B4 809F6C74 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 008B8 809F6C78 3C01809F */ lui $at, %hi(D_809F7F88) ## $at = 809F0000 -/* 008BC 809F6C7C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 008C0 809F6C80 E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C -/* 008C4 809F6C84 E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 -/* 008C8 809F6C88 C4287F88 */ lwc1 $f8, %lo(D_809F7F88)($at) -/* 008CC 809F6C8C E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 008D0 809F6C90 8FBF002C */ lw $ra, 0x002C($sp) -/* 008D4 809F6C94 8FB00028 */ lw $s0, 0x0028($sp) -/* 008D8 809F6C98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 008DC 809F6C9C 03E00008 */ jr $ra -/* 008E0 809F6CA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6CA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6CA4.s deleted file mode 100644 index 6339c9a6b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6CA4.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_809F6CA4 -/* 008E4 809F6CA4 3C0E809F */ lui $t6, %hi(D_809F7F28) ## $t6 = 809F0000 -/* 008E8 809F6CA8 25CE7F28 */ addiu $t6, $t6, %lo(D_809F7F28) ## $t6 = 809F7F28 -/* 008EC 809F6CAC 8DD80000 */ lw $t8, 0x0000($t6) ## 809F7F28 -/* 008F0 809F6CB0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 008F4 809F6CB4 27A60020 */ addiu $a2, $sp, 0x0020 ## $a2 = FFFFFFF0 -/* 008F8 809F6CB8 ACD80000 */ sw $t8, 0x0000($a2) ## FFFFFFF0 -/* 008FC 809F6CBC 8DCF0004 */ lw $t7, 0x0004($t6) ## 809F7F2C -/* 00900 809F6CC0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00904 809F6CC4 ACCF0004 */ sw $t7, 0x0004($a2) ## FFFFFFF4 -/* 00908 809F6CC8 8DD80008 */ lw $t8, 0x0008($t6) ## 809F7F30 -/* 0090C 809F6CCC ACD80008 */ sw $t8, 0x0008($a2) ## FFFFFFF8 -/* 00910 809F6CD0 8CA21C4C */ lw $v0, 0x1C4C($a1) ## 00001C4C -/* 00914 809F6CD4 AC8001E0 */ sw $zero, 0x01E0($a0) ## 000001E0 -/* 00918 809F6CD8 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 0091C 809F6CDC 5040003A */ beql $v0, $zero, .L809F6DC8 -/* 00920 809F6CE0 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 00924 809F6CE4 8459001C */ lh $t9, 0x001C($v0) ## 0000001C -.L809F6CE8: -/* 00928 809F6CE8 17200007 */ bne $t9, $zero, .L809F6D08 -/* 0092C 809F6CEC 00000000 */ nop -/* 00930 809F6CF0 8C480118 */ lw $t0, 0x0118($v0) ## 00000118 -/* 00934 809F6CF4 15000004 */ bne $t0, $zero, .L809F6D08 -/* 00938 809F6CF8 00000000 */ nop -/* 0093C 809F6CFC 8C490130 */ lw $t1, 0x0130($v0) ## 00000130 -/* 00940 809F6D00 55200004 */ bnel $t1, $zero, .L809F6D14 -/* 00944 809F6D04 844A0000 */ lh $t2, 0x0000($v0) ## 00000000 -.L809F6D08: -/* 00948 809F6D08 1000002C */ beq $zero, $zero, .L809F6DBC -/* 0094C 809F6D0C 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 00950 809F6D10 844A0000 */ lh $t2, 0x0000($v0) ## 00000000 -.L809F6D14: -/* 00954 809F6D14 50AA0004 */ beql $a1, $t2, .L809F6D28 -/* 00958 809F6D18 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 0095C 809F6D1C 10000027 */ beq $zero, $zero, .L809F6DBC -/* 00960 809F6D20 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 00964 809F6D24 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -.L809F6D28: -/* 00968 809F6D28 C4860024 */ lwc1 $f6, 0x0024($a0) ## 00000024 -/* 0096C 809F6D2C C7A00020 */ lwc1 $f0, 0x0020($sp) -/* 00970 809F6D30 C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 -/* 00974 809F6D34 46062081 */ sub.s $f2, $f4, $f6 -/* 00978 809F6D38 C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 0097C 809F6D3C C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C -/* 00980 809F6D40 46000005 */ abs.s $f0, $f0 -/* 00984 809F6D44 46001405 */ abs.s $f16, $f2 -/* 00988 809F6D48 C452002C */ lwc1 $f18, 0x002C($v0) ## 0000002C -/* 0098C 809F6D4C 4610003E */ c.le.s $f0, $f16 -/* 00990 809F6D50 C7A00024 */ lwc1 $f0, 0x0024($sp) -/* 00994 809F6D54 460A4301 */ sub.s $f12, $f8, $f10 -/* 00998 809F6D58 4501000D */ bc1t .L809F6D90 -/* 0099C 809F6D5C 46049381 */ sub.s $f14, $f18, $f4 -/* 009A0 809F6D60 46006085 */ abs.s $f2, $f12 -/* 009A4 809F6D64 46000005 */ abs.s $f0, $f0 -/* 009A8 809F6D68 4602003E */ c.le.s $f0, $f2 -/* 009AC 809F6D6C C7A00028 */ lwc1 $f0, 0x0028($sp) -/* 009B0 809F6D70 45010007 */ bc1t .L809F6D90 -/* 009B4 809F6D74 00000000 */ nop -/* 009B8 809F6D78 46007085 */ abs.s $f2, $f14 -/* 009BC 809F6D7C 46000005 */ abs.s $f0, $f0 -/* 009C0 809F6D80 4602003E */ c.le.s $f0, $f2 -/* 009C4 809F6D84 00000000 */ nop -/* 009C8 809F6D88 45020004 */ bc1fl .L809F6D9C -/* 009CC 809F6D8C AC8201E0 */ sw $v0, 0x01E0($a0) ## 000001E0 -.L809F6D90: -/* 009D0 809F6D90 1000000A */ beq $zero, $zero, .L809F6DBC -/* 009D4 809F6D94 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 009D8 809F6D98 AC8201E0 */ sw $v0, 0x01E0($a0) ## 000001E0 -.L809F6D9C: -/* 009DC 809F6D9C 8C4C0024 */ lw $t4, 0x0024($v0) ## 00000024 -/* 009E0 809F6DA0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 009E4 809F6DA4 ACCC0000 */ sw $t4, 0x0000($a2) ## FFFFFFF0 -/* 009E8 809F6DA8 8C4B0028 */ lw $t3, 0x0028($v0) ## 00000028 -/* 009EC 809F6DAC ACCB0004 */ sw $t3, 0x0004($a2) ## FFFFFFF4 -/* 009F0 809F6DB0 8C4C002C */ lw $t4, 0x002C($v0) ## 0000002C -/* 009F4 809F6DB4 ACCC0008 */ sw $t4, 0x0008($a2) ## FFFFFFF8 -/* 009F8 809F6DB8 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -.L809F6DBC: -/* 009FC 809F6DBC 5440FFCA */ bnel $v0, $zero, .L809F6CE8 -/* 00A00 809F6DC0 8459001C */ lh $t9, 0x001C($v0) ## 0000001C -/* 00A04 809F6DC4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000001 -.L809F6DC8: -/* 00A08 809F6DC8 03E00008 */ jr $ra -/* 00A0C 809F6DCC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6DD0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6DD0.s deleted file mode 100644 index 4f29589629..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6DD0.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_809F6DD0 -/* 00A10 809F6DD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A14 809F6DD4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A18 809F6DD8 8C8201E0 */ lw $v0, 0x01E0($a0) ## 000001E0 -/* 00A1C 809F6DDC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00A20 809F6DE0 54400004 */ bnel $v0, $zero, .L809F6DF4 -/* 00A24 809F6DE4 8C4E0118 */ lw $t6, 0x0118($v0) ## 00000118 -/* 00A28 809F6DE8 10000016 */ beq $zero, $zero, .L809F6E44 -/* 00A2C 809F6DEC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00A30 809F6DF0 8C4E0118 */ lw $t6, 0x0118($v0) ## 00000118 -.L809F6DF4: -/* 00A34 809F6DF4 24C40024 */ addiu $a0, $a2, 0x0024 ## $a0 = 00000024 -/* 00A38 809F6DF8 24450024 */ addiu $a1, $v0, 0x0024 ## $a1 = 00000024 -/* 00A3C 809F6DFC 11C00003 */ beq $t6, $zero, .L809F6E0C -/* 00A40 809F6E00 00000000 */ nop -/* 00A44 809F6E04 1000000F */ beq $zero, $zero, .L809F6E44 -/* 00A48 809F6E08 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809F6E0C: -/* 00A4C 809F6E0C 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 00A50 809F6E10 AFA60018 */ sw $a2, 0x0018($sp) -/* 00A54 809F6E14 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00A58 809F6E18 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 00A5C 809F6E1C 8FA60018 */ lw $a2, 0x0018($sp) -/* 00A60 809F6E20 4600203C */ c.lt.s $f4, $f0 -/* 00A64 809F6E24 00000000 */ nop -/* 00A68 809F6E28 45020004 */ bc1fl .L809F6E3C -/* 00A6C 809F6E2C 8CCF01E0 */ lw $t7, 0x01E0($a2) ## 000001E0 -/* 00A70 809F6E30 10000004 */ beq $zero, $zero, .L809F6E44 -/* 00A74 809F6E34 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00A78 809F6E38 8CCF01E0 */ lw $t7, 0x01E0($a2) ## 000001E0 -.L809F6E3C: -/* 00A7C 809F6E3C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00A80 809F6E40 ADE60118 */ sw $a2, 0x0118($t7) ## 00000118 -.L809F6E44: -/* 00A84 809F6E44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A88 809F6E48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A8C 809F6E4C 03E00008 */ jr $ra -/* 00A90 809F6E50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s deleted file mode 100644 index e89b3e356c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s +++ /dev/null @@ -1,149 +0,0 @@ -glabel func_809F6E54 -/* 00A94 809F6E54 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00A98 809F6E58 3C0F809F */ lui $t7, %hi(D_809F7F34) ## $t7 = 809F0000 -/* 00A9C 809F6E5C AFB00020 */ sw $s0, 0x0020($sp) -/* 00AA0 809F6E60 25EF7F34 */ addiu $t7, $t7, %lo(D_809F7F34) ## $t7 = 809F7F34 -/* 00AA4 809F6E64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AA8 809F6E68 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00AAC 809F6E6C AFA50084 */ sw $a1, 0x0084($sp) -/* 00AB0 809F6E70 25E80030 */ addiu $t0, $t7, 0x0030 ## $t0 = 809F7F64 -/* 00AB4 809F6E74 27AE0050 */ addiu $t6, $sp, 0x0050 ## $t6 = FFFFFFD0 -.L809F6E78: -/* 00AB8 809F6E78 8DF90000 */ lw $t9, 0x0000($t7) ## 809F7F34 -/* 00ABC 809F6E7C 25EF000C */ addiu $t7, $t7, 0x000C ## $t7 = 809F7F40 -/* 00AC0 809F6E80 25CE000C */ addiu $t6, $t6, 0x000C ## $t6 = FFFFFFDC -/* 00AC4 809F6E84 ADD9FFF4 */ sw $t9, -0x000C($t6) ## FFFFFFD0 -/* 00AC8 809F6E88 8DF8FFF8 */ lw $t8, -0x0008($t7) ## 809F7F38 -/* 00ACC 809F6E8C ADD8FFF8 */ sw $t8, -0x0008($t6) ## FFFFFFD4 -/* 00AD0 809F6E90 8DF9FFFC */ lw $t9, -0x0004($t7) ## 809F7F3C -/* 00AD4 809F6E94 15E8FFF8 */ bne $t7, $t0, .L809F6E78 -/* 00AD8 809F6E98 ADD9FFFC */ sw $t9, -0x0004($t6) ## FFFFFFD8 -/* 00ADC 809F6E9C 8E0301E0 */ lw $v1, 0x01E0($s0) ## 000001E0 -/* 00AE0 809F6EA0 8FA90084 */ lw $t1, 0x0084($sp) -/* 00AE4 809F6EA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AE8 809F6EA8 10600009 */ beq $v1, $zero, .L809F6ED0 -/* 00AEC 809F6EAC 8D261C44 */ lw $a2, 0x1C44($t1) ## 00001C44 -/* 00AF0 809F6EB0 8C6A0130 */ lw $t2, 0x0130($v1) ## 00000130 -/* 00AF4 809F6EB4 51400007 */ beql $t2, $zero, .L809F6ED4 -/* 00AF8 809F6EB8 8FA50084 */ lw $a1, 0x0084($sp) -/* 00AFC 809F6EBC 10600009 */ beq $v1, $zero, .L809F6EE4 -/* 00B00 809F6EC0 00000000 */ nop -/* 00B04 809F6EC4 8C6B0118 */ lw $t3, 0x0118($v1) ## 00000118 -/* 00B08 809F6EC8 11600006 */ beq $t3, $zero, .L809F6EE4 -/* 00B0C 809F6ECC 00000000 */ nop -.L809F6ED0: -/* 00B10 809F6ED0 8FA50084 */ lw $a1, 0x0084($sp) -.L809F6ED4: -/* 00B14 809F6ED4 0C27DB29 */ jal func_809F6CA4 -/* 00B18 809F6ED8 AFA60048 */ sw $a2, 0x0048($sp) -/* 00B1C 809F6EDC 8FA60048 */ lw $a2, 0x0048($sp) -/* 00B20 809F6EE0 8E0301E0 */ lw $v1, 0x01E0($s0) ## 000001E0 -.L809F6EE4: -/* 00B24 809F6EE4 10600009 */ beq $v1, $zero, .L809F6F0C -/* 00B28 809F6EE8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00B2C 809F6EEC 8C680024 */ lw $t0, 0x0024($v1) ## 00000024 -/* 00B30 809F6EF0 27AC003C */ addiu $t4, $sp, 0x003C ## $t4 = FFFFFFBC -/* 00B34 809F6EF4 AD880000 */ sw $t0, 0x0000($t4) ## FFFFFFBC -/* 00B38 809F6EF8 8C6D0028 */ lw $t5, 0x0028($v1) ## 00000028 -/* 00B3C 809F6EFC AD8D0004 */ sw $t5, 0x0004($t4) ## FFFFFFC0 -/* 00B40 809F6F00 8C68002C */ lw $t0, 0x002C($v1) ## 0000002C -/* 00B44 809F6F04 10000008 */ beq $zero, $zero, .L809F6F28 -/* 00B48 809F6F08 AD880008 */ sw $t0, 0x0008($t4) ## FFFFFFC4 -.L809F6F0C: -/* 00B4C 809F6F0C 8CD80024 */ lw $t8, 0x0024($a2) ## 00000024 -/* 00B50 809F6F10 27AF003C */ addiu $t7, $sp, 0x003C ## $t7 = FFFFFFBC -/* 00B54 809F6F14 ADF80000 */ sw $t8, 0x0000($t7) ## FFFFFFBC -/* 00B58 809F6F18 8CCE0028 */ lw $t6, 0x0028($a2) ## 00000028 -/* 00B5C 809F6F1C ADEE0004 */ sw $t6, 0x0004($t7) ## FFFFFFC0 -/* 00B60 809F6F20 8CD8002C */ lw $t8, 0x002C($a2) ## 0000002C -/* 00B64 809F6F24 ADF80008 */ sw $t8, 0x0008($t7) ## FFFFFFC4 -.L809F6F28: -/* 00B68 809F6F28 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFBC -/* 00B6C 809F6F2C 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 00B70 809F6F30 AFA4002C */ sw $a0, 0x002C($sp) -/* 00B74 809F6F34 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00B78 809F6F38 44812000 */ mtc1 $at, $f4 ## $f4 = 80.00 -/* 00B7C 809F6F3C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 00B80 809F6F40 27AD0050 */ addiu $t5, $sp, 0x0050 ## $t5 = FFFFFFD0 -/* 00B84 809F6F44 4600203C */ c.lt.s $f4, $f0 -/* 00B88 809F6F48 00000000 */ nop -/* 00B8C 809F6F4C 45020036 */ bc1fl .L809F7028 -/* 00B90 809F6F50 8FA4002C */ lw $a0, 0x002C($sp) -/* 00B94 809F6F54 8FB90084 */ lw $t9, 0x0084($sp) -/* 00B98 809F6F58 C6060008 */ lwc1 $f6, 0x0008($s0) ## 00000008 -/* 00B9C 809F6F5C C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 00BA0 809F6F60 8F29009C */ lw $t1, 0x009C($t9) ## 0000009C -/* 00BA4 809F6F64 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 00BA8 809F6F68 46083280 */ add.s $f10, $f6, $f8 -/* 00BAC 809F6F6C 0121001B */ divu $zero, $t1, $at -/* 00BB0 809F6F70 00005012 */ mflo $t2 -/* 00BB4 809F6F74 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 00BB8 809F6F78 46105480 */ add.s $f18, $f10, $f16 -/* 00BBC 809F6F7C 05410005 */ bgez $t2, .L809F6F94 -/* 00BC0 809F6F80 468021A0 */ cvt.s.w $f6, $f4 -/* 00BC4 809F6F84 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 00BC8 809F6F88 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 00BCC 809F6F8C 00000000 */ nop -/* 00BD0 809F6F90 46083180 */ add.s $f6, $f6, $f8 -.L809F6F94: -/* 00BD4 809F6F94 46069280 */ add.s $f10, $f18, $f6 -/* 00BD8 809F6F98 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 00BDC 809F6F9C 4600540D */ trunc.w.s $f16, $f10 -/* 00BE0 809F6FA0 44028000 */ mfc1 $v0, $f16 -/* 00BE4 809F6FA4 00000000 */ nop -/* 00BE8 809F6FA8 00021400 */ sll $v0, $v0, 16 -/* 00BEC 809F6FAC 00021403 */ sra $v0, $v0, 16 -/* 00BF0 809F6FB0 0041001A */ div $zero, $v0, $at -/* 00BF4 809F6FB4 00001010 */ mfhi $v0 -/* 00BF8 809F6FB8 00021400 */ sll $v0, $v0, 16 -/* 00BFC 809F6FBC 00021403 */ sra $v0, $v0, 16 -/* 00C00 809F6FC0 04430005 */ bgezl $v0, .L809F6FD8 -/* 00C04 809F6FC4 00026080 */ sll $t4, $v0, 2 -/* 00C08 809F6FC8 00021023 */ subu $v0, $zero, $v0 -/* 00C0C 809F6FCC 00021400 */ sll $v0, $v0, 16 -/* 00C10 809F6FD0 00021403 */ sra $v0, $v0, 16 -/* 00C14 809F6FD4 00026080 */ sll $t4, $v0, 2 -.L809F6FD8: -/* 00C18 809F6FD8 018D1821 */ addu $v1, $t4, $t5 -/* 00C1C 809F6FDC C46C0000 */ lwc1 $f12, 0x0000($v1) ## 00000000 -/* 00C20 809F6FE0 0C0400A4 */ jal sinf - -/* 00C24 809F6FE4 AFA30028 */ sw $v1, 0x0028($sp) -/* 00C28 809F6FE8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00C2C 809F6FEC 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 -/* 00C30 809F6FF0 C7A4003C */ lwc1 $f4, 0x003C($sp) -/* 00C34 809F6FF4 8FA30028 */ lw $v1, 0x0028($sp) -/* 00C38 809F6FF8 46004482 */ mul.s $f18, $f8, $f0 -/* 00C3C 809F6FFC 46122180 */ add.s $f6, $f4, $f18 -/* 00C40 809F7000 E7A6003C */ swc1 $f6, 0x003C($sp) -/* 00C44 809F7004 0C041184 */ jal cosf - -/* 00C48 809F7008 C46C0000 */ lwc1 $f12, 0x0000($v1) ## 00000000 -/* 00C4C 809F700C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00C50 809F7010 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 -/* 00C54 809F7014 C7AA0044 */ lwc1 $f10, 0x0044($sp) -/* 00C58 809F7018 46008202 */ mul.s $f8, $f16, $f0 -/* 00C5C 809F701C 46085100 */ add.s $f4, $f10, $f8 -/* 00C60 809F7020 E7A40044 */ swc1 $f4, 0x0044($sp) -/* 00C64 809F7024 8FA4002C */ lw $a0, 0x002C($sp) -.L809F7028: -/* 00C68 809F7028 0C01E01A */ jal Math_Vec3f_Yaw - -/* 00C6C 809F702C 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFBC -/* 00C70 809F7030 00022C00 */ sll $a1, $v0, 16 -/* 00C74 809F7034 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00C78 809F7038 AFA80010 */ sw $t0, 0x0010($sp) -/* 00C7C 809F703C 00052C03 */ sra $a1, $a1, 16 -/* 00C80 809F7040 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00C84 809F7044 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00C88 809F7048 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00C8C 809F704C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 00C90 809F7050 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 00C94 809F7054 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 00C98 809F7058 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00C9C 809F705C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00CA0 809F7060 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 00CA4 809F7064 03E00008 */ jr $ra -/* 00CA8 809F7068 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F706C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F706C.s deleted file mode 100644 index 2fe07df412..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F706C.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_809F706C -/* 00CAC 809F706C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00CB0 809F7070 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 -/* 00CB4 809F7074 C4860090 */ lwc1 $f6, 0x0090($a0) ## 00000090 -/* 00CB8 809F7078 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00CBC 809F707C 4606203C */ c.lt.s $f4, $f6 -/* 00CC0 809F7080 00000000 */ nop -/* 00CC4 809F7084 45000003 */ bc1f .L809F7094 -/* 00CC8 809F7088 00000000 */ nop -/* 00CCC 809F708C 03E00008 */ jr $ra -/* 00CD0 809F7090 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809F7094: -/* 00CD4 809F7094 03E00008 */ jr $ra -/* 00CD8 809F7098 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F709C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F709C.s deleted file mode 100644 index d09352435f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F709C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_809F709C -/* 00CDC 809F709C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CE0 809F70A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CE4 809F70A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00CE8 809F70A8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00CEC 809F70AC 24053821 */ addiu $a1, $zero, 0x3821 ## $a1 = 00003821 -/* 00CF0 809F70B0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CF4 809F70B4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00CF8 809F70B8 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00CFC 809F70BC 01C17824 */ and $t7, $t6, $at -/* 00D00 809F70C0 0C27DA88 */ jal func_809F6A20 -/* 00D04 809F70C4 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 00D08 809F70C8 8FA40018 */ lw $a0, 0x0018($sp) -/* 00D0C 809F70CC 3C18809F */ lui $t8, %hi(func_809F7AB8) ## $t8 = 809F0000 -/* 00D10 809F70D0 27187AB8 */ addiu $t8, $t8, %lo(func_809F7AB8) ## $t8 = 809F7AB8 -/* 00D14 809F70D4 AC980190 */ sw $t8, 0x0190($a0) ## 00000190 -/* 00D18 809F70D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D1C 809F70DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D20 809F70E0 03E00008 */ jr $ra -/* 00D24 809F70E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s deleted file mode 100644 index f158391e09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s +++ /dev/null @@ -1,124 +0,0 @@ -glabel func_809F70E8 -/* 00D28 809F70E8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00D2C 809F70EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D30 809F70F0 AFB00020 */ sw $s0, 0x0020($sp) -/* 00D34 809F70F4 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 00D38 809F70F8 3C0E809F */ lui $t6, %hi(func_809F773C) ## $t6 = 809F0000 -/* 00D3C 809F70FC 25CE773C */ addiu $t6, $t6, %lo(func_809F773C) ## $t6 = 809F773C -/* 00D40 809F7100 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D44 809F7104 11C20014 */ beq $t6, $v0, .L809F7158 -/* 00D48 809F7108 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00D4C 809F710C 3C0F809F */ lui $t7, %hi(func_809F77AC) ## $t7 = 809F0000 -/* 00D50 809F7110 25EF77AC */ addiu $t7, $t7, %lo(func_809F77AC) ## $t7 = 809F77AC -/* 00D54 809F7114 11E20010 */ beq $t7, $v0, .L809F7158 -/* 00D58 809F7118 3C18809F */ lui $t8, %hi(func_809F784C) ## $t8 = 809F0000 -/* 00D5C 809F711C 2718784C */ addiu $t8, $t8, %lo(func_809F784C) ## $t8 = 809F784C -/* 00D60 809F7120 1302000D */ beq $t8, $v0, .L809F7158 -/* 00D64 809F7124 3C19809F */ lui $t9, %hi(func_809F7A00) ## $t9 = 809F0000 -/* 00D68 809F7128 27397A00 */ addiu $t9, $t9, %lo(func_809F7A00) ## $t9 = 809F7A00 -/* 00D6C 809F712C 1322000A */ beq $t9, $v0, .L809F7158 -/* 00D70 809F7130 3C08809F */ lui $t0, %hi(func_809F7AB8) ## $t0 = 809F0000 -/* 00D74 809F7134 25087AB8 */ addiu $t0, $t0, %lo(func_809F7AB8) ## $t0 = 809F7AB8 -/* 00D78 809F7138 11020007 */ beq $t0, $v0, .L809F7158 -/* 00D7C 809F713C 3C09809F */ lui $t1, %hi(func_809F7B3C) ## $t1 = 809F0000 -/* 00D80 809F7140 25297B3C */ addiu $t1, $t1, %lo(func_809F7B3C) ## $t1 = 809F7B3C -/* 00D84 809F7144 11220004 */ beq $t1, $v0, .L809F7158 -/* 00D88 809F7148 3C0A809F */ lui $t2, %hi(func_809F7BE4) ## $t2 = 809F0000 -/* 00D8C 809F714C 254A7BE4 */ addiu $t2, $t2, %lo(func_809F7BE4) ## $t2 = 809F7BE4 -/* 00D90 809F7150 55420004 */ bnel $t2, $v0, .L809F7164 -/* 00D94 809F7154 90CB1C26 */ lbu $t3, 0x1C26($a2) ## 00001C26 -.L809F7158: -/* 00D98 809F7158 1000004D */ beq $zero, $zero, .L809F7290 -/* 00D9C 809F715C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00DA0 809F7160 90CB1C26 */ lbu $t3, 0x1C26($a2) ## 00001C26 -.L809F7164: -/* 00DA4 809F7164 3C0C809F */ lui $t4, %hi(func_809F73AC) ## $t4 = 809F0000 -/* 00DA8 809F7168 258C73AC */ addiu $t4, $t4, %lo(func_809F73AC) ## $t4 = 809F73AC -/* 00DAC 809F716C 5160000D */ beql $t3, $zero, .L809F71A4 -/* 00DB0 809F7170 920301A5 */ lbu $v1, 0x01A5($s0) ## 000001A5 -/* 00DB4 809F7174 11820008 */ beq $t4, $v0, .L809F7198 -/* 00DB8 809F7178 3C0D809F */ lui $t5, %hi(func_809F74C4) ## $t5 = 809F0000 -/* 00DBC 809F717C 25AD74C4 */ addiu $t5, $t5, %lo(func_809F74C4) ## $t5 = 809F74C4 -/* 00DC0 809F7180 15A20003 */ bne $t5, $v0, .L809F7190 -/* 00DC4 809F7184 3C0E8003 */ lui $t6, %hi(ActorShadow_DrawCircle) -/* 00DC8 809F7188 25CEB5EC */ addiu $t6, %lo(ActorShadow_DrawCircle) -/* 00DCC 809F718C AE0E00C0 */ sw $t6, 0x00C0($s0) ## 000000C0 -.L809F7190: -/* 00DD0 809F7190 0C27DC27 */ jal func_809F709C -/* 00DD4 809F7194 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809F7198: -/* 00DD8 809F7198 1000003D */ beq $zero, $zero, .L809F7290 -/* 00DDC 809F719C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00DE0 809F71A0 920301A5 */ lbu $v1, 0x01A5($s0) ## 000001A5 -.L809F71A4: -/* 00DE4 809F71A4 3C19809F */ lui $t9, %hi(func_809F73AC) ## $t9 = 809F0000 -/* 00DE8 809F71A8 273973AC */ addiu $t9, $t9, %lo(func_809F73AC) ## $t9 = 809F73AC -/* 00DEC 809F71AC 306F0002 */ andi $t7, $v1, 0x0002 ## $t7 = 00000000 -/* 00DF0 809F71B0 15E00003 */ bne $t7, $zero, .L809F71C0 -/* 00DF4 809F71B4 3078FFFD */ andi $t8, $v1, 0xFFFD ## $t8 = 00000000 -/* 00DF8 809F71B8 10000035 */ beq $zero, $zero, .L809F7290 -/* 00DFC 809F71BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809F71C0: -/* 00E00 809F71C0 13220004 */ beq $t9, $v0, .L809F71D4 -/* 00E04 809F71C4 A21801A5 */ sb $t8, 0x01A5($s0) ## 000001A5 -/* 00E08 809F71C8 3C08809F */ lui $t0, %hi(func_809F74C4) ## $t0 = 809F0000 -/* 00E0C 809F71CC 250874C4 */ addiu $t0, $t0, %lo(func_809F74C4) ## $t0 = 809F74C4 -/* 00E10 809F71D0 15020003 */ bne $t0, $v0, .L809F71E0 -.L809F71D4: -/* 00E14 809F71D4 3C098003 */ lui $t1, %hi(ActorShadow_DrawCircle) -/* 00E18 809F71D8 2529B5EC */ addiu $t1, %lo(ActorShadow_DrawCircle) -/* 00E1C 809F71DC AE0900C0 */ sw $t1, 0x00C0($s0) ## 000000C0 -.L809F71E0: -/* 00E20 809F71E0 920200B1 */ lbu $v0, 0x00B1($s0) ## 000000B1 -/* 00E24 809F71E4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00E28 809F71E8 1440000E */ bne $v0, $zero, .L809F7224 -/* 00E2C 809F71EC 00000000 */ nop -/* 00E30 809F71F0 920A00B0 */ lbu $t2, 0x00B0($s0) ## 000000B0 -/* 00E34 809F71F4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00E38 809F71F8 1140000A */ beq $t2, $zero, .L809F7224 -/* 00E3C 809F71FC 00000000 */ nop -/* 00E40 809F7200 0C00CB1F */ jal func_80032C7C -/* 00E44 809F7204 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E48 809F7208 3C0C809F */ lui $t4, %hi(func_809F7C48) ## $t4 = 809F0000 -/* 00E4C 809F720C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 00E50 809F7210 258C7C48 */ addiu $t4, $t4, %lo(func_809F7C48) ## $t4 = 809F7C48 -/* 00E54 809F7214 A60B0200 */ sh $t3, 0x0200($s0) ## 00000200 -/* 00E58 809F7218 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 00E5C 809F721C 1000001C */ beq $zero, $zero, .L809F7290 -/* 00E60 809F7220 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809F7224: -/* 00E64 809F7224 5441001A */ bnel $v0, $at, .L809F7290 -/* 00E68 809F7228 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00E6C 809F722C 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 00E70 809F7230 3C0D809F */ lui $t5, %hi(func_809F78EC) ## $t5 = 809F0000 -/* 00E74 809F7234 25AD78EC */ addiu $t5, $t5, %lo(func_809F78EC) ## $t5 = 809F78EC -/* 00E78 809F7238 11A20014 */ beq $t5, $v0, .L809F728C -/* 00E7C 809F723C 3C03809F */ lui $v1, %hi(func_809F786C) ## $v1 = 809F0000 -/* 00E80 809F7240 2463786C */ addiu $v1, $v1, %lo(func_809F786C) ## $v1 = 809F786C -/* 00E84 809F7244 10620011 */ beq $v1, $v0, .L809F728C -/* 00E88 809F7248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E8C 809F724C 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E -/* 00E90 809F7250 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00E94 809F7254 AFA30028 */ sw $v1, 0x0028($sp) -/* 00E98 809F7258 240E0078 */ addiu $t6, $zero, 0x0078 ## $t6 = 00000078 -/* 00E9C 809F725C A60E01FE */ sh $t6, 0x01FE($s0) ## 000001FE -/* 00EA0 809F7260 240F0078 */ addiu $t7, $zero, 0x0078 ## $t7 = 00000078 -/* 00EA4 809F7264 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00EA8 809F7268 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EAC 809F726C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00EB0 809F7270 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 00EB4 809F7274 0C00D09B */ jal func_8003426C -/* 00EB8 809F7278 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00EBC 809F727C 0C27DA88 */ jal func_809F6A20 -/* 00EC0 809F7280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EC4 809F7284 8FB80028 */ lw $t8, 0x0028($sp) -/* 00EC8 809F7288 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -.L809F728C: -/* 00ECC 809F728C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809F7290: -/* 00ED0 809F7290 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00ED4 809F7294 8FB00020 */ lw $s0, 0x0020($sp) -/* 00ED8 809F7298 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00EDC 809F729C 03E00008 */ jr $ra -/* 00EE0 809F72A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s deleted file mode 100644 index 6073be6d22..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_809F72A4 -/* 00EE4 809F72A4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00EE8 809F72A8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00EEC 809F72AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00EF0 809F72B0 24850194 */ addiu $a1, $a0, 0x0194 ## $a1 = 00000194 -/* 00EF4 809F72B4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00EF8 809F72B8 0C0189B7 */ jal Collider_UpdateCylinder - -/* 00EFC 809F72BC AFA40028 */ sw $a0, 0x0028($sp) -/* 00F00 809F72C0 8FA70028 */ lw $a3, 0x0028($sp) -/* 00F04 809F72C4 3C0E809F */ lui $t6, %hi(func_809F73AC) ## $t6 = 809F0000 -/* 00F08 809F72C8 25CE73AC */ addiu $t6, $t6, %lo(func_809F73AC) ## $t6 = 809F73AC -/* 00F0C 809F72CC 8CE20190 */ lw $v0, 0x0190($a3) ## 00000190 -/* 00F10 809F72D0 3C0F809F */ lui $t7, %hi(func_809F7BE4) ## $t7 = 809F0000 -/* 00F14 809F72D4 25EF7BE4 */ addiu $t7, $t7, %lo(func_809F7BE4) ## $t7 = 809F7BE4 -/* 00F18 809F72D8 51C20031 */ beql $t6, $v0, .L809F73A0 -/* 00F1C 809F72DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F20 809F72E0 11E2002E */ beq $t7, $v0, .L809F739C -/* 00F24 809F72E4 3C03809F */ lui $v1, %hi(func_809F74C4) ## $v1 = 809F0000 -/* 00F28 809F72E8 246374C4 */ addiu $v1, $v1, %lo(func_809F74C4) ## $v1 = 809F74C4 -/* 00F2C 809F72EC 10620007 */ beq $v1, $v0, .L809F730C -/* 00F30 809F72F0 3C18809F */ lui $t8, %hi(func_809F758C) ## $t8 = 809F0000 -/* 00F34 809F72F4 2718758C */ addiu $t8, $t8, %lo(func_809F758C) ## $t8 = 809F758C -/* 00F38 809F72F8 13020004 */ beq $t8, $v0, .L809F730C -/* 00F3C 809F72FC 3C19809F */ lui $t9, %hi(func_809F799C) ## $t9 = 809F0000 -/* 00F40 809F7300 2739799C */ addiu $t9, $t9, %lo(func_809F799C) ## $t9 = 809F799C -/* 00F44 809F7304 5722000D */ bnel $t9, $v0, .L809F733C -/* 00F48 809F7308 8FA4002C */ lw $a0, 0x002C($sp) -.L809F730C: -/* 00F4C 809F730C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00F50 809F7310 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00F54 809F7314 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00F58 809F7318 8FA60024 */ lw $a2, 0x0024($sp) -/* 00F5C 809F731C AFA3001C */ sw $v1, 0x001C($sp) -/* 00F60 809F7320 AFA70028 */ sw $a3, 0x0028($sp) -/* 00F64 809F7324 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 00F68 809F7328 00812821 */ addu $a1, $a0, $at -/* 00F6C 809F732C 8FA70028 */ lw $a3, 0x0028($sp) -/* 00F70 809F7330 8FA3001C */ lw $v1, 0x001C($sp) -/* 00F74 809F7334 8CE20190 */ lw $v0, 0x0190($a3) ## 00000190 -/* 00F78 809F7338 8FA4002C */ lw $a0, 0x002C($sp) -.L809F733C: -/* 00F7C 809F733C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00F80 809F7340 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00F84 809F7344 1062000E */ beq $v1, $v0, .L809F7380 -/* 00F88 809F7348 00812821 */ addu $a1, $a0, $at -/* 00F8C 809F734C 3C08809F */ lui $t0, %hi(func_809F758C) ## $t0 = 809F0000 -/* 00F90 809F7350 2508758C */ addiu $t0, $t0, %lo(func_809F758C) ## $t0 = 809F758C -/* 00F94 809F7354 1102000A */ beq $t0, $v0, .L809F7380 -/* 00F98 809F7358 3C09809F */ lui $t1, %hi(func_809F786C) ## $t1 = 809F0000 -/* 00F9C 809F735C 2529786C */ addiu $t1, $t1, %lo(func_809F786C) ## $t1 = 809F786C -/* 00FA0 809F7360 11220007 */ beq $t1, $v0, .L809F7380 -/* 00FA4 809F7364 3C0A809F */ lui $t2, %hi(func_809F78EC) ## $t2 = 809F0000 -/* 00FA8 809F7368 254A78EC */ addiu $t2, $t2, %lo(func_809F78EC) ## $t2 = 809F78EC -/* 00FAC 809F736C 11420004 */ beq $t2, $v0, .L809F7380 -/* 00FB0 809F7370 3C0B809F */ lui $t3, %hi(func_809F799C) ## $t3 = 809F0000 -/* 00FB4 809F7374 256B799C */ addiu $t3, $t3, %lo(func_809F799C) ## $t3 = 809F799C -/* 00FB8 809F7378 15620006 */ bne $t3, $v0, .L809F7394 -/* 00FBC 809F737C 00000000 */ nop -.L809F7380: -/* 00FC0 809F7380 8FA60024 */ lw $a2, 0x0024($sp) -/* 00FC4 809F7384 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00FC8 809F7388 AFA50018 */ sw $a1, 0x0018($sp) -/* 00FCC 809F738C 8FA50018 */ lw $a1, 0x0018($sp) -/* 00FD0 809F7390 8FA4002C */ lw $a0, 0x002C($sp) -.L809F7394: -/* 00FD4 809F7394 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 00FD8 809F7398 8FA60024 */ lw $a2, 0x0024($sp) -.L809F739C: -/* 00FDC 809F739C 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F73A0: -/* 00FE0 809F73A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00FE4 809F73A4 03E00008 */ jr $ra -/* 00FE8 809F73A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s deleted file mode 100644 index 1d8cd1315d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_809F73AC -/* 00FEC 809F73AC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00FF0 809F73B0 AFB00028 */ sw $s0, 0x0028($sp) -/* 00FF4 809F73B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FF8 809F73B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 00FFC 809F73BC 3C040600 */ lui $a0, %hi(D_06000860) ## $a0 = 06000000 -/* 01000 809F73C0 AFA50034 */ sw $a1, 0x0034($sp) -/* 01004 809F73C4 0C028800 */ jal Animation_GetLastFrame - -/* 01008 809F73C8 24840860 */ addiu $a0, $a0, %lo(D_06000860) ## $a0 = 06000860 -/* 0100C 809F73CC 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 -/* 01010 809F73D0 44814000 */ mtc1 $at, $f8 ## $f8 = 320.00 -/* 01014 809F73D4 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 01018 809F73D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0101C 809F73DC 8FAE0034 */ lw $t6, 0x0034($sp) -/* 01020 809F73E0 4606403E */ c.le.s $f8, $f6 -/* 01024 809F73E4 468020A0 */ cvt.s.w $f2, $f4 -/* 01028 809F73E8 8DC31C44 */ lw $v1, 0x1C44($t6) ## 00001C44 -/* 0102C 809F73EC 45030031 */ bc1tl .L809F74B4 -/* 01030 809F73F0 8FBF002C */ lw $ra, 0x002C($sp) -/* 01034 809F73F4 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 01038 809F73F8 C4700028 */ lwc1 $f16, 0x0028($v1) ## 00000028 -/* 0103C 809F73FC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 01040 809F7400 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 -/* 01044 809F7404 46105001 */ sub.s $f0, $f10, $f16 -/* 01048 809F7408 3C050600 */ lui $a1, %hi(D_06000860) ## $a1 = 06000000 -/* 0104C 809F740C 3C063FE6 */ lui $a2, 0x3FE6 ## $a2 = 3FE60000 -/* 01050 809F7410 34C66666 */ ori $a2, $a2, 0x6666 ## $a2 = 3FE66666 -/* 01054 809F7414 4600903E */ c.le.s $f18, $f0 -/* 01058 809F7418 24A50860 */ addiu $a1, $a1, %lo(D_06000860) ## $a1 = 06000860 -/* 0105C 809F741C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01060 809F7420 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01064 809F7424 45010022 */ bc1t .L809F74B0 -/* 01068 809F7428 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0106C 809F742C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01070 809F7430 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 -/* 01074 809F7434 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01078 809F7438 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0107C 809F743C 0C029468 */ jal Animation_Change - -/* 01080 809F7440 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 01084 809F7444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01088 809F7448 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0108C 809F744C 24053824 */ addiu $a1, $zero, 0x3824 ## $a1 = 00003824 -/* 01090 809F7450 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01094 809F7454 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 01098 809F7458 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 0109C 809F745C 86080030 */ lh $t0, 0x0030($s0) ## 00000030 -/* 010A0 809F7460 8E0C0024 */ lw $t4, 0x0024($s0) ## 00000024 -/* 010A4 809F7464 46083281 */ sub.s $f10, $f6, $f8 -/* 010A8 809F7468 2509C000 */ addiu $t1, $t0, 0xC000 ## $t1 = FFFFC000 -/* 010AC 809F746C 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 010B0 809F7470 A6090030 */ sh $t1, 0x0030($s0) ## 00000030 -/* 010B4 809F7474 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 010B8 809F7478 8E0B0028 */ lw $t3, 0x0028($s0) ## 00000028 -/* 010BC 809F747C AE0C01F0 */ sw $t4, 0x01F0($s0) ## 000001F0 -/* 010C0 809F7480 860A0030 */ lh $t2, 0x0030($s0) ## 00000030 -/* 010C4 809F7484 8E0C002C */ lw $t4, 0x002C($s0) ## 0000002C -/* 010C8 809F7488 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 -/* 010CC 809F748C 3C0D809F */ lui $t5, %hi(func_809F74C4) ## $t5 = 809F0000 -/* 010D0 809F7490 25AD74C4 */ addiu $t5, $t5, %lo(func_809F74C4) ## $t5 = 809F74C4 -/* 010D4 809F7494 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 010D8 809F7498 AE0B01F4 */ sw $t3, 0x01F4($s0) ## 000001F4 -/* 010DC 809F749C AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 010E0 809F74A0 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 010E4 809F74A4 A60A00B4 */ sh $t2, 0x00B4($s0) ## 000000B4 -/* 010E8 809F74A8 AE0C01F8 */ sw $t4, 0x01F8($s0) ## 000001F8 -/* 010EC 809F74AC E61001F4 */ swc1 $f16, 0x01F4($s0) ## 000001F4 -.L809F74B0: -/* 010F0 809F74B0 8FBF002C */ lw $ra, 0x002C($sp) -.L809F74B4: -/* 010F4 809F74B4 8FB00028 */ lw $s0, 0x0028($sp) -/* 010F8 809F74B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 010FC 809F74BC 03E00008 */ jr $ra -/* 01100 809F74C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s deleted file mode 100644 index 93c2695c48..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s +++ /dev/null @@ -1,58 +0,0 @@ -.late_rodata -glabel D_809F7F8C - .word 0x40266666 - -.text -glabel func_809F74C4 -/* 01104 809F74C4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01108 809F74C8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0110C 809F74CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01110 809F74D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01114 809F74D4 AFA50034 */ sw $a1, 0x0034($sp) -/* 01118 809F74D8 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 0111C 809F74DC AFAE0010 */ sw $t6, 0x0010($sp) -/* 01120 809F74E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01124 809F74E4 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 01128 809F74E8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0112C 809F74EC 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01130 809F74F0 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 01134 809F74F4 860F00B4 */ lh $t7, 0x00B4($s0) ## 000000B4 -/* 01138 809F74F8 3C014680 */ lui $at, 0x4680 ## $at = 46800000 -/* 0113C 809F74FC 44813000 */ mtc1 $at, $f6 ## $f6 = 16384.00 -/* 01140 809F7500 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 01144 809F7504 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01148 809F7508 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 -/* 0114C 809F750C 46802020 */ cvt.s.w $f0, $f4 -/* 01150 809F7510 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 01154 809F7514 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01158 809F7518 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 0115C 809F751C 46060003 */ div.s $f0, $f0, $f6 -/* 01160 809F7520 46005402 */ mul.s $f16, $f10, $f0 -/* 01164 809F7524 46104480 */ add.s $f18, $f8, $f16 -/* 01168 809F7528 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 0116C 809F752C E7A0002C */ swc1 $f0, 0x002C($sp) -/* 01170 809F7530 0C27D944 */ jal func_809F6510 -/* 01174 809F7534 8FA50034 */ lw $a1, 0x0034($sp) -/* 01178 809F7538 C7A0002C */ lwc1 $f0, 0x002C($sp) -/* 0117C 809F753C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01180 809F7540 3C188003 */ lui $t8, %hi(ActorShadow_DrawCircle) -/* 01184 809F7544 2718B5EC */ addiu $t8, %lo(ActorShadow_DrawCircle) -/* 01188 809F7548 46040032 */ c.eq.s $f0, $f4 -/* 0118C 809F754C 3C01809F */ lui $at, %hi(D_809F7F8C) ## $at = 809F0000 -/* 01190 809F7550 4502000A */ bc1fl .L809F757C -/* 01194 809F7554 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01198 809F7558 861900B4 */ lh $t9, 0x00B4($s0) ## 000000B4 -/* 0119C 809F755C AE1800C0 */ sw $t8, 0x00C0($s0) ## 000000C0 -/* 011A0 809F7560 3C08809F */ lui $t0, %hi(func_809F758C) ## $t0 = 809F0000 -/* 011A4 809F7564 A6190030 */ sh $t9, 0x0030($s0) ## 00000030 -/* 011A8 809F7568 C4267F8C */ lwc1 $f6, %lo(D_809F7F8C)($at) -/* 011AC 809F756C 2508758C */ addiu $t0, $t0, %lo(func_809F758C) ## $t0 = 809F758C -/* 011B0 809F7570 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -/* 011B4 809F7574 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 011B8 809F7578 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F757C: -/* 011BC 809F757C 8FB00020 */ lw $s0, 0x0020($sp) -/* 011C0 809F7580 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 011C4 809F7584 03E00008 */ jr $ra -/* 011C8 809F7588 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F758C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F758C.s deleted file mode 100644 index 45d2895c23..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F758C.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_809F758C -/* 011CC 809F758C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 011D0 809F7590 AFBF001C */ sw $ra, 0x001C($sp) -/* 011D4 809F7594 AFB00018 */ sw $s0, 0x0018($sp) -/* 011D8 809F7598 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 011DC 809F759C 0C00B61A */ jal func_8002D868 -/* 011E0 809F75A0 AFA50024 */ sw $a1, 0x0024($sp) -/* 011E4 809F75A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011E8 809F75A8 8FA50024 */ lw $a1, 0x0024($sp) -/* 011EC 809F75AC 0C27D9CC */ jal func_809F6730 -/* 011F0 809F75B0 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 011F4 809F75B4 86020204 */ lh $v0, 0x0204($s0) ## 00000204 -/* 011F8 809F75B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011FC 809F75BC 14400003 */ bne $v0, $zero, .L809F75CC -/* 01200 809F75C0 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01204 809F75C4 10000003 */ beq $zero, $zero, .L809F75D4 -/* 01208 809F75C8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809F75CC: -/* 0120C 809F75CC A60E0204 */ sh $t6, 0x0204($s0) ## 00000204 -/* 01210 809F75D0 86030204 */ lh $v1, 0x0204($s0) ## 00000204 -.L809F75D4: -/* 01214 809F75D4 14600005 */ bne $v1, $zero, .L809F75EC -/* 01218 809F75D8 00000000 */ nop -/* 0121C 809F75DC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01220 809F75E0 24053822 */ addiu $a1, $zero, 0x3822 ## $a1 = 00003822 -/* 01224 809F75E4 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 01228 809F75E8 A60F0204 */ sh $t7, 0x0204($s0) ## 00000204 -.L809F75EC: -/* 0122C 809F75EC 0C27DB74 */ jal func_809F6DD0 -/* 01230 809F75F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01234 809F75F4 10400007 */ beq $v0, $zero, .L809F7614 -/* 01238 809F75F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0123C 809F75FC 0C27DB09 */ jal func_809F6C24 -/* 01240 809F7600 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01244 809F7604 3C18809F */ lui $t8, %hi(func_809F768C) ## $t8 = 809F0000 -/* 01248 809F7608 2718768C */ addiu $t8, $t8, %lo(func_809F768C) ## $t8 = 809F768C -/* 0124C 809F760C 1000001A */ beq $zero, $zero, .L809F7678 -/* 01250 809F7610 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -.L809F7614: -/* 01254 809F7614 0C27DB95 */ jal func_809F6E54 -/* 01258 809F7618 8FA50024 */ lw $a1, 0x0024($sp) -/* 0125C 809F761C 0C27DC1B */ jal func_809F706C -/* 01260 809F7620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01264 809F7624 10400008 */ beq $v0, $zero, .L809F7648 -/* 01268 809F7628 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0126C 809F762C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01270 809F7630 24053820 */ addiu $a1, $zero, 0x3820 ## $a1 = 00003820 -/* 01274 809F7634 0C27DACE */ jal func_809F6B38 -/* 01278 809F7638 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0127C 809F763C 3C19809F */ lui $t9, %hi(func_809F799C) ## $t9 = 809F0000 -/* 01280 809F7640 2739799C */ addiu $t9, $t9, %lo(func_809F799C) ## $t9 = 809F799C -/* 01284 809F7644 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -.L809F7648: -/* 01288 809F7648 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 -/* 0128C 809F764C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01290 809F7650 31090008 */ andi $t1, $t0, 0x0008 ## $t1 = 00000000 -/* 01294 809F7654 51200009 */ beql $t1, $zero, .L809F767C -/* 01298 809F7658 8FBF001C */ lw $ra, 0x001C($sp) -/* 0129C 809F765C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 012A0 809F7660 24053823 */ addiu $a1, $zero, 0x3823 ## $a1 = 00003823 -/* 012A4 809F7664 0C27DAEF */ jal func_809F6BBC -/* 012A8 809F7668 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012AC 809F766C 3C0A809F */ lui $t2, %hi(func_809F7A00) ## $t2 = 809F0000 -/* 012B0 809F7670 254A7A00 */ addiu $t2, $t2, %lo(func_809F7A00) ## $t2 = 809F7A00 -/* 012B4 809F7674 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -.L809F7678: -/* 012B8 809F7678 8FBF001C */ lw $ra, 0x001C($sp) -.L809F767C: -/* 012BC 809F767C 8FB00018 */ lw $s0, 0x0018($sp) -/* 012C0 809F7680 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 012C4 809F7684 03E00008 */ jr $ra -/* 012C8 809F7688 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F768C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F768C.s deleted file mode 100644 index 006d4c3947..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F768C.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_809F768C -/* 012CC 809F768C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012D0 809F7690 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012D4 809F7694 AFA5001C */ sw $a1, 0x001C($sp) -/* 012D8 809F7698 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 012DC 809F769C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 012E0 809F76A0 24053850 */ addiu $a1, $zero, 0x3850 ## $a1 = 00003850 -/* 012E4 809F76A4 4600218D */ trunc.w.s $f6, $f4 -/* 012E8 809F76A8 440F3000 */ mfc1 $t7, $f6 -/* 012EC 809F76AC 00000000 */ nop -/* 012F0 809F76B0 000FC400 */ sll $t8, $t7, 16 -/* 012F4 809F76B4 0018CC03 */ sra $t9, $t8, 16 -/* 012F8 809F76B8 2728FFF8 */ addiu $t0, $t9, 0xFFF8 ## $t0 = FFFFFFF8 -/* 012FC 809F76BC 29010004 */ slti $at, $t0, 0x0004 -/* 01300 809F76C0 5020000E */ beql $at, $zero, .L809F76FC -/* 01304 809F76C4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01308 809F76C8 8C8201E0 */ lw $v0, 0x01E0($a0) ## 000001E0 -/* 0130C 809F76CC 844901F8 */ lh $t1, 0x01F8($v0) ## 000001F8 -/* 01310 809F76D0 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 01314 809F76D4 A44A01F8 */ sh $t2, 0x01F8($v0) ## 000001F8 -/* 01318 809F76D8 8C8D01E4 */ lw $t5, 0x01E4($a0) ## 000001E4 -/* 0131C 809F76DC 8C8B01E0 */ lw $t3, 0x01E0($a0) ## 000001E0 -/* 01320 809F76E0 AD6D0024 */ sw $t5, 0x0024($t3) ## 00000024 -/* 01324 809F76E4 8C8C01E8 */ lw $t4, 0x01E8($a0) ## 000001E8 -/* 01328 809F76E8 AD6C0028 */ sw $t4, 0x0028($t3) ## 00000028 -/* 0132C 809F76EC 8C8D01EC */ lw $t5, 0x01EC($a0) ## 000001EC -/* 01330 809F76F0 1000000E */ beq $zero, $zero, .L809F772C -/* 01334 809F76F4 AD6D002C */ sw $t5, 0x002C($t3) ## 0000002C -/* 01338 809F76F8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L809F76FC: -/* 0133C 809F76FC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01340 809F7700 AFA60018 */ sw $a2, 0x0018($sp) -/* 01344 809F7704 8FA60018 */ lw $a2, 0x0018($sp) -/* 01348 809F7708 0C00B55C */ jal Actor_Kill - -/* 0134C 809F770C 8CC401E0 */ lw $a0, 0x01E0($a2) ## 000001E0 -/* 01350 809F7710 8FA60018 */ lw $a2, 0x0018($sp) -/* 01354 809F7714 3C0F809F */ lui $t7, %hi(func_809F773C) ## $t7 = 809F0000 -/* 01358 809F7718 240E0018 */ addiu $t6, $zero, 0x0018 ## $t6 = 00000018 -/* 0135C 809F771C 25EF773C */ addiu $t7, $t7, %lo(func_809F773C) ## $t7 = 809F773C -/* 01360 809F7720 A4CE0202 */ sh $t6, 0x0202($a2) ## 00000202 -/* 01364 809F7724 A4C001FC */ sh $zero, 0x01FC($a2) ## 000001FC -/* 01368 809F7728 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -.L809F772C: -/* 0136C 809F772C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01370 809F7730 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01374 809F7734 03E00008 */ jr $ra -/* 01378 809F7738 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F773C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F773C.s deleted file mode 100644 index 5ccdc1e522..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F773C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_809F773C -/* 0137C 809F773C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01380 809F7740 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01384 809F7744 AFA5001C */ sw $a1, 0x001C($sp) -/* 01388 809F7748 84820202 */ lh $v0, 0x0202($a0) ## 00000202 -/* 0138C 809F774C 14400003 */ bne $v0, $zero, .L809F775C -/* 01390 809F7750 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01394 809F7754 10000003 */ beq $zero, $zero, .L809F7764 -/* 01398 809F7758 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809F775C: -/* 0139C 809F775C A48E0202 */ sh $t6, 0x0202($a0) ## 00000202 -/* 013A0 809F7760 84830202 */ lh $v1, 0x0202($a0) ## 00000202 -.L809F7764: -/* 013A4 809F7764 5460000E */ bnel $v1, $zero, .L809F77A0 -/* 013A8 809F7768 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013AC 809F776C 0C27D934 */ jal func_809F64D0 -/* 013B0 809F7770 AFA40018 */ sw $a0, 0x0018($sp) -/* 013B4 809F7774 8FA40018 */ lw $a0, 0x0018($sp) -/* 013B8 809F7778 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 013BC 809F777C 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 013C0 809F7780 01E1C024 */ and $t8, $t7, $at -/* 013C4 809F7784 0C27DA88 */ jal func_809F6A20 -/* 013C8 809F7788 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 013CC 809F778C 8FA40018 */ lw $a0, 0x0018($sp) -/* 013D0 809F7790 3C19809F */ lui $t9, %hi(func_809F77AC) ## $t9 = 809F0000 -/* 013D4 809F7794 273977AC */ addiu $t9, $t9, %lo(func_809F77AC) ## $t9 = 809F77AC -/* 013D8 809F7798 AC990190 */ sw $t9, 0x0190($a0) ## 00000190 -/* 013DC 809F779C 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F77A0: -/* 013E0 809F77A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013E4 809F77A4 03E00008 */ jr $ra -/* 013E8 809F77A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F77AC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F77AC.s deleted file mode 100644 index 9e7c24afb4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F77AC.s +++ /dev/null @@ -1,48 +0,0 @@ -.late_rodata -glabel D_809F7F90 - .float 1.2 - -.text -glabel func_809F77AC -/* 013EC 809F77AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 013F0 809F77B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 013F4 809F77B4 AFB00018 */ sw $s0, 0x0018($sp) -/* 013F8 809F77B8 AFA50024 */ sw $a1, 0x0024($sp) -/* 013FC 809F77BC 908E0114 */ lbu $t6, 0x0114($a0) ## 00000114 -/* 01400 809F77C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01404 809F77C4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01408 809F77C8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 0140C 809F77CC 05C10004 */ bgez $t6, .L809F77E0 -/* 01410 809F77D0 468021A0 */ cvt.s.w $f6, $f4 -/* 01414 809F77D4 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 01418 809F77D8 00000000 */ nop -/* 0141C 809F77DC 46083180 */ add.s $f6, $f6, $f8 -.L809F77E0: -/* 01420 809F77E0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 01424 809F77E4 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 01428 809F77E8 3C01809F */ lui $at, %hi(D_809F7F90) ## $at = 809F0000 -/* 0142C 809F77EC C4327F90 */ lwc1 $f18, %lo(D_809F7F90)($at) -/* 01430 809F77F0 460A3403 */ div.s $f16, $f6, $f10 -/* 01434 809F77F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01438 809F77F8 46109102 */ mul.s $f4, $f18, $f16 -/* 0143C 809F77FC 0C00B61A */ jal func_8002D868 -/* 01440 809F7800 E6040208 */ swc1 $f4, 0x0208($s0) ## 00000208 -/* 01444 809F7804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01448 809F7808 0C27DA2C */ jal func_809F68B0 -/* 0144C 809F780C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01450 809F7810 10400009 */ beq $v0, $zero, .L809F7838 -/* 01454 809F7814 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 01458 809F7818 A60F0202 */ sh $t7, 0x0202($s0) ## 00000202 -/* 0145C 809F781C 0C27DAB1 */ jal func_809F6AC4 -/* 01460 809F7820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01464 809F7824 3C19809F */ lui $t9, %hi(func_809F784C) ## $t9 = 809F0000 -/* 01468 809F7828 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 0146C 809F782C 2739784C */ addiu $t9, $t9, %lo(func_809F784C) ## $t9 = 809F784C -/* 01470 809F7830 A61801FC */ sh $t8, 0x01FC($s0) ## 000001FC -/* 01474 809F7834 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -.L809F7838: -/* 01478 809F7838 8FBF001C */ lw $ra, 0x001C($sp) -/* 0147C 809F783C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01480 809F7840 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01484 809F7844 03E00008 */ jr $ra -/* 01488 809F7848 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F784C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F784C.s deleted file mode 100644 index 3a4533f71e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F784C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_809F784C -/* 0148C 809F784C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01490 809F7850 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01494 809F7854 0C27DECF */ jal func_809F7B3C -/* 01498 809F7858 00000000 */ nop -/* 0149C 809F785C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014A0 809F7860 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014A4 809F7864 03E00008 */ jr $ra -/* 014A8 809F7868 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s deleted file mode 100644 index 251ccfb234..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_809F786C -/* 014AC 809F786C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 014B0 809F7870 AFBF0024 */ sw $ra, 0x0024($sp) -/* 014B4 809F7874 AFB00020 */ sw $s0, 0x0020($sp) -/* 014B8 809F7878 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 014BC 809F787C 0C00B61A */ jal func_8002D868 -/* 014C0 809F7880 AFA5002C */ sw $a1, 0x002C($sp) -/* 014C4 809F7884 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014C8 809F7888 0C27DA2C */ jal func_809F68B0 -/* 014CC 809F788C 8FA5002C */ lw $a1, 0x002C($sp) -/* 014D0 809F7890 50400007 */ beql $v0, $zero, .L809F78B0 -/* 014D4 809F7894 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 014D8 809F7898 0C27DAB1 */ jal func_809F6AC4 -/* 014DC 809F789C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014E0 809F78A0 3C0E809F */ lui $t6, %hi(func_809F78EC) ## $t6 = 809F0000 -/* 014E4 809F78A4 25CE78EC */ addiu $t6, $t6, %lo(func_809F78EC) ## $t6 = 809F78EC -/* 014E8 809F78A8 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 014EC 809F78AC 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -.L809F78B0: -/* 014F0 809F78B0 AFAF0010 */ sw $t7, 0x0010($sp) -/* 014F4 809F78B4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 014F8 809F78B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 014FC 809F78BC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01500 809F78C0 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01504 809F78C4 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 01508 809F78C8 861800B4 */ lh $t8, 0x00B4($s0) ## 000000B4 -/* 0150C 809F78CC 861901FE */ lh $t9, 0x01FE($s0) ## 000001FE -/* 01510 809F78D0 A6180030 */ sh $t8, 0x0030($s0) ## 00000030 -/* 01514 809F78D4 A2190114 */ sb $t9, 0x0114($s0) ## 00000114 -/* 01518 809F78D8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0151C 809F78DC 8FB00020 */ lw $s0, 0x0020($sp) -/* 01520 809F78E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01524 809F78E4 03E00008 */ jr $ra -/* 01528 809F78E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F78EC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F78EC.s deleted file mode 100644 index 7282647454..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F78EC.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_809F78EC -/* 0152C 809F78EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01530 809F78F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01534 809F78F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01538 809F78F8 848201FE */ lh $v0, 0x01FE($a0) ## 000001FE -/* 0153C 809F78FC 14400003 */ bne $v0, $zero, .L809F790C -/* 01540 809F7900 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01544 809F7904 10000004 */ beq $zero, $zero, .L809F7918 -/* 01548 809F7908 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809F790C: -/* 0154C 809F790C A48E01FE */ sh $t6, 0x01FE($a0) ## 000001FE -/* 01550 809F7910 848201FE */ lh $v0, 0x01FE($a0) ## 000001FE -/* 01554 809F7914 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L809F7918: -/* 01558 809F7918 10600016 */ beq $v1, $zero, .L809F7974 -/* 0155C 809F791C 2841001E */ slti $at, $v0, 0x001E -/* 01560 809F7920 1020001A */ beq $at, $zero, .L809F798C -/* 01564 809F7924 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 01568 809F7928 11E0000A */ beq $t7, $zero, .L809F7954 -/* 0156C 809F792C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 01570 809F7930 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 01574 809F7934 44810000 */ mtc1 $at, $f0 ## $f0 = 1.50 -/* 01578 809F7938 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 0157C 809F793C C488002C */ lwc1 $f8, 0x002C($a0) ## 0000002C -/* 01580 809F7940 46002180 */ add.s $f6, $f4, $f0 -/* 01584 809F7944 46004280 */ add.s $f10, $f8, $f0 -/* 01588 809F7948 E4860024 */ swc1 $f6, 0x0024($a0) ## 00000024 -/* 0158C 809F794C 1000000F */ beq $zero, $zero, .L809F798C -/* 01590 809F7950 E48A002C */ swc1 $f10, 0x002C($a0) ## 0000002C -.L809F7954: -/* 01594 809F7954 44810000 */ mtc1 $at, $f0 ## $f0 = 1.50 -/* 01598 809F7958 C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 -/* 0159C 809F795C C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C -/* 015A0 809F7960 46008481 */ sub.s $f18, $f16, $f0 -/* 015A4 809F7964 46002181 */ sub.s $f6, $f4, $f0 -/* 015A8 809F7968 E4920024 */ swc1 $f18, 0x0024($a0) ## 00000024 -/* 015AC 809F796C 10000007 */ beq $zero, $zero, .L809F798C -/* 015B0 809F7970 E486002C */ swc1 $f6, 0x002C($a0) ## 0000002C -.L809F7974: -/* 015B4 809F7974 0C27DA65 */ jal func_809F6994 -/* 015B8 809F7978 AFA40018 */ sw $a0, 0x0018($sp) -/* 015BC 809F797C 8FA40018 */ lw $a0, 0x0018($sp) -/* 015C0 809F7980 3C18809F */ lui $t8, %hi(func_809F758C) ## $t8 = 809F0000 -/* 015C4 809F7984 2718758C */ addiu $t8, $t8, %lo(func_809F758C) ## $t8 = 809F758C -/* 015C8 809F7988 AC980190 */ sw $t8, 0x0190($a0) ## 00000190 -.L809F798C: -/* 015CC 809F798C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 015D0 809F7990 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 015D4 809F7994 03E00008 */ jr $ra -/* 015D8 809F7998 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F799C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F799C.s deleted file mode 100644 index 36a004eb4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F799C.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_809F799C -/* 015DC 809F799C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 015E0 809F79A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 015E4 809F79A4 AFB00018 */ sw $s0, 0x0018($sp) -/* 015E8 809F79A8 AFA50024 */ sw $a1, 0x0024($sp) -/* 015EC 809F79AC 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 015F0 809F79B0 3C010100 */ lui $at, 0x0100 ## $at = 01000000 -/* 015F4 809F79B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 015F8 809F79B8 01C17825 */ or $t7, $t6, $at ## $t7 = 01000000 -/* 015FC 809F79BC 0C00B61A */ jal func_8002D868 -/* 01600 809F79C0 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 01604 809F79C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01608 809F79C8 0C27DA2C */ jal func_809F68B0 -/* 0160C 809F79CC 8FA50024 */ lw $a1, 0x0024($sp) -/* 01610 809F79D0 50400007 */ beql $v0, $zero, .L809F79F0 -/* 01614 809F79D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01618 809F79D8 0C27DA65 */ jal func_809F6994 -/* 0161C 809F79DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01620 809F79E0 3C18809F */ lui $t8, %hi(func_809F758C) ## $t8 = 809F0000 -/* 01624 809F79E4 2718758C */ addiu $t8, $t8, %lo(func_809F758C) ## $t8 = 809F758C -/* 01628 809F79E8 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 0162C 809F79EC 8FBF001C */ lw $ra, 0x001C($sp) -.L809F79F0: -/* 01630 809F79F0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01634 809F79F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01638 809F79F8 03E00008 */ jr $ra -/* 0163C 809F79FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s deleted file mode 100644 index 1edd610764..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_809F7A00 -/* 01640 809F7A00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01644 809F7A04 AFB00020 */ sw $s0, 0x0020($sp) -/* 01648 809F7A08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0164C 809F7A0C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01650 809F7A10 AFA5002C */ sw $a1, 0x002C($sp) -/* 01654 809F7A14 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 01658 809F7A18 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0165C 809F7A1C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 01660 809F7A20 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 01664 809F7A24 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01668 809F7A28 0C01E1A7 */ jal Math_SmoothStepToS - -/* 0166C 809F7A2C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 01670 809F7A30 86020202 */ lh $v0, 0x0202($s0) ## 00000202 -/* 01674 809F7A34 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 01678 809F7A38 14400003 */ bne $v0, $zero, .L809F7A48 -/* 0167C 809F7A3C 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 01680 809F7A40 10000004 */ beq $zero, $zero, .L809F7A54 -/* 01684 809F7A44 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809F7A48: -/* 01688 809F7A48 A60F0202 */ sh $t7, 0x0202($s0) ## 00000202 -/* 0168C 809F7A4C 86020202 */ lh $v0, 0x0202($s0) ## 00000202 -/* 01690 809F7A50 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L809F7A54: -/* 01694 809F7A54 1060000D */ beq $v1, $zero, .L809F7A8C -/* 01698 809F7A58 0302C823 */ subu $t9, $t8, $v0 -/* 0169C 809F7A5C 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 016A0 809F7A60 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 016A4 809F7A64 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 016A8 809F7A68 468021A0 */ cvt.s.w $f6, $f4 -/* 016AC 809F7A6C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 016B0 809F7A70 44818000 */ mtc1 $at, $f16 ## $f16 = 60.00 -/* 016B4 809F7A74 C60A000C */ lwc1 $f10, 0x000C($s0) ## 0000000C -/* 016B8 809F7A78 46083003 */ div.s $f0, $f6, $f8 -/* 016BC 809F7A7C 46008482 */ mul.s $f18, $f16, $f0 -/* 016C0 809F7A80 46125101 */ sub.s $f4, $f10, $f18 -/* 016C4 809F7A84 10000003 */ beq $zero, $zero, .L809F7A94 -/* 016C8 809F7A88 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -.L809F7A8C: -/* 016CC 809F7A8C 0C00B55C */ jal Actor_Kill - -/* 016D0 809F7A90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809F7A94: -/* 016D4 809F7A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016D8 809F7A98 8FA5002C */ lw $a1, 0x002C($sp) -/* 016DC 809F7A9C 0C27D944 */ jal func_809F6510 -/* 016E0 809F7AA0 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 016E4 809F7AA4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 016E8 809F7AA8 8FB00020 */ lw $s0, 0x0020($sp) -/* 016EC 809F7AAC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 016F0 809F7AB0 03E00008 */ jr $ra -/* 016F4 809F7AB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s deleted file mode 100644 index 83da537a05..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_809F7AB8 -/* 016F8 809F7AB8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 016FC 809F7ABC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01700 809F7AC0 AFB00020 */ sw $s0, 0x0020($sp) -/* 01704 809F7AC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01708 809F7AC8 0C00B61A */ jal func_8002D868 -/* 0170C 809F7ACC AFA5002C */ sw $a1, 0x002C($sp) -/* 01710 809F7AD0 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 01714 809F7AD4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01718 809F7AD8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 0171C 809F7ADC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01720 809F7AE0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01724 809F7AE4 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01728 809F7AE8 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 0172C 809F7AEC 860F00B4 */ lh $t7, 0x00B4($s0) ## 000000B4 -/* 01730 809F7AF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01734 809F7AF4 A60F0030 */ sh $t7, 0x0030($s0) ## 00000030 -/* 01738 809F7AF8 0C27DA2C */ jal func_809F68B0 -/* 0173C 809F7AFC 8FA5002C */ lw $a1, 0x002C($sp) -/* 01740 809F7B00 10400009 */ beq $v0, $zero, .L809F7B28 -/* 01744 809F7B04 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C -/* 01748 809F7B08 A6180202 */ sh $t8, 0x0202($s0) ## 00000202 -/* 0174C 809F7B0C 0C27DAB1 */ jal func_809F6AC4 -/* 01750 809F7B10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01754 809F7B14 3C08809F */ lui $t0, %hi(func_809F7B3C) ## $t0 = 809F0000 -/* 01758 809F7B18 24190007 */ addiu $t9, $zero, 0x0007 ## $t9 = 00000007 -/* 0175C 809F7B1C 25087B3C */ addiu $t0, $t0, %lo(func_809F7B3C) ## $t0 = 809F7B3C -/* 01760 809F7B20 A61901FC */ sh $t9, 0x01FC($s0) ## 000001FC -/* 01764 809F7B24 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -.L809F7B28: -/* 01768 809F7B28 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0176C 809F7B2C 8FB00020 */ lw $s0, 0x0020($sp) -/* 01770 809F7B30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01774 809F7B34 03E00008 */ jr $ra -/* 01778 809F7B38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7B3C.s deleted file mode 100644 index 7cb2366496..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7B3C.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_809F7B3C -/* 0177C 809F7B3C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01780 809F7B40 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01784 809F7B44 AFB00030 */ sw $s0, 0x0030($sp) -/* 01788 809F7B48 848201FC */ lh $v0, 0x01FC($a0) ## 000001FC -/* 0178C 809F7B4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01790 809F7B50 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 01794 809F7B54 5040000D */ beql $v0, $zero, .L809F7B8C -/* 01798 809F7B58 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 0179C 809F7B5C 908E0114 */ lbu $t6, 0x0114($a0) ## 00000114 -/* 017A0 809F7B60 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 017A4 809F7B64 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 017A8 809F7B68 15C00019 */ bne $t6, $zero, .L809F7BD0 -/* 017AC 809F7B6C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 017B0 809F7B70 0C00D09B */ jal func_8003426C -/* 017B4 809F7B74 AFA20010 */ sw $v0, 0x0010($sp) -/* 017B8 809F7B78 860F01FC */ lh $t7, 0x01FC($s0) ## 000001FC -/* 017BC 809F7B7C 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 017C0 809F7B80 10000013 */ beq $zero, $zero, .L809F7BD0 -/* 017C4 809F7B84 A61801FC */ sh $t8, 0x01FC($s0) ## 000001FC -/* 017C8 809F7B88 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -.L809F7B8C: -/* 017CC 809F7B8C 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 017D0 809F7B90 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 017D4 809F7B94 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 017D8 809F7B98 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 017DC 809F7B9C AFA00024 */ sw $zero, 0x0024($sp) -/* 017E0 809F7BA0 AFA00020 */ sw $zero, 0x0020($sp) -/* 017E4 809F7BA4 AFA0001C */ sw $zero, 0x001C($sp) -/* 017E8 809F7BA8 AFA00018 */ sw $zero, 0x0018($sp) -/* 017EC 809F7BAC 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 017F0 809F7BB0 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 017F4 809F7BB4 10400002 */ beq $v0, $zero, .L809F7BC0 -/* 017F8 809F7BB8 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 -/* 017FC 809F7BBC A44001F8 */ sh $zero, 0x01F8($v0) ## 000001F8 -.L809F7BC0: -/* 01800 809F7BC0 3C08809F */ lui $t0, %hi(func_809F7BE4) ## $t0 = 809F0000 -/* 01804 809F7BC4 25087BE4 */ addiu $t0, $t0, %lo(func_809F7BE4) ## $t0 = 809F7BE4 -/* 01808 809F7BC8 A6190202 */ sh $t9, 0x0202($s0) ## 00000202 -/* 0180C 809F7BCC AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -.L809F7BD0: -/* 01810 809F7BD0 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01814 809F7BD4 8FB00030 */ lw $s0, 0x0030($sp) -/* 01818 809F7BD8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0181C 809F7BDC 03E00008 */ jr $ra -/* 01820 809F7BE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7BE4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7BE4.s deleted file mode 100644 index ea31351c45..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7BE4.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_809F7BE4 -/* 01824 809F7BE4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01828 809F7BE8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0182C 809F7BEC AFB00018 */ sw $s0, 0x0018($sp) -/* 01830 809F7BF0 AFA50024 */ sw $a1, 0x0024($sp) -/* 01834 809F7BF4 84820202 */ lh $v0, 0x0202($a0) ## 00000202 -/* 01838 809F7BF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0183C 809F7BFC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01840 809F7C00 14400003 */ bne $v0, $zero, .L809F7C10 -/* 01844 809F7C04 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01848 809F7C08 10000003 */ beq $zero, $zero, .L809F7C18 -/* 0184C 809F7C0C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809F7C10: -/* 01850 809F7C10 A60E0202 */ sh $t6, 0x0202($s0) ## 00000202 -/* 01854 809F7C14 86030202 */ lh $v1, 0x0202($s0) ## 00000202 -.L809F7C18: -/* 01858 809F7C18 14600006 */ bne $v1, $zero, .L809F7C34 -/* 0185C 809F7C1C 8FA40024 */ lw $a0, 0x0024($sp) -/* 01860 809F7C20 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 01864 809F7C24 0C007E50 */ jal Item_DropCollectibleRandom - -/* 01868 809F7C28 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 -/* 0186C 809F7C2C 0C00B55C */ jal Actor_Kill - -/* 01870 809F7C30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809F7C34: -/* 01874 809F7C34 8FBF001C */ lw $ra, 0x001C($sp) -/* 01878 809F7C38 8FB00018 */ lw $s0, 0x0018($sp) -/* 0187C 809F7C3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01880 809F7C40 03E00008 */ jr $ra -/* 01884 809F7C44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7C48.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7C48.s deleted file mode 100644 index 79e8e9617f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7C48.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_809F7C48 -/* 01888 809F7C48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0188C 809F7C4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01890 809F7C50 AFA5001C */ sw $a1, 0x001C($sp) -/* 01894 809F7C54 84820200 */ lh $v0, 0x0200($a0) ## 00000200 -/* 01898 809F7C58 14400003 */ bne $v0, $zero, .L809F7C68 -/* 0189C 809F7C5C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 018A0 809F7C60 10000003 */ beq $zero, $zero, .L809F7C70 -/* 018A4 809F7C64 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809F7C68: -/* 018A8 809F7C68 A48E0200 */ sh $t6, 0x0200($a0) ## 00000200 -/* 018AC 809F7C6C 84830200 */ lh $v1, 0x0200($a0) ## 00000200 -.L809F7C70: -/* 018B0 809F7C70 54600004 */ bnel $v1, $zero, .L809F7C84 -/* 018B4 809F7C74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018B8 809F7C78 0C27DC27 */ jal func_809F709C -/* 018BC 809F7C7C 00000000 */ nop -/* 018C0 809F7C80 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F7C84: -/* 018C4 809F7C84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018C8 809F7C88 03E00008 */ jr $ra -/* 018CC 809F7C8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7D50.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7D50.s deleted file mode 100644 index b90be2a9f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7D50.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_809F7D50 -/* 01990 809F7D50 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01994 809F7D54 3C0F809F */ lui $t7, %hi(D_809F7F64) ## $t7 = 809F0000 -/* 01998 809F7D58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0199C 809F7D5C AFA40030 */ sw $a0, 0x0030($sp) -/* 019A0 809F7D60 AFA60038 */ sw $a2, 0x0038($sp) -/* 019A4 809F7D64 AFA7003C */ sw $a3, 0x003C($sp) -/* 019A8 809F7D68 25EF7F64 */ addiu $t7, $t7, %lo(D_809F7F64) ## $t7 = 809F7F64 -/* 019AC 809F7D6C 8DF90000 */ lw $t9, 0x0000($t7) ## 809F7F64 -/* 019B0 809F7D70 27AE0020 */ addiu $t6, $sp, 0x0020 ## $t6 = FFFFFFF0 -/* 019B4 809F7D74 8DF80004 */ lw $t8, 0x0004($t7) ## 809F7F68 -/* 019B8 809F7D78 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF0 -/* 019BC 809F7D7C 8DF90008 */ lw $t9, 0x0008($t7) ## 809F7F6C -/* 019C0 809F7D80 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 019C4 809F7D84 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF4 -/* 019C8 809F7D88 14A10010 */ bne $a1, $at, .L809F7DCC -/* 019CC 809F7D8C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF8 -/* 019D0 809F7D90 8FA80044 */ lw $t0, 0x0044($sp) -/* 019D4 809F7D94 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 019D8 809F7D98 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 019DC 809F7D9C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 019E0 809F7DA0 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 019E4 809F7DA4 C5000208 */ lwc1 $f0, 0x0208($t0) ## 00000208 -/* 019E8 809F7DA8 AFA50034 */ sw $a1, 0x0034($sp) -/* 019EC 809F7DAC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 019F0 809F7DB0 46040182 */ mul.s $f6, $f0, $f4 -/* 019F4 809F7DB4 46020380 */ add.s $f14, $f0, $f2 -/* 019F8 809F7DB8 46023300 */ add.s $f12, $f6, $f2 -/* 019FC 809F7DBC 44066000 */ mfc1 $a2, $f12 -/* 01A00 809F7DC0 0C0342A3 */ jal Matrix_Scale -/* 01A04 809F7DC4 00000000 */ nop -/* 01A08 809F7DC8 8FA50034 */ lw $a1, 0x0034($sp) -.L809F7DCC: -/* 01A0C 809F7DCC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01A10 809F7DD0 54A10006 */ bnel $a1, $at, .L809F7DEC -/* 01A14 809F7DD4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01A18 809F7DD8 8FA50044 */ lw $a1, 0x0044($sp) -/* 01A1C 809F7DDC 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFF0 -/* 01A20 809F7DE0 0C0346BD */ jal Matrix_MultVec3f -/* 01A24 809F7DE4 24A501E4 */ addiu $a1, $a1, 0x01E4 ## $a1 = 000001E4 -/* 01A28 809F7DE8 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F7DEC: -/* 01A2C 809F7DEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01A30 809F7DF0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01A34 809F7DF4 03E00008 */ jr $ra -/* 01A38 809F7DF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7DFC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7DFC.s deleted file mode 100644 index e87e501eef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7DFC.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_809F7DFC -/* 01A3C 809F7DFC AFA40000 */ sw $a0, 0x0000($sp) -/* 01A40 809F7E00 AFA50004 */ sw $a1, 0x0004($sp) -/* 01A44 809F7E04 AFA60008 */ sw $a2, 0x0008($sp) -/* 01A48 809F7E08 03E00008 */ jr $ra -/* 01A4C 809F7E0C AFA7000C */ sw $a3, 0x000C($sp) diff --git a/data/overlays/actors/z_en_dodojr.data.s b/data/overlays/actors/z_en_dodojr.data.s deleted file mode 100644 index 3ccf6fc73f..0000000000 --- a/data/overlays/actors/z_en_dodojr.data.s +++ /dev/null @@ -1,44 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Dodojr_InitVars - .word 0x002F0500, 0x00000005, 0x001F0000, 0x000002C0 -.word EnDodojr_Init -.word EnDodojr_Destroy -.word EnDodojr_Update -.word EnDodojr_Draw -glabel D_809F7EB0 - .word 0x06110939, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x00080000, 0xFFC5FFFF, 0x00000000, 0x01010100, 0x00120014, 0x00000000, 0x00000000 -glabel D_809F7EDC - .word 0x01000002, 0x00190019, 0xFF000000 -glabel D_809F7EE8 - .word 0xAA825AFF -glabel D_809F7EEC - .word 0x643C1400 -glabel D_809F7EF0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809F7EFC - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_809F7F08 - .word 0xAA825AFF -glabel D_809F7F0C - .word 0x643C1400 -glabel D_809F7F10 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809F7F1C - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_809F7F28 - .word 0x47C34F80, 0x47C34F80, 0x47C34F80 -glabel D_809F7F34 - .word 0x00000000, 0x43520000, 0x42700000, 0x43870000, 0x42F00000, 0x43A50000, 0x43340000, 0x41F00000, 0x43700000, 0x42B40000, 0x43960000, 0x43160000 -glabel D_809F7F64 - .word 0x43F00000, 0x441B0000, 0x00000000 - diff --git a/data/overlays/actors/z_en_dodojr.reloc.s b/data/overlays/actors/z_en_dodojr.reloc.s deleted file mode 100644 index 6941af72dd..0000000000 --- a/data/overlays/actors/z_en_dodojr.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809F7FA0 - .incbin "baserom/ovl_En_Dodojr", 0x1BE0, 0x000002B0 diff --git a/spec b/spec index af4a64b839..371a8ff3df 100644 --- a/spec +++ b/spec @@ -2127,8 +2127,7 @@ endseg beginseg name "ovl_En_Dodojr" include "build/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.o" - include "build/data/overlays/actors/z_en_dodojr.data.o" - include "build/data/overlays/actors/z_en_dodojr.reloc.o" + include "build/src/overlays/actors/ovl_En_Dodojr/ovl_En_Dodojr_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index bee4ffe008..4530da8731 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -1,4 +1,11 @@ +/* + * File: z_en_dodojr.c + * Overlay: ovl_En_Dodojr + * Description: Baby Dodongo + */ + #include "z_en_dodojr.h" +#include "overlays/actors/ovl_En_Bom/z_en_bom.h" #define FLAGS 0x00000005 @@ -9,14 +16,29 @@ void EnDodojr_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnDodojr_Update(Actor* thisx, GlobalContext* globalCtx); void EnDodojr_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_060004A0; -extern UNK_TYPE D_060005F0; -extern UNK_TYPE D_06000724; -extern UNK_TYPE D_06000860; -extern UNK_TYPE D_060009D4; -extern UNK_TYPE D_060020E0; +void func_809F73AC(EnDodojr* this, GlobalContext* globalCtx); +void func_809F7BE4(EnDodojr* this, GlobalContext* globalCtx); +void func_809F74C4(EnDodojr* this, GlobalContext* globalCtx); +void func_809F758C(EnDodojr* this, GlobalContext* globalCtx); +void func_809F786C(EnDodojr* this, GlobalContext* globalCtx); +void func_809F799C(EnDodojr* this, GlobalContext* globalCtx); +void func_809F78EC(EnDodojr* this, GlobalContext* globalCtx); +void func_809F773C(EnDodojr* this, GlobalContext* globalCtx); +void func_809F77AC(EnDodojr* this, GlobalContext* globalCtx); +void func_809F784C(EnDodojr* this, GlobalContext* globalCtx); +void func_809F7AB8(EnDodojr* this, GlobalContext* globalCtx); +void func_809F7A00(EnDodojr* this, GlobalContext* globalCtx); +void func_809F7B3C(EnDodojr* this, GlobalContext* globalCtx); +void func_809F7C48(EnDodojr* this, GlobalContext* globalCtx); +void func_809F768C(EnDodojr* this, GlobalContext* globalCtx); + +extern AnimationHeader D_060004A0; +extern AnimationHeader D_060005F0; +extern AnimationHeader D_06000724; +extern AnimationHeader D_06000860; +extern AnimationHeader D_060009D4; +extern SkeletonHeader D_060020E0; -/* const ActorInit En_Dodojr_InitVars = { ACTOR_EN_DODOJR, ACTORCAT_ENEMY, @@ -29,7 +51,7 @@ const ActorInit En_Dodojr_InitVars = { (ActorFunc)EnDodojr_Draw, }; -static ColliderCylinderInit D_809F7EB0 = { +static ColliderCylinderInit sCylinderInit = { { COLTYPE_HIT6, AT_ON | AT_TYPE_ENEMY, @@ -48,79 +70,585 @@ static ColliderCylinderInit D_809F7EB0 = { }, { 18, 20, 0, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Destroy.s") +static CollisionCheckInfoInit2 sColChkInit = { 1, 2, 25, 25, 0xFF }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F64D0.s") +void EnDodojr_Init(Actor* thisx, GlobalContext* globalCtx) { + EnDodojr* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6510.s") + ActorShape_Init(&this->actor.shape.rot.x, 0.0f, NULL, 18.0f); + SkelAnime_Init(globalCtx, &this->skelAnime, &D_060020E0, &D_060009D4, &this->jointTable, &this->morphTable, 15); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(4), &sColChkInit); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6730.s") + this->actor.naviEnemyId = 0xE; + this->actor.flags &= ~1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F68B0.s") + Actor_SetScale(&this->actor, 0.02f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s") + this->actionFunc = func_809F73AC; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s") +void EnDodojr_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnDodojr* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s") + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s") +void func_809F64D0(EnDodojr* this) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_BOMB_EXPLOSION); + func_8003426C(&this->actor, 0x4000, 200, 0, 8); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6BBC.s") +void func_809F6510(EnDodojr* this, GlobalContext* globalCtx, s32 count) { + Color_RGBA8 prim = { 170, 130, 90, 255 }; + Color_RGBA8 env = { 100, 60, 20, 0 }; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.3f, 0.0f }; + Vec3f pos; + s16 angle = ((Rand_ZeroOne() - 0.5f) * 65536.0f); + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s") + pos.y = this->dustPos.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6CA4.s") + for (i = count; i >= 0; i--, angle += (s16)(0x10000 / count)) { + accel.x = (Rand_ZeroOne() - 0.5f) * 4.0f; + accel.z = (Rand_ZeroOne() - 0.5f) * 4.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6DD0.s") + pos.x = (Math_SinS(angle) * 22.0f) + this->dustPos.x; + pos.z = (Math_CosS(angle) * 22.0f) + this->dustPos.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6E54.s") + func_8002836C(globalCtx, &pos, &velocity, &accel, &prim, &env, 120, 40, 10); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F706C.s") +void func_809F6730(EnDodojr* this, GlobalContext* globalCtx, Vec3f* arg2) { + Color_RGBA8 prim = { 170, 130, 90, 255 }; + Color_RGBA8 env = { 100, 60, 20, 0 }; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.3f, 0.0f }; + Vec3f pos; + s16 angle = ((Rand_ZeroOne() - 0.5f) * 65536.0f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F709C.s") + pos.y = this->actor.floorHeight; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F70E8.s") + accel.x = (Rand_ZeroOne() - 0.5f) * 2; + accel.z = (Rand_ZeroOne() - 0.5f) * 2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F72A4.s") + pos.x = (Math_SinS(angle) * 11.0f) + arg2->x; + pos.z = (Math_CosS(angle) * 11.0f) + arg2->z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s") + func_8002836C(globalCtx, &pos, &velocity, &accel, &prim, &env, 100, 60, 8); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F74C4.s") +s32 func_809F68B0(EnDodojr* this, GlobalContext* globalCtx) { + if (this->actor.velocity.y >= 0.0f) { + return 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F758C.s") + if (this->unk_1FC == 0) { + return 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F768C.s") + if (this->actor.bgCheckFlags & 1) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); + this->dustPos = this->actor.world.pos; + func_809F6510(this, globalCtx, 10); + this->actor.velocity.y = 10.0f / (4 - this->unk_1FC); + this->unk_1FC--; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F773C.s") + if (this->unk_1FC == 0) { + this->actor.velocity.y = 0.0f; + return 1; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F77AC.s") + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F784C.s") +void func_809F6994(EnDodojr* this) { + f32 lastFrame = Animation_GetLastFrame(&D_06000860); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F786C.s") + Animation_Change(&this->skelAnime, &D_06000860, 1.8f, 0.0f, lastFrame, 1, -10.0f); + this->actor.velocity.y = 0.0f; + this->actor.speedXZ = 2.6f; + this->actor.gravity = -0.8f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F78EC.s") +void func_809F6A20(EnDodojr* this) { + f32 lastFrame = Animation_GetLastFrame(&D_060004A0); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F799C.s") + Animation_Change(&this->skelAnime, &D_060004A0, 1.0f, 0.0f, lastFrame, 2, -10.0f); + this->actor.speedXZ = 0.0f; + this->actor.velocity.x = 0.0f; + this->actor.velocity.z = 0.0f; + this->actor.gravity = -0.8f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7A00.s") + if (this->unk_1FC == 0) { + this->unk_1FC = 3; + this->actor.velocity.y = 10.0f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7AB8.s") +void func_809F6AC4(EnDodojr* this) { + f32 lastFrame = Animation_GetLastFrame(&D_060005F0); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7B3C.s") + Animation_Change(&this->skelAnime, &D_060005F0, 1.0f, 0.0f, lastFrame, 0, 0.0f); + this->actor.velocity.y = 0.0f; + this->actor.gravity = -0.8f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7BE4.s") +void func_809F6B38(EnDodojr* this) { + f32 lastFrame = Animation_GetLastFrame(&D_06000724); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7C48.s") + Animation_Change(&this->skelAnime, &D_06000724, 1.0f, 0.0f, lastFrame, 0, -10.0f); + this->actor.gravity = -0.8f; + this->unk_1FC = 3; + this->actor.velocity.y = 10.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Update.s") +void func_809F6BBC(EnDodojr* this) { + this->actor.shape.shadowDraw = NULL; + this->actor.flags &= ~1; + this->actor.home.pos = this->actor.world.pos; + this->actor.speedXZ = 0.0f; + this->actor.gravity = -0.8f; + this->timer3 = 30; + this->dustPos = this->actor.world.pos; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7D50.s") +void func_809F6C24(EnDodojr* this) { + Animation_Change(&this->skelAnime, &D_06000724, 1.0f, 8.0f, 12.0f, 2, 0.0f); + Audio_PlayActorSound2(this, NA_SE_EN_DODO_M_EAT); + this->actor.speedXZ = 0.0f; + this->actor.velocity.x = 0.0f; + this->actor.velocity.z = 0.0f; + this->actor.gravity = -0.8f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F7DFC.s") +s32 func_809F6CA4(EnDodojr* this, GlobalContext* globalCtx) { + Actor* bomb; + Vec3f unkVec = { 99999.0f, 99999.0f, 99999.0f }; + s32 retVar = 0; + f32 xDist; + f32 yDist; + f32 zDist; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dodojr/EnDodojr_Draw.s") + bomb = globalCtx->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].head; + this->bomb = NULL; + + while (bomb != NULL) { + if ((bomb->params != 0) || (bomb->parent != NULL) || (bomb->update == NULL)) { + bomb = bomb->next; + continue; + } + + if (bomb->id != ACTOR_EN_BOM) { + bomb = bomb->next; + continue; + } + + xDist = bomb->world.pos.x - this->actor.world.pos.x; + yDist = bomb->world.pos.y - this->actor.world.pos.y; + zDist = bomb->world.pos.z - this->actor.world.pos.z; + + if ((fabsf(xDist) >= fabsf(unkVec.x)) || (fabsf(yDist) >= fabsf(unkVec.y)) || + (fabsf(zDist) >= fabsf(unkVec.z))) { + bomb = bomb->next; + continue; + } + + this->bomb = bomb; + unkVec = bomb->world.pos; + retVar = 1; + bomb = bomb->next; + } + + return retVar; +} + +s32 func_809F6DD0(EnDodojr* this) { + if (this->bomb == NULL) { + return 0; + } else if (this->bomb->parent != NULL) { + return 0; + } else if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &this->bomb->world.pos) > 30.0f) { + return 0; + } else { + this->bomb->parent = this; + return 1; + } +} + +void func_809F6E54(EnDodojr* this, GlobalContext* globalCtx) { + f32 angles[] = { 0.0f, 210.0f, 60.0f, 270.0f, 120.0f, 330.0f, 180.0f, 30.0f, 240.0f, 90.0f, 300.0f, 150.0f }; + s32 pad; + Player* player = PLAYER; + Vec3f pos; + s16 angleIndex; + + if ((this->bomb == NULL) || (this->bomb->update == NULL) || + ((this->bomb != NULL) && (this->bomb->parent != NULL))) { + func_809F6CA4(this, globalCtx); + } + + if (this->bomb != NULL) { + pos = this->bomb->world.pos; + } else { + pos = player->actor.world.pos; + } + + if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &pos) > 80.0f) { + angleIndex = (s16)(this->actor.home.pos.x + this->actor.home.pos.y + this->actor.home.pos.z + + globalCtx->state.frames / 30) % + 12; + angleIndex = ABS(angleIndex); + pos.x += 80.0f * sinf(angles[angleIndex]); + pos.z += 80.0f * cosf(angles[angleIndex]); + } + + Math_SmoothStepToS(&this->actor.world.rot.y, Math_Vec3f_Yaw(&this->actor.world.pos, &pos), 10, 1000, 1); + this->actor.shape.rot.y = this->actor.world.rot.y; +} + +s32 func_809F706C(EnDodojr* this) { + if (this->actor.xzDistToPlayer > 40.0f) { + return 0; + } else { + return 1; + } +} + +void func_809F709C(EnDodojr* this) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_DEAD); + this->actor.flags &= ~1; + func_809F6A20(this); + this->actionFunc = func_809F7AB8; +} + +s32 func_809F70E8(EnDodojr* this, GlobalContext* globalCtx) { + if ((this->actionFunc == func_809F773C) || (this->actionFunc == func_809F77AC) || + (this->actionFunc == func_809F784C) || (this->actionFunc == func_809F7A00) || + (this->actionFunc == func_809F7AB8) || (this->actionFunc == func_809F7B3C) || + (this->actionFunc == func_809F7BE4)) { + return 0; + } + + if (globalCtx->actorCtx.unk_02 != 0) { + if (this->actionFunc != func_809F73AC) { + if (this->actionFunc == func_809F74C4) { + this->actor.shape.shadowDraw = ActorShadow_DrawCircle; + } + + func_809F709C(this); + } + return 0; + } + + if (!(this->collider.base.acFlags & 2)) { + return 0; + } else { + this->collider.base.acFlags &= ~2; + + if ((this->actionFunc == func_809F73AC) || (this->actionFunc == func_809F74C4)) { + this->actor.shape.shadowDraw = ActorShadow_DrawCircle; + } + + if ((this->actor.colChkInfo.damageEffect == 0) && (this->actor.colChkInfo.damage != 0)) { + func_80032C7C(globalCtx, &this->actor); + this->timer2 = 2; + this->actionFunc = func_809F7C48; + return 1; + } + + if ((this->actor.colChkInfo.damageEffect == 1) && (this->actionFunc != func_809F78EC) && + (this->actionFunc != func_809F786C)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); + this->timer1 = 120; + func_8003426C(&this->actor, 0, 200, 0, 120); + func_809F6A20(this); + this->actionFunc = func_809F786C; + } + + return 0; + } +} + +void func_809F72A4(EnDodojr* this, GlobalContext* globalCtx) { + Collider_UpdateCylinder(&this->actor, &this->collider); + + if ((this->actionFunc != func_809F73AC) && (this->actionFunc != func_809F7BE4)) { + if ((this->actionFunc == func_809F74C4) || (this->actionFunc == func_809F758C) || + (this->actionFunc == func_809F799C)) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + + if ((this->actionFunc == func_809F74C4) || (this->actionFunc == func_809F758C) || + (this->actionFunc == func_809F786C) || (this->actionFunc == func_809F78EC) || + (this->actionFunc == func_809F799C)) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } +} + +void func_809F73AC(EnDodojr* this, GlobalContext* globalCtx) { + f32 lastFrame = Animation_GetLastFrame(&D_06000860); + Player* player = PLAYER; + f32 dist; + + if (!(this->actor.xzDistToPlayer >= 320.0f)) { + dist = this->actor.world.pos.y - player->actor.world.pos.y; + + if (!(dist >= 40.0f)) { + Animation_Change(&this->skelAnime, &D_06000860, 1.8f, 0.0f, lastFrame, 1, -10.0f); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_UP); + this->actor.world.pos.y -= 60.0f; + this->actor.flags |= 1; + this->actor.world.rot.x -= 0x4000; + this->actor.shape.rot.x = this->actor.world.rot.x; + this->dustPos = this->actor.world.pos; + this->dustPos.y = this->actor.floorHeight; + this->actionFunc = func_809F74C4; + } + } +} + +void func_809F74C4(EnDodojr* this, GlobalContext* globalCtx) { + f32 sp2C; + + Math_SmoothStepToS(&this->actor.shape, 0, 4, 0x3E8, 0x64); + sp2C = this->actor.shape.rot.x; + sp2C /= 16384.0f; + this->actor.world.pos.y = this->actor.home.pos.y + (60.0f * sp2C); + func_809F6510(this, globalCtx, 3); + + if (sp2C == 0.0f) { + this->actor.shape.shadowDraw = ActorShadow_DrawCircle; + this->actor.world.rot.x = this->actor.shape.rot.x; + this->actor.speedXZ = 2.6f; + this->actionFunc = func_809F758C; + } +} + +void func_809F758C(EnDodojr* this, GlobalContext* globalCtx) { + func_8002D868(&this->actor); + func_809F6730(this, globalCtx, &this->actor.world.pos); + + if (DECR(this->timer4) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_MOVE); + this->timer4 = 5; + } + + if (func_809F6DD0(this) != 0) { + func_809F6C24(this); + this->actionFunc = func_809F768C; + return; + } + + func_809F6E54(this, globalCtx); + + if (func_809F706C(this) != 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_CRY); + func_809F6B38(this); + this->actionFunc = func_809F799C; + } + + if (this->actor.bgCheckFlags & 8) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_DOWN); + func_809F6BBC(this); + this->actionFunc = func_809F7A00; + } +} + +void func_809F768C(EnDodojr* this, GlobalContext* globalCtx) { + EnBom* bomb; + + if (((s16)this->skelAnime.curFrame - 8) < 4) { + bomb = (EnBom*)this->bomb; + bomb->timer++; + this->bomb->world.pos = this->headPos; + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_DRINK); + Actor_Kill(this->bomb); + this->timer3 = 24; + this->unk_1FC = 0; + this->actionFunc = func_809F773C; + } +} + +void func_809F773C(EnDodojr* this, GlobalContext* globalCtx) { + if (DECR(this->timer3) == 0) { + func_809F64D0(this); + this->actor.flags &= ~1; + func_809F6A20(this); + this->actionFunc = func_809F77AC; + } +} + +void func_809F77AC(EnDodojr* this, GlobalContext* globalCtx) { + this->rootScale = 1.2f; + this->rootScale *= ((f32)this->actor.colorFilterTimer / 8); + func_8002D868(&this->actor); + + if (func_809F68B0(this, globalCtx) != 0) { + this->timer3 = 60; + func_809F6AC4(this); + this->unk_1FC = 7; + this->actionFunc = func_809F784C; + } +} + +void func_809F784C(EnDodojr* this, GlobalContext* globalCtx) { + func_809F7B3C(this, globalCtx); +} + +void func_809F786C(EnDodojr* this, GlobalContext* globalCtx) { + func_8002D868(&this->actor); + + if (func_809F68B0(this, globalCtx) != 0) { + func_809F6AC4(this); + this->actionFunc = func_809F78EC; + } + + Math_SmoothStepToS(&this->actor.shape.rot.y, 0, 4, 1000, 10); + this->actor.world.rot.x = this->actor.shape.rot.x; + this->actor.colorFilterTimer = this->timer1; +} + +void func_809F78EC(EnDodojr* this, GlobalContext* globalCtx) { + if (DECR(this->timer1) != 0) { + if (this->timer1 < 30) { + if ((this->timer1 & 1) != 0) { + this->actor.world.pos.x += 1.5f; + this->actor.world.pos.z += 1.5f; + } else { + this->actor.world.pos.x -= 1.5f; + this->actor.world.pos.z -= 1.5f; + } + + return; + } + } else { + func_809F6994(this); + this->actionFunc = func_809F758C; + } +} + +void func_809F799C(EnDodojr* this, GlobalContext* globalCtx) { + this->actor.flags |= 0x1000000; + func_8002D868(&this->actor); + + if (func_809F68B0(this, globalCtx) != 0) { + func_809F6994(this); + this->actionFunc = func_809F758C; + } +} + +void func_809F7A00(EnDodojr* this, GlobalContext* globalCtx) { + f32 tmp; + + Math_SmoothStepToS(&this->actor.shape.rot.x, 0x4000, 4, 1000, 100); + + if (DECR(this->timer3) != 0) { + tmp = (30 - this->timer3) / 30.0f; + this->actor.world.pos.y = this->actor.home.pos.y - (60.0f * tmp); + } else { + Actor_Kill(&this->actor); + } + + func_809F6510(this, globalCtx, 3); +} + +void func_809F7AB8(EnDodojr* this, GlobalContext* globalCtx) { + func_8002D868(this); + Math_SmoothStepToS(&this->actor.shape.rot.y, 0, 4, 1000, 10); + this->actor.world.rot.x = this->actor.shape.rot.x; + + if (func_809F68B0(this, globalCtx) != 0) { + this->timer3 = 60; + func_809F6AC4(this); + this->unk_1FC = 7; + this->actionFunc = func_809F7B3C; + } +} + +void func_809F7B3C(EnDodojr* this, GlobalContext* globalCtx) { + EnBom* bomb; + + if (this->unk_1FC != 0) { + if (this->actor.colorFilterTimer == 0) { + func_8003426C(&this->actor, 0x4000, 200, 0, this->unk_1FC); + this->unk_1FC--; + } + } else { + bomb = (EnBom*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOM, this->actor.world.pos.x, + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, BOMB_BODY); + + if (bomb != NULL) { + bomb->timer = 0; + } + + this->timer3 = 8; + this->actionFunc = func_809F7BE4; + } +} + +void func_809F7BE4(EnDodojr* this, GlobalContext* globalCtx) { + if (DECR(this->timer3) == 0) { + Item_DropCollectibleRandom(globalCtx, NULL, &this->actor.world.pos, 0x40); + Actor_Kill(&this->actor); + } +} + +void func_809F7C48(EnDodojr* this, GlobalContext* globalCtx) { + if (DECR(this->timer2) == 0) { + func_809F709C(this); + } +} + +void EnDodojr_Update(Actor* thisx, GlobalContext* globalCtx) { + EnDodojr* this = THIS; + + SkelAnime_Update(&this->skelAnime); + Actor_MoveForward(&this->actor); + func_809F70E8(this, globalCtx); + + if (this->actionFunc != func_809F73AC) { + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, this->collider.dim.radius, this->collider.dim.height, 0.0f, 5); + } + + this->actionFunc(this, globalCtx); + Actor_SetFocus(&this->actor, 10.0f); + func_809F72A4(this, globalCtx); +} + +s32 func_809F7D50(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { + EnDodojr* this = THIS; + Vec3f D_809F7F64 = { 480.0f, 620.0f, 0.0f }; + + if (limbIndex == 1) { + Matrix_Scale((this->rootScale * 0.5f) + 1.0f, this->rootScale + 1.0f, (this->rootScale * 0.5f) + 1.0f, 1); + } + + if (limbIndex == 4) { + Matrix_MultVec3f(&D_809F7F64, &this->headPos); + } + + return 0; +} + +void func_809F7DFC(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) { +} + +void EnDodojr_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnDodojr* this = THIS; + + if ((this->actionFunc != func_809F73AC) && (this->actionFunc != func_809F7BE4)) { + func_80093D18(globalCtx->state.gfxCtx); + SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, func_809F7D50, func_809F7DFC, + &this->actor); + } +} diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h index b16146f1f3..a46e9fd28d 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h @@ -6,9 +6,24 @@ struct EnDodojr; +typedef void (*EnDodojrActionFunc)(struct EnDodojr*, GlobalContext*); + typedef struct EnDodojr { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x174]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnDodojrActionFunc actionFunc; + /* 0x0194 */ ColliderCylinder collider; + /* 0x01E0 */ Actor* bomb; + /* 0x01E4 */ Vec3f headPos; + /* 0x01F0 */ Vec3f dustPos; + /* 0x01FC */ s16 unk_1FC; + /* 0x01FE */ s16 timer1; + /* 0x0200 */ s16 timer2; + /* 0x0202 */ s16 timer3; + /* 0x0204 */ s16 timer4; + /* 0x0208 */ f32 rootScale; // scale used with the root limb + /* 0x020C */ Vec3s jointTable[15]; + /* 0x0266 */ Vec3s morphTable[15]; } EnDodojr; // size = 0x02C0 extern const ActorInit En_Dodojr_InitVars; diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 050a2517f6..930a9c9b18 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -618,7 +618,8 @@ void func_80AF68E4(EnSa* this, GlobalContext* globalCtx) { phi_v0 = this->unk_20C; } if (phi_v0 == 0) { - Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_PL_WALK_GROUND, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); this->unk_20C = 8; } }