diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s deleted file mode 100644 index 4c475f8405..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel EnReeba_Destroy -/* 001FC 80AE4ECC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00200 80AE4ED0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00204 80AE4ED4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00208 80AE4ED8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0020C 80AE4EDC 24C50290 */ addiu $a1, $a2, 0x0290 ## $a1 = 00000290 -/* 00210 80AE4EE0 0C0170EB */ jal Collider_DestroyCylinder - -/* 00214 80AE4EE4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00218 80AE4EE8 8FA60018 */ lw $a2, 0x0018($sp) -/* 0021C 80AE4EEC 8CC30118 */ lw $v1, 0x0118($a2) ## 00000118 -/* 00220 80AE4EF0 50600010 */ beql $v1, $zero, .L80AE4F34 -/* 00224 80AE4EF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00228 80AE4EF8 8C6E0130 */ lw $t6, 0x0130($v1) ## 00000130 -/* 0022C 80AE4EFC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 00230 80AE4F00 51C0000C */ beql $t6, $zero, .L80AE4F34 -/* 00234 80AE4F04 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00238 80AE4F08 84630152 */ lh $v1, 0x0152($v1) ## 00000152 -/* 0023C 80AE4F0C 24190258 */ addiu $t9, $zero, 0x0258 ## $t9 = 00000258 -/* 00240 80AE4F10 18600002 */ blez $v1, .L80AE4F1C -/* 00244 80AE4F14 246FFFFF */ addiu $t7, $v1, 0xFFFF ## $t7 = FFFFFFFF -/* 00248 80AE4F18 A44F0152 */ sh $t7, 0x0152($v0) ## 00000152 -.L80AE4F1C: -/* 0024C 80AE4F1C 84D8027A */ lh $t8, 0x027A($a2) ## 0000027A -/* 00250 80AE4F20 53000004 */ beql $t8, $zero, .L80AE4F34 -/* 00254 80AE4F24 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00258 80AE4F28 AC40016C */ sw $zero, 0x016C($v0) ## 0000016C -/* 0025C 80AE4F2C A4590164 */ sh $t9, 0x0164($v0) ## 00000164 -/* 00260 80AE4F30 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE4F34: -/* 00264 80AE4F34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00268 80AE4F38 03E00008 */ jr $ra -/* 0026C 80AE4F3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s deleted file mode 100644 index d817c10245..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s +++ /dev/null @@ -1,121 +0,0 @@ -.rdata -glabel D_80AE665C - .asciz "../z_en_reeba.c" - .balign 4 - -glabel D_80AE666C - .asciz "../z_en_reeba.c" - .balign 4 - -.text -glabel EnReeba_Draw -/* 016F4 80AE63C4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 016F8 80AE63C8 AFB10048 */ sw $s1, 0x0048($sp) -/* 016FC 80AE63CC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01700 80AE63D0 AFBF004C */ sw $ra, 0x004C($sp) -/* 01704 80AE63D4 AFB00044 */ sw $s0, 0x0044($sp) -/* 01708 80AE63D8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0170C 80AE63DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01710 80AE63E0 3C0680AE */ lui $a2, %hi(D_80AE665C) ## $a2 = 80AE0000 -/* 01714 80AE63E4 24C6665C */ addiu $a2, $a2, %lo(D_80AE665C) ## $a2 = 80AE665C -/* 01718 80AE63E8 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 -/* 0171C 80AE63EC 24070426 */ addiu $a3, $zero, 0x0426 ## $a3 = 00000426 -/* 01720 80AE63F0 0C031AB1 */ jal Graph_OpenDisps -/* 01724 80AE63F4 AFA5007C */ sw $a1, 0x007C($sp) -/* 01728 80AE63F8 0C024F46 */ jal func_80093D18 -/* 0172C 80AE63FC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01730 80AE6400 860E027A */ lh $t6, 0x027A($s0) ## 0000027A -/* 01734 80AE6404 8FA8007C */ lw $t0, 0x007C($sp) -/* 01738 80AE6408 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0173C 80AE640C 11C0000B */ beq $t6, $zero, .L80AE643C -/* 01740 80AE6410 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01744 80AE6414 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 01748 80AE6418 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 0174C 80AE641C 3C199B37 */ lui $t9, 0x9B37 ## $t9 = 9B370000 -/* 01750 80AE6420 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 01754 80AE6424 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01758 80AE6428 3739FFFF */ ori $t9, $t9, 0xFFFF ## $t9 = 9B37FFFF -/* 0175C 80AE642C 37180001 */ ori $t8, $t8, 0x0001 ## $t8 = FA000001 -/* 01760 80AE6430 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 01764 80AE6434 10000009 */ beq $zero, $zero, .L80AE645C -/* 01768 80AE6438 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -.L80AE643C: -/* 0176C 80AE643C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 01770 80AE6440 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 -/* 01774 80AE6444 354A0001 */ ori $t2, $t2, 0x0001 ## $t2 = FA000001 -/* 01778 80AE6448 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 0177C 80AE644C AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 01780 80AE6450 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 01784 80AE6454 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 01788 80AE6458 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -.L80AE645C: -/* 0178C 80AE645C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 01790 80AE6460 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 01794 80AE6464 AFB00014 */ sw $s0, 0x0014($sp) -/* 01798 80AE6468 0C028572 */ jal SkelAnime_Draw - -/* 0179C 80AE646C AFA00010 */ sw $zero, 0x0010($sp) -/* 017A0 80AE6470 3C0680AE */ lui $a2, %hi(D_80AE666C) ## $a2 = 80AE0000 -/* 017A4 80AE6474 24C6666C */ addiu $a2, $a2, %lo(D_80AE666C) ## $a2 = 80AE666C -/* 017A8 80AE6478 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 -/* 017AC 80AE647C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 017B0 80AE6480 0C031AD5 */ jal Graph_CloseDisps -/* 017B4 80AE6484 24070440 */ addiu $a3, $zero, 0x0440 ## $a3 = 00000440 -/* 017B8 80AE6488 3C0C8016 */ lui $t4, %hi(gGameInfo) -/* 017BC 80AE648C 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) -/* 017C0 80AE6490 858D12D4 */ lh $t5, 0x12D4($t4) ## 801612D4 -/* 017C4 80AE6494 51A0002E */ beql $t5, $zero, .L80AE6550 -/* 017C8 80AE6498 8FBF004C */ lw $ra, 0x004C($sp) -/* 017CC 80AE649C 0C01DE1C */ jal Math_Sins - ## sins? -/* 017D0 80AE64A0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 017D4 80AE64A4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 017D8 80AE64A8 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 017DC 80AE64AC C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 017E0 80AE64B0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 017E4 80AE64B4 46040182 */ mul.s $f6, $f0, $f4 -/* 017E8 80AE64B8 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 017EC 80AE64BC 46083280 */ add.s $f10, $f6, $f8 -/* 017F0 80AE64C0 E7AA0058 */ swc1 $f10, 0x0058($sp) -/* 017F4 80AE64C4 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 017F8 80AE64C8 46049180 */ add.s $f6, $f18, $f4 -/* 017FC 80AE64CC E7A6005C */ swc1 $f6, 0x005C($sp) -/* 01800 80AE64D0 0C01DE0D */ jal Math_Coss - ## coss? -/* 01804 80AE64D4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 01808 80AE64D8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0180C 80AE64DC 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 01810 80AE64E0 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 01814 80AE64E4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01818 80AE64E8 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 0181C 80AE64EC C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 01820 80AE64F0 86070030 */ lh $a3, 0x0030($s0) ## 00000030 -/* 01824 80AE64F4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01828 80AE64F8 46080282 */ mul.s $f10, $f0, $f8 -/* 0182C 80AE64FC 860F0034 */ lh $t7, 0x0034($s0) ## 00000034 -/* 01830 80AE6500 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01834 80AE6504 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01838 80AE6508 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 0183C 80AE650C AFA90034 */ sw $t1, 0x0034($sp) -/* 01840 80AE6510 AFB90030 */ sw $t9, 0x0030($sp) -/* 01844 80AE6514 46125080 */ add.s $f2, $f10, $f18 -/* 01848 80AE6518 AFB80024 */ sw $t8, 0x0024($sp) -/* 0184C 80AE651C AFA0002C */ sw $zero, 0x002C($sp) -/* 01850 80AE6520 AFA00028 */ sw $zero, 0x0028($sp) -/* 01854 80AE6524 E7B00020 */ swc1 $f16, 0x0020($sp) -/* 01858 80AE6528 E7B0001C */ swc1 $f16, 0x001C($sp) -/* 0185C 80AE652C E7B00018 */ swc1 $f16, 0x0018($sp) -/* 01860 80AE6530 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01864 80AE6534 8E2A0000 */ lw $t2, 0x0000($s1) ## 00000000 -/* 01868 80AE6538 44061000 */ mfc1 $a2, $f2 -/* 0186C 80AE653C C7AC0058 */ lwc1 $f12, 0x0058($sp) -/* 01870 80AE6540 C7AE005C */ lwc1 $f14, 0x005C($sp) -/* 01874 80AE6544 0C018FA7 */ jal DebugDisplay_AddObject - -/* 01878 80AE6548 AFAA0038 */ sw $t2, 0x0038($sp) -/* 0187C 80AE654C 8FBF004C */ lw $ra, 0x004C($sp) -.L80AE6550: -/* 01880 80AE6550 8FB00044 */ lw $s0, 0x0044($sp) -/* 01884 80AE6554 8FB10048 */ lw $s1, 0x0048($sp) -/* 01888 80AE6558 03E00008 */ jr $ra -/* 0188C 80AE655C 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s deleted file mode 100644 index a45f9cc476..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s +++ /dev/null @@ -1,151 +0,0 @@ -.rdata -glabel D_80AE65F0 - .asciz "\x1b[33m☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -.late_rodata -glabel D_80AE667C - .float 0.04 - -glabel D_80AE6680 - .word 0xC6D6D800 - -.text -glabel EnReeba_Init -/* 00000 80AE4CD0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00004 80AE4CD4 AFB00024 */ sw $s0, 0x0024($sp) -/* 00008 80AE4CD8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 80AE4CDC AFB10028 */ sw $s1, 0x0028($sp) -/* 00010 80AE4CE0 8C990024 */ lw $t9, 0x0024($a0) ## 00000024 -/* 00014 80AE4CE4 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 -/* 00018 80AE4CE8 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 -/* 0001C 80AE4CEC AC990038 */ sw $t9, 0x0038($a0) ## 00000038 -/* 00020 80AE4CF0 8C99002C */ lw $t9, 0x002C($a0) ## 0000002C -/* 00024 80AE4CF4 8C980028 */ lw $t8, 0x0028($a0) ## 00000028 -/* 00028 80AE4CF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0002C 80AE4CFC 240E0047 */ addiu $t6, $zero, 0x0047 ## $t6 = 00000047 -/* 00030 80AE4D00 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 00034 80AE4D04 A08E0117 */ sb $t6, 0x0117($a0) ## 00000117 -/* 00038 80AE4D08 A08F001F */ sb $t7, 0x001F($a0) ## 0000001F -/* 0003C 80AE4D0C E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 00040 80AE4D10 AC990040 */ sw $t9, 0x0040($a0) ## 00000040 -/* 00044 80AE4D14 AC98003C */ sw $t8, 0x003C($a0) ## 0000003C -/* 00048 80AE4D18 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0004C 80AE4D1C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00050 80AE4D20 26080190 */ addiu $t0, $s0, 0x0190 ## $t0 = 00000190 -/* 00054 80AE4D24 260901FC */ addiu $t1, $s0, 0x01FC ## $t1 = 000001FC -/* 00058 80AE4D28 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0005C 80AE4D2C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00060 80AE4D30 240A0012 */ addiu $t2, $zero, 0x0012 ## $t2 = 00000012 -/* 00064 80AE4D34 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00068 80AE4D38 24E701E4 */ addiu $a3, $a3, 0x01E4 ## $a3 = 060001E4 -/* 0006C 80AE4D3C 24C61EE8 */ addiu $a2, $a2, 0x1EE8 ## $a2 = 06001EE8 -/* 00070 80AE4D40 AFA90014 */ sw $t1, 0x0014($sp) -/* 00074 80AE4D44 AFA80010 */ sw $t0, 0x0010($sp) -/* 00078 80AE4D48 0C02915F */ jal SkelAnime_Init - -/* 0007C 80AE4D4C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00080 80AE4D50 240B00FE */ addiu $t3, $zero, 0x00FE ## $t3 = 000000FE -/* 00084 80AE4D54 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 -/* 00088 80AE4D58 A20B00AE */ sb $t3, 0x00AE($s0) ## 000000AE -/* 0008C 80AE4D5C A20C00AF */ sb $t4, 0x00AF($s0) ## 000000AF -/* 00090 80AE4D60 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 -/* 00094 80AE4D64 AFA50034 */ sw $a1, 0x0034($sp) -/* 00098 80AE4D68 0C0170D9 */ jal Collider_InitCylinder - -/* 0009C 80AE4D6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000A0 80AE4D70 3C0780AE */ lui $a3, %hi(D_80AE65A0) ## $a3 = 80AE0000 -/* 000A4 80AE4D74 8FA50034 */ lw $a1, 0x0034($sp) -/* 000A8 80AE4D78 24E765A0 */ addiu $a3, $a3, %lo(D_80AE65A0) ## $a3 = 80AE65A0 -/* 000AC 80AE4D7C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000B0 80AE4D80 0C01712B */ jal Collider_SetCylinder - -/* 000B4 80AE4D84 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000B8 80AE4D88 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -/* 000BC 80AE4D8C 3C0180AE */ lui $at, %hi(D_80AE667C) ## $at = 80AE0000 -/* 000C0 80AE4D90 A60D027A */ sh $t5, 0x027A($s0) ## 0000027A -/* 000C4 80AE4D94 860E027A */ lh $t6, 0x027A($s0) ## 0000027A -/* 000C8 80AE4D98 C426667C */ lwc1 $f6, %lo(D_80AE667C)($at) -/* 000CC 80AE4D9C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 000D0 80AE4DA0 11C0001C */ beq $t6, $zero, .L80AE4E14 -/* 000D4 80AE4DA4 E606028C */ swc1 $f6, 0x028C($s0) ## 0000028C -/* 000D8 80AE4DA8 C608028C */ lwc1 $f8, 0x028C($s0) ## 0000028C -/* 000DC 80AE4DAC 44815000 */ mtc1 $at, $f10 ## $f10 = 1.50 -/* 000E0 80AE4DB0 240F0023 */ addiu $t7, $zero, 0x0023 ## $t7 = 00000023 -/* 000E4 80AE4DB4 2418002D */ addiu $t8, $zero, 0x002D ## $t8 = 0000002D -/* 000E8 80AE4DB8 460A4402 */ mul.s $f16, $f8, $f10 -/* 000EC 80AE4DBC 3C0480AE */ lui $a0, %hi(D_80AE65F0) ## $a0 = 80AE0000 -/* 000F0 80AE4DC0 A60F02D0 */ sh $t7, 0x02D0($s0) ## 000002D0 -/* 000F4 80AE4DC4 A61802D2 */ sh $t8, 0x02D2($s0) ## 000002D2 -/* 000F8 80AE4DC8 248465F0 */ addiu $a0, $a0, %lo(D_80AE65F0) ## $a0 = 80AE65F0 -/* 000FC 80AE4DCC E610028C */ swc1 $f16, 0x028C($s0) ## 0000028C -/* 00100 80AE4DD0 C612028C */ lwc1 $f18, 0x028C($s0) ## 0000028C -/* 00104 80AE4DD4 46009121 */ cvt.d.s $f4, $f18 -/* 00108 80AE4DD8 44072000 */ mfc1 $a3, $f4 -/* 0010C 80AE4DDC 44062800 */ mfc1 $a2, $f5 -/* 00110 80AE4DE0 0C00084C */ jal osSyncPrintf - -/* 00114 80AE4DE4 00000000 */ nop -/* 00118 80AE4DE8 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 0011C 80AE4DEC 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 00120 80AE4DF0 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 -/* 00124 80AE4DF4 A21900AF */ sb $t9, 0x00AF($s0) ## 000000AF -/* 00128 80AE4DF8 A20802AC */ sb $t0, 0x02AC($s0) ## 000002AC -/* 0012C 80AE4DFC A20902AD */ sb $t1, 0x02AD($s0) ## 000002AD -/* 00130 80AE4E00 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00134 80AE4E04 26251C24 */ addiu $a1, $s1, 0x1C24 ## $a1 = 00001C24 -/* 00138 80AE4E08 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0013C 80AE4E0C 0C00CDD2 */ jal Actor_ChangeType - -/* 00140 80AE4E10 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -.L80AE4E14: -/* 00144 80AE4E14 3C0180AE */ lui $at, %hi(D_80AE6680) ## $at = 80AE0000 -/* 00148 80AE4E18 C4286680 */ lwc1 $f8, %lo(D_80AE6680)($at) -/* 0014C 80AE4E1C C606028C */ lwc1 $f6, 0x028C($s0) ## 0000028C -/* 00150 80AE4E20 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00154 80AE4E24 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00158 80AE4E28 46083002 */ mul.s $f0, $f6, $f8 -/* 0015C 80AE4E2C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00160 80AE4E30 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00164 80AE4E34 44050000 */ mfc1 $a1, $f0 -/* 00168 80AE4E38 E6000284 */ swc1 $f0, 0x0284($s0) ## 00000284 -/* 0016C 80AE4E3C 0C00AC78 */ jal ActorShape_Init - -/* 00170 80AE4E40 E60000BC */ swc1 $f0, 0x00BC($s0) ## 000000BC -/* 00174 80AE4E44 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00178 80AE4E48 44810000 */ mtc1 $at, $f0 ## $f0 = 60.00 -/* 0017C 80AE4E4C 3C0A80AE */ lui $t2, %hi(D_80AE6560) ## $t2 = 80AE0000 -/* 00180 80AE4E50 254A6560 */ addiu $t2, $t2, %lo(D_80AE6560) ## $t2 = 80AE6560 -/* 00184 80AE4E54 AE0A0098 */ sw $t2, 0x0098($s0) ## 00000098 -/* 00188 80AE4E58 240B001D */ addiu $t3, $zero, 0x001D ## $t3 = 0000001D -/* 0018C 80AE4E5C 44070000 */ mfc1 $a3, $f0 -/* 00190 80AE4E60 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00194 80AE4E64 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00198 80AE4E68 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0019C 80AE4E6C 3C06420C */ lui $a2, 0x420C ## $a2 = 420C0000 -/* 001A0 80AE4E70 0C00B92D */ jal func_8002E4B4 -/* 001A4 80AE4E74 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 001A8 80AE4E78 262407C0 */ addiu $a0, $s1, 0x07C0 ## $a0 = 000007C0 -/* 001AC 80AE4E7C 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 001B0 80AE4E80 0C010753 */ jal func_80041D4C -/* 001B4 80AE4E84 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 001B8 80AE4E88 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 001BC 80AE4E8C 10410008 */ beq $v0, $at, .L80AE4EB0 -/* 001C0 80AE4E90 3C0C80AE */ lui $t4, %hi(func_80AE4F40) ## $t4 = 80AE0000 -/* 001C4 80AE4E94 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 001C8 80AE4E98 10410005 */ beq $v0, $at, .L80AE4EB0 -/* 001CC 80AE4E9C 00000000 */ nop -/* 001D0 80AE4EA0 0C00B55C */ jal Actor_Kill - -/* 001D4 80AE4EA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001D8 80AE4EA8 10000004 */ beq $zero, $zero, .L80AE4EBC -/* 001DC 80AE4EAC 8FBF002C */ lw $ra, 0x002C($sp) -.L80AE4EB0: -/* 001E0 80AE4EB0 258C4F40 */ addiu $t4, $t4, %lo(func_80AE4F40) ## $t4 = 00004F40 -/* 001E4 80AE4EB4 AE0C026C */ sw $t4, 0x026C($s0) ## 0000026C -/* 001E8 80AE4EB8 8FBF002C */ lw $ra, 0x002C($sp) -.L80AE4EBC: -/* 001EC 80AE4EBC 8FB00024 */ lw $s0, 0x0024($sp) -/* 001F0 80AE4EC0 8FB10028 */ lw $s1, 0x0028($sp) -/* 001F4 80AE4EC4 03E00008 */ jr $ra -/* 001F8 80AE4EC8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s deleted file mode 100644 index cd9a9f4c61..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s +++ /dev/null @@ -1,193 +0,0 @@ -glabel EnReeba_Update -/* 01448 80AE6118 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0144C 80AE611C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01450 80AE6120 AFB00020 */ sw $s0, 0x0020($sp) -/* 01454 80AE6124 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 01458 80AE6128 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0145C 80AE612C AFA50044 */ sw $a1, 0x0044($sp) -/* 01460 80AE6130 0C2B97B7 */ jal func_80AE5EDC -/* 01464 80AE6134 AFAE0034 */ sw $t6, 0x0034($sp) -/* 01468 80AE6138 8E19026C */ lw $t9, 0x026C($s0) ## 0000026C -/* 0146C 80AE613C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01470 80AE6140 8FA50044 */ lw $a1, 0x0044($sp) -/* 01474 80AE6144 0320F809 */ jalr $ra, $t9 -/* 01478 80AE6148 00000000 */ nop -/* 0147C 80AE614C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01480 80AE6150 0C00B58B */ jal Actor_SetScale - -/* 01484 80AE6154 8E05028C */ lw $a1, 0x028C($s0) ## 0000028C -/* 01488 80AE6158 86020270 */ lh $v0, 0x0270($s0) ## 00000270 -/* 0148C 80AE615C 10400002 */ beq $v0, $zero, .L80AE6168 -/* 01490 80AE6160 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 01494 80AE6164 A60F0270 */ sh $t7, 0x0270($s0) ## 00000270 -.L80AE6168: -/* 01498 80AE6168 86020272 */ lh $v0, 0x0272($s0) ## 00000272 -/* 0149C 80AE616C 10400002 */ beq $v0, $zero, .L80AE6178 -/* 014A0 80AE6170 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 014A4 80AE6174 A6180272 */ sh $t8, 0x0272($s0) ## 00000272 -.L80AE6178: -/* 014A8 80AE6178 86020278 */ lh $v0, 0x0278($s0) ## 00000278 -/* 014AC 80AE617C 10400002 */ beq $v0, $zero, .L80AE6188 -/* 014B0 80AE6180 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 014B4 80AE6184 A6080278 */ sh $t0, 0x0278($s0) ## 00000278 -.L80AE6188: -/* 014B8 80AE6188 86020274 */ lh $v0, 0x0274($s0) ## 00000274 -/* 014BC 80AE618C 10400002 */ beq $v0, $zero, .L80AE6198 -/* 014C0 80AE6190 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 014C4 80AE6194 A6090274 */ sh $t1, 0x0274($s0) ## 00000274 -.L80AE6198: -/* 014C8 80AE6198 86020276 */ lh $v0, 0x0276($s0) ## 00000276 -/* 014CC 80AE619C 10400002 */ beq $v0, $zero, .L80AE61A8 -/* 014D0 80AE61A0 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF -/* 014D4 80AE61A4 A60A0276 */ sh $t2, 0x0276($s0) ## 00000276 -.L80AE61A8: -/* 014D8 80AE61A8 0C00B638 */ jal Actor_MoveForward - -/* 014DC 80AE61AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014E0 80AE61B0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 014E4 80AE61B4 44810000 */ mtc1 $at, $f0 ## $f0 = 60.00 -/* 014E8 80AE61B8 240B001D */ addiu $t3, $zero, 0x001D ## $t3 = 0000001D -/* 014EC 80AE61BC AFAB0014 */ sw $t3, 0x0014($sp) -/* 014F0 80AE61C0 44070000 */ mfc1 $a3, $f0 -/* 014F4 80AE61C4 8FA40044 */ lw $a0, 0x0044($sp) -/* 014F8 80AE61C8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 014FC 80AE61CC 3C06420C */ lui $a2, 0x420C ## $a2 = 420C0000 -/* 01500 80AE61D0 0C00B92D */ jal func_8002E4B4 -/* 01504 80AE61D4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01508 80AE61D8 920302A0 */ lbu $v1, 0x02A0($s0) ## 000002A0 -/* 0150C 80AE61DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01510 80AE61E0 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 -/* 01514 80AE61E4 306C0004 */ andi $t4, $v1, 0x0004 ## $t4 = 00000000 -/* 01518 80AE61E8 1180001C */ beq $t4, $zero, .L80AE625C -/* 0151C 80AE61EC 306DFFFB */ andi $t5, $v1, 0xFFFB ## $t5 = 00000000 -/* 01520 80AE61F0 8E02026C */ lw $v0, 0x026C($s0) ## 0000026C -/* 01524 80AE61F4 3C0E80AE */ lui $t6, %hi(func_80AE5270) ## $t6 = 80AE0000 -/* 01528 80AE61F8 25CE5270 */ addiu $t6, $t6, %lo(func_80AE5270) ## $t6 = 80AE5270 -/* 0152C 80AE61FC 11C20005 */ beq $t6, $v0, .L80AE6214 -/* 01530 80AE6200 A20D02A0 */ sb $t5, 0x02A0($s0) ## 000002A0 -/* 01534 80AE6204 3C1980AE */ lui $t9, %hi(func_80AE53AC) ## $t9 = 80AE0000 -/* 01538 80AE6208 273953AC */ addiu $t9, $t9, %lo(func_80AE53AC) ## $t9 = 80AE53AC -/* 0153C 80AE620C 57220014 */ bnel $t9, $v0, .L80AE6260 -/* 01540 80AE6210 920302A0 */ lbu $v1, 0x02A0($s0) ## 000002A0 -.L80AE6214: -/* 01544 80AE6214 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 01548 80AE6218 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0154C 80AE621C 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 01550 80AE6220 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 01554 80AE6224 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01558 80AE6228 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 -/* 0155C 80AE622C 46803220 */ cvt.s.w $f8, $f6 -/* 01560 80AE6230 3C0A80AE */ lui $t2, %hi(func_80AE561C) ## $t2 = 80AE0000 -/* 01564 80AE6234 2409000E */ addiu $t1, $zero, 0x000E ## $t1 = 0000000E -/* 01568 80AE6238 254A561C */ addiu $t2, $t2, %lo(func_80AE561C) ## $t2 = 80AE561C -/* 0156C 80AE623C A6090272 */ sh $t1, 0x0272($s0) ## 00000272 -/* 01570 80AE6240 AE0A026C */ sw $t2, 0x026C($s0) ## 0000026C -/* 01574 80AE6244 460A4402 */ mul.s $f16, $f8, $f10 -/* 01578 80AE6248 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 0157C 80AE624C 4600848D */ trunc.w.s $f18, $f16 -/* 01580 80AE6250 44089000 */ mfc1 $t0, $f18 -/* 01584 80AE6254 10000056 */ beq $zero, $zero, .L80AE63B0 -/* 01588 80AE6258 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -.L80AE625C: -/* 0158C 80AE625C 920302A0 */ lbu $v1, 0x02A0($s0) ## 000002A0 -.L80AE6260: -/* 01590 80AE6260 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01594 80AE6264 306B0002 */ andi $t3, $v1, 0x0002 ## $t3 = 00000000 -/* 01598 80AE6268 11600010 */ beq $t3, $zero, .L80AE62AC -/* 0159C 80AE626C 306CFFFD */ andi $t4, $v1, 0xFFFD ## $t4 = 00000000 -/* 015A0 80AE6270 A20C02A0 */ sb $t4, 0x02A0($s0) ## 000002A0 -/* 015A4 80AE6274 8FAD0034 */ lw $t5, 0x0034($sp) -/* 015A8 80AE6278 8E0E0294 */ lw $t6, 0x0294($s0) ## 00000294 -/* 015AC 80AE627C 55AE000C */ bnel $t5, $t6, .L80AE62B0 -/* 015B0 80AE6280 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 -/* 015B4 80AE6284 8619027A */ lh $t9, 0x027A($s0) ## 0000027A -/* 015B8 80AE6288 57200009 */ bnel $t9, $zero, .L80AE62B0 -/* 015BC 80AE628C 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 -/* 015C0 80AE6290 8E18026C */ lw $t8, 0x026C($s0) ## 0000026C -/* 015C4 80AE6294 3C0F80AE */ lui $t7, %hi(func_80AE56E0) ## $t7 = 80AE0000 -/* 015C8 80AE6298 25EF56E0 */ addiu $t7, $t7, %lo(func_80AE56E0) ## $t7 = 80AE56E0 -/* 015CC 80AE629C 11F80003 */ beq $t7, $t8, .L80AE62AC -/* 015D0 80AE62A0 3C0880AE */ lui $t0, %hi(func_80AE5688) ## $t0 = 80AE0000 -/* 015D4 80AE62A4 25085688 */ addiu $t0, $t0, %lo(func_80AE5688) ## $t0 = 80AE5688 -/* 015D8 80AE62A8 AE08026C */ sw $t0, 0x026C($s0) ## 0000026C -.L80AE62AC: -/* 015DC 80AE62AC 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 -.L80AE62B0: -/* 015E0 80AE62B0 860B027A */ lh $t3, 0x027A($s0) ## 0000027A -/* 015E4 80AE62B4 8E090028 */ lw $t1, 0x0028($s0) ## 00000028 -/* 015E8 80AE62B8 AE0A0038 */ sw $t2, 0x0038($s0) ## 00000038 -/* 015EC 80AE62BC 8E0A002C */ lw $t2, 0x002C($s0) ## 0000002C -/* 015F0 80AE62C0 AE09003C */ sw $t1, 0x003C($s0) ## 0000003C -/* 015F4 80AE62C4 15600007 */ bne $t3, $zero, .L80AE62E4 -/* 015F8 80AE62C8 AE0A0040 */ sw $t2, 0x0040($s0) ## 00000040 -/* 015FC 80AE62CC 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 01600 80AE62D0 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 01604 80AE62D4 C604003C */ lwc1 $f4, 0x003C($s0) ## 0000003C -/* 01608 80AE62D8 46062200 */ add.s $f8, $f4, $f6 -/* 0160C 80AE62DC 10000006 */ beq $zero, $zero, .L80AE62F8 -/* 01610 80AE62E0 E608003C */ swc1 $f8, 0x003C($s0) ## 0000003C -.L80AE62E4: -/* 01614 80AE62E4 C60A003C */ lwc1 $f10, 0x003C($s0) ## 0000003C -/* 01618 80AE62E8 44818000 */ mtc1 $at, $f16 ## $f16 = 15.00 -/* 0161C 80AE62EC 00000000 */ nop -/* 01620 80AE62F0 46105480 */ add.s $f18, $f10, $f16 -/* 01624 80AE62F4 E612003C */ swc1 $f18, 0x003C($s0) ## 0000003C -.L80AE62F8: -/* 01628 80AE62F8 0C0189B7 */ jal Collider_CylinderUpdate - -/* 0162C 80AE62FC AFA50028 */ sw $a1, 0x0028($sp) -/* 01630 80AE6300 3C01C42F */ lui $at, 0xC42F ## $at = C42F0000 -/* 01634 80AE6304 44813000 */ mtc1 $at, $f6 ## $f6 = -700.00 -/* 01638 80AE6308 C60400BC */ lwc1 $f4, 0x00BC($s0) ## 000000BC -/* 0163C 80AE630C 4604303E */ c.le.s $f6, $f4 -/* 01640 80AE6310 00000000 */ nop -/* 01644 80AE6314 45020027 */ bc1fl .L80AE63B4 -/* 01648 80AE6318 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0164C 80AE631C 920C00AF */ lbu $t4, 0x00AF($s0) ## 000000AF -/* 01650 80AE6320 59800024 */ blezl $t4, .L80AE63B4 -/* 01654 80AE6324 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01658 80AE6328 8E0E026C */ lw $t6, 0x026C($s0) ## 0000026C -/* 0165C 80AE632C 3C0D80AE */ lui $t5, %hi(func_80AE56E0) ## $t5 = 80AE0000 -/* 01660 80AE6330 25AD56E0 */ addiu $t5, $t5, %lo(func_80AE56E0) ## $t5 = 80AE56E0 -/* 01664 80AE6334 11AE001E */ beq $t5, $t6, .L80AE63B0 -/* 01668 80AE6338 8FA40044 */ lw $a0, 0x0044($sp) -/* 0166C 80AE633C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01670 80AE6340 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01674 80AE6344 00812821 */ addu $a1, $a0, $at -/* 01678 80AE6348 AFA5002C */ sw $a1, 0x002C($sp) -/* 0167C 80AE634C 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 01680 80AE6350 8FA60028 */ lw $a2, 0x0028($sp) -/* 01684 80AE6354 C60800BC */ lwc1 $f8, 0x00BC($s0) ## 000000BC -/* 01688 80AE6358 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0168C 80AE635C 3C1980AE */ lui $t9, %hi(func_80AE5270) ## $t9 = 80AE0000 -/* 01690 80AE6360 8FA40044 */ lw $a0, 0x0044($sp) -/* 01694 80AE6364 460A403C */ c.lt.s $f8, $f10 -/* 01698 80AE6368 27395270 */ addiu $t9, $t9, %lo(func_80AE5270) ## $t9 = 80AE5270 -/* 0169C 80AE636C 8FA5002C */ lw $a1, 0x002C($sp) -/* 016A0 80AE6370 8FA60028 */ lw $a2, 0x0028($sp) -/* 016A4 80AE6374 4503000F */ bc1tl .L80AE63B4 -/* 016A8 80AE6378 8FBF0024 */ lw $ra, 0x0024($sp) -/* 016AC 80AE637C 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 016B0 80AE6380 AFB90030 */ sw $t9, 0x0030($sp) -/* 016B4 80AE6384 8E02026C */ lw $v0, 0x026C($s0) ## 0000026C -/* 016B8 80AE6388 8FAF0030 */ lw $t7, 0x0030($sp) -/* 016BC 80AE638C 3C1880AE */ lui $t8, %hi(func_80AE53AC) ## $t8 = 80AE0000 -/* 016C0 80AE6390 271853AC */ addiu $t8, $t8, %lo(func_80AE53AC) ## $t8 = 80AE53AC -/* 016C4 80AE6394 11E20003 */ beq $t7, $v0, .L80AE63A4 -/* 016C8 80AE6398 8FA40044 */ lw $a0, 0x0044($sp) -/* 016CC 80AE639C 57020005 */ bnel $t8, $v0, .L80AE63B4 -/* 016D0 80AE63A0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE63A4: -/* 016D4 80AE63A4 8FA5002C */ lw $a1, 0x002C($sp) -/* 016D8 80AE63A8 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 016DC 80AE63AC 8FA60028 */ lw $a2, 0x0028($sp) -.L80AE63B0: -/* 016E0 80AE63B0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE63B4: -/* 016E4 80AE63B4 8FB00020 */ lw $s0, 0x0020($sp) -/* 016E8 80AE63B8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 016EC 80AE63BC 03E00008 */ jr $ra -/* 016F0 80AE63C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s deleted file mode 100644 index 3790a512c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_80AE4F40 -/* 00270 80AE4F40 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00274 80AE4F44 AFB00028 */ sw $s0, 0x0028($sp) -/* 00278 80AE4F48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0027C 80AE4F4C AFBF002C */ sw $ra, 0x002C($sp) -/* 00280 80AE4F50 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00284 80AE4F54 AFA5003C */ sw $a1, 0x003C($sp) -/* 00288 80AE4F58 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0028C 80AE4F5C 248401E4 */ addiu $a0, $a0, 0x01E4 ## $a0 = 060001E4 -/* 00290 80AE4F60 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00294 80AE4F64 8FAE003C */ lw $t6, 0x003C($sp) -/* 00298 80AE4F68 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 0029C 80AE4F6C 468021A0 */ cvt.s.w $f6, $f4 -/* 002A0 80AE4F70 8DCF1C44 */ lw $t7, 0x1C44($t6) ## 00001C44 -/* 002A4 80AE4F74 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 002A8 80AE4F78 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 002AC 80AE4F7C 24A501E4 */ addiu $a1, $a1, 0x01E4 ## $a1 = 060001E4 -/* 002B0 80AE4F80 AFA00014 */ sw $zero, 0x0014($sp) -/* 002B4 80AE4F84 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 002B8 80AE4F88 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 002BC 80AE4F8C 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 002C0 80AE4F90 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 002C4 80AE4F94 AFAF0030 */ sw $t7, 0x0030($sp) -/* 002C8 80AE4F98 0C029468 */ jal SkelAnime_ChangeAnim - -/* 002CC 80AE4F9C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 002D0 80AE4FA0 8FB80030 */ lw $t8, 0x0030($sp) -/* 002D4 80AE4FA4 24030014 */ addiu $v1, $zero, 0x0014 ## $v1 = 00000014 -/* 002D8 80AE4FA8 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 002DC 80AE4FAC C7000838 */ lwc1 $f0, 0x0838($t8) ## 00000838 -/* 002E0 80AE4FB0 240539EE */ addiu $a1, $zero, 0x39EE ## $a1 = 000039EE -/* 002E4 80AE4FB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002E8 80AE4FB8 46000005 */ abs.s $f0, $f0 -/* 002EC 80AE4FBC 4600028D */ trunc.w.s $f10, $f0 -/* 002F0 80AE4FC0 440A5000 */ mfc1 $t2, $f10 -/* 002F4 80AE4FC4 00000000 */ nop -/* 002F8 80AE4FC8 000A5840 */ sll $t3, $t2, 1 -/* 002FC 80AE4FCC 006B6023 */ subu $t4, $v1, $t3 -/* 00300 80AE4FD0 A60C0278 */ sh $t4, 0x0278($s0) ## 00000278 -/* 00304 80AE4FD4 86020278 */ lh $v0, 0x0278($s0) ## 00000278 -/* 00308 80AE4FD8 04430004 */ bgezl $v0, .L80AE4FEC -/* 0030C 80AE4FDC 28410015 */ slti $at, $v0, 0x0015 -/* 00310 80AE4FE0 A60D0278 */ sh $t5, 0x0278($s0) ## 00000278 -/* 00314 80AE4FE4 86020278 */ lh $v0, 0x0278($s0) ## 00000278 -/* 00318 80AE4FE8 28410015 */ slti $at, $v0, 0x0015 -.L80AE4FEC: -/* 0031C 80AE4FEC 54200003 */ bnel $at, $zero, .L80AE4FFC -/* 00320 80AE4FF0 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 00324 80AE4FF4 A6030278 */ sh $v1, 0x0278($s0) ## 00000278 -/* 00328 80AE4FF8 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -.L80AE4FFC: -/* 0032C 80AE4FFC 8618027A */ lh $t8, 0x027A($s0) ## 0000027A -/* 00330 80AE5000 3C01F7FF */ lui $at, 0xF7FF ## $at = F7FF0000 -/* 00334 80AE5004 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 -/* 00338 80AE5008 3421FFFF */ ori $at, $at, 0xFFFF ## $at = F7FFFFFF -/* 0033C 80AE500C 01C17824 */ and $t7, $t6, $at -/* 00340 80AE5010 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00344 80AE5014 13000005 */ beq $t8, $zero, .L80AE502C -/* 00348 80AE5018 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 0034C 80AE501C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00350 80AE5020 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00354 80AE5024 10000003 */ beq $zero, $zero, .L80AE5034 -/* 00358 80AE5028 00000000 */ nop -.L80AE502C: -/* 0035C 80AE502C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00360 80AE5030 24053986 */ addiu $a1, $zero, 0x3986 ## $a1 = 00003986 -.L80AE5034: -/* 00364 80AE5034 3C1980AE */ lui $t9, %hi(func_80AE5054) ## $t9 = 80AE0000 -/* 00368 80AE5038 27395054 */ addiu $t9, $t9, %lo(func_80AE5054) ## $t9 = 80AE5054 -/* 0036C 80AE503C AE19026C */ sw $t9, 0x026C($s0) ## 0000026C -/* 00370 80AE5040 8FBF002C */ lw $ra, 0x002C($sp) -/* 00374 80AE5044 8FB00028 */ lw $s0, 0x0028($sp) -/* 00378 80AE5048 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0037C 80AE504C 03E00008 */ jr $ra -/* 00380 80AE5050 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5054.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5054.s deleted file mode 100644 index 5561aa0ebd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5054.s +++ /dev/null @@ -1,162 +0,0 @@ -.late_rodata -glabel jtbl_80AE6684 -.word L80AE5170 -.word L80AE517C -.word L80AE51A8 -.word L80AE51A8 -.word L80AE51E8 -glabel D_80AE6698 - .float 0.15 - -.text -glabel func_80AE5054 -/* 00384 80AE5054 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00388 80AE5058 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0038C 80AE505C AFB00030 */ sw $s0, 0x0030($sp) -/* 00390 80AE5060 AFA50044 */ sw $a1, 0x0044($sp) -/* 00394 80AE5064 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00398 80AE5068 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0039C 80AE506C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003A0 80AE5070 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 003A4 80AE5074 AFAF003C */ sw $t7, 0x003C($sp) -/* 003A8 80AE5078 8FA40044 */ lw $a0, 0x0044($sp) -/* 003AC 80AE507C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 003B0 80AE5080 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 003B4 80AE5084 0304C021 */ addu $t8, $t8, $a0 -/* 003B8 80AE5088 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 -/* 003BC 80AE508C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 003C0 80AE5090 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 003C4 80AE5094 33190003 */ andi $t9, $t8, 0x0003 ## $t9 = 00000000 -/* 003C8 80AE5098 1720000C */ bne $t9, $zero, .L80AE50CC -/* 003CC 80AE509C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 003D0 80AE50A0 8E0700C4 */ lw $a3, 0x00C4($s0) ## 000000C4 -/* 003D4 80AE50A4 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 003D8 80AE50A8 240901F4 */ addiu $t1, $zero, 0x01F4 ## $t1 = 000001F4 -/* 003DC 80AE50AC 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 003E0 80AE50B0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 003E4 80AE50B4 AFAB0020 */ sw $t3, 0x0020($sp) -/* 003E8 80AE50B8 AFAA001C */ sw $t2, 0x001C($sp) -/* 003EC 80AE50BC AFA90018 */ sw $t1, 0x0018($sp) -/* 003F0 80AE50C0 AFA80010 */ sw $t0, 0x0010($sp) -/* 003F4 80AE50C4 0C00CC98 */ jal func_80033260 -/* 003F8 80AE50C8 E7A40014 */ swc1 $f4, 0x0014($sp) -.L80AE50CC: -/* 003FC 80AE50CC 860C0278 */ lh $t4, 0x0278($s0) ## 00000278 -/* 00400 80AE50D0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00404 80AE50D4 55800062 */ bnel $t4, $zero, .L80AE5260 -/* 00408 80AE50D8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0040C 80AE50DC 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00410 80AE50E0 260400C4 */ addiu $a0, $s0, 0x00C4 ## $a0 = 000000C4 -/* 00414 80AE50E4 3C054140 */ lui $a1, 0x4140 ## $a1 = 41400000 -/* 00418 80AE50E8 44060000 */ mfc1 $a2, $f0 -/* 0041C 80AE50EC 44070000 */ mfc1 $a3, $f0 -/* 00420 80AE50F0 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00424 80AE50F4 00000000 */ nop -/* 00428 80AE50F8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0042C 80AE50FC C60600BC */ lwc1 $f6, 0x00BC($s0) ## 000000BC -/* 00430 80AE5100 8FA3003C */ lw $v1, 0x003C($sp) -/* 00434 80AE5104 4602303C */ c.lt.s $f6, $f2 -/* 00438 80AE5108 00000000 */ nop -/* 0043C 80AE510C 4502000D */ bc1fl .L80AE5144 -/* 00440 80AE5110 960D0280 */ lhu $t5, 0x0280($s0) ## 00000280 -/* 00444 80AE5114 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 00448 80AE5118 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 0044C 80AE511C 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00450 80AE5120 8E060288 */ lw $a2, 0x0288($s0) ## 00000288 -/* 00454 80AE5124 26040288 */ addiu $a0, $s0, 0x0288 ## $a0 = 00000288 -/* 00458 80AE5128 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 -/* 0045C 80AE512C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00460 80AE5130 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00464 80AE5134 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 00468 80AE5138 10000049 */ beq $zero, $zero, .L80AE5260 -/* 0046C 80AE513C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00470 80AE5140 960D0280 */ lhu $t5, 0x0280($s0) ## 00000280 -.L80AE5144: -/* 00474 80AE5144 E6020288 */ swc1 $f2, 0x0288($s0) ## 00000288 -/* 00478 80AE5148 E60200BC */ swc1 $f2, 0x00BC($s0) ## 000000BC -/* 0047C 80AE514C 2DA10005 */ sltiu $at, $t5, 0x0005 -/* 00480 80AE5150 10200030 */ beq $at, $zero, .L80AE5214 -/* 00484 80AE5154 C4600838 */ lwc1 $f0, 0x0838($v1) ## 00000838 -/* 00488 80AE5158 000D6880 */ sll $t5, $t5, 2 -/* 0048C 80AE515C 3C0180AE */ lui $at, %hi(jtbl_80AE6684) ## $at = 80AE0000 -/* 00490 80AE5160 002D0821 */ addu $at, $at, $t5 -/* 00494 80AE5164 8C2D6684 */ lw $t5, %lo(jtbl_80AE6684)($at) -/* 00498 80AE5168 01A00008 */ jr $t5 -/* 0049C 80AE516C 00000000 */ nop -glabel L80AE5170 -/* 004A0 80AE5170 860E008A */ lh $t6, 0x008A($s0) ## 0000008A -/* 004A4 80AE5174 10000027 */ beq $zero, $zero, .L80AE5214 -/* 004A8 80AE5178 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 -glabel L80AE517C -/* 004AC 80AE517C 860F008A */ lh $t7, 0x008A($s0) ## 0000008A -/* 004B0 80AE5180 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 004B4 80AE5184 44818000 */ mtc1 $at, $f16 ## $f16 = 800.00 -/* 004B8 80AE5188 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 004BC 80AE518C 46008482 */ mul.s $f18, $f16, $f0 -/* 004C0 80AE5190 468042A0 */ cvt.s.w $f10, $f8 -/* 004C4 80AE5194 46125100 */ add.s $f4, $f10, $f18 -/* 004C8 80AE5198 4600218D */ trunc.w.s $f6, $f4 -/* 004CC 80AE519C 44193000 */ mfc1 $t9, $f6 -/* 004D0 80AE51A0 1000001C */ beq $zero, $zero, .L80AE5214 -/* 004D4 80AE51A4 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -glabel L80AE51A8 -/* 004D8 80AE51A8 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -/* 004DC 80AE51AC 846800B6 */ lh $t0, 0x00B6($v1) ## 000000B6 -/* 004E0 80AE51B0 3C0180AE */ lui $at, %hi(D_80AE6698) ## $at = 80AE0000 -/* 004E4 80AE51B4 C42A6698 */ lwc1 $f10, %lo(D_80AE6698)($at) -/* 004E8 80AE51B8 01024823 */ subu $t1, $t0, $v0 -/* 004EC 80AE51BC 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 004F0 80AE51C0 460A0482 */ mul.s $f18, $f0, $f10 -/* 004F4 80AE51C4 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 004F8 80AE51C8 46804420 */ cvt.s.w $f16, $f8 -/* 004FC 80AE51CC 46803220 */ cvt.s.w $f8, $f6 -/* 00500 80AE51D0 46128102 */ mul.s $f4, $f16, $f18 -/* 00504 80AE51D4 46044280 */ add.s $f10, $f8, $f4 -/* 00508 80AE51D8 4600540D */ trunc.w.s $f16, $f10 -/* 0050C 80AE51DC 440B8000 */ mfc1 $t3, $f16 -/* 00510 80AE51E0 1000000C */ beq $zero, $zero, .L80AE5214 -/* 00514 80AE51E4 A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 -glabel L80AE51E8 -/* 00518 80AE51E8 860C008A */ lh $t4, 0x008A($s0) ## 0000008A -/* 0051C 80AE51EC 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 00520 80AE51F0 44814000 */ mtc1 $at, $f8 ## $f8 = 800.00 -/* 00524 80AE51F4 448C9000 */ mtc1 $t4, $f18 ## $f18 = 0.00 -/* 00528 80AE51F8 46004102 */ mul.s $f4, $f8, $f0 -/* 0052C 80AE51FC 468091A0 */ cvt.s.w $f6, $f18 -/* 00530 80AE5200 46043281 */ sub.s $f10, $f6, $f4 -/* 00534 80AE5204 4600540D */ trunc.w.s $f16, $f10 -/* 00538 80AE5208 440E8000 */ mfc1 $t6, $f16 -/* 0053C 80AE520C 00000000 */ nop -/* 00540 80AE5210 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 -.L80AE5214: -/* 00544 80AE5214 860F027A */ lh $t7, 0x027A($s0) ## 0000027A -/* 00548 80AE5218 3C1880AE */ lui $t8, %hi(func_80AE538C) ## $t8 = 80AE0000 -/* 0054C 80AE521C 24190082 */ addiu $t9, $zero, 0x0082 ## $t9 = 00000082 -/* 00550 80AE5220 11E00004 */ beq $t7, $zero, .L80AE5234 -/* 00554 80AE5224 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00558 80AE5228 2718538C */ addiu $t8, $t8, %lo(func_80AE538C) ## $t8 = 80AE538C -/* 0055C 80AE522C 1000000B */ beq $zero, $zero, .L80AE525C -/* 00560 80AE5230 AE18026C */ sw $t8, 0x026C($s0) ## 0000026C -.L80AE5234: -/* 00564 80AE5234 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 -/* 00568 80AE5238 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0056C 80AE523C A6190272 */ sh $t9, 0x0272($s0) ## 00000272 -/* 00570 80AE5240 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00574 80AE5244 44819000 */ mtc1 $at, $f18 ## $f18 = 6.00 -/* 00578 80AE5248 3C0880AE */ lui $t0, %hi(func_80AE5270) ## $t0 = 80AE0000 -/* 0057C 80AE524C 25085270 */ addiu $t0, $t0, %lo(func_80AE5270) ## $t0 = 80AE5270 -/* 00580 80AE5250 46120200 */ add.s $f8, $f0, $f18 -/* 00584 80AE5254 AE08026C */ sw $t0, 0x026C($s0) ## 0000026C -/* 00588 80AE5258 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -.L80AE525C: -/* 0058C 80AE525C 8FBF0034 */ lw $ra, 0x0034($sp) -.L80AE5260: -/* 00590 80AE5260 8FB00030 */ lw $s0, 0x0030($sp) -/* 00594 80AE5264 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00598 80AE5268 03E00008 */ jr $ra -/* 0059C 80AE526C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5270.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5270.s deleted file mode 100644 index 43eaae444f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5270.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel func_80AE5270 -/* 005A0 80AE5270 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 005A4 80AE5274 AFB00018 */ sw $s0, 0x0018($sp) -/* 005A8 80AE5278 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005AC 80AE527C AFBF001C */ sw $ra, 0x001C($sp) -/* 005B0 80AE5280 AFA50024 */ sw $a1, 0x0024($sp) -/* 005B4 80AE5284 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 005B8 80AE5288 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005BC 80AE528C 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 005C0 80AE5290 44810000 */ mtc1 $at, $f0 ## $f0 = 12.00 -/* 005C4 80AE5294 C60400C4 */ lwc1 $f4, 0x00C4($s0) ## 000000C4 -/* 005C8 80AE5298 260400C4 */ addiu $a0, $s0, 0x00C4 ## $a0 = 000000C4 -/* 005CC 80AE529C 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 005D0 80AE52A0 4600203C */ c.lt.s $f4, $f0 -/* 005D4 80AE52A4 00000000 */ nop -/* 005D8 80AE52A8 45020005 */ bc1fl .L80AE52C0 -/* 005DC 80AE52AC 8FA40024 */ lw $a0, 0x0024($sp) -/* 005E0 80AE52B0 44050000 */ mfc1 $a1, $f0 -/* 005E4 80AE52B4 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 005E8 80AE52B8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 005EC 80AE52BC 8FA40024 */ lw $a0, 0x0024($sp) -.L80AE52C0: -/* 005F0 80AE52C0 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 005F4 80AE52C4 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 005F8 80AE52C8 0C010753 */ jal func_80041D4C -/* 005FC 80AE52CC 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 00600 80AE52D0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00604 80AE52D4 10410008 */ beq $v0, $at, .L80AE52F8 -/* 00608 80AE52D8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0060C 80AE52DC 10410006 */ beq $v0, $at, .L80AE52F8 -/* 00610 80AE52E0 3C0E80AE */ lui $t6, %hi(func_80AE5688) ## $t6 = 80AE0000 -/* 00614 80AE52E4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00618 80AE52E8 25CE5688 */ addiu $t6, $t6, %lo(func_80AE5688) ## $t6 = 80AE5688 -/* 0061C 80AE52EC AE0E026C */ sw $t6, 0x026C($s0) ## 0000026C -/* 00620 80AE52F0 10000021 */ beq $zero, $zero, .L80AE5378 -/* 00624 80AE52F4 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -.L80AE52F8: -/* 00628 80AE52F8 860F0272 */ lh $t7, 0x0272($s0) ## 00000272 -/* 0062C 80AE52FC 3C0880AE */ lui $t0, %hi(func_80AE5688) ## $t0 = 80AE0000 -/* 00630 80AE5300 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00634 80AE5304 11E00012 */ beq $t7, $zero, .L80AE5350 -/* 00638 80AE5308 25085688 */ addiu $t0, $t0, %lo(func_80AE5688) ## $t0 = 80AE5688 -/* 0063C 80AE530C C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 00640 80AE5310 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 00644 80AE5314 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00648 80AE5318 4608003C */ c.lt.s $f0, $f8 -/* 0064C 80AE531C 00000000 */ nop -/* 00650 80AE5320 4501000B */ bc1t .L80AE5350 -/* 00654 80AE5324 00000000 */ nop -/* 00658 80AE5328 44815000 */ mtc1 $at, $f10 ## $f10 = 400.00 -/* 0065C 80AE532C 00000000 */ nop -/* 00660 80AE5330 4600503C */ c.lt.s $f10, $f0 -/* 00664 80AE5334 00000000 */ nop -/* 00668 80AE5338 45010005 */ bc1t .L80AE5350 -/* 0066C 80AE533C 00000000 */ nop -/* 00670 80AE5340 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 00674 80AE5344 33190008 */ andi $t9, $t8, 0x0008 ## $t9 = 00000000 -/* 00678 80AE5348 53200004 */ beql $t9, $zero, .L80AE535C -/* 0067C 80AE534C 86090274 */ lh $t1, 0x0274($s0) ## 00000274 -.L80AE5350: -/* 00680 80AE5350 10000009 */ beq $zero, $zero, .L80AE5378 -/* 00684 80AE5354 AE08026C */ sw $t0, 0x026C($s0) ## 0000026C -/* 00688 80AE5358 86090274 */ lh $t1, 0x0274($s0) ## 00000274 -.L80AE535C: -/* 0068C 80AE535C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00690 80AE5360 55200006 */ bnel $t1, $zero, .L80AE537C -/* 00694 80AE5364 8FBF001C */ lw $ra, 0x001C($sp) -/* 00698 80AE5368 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0069C 80AE536C 2405398A */ addiu $a1, $zero, 0x398A ## $a1 = 0000398A -/* 006A0 80AE5370 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 006A4 80AE5374 A60A0274 */ sh $t2, 0x0274($s0) ## 00000274 -.L80AE5378: -/* 006A8 80AE5378 8FBF001C */ lw $ra, 0x001C($sp) -.L80AE537C: -/* 006AC 80AE537C 8FB00018 */ lw $s0, 0x0018($sp) -/* 006B0 80AE5380 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 006B4 80AE5384 03E00008 */ jr $ra -/* 006B8 80AE5388 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE538C.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE538C.s deleted file mode 100644 index 9e4558b151..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE538C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AE538C -/* 006BC 80AE538C AFA50004 */ sw $a1, 0x0004($sp) -/* 006C0 80AE5390 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 006C4 80AE5394 3C1880AE */ lui $t8, %hi(func_80AE53AC) ## $t8 = 80AE0000 -/* 006C8 80AE5398 271853AC */ addiu $t8, $t8, %lo(func_80AE53AC) ## $t8 = 80AE53AC -/* 006CC 80AE539C 35CF0005 */ ori $t7, $t6, 0x0005 ## $t7 = 00000005 -/* 006D0 80AE53A0 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 006D4 80AE53A4 03E00008 */ jr $ra -/* 006D8 80AE53A8 AC98026C */ sw $t8, 0x026C($a0) ## 0000026C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE53AC.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE53AC.s deleted file mode 100644 index 13073e5838..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE53AC.s +++ /dev/null @@ -1,178 +0,0 @@ -.late_rodata -glabel D_80AE669C - .word 0x3FE66666 - -.text -glabel func_80AE53AC -/* 006DC 80AE53AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 006E0 80AE53B0 AFB00018 */ sw $s0, 0x0018($sp) -/* 006E4 80AE53B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006E8 80AE53B8 AFBF001C */ sw $ra, 0x001C($sp) -/* 006EC 80AE53BC AFA50024 */ sw $a1, 0x0024($sp) -/* 006F0 80AE53C0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 006F4 80AE53C4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006F8 80AE53C8 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 006FC 80AE53CC 44810000 */ mtc1 $at, $f0 ## $f0 = 12.00 -/* 00700 80AE53D0 C60400C4 */ lwc1 $f4, 0x00C4($s0) ## 000000C4 -/* 00704 80AE53D4 260400C4 */ addiu $a0, $s0, 0x00C4 ## $a0 = 000000C4 -/* 00708 80AE53D8 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 0070C 80AE53DC 4600203C */ c.lt.s $f4, $f0 -/* 00710 80AE53E0 00000000 */ nop -/* 00714 80AE53E4 45020005 */ bc1fl .L80AE53FC -/* 00718 80AE53E8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0071C 80AE53EC 44050000 */ mfc1 $a1, $f0 -/* 00720 80AE53F0 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00724 80AE53F4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00728 80AE53F8 8FA40024 */ lw $a0, 0x0024($sp) -.L80AE53FC: -/* 0072C 80AE53FC 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 00730 80AE5400 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 00734 80AE5404 0C010753 */ jal func_80041D4C -/* 00738 80AE5408 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 0073C 80AE540C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00740 80AE5410 10410002 */ beq $v0, $at, .L80AE541C -/* 00744 80AE5414 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00748 80AE5418 1441000B */ bne $v0, $at, .L80AE5448 -.L80AE541C: -/* 0074C 80AE541C 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00750 80AE5420 44813000 */ mtc1 $at, $f6 ## $f6 = 400.00 -/* 00754 80AE5424 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 00758 80AE5428 4600303C */ c.lt.s $f6, $f0 -/* 0075C 80AE542C 00000000 */ nop -/* 00760 80AE5430 45010005 */ bc1t .L80AE5448 -/* 00764 80AE5434 00000000 */ nop -/* 00768 80AE5438 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 0076C 80AE543C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 00770 80AE5440 31CF0008 */ andi $t7, $t6, 0x0008 ## $t7 = 00000000 -/* 00774 80AE5444 11E00004 */ beq $t7, $zero, .L80AE5458 -.L80AE5448: -/* 00778 80AE5448 3C1880AE */ lui $t8, %hi(func_80AE5688) ## $t8 = 80AE0000 -/* 0077C 80AE544C 27185688 */ addiu $t8, $t8, %lo(func_80AE5688) ## $t8 = 80AE5688 -/* 00780 80AE5450 1000006D */ beq $zero, $zero, .L80AE5608 -/* 00784 80AE5454 AE18026C */ sw $t8, 0x026C($s0) ## 0000026C -.L80AE5458: -/* 00788 80AE5458 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 -/* 0078C 80AE545C 00000000 */ nop -/* 00790 80AE5460 4608003C */ c.lt.s $f0, $f8 -/* 00794 80AE5464 00000000 */ nop -/* 00798 80AE5468 45000006 */ bc1f .L80AE5484 -/* 0079C 80AE546C 00000000 */ nop -/* 007A0 80AE5470 86190270 */ lh $t9, 0x0270($s0) ## 00000270 -/* 007A4 80AE5474 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 007A8 80AE5478 17200002 */ bne $t9, $zero, .L80AE5484 -/* 007AC 80AE547C 00000000 */ nop -/* 007B0 80AE5480 A6080270 */ sh $t0, 0x0270($s0) ## 00000270 -.L80AE5484: -/* 007B4 80AE5484 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 007B8 80AE5488 00000000 */ nop -/* 007BC 80AE548C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 007C0 80AE5490 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 007C4 80AE5494 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 007C8 80AE5498 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 007CC 80AE549C C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 -/* 007D0 80AE54A0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 007D4 80AE54A4 46040182 */ mul.s $f6, $f0, $f4 -/* 007D8 80AE54A8 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 -/* 007DC 80AE54AC 46105481 */ sub.s $f18, $f10, $f16 -/* 007E0 80AE54B0 3C0180AE */ lui $at, %hi(D_80AE669C) ## $at = 80AE0000 -/* 007E4 80AE54B4 C424669C */ lwc1 $f4, %lo(D_80AE669C)($at) -/* 007E8 80AE54B8 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 -/* 007EC 80AE54BC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 007F0 80AE54C0 46083280 */ add.s $f10, $f6, $f8 -/* 007F4 80AE54C4 2405398A */ addiu $a1, $zero, 0x398A ## $a1 = 0000398A -/* 007F8 80AE54C8 460A9083 */ div.s $f2, $f18, $f10 -/* 007FC 80AE54CC 44819000 */ mtc1 $at, $f18 ## $f18 = 3.00 -/* 00800 80AE54D0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00804 80AE54D4 46041182 */ mul.s $f6, $f2, $f4 -/* 00808 80AE54D8 46068200 */ add.s $f8, $f16, $f6 -/* 0080C 80AE54DC E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 00810 80AE54E0 C60C0068 */ lwc1 $f12, 0x0068($s0) ## 00000068 -/* 00814 80AE54E4 460C903E */ c.le.s $f18, $f12 -/* 00818 80AE54E8 00000000 */ nop -/* 0081C 80AE54EC 45020006 */ bc1fl .L80AE5508 -/* 00820 80AE54F0 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 00824 80AE54F4 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 -/* 00828 80AE54F8 00000000 */ nop -/* 0082C 80AE54FC E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 00830 80AE5500 C60C0068 */ lwc1 $f12, 0x0068($s0) ## 00000068 -/* 00834 80AE5504 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -.L80AE5508: -/* 00838 80AE5508 44810000 */ mtc1 $at, $f0 ## $f0 = -3.00 -/* 0083C 80AE550C 00000000 */ nop -/* 00840 80AE5510 4600603C */ c.lt.s $f12, $f0 -/* 00844 80AE5514 00000000 */ nop -/* 00848 80AE5518 45020003 */ bc1fl .L80AE5528 -/* 0084C 80AE551C 86090270 */ lh $t1, 0x0270($s0) ## 00000270 -/* 00850 80AE5520 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 00854 80AE5524 86090270 */ lh $t1, 0x0270($s0) ## 00000270 -.L80AE5528: -/* 00858 80AE5528 55200004 */ bnel $t1, $zero, .L80AE553C -/* 0085C 80AE552C 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -/* 00860 80AE5530 10000005 */ beq $zero, $zero, .L80AE5548 -/* 00864 80AE5534 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -/* 00868 80AE5538 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -.L80AE553C: -/* 0086C 80AE553C 00021023 */ subu $v0, $zero, $v0 -/* 00870 80AE5540 00021400 */ sll $v0, $v0, 16 -/* 00874 80AE5544 00021403 */ sra $v0, $v0, 16 -.L80AE5548: -/* 00878 80AE5548 86030032 */ lh $v1, 0x0032($s0) ## 00000032 -/* 0087C 80AE554C 00431023 */ subu $v0, $v0, $v1 -/* 00880 80AE5550 00021400 */ sll $v0, $v0, 16 -/* 00884 80AE5554 00021403 */ sra $v0, $v0, 16 -/* 00888 80AE5558 58400010 */ blezl $v0, .L80AE559C -/* 0088C 80AE555C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 00890 80AE5560 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00894 80AE5564 3C0141F8 */ lui $at, 0x41F8 ## $at = 41F80000 -/* 00898 80AE5568 44813000 */ mtc1 $at, $f6 ## $f6 = 31.00 -/* 0089C 80AE556C 46802420 */ cvt.s.w $f16, $f4 -/* 008A0 80AE5570 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 008A4 80AE5574 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 008A8 80AE5578 46068203 */ div.s $f8, $f16, $f6 -/* 008AC 80AE557C 46124280 */ add.s $f10, $f8, $f18 -/* 008B0 80AE5580 4600510D */ trunc.w.s $f4, $f10 -/* 008B4 80AE5584 44042000 */ mfc1 $a0, $f4 -/* 008B8 80AE5588 00000000 */ nop -/* 008BC 80AE558C 00042400 */ sll $a0, $a0, 16 -/* 008C0 80AE5590 1000000E */ beq $zero, $zero, .L80AE55CC -/* 008C4 80AE5594 00042403 */ sra $a0, $a0, 16 -/* 008C8 80AE5598 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -.L80AE559C: -/* 008CC 80AE559C 3C0141F8 */ lui $at, 0x41F8 ## $at = 41F80000 -/* 008D0 80AE55A0 44814000 */ mtc1 $at, $f8 ## $f8 = 31.00 -/* 008D4 80AE55A4 468081A0 */ cvt.s.w $f6, $f16 -/* 008D8 80AE55A8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 008DC 80AE55AC 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 008E0 80AE55B0 46083483 */ div.s $f18, $f6, $f8 -/* 008E4 80AE55B4 460A9101 */ sub.s $f4, $f18, $f10 -/* 008E8 80AE55B8 4600240D */ trunc.w.s $f16, $f4 -/* 008EC 80AE55BC 44048000 */ mfc1 $a0, $f16 -/* 008F0 80AE55C0 00000000 */ nop -/* 008F4 80AE55C4 00042400 */ sll $a0, $a0, 16 -/* 008F8 80AE55C8 00042403 */ sra $a0, $a0, 16 -.L80AE55CC: -/* 008FC 80AE55CC 44843000 */ mtc1 $a0, $f6 ## $f6 = 0.00 -/* 00900 80AE55D0 44834000 */ mtc1 $v1, $f8 ## $f8 = 0.00 -/* 00904 80AE55D4 860E0274 */ lh $t6, 0x0274($s0) ## 00000274 -/* 00908 80AE55D8 46803020 */ cvt.s.w $f0, $f6 -/* 0090C 80AE55DC 468044A0 */ cvt.s.w $f18, $f8 -/* 00910 80AE55E0 46000280 */ add.s $f10, $f0, $f0 -/* 00914 80AE55E4 460A9100 */ add.s $f4, $f18, $f10 -/* 00918 80AE55E8 4600240D */ trunc.w.s $f16, $f4 -/* 0091C 80AE55EC 440D8000 */ mfc1 $t5, $f16 -/* 00920 80AE55F0 15C00005 */ bne $t6, $zero, .L80AE5608 -/* 00924 80AE55F4 A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 -/* 00928 80AE55F8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0092C 80AE55FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00930 80AE5600 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 00934 80AE5604 A60F0274 */ sh $t7, 0x0274($s0) ## 00000274 -.L80AE5608: -/* 00938 80AE5608 8FBF001C */ lw $ra, 0x001C($sp) -/* 0093C 80AE560C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00940 80AE5610 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00944 80AE5614 03E00008 */ jr $ra -/* 00948 80AE5618 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE561C.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE561C.s deleted file mode 100644 index fa2daf1853..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE561C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AE561C -/* 0094C 80AE561C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00950 80AE5620 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00954 80AE5624 AFA5001C */ sw $a1, 0x001C($sp) -/* 00958 80AE5628 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0095C 80AE562C 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 00960 80AE5630 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 00964 80AE5634 AFA70018 */ sw $a3, 0x0018($sp) -/* 00968 80AE5638 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 0096C 80AE563C 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00970 80AE5640 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00974 80AE5644 8FA70018 */ lw $a3, 0x0018($sp) -/* 00978 80AE5648 84EE0272 */ lh $t6, 0x0272($a3) ## 00000272 -/* 0097C 80AE564C 55C0000B */ bnel $t6, $zero, .L80AE567C -/* 00980 80AE5650 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00984 80AE5654 84EF027A */ lh $t7, 0x027A($a3) ## 0000027A -/* 00988 80AE5658 3C1980AE */ lui $t9, %hi(func_80AE5688) ## $t9 = 80AE0000 -/* 0098C 80AE565C 3C1880AE */ lui $t8, %hi(func_80AE538C) ## $t8 = 80AE0000 -/* 00990 80AE5660 11E00004 */ beq $t7, $zero, .L80AE5674 -/* 00994 80AE5664 27395688 */ addiu $t9, $t9, %lo(func_80AE5688) ## $t9 = 80AE5688 -/* 00998 80AE5668 2718538C */ addiu $t8, $t8, %lo(func_80AE538C) ## $t8 = 80AE538C -/* 0099C 80AE566C 10000002 */ beq $zero, $zero, .L80AE5678 -/* 009A0 80AE5670 ACF8026C */ sw $t8, 0x026C($a3) ## 0000026C -.L80AE5674: -/* 009A4 80AE5674 ACF9026C */ sw $t9, 0x026C($a3) ## 0000026C -.L80AE5678: -/* 009A8 80AE5678 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE567C: -/* 009AC 80AE567C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009B0 80AE5680 03E00008 */ jr $ra -/* 009B4 80AE5684 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5688.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5688.s deleted file mode 100644 index c452e579e8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5688.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AE5688 -/* 009B8 80AE5688 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009BC 80AE568C AFBF0014 */ sw $ra, 0x0014($sp) -/* 009C0 80AE5690 AFA5001C */ sw $a1, 0x001C($sp) -/* 009C4 80AE5694 A480027E */ sh $zero, 0x027E($a0) ## 0000027E -/* 009C8 80AE5698 AFA40018 */ sw $a0, 0x0018($sp) -/* 009CC 80AE569C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 009D0 80AE56A0 24053987 */ addiu $a1, $zero, 0x3987 ## $a1 = 00003987 -/* 009D4 80AE56A4 8FA40018 */ lw $a0, 0x0018($sp) -/* 009D8 80AE56A8 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 009DC 80AE56AC 3C0880AE */ lui $t0, %hi(func_80AE56E0) ## $t0 = 80AE0000 -/* 009E0 80AE56B0 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 009E4 80AE56B4 250856E0 */ addiu $t0, $t0, %lo(func_80AE56E0) ## $t0 = 80AE56E0 -/* 009E8 80AE56B8 AC88026C */ sw $t0, 0x026C($a0) ## 0000026C -/* 009EC 80AE56BC 01C17825 */ or $t7, $t6, $at ## $t7 = 08000000 -/* 009F0 80AE56C0 2401FFFA */ addiu $at, $zero, 0xFFFA ## $at = FFFFFFFA -/* 009F4 80AE56C4 01E1C824 */ and $t9, $t7, $at -/* 009F8 80AE56C8 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 009FC 80AE56CC AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 00A00 80AE56D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A04 80AE56D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A08 80AE56D8 03E00008 */ jr $ra -/* 00A0C 80AE56DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE56E0.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE56E0.s deleted file mode 100644 index a75b7c994a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE56E0.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_80AE56E0 -/* 00A10 80AE56E0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00A14 80AE56E4 AFB00030 */ sw $s0, 0x0030($sp) -/* 00A18 80AE56E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A1C 80AE56EC AFBF0034 */ sw $ra, 0x0034($sp) -/* 00A20 80AE56F0 AFA5003C */ sw $a1, 0x003C($sp) -/* 00A24 80AE56F4 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 00A28 80AE56F8 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 00A2C 80AE56FC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00A30 80AE5700 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00A34 80AE5704 248400C4 */ addiu $a0, $a0, 0x00C4 ## $a0 = 000000C4 -/* 00A38 80AE5708 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 00A3C 80AE570C 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 00A40 80AE5710 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 00A44 80AE5714 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 00A48 80AE5718 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00A4C 80AE571C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00A50 80AE5720 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00A54 80AE5724 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00A58 80AE5728 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00A5C 80AE572C 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 00A60 80AE5730 C6000284 */ lwc1 $f0, 0x0284($s0) ## 00000284 -/* 00A64 80AE5734 C60400BC */ lwc1 $f4, 0x00BC($s0) ## 000000BC -/* 00A68 80AE5738 8FA4003C */ lw $a0, 0x003C($sp) -/* 00A6C 80AE573C 46060200 */ add.s $f8, $f0, $f6 -/* 00A70 80AE5740 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 00A74 80AE5744 01C47021 */ addu $t6, $t6, $a0 -/* 00A78 80AE5748 4604403E */ c.le.s $f8, $f4 -/* 00A7C 80AE574C 00000000 */ nop -/* 00A80 80AE5750 45000020 */ bc1f .L80AE57D4 -/* 00A84 80AE5754 00000000 */ nop -/* 00A88 80AE5758 8DCE1DE4 */ lw $t6, 0x1DE4($t6) ## 00011DE4 -/* 00A8C 80AE575C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00A90 80AE5760 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 00A94 80AE5764 31CF0003 */ andi $t7, $t6, 0x0003 ## $t7 = 00000000 -/* 00A98 80AE5768 15E0000E */ bne $t7, $zero, .L80AE57A4 -/* 00A9C 80AE576C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00AA0 80AE5770 8E0700C4 */ lw $a3, 0x00C4($s0) ## 000000C4 -/* 00AA4 80AE5774 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00AA8 80AE5778 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 00AAC 80AE577C 241901F4 */ addiu $t9, $zero, 0x01F4 ## $t9 = 000001F4 -/* 00AB0 80AE5780 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 00AB4 80AE5784 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00AB8 80AE5788 AFA90020 */ sw $t1, 0x0020($sp) -/* 00ABC 80AE578C AFA8001C */ sw $t0, 0x001C($sp) -/* 00AC0 80AE5790 AFB90018 */ sw $t9, 0x0018($sp) -/* 00AC4 80AE5794 AFB80010 */ sw $t8, 0x0010($sp) -/* 00AC8 80AE5798 0C00CC98 */ jal func_80033260 -/* 00ACC 80AE579C E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 00AD0 80AE57A0 C6000284 */ lwc1 $f0, 0x0284($s0) ## 00000284 -.L80AE57A4: -/* 00AD4 80AE57A4 44050000 */ mfc1 $a1, $f0 -/* 00AD8 80AE57A8 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 00ADC 80AE57AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00AE0 80AE57B0 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00AE4 80AE57B4 8E070288 */ lw $a3, 0x0288($s0) ## 00000288 -/* 00AE8 80AE57B8 26040288 */ addiu $a0, $s0, 0x0288 ## $a0 = 00000288 -/* 00AEC 80AE57BC 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 -/* 00AF0 80AE57C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00AF4 80AE57C4 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00AF8 80AE57C8 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 00AFC 80AE57CC 10000004 */ beq $zero, $zero, .L80AE57E0 -/* 00B00 80AE57D0 8FBF0034 */ lw $ra, 0x0034($sp) -.L80AE57D4: -/* 00B04 80AE57D4 0C00B55C */ jal Actor_Kill - -/* 00B08 80AE57D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B0C 80AE57DC 8FBF0034 */ lw $ra, 0x0034($sp) -.L80AE57E0: -/* 00B10 80AE57E0 8FB00030 */ lw $s0, 0x0030($sp) -/* 00B14 80AE57E4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00B18 80AE57E8 03E00008 */ jr $ra -/* 00B1C 80AE57EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE57F0.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE57F0.s deleted file mode 100644 index 338b6d9d67..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE57F0.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AE57F0 -/* 00B20 80AE57F0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B24 80AE57F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B28 80AE57F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 00B2C 80AE57FC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 00B30 80AE5800 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 00B34 80AE5804 848F008A */ lh $t7, 0x008A($a0) ## 0000008A -/* 00B38 80AE5808 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 00B3C 80AE580C A48E0276 */ sh $t6, 0x0276($a0) ## 00000276 -/* 00B40 80AE5810 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 00B44 80AE5814 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00B48 80AE5818 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 00B4C 80AE581C AFA40020 */ sw $a0, 0x0020($sp) -/* 00B50 80AE5820 AFB80010 */ sw $t8, 0x0010($sp) -/* 00B54 80AE5824 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00B58 80AE5828 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00B5C 80AE582C 0C00D09B */ jal func_8003426C -/* 00B60 80AE5830 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00B64 80AE5834 8FA40020 */ lw $a0, 0x0020($sp) -/* 00B68 80AE5838 3C1980AE */ lui $t9, %hi(func_80AE5854) ## $t9 = 80AE0000 -/* 00B6C 80AE583C 27395854 */ addiu $t9, $t9, %lo(func_80AE5854) ## $t9 = 80AE5854 -/* 00B70 80AE5840 AC99026C */ sw $t9, 0x026C($a0) ## 0000026C -/* 00B74 80AE5844 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B78 80AE5848 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00B7C 80AE584C 03E00008 */ jr $ra -/* 00B80 80AE5850 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5854.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5854.s deleted file mode 100644 index d24b70fa88..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5854.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80AE5854 -/* 00B84 80AE5854 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B88 80AE5858 AFA5001C */ sw $a1, 0x001C($sp) -/* 00B8C 80AE585C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00B90 80AE5860 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B94 80AE5864 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B98 80AE5868 AFA50018 */ sw $a1, 0x0018($sp) -/* 00B9C 80AE586C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00BA0 80AE5870 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00BA4 80AE5874 8FA50018 */ lw $a1, 0x0018($sp) -/* 00BA8 80AE5878 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00BAC 80AE587C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00BB0 80AE5880 C4A00068 */ lwc1 $f0, 0x0068($a1) ## 00000068 -/* 00BB4 80AE5884 4604003C */ c.lt.s $f0, $f4 -/* 00BB8 80AE5888 00000000 */ nop -/* 00BBC 80AE588C 45020006 */ bc1fl .L80AE58A8 -/* 00BC0 80AE5890 84AE0276 */ lh $t6, 0x0276($a1) ## 00000276 -/* 00BC4 80AE5894 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00BC8 80AE5898 00000000 */ nop -/* 00BCC 80AE589C 46060200 */ add.s $f8, $f0, $f6 -/* 00BD0 80AE58A0 E4A80068 */ swc1 $f8, 0x0068($a1) ## 00000068 -/* 00BD4 80AE58A4 84AE0276 */ lh $t6, 0x0276($a1) ## 00000276 -.L80AE58A8: -/* 00BD8 80AE58A8 55C0000D */ bnel $t6, $zero, .L80AE58E0 -/* 00BDC 80AE58AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BE0 80AE58B0 84AF027A */ lh $t7, 0x027A($a1) ## 0000027A -/* 00BE4 80AE58B4 3C0880AE */ lui $t0, %hi(func_80AE5688) ## $t0 = 80AE0000 -/* 00BE8 80AE58B8 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 00BEC 80AE58BC 11E00006 */ beq $t7, $zero, .L80AE58D8 -/* 00BF0 80AE58C0 25085688 */ addiu $t0, $t0, %lo(func_80AE5688) ## $t0 = 80AE5688 -/* 00BF4 80AE58C4 3C1980AE */ lui $t9, %hi(func_80AE538C) ## $t9 = 80AE0000 -/* 00BF8 80AE58C8 2739538C */ addiu $t9, $t9, %lo(func_80AE538C) ## $t9 = 80AE538C -/* 00BFC 80AE58CC A4B80270 */ sh $t8, 0x0270($a1) ## 00000270 -/* 00C00 80AE58D0 10000002 */ beq $zero, $zero, .L80AE58DC -/* 00C04 80AE58D4 ACB9026C */ sw $t9, 0x026C($a1) ## 0000026C -.L80AE58D8: -/* 00C08 80AE58D8 ACA8026C */ sw $t0, 0x026C($a1) ## 0000026C -.L80AE58DC: -/* 00C0C 80AE58DC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE58E0: -/* 00C10 80AE58E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C14 80AE58E4 03E00008 */ jr $ra -/* 00C18 80AE58E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE58EC.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE58EC.s deleted file mode 100644 index 6d60dd2f6f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE58EC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AE58EC -/* 00C1C 80AE58EC AFA50004 */ sw $a1, 0x0004($sp) -/* 00C20 80AE58F0 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 00C24 80AE58F4 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 00C28 80AE58F8 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 00C2C 80AE58FC 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 00C30 80AE5900 0301C825 */ or $t9, $t8, $at ## $t9 = 08000000 -/* 00C34 80AE5904 848F008A */ lh $t7, 0x008A($a0) ## 0000008A -/* 00C38 80AE5908 2401FFFA */ addiu $at, $zero, 0xFFFA ## $at = FFFFFFFA -/* 00C3C 80AE590C 3C0A80AE */ lui $t2, %hi(func_80AE5938) ## $t2 = 80AE0000 -/* 00C40 80AE5910 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 00C44 80AE5914 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 00C48 80AE5918 03214824 */ and $t1, $t9, $at -/* 00C4C 80AE591C 254A5938 */ addiu $t2, $t2, %lo(func_80AE5938) ## $t2 = 80AE5938 -/* 00C50 80AE5920 A48E0278 */ sh $t6, 0x0278($a0) ## 00000278 -/* 00C54 80AE5924 AC890004 */ sw $t1, 0x0004($a0) ## 00000004 -/* 00C58 80AE5928 AC8A026C */ sw $t2, 0x026C($a0) ## 0000026C -/* 00C5C 80AE592C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00C60 80AE5930 03E00008 */ jr $ra -/* 00C64 80AE5934 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s deleted file mode 100644 index b26891597d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_80AE5938 -/* 00C68 80AE5938 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00C6C 80AE593C AFBF003C */ sw $ra, 0x003C($sp) -/* 00C70 80AE5940 AFB00038 */ sw $s0, 0x0038($sp) -/* 00C74 80AE5944 AFA5005C */ sw $a1, 0x005C($sp) -/* 00C78 80AE5948 848E0278 */ lh $t6, 0x0278($a0) ## 00000278 -/* 00C7C 80AE594C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C80 80AE5950 51C0000E */ beql $t6, $zero, .L80AE598C -/* 00C84 80AE5954 8602027E */ lh $v0, 0x027E($s0) ## 0000027E -/* 00C88 80AE5958 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 00C8C 80AE595C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00C90 80AE5960 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00C94 80AE5964 4604003C */ c.lt.s $f0, $f4 -/* 00C98 80AE5968 00000000 */ nop -/* 00C9C 80AE596C 45020047 */ bc1fl .L80AE5A8C -/* 00CA0 80AE5970 8FBF003C */ lw $ra, 0x003C($sp) -/* 00CA4 80AE5974 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00CA8 80AE5978 00000000 */ nop -/* 00CAC 80AE597C 46060200 */ add.s $f8, $f0, $f6 -/* 00CB0 80AE5980 10000041 */ beq $zero, $zero, .L80AE5A88 -/* 00CB4 80AE5984 E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 -/* 00CB8 80AE5988 8602027E */ lh $v0, 0x027E($s0) ## 0000027E -.L80AE598C: -/* 00CBC 80AE598C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00CC0 80AE5990 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00CC4 80AE5994 10410005 */ beq $v0, $at, .L80AE59AC -/* 00CC8 80AE5998 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 00CCC 80AE599C 920F00AF */ lbu $t7, 0x00AF($s0) ## 000000AF -/* 00CD0 80AE59A0 3C1880AE */ lui $t8, %hi(func_80AE5A9C) ## $t8 = 80AE0000 -/* 00CD4 80AE59A4 27185A9C */ addiu $t8, $t8, %lo(func_80AE5A9C) ## $t8 = 80AE5A9C -/* 00CD8 80AE59A8 11E00034 */ beq $t7, $zero, .L80AE5A7C -.L80AE59AC: -/* 00CDC 80AE59AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00CE0 80AE59B0 1441002C */ bne $v0, $at, .L80AE5A64 -/* 00CE4 80AE59B4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00CE8 80AE59B8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00CEC 80AE59BC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00CF0 80AE59C0 00000000 */ nop -/* 00CF4 80AE59C4 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 00CF8 80AE59C8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00CFC 80AE59CC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00D00 80AE59D0 46100480 */ add.s $f18, $f0, $f16 -/* 00D04 80AE59D4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00D08 80AE59D8 E7B2004C */ swc1 $f18, 0x004C($sp) -/* 00D0C 80AE59DC C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00D10 80AE59E0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00D14 80AE59E4 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00D18 80AE59E8 46040180 */ add.s $f6, $f0, $f4 -/* 00D1C 80AE59EC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00D20 80AE59F0 E7A60050 */ swc1 $f6, 0x0050($sp) -/* 00D24 80AE59F4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00D28 80AE59F8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00D2C 80AE59FC 44811000 */ mtc1 $at, $f2 ## $f2 = 3.00 -/* 00D30 80AE5A00 46080280 */ add.s $f10, $f0, $f8 -/* 00D34 80AE5A04 8FA4005C */ lw $a0, 0x005C($sp) -/* 00D38 80AE5A08 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00D3C 80AE5A0C 27A6004C */ addiu $a2, $sp, 0x004C ## $a2 = FFFFFFF4 -/* 00D40 80AE5A10 E7AA0054 */ swc1 $f10, 0x0054($sp) -/* 00D44 80AE5A14 8618027A */ lh $t8, 0x027A($s0) ## 0000027A -/* 00D48 80AE5A18 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 00D4C 80AE5A1C 24190096 */ addiu $t9, $zero, 0x0096 ## $t9 = 00000096 -/* 00D50 80AE5A20 13000004 */ beq $t8, $zero, .L80AE5A34 -/* 00D54 80AE5A24 24080096 */ addiu $t0, $zero, 0x0096 ## $t0 = 00000096 -/* 00D58 80AE5A28 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00D5C 80AE5A2C 44811000 */ mtc1 $at, $f2 ## $f2 = 6.00 -/* 00D60 80AE5A30 00000000 */ nop -.L80AE5A34: -/* 00D64 80AE5A34 240900FA */ addiu $t1, $zero, 0x00FA ## $t1 = 000000FA -/* 00D68 80AE5A38 240A00EB */ addiu $t2, $zero, 0x00EB ## $t2 = 000000EB -/* 00D6C 80AE5A3C 240B00F5 */ addiu $t3, $zero, 0x00F5 ## $t3 = 000000F5 -/* 00D70 80AE5A40 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00D74 80AE5A44 AFAC0024 */ sw $t4, 0x0024($sp) -/* 00D78 80AE5A48 AFAB0020 */ sw $t3, 0x0020($sp) -/* 00D7C 80AE5A4C AFAA001C */ sw $t2, 0x001C($sp) -/* 00D80 80AE5A50 AFA90018 */ sw $t1, 0x0018($sp) -/* 00D84 80AE5A54 AFB90010 */ sw $t9, 0x0010($sp) -/* 00D88 80AE5A58 AFA80014 */ sw $t0, 0x0014($sp) -/* 00D8C 80AE5A5C 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f -/* 00D90 80AE5A60 E7A20028 */ swc1 $f2, 0x0028($sp) -.L80AE5A64: -/* 00D94 80AE5A64 3C0E80AE */ lui $t6, %hi(func_80AE5E48) ## $t6 = 80AE0000 -/* 00D98 80AE5A68 240D0042 */ addiu $t5, $zero, 0x0042 ## $t5 = 00000042 -/* 00D9C 80AE5A6C 25CE5E48 */ addiu $t6, $t6, %lo(func_80AE5E48) ## $t6 = 80AE5E48 -/* 00DA0 80AE5A70 A60D0278 */ sh $t5, 0x0278($s0) ## 00000278 -/* 00DA4 80AE5A74 10000004 */ beq $zero, $zero, .L80AE5A88 -/* 00DA8 80AE5A78 AE0E026C */ sw $t6, 0x026C($s0) ## 0000026C -.L80AE5A7C: -/* 00DAC 80AE5A7C 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 00DB0 80AE5A80 A60F0278 */ sh $t7, 0x0278($s0) ## 00000278 -/* 00DB4 80AE5A84 AE18026C */ sw $t8, 0x026C($s0) ## 0000026C -.L80AE5A88: -/* 00DB8 80AE5A88 8FBF003C */ lw $ra, 0x003C($sp) -.L80AE5A8C: -/* 00DBC 80AE5A8C 8FB00038 */ lw $s0, 0x0038($sp) -/* 00DC0 80AE5A90 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00DC4 80AE5A94 03E00008 */ jr $ra -/* 00DC8 80AE5A98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s deleted file mode 100644 index 7a4ff49b63..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_80AE5A9C -/* 00DCC 80AE5A9C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00DD0 80AE5AA0 AFBF003C */ sw $ra, 0x003C($sp) -/* 00DD4 80AE5AA4 AFB00038 */ sw $s0, 0x0038($sp) -/* 00DD8 80AE5AA8 AFA5005C */ sw $a1, 0x005C($sp) -/* 00DDC 80AE5AAC 84820278 */ lh $v0, 0x0278($a0) ## 00000278 -/* 00DE0 80AE5AB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DE4 80AE5AB4 24053989 */ addiu $a1, $zero, 0x3989 ## $a1 = 00003989 -/* 00DE8 80AE5AB8 10400035 */ beq $v0, $zero, .L80AE5B90 -/* 00DEC 80AE5ABC 00000000 */ nop -/* 00DF0 80AE5AC0 848E027E */ lh $t6, 0x027E($a0) ## 0000027E -/* 00DF4 80AE5AC4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00DF8 80AE5AC8 304F000F */ andi $t7, $v0, 0x000F ## $t7 = 00000000 -/* 00DFC 80AE5ACC 55C10039 */ bnel $t6, $at, .L80AE5BB4 -/* 00E00 80AE5AD0 8FBF003C */ lw $ra, 0x003C($sp) -/* 00E04 80AE5AD4 15E00036 */ bne $t7, $zero, .L80AE5BB0 -/* 00E08 80AE5AD8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00E0C 80AE5ADC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00E10 80AE5AE0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00E14 80AE5AE4 00000000 */ nop -/* 00E18 80AE5AE8 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00E1C 80AE5AEC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00E20 80AE5AF0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00E24 80AE5AF4 46040180 */ add.s $f6, $f0, $f4 -/* 00E28 80AE5AF8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00E2C 80AE5AFC E7A6004C */ swc1 $f6, 0x004C($sp) -/* 00E30 80AE5B00 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00E34 80AE5B04 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00E38 80AE5B08 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00E3C 80AE5B0C 46080280 */ add.s $f10, $f0, $f8 -/* 00E40 80AE5B10 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00E44 80AE5B14 E7AA0050 */ swc1 $f10, 0x0050($sp) -/* 00E48 80AE5B18 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00E4C 80AE5B1C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00E50 80AE5B20 44811000 */ mtc1 $at, $f2 ## $f2 = 3.00 -/* 00E54 80AE5B24 46100480 */ add.s $f18, $f0, $f16 -/* 00E58 80AE5B28 8FA4005C */ lw $a0, 0x005C($sp) -/* 00E5C 80AE5B2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E60 80AE5B30 27A6004C */ addiu $a2, $sp, 0x004C ## $a2 = FFFFFFF4 -/* 00E64 80AE5B34 E7B20054 */ swc1 $f18, 0x0054($sp) -/* 00E68 80AE5B38 8618027A */ lh $t8, 0x027A($s0) ## 0000027A -/* 00E6C 80AE5B3C 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 00E70 80AE5B40 24190096 */ addiu $t9, $zero, 0x0096 ## $t9 = 00000096 -/* 00E74 80AE5B44 13000004 */ beq $t8, $zero, .L80AE5B58 -/* 00E78 80AE5B48 24080096 */ addiu $t0, $zero, 0x0096 ## $t0 = 00000096 -/* 00E7C 80AE5B4C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00E80 80AE5B50 44811000 */ mtc1 $at, $f2 ## $f2 = 6.00 -/* 00E84 80AE5B54 00000000 */ nop -.L80AE5B58: -/* 00E88 80AE5B58 240900FA */ addiu $t1, $zero, 0x00FA ## $t1 = 000000FA -/* 00E8C 80AE5B5C 240A00EB */ addiu $t2, $zero, 0x00EB ## $t2 = 000000EB -/* 00E90 80AE5B60 240B00F5 */ addiu $t3, $zero, 0x00F5 ## $t3 = 000000F5 -/* 00E94 80AE5B64 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00E98 80AE5B68 AFAC0024 */ sw $t4, 0x0024($sp) -/* 00E9C 80AE5B6C AFAB0020 */ sw $t3, 0x0020($sp) -/* 00EA0 80AE5B70 AFAA001C */ sw $t2, 0x001C($sp) -/* 00EA4 80AE5B74 AFA90018 */ sw $t1, 0x0018($sp) -/* 00EA8 80AE5B78 AFB90010 */ sw $t9, 0x0010($sp) -/* 00EAC 80AE5B7C AFA80014 */ sw $t0, 0x0014($sp) -/* 00EB0 80AE5B80 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f -/* 00EB4 80AE5B84 E7A20028 */ swc1 $f2, 0x0028($sp) -/* 00EB8 80AE5B88 1000000A */ beq $zero, $zero, .L80AE5BB4 -/* 00EBC 80AE5B8C 8FBF003C */ lw $ra, 0x003C($sp) -.L80AE5B90: -/* 00EC0 80AE5B90 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00EC4 80AE5B94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EC8 80AE5B98 8FA4005C */ lw $a0, 0x005C($sp) -/* 00ECC 80AE5B9C 0C00CB1F */ jal func_80032C7C -/* 00ED0 80AE5BA0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00ED4 80AE5BA4 3C0D80AE */ lui $t5, %hi(func_80AE5C38) ## $t5 = 80AE0000 -/* 00ED8 80AE5BA8 25AD5C38 */ addiu $t5, $t5, %lo(func_80AE5C38) ## $t5 = 80AE5C38 -/* 00EDC 80AE5BAC AE0D026C */ sw $t5, 0x026C($s0) ## 0000026C -.L80AE5BB0: -/* 00EE0 80AE5BB0 8FBF003C */ lw $ra, 0x003C($sp) -.L80AE5BB4: -/* 00EE4 80AE5BB4 8FB00038 */ lw $s0, 0x0038($sp) -/* 00EE8 80AE5BB8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00EEC 80AE5BBC 03E00008 */ jr $ra -/* 00EF0 80AE5BC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5BC4.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5BC4.s deleted file mode 100644 index b22d5a0132..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5BC4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80AE5BC4 -/* 00EF4 80AE5BC4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00EF8 80AE5BC8 AFBF001C */ sw $ra, 0x001C($sp) -/* 00EFC 80AE5BCC AFA50024 */ sw $a1, 0x0024($sp) -/* 00F00 80AE5BD0 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 00F04 80AE5BD4 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 00F08 80AE5BD8 848E008A */ lh $t6, 0x008A($a0) ## 0000008A -/* 00F0C 80AE5BDC 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 00F10 80AE5BE0 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00F14 80AE5BE4 A48E0032 */ sh $t6, 0x0032($a0) ## 00000032 -/* 00F18 80AE5BE8 AFA40020 */ sw $a0, 0x0020($sp) -/* 00F1C 80AE5BEC AFAF0010 */ sw $t7, 0x0010($sp) -/* 00F20 80AE5BF0 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00F24 80AE5BF4 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00F28 80AE5BF8 0C00D09B */ jal func_8003426C -/* 00F2C 80AE5BFC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00F30 80AE5C00 8FA40020 */ lw $a0, 0x0020($sp) -/* 00F34 80AE5C04 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00F38 80AE5C08 3C0980AE */ lui $t1, %hi(func_80AE5C38) ## $t1 = 80AE0000 -/* 00F3C 80AE5C0C 8C990004 */ lw $t9, 0x0004($a0) ## 00000004 -/* 00F40 80AE5C10 2418000E */ addiu $t8, $zero, 0x000E ## $t8 = 0000000E -/* 00F44 80AE5C14 25295C38 */ addiu $t1, $t1, %lo(func_80AE5C38) ## $t1 = 80AE5C38 -/* 00F48 80AE5C18 03214024 */ and $t0, $t9, $at -/* 00F4C 80AE5C1C A4980278 */ sh $t8, 0x0278($a0) ## 00000278 -/* 00F50 80AE5C20 AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 00F54 80AE5C24 AC89026C */ sw $t1, 0x026C($a0) ## 0000026C -/* 00F58 80AE5C28 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F5C 80AE5C2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00F60 80AE5C30 03E00008 */ jr $ra -/* 00F64 80AE5C34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s deleted file mode 100644 index 2dc9154ebc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s +++ /dev/null @@ -1,165 +0,0 @@ -.rdata -glabel D_80AE6624 - .asciz "\n\n" - .balign 4 - -glabel D_80AE6628 - .asciz "\x1b[32m☆☆☆☆☆ 何匹ＤＥＡＤ？ ☆☆☆☆☆%d\n\x1b[m" - .balign 4 - -glabel D_80AE6658 - .asciz "\n\n" - .balign 4 - -.late_rodata -glabel D_80AE66A0 - .float 0.01 - -.text -glabel func_80AE5C38 -/* 00F68 80AE5C38 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00F6C 80AE5C3C 3C0F80AE */ lui $t7, %hi(D_80AE65CC) ## $t7 = 80AE0000 -/* 00F70 80AE5C40 AFBF004C */ sw $ra, 0x004C($sp) -/* 00F74 80AE5C44 AFB00048 */ sw $s0, 0x0048($sp) -/* 00F78 80AE5C48 AFA50084 */ sw $a1, 0x0084($sp) -/* 00F7C 80AE5C4C 25EF65CC */ addiu $t7, $t7, %lo(D_80AE65CC) ## $t7 = 80AE65CC -/* 00F80 80AE5C50 8DF90000 */ lw $t9, 0x0000($t7) ## 80AE65CC -/* 00F84 80AE5C54 27AE0068 */ addiu $t6, $sp, 0x0068 ## $t6 = FFFFFFE8 -/* 00F88 80AE5C58 8DF80004 */ lw $t8, 0x0004($t7) ## 80AE65D0 -/* 00F8C 80AE5C5C ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFE8 -/* 00F90 80AE5C60 8DF90008 */ lw $t9, 0x0008($t7) ## 80AE65D4 -/* 00F94 80AE5C64 3C0980AE */ lui $t1, %hi(D_80AE65D8) ## $t1 = 80AE0000 -/* 00F98 80AE5C68 252965D8 */ addiu $t1, $t1, %lo(D_80AE65D8) ## $t1 = 80AE65D8 -/* 00F9C 80AE5C6C ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFEC -/* 00FA0 80AE5C70 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF0 -/* 00FA4 80AE5C74 8D2B0000 */ lw $t3, 0x0000($t1) ## 80AE65D8 -/* 00FA8 80AE5C78 27A8005C */ addiu $t0, $sp, 0x005C ## $t0 = FFFFFFDC -/* 00FAC 80AE5C7C 8D2A0004 */ lw $t2, 0x0004($t1) ## 80AE65DC -/* 00FB0 80AE5C80 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFDC -/* 00FB4 80AE5C84 8D2B0008 */ lw $t3, 0x0008($t1) ## 80AE65E0 -/* 00FB8 80AE5C88 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFE0 -/* 00FBC 80AE5C8C 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 00FC0 80AE5C90 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE4 -/* 00FC4 80AE5C94 848C0278 */ lh $t4, 0x0278($a0) ## 00000278 -/* 00FC8 80AE5C98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FCC 80AE5C9C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 00FD0 80AE5CA0 1180000D */ beq $t4, $zero, .L80AE5CD8 -/* 00FD4 80AE5CA4 3C063C23 */ lui $a2, 0x3C23 ## $a2 = 3C230000 -/* 00FD8 80AE5CA8 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 00FDC 80AE5CAC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00FE0 80AE5CB0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00FE4 80AE5CB4 4604003C */ c.lt.s $f0, $f4 -/* 00FE8 80AE5CB8 00000000 */ nop -/* 00FEC 80AE5CBC 4502005E */ bc1fl .L80AE5E38 -/* 00FF0 80AE5CC0 8FBF004C */ lw $ra, 0x004C($sp) -/* 00FF4 80AE5CC4 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00FF8 80AE5CC8 00000000 */ nop -/* 00FFC 80AE5CCC 46060200 */ add.s $f8, $f0, $f6 -/* 01000 80AE5CD0 10000058 */ beq $zero, $zero, .L80AE5E34 -/* 01004 80AE5CD4 E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 -.L80AE5CD8: -/* 01008 80AE5CD8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0100C 80AE5CDC 2604028C */ addiu $a0, $s0, 0x028C ## $a0 = 0000028C -/* 01010 80AE5CE0 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3C23D70A -/* 01014 80AE5CE4 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 01018 80AE5CE8 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 0101C 80AE5CEC 3C0180AE */ lui $at, %hi(D_80AE66A0) ## $at = 80AE0000 -/* 01020 80AE5CF0 C43266A0 */ lwc1 $f18, %lo(D_80AE66A0)($at) -/* 01024 80AE5CF4 C610028C */ lwc1 $f16, 0x028C($s0) ## 0000028C -/* 01028 80AE5CF8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 0102C 80AE5CFC 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFF4 -/* 01030 80AE5D00 4612803C */ c.lt.s $f16, $f18 -/* 01034 80AE5D04 27A6005C */ addiu $a2, $sp, 0x005C ## $a2 = FFFFFFDC -/* 01038 80AE5D08 27A70068 */ addiu $a3, $sp, 0x0068 ## $a3 = FFFFFFE8 -/* 0103C 80AE5D0C 240D0078 */ addiu $t5, $zero, 0x0078 ## $t5 = 00000078 -/* 01040 80AE5D10 45000048 */ bc1f .L80AE5E34 -/* 01044 80AE5D14 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 01048 80AE5D18 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 0104C 80AE5D1C 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 01050 80AE5D20 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 01054 80AE5D24 E7A40074 */ swc1 $f4, 0x0074($sp) -/* 01058 80AE5D28 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 0105C 80AE5D2C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01060 80AE5D30 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01064 80AE5D34 E7A60078 */ swc1 $f6, 0x0078($sp) -/* 01068 80AE5D38 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 0106C 80AE5D3C 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 01070 80AE5D40 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01074 80AE5D44 240A0009 */ addiu $t2, $zero, 0x0009 ## $t2 = 00000009 -/* 01078 80AE5D48 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0107C 80AE5D4C AFAB003C */ sw $t3, 0x003C($sp) -/* 01080 80AE5D50 AFAA0038 */ sw $t2, 0x0038($sp) -/* 01084 80AE5D54 AFA90034 */ sw $t1, 0x0034($sp) -/* 01088 80AE5D58 AFA80028 */ sw $t0, 0x0028($sp) -/* 0108C 80AE5D5C AFA00030 */ sw $zero, 0x0030($sp) -/* 01090 80AE5D60 AFA0002C */ sw $zero, 0x002C($sp) -/* 01094 80AE5D64 AFB90024 */ sw $t9, 0x0024($sp) -/* 01098 80AE5D68 AFB80020 */ sw $t8, 0x0020($sp) -/* 0109C 80AE5D6C AFAF001C */ sw $t7, 0x001C($sp) -/* 010A0 80AE5D70 AFAE0018 */ sw $t6, 0x0018($sp) -/* 010A4 80AE5D74 AFA00014 */ sw $zero, 0x0014($sp) -/* 010A8 80AE5D78 AFAD0010 */ sw $t5, 0x0010($sp) -/* 010AC 80AE5D7C 8FA40084 */ lw $a0, 0x0084($sp) -/* 010B0 80AE5D80 E7AA0060 */ swc1 $f10, 0x0060($sp) -/* 010B4 80AE5D84 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 010B8 80AE5D88 E7A8007C */ swc1 $f8, 0x007C($sp) -/* 010BC 80AE5D8C 860C027A */ lh $t4, 0x027A($s0) ## 0000027A -/* 010C0 80AE5D90 27A60074 */ addiu $a2, $sp, 0x0074 ## $a2 = FFFFFFF4 -/* 010C4 80AE5D94 8FA40084 */ lw $a0, 0x0084($sp) -/* 010C8 80AE5D98 15800007 */ bne $t4, $zero, .L80AE5DB8 -/* 010CC 80AE5D9C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 010D0 80AE5DA0 8FA40084 */ lw $a0, 0x0084($sp) -/* 010D4 80AE5DA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 010D8 80AE5DA8 0C007E50 */ jal Item_DropCollectibleRandom - -/* 010DC 80AE5DAC 240700E0 */ addiu $a3, $zero, 0x00E0 ## $a3 = 000000E0 -/* 010E0 80AE5DB0 10000004 */ beq $zero, $zero, .L80AE5DC4 -/* 010E4 80AE5DB4 8E030118 */ lw $v1, 0x0118($s0) ## 00000118 -.L80AE5DB8: -/* 010E8 80AE5DB8 0C007E50 */ jal Item_DropCollectibleRandom - -/* 010EC 80AE5DBC 240700C0 */ addiu $a3, $zero, 0x00C0 ## $a3 = 000000C0 -/* 010F0 80AE5DC0 8E030118 */ lw $v1, 0x0118($s0) ## 00000118 -.L80AE5DC4: -/* 010F4 80AE5DC4 5060001C */ beql $v1, $zero, .L80AE5E38 -/* 010F8 80AE5DC8 8FBF004C */ lw $ra, 0x004C($sp) -/* 010FC 80AE5DCC 8C6D0130 */ lw $t5, 0x0130($v1) ## 00000130 -/* 01100 80AE5DD0 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 01104 80AE5DD4 11A00015 */ beq $t5, $zero, .L80AE5E2C -/* 01108 80AE5DD8 00000000 */ nop -/* 0110C 80AE5DDC 860E027A */ lh $t6, 0x027A($s0) ## 0000027A -/* 01110 80AE5DE0 3C0480AE */ lui $a0, %hi(D_80AE6624) ## $a0 = 80AE0000 -/* 01114 80AE5DE4 24846624 */ addiu $a0, $a0, %lo(D_80AE6624) ## $a0 = 80AE6624 -/* 01118 80AE5DE8 15C00010 */ bne $t6, $zero, .L80AE5E2C -/* 0111C 80AE5DEC 00000000 */ nop -/* 01120 80AE5DF0 8463015E */ lh $v1, 0x015E($v1) ## 0000015E -/* 01124 80AE5DF4 2861000A */ slti $at, $v1, 0x000A -/* 01128 80AE5DF8 10200002 */ beq $at, $zero, .L80AE5E04 -/* 0112C 80AE5DFC 246F0001 */ addiu $t7, $v1, 0x0001 ## $t7 = 00000001 -/* 01130 80AE5E00 A44F015E */ sh $t7, 0x015E($v0) ## 0000015E -.L80AE5E04: -/* 01134 80AE5E04 0C00084C */ jal osSyncPrintf - -/* 01138 80AE5E08 AFA20058 */ sw $v0, 0x0058($sp) -/* 0113C 80AE5E0C 8FA20058 */ lw $v0, 0x0058($sp) -/* 01140 80AE5E10 3C0480AE */ lui $a0, %hi(D_80AE6628) ## $a0 = 80AE0000 -/* 01144 80AE5E14 24846628 */ addiu $a0, $a0, %lo(D_80AE6628) ## $a0 = 80AE6628 -/* 01148 80AE5E18 0C00084C */ jal osSyncPrintf - -/* 0114C 80AE5E1C 8445015E */ lh $a1, 0x015E($v0) ## 0000015E -/* 01150 80AE5E20 3C0480AE */ lui $a0, %hi(D_80AE6658) ## $a0 = 80AE0000 -/* 01154 80AE5E24 0C00084C */ jal osSyncPrintf - -/* 01158 80AE5E28 24846658 */ addiu $a0, $a0, %lo(D_80AE6658) ## $a0 = 80AE6658 -.L80AE5E2C: -/* 0115C 80AE5E2C 0C00B55C */ jal Actor_Kill - -/* 01160 80AE5E30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AE5E34: -/* 01164 80AE5E34 8FBF004C */ lw $ra, 0x004C($sp) -.L80AE5E38: -/* 01168 80AE5E38 8FB00048 */ lw $s0, 0x0048($sp) -/* 0116C 80AE5E3C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 01170 80AE5E40 03E00008 */ jr $ra -/* 01174 80AE5E44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5E48.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5E48.s deleted file mode 100644 index fd47422be5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5E48.s +++ /dev/null @@ -1,50 +0,0 @@ -.late_rodata -glabel D_80AE66A4 - .float 3000.0 - -glabel D_80AE66A8 - .float 3000.0 - -.text -glabel func_80AE5E48 -/* 01178 80AE5E48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0117C 80AE5E4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01180 80AE5E50 AFA5001C */ sw $a1, 0x001C($sp) -/* 01184 80AE5E54 848E0278 */ lh $t6, 0x0278($a0) ## 00000278 -/* 01188 80AE5E58 29C10025 */ slti $at, $t6, 0x0025 -/* 0118C 80AE5E5C 1020001B */ beq $at, $zero, .L80AE5ECC -/* 01190 80AE5E60 3C0180AE */ lui $at, %hi(D_80AE66A4) ## $at = 80AE0000 -/* 01194 80AE5E64 C42C66A4 */ lwc1 $f12, %lo(D_80AE66A4)($at) -/* 01198 80AE5E68 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0119C 80AE5E6C AFA40018 */ sw $a0, 0x0018($sp) -/* 011A0 80AE5E70 4600010D */ trunc.w.s $f4, $f0 -/* 011A4 80AE5E74 8FA40018 */ lw $a0, 0x0018($sp) -/* 011A8 80AE5E78 3C0180AE */ lui $at, %hi(D_80AE66A8) ## $at = 80AE0000 -/* 011AC 80AE5E7C 44182000 */ mfc1 $t8, $f4 -/* 011B0 80AE5E80 00000000 */ nop -/* 011B4 80AE5E84 A49800B4 */ sh $t8, 0x00B4($a0) ## 000000B4 -/* 011B8 80AE5E88 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 011BC 80AE5E8C C42C66A8 */ lwc1 $f12, %lo(D_80AE66A8)($at) -/* 011C0 80AE5E90 4600018D */ trunc.w.s $f6, $f0 -/* 011C4 80AE5E94 8FA40018 */ lw $a0, 0x0018($sp) -/* 011C8 80AE5E98 84890278 */ lh $t1, 0x0278($a0) ## 00000278 -/* 011CC 80AE5E9C 44083000 */ mfc1 $t0, $f6 -/* 011D0 80AE5EA0 1520000A */ bne $t1, $zero, .L80AE5ECC -/* 011D4 80AE5EA4 A48800B8 */ sh $t0, 0x00B8($a0) ## 000000B8 -/* 011D8 80AE5EA8 848A027A */ lh $t2, 0x027A($a0) ## 0000027A -/* 011DC 80AE5EAC 3C0C80AE */ lui $t4, %hi(func_80AE5688) ## $t4 = 80AE0000 -/* 011E0 80AE5EB0 3C0B80AE */ lui $t3, %hi(func_80AE538C) ## $t3 = 80AE0000 -/* 011E4 80AE5EB4 11400004 */ beq $t2, $zero, .L80AE5EC8 -/* 011E8 80AE5EB8 258C5688 */ addiu $t4, $t4, %lo(func_80AE5688) ## $t4 = 80AE5688 -/* 011EC 80AE5EBC 256B538C */ addiu $t3, $t3, %lo(func_80AE538C) ## $t3 = 80AE538C -/* 011F0 80AE5EC0 10000002 */ beq $zero, $zero, .L80AE5ECC -/* 011F4 80AE5EC4 AC8B026C */ sw $t3, 0x026C($a0) ## 0000026C -.L80AE5EC8: -/* 011F8 80AE5EC8 AC8C026C */ sw $t4, 0x026C($a0) ## 0000026C -.L80AE5ECC: -/* 011FC 80AE5ECC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01200 80AE5ED0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01204 80AE5ED4 03E00008 */ jr $ra -/* 01208 80AE5ED8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5EDC.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5EDC.s deleted file mode 100644 index 62e8992f8d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5EDC.s +++ /dev/null @@ -1,182 +0,0 @@ -.late_rodata -glabel jtbl_80AE66AC -.word L80AE60CC -.word L80AE6104 -.word L80AE608C -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE5F5C -.word L80AE5F5C -.word L80AE5FB4 -.word L80AE600C -.word 0x00000000, 0x00000000, 0x00000000 - -.text -glabel func_80AE5EDC -/* 0120C 80AE5EDC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01210 80AE5EE0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01214 80AE5EE4 AFB00020 */ sw $s0, 0x0020($sp) -/* 01218 80AE5EE8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0121C 80AE5EEC 908202A1 */ lbu $v0, 0x02A1($a0) ## 000002A1 -/* 01220 80AE5EF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01224 80AE5EF4 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 01228 80AE5EF8 11C00082 */ beq $t6, $zero, .L80AE6104 -/* 0122C 80AE5EFC 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 01230 80AE5F00 8C83026C */ lw $v1, 0x026C($a0) ## 0000026C -/* 01234 80AE5F04 3C1880AE */ lui $t8, %hi(func_80AE5C38) ## $t8 = 80AE0000 -/* 01238 80AE5F08 27185C38 */ addiu $t8, $t8, %lo(func_80AE5C38) ## $t8 = 80AE5C38 -/* 0123C 80AE5F0C 1303007D */ beq $t8, $v1, .L80AE6104 -/* 01240 80AE5F10 A08F02A1 */ sb $t7, 0x02A1($a0) ## 000002A1 -/* 01244 80AE5F14 3C1980AE */ lui $t9, %hi(func_80AE5854) ## $t9 = 80AE0000 -/* 01248 80AE5F18 27395854 */ addiu $t9, $t9, %lo(func_80AE5854) ## $t9 = 80AE5854 -/* 0124C 80AE5F1C 5323007A */ beql $t9, $v1, .L80AE6108 -/* 01250 80AE5F20 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01254 80AE5F24 908900B1 */ lbu $t1, 0x00B1($a0) ## 000000B1 -/* 01258 80AE5F28 A48000B8 */ sh $zero, 0x00B8($a0) ## 000000B8 -/* 0125C 80AE5F2C 848800B8 */ lh $t0, 0x00B8($a0) ## 000000B8 -/* 01260 80AE5F30 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 01264 80AE5F34 2D41000E */ sltiu $at, $t2, 0x000E -/* 01268 80AE5F38 A480027E */ sh $zero, 0x027E($a0) ## 0000027E -/* 0126C 80AE5F3C 10200071 */ beq $at, $zero, .L80AE6104 -/* 01270 80AE5F40 A48800B4 */ sh $t0, 0x00B4($a0) ## 000000B4 -/* 01274 80AE5F44 000A5080 */ sll $t2, $t2, 2 -/* 01278 80AE5F48 3C0180AE */ lui $at, %hi(jtbl_80AE66AC) ## $at = 80AE0000 -/* 0127C 80AE5F4C 002A0821 */ addu $at, $at, $t2 -/* 01280 80AE5F50 8C2A66AC */ lw $t2, %lo(jtbl_80AE66AC)($at) -/* 01284 80AE5F54 01400008 */ jr $t2 -/* 01288 80AE5F58 00000000 */ nop -glabel L80AE5F5C -/* 0128C 80AE5F5C 920B00AF */ lbu $t3, 0x00AF($s0) ## 000000AF -/* 01290 80AE5F60 29610002 */ slti $at, $t3, 0x0002 -/* 01294 80AE5F64 14200013 */ bne $at, $zero, .L80AE5FB4 -/* 01298 80AE5F68 00000000 */ nop -/* 0129C 80AE5F6C 860C027E */ lh $t4, 0x027E($s0) ## 0000027E -/* 012A0 80AE5F70 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 012A4 80AE5F74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012A8 80AE5F78 104C000E */ beq $v0, $t4, .L80AE5FB4 -/* 012AC 80AE5F7C 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E -/* 012B0 80AE5F80 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 012B4 80AE5F84 A602027E */ sh $v0, 0x027E($s0) ## 0000027E -/* 012B8 80AE5F88 240D0050 */ addiu $t5, $zero, 0x0050 ## $t5 = 00000050 -/* 012BC 80AE5F8C AFAD0010 */ sw $t5, 0x0010($sp) -/* 012C0 80AE5F90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012C4 80AE5F94 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 012C8 80AE5F98 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 012CC 80AE5F9C 0C00D09B */ jal func_8003426C -/* 012D0 80AE5FA0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 012D4 80AE5FA4 3C0E80AE */ lui $t6, %hi(func_80AE58EC) ## $t6 = 80AE0000 -/* 012D8 80AE5FA8 25CE58EC */ addiu $t6, $t6, %lo(func_80AE58EC) ## $t6 = 80AE58EC -/* 012DC 80AE5FAC 10000055 */ beq $zero, $zero, .L80AE6104 -/* 012E0 80AE5FB0 AE0E026C */ sw $t6, 0x026C($s0) ## 0000026C -glabel L80AE5FB4 -.L80AE5FB4: -/* 012E4 80AE5FB4 920F00AF */ lbu $t7, 0x00AF($s0) ## 000000AF -/* 012E8 80AE5FB8 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 012EC 80AE5FBC 29E10003 */ slti $at, $t7, 0x0003 -/* 012F0 80AE5FC0 54200013 */ bnel $at, $zero, .L80AE6010 -/* 012F4 80AE5FC4 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 012F8 80AE5FC8 8618027E */ lh $t8, 0x027E($s0) ## 0000027E -/* 012FC 80AE5FCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01300 80AE5FD0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01304 80AE5FD4 1058000D */ beq $v0, $t8, .L80AE600C -/* 01308 80AE5FD8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0130C 80AE5FDC A602027E */ sh $v0, 0x027E($s0) ## 0000027E -/* 01310 80AE5FE0 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 -/* 01314 80AE5FE4 AFB90010 */ sw $t9, 0x0010($sp) -/* 01318 80AE5FE8 0C00D09B */ jal func_8003426C -/* 0131C 80AE5FEC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01320 80AE5FF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01324 80AE5FF4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01328 80AE5FF8 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E -/* 0132C 80AE5FFC 3C0880AE */ lui $t0, %hi(func_80AE58EC) ## $t0 = 80AE0000 -/* 01330 80AE6000 250858EC */ addiu $t0, $t0, %lo(func_80AE58EC) ## $t0 = 80AE58EC -/* 01334 80AE6004 1000003F */ beq $zero, $zero, .L80AE6104 -/* 01338 80AE6008 AE08026C */ sw $t0, 0x026C($s0) ## 0000026C -glabel L80AE600C -.L80AE600C: -/* 0133C 80AE600C 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -.L80AE6010: -/* 01340 80AE6010 A609027C */ sh $t1, 0x027C($s0) ## 0000027C -/* 01344 80AE6014 0C00D58A */ jal Actor_ApplyDamage - -/* 01348 80AE6018 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0134C 80AE601C 920A00AF */ lbu $t2, 0x00AF($s0) ## 000000AF -/* 01350 80AE6020 24053989 */ addiu $a1, $zero, 0x3989 ## $a1 = 00003989 -/* 01354 80AE6024 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01358 80AE6028 5540000B */ bnel $t2, $zero, .L80AE6058 -/* 0135C 80AE602C 8E0D026C */ lw $t5, 0x026C($s0) ## 0000026C -/* 01360 80AE6030 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01364 80AE6034 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01368 80AE6038 8FA4002C */ lw $a0, 0x002C($sp) -/* 0136C 80AE603C 0C00CB1F */ jal func_80032C7C -/* 01370 80AE6040 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01374 80AE6044 3C0B80AE */ lui $t3, %hi(func_80AE5BC4) ## $t3 = 80AE0000 -/* 01378 80AE6048 256B5BC4 */ addiu $t3, $t3, %lo(func_80AE5BC4) ## $t3 = 80AE5BC4 -/* 0137C 80AE604C 1000002D */ beq $zero, $zero, .L80AE6104 -/* 01380 80AE6050 AE0B026C */ sw $t3, 0x026C($s0) ## 0000026C -/* 01384 80AE6054 8E0D026C */ lw $t5, 0x026C($s0) ## 0000026C -.L80AE6058: -/* 01388 80AE6058 3C0C80AE */ lui $t4, %hi(func_80AE5E48) ## $t4 = 80AE0000 -/* 0138C 80AE605C 258C5E48 */ addiu $t4, $t4, %lo(func_80AE5E48) ## $t4 = 80AE5E48 -/* 01390 80AE6060 158D0004 */ bne $t4, $t5, .L80AE6074 -/* 01394 80AE6064 00000000 */ nop -/* 01398 80AE6068 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -/* 0139C 80AE606C 860E00B8 */ lh $t6, 0x00B8($s0) ## 000000B8 -/* 013A0 80AE6070 A60E00B4 */ sh $t6, 0x00B4($s0) ## 000000B4 -.L80AE6074: -/* 013A4 80AE6074 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 013A8 80AE6078 24053988 */ addiu $a1, $zero, 0x3988 ## $a1 = 00003988 -/* 013AC 80AE607C 3C0F80AE */ lui $t7, %hi(func_80AE57F0) ## $t7 = 80AE0000 -/* 013B0 80AE6080 25EF57F0 */ addiu $t7, $t7, %lo(func_80AE57F0) ## $t7 = 80AE57F0 -/* 013B4 80AE6084 1000001F */ beq $zero, $zero, .L80AE6104 -/* 013B8 80AE6088 AE0F026C */ sw $t7, 0x026C($s0) ## 0000026C -glabel L80AE608C -/* 013BC 80AE608C 0C00D58A */ jal Actor_ApplyDamage - -/* 013C0 80AE6090 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013C4 80AE6094 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 013C8 80AE6098 A602027C */ sh $v0, 0x027C($s0) ## 0000027C -/* 013CC 80AE609C A602027E */ sh $v0, 0x027E($s0) ## 0000027E -/* 013D0 80AE60A0 24180050 */ addiu $t8, $zero, 0x0050 ## $t8 = 00000050 -/* 013D4 80AE60A4 AFB80010 */ sw $t8, 0x0010($sp) -/* 013D8 80AE60A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013DC 80AE60AC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 013E0 80AE60B0 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 013E4 80AE60B4 0C00D09B */ jal func_8003426C -/* 013E8 80AE60B8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 013EC 80AE60BC 3C1980AE */ lui $t9, %hi(func_80AE58EC) ## $t9 = 80AE0000 -/* 013F0 80AE60C0 273958EC */ addiu $t9, $t9, %lo(func_80AE58EC) ## $t9 = 80AE58EC -/* 013F4 80AE60C4 1000000F */ beq $zero, $zero, .L80AE6104 -/* 013F8 80AE60C8 AE19026C */ sw $t9, 0x026C($s0) ## 0000026C -glabel L80AE60CC -/* 013FC 80AE60CC 8608027E */ lh $t0, 0x027E($s0) ## 0000027E -/* 01400 80AE60D0 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 01404 80AE60D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01408 80AE60D8 1048000A */ beq $v0, $t0, .L80AE6104 -/* 0140C 80AE60DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01410 80AE60E0 A602027E */ sh $v0, 0x027E($s0) ## 0000027E -/* 01414 80AE60E4 24090050 */ addiu $t1, $zero, 0x0050 ## $t1 = 00000050 -/* 01418 80AE60E8 AFA90010 */ sw $t1, 0x0010($sp) -/* 0141C 80AE60EC 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 01420 80AE60F0 0C00D09B */ jal func_8003426C -/* 01424 80AE60F4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01428 80AE60F8 3C0A80AE */ lui $t2, %hi(func_80AE58EC) ## $t2 = 80AE0000 -/* 0142C 80AE60FC 254A58EC */ addiu $t2, $t2, %lo(func_80AE58EC) ## $t2 = 80AE58EC -/* 01430 80AE6100 AE0A026C */ sw $t2, 0x026C($s0) ## 0000026C -glabel L80AE6104 -.L80AE6104: -/* 01434 80AE6104 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE6108: -/* 01438 80AE6108 8FB00020 */ lw $s0, 0x0020($sp) -/* 0143C 80AE610C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01440 80AE6110 03E00008 */ jr $ra -/* 01444 80AE6114 00000000 */ nop diff --git a/data/overlays/actors/z_en_reeba.data.s b/data/overlays/actors/z_en_reeba.data.s deleted file mode 100644 index 792d506794..0000000000 --- a/data/overlays/actors/z_en_reeba.data.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80AE6560 - .word 0x00E2E1E2, 0xC1E2E2D2, 0xE1E4E6E2, 0x34E2E2E2, 0xE2003400, 0x0000E2E8, 0xE4E2E8E4, 0x10000000 -glabel En_Reeba_InitVars - .word 0x001C0800, 0x08000015, 0x00170000, 0x000002DC -.word EnReeba_Init -.word EnReeba_Destroy -.word EnReeba_Update -.word EnReeba_Draw -glabel D_80AE65A0 - .word 0x05110939, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x08080000, 0xFFCFFFFF, 0x00000000, 0x01050100, 0x00140028, 0x00000000, 0x00000000 -glabel D_80AE65CC - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80AE65D8 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_reeba.reloc.s b/data/overlays/actors/z_en_reeba.reloc.s deleted file mode 100644 index a53486d489..0000000000 --- a/data/overlays/actors/z_en_reeba.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_80AE66F0 - .incbin "baserom/ovl_En_Reeba", 0x1A20, 0x00000240 diff --git a/include/functions.h b/include/functions.h index af8093cca0..566eac6bd5 100644 --- a/include/functions.h +++ b/include/functions.h @@ -654,7 +654,7 @@ void DynaPolyInfo_Alloc(UNK_PTR arg0, UNK_PTR arg1); // ? func_80041B80(?); struct_80041C10_ret* func_80041C10(CollisionContext* colCtx, s32, s32); // ? func_80041C98(?); -// ? func_80041D4C(?); +UNK_TYPE func_80041D4C(CollisionContext*, CollisionPoly*, CollisionPoly*); // ? func_80041D94(?); // ? func_80041DB8(?); // ? func_80041EC8(?); diff --git a/spec b/spec index cdd87dac0d..cb319b86d8 100644 --- a/spec +++ b/spec @@ -2944,8 +2944,7 @@ endseg beginseg name "ovl_En_Reeba" include "build/src/overlays/actors/ovl_En_Reeba/z_en_reeba.o" - include "build/data/overlays/actors/z_en_reeba.data.o" - include "build/data/overlays/actors/z_en_reeba.reloc.o" + include "build/src/overlays/actors/ovl_En_Reeba/ovl_En_Reeba_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h index d7f37d33e7..7e2d99d302 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h @@ -8,7 +8,14 @@ struct EnEncount1; typedef struct EnEncount1 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x24]; + /* 0x014C */ char unk_14C[0x6]; + /* 0x0152 */ s16 unk_152; + /* 0x0154 */ char unk_154[0xA]; + /* 0x015E */ s16 numLeeversDead; + /* 0x0160 */ char unk_160[0x4]; + /* 0x0164 */ s16 unk_164; + /* 0x0166 */ char unk_166[0x6]; + /* 0x016C */ UNK_TYPE unk_16C; } EnEncount1; // size = 0x0170 extern const ActorInit En_Encount1_InitVars; diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 62a0ca27de..9792a5c0a3 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -1,4 +1,13 @@ + +/* + * File: z_en_reeba.c + * Overlay: ovl_En_Reeba + * Description: Leever + */ + #include "z_en_reeba.h" +#include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" +#include "vt.h" #define FLAGS 0x08000015 @@ -9,7 +18,24 @@ void EnReeba_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnReeba_Update(Actor* thisx, GlobalContext* globalCtx); void EnReeba_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80AE4F40(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5054(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5270(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5688(EnReeba* this, GlobalContext* globalCtx); +void func_80AE56E0(EnReeba* this, GlobalContext* globalCtx); +void func_80AE538C(EnReeba* this, GlobalContext* globalCtx); +void func_80AE53AC(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5E48(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5854(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5C38(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5938(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5A9C(EnReeba* this, GlobalContext* globalCtx); + +static DamageTable sDamageTable = { + 0x00, 0xE2, 0xE1, 0xE2, 0xC1, 0xE2, 0xE2, 0xD2, 0xE1, 0xE4, 0xE6, 0xE2, 0x34, 0xE2, 0xE2, 0xE2, + 0xE2, 0x00, 0x34, 0x00, 0x00, 0x00, 0xE2, 0xE8, 0xE4, 0xE2, 0xE8, 0xE4, 0x10, 0x00, 0x00, 0x00, +}; + const ActorInit En_Reeba_InitVars = { ACTOR_EN_REEBA, ACTORTYPE_MISC, @@ -21,45 +47,611 @@ const ActorInit En_Reeba_InitVars = { (ActorFunc)EnReeba_Update, (ActorFunc)EnReeba_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK5, 0x11, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0xFFCFFFFF, 0x08, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x01, 0x05, 0x01 }, + { 20, 40, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s") +extern AnimationHeader D_060001E4; +extern SkeletonHeader D_06001EE8; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5054.s") +void EnReeba_Init(Actor* thisx, GlobalContext* globalCtx) { + EnReeba* this = THIS; + f32 temp_f0; + s32 surfaceType; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5270.s") + this->actor.naviEnemyId = 0x47; + this->actor.unk_1F = 3; + this->actor.gravity = -3.5f; + this->actor.posRot2.pos = this->actor.posRot.pos; + SkelAnime_Init(globalCtx, &this->skelanime, &D_06001EE8, &D_060001E4, this->limbDrawTable, + this->transitionDrawTable, 18); + this->actor.colChkInfo.mass = 0xFE; + this->actor.colChkInfo.health = 4; + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + this->isBig = this->actor.params; + this->scale = 0.04f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE538C.s") + if (this->isBig) { + this->collider.dim.radius = 35; + this->collider.dim.height = 45; + this->scale *= 1.5f; + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n" VT_RST, this->scale); + this->actor.colChkInfo.health = 20; + this->collider.body.toucher.effect = 4; + this->collider.body.toucher.damage = 16; + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_ENEMY); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE53AC.s") + temp_f0 = this->scale * -27500.0f; + this->unk_284 = temp_f0; + this->actor.shape.unk_08 = temp_f0; + ActorShape_Init(&this->actor.shape, temp_f0, ActorShadow_DrawFunc_Circle, 0.0f); + this->actor.colChkInfo.damageTable = &sDamageTable; + func_8002E4B4(globalCtx, &this->actor, 35.0f, 60.0f, 60.0f, 0x1D); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE561C.s") + surfaceType = func_80041D4C(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5688.s") + if ((surfaceType != 4) && (surfaceType != 7)) { + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE56E0.s") + this->actionfunc = func_80AE4F40; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE57F0.s") +void EnReeba_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnReeba* this = THIS; + EnEncount1* spawner; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5854.s") + Collider_DestroyCylinder(globalCtx, &this->collider); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE58EC.s") + if (this->actor.parent != NULL) { + spawner = (EnEncount1*)this->actor.parent; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s") + if (spawner->actor.update != NULL) { -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s") + if (spawner->unk_152 > 0) { + spawner->unk_152--; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5BC4.s") + if (this->isBig) { + spawner->unk_16C = 0; + spawner->unk_164 = 0x258; + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s") +void func_80AE4F40(EnReeba* this, GlobalContext* globalCtx) { + f32 frames = SkelAnime_GetFrameCount(&D_060001E4.genericHeader); + Player* player = PLAYER; + s16 absPlayerVel; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5E48.s") + SkelAnime_ChangeAnim(&this->skelanime, &D_060001E4, 2.0f, 0.0f, frames, 0, -10.0f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5EDC.s") + absPlayerVel = fabsf(player->linearVelocity); + this->unk_278 = (20 - (absPlayerVel * 2)); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s") + if (this->unk_278 < 0) { + this->unk_278 = 2; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s") + if (this->unk_278 > 20) { + this->unk_278 = 20; + } + + this->actor.flags &= ~0x08000000; + this->actor.posRot.pos.y = this->actor.groundY; + + if (this->isBig) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_BIG_APPEAR); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_APPEAR); + } + + this->actionfunc = func_80AE5054; +} + +void func_80AE5054(EnReeba* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 playerLinearVel; + + SkelAnime_FrameUpdateMatrix(&this->skelanime); + + if ((globalCtx->gameplayFrames % 4) == 0) { + func_80033260(globalCtx, &this->actor, &this->actor.posRot.pos, this->actor.shape.unk_10, 1, 8.0f, 0x1F4, 0xA, + 1); + } + + if (this->unk_278 == 0) { + Math_SmoothScaleMaxF(&this->actor.shape.unk_10, 12.0f, 1.0f, 1.0f); + if (this->actor.shape.unk_08 < 0.0f) { + Math_SmoothDownscaleMaxF(&this->actor.shape.unk_08, 1.0f, this->unk_288); + Math_SmoothScaleMaxF(&this->unk_288, 300.0f, 1.0f, 5.0f); + + } else { + this->unk_288 = 0.0f; + this->actor.shape.unk_08 = 0.0f; + playerLinearVel = player->linearVelocity; + + switch (this->unk_280) { + case 0: + this->actor.posRot.rot.y = this->actor.yawTowardsLink; + break; + case 1: + this->actor.posRot.rot.y = this->actor.yawTowardsLink + (800.0f * playerLinearVel); + break; + case 2: + case 3: + this->actor.posRot.rot.y = + this->actor.yawTowardsLink + + (player->actor.shape.rot.y - this->actor.yawTowardsLink) * (playerLinearVel * 0.15f); + break; + case 4: + this->actor.posRot.rot.y = this->actor.yawTowardsLink - (800.0f * playerLinearVel); + } + + if (this->isBig) { + this->actionfunc = func_80AE538C; + } else { + this->unk_272 = 130; + this->actor.speedXZ = Math_Rand_ZeroFloat(4.0f) + 6.0f; + this->actionfunc = func_80AE5270; + } + } + } +} + +void func_80AE5270(EnReeba* this, GlobalContext* globalCtx) { + s32 surfaceType; + + SkelAnime_FrameUpdateMatrix(&this->skelanime); + + if (this->actor.shape.unk_10 < 12.0f) { + Math_SmoothScaleMaxF(&this->actor.shape.unk_10, 12.0f, 3.0f, 1.0f); + } + + surfaceType = func_80041D4C(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource); + + if ((surfaceType != 4) && (surfaceType != 7)) { + this->actor.speedXZ = 0.0f; + this->actionfunc = func_80AE5688; + return; + } + + if ((this->unk_272 == 0) || (this->actor.xzDistFromLink < 30.0f) || (this->actor.xzDistFromLink > 400.0f) || + (this->actor.bgCheckFlags & 8)) { + this->actionfunc = func_80AE5688; + return; + } + + if (this->unk_274 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_MOVE); + this->unk_274 = 10; + } + +} + +void func_80AE538C(EnReeba* this, GlobalContext* globalCtx) { + this->actor.flags |= 5; + this->actionfunc = func_80AE53AC; +} + +void func_80AE53AC(EnReeba* this, GlobalContext* globalCtx) { + f32 speed; + s16 yawDiff; + s16 yaw; + s32 surfaceType; + + SkelAnime_FrameUpdateMatrix(&this->skelanime); + + if (this->actor.shape.unk_10 < 12.0f) { + Math_SmoothScaleMaxF(&this->actor.shape.unk_10, 12.0f, 3.0f, 1.0f); + } + + surfaceType = func_80041D4C(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource); + + if (((surfaceType != 4) && (surfaceType != 7)) || (this->actor.xzDistFromLink > 400.0f) || + (this->actor.bgCheckFlags & 8)) { + this->actionfunc = func_80AE5688; + return; + } + + if ((this->actor.xzDistFromLink < 70.0f) && (this->unk_270 == 0)) { + this->unk_270 = 30; + } + + speed = (this->actor.xzDistFromLink - 20.0f) / ((Math_Rand_ZeroOne() * 50.0f) + 150.0f); + this->actor.speedXZ += speed * 1.8f; + + if (this->actor.speedXZ >= 3.0f) { + this->actor.speedXZ = 3.0f; + } + + if (this->actor.speedXZ < -3.0f) { + this->actor.speedXZ = -3.0f; + } + + yawDiff = (this->unk_270 == 0) ? this->actor.yawTowardsLink : -this->actor.yawTowardsLink; + yawDiff = yawDiff - this->actor.posRot.rot.y; + yaw = (yawDiff > 0) ? ((yawDiff / 31.0f) + 10.0f) : ((yawDiff / 31.0f) - 10.0f); + this->actor.posRot.rot.y += (yaw * 2.0f); + + if (this->unk_274 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_MOVE); + this->unk_274 = 20; + } +} + +void func_80AE561C(EnReeba* this, GlobalContext* globalCtx) { + Math_SmoothDownscaleMaxF(&this->actor.speedXZ, 1.0f, 0.3f); + + if (this->unk_272 == 0) { + if (this->isBig) { + this->actionfunc = func_80AE538C; + } else { + this->actionfunc = func_80AE5688; + } + } +} + +void func_80AE5688(EnReeba* this, GlobalContext* globalCtx) { + this->unk_27E = 0; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + this->actor.flags |= 0x8000000; + this->actor.flags &= ~5; + this->actionfunc = func_80AE56E0; +} + +void func_80AE56E0(EnReeba* this, GlobalContext* globalCtx) { + Math_SmoothDownscaleMaxF(&this->actor.shape.unk_10, 1.0f, 0.3f); + Math_SmoothDownscaleMaxF(&this->actor.speedXZ, 0.1f, 0.3f); + SkelAnime_FrameUpdateMatrix(&this->skelanime); + + if ((this->unk_284 + 10.0f) <= this->actor.shape.unk_08) { + if ((globalCtx->gameplayFrames & 3) == 0) { + func_80033260(globalCtx, &this->actor, &this->actor.posRot.pos, this->actor.shape.unk_10, 1, 8.0f, 500, 10, + 1); + } + + Math_SmoothScaleMaxF(&this->actor.shape.unk_08, this->unk_284, 1.0f, this->unk_288); + Math_SmoothScaleMaxF(&this->unk_288, 300.0f, 1.0f, 5.0f); + } else { + Actor_Kill(&this->actor); + } +} + +void func_80AE57F0(EnReeba* this, GlobalContext* globalCtx) { + this->unk_276 = 14; + this->actor.speedXZ = -8.0f; + this->actor.posRot.rot.y = this->actor.yawTowardsLink; + func_8003426C(&this->actor, 0x4000, 0xFF, 0, 8); + this->actionfunc = func_80AE5854; +} + +void func_80AE5854(EnReeba* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelanime); + + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ++; + } + + if (this->unk_276 == 0) { + if (this->isBig) { + this->unk_270 = 30; + this->actionfunc = func_80AE538C; + } else { + this->actionfunc = func_80AE5688; + } + } +} + +void func_80AE58EC(EnReeba* this, GlobalContext* globalCtx) { + this->unk_278 = 14; + this->actor.posRot.rot.y = this->actor.yawTowardsLink; + this->actor.speedXZ = -8.0f; + this->actor.flags |= 0x8000000; + this->actor.flags &= ~5; + this->actionfunc = func_80AE5938; +} + +void func_80AE5938(EnReeba* this, GlobalContext* globalCtx) { + Vec3f pos; + f32 scale; + + if (this->unk_278 != 0) { + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ += 1.0f; + } + } else { + this->actor.speedXZ = 0.0f; + + if ((this->unk_27E == 4) || (this->actor.colChkInfo.health != 0)) { + if (this->unk_27E == 2) { + pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(20.0f); + pos.y = this->actor.posRot.pos.y + Math_Rand_CenteredFloat(20.0f); + pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(20.0f); + scale = 3.0f; + + if (this->isBig) { + scale = 6.0f; + } + + EffectSsEnIce_SpawnFlyingVec3f(globalCtx, &this->actor, &pos, 150, 150, 150, 250, 235, 245, 255, scale); + } + + this->unk_278 = 66; + this->actionfunc = func_80AE5E48; + } else { + this->unk_278 = 30; + this->actionfunc = func_80AE5A9C; + } + } +} + +void func_80AE5A9C(EnReeba* this, GlobalContext* globalCtx) { + Vec3f randPos; + f32 scale; + + if (this->unk_278 != 0) { + if ((this->unk_27E == 2) && ((this->unk_278 & 0xF) == 0)) { + randPos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(20.0f); + randPos.y = this->actor.posRot.pos.y + Math_Rand_CenteredFloat(20.0f); + randPos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(20.0f); + scale = 3.0f; + + if (this->isBig) { + scale = 6.0f; + } + + EffectSsEnIce_SpawnFlyingVec3f(globalCtx, &this->actor, &randPos, 150, 150, 150, 250, 235, 245, 255, scale); + } + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_DEAD); + func_80032C7C(globalCtx, &this->actor); + this->actionfunc = func_80AE5C38; + } +} + +void func_80AE5BC4(EnReeba* this, GlobalContext* globalCtx) { + this->actor.speedXZ = -8.0f; + this->actor.posRot.rot.y = this->actor.yawTowardsLink; + func_8003426C(&this->actor, 0x4000, 0xFF, 0, 8); + this->unk_278 = 14; + this->actor.flags &= ~1; + this->actionfunc = func_80AE5C38; +} + +void func_80AE5C38(EnReeba* this, GlobalContext* globalCtx) { + Vec3f pos; + Vec3f accel = { 0.0f, 0.0f, 0.0f }; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + EnEncount1* spawner; + + if (this->unk_278 != 0) { + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ++; + } + } else { + this->actor.speedXZ = 0.0f; + Math_SmoothDownscaleMaxF(&this->scale, 0.1f, 0.01f); + + if (this->scale < 0.01f) { + pos.x = this->actor.posRot.pos.x; + pos.y = this->actor.posRot.pos.y; + pos.z = this->actor.posRot.pos.z; + velocity.y = 4.0f; + EffectSsDeadDb_Spawn(globalCtx, &pos, &velocity, &accel, 120, 0, 255, 255, 255, 255, 255, 0, 0, 1, 9, true); + + if (!this->isBig) { + Item_DropCollectibleRandom(globalCtx, &this->actor, &pos, 0xE0); + } else { + Item_DropCollectibleRandom(globalCtx, &this->actor, &pos, 0xC0); + } + + if (this->actor.parent != NULL) { + spawner = (EnEncount1*)this->actor.parent; + + if (spawner->actor.update != NULL) { + if (!this->isBig) { + if (spawner->numLeeversDead < 10) { + spawner->numLeeversDead++; + } + // How many are dead? + osSyncPrintf("\n\n"); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 何匹ＤＥＡＤ？ ☆☆☆☆☆%d\n" VT_RST, spawner->numLeeversDead); + osSyncPrintf("\n\n"); + } + } + + Actor_Kill(&this->actor); + } + } + } +} + +void func_80AE5E48(EnReeba* this, GlobalContext* globalCtx) { + if (this->unk_278 < 37) { + this->actor.shape.rot.x = Math_Rand_CenteredFloat(3000.0f); + this->actor.shape.rot.z = Math_Rand_CenteredFloat(3000.0f); + + if (this->unk_278 == 0) { + if (this->isBig) { + this->actionfunc = func_80AE538C; + } else { + this->actionfunc = func_80AE5688; + } + } + } +} + +void func_80AE5EDC(EnReeba* this, GlobalContext* globalCtx) { + if (this->collider.base.acFlags & 2) { + this->collider.base.acFlags &= ~2; + + if ((this->actionfunc != func_80AE5C38) && (this->actionfunc != func_80AE5854)) { + this->actor.shape.rot.z = 0; + this->unk_27E = 0; + this->actor.shape.rot.x = this->actor.shape.rot.z; + + switch (this->actor.colChkInfo.damageEffect) { + case 11: // none + case 12: // boomerang + if ((this->actor.colChkInfo.health > 1) && (this->unk_27E != 4)) { + this->unk_27E = 4; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); + func_8003426C(&this->actor, 0, 0xFF, 0, 0x50); + this->actionfunc = func_80AE58EC; + break; + } + case 13: // hookshot/longshot + if ((this->actor.colChkInfo.health > 2) && (this->unk_27E != 4)) { + this->unk_27E = 4; + func_8003426C(&this->actor, 0, 0xFF, 0, 0x50); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); + this->actionfunc = func_80AE58EC; + break; + } + case 14: + this->unk_27C = 6; + Actor_ApplyDamage(&this->actor); + if (this->actor.colChkInfo.health == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_DEAD); + func_80032C7C(globalCtx, &this->actor); + this->actionfunc = func_80AE5BC4; + break; + } + if (this->actionfunc == func_80AE5E48) { + this->actor.shape.rot.z = 0; + this->actor.shape.rot.x = this->actor.shape.rot.z; + } + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_DAMAGE); + this->actionfunc = func_80AE57F0; + break; + case 3: // ice arrows/ice magic + Actor_ApplyDamage(&this->actor); + this->unk_27C = 2; + this->unk_27E = 2; + func_8003426C(&this->actor, 0, 0xFF, 0, 0x50); + this->actionfunc = func_80AE58EC; + break; + case 1: // unknown + if (this->unk_27E != 4) { + this->unk_27E = 4; + func_8003426C(&this->actor, 0, 0xFF, 0, 0x50); + this->actionfunc = func_80AE58EC; + } + break; + } + } + } +} + +void EnReeba_Update(Actor* thisx, GlobalContext* globalCtx) { + GlobalContext* globalCtx2 = globalCtx; + EnReeba* this = THIS; + Player* player = PLAYER; + + func_80AE5EDC(this, globalCtx); + this->actionfunc(this, globalCtx2); + Actor_SetScale(&this->actor, this->scale); + + if (this->unk_270 != 0) { + this->unk_270--; + } + + if (this->unk_272 != 0) { + this->unk_272--; + } + + if (this->unk_278 != 0) { + this->unk_278--; + } + + if (this->unk_274 != 0) { + this->unk_274--; + } + + if (this->unk_276 != 0) { + this->unk_276--; + } + + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx2, &this->actor, 35.0f, 60.0f, 60.0f, 0x1D); + + if (this->collider.base.atFlags & 4) { + this->collider.base.atFlags &= ~4; + + if ((this->actionfunc == func_80AE5270) || (this->actionfunc == func_80AE53AC)) { + this->actor.speedXZ = 8.0f; + this->actor.posRot.rot.y *= -1.0f; + this->unk_272 = 14; + this->actionfunc = func_80AE561C; + return; + } + } + + if (this->collider.base.atFlags & 2) { + this->collider.base.atFlags &= ~2; + if ((this->collider.base.at == &player->actor) && !this->isBig && (this->actionfunc != func_80AE56E0)) { + this->actionfunc = func_80AE5688; + } + } + + this->actor.posRot2.pos = this->actor.posRot.pos; + + if (!this->isBig) { + this->actor.posRot2.pos.y += 15.0f; + } else { + this->actor.posRot2.pos.y += 30.0f; + } + + Collider_CylinderUpdate(&this->actor, &this->collider); + + if ((this->actor.shape.unk_08 >= -700.0f) && (this->actor.colChkInfo.health > 0) && + (this->actionfunc != func_80AE56E0)) { + CollisionCheck_SetOC(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base); + + if (!(this->actor.shape.unk_08 < 0.0f)) { + CollisionCheck_SetAC(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base); + + if ((this->actionfunc == func_80AE5270) || (this->actionfunc == func_80AE53AC)) { + CollisionCheck_SetAT(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base); + } + } + } +} + +void EnReeba_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnReeba* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_reeba.c", 1062); + + func_80093D18(globalCtx->state.gfxCtx); + + if (this->isBig) { + gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0x0, 0x01, 155, 55, 255, 255); + } else { + gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0x0, 0x01, 255, 255, 255, 255); + } + + SkelAnime_Draw(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, NULL, NULL, &this->actor); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_reeba.c", 1088); + + if (BREG(0)) { + Vec3f debugPos; + + debugPos.x = (Math_Sins(this->actor.posRot.rot.y) * 30.0f) + this->actor.posRot.pos.x; + debugPos.y = this->actor.posRot.pos.y + 20.0f; + debugPos.z = (Math_Coss(this->actor.posRot.rot.y) * 30.0f) + this->actor.posRot.pos.z; + DebugDisplay_AddObject(debugPos.x, debugPos.y, debugPos.z, this->actor.posRot.rot.x, this->actor.posRot.rot.y, + this->actor.posRot.rot.z, 1.0f, 1.0f, 1.0f, 255, 0, 0, 255, 4, globalCtx->state.gfxCtx); + } +} diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h index 299d19bdf0..c469ab7387 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h @@ -6,9 +6,28 @@ struct EnReeba; +typedef void (*EnReebaActionFunc)(struct EnReeba*, GlobalContext*); + typedef struct EnReeba { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x190]; + /* 0x014C */ SkelAnime skelanime; + /* 0x0190 */ Vec3s limbDrawTable[18]; + /* 0x01FC */ Vec3s transitionDrawTable[18]; + /* 0x0268 */ char unk_268[0x4]; + /* 0x026C */ EnReebaActionFunc actionfunc; + /* 0x0270 */ s16 unk_270; + /* 0x0272 */ s16 unk_272; + /* 0x0274 */ s16 unk_274; + /* 0x0276 */ s16 unk_276; + /* 0x0278 */ s16 unk_278; + /* 0x027A */ s16 isBig; + /* 0x027C */ s16 unk_27C; + /* 0x027E */ s16 unk_27E; + /* 0x0280 */ s16 unk_280; + /* 0x0284 */ f32 unk_284; + /* 0x0288 */ f32 unk_288; + /* 0x028C */ f32 scale; + /* 0x0290 */ ColliderCylinder collider; } EnReeba; // size = 0x02DC extern const ActorInit En_Reeba_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index be61f0b71a..686c4fee5a 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -952,6 +952,10 @@ D_0E000000 = 0x0E000000; // z_vismono D_0F000000 = 0x0F000000; +// en_reeba +D_060001E4 = 0x060001E4; +D_06001EE8 = 0x06001EE8; + // z_en_dha D_06000BD8 = 0x06000BD8; D_060015B0 = 0x060015B0;