diff --git a/asm/non_matchings/code/code_8006C510/func_8006C510.s b/asm/non_matchings/code/code_8006C510/func_8006C510.s deleted file mode 100644 index 35ffdb402a..0000000000 --- a/asm/non_matchings/code/code_8006C510/func_8006C510.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8006C510 -/* AE36B0 8006C510 460C6082 */ mul.s $f2, $f12, $f12 -/* AE36B4 8006C514 3C014040 */ li $at, 0x40400000 # 0.000000 -/* AE36B8 8006C518 44812000 */ mtc1 $at, $f4 -/* AE36BC 8006C51C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AE36C0 8006C520 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* AE36C4 8006C524 AFA60040 */ sw $a2, 0x40($sp) -/* AE36C8 8006C528 AFA70044 */ sw $a3, 0x44($sp) -/* AE36CC 8006C52C 460C1402 */ mul.s $f16, $f2, $f12 -/* AE36D0 8006C530 00000000 */ nop -/* AE36D4 8006C534 46041182 */ mul.s $f6, $f2, $f4 -/* AE36D8 8006C538 44812000 */ mtc1 $at, $f4 -/* AE36DC 8006C53C 46108480 */ add.s $f18, $f16, $f16 -/* AE36E0 8006C540 E7A60004 */ swc1 $f6, 4($sp) -/* AE36E4 8006C544 C7A80004 */ lwc1 $f8, 4($sp) -/* AE36E8 8006C548 46089281 */ sub.s $f10, $f18, $f8 -/* AE36EC 8006C54C 46045180 */ add.s $f6, $f10, $f4 -/* AE36F0 8006C550 C7AA0040 */ lwc1 $f10, 0x40($sp) -/* AE36F4 8006C554 460A3102 */ mul.s $f4, $f6, $f10 -/* AE36F8 8006C558 46124181 */ sub.s $f6, $f8, $f18 -/* AE36FC 8006C55C C7AA0044 */ lwc1 $f10, 0x44($sp) -/* AE3700 8006C560 460A3202 */ mul.s $f8, $f6, $f10 -/* AE3704 8006C564 46021280 */ add.s $f10, $f2, $f2 -/* AE3708 8006C568 46082180 */ add.s $f6, $f4, $f8 -/* AE370C 8006C56C 460A8101 */ sub.s $f4, $f16, $f10 -/* AE3710 8006C570 C7AA0048 */ lwc1 $f10, 0x48($sp) -/* AE3714 8006C574 460C2200 */ add.s $f8, $f4, $f12 -/* AE3718 8006C578 460A4102 */ mul.s $f4, $f8, $f10 -/* AE371C 8006C57C 00000000 */ nop -/* AE3720 8006C580 460E2202 */ mul.s $f8, $f4, $f14 -/* AE3724 8006C584 46028101 */ sub.s $f4, $f16, $f2 -/* AE3728 8006C588 46083280 */ add.s $f10, $f6, $f8 -/* AE372C 8006C58C C7A6004C */ lwc1 $f6, 0x4c($sp) -/* AE3730 8006C590 27BD0038 */ addiu $sp, $sp, 0x38 -/* AE3734 8006C594 46062202 */ mul.s $f8, $f4, $f6 -/* AE3738 8006C598 00000000 */ nop -/* AE373C 8006C59C 460E4102 */ mul.s $f4, $f8, $f14 -/* AE3740 8006C5A0 03E00008 */ jr $ra -/* AE3744 8006C5A4 46045000 */ add.s $f0, $f10, $f4 - diff --git a/asm/non_matchings/code/code_8006C510/func_8006C5A8.s b/asm/non_matchings/code/code_8006C510/func_8006C5A8.s deleted file mode 100644 index 419c7e7886..0000000000 --- a/asm/non_matchings/code/code_8006C510/func_8006C5A8.s +++ /dev/null @@ -1,117 +0,0 @@ -.late_rodata -glabel D_8013B9D0 - .float 0.033333335 - -.text -glabel func_8006C5A8 -/* AE3748 8006C5A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AE374C 8006C5AC AFBF0024 */ sw $ra, 0x24($sp) -/* AE3750 8006C5B0 F7B40018 */ sdc1 $f20, 0x18($sp) -/* AE3754 8006C5B4 84AE0002 */ lh $t6, 2($a1) -/* AE3758 8006C5B8 46006506 */ mov.s $f20, $f12 -/* AE375C 8006C5BC 2408000C */ li $t0, 12 -/* AE3760 8006C5C0 448E2000 */ mtc1 $t6, $f4 -/* AE3764 8006C5C4 00000000 */ nop -/* AE3768 8006C5C8 468021A0 */ cvt.s.w $f6, $f4 -/* AE376C 8006C5CC 4606603E */ c.le.s $f12, $f6 -/* AE3770 8006C5D0 00000000 */ nop -/* AE3774 8006C5D4 45000003 */ bc1f .L8006C5E4 -/* AE3778 8006C5D8 00000000 */ nop -/* AE377C 8006C5DC 10000055 */ b .L8006C734 -/* AE3780 8006C5E0 C4A00008 */ lwc1 $f0, 8($a1) -.L8006C5E4: -/* AE3784 8006C5E4 00C80019 */ multu $a2, $t0 -/* AE3788 8006C5E8 00001825 */ move $v1, $zero -/* AE378C 8006C5EC 00007812 */ mflo $t7 -/* AE3790 8006C5F0 00AF1021 */ addu $v0, $a1, $t7 -/* AE3794 8006C5F4 8458FFF6 */ lh $t8, -0xa($v0) -/* AE3798 8006C5F8 44984000 */ mtc1 $t8, $f8 -/* AE379C 8006C5FC 00000000 */ nop -/* AE37A0 8006C600 468042A0 */ cvt.s.w $f10, $f8 -/* AE37A4 8006C604 4614503E */ c.le.s $f10, $f20 -/* AE37A8 8006C608 00000000 */ nop -/* AE37AC 8006C60C 45020004 */ bc1fl .L8006C620 -/* AE37B0 8006C610 00A01025 */ move $v0, $a1 -/* AE37B4 8006C614 10000047 */ b .L8006C734 -/* AE37B8 8006C618 C440FFFC */ lwc1 $f0, -4($v0) -/* AE37BC 8006C61C 00A01025 */ move $v0, $a1 -.L8006C620: -/* AE37C0 8006C620 8459000E */ lh $t9, 0xe($v0) -/* AE37C4 8006C624 44999000 */ mtc1 $t9, $f18 -/* AE37C8 8006C628 00000000 */ nop -/* AE37CC 8006C62C 46809120 */ cvt.s.w $f4, $f18 -/* AE37D0 8006C630 4604A03C */ c.lt.s $f20, $f4 -/* AE37D4 8006C634 00000000 */ nop -/* AE37D8 8006C638 4502003C */ bc1fl .L8006C72C -/* AE37DC 8006C63C 24630001 */ addiu $v1, $v1, 1 -/* AE37E0 8006C640 94460000 */ lhu $a2, ($v0) -/* AE37E4 8006C644 30C90001 */ andi $t1, $a2, 1 -/* AE37E8 8006C648 11200003 */ beqz $t1, .L8006C658 -/* AE37EC 8006C64C 30CA0002 */ andi $t2, $a2, 2 -/* AE37F0 8006C650 10000038 */ b .L8006C734 -/* AE37F4 8006C654 C4400008 */ lwc1 $f0, 8($v0) -.L8006C658: -/* AE37F8 8006C658 11400015 */ beqz $t2, .L8006C6B0 -/* AE37FC 8006C65C 24640001 */ addiu $a0, $v1, 1 -/* AE3800 8006C660 00880019 */ multu $a0, $t0 -/* AE3804 8006C664 844C0002 */ lh $t4, 2($v0) -/* AE3808 8006C668 C4420008 */ lwc1 $f2, 8($v0) -/* AE380C 8006C66C 448C3000 */ mtc1 $t4, $f6 -/* AE3810 8006C670 00000000 */ nop -/* AE3814 8006C674 46803420 */ cvt.s.w $f16, $f6 -/* AE3818 8006C678 00005812 */ mflo $t3 -/* AE381C 8006C67C 00AB1821 */ addu $v1, $a1, $t3 -/* AE3820 8006C680 846D0002 */ lh $t5, 2($v1) -/* AE3824 8006C684 4610A201 */ sub.s $f8, $f20, $f16 -/* AE3828 8006C688 448D5000 */ mtc1 $t5, $f10 -/* AE382C 8006C68C 00000000 */ nop -/* AE3830 8006C690 468054A0 */ cvt.s.w $f18, $f10 -/* AE3834 8006C694 C46A0008 */ lwc1 $f10, 8($v1) -/* AE3838 8006C698 46109101 */ sub.s $f4, $f18, $f16 -/* AE383C 8006C69C 46025481 */ sub.s $f18, $f10, $f2 -/* AE3840 8006C6A0 46044183 */ div.s $f6, $f8, $f4 -/* AE3844 8006C6A4 46069202 */ mul.s $f8, $f18, $f6 -/* AE3848 8006C6A8 10000022 */ b .L8006C734 -/* AE384C 8006C6AC 46024000 */ add.s $f0, $f8, $f2 -.L8006C6B0: -/* AE3850 8006C6B0 00880019 */ multu $a0, $t0 -/* AE3854 8006C6B4 844E0002 */ lh $t6, 2($v0) -/* AE3858 8006C6B8 84590006 */ lh $t9, 6($v0) -/* AE385C 8006C6BC 8C460008 */ lw $a2, 8($v0) -/* AE3860 8006C6C0 448E2000 */ mtc1 $t6, $f4 -/* AE3864 8006C6C4 3C018014 */ lui $at, %hi(D_8013B9D0) -/* AE3868 8006C6C8 C428B9D0 */ lwc1 $f8, %lo(D_8013B9D0)($at) -/* AE386C 8006C6CC 46802420 */ cvt.s.w $f16, $f4 -/* AE3870 8006C6D0 44992000 */ mtc1 $t9, $f4 -/* AE3874 8006C6D4 00007812 */ mflo $t7 -/* AE3878 8006C6D8 00AF1821 */ addu $v1, $a1, $t7 -/* AE387C 8006C6DC 84780002 */ lh $t8, 2($v1) -/* AE3880 8006C6E0 8C670008 */ lw $a3, 8($v1) -/* AE3884 8006C6E4 4610A181 */ sub.s $f6, $f20, $f16 -/* AE3888 8006C6E8 44985000 */ mtc1 $t8, $f10 -/* AE388C 8006C6EC 00000000 */ nop -/* AE3890 8006C6F0 468054A0 */ cvt.s.w $f18, $f10 -/* AE3894 8006C6F4 468022A0 */ cvt.s.w $f10, $f4 -/* AE3898 8006C6F8 46109001 */ sub.s $f0, $f18, $f16 -/* AE389C 8006C6FC E7AA0010 */ swc1 $f10, 0x10($sp) -/* AE38A0 8006C700 84690004 */ lh $t1, 4($v1) -/* AE38A4 8006C704 46003303 */ div.s $f12, $f6, $f0 -/* AE38A8 8006C708 44899000 */ mtc1 $t1, $f18 -/* AE38AC 8006C70C 00000000 */ nop -/* AE38B0 8006C710 468091A0 */ cvt.s.w $f6, $f18 -/* AE38B4 8006C714 46080382 */ mul.s $f14, $f0, $f8 -/* AE38B8 8006C718 0C01B144 */ jal func_8006C510 -/* AE38BC 8006C71C E7A60014 */ swc1 $f6, 0x14($sp) -/* AE38C0 8006C720 10000005 */ b .L8006C738 -/* AE38C4 8006C724 8FBF0024 */ lw $ra, 0x24($sp) -/* AE38C8 8006C728 24630001 */ addiu $v1, $v1, 1 -.L8006C72C: -/* AE38CC 8006C72C 1000FFBC */ b .L8006C620 -/* AE38D0 8006C730 2442000C */ addiu $v0, $v0, 0xc -.L8006C734: -/* AE38D4 8006C734 8FBF0024 */ lw $ra, 0x24($sp) -.L8006C738: -/* AE38D8 8006C738 D7B40018 */ ldc1 $f20, 0x18($sp) -/* AE38DC 8006C73C 27BD0028 */ addiu $sp, $sp, 0x28 -/* AE38E0 8006C740 03E00008 */ jr $ra -/* AE38E4 8006C744 00000000 */ nop diff --git a/asm/non_matchings/code/z_player_lib/func_8008E750.s b/asm/non_matchings/code/z_player_lib/func_8008E750.s deleted file mode 100644 index 2ec2ac1a7f..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008E750.s +++ /dev/null @@ -1,106 +0,0 @@ -glabel func_8008E750 -/* B058F0 8008E750 3C068016 */ lui $a2, %hi(gGameInfo) # $a2, 0x8016 -/* B058F4 8008E754 24C6FA90 */ addiu $a2, %lo(gGameInfo) # addiu $a2, $a2, -0x570 -/* B058F8 8008E758 8CCF0000 */ lw $t7, ($a2) -/* B058FC 8008E75C 240E07D0 */ li $t6, 2000 -/* B05900 8008E760 24180172 */ li $t8, 370 -/* B05904 8008E764 A5EE004A */ sh $t6, 0x4a($t7) -/* B05908 8008E768 8CD90000 */ lw $t9, ($a2) -/* B0590C 8008E76C 3C088016 */ lui $t0, %hi(gSaveContext+4) # $t0, 0x8016 -/* B05910 8008E770 24010001 */ li $at, 1 -/* B05914 8008E774 A7380074 */ sh $t8, 0x74($t9) -/* B05918 8008E778 80A2014F */ lb $v0, 0x14f($a1) -/* B0591C 8008E77C 3C188012 */ lui $t8, %hi(D_80125B78) # $t8, 0x8012 -/* B05920 8008E780 27185B78 */ addiu $t8, %lo(D_80125B78) # addiu $t8, $t8, 0x5b78 -/* B05924 8008E784 14400006 */ bnez $v0, .L8008E7A0 -/* B05928 8008E788 00000000 */ nop -/* B0592C 8008E78C 8D08E664 */ lw $t0, %lo(gSaveContext+4)($t0) -/* B05930 8008E790 51000011 */ beql $t0, $zero, .L8008E7D8 -/* B05934 8008E794 00027900 */ sll $t7, $v0, 4 -/* B05938 8008E798 1000000E */ b .L8008E7D4 -/* B0593C 8008E79C 24020005 */ li $v0, 5 -.L8008E7A0: -/* B05940 8008E7A0 5441000D */ bnel $v0, $at, .L8008E7D8 -/* B05944 8008E7A4 00027900 */ sll $t7, $v0, 4 -/* B05948 8008E7A8 8CA9067C */ lw $t1, 0x67c($a1) -/* B0594C 8008E7AC 00095100 */ sll $t2, $t1, 4 -/* B05950 8008E7B0 05430003 */ bgezl $t2, .L8008E7C0 -/* B05954 8008E7B4 8CCC0000 */ lw $t4, ($a2) -/* B05958 8008E7B8 24020004 */ li $v0, 4 -/* B0595C 8008E7BC 8CCC0000 */ lw $t4, ($a2) -.L8008E7C0: -/* B05960 8008E7C0 240B01F4 */ li $t3, 500 -/* B05964 8008E7C4 240D0064 */ li $t5, 100 -/* B05968 8008E7C8 A58B004A */ sh $t3, 0x4a($t4) -/* B0596C 8008E7CC 8CCE0000 */ lw $t6, ($a2) -/* B05970 8008E7D0 A5CD0074 */ sh $t5, 0x74($t6) -.L8008E7D4: -/* B05974 8008E7D4 00027900 */ sll $t7, $v0, 4 -.L8008E7D8: -/* B05978 8008E7D8 01E27821 */ addu $t7, $t7, $v0 -/* B0597C 8008E7DC 000F7840 */ sll $t7, $t7, 1 -/* B05980 8008E7E0 01F81821 */ addu $v1, $t7, $t8 -/* B05984 8008E7E4 84790000 */ lh $t9, ($v1) -/* B05988 8008E7E8 8CC80000 */ lw $t0, ($a2) -/* B0598C 8008E7EC 24010002 */ li $at, 2 -/* B05990 8008E7F0 A519003A */ sh $t9, 0x3a($t0) -/* B05994 8008E7F4 8CCA0000 */ lw $t2, ($a2) -/* B05998 8008E7F8 84690002 */ lh $t1, 2($v1) -/* B0599C 8008E7FC A5490050 */ sh $t1, 0x50($t2) -/* B059A0 8008E800 8CCC0000 */ lw $t4, ($a2) -/* B059A4 8008E804 846B0004 */ lh $t3, 4($v1) -/* B059A8 8008E808 A58B0054 */ sh $t3, 0x54($t4) -/* B059AC 8008E80C 8CCE0000 */ lw $t6, ($a2) -/* B059B0 8008E810 846D0006 */ lh $t5, 6($v1) -/* B059B4 8008E814 A5CD0058 */ sh $t5, 0x58($t6) -/* B059B8 8008E818 8CD80000 */ lw $t8, ($a2) -/* B059BC 8008E81C 846F0008 */ lh $t7, 8($v1) -/* B059C0 8008E820 A70F005A */ sh $t7, 0x5a($t8) -/* B059C4 8008E824 8CC80000 */ lw $t0, ($a2) -/* B059C8 8008E828 8479000A */ lh $t9, 0xa($v1) -/* B059CC 8008E82C A519005C */ sh $t9, 0x5c($t0) -/* B059D0 8008E830 8CCA0000 */ lw $t2, ($a2) -/* B059D4 8008E834 8469000C */ lh $t1, 0xc($v1) -/* B059D8 8008E838 A549005E */ sh $t1, 0x5e($t2) -/* B059DC 8008E83C 8CCC0000 */ lw $t4, ($a2) -/* B059E0 8008E840 846B000E */ lh $t3, 0xe($v1) -/* B059E4 8008E844 A58B0060 */ sh $t3, 0x60($t4) -/* B059E8 8008E848 8CCE0000 */ lw $t6, ($a2) -/* B059EC 8008E84C 846D0010 */ lh $t5, 0x10($v1) -/* B059F0 8008E850 A5CD006A */ sh $t5, 0x6a($t6) -/* B059F4 8008E854 8CD80000 */ lw $t8, ($a2) -/* B059F8 8008E858 846F0012 */ lh $t7, 0x12($v1) -/* B059FC 8008E85C A70F006E */ sh $t7, 0x6e($t8) -/* B05A00 8008E860 8CC80000 */ lw $t0, ($a2) -/* B05A04 8008E864 84790014 */ lh $t9, 0x14($v1) -/* B05A08 8008E868 A519009C */ sh $t9, 0x9c($t0) -/* B05A0C 8008E86C 8CCA0000 */ lw $t2, ($a2) -/* B05A10 8008E870 84690016 */ lh $t1, 0x16($v1) -/* B05A14 8008E874 A549009E */ sh $t1, 0x9e($t2) -/* B05A18 8008E878 8CCC0000 */ lw $t4, ($a2) -/* B05A1C 8008E87C 846B0018 */ lh $t3, 0x18($v1) -/* B05A20 8008E880 A58B0758 */ sh $t3, 0x758($t4) -/* B05A24 8008E884 8CCE0000 */ lw $t6, ($a2) -/* B05A28 8008E888 846D001A */ lh $t5, 0x1a($v1) -/* B05A2C 8008E88C 3C0B0001 */ lui $t3, 1 -/* B05A30 8008E890 01645821 */ addu $t3, $t3, $a0 -/* B05A34 8008E894 A5CD075A */ sh $t5, 0x75a($t6) -/* B05A38 8008E898 8CD80000 */ lw $t8, ($a2) -/* B05A3C 8008E89C 846F001C */ lh $t7, 0x1c($v1) -/* B05A40 8008E8A0 A70F075C */ sh $t7, 0x75c($t8) -/* B05A44 8008E8A4 8CC80000 */ lw $t0, ($a2) -/* B05A48 8008E8A8 8479001E */ lh $t9, 0x1e($v1) -/* B05A4C 8008E8AC A519075E */ sh $t9, 0x75e($t0) -/* B05A50 8008E8B0 8CCA0000 */ lw $t2, ($a2) -/* B05A54 8008E8B4 84690020 */ lh $t1, 0x20($v1) -/* B05A58 8008E8B8 A5490492 */ sh $t1, 0x492($t2) -/* B05A5C 8008E8BC 916B1CBF */ lbu $t3, 0x1cbf($t3) -/* B05A60 8008E8C0 15610004 */ bne $t3, $at, .L8008E8D4 -/* B05A64 8008E8C4 00000000 */ nop -/* B05A68 8008E8C8 8CCD0000 */ lw $t5, ($a2) -/* B05A6C 8008E8CC 240C01F4 */ li $t4, 500 -/* B05A70 8008E8D0 A5AC006E */ sh $t4, 0x6e($t5) -.L8008E8D4: -/* B05A74 8008E8D4 03E00008 */ jr $ra -/* B05A78 8008E8D8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_8008E9F8.s b/asm/non_matchings/code/z_player_lib/func_8008E9F8.s deleted file mode 100644 index 29e5022a67..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008E9F8.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8008E9F8 -/* B05B98 8008E9F8 3C038012 */ lui $v1, %hi(D_80125C44) -/* B05B9C 8008E9FC 00651821 */ addu $v1, $v1, $a1 -/* B05BA0 8008EA00 90635C44 */ lbu $v1, %lo(D_80125C44)($v1) -/* B05BA4 8008EA04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B05BA8 8008EA08 24010002 */ li $at, 2 -/* B05BAC 8008EA0C 14610007 */ bne $v1, $at, .L8008EA2C -/* B05BB0 8008EA10 AFBF0014 */ sw $ra, 0x14($sp) -/* B05BB4 8008EA14 0C023A74 */ jal func_8008E9D0 -/* B05BB8 8008EA18 AFA3001C */ sw $v1, 0x1c($sp) -/* B05BBC 8008EA1C 10400003 */ beqz $v0, .L8008EA2C -/* B05BC0 8008EA20 8FA3001C */ lw $v1, 0x1c($sp) -/* B05BC4 8008EA24 10000002 */ b .L8008EA30 -/* B05BC8 8008EA28 24020001 */ li $v0, 1 -.L8008EA2C: -/* B05BCC 8008EA2C 00601025 */ move $v0, $v1 -.L8008EA30: -/* B05BD0 8008EA30 8FBF0014 */ lw $ra, 0x14($sp) -/* B05BD4 8008EA34 27BD0020 */ addiu $sp, $sp, 0x20 -/* B05BD8 8008EA38 03E00008 */ jr $ra -/* B05BDC 8008EA3C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_8008EC04.s b/asm/non_matchings/code/z_player_lib/func_8008EC04.s deleted file mode 100644 index 08587c2a77..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008EC04.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_8008EC04 -/* B05DA4 8008EC04 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B05DA8 8008EC08 AFBF0014 */ sw $ra, 0x14($sp) -/* B05DAC 8008EC0C 24010001 */ li $at, 1 -/* B05DB0 8008EC10 14A10003 */ bne $a1, $at, .L8008EC20 -/* B05DB4 8008EC14 A0850158 */ sb $a1, 0x158($a0) -/* B05DB8 8008EC18 10000007 */ b .L8008EC38 -/* B05DBC 8008EC1C A080015B */ sb $zero, 0x15b($a0) -.L8008EC20: -/* B05DC0 8008EC20 00057080 */ sll $t6, $a1, 2 -/* B05DC4 8008EC24 01C57021 */ addu $t6, $t6, $a1 -/* B05DC8 8008EC28 3C0F8012 */ lui $t7, %hi(D_80125C98) -/* B05DCC 8008EC2C 01EE7821 */ addu $t7, $t7, $t6 -/* B05DD0 8008EC30 91EF5C98 */ lbu $t7, %lo(D_80125C98)($t7) -/* B05DD4 8008EC34 A08F015B */ sb $t7, 0x15b($a0) -.L8008EC38: -/* B05DD8 8008EC38 9098015B */ lbu $t8, 0x15b($a0) -/* B05DDC 8008EC3C 2B010003 */ slti $at, $t8, 3 -/* B05DE0 8008EC40 10200005 */ beqz $at, .L8008EC58 -/* B05DE4 8008EC44 00000000 */ nop -/* B05DE8 8008EC48 8099014E */ lb $t9, 0x14e($a0) -/* B05DEC 8008EC4C 17200002 */ bnez $t9, .L8008EC58 -/* B05DF0 8008EC50 00000000 */ nop -/* B05DF4 8008EC54 A080015B */ sb $zero, 0x15b($a0) -.L8008EC58: -/* B05DF8 8008EC58 0C023ACB */ jal func_8008EB2C -/* B05DFC 8008EC5C 00000000 */ nop -/* B05E00 8008EC60 8FBF0014 */ lw $ra, 0x14($sp) -/* B05E04 8008EC64 27BD0018 */ addiu $sp, $sp, 0x18 -/* B05E08 8008EC68 03E00008 */ jr $ra -/* B05E0C 8008EC6C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_8008EE08.s b/asm/non_matchings/code/z_player_lib/func_8008EE08.s deleted file mode 100644 index 5855b4ff40..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008EE08.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_8008EE08 -/* B05FA8 8008EE08 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B05FAC 8008EE0C AFBF0014 */ sw $ra, 0x14($sp) -/* B05FB0 8008EE10 948E0088 */ lhu $t6, 0x88($a0) -/* B05FB4 8008EE14 31CF0001 */ andi $t7, $t6, 1 -/* B05FB8 8008EE18 55E00013 */ bnezl $t7, .L8008EE68 -/* B05FBC 8008EE1C 8C88067C */ lw $t0, 0x67c($a0) -/* B05FC0 8008EE20 8C82067C */ lw $v0, 0x67c($a0) -/* B05FC4 8008EE24 3C0108A0 */ lui $at, 0x8a0 -/* B05FC8 8008EE28 0041C024 */ and $t8, $v0, $at -/* B05FCC 8008EE2C 1700000D */ bnez $t8, .L8008EE64 -/* B05FD0 8008EE30 3C01000C */ lui $at, 0xc -/* B05FD4 8008EE34 0041C824 */ and $t9, $v0, $at -/* B05FD8 8008EE38 57200011 */ bnezl $t9, .L8008EE80 -/* B05FDC 8008EE3C 3C01002C */ lui $at, 0x2c -/* B05FE0 8008EE40 C4840028 */ lwc1 $f4, 0x28($a0) -/* B05FE4 8008EE44 C4860080 */ lwc1 $f6, 0x80($a0) -/* B05FE8 8008EE48 3C0142C8 */ li $at, 0x42C80000 # 0.000000 -/* B05FEC 8008EE4C 44815000 */ mtc1 $at, $f10 -/* B05FF0 8008EE50 46062201 */ sub.s $f8, $f4, $f6 -/* B05FF4 8008EE54 460A403C */ c.lt.s $f8, $f10 -/* B05FF8 8008EE58 00000000 */ nop -/* B05FFC 8008EE5C 45020008 */ bc1fl .L8008EE80 -/* B06000 8008EE60 3C01002C */ lui $at, 0x2c -.L8008EE64: -/* B06004 8008EE64 8C88067C */ lw $t0, 0x67c($a0) -.L8008EE68: -/* B06008 8008EE68 3C01BFF0 */ lui $at, (0xBFF07FFF >> 16) # lui $at, 0xbff0 -/* B0600C 8008EE6C 34217FFF */ ori $at, (0xBFF07FFF & 0xFFFF) # ori $at, $at, 0x7fff -/* B06010 8008EE70 01014824 */ and $t1, $t0, $at -/* B06014 8008EE74 10000007 */ b .L8008EE94 -/* B06018 8008EE78 AC89067C */ sw $t1, 0x67c($a0) -/* B0601C 8008EE7C 3C01002C */ lui $at, 0x2c -.L8008EE80: -/* B06020 8008EE80 00415024 */ and $t2, $v0, $at -/* B06024 8008EE84 15400003 */ bnez $t2, .L8008EE94 -/* B06028 8008EE88 3C010008 */ lui $at, 8 -/* B0602C 8008EE8C 00415825 */ or $t3, $v0, $at -/* B06030 8008EE90 AC8B067C */ sw $t3, 0x67c($a0) -.L8008EE94: -/* B06034 8008EE94 0C023B7C */ jal func_8008EDF0 -/* B06038 8008EE98 00000000 */ nop -/* B0603C 8008EE9C 8FBF0014 */ lw $ra, 0x14($sp) -/* B06040 8008EEA0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B06044 8008EEA4 03E00008 */ jr $ra -/* B06048 8008EEA8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_8008EF40.s b/asm/non_matchings/code/z_player_lib/func_8008EF40.s deleted file mode 100644 index dd539f43db..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008EF40.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8008EF40 -/* B060D0 8008EF30 8C831C44 */ lw $v1, 0x1c44($a0) -/* B060D4 8008EF34 3C010080 */ lui $at, 0x80 -/* B060D8 8008EF38 8C62067C */ lw $v0, 0x67c($v1) -/* B060DC 8008EF3C 03E00008 */ jr $ra -/* B060E0 8008EF40 00411024 */ and $v0, $v0, $at diff --git a/asm/non_matchings/code/z_player_lib/func_8008EF5C.s b/asm/non_matchings/code/z_player_lib/func_8008EF5C.s deleted file mode 100644 index 4f989153a5..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008EF5C.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_8008EF5C -/* B060FC 8008EF5C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B06100 8008EF60 AFBF0014 */ sw $ra, 0x14($sp) -/* B06104 8008EF64 AFA7003C */ sw $a3, 0x3c($sp) -/* B06108 8008EF68 8C821C44 */ lw $v0, 0x1c44($a0) -/* B0610C 8008EF6C 44866000 */ mtc1 $a2, $f12 -/* B06110 8008EF70 24010006 */ li $at, 6 -/* B06114 8008EF74 804E0151 */ lb $t6, 0x151($v0) -/* B06118 8008EF78 55C1002A */ bnel $t6, $at, .L8008F024 -/* B0611C 8008EF7C 00001025 */ move $v0, $zero -/* B06120 8008EF80 844F0860 */ lh $t7, 0x860($v0) -/* B06124 8008EF84 244408B8 */ addiu $a0, $v0, 0x8b8 -/* B06128 8008EF88 27A60020 */ addiu $a2, $sp, 0x20 -/* B0612C 8008EF8C 51E00025 */ beql $t7, $zero, .L8008F024 -/* B06130 8008EF90 00001025 */ move $v0, $zero -/* B06134 8008EF94 0C01DFB4 */ jal Math_Vec3f_Diff -/* B06138 8008EF98 E7AC0038 */ swc1 $f12, 0x38($sp) -/* B0613C 8008EF9C C7A00020 */ lwc1 $f0, 0x20($sp) -/* B06140 8008EFA0 C7A20028 */ lwc1 $f2, 0x28($sp) -/* B06144 8008EFA4 C7AC0038 */ lwc1 $f12, 0x38($sp) -/* B06148 8008EFA8 46000102 */ mul.s $f4, $f0, $f0 -/* B0614C 8008EFAC C7A00024 */ lwc1 $f0, 0x24($sp) -/* B06150 8008EFB0 00001025 */ move $v0, $zero -/* B06154 8008EFB4 46021182 */ mul.s $f6, $f2, $f2 -/* B06158 8008EFB8 46062200 */ add.s $f8, $f4, $f6 -/* B0615C 8008EFBC 460C6282 */ mul.s $f10, $f12, $f12 -/* B06160 8008EFC0 460A403E */ c.le.s $f8, $f10 -/* B06164 8008EFC4 00000000 */ nop -/* B06168 8008EFC8 45000002 */ bc1f .L8008EFD4 -/* B0616C 8008EFCC 00000000 */ nop -/* B06170 8008EFD0 24020001 */ li $v0, 1 -.L8008EFD4: -/* B06174 8008EFD4 50400014 */ beql $v0, $zero, .L8008F028 -/* B06178 8008EFD8 8FBF0014 */ lw $ra, 0x14($sp) -/* B0617C 8008EFDC 44808000 */ mtc1 $zero, $f16 -/* B06180 8008EFE0 00001025 */ move $v0, $zero -/* B06184 8008EFE4 C7B2003C */ lwc1 $f18, 0x3c($sp) -/* B06188 8008EFE8 4600803E */ c.le.s $f16, $f0 -/* B0618C 8008EFEC 00000000 */ nop -/* B06190 8008EFF0 45000002 */ bc1f .L8008EFFC -/* B06194 8008EFF4 00000000 */ nop -/* B06198 8008EFF8 24020001 */ li $v0, 1 -.L8008EFFC: -/* B0619C 8008EFFC 5040000A */ beql $v0, $zero, .L8008F028 -/* B061A0 8008F000 8FBF0014 */ lw $ra, 0x14($sp) -/* B061A4 8008F004 4612003E */ c.le.s $f0, $f18 -/* B061A8 8008F008 00001025 */ move $v0, $zero -/* B061AC 8008F00C 45020006 */ bc1fl .L8008F028 -/* B061B0 8008F010 8FBF0014 */ lw $ra, 0x14($sp) -/* B061B4 8008F014 24020001 */ li $v0, 1 -/* B061B8 8008F018 10000003 */ b .L8008F028 -/* B061BC 8008F01C 8FBF0014 */ lw $ra, 0x14($sp) -/* B061C0 8008F020 00001025 */ move $v0, $zero -.L8008F024: -/* B061C4 8008F024 8FBF0014 */ lw $ra, 0x14($sp) -.L8008F028: -/* B061C8 8008F028 27BD0030 */ addiu $sp, $sp, 0x30 -/* B061CC 8008F02C 03E00008 */ jr $ra -/* B061D0 8008F030 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_8008F034.s b/asm/non_matchings/code/z_player_lib/func_8008F034.s deleted file mode 100644 index 61d692e9b0..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008F034.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8008F034 -/* B061D4 8008F034 3C028016 */ lui $v0, %hi(gSaveContext) # $v0, 0x8016 -/* B061D8 8008F038 2442E660 */ addiu $v0, %lo(gSaveContext) # addiu $v0, $v0, -0x19a0 -/* B061DC 8008F03C 3C0F8012 */ lui $t7, %hi(gUpgradeMasks+8) # $t7, 0x8012 -/* B061E0 8008F040 8DEF71B8 */ lw $t7, %lo(gUpgradeMasks+8)($t7) -/* B061E4 8008F044 8C4E00A0 */ lw $t6, 0xa0($v0) -/* B061E8 8008F048 8C480004 */ lw $t0, 4($v0) -/* B061EC 8008F04C 3C198012 */ lui $t9, %hi(gUpgradeShifts+2) # $t9, 0x8012 -/* B061F0 8008F050 933971F6 */ lbu $t9, %lo(gUpgradeShifts+2)($t9) -/* B061F4 8008F054 01CFC024 */ and $t8, $t6, $t7 -/* B061F8 8008F058 15000003 */ bnez $t0, .L8008F068 -/* B061FC 8008F05C 03381807 */ srav $v1, $t8, $t9 -/* B06200 8008F060 03E00008 */ jr $ra -/* B06204 8008F064 00601025 */ move $v0, $v1 - -.L8008F068: -/* B06208 8008F068 10600003 */ beqz $v1, .L8008F078 -/* B0620C 8008F06C 00001025 */ move $v0, $zero -/* B06210 8008F070 03E00008 */ jr $ra -/* B06214 8008F074 24020001 */ li $v0, 1 - -.L8008F078: -/* B06218 8008F078 03E00008 */ jr $ra -/* B0621C 8008F07C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_8008F1CC.s b/asm/non_matchings/code/z_player_lib/func_8008F1CC.s deleted file mode 100644 index ab6cefd020..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008F1CC.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_8008F1CC -/* B0636C 8008F1CC 80820151 */ lb $v0, 0x151($a0) -/* B06370 8008F1D0 3C0E8016 */ lui $t6, %hi(gSaveContext+0x36) -/* B06374 8008F1D4 38420005 */ xori $v0, $v0, 5 -/* B06378 8008F1D8 2C420001 */ sltiu $v0, $v0, 1 -/* B0637C 8008F1DC 1040000F */ beqz $v0, .L8008F21C -/* B06380 8008F1E0 00000000 */ nop -/* B06384 8008F1E4 95CEE696 */ lhu $t6, %lo(gSaveContext+0x36)($t6) -/* B06388 8008F1E8 44802000 */ mtc1 $zero, $f4 -/* B0638C 8008F1EC 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B06390 8008F1F0 448E3000 */ mtc1 $t6, $f6 -/* B06394 8008F1F4 05C10004 */ bgez $t6, .L8008F208 -/* B06398 8008F1F8 46803220 */ cvt.s.w $f8, $f6 -/* B0639C 8008F1FC 44815000 */ mtc1 $at, $f10 -/* B063A0 8008F200 00000000 */ nop -/* B063A4 8008F204 460A4200 */ add.s $f8, $f8, $f10 -.L8008F208: -/* B063A8 8008F208 4604403E */ c.le.s $f8, $f4 -/* B063AC 8008F20C 00001025 */ move $v0, $zero -/* B063B0 8008F210 45000002 */ bc1f .L8008F21C -/* B063B4 8008F214 00000000 */ nop -/* B063B8 8008F218 24020001 */ li $v0, 1 -.L8008F21C: -/* B063BC 8008F21C 03E00008 */ jr $ra -/* B063C0 8008F220 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_8008F2F8.s b/asm/non_matchings/code/z_player_lib/func_8008F2F8.s deleted file mode 100644 index 02108a3402..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008F2F8.s +++ /dev/null @@ -1,108 +0,0 @@ -glabel func_8008F2F8 -/* B06498 8008F2F8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B0649C 8008F2FC 3C0E0001 */ lui $t6, 1 -/* B064A0 8008F300 AFBF0014 */ sw $ra, 0x14($sp) -/* B064A4 8008F304 01C47021 */ addu $t6, $t6, $a0 -/* B064A8 8008F308 91CE1CBE */ lbu $t6, 0x1cbe($t6) -/* B064AC 8008F30C 24010003 */ li $at, 3 -/* B064B0 8008F310 8C851C44 */ lw $a1, 0x1c44($a0) -/* B064B4 8008F314 55C10004 */ bnel $t6, $at, .L8008F328 -/* B064B8 8008F318 94A20840 */ lhu $v0, 0x840($a1) -/* B064BC 8008F31C 1000001D */ b .L8008F394 -/* B064C0 8008F320 00001825 */ move $v1, $zero -/* B064C4 8008F324 94A20840 */ lhu $v0, 0x840($a1) -.L8008F328: -/* B064C8 8008F328 28410051 */ slti $at, $v0, 0x51 -/* B064CC 8008F32C 54200012 */ bnezl $at, .L8008F378 -/* B064D0 8008F330 8CB9067C */ lw $t9, 0x67c($a1) -/* B064D4 8008F334 80A3014F */ lb $v1, 0x14f($a1) -/* B064D8 8008F338 24010001 */ li $at, 1 -/* B064DC 8008F33C 10610002 */ beq $v1, $at, .L8008F348 -/* B064E0 8008F340 2841012C */ slti $at, $v0, 0x12c -/* B064E4 8008F344 1420000B */ bnez $at, .L8008F374 -.L8008F348: -/* B064E8 8008F348 24010001 */ li $at, 1 -/* B064EC 8008F34C 14610007 */ bne $v1, $at, .L8008F36C -/* B064F0 8008F350 00000000 */ nop -/* B064F4 8008F354 94AF0088 */ lhu $t7, 0x88($a1) -/* B064F8 8008F358 31F80001 */ andi $t8, $t7, 1 -/* B064FC 8008F35C 13000003 */ beqz $t8, .L8008F36C -/* B06500 8008F360 00000000 */ nop -/* B06504 8008F364 1000000B */ b .L8008F394 -/* B06508 8008F368 24030001 */ li $v1, 1 -.L8008F36C: -/* B0650C 8008F36C 10000009 */ b .L8008F394 -/* B06510 8008F370 24030003 */ li $v1, 3 -.L8008F374: -/* B06514 8008F374 8CB9067C */ lw $t9, 0x67c($a1) -.L8008F378: -/* B06518 8008F378 00194100 */ sll $t0, $t9, 4 -/* B0651C 8008F37C 05010003 */ bgez $t0, .L8008F38C -/* B06520 8008F380 00000000 */ nop -/* B06524 8008F384 10000003 */ b .L8008F394 -/* B06528 8008F388 24030002 */ li $v1, 2 -.L8008F38C: -/* B0652C 8008F38C 10000034 */ b .L8008F460 -/* B06530 8008F390 00001025 */ move $v0, $zero -.L8008F394: -/* B06534 8008F394 AFA3001C */ sw $v1, 0x1c($sp) -/* B06538 8008F398 AFA40028 */ sw $a0, 0x28($sp) -/* B0653C 8008F39C 0C023A62 */ jal func_8008E988 -/* B06540 8008F3A0 AFA50024 */ sw $a1, 0x24($sp) -/* B06544 8008F3A4 8FA3001C */ lw $v1, 0x1c($sp) -/* B06548 8008F3A8 8FA40028 */ lw $a0, 0x28($sp) -/* B0654C 8008F3AC 1440002B */ bnez $v0, .L8008F45C -/* B06550 8008F3B0 8FA50024 */ lw $a1, 0x24($sp) -/* B06554 8008F3B4 3C0A8012 */ lui $t2, %hi(D_80125C88) # $t2, 0x8012 -/* B06558 8008F3B8 254A5C88 */ addiu $t2, %lo(D_80125C88) # addiu $t2, $t2, 0x5c88 -/* B0655C 8008F3BC 00034880 */ sll $t1, $v1, 2 -/* B06560 8008F3C0 012A3821 */ addu $a3, $t1, $t2 -/* B06564 8008F3C4 90E20000 */ lbu $v0, ($a3) -/* B06568 8008F3C8 3C0B8016 */ lui $t3, %hi(gSaveContext+0x13c6) # $t3, 0x8016 -/* B0656C 8008F3CC 50400024 */ beql $v0, $zero, .L8008F460 -/* B06570 8008F3D0 24620001 */ addiu $v0, $v1, 1 -/* B06574 8008F3D4 916BFA26 */ lbu $t3, %lo(gSaveContext+0x13c6)($t3) -/* B06578 8008F3D8 01626024 */ and $t4, $t3, $v0 -/* B0657C 8008F3DC 55800020 */ bnezl $t4, .L8008F460 -/* B06580 8008F3E0 24620001 */ addiu $v0, $v1, 1 -/* B06584 8008F3E4 54600005 */ bnezl $v1, .L8008F3FC -/* B06588 8008F3E8 24020001 */ li $v0, 1 -/* B0658C 8008F3EC 80AD014C */ lb $t5, 0x14c($a1) -/* B06590 8008F3F0 24020001 */ li $v0, 1 -/* B06594 8008F3F4 144D000C */ bne $v0, $t5, .L8008F428 -/* B06598 8008F3F8 24020001 */ li $v0, 1 -.L8008F3FC: -/* B0659C 8008F3FC 10620003 */ beq $v1, $v0, .L8008F40C -/* B065A0 8008F400 24010003 */ li $at, 3 -/* B065A4 8008F404 54610016 */ bnel $v1, $at, .L8008F460 -/* B065A8 8008F408 24620001 */ addiu $v0, $v1, 1 -.L8008F40C: -/* B065AC 8008F40C 80AE014F */ lb $t6, 0x14f($a1) -/* B065B0 8008F410 544E0013 */ bnel $v0, $t6, .L8008F460 -/* B065B4 8008F414 24620001 */ addiu $v0, $v1, 1 -/* B065B8 8008F418 80AF014C */ lb $t7, 0x14c($a1) -/* B065BC 8008F41C 24010002 */ li $at, 2 -/* B065C0 8008F420 51E1000F */ beql $t7, $at, .L8008F460 -/* B065C4 8008F424 24620001 */ addiu $v0, $v1, 1 -.L8008F428: -/* B065C8 8008F428 94E50002 */ lhu $a1, 2($a3) -/* B065CC 8008F42C AFA70018 */ sw $a3, 0x18($sp) -/* B065D0 8008F430 AFA3001C */ sw $v1, 0x1c($sp) -/* B065D4 8008F434 0C042DA0 */ jal func_8010B680 -/* B065D8 8008F438 00003025 */ move $a2, $zero -/* B065DC 8008F43C 8FA70018 */ lw $a3, 0x18($sp) -/* B065E0 8008F440 3C188016 */ lui $t8, %hi(gSaveContext+0x13c6) # $t8, 0x8016 -/* B065E4 8008F444 9318FA26 */ lbu $t8, %lo(gSaveContext+0x13c6)($t8) -/* B065E8 8008F448 90F90000 */ lbu $t9, ($a3) -/* B065EC 8008F44C 3C018016 */ lui $at, %hi(gSaveContext+0x13c6) # $at, 0x8016 -/* B065F0 8008F450 8FA3001C */ lw $v1, 0x1c($sp) -/* B065F4 8008F454 03194025 */ or $t0, $t8, $t9 -/* B065F8 8008F458 A028FA26 */ sb $t0, %lo(gSaveContext+0x13c6)($at) -.L8008F45C: -/* B065FC 8008F45C 24620001 */ addiu $v0, $v1, 1 -.L8008F460: -/* B06600 8008F460 8FBF0014 */ lw $ra, 0x14($sp) -/* B06604 8008F464 27BD0028 */ addiu $sp, $sp, 0x28 -/* B06608 8008F468 03E00008 */ jr $ra -/* B0660C 8008F46C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_80090440.s b/asm/non_matchings/code/z_player_lib/func_80090440.s deleted file mode 100644 index 49cdd993d1..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_80090440.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80090440 -/* B075E0 80090440 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B075E4 80090444 8FAE0030 */ lw $t6, 0x30($sp) -/* B075E8 80090448 8FAF0034 */ lw $t7, 0x34($sp) -/* B075EC 8009044C AFBF001C */ sw $ra, 0x1c($sp) -/* B075F0 80090450 AFA60028 */ sw $a2, 0x28($sp) -/* B075F4 80090454 AFAE0010 */ sw $t6, 0x10($sp) -/* B075F8 80090458 0C023F32 */ jal func_8008FCC8 -/* B075FC 8009045C AFAF0014 */ sw $t7, 0x14($sp) -/* B07600 80090460 14400002 */ bnez $v0, .L8009046C -/* B07604 80090464 8FB80028 */ lw $t8, 0x28($sp) -/* B07608 80090468 AF000000 */ sw $zero, ($t8) -.L8009046C: -/* B0760C 8009046C 8FBF001C */ lw $ra, 0x1c($sp) -/* B07610 80090470 27BD0020 */ addiu $sp, $sp, 0x20 -/* B07614 80090474 00001025 */ move $v0, $zero -/* B07618 80090478 03E00008 */ jr $ra -/* B0761C 8009047C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_80090480.s b/asm/non_matchings/code/z_player_lib/func_80090480.s deleted file mode 100644 index feb7e1ae39..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_80090480.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel func_80090480 -/* B07620 80090480 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B07624 80090484 AFBF0024 */ sw $ra, 0x24($sp) -/* B07628 80090488 AFB10020 */ sw $s1, 0x20($sp) -/* B0762C 8009048C AFB0001C */ sw $s0, 0x1c($sp) -/* B07630 80090490 AFA40028 */ sw $a0, 0x28($sp) -/* B07634 80090494 AFA70034 */ sw $a3, 0x34($sp) -/* B07638 80090498 8CCE0000 */ lw $t6, ($a2) -/* B0763C 8009049C 00C08025 */ move $s0, $a2 -/* B07640 800904A0 00A08825 */ move $s1, $a1 -/* B07644 800904A4 15C0000F */ bnez $t6, .L800904E4 -/* B07648 800904A8 8FB80034 */ lw $t8, 0x34($sp) -/* B0764C 800904AC 50A00004 */ beql $a1, $zero, .L800904C0 -/* B07650 800904B0 26040004 */ addiu $a0, $s0, 4 -/* B07654 800904B4 0C017458 */ jal Collider_QuadSetAT -/* B07658 800904B8 00000000 */ nop -/* B0765C 800904BC 26040004 */ addiu $a0, $s0, 4 -.L800904C0: -/* B07660 800904C0 0C01DF90 */ jal Math_Vec3f_Copy -/* B07664 800904C4 8FA50034 */ lw $a1, 0x34($sp) -/* B07668 800904C8 26040010 */ addiu $a0, $s0, 0x10 -/* B0766C 800904CC 0C01DF90 */ jal Math_Vec3f_Copy -/* B07670 800904D0 8FA50038 */ lw $a1, 0x38($sp) -/* B07674 800904D4 240F0001 */ li $t7, 1 -/* B07678 800904D8 AE0F0000 */ sw $t7, ($s0) -/* B0767C 800904DC 10000044 */ b .L800905F0 -/* B07680 800904E0 24020001 */ li $v0, 1 -.L800904E4: -/* B07684 800904E4 C7040000 */ lwc1 $f4, ($t8) -/* B07688 800904E8 C6060004 */ lwc1 $f6, 4($s0) -/* B0768C 800904EC 46062032 */ c.eq.s $f4, $f6 -/* B07690 800904F0 00000000 */ nop -/* B07694 800904F4 45000026 */ bc1f .L80090590 -/* B07698 800904F8 00000000 */ nop -/* B0769C 800904FC C7080004 */ lwc1 $f8, 4($t8) -/* B076A0 80090500 C60A0008 */ lwc1 $f10, 8($s0) -/* B076A4 80090504 460A4032 */ c.eq.s $f8, $f10 -/* B076A8 80090508 00000000 */ nop -/* B076AC 8009050C 45000020 */ bc1f .L80090590 -/* B076B0 80090510 00000000 */ nop -/* B076B4 80090514 C7100008 */ lwc1 $f16, 8($t8) -/* B076B8 80090518 C612000C */ lwc1 $f18, 0xc($s0) -/* B076BC 8009051C 8FA50038 */ lw $a1, 0x38($sp) -/* B076C0 80090520 46128032 */ c.eq.s $f16, $f18 -/* B076C4 80090524 00000000 */ nop -/* B076C8 80090528 45000019 */ bc1f .L80090590 -/* B076CC 8009052C 00000000 */ nop -/* B076D0 80090530 C4A40000 */ lwc1 $f4, ($a1) -/* B076D4 80090534 C6060010 */ lwc1 $f6, 0x10($s0) -/* B076D8 80090538 46062032 */ c.eq.s $f4, $f6 -/* B076DC 8009053C 00000000 */ nop -/* B076E0 80090540 45000013 */ bc1f .L80090590 -/* B076E4 80090544 00000000 */ nop -/* B076E8 80090548 C4A80004 */ lwc1 $f8, 4($a1) -/* B076EC 8009054C C60A0014 */ lwc1 $f10, 0x14($s0) -/* B076F0 80090550 460A4032 */ c.eq.s $f8, $f10 -/* B076F4 80090554 00000000 */ nop -/* B076F8 80090558 4500000D */ bc1f .L80090590 -/* B076FC 8009055C 00000000 */ nop -/* B07700 80090560 C4B00008 */ lwc1 $f16, 8($a1) -/* B07704 80090564 C6120018 */ lwc1 $f18, 0x18($s0) -/* B07708 80090568 46128032 */ c.eq.s $f16, $f18 -/* B0770C 8009056C 00000000 */ nop -/* B07710 80090570 45000007 */ bc1f .L80090590 -/* B07714 80090574 00000000 */ nop -/* B07718 80090578 12200003 */ beqz $s1, .L80090588 -/* B0771C 8009057C 8FA40028 */ lw $a0, 0x28($sp) -/* B07720 80090580 0C017458 */ jal Collider_QuadSetAT -/* B07724 80090584 02202825 */ move $a1, $s1 -.L80090588: -/* B07728 80090588 10000019 */ b .L800905F0 -/* B0772C 8009058C 00001025 */ move $v0, $zero -.L80090590: -/* B07730 80090590 1220000E */ beqz $s1, .L800905CC -/* B07734 80090594 8FA50038 */ lw $a1, 0x38($sp) -/* B07738 80090598 26190004 */ addiu $t9, $s0, 4 -/* B0773C 8009059C AFB90010 */ sw $t9, 0x10($sp) -/* B07740 800905A0 02202025 */ move $a0, $s1 -/* B07744 800905A4 8FA60034 */ lw $a2, 0x34($sp) -/* B07748 800905A8 0C0189CD */ jal func_80062734 -/* B0774C 800905AC 26070010 */ addiu $a3, $s0, 0x10 -/* B07750 800905B0 8FA40028 */ lw $a0, 0x28($sp) -/* B07754 800905B4 3C010001 */ lui $at, (0x00011E60 >> 16) # lui $at, 1 -/* B07758 800905B8 34211E60 */ ori $at, (0x00011E60 & 0xFFFF) # ori $at, $at, 0x1e60 -/* B0775C 800905BC 02203025 */ move $a2, $s1 -/* B07760 800905C0 0C0175E7 */ jal CollisionCheck_SetAT -/* B07764 800905C4 00812821 */ addu $a1, $a0, $at -/* B07768 800905C8 8FA50038 */ lw $a1, 0x38($sp) -.L800905CC: -/* B0776C 800905CC 26040010 */ addiu $a0, $s0, 0x10 -/* B07770 800905D0 0C01DF90 */ jal Math_Vec3f_Copy -/* B07774 800905D4 26110004 */ addiu $s1, $s0, 4 -/* B07778 800905D8 02202025 */ move $a0, $s1 -/* B0777C 800905DC 0C01DF90 */ jal Math_Vec3f_Copy -/* B07780 800905E0 8FA50034 */ lw $a1, 0x34($sp) -/* B07784 800905E4 24080001 */ li $t0, 1 -/* B07788 800905E8 AE080000 */ sw $t0, ($s0) -/* B0778C 800905EC 24020001 */ li $v0, 1 -.L800905F0: -/* B07790 800905F0 8FBF0024 */ lw $ra, 0x24($sp) -/* B07794 800905F4 8FB0001C */ lw $s0, 0x1c($sp) -/* B07798 800905F8 8FB10020 */ lw $s1, 0x20($sp) -/* B0779C 800905FC 03E00008 */ jr $ra -/* B077A0 80090600 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_player_lib/func_80090604.s b/asm/non_matchings/code/z_player_lib/func_80090604.s deleted file mode 100644 index 98f94ee4a5..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_80090604.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80090604 -/* B077A4 80090604 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B077A8 80090608 AFBF001C */ sw $ra, 0x1c($sp) -/* B077AC 8009060C AFA40058 */ sw $a0, 0x58($sp) -/* B077B0 80090610 AFA5005C */ sw $a1, 0x5c($sp) -/* B077B4 80090614 AFA60060 */ sw $a2, 0x60($sp) -/* B077B8 80090618 AFA70064 */ sw $a3, 0x64($sp) -/* B077BC 8009061C 8CAF067C */ lw $t7, 0x67c($a1) -/* B077C0 80090620 000FC240 */ sll $t8, $t7, 9 -/* B077C4 80090624 07030028 */ bgezl $t8, .L800906C8 -/* B077C8 80090628 8FBF001C */ lw $ra, 0x1c($sp) -/* B077CC 8009062C 80B9014E */ lb $t9, 0x14e($a1) -/* B077D0 80090630 3C088012 */ lui $t0, %hi(D_8012607C) -/* B077D4 80090634 01194021 */ addu $t0, $t0, $t9 -/* B077D8 80090638 9108607C */ lbu $t0, %lo(D_8012607C)($t0) -/* B077DC 8009063C A0A805F8 */ sb $t0, 0x5f8($a1) -/* B077E0 80090640 8FA40064 */ lw $a0, 0x64($sp) -/* B077E4 80090644 0C0346BD */ jal Matrix_MultVec3f -/* B077E8 80090648 27A50028 */ addiu $a1, $sp, 0x28 -/* B077EC 8009064C 8FA40064 */ lw $a0, 0x64($sp) -/* B077F0 80090650 27A50034 */ addiu $a1, $sp, 0x34 -/* B077F4 80090654 0C0346BD */ jal Matrix_MultVec3f -/* B077F8 80090658 2484000C */ addiu $a0, $a0, 0xc -/* B077FC 8009065C 8FA40064 */ lw $a0, 0x64($sp) -/* B07800 80090660 27A50040 */ addiu $a1, $sp, 0x40 -/* B07804 80090664 0C0346BD */ jal Matrix_MultVec3f -/* B07808 80090668 24840018 */ addiu $a0, $a0, 0x18 -/* B0780C 8009066C 8FA40064 */ lw $a0, 0x64($sp) -/* B07810 80090670 27A5004C */ addiu $a1, $sp, 0x4c -/* B07814 80090674 0C0346BD */ jal Matrix_MultVec3f -/* B07818 80090678 24840024 */ addiu $a0, $a0, 0x24 -/* B0781C 8009067C 27A9004C */ addiu $t1, $sp, 0x4c -/* B07820 80090680 AFA90010 */ sw $t1, 0x10($sp) -/* B07824 80090684 8FA40060 */ lw $a0, 0x60($sp) -/* B07828 80090688 27A50028 */ addiu $a1, $sp, 0x28 -/* B0782C 8009068C 27A60034 */ addiu $a2, $sp, 0x34 -/* B07830 80090690 0C0189CD */ jal func_80062734 -/* B07834 80090694 27A70040 */ addiu $a3, $sp, 0x40 -/* B07838 80090698 8FA40058 */ lw $a0, 0x58($sp) -/* B0783C 8009069C 3C010001 */ lui $at, (0x00011E60 >> 16) # lui $at, 1 -/* B07840 800906A0 34211E60 */ ori $at, (0x00011E60 & 0xFFFF) # ori $at, $at, 0x1e60 -/* B07844 800906A4 00812821 */ addu $a1, $a0, $at -/* B07848 800906A8 AFA50024 */ sw $a1, 0x24($sp) -/* B0784C 800906AC 0C01767D */ jal CollisionCheck_SetAC -/* B07850 800906B0 8FA60060 */ lw $a2, 0x60($sp) -/* B07854 800906B4 8FA50024 */ lw $a1, 0x24($sp) -/* B07858 800906B8 8FA40058 */ lw $a0, 0x58($sp) -/* B0785C 800906BC 0C0175E7 */ jal CollisionCheck_SetAT -/* B07860 800906C0 8FA60060 */ lw $a2, 0x60($sp) -/* B07864 800906C4 8FBF001C */ lw $ra, 0x1c($sp) -.L800906C8: -/* B07868 800906C8 27BD0058 */ addiu $sp, $sp, 0x58 -/* B0786C 800906CC 03E00008 */ jr $ra -/* B07870 800906D0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_800906D4.s b/asm/non_matchings/code/z_player_lib/func_800906D4.s deleted file mode 100644 index 480a4ed6e6..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_800906D4.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_800906D4 -/* B07874 800906D4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B07878 800906D8 AFB00020 */ sw $s0, 0x20($sp) -/* B0787C 800906DC AFA40050 */ sw $a0, 0x50($sp) -/* B07880 800906E0 00A08025 */ move $s0, $a1 -/* B07884 800906E4 AFBF0024 */ sw $ra, 0x24($sp) -/* B07888 800906E8 3C048012 */ lui $a0, %hi(D_801260A4) # $a0, 0x8012 -/* B0788C 800906EC AFA60058 */ sw $a2, 0x58($sp) -/* B07890 800906F0 248460A4 */ addiu $a0, %lo(D_801260A4) # addiu $a0, $a0, 0x60a4 -/* B07894 800906F4 0C0346BD */ jal Matrix_MultVec3f -/* B07898 800906F8 27A5002C */ addiu $a1, $sp, 0x2c -/* B0789C 800906FC 3C048012 */ lui $a0, %hi(D_801260B0) # $a0, 0x8012 -/* B078A0 80090700 248460B0 */ addiu $a0, %lo(D_801260B0) # addiu $a0, $a0, 0x60b0 -/* B078A4 80090704 0C0346BD */ jal Matrix_MultVec3f -/* B078A8 80090708 27A50038 */ addiu $a1, $sp, 0x38 -/* B078AC 8009070C 3C048012 */ lui $a0, %hi(D_801260BC) # $a0, 0x8012 -/* B078B0 80090710 248460BC */ addiu $a0, %lo(D_801260BC) # addiu $a0, $a0, 0x60bc -/* B078B4 80090714 0C0346BD */ jal Matrix_MultVec3f -/* B078B8 80090718 27A50044 */ addiu $a1, $sp, 0x44 -/* B078BC 8009071C 27AE002C */ addiu $t6, $sp, 0x2c -/* B078C0 80090720 AFAE0010 */ sw $t6, 0x10($sp) -/* B078C4 80090724 8FA40050 */ lw $a0, 0x50($sp) -/* B078C8 80090728 00002825 */ move $a1, $zero -/* B078CC 8009072C 260608B4 */ addiu $a2, $s0, 0x8b4 -/* B078D0 80090730 0C024120 */ jal func_80090480 -/* B078D4 80090734 8FA70058 */ lw $a3, 0x58($sp) -/* B078D8 80090738 5040000C */ beql $v0, $zero, .L8009076C -/* B078DC 8009073C 82190843 */ lb $t9, 0x843($s0) -/* B078E0 80090740 8E0F067C */ lw $t7, 0x67c($s0) -/* B078E4 80090744 000FC240 */ sll $t8, $t7, 9 -/* B078E8 80090748 07020008 */ bltzl $t8, .L8009076C -/* B078EC 8009074C 82190843 */ lb $t9, 0x843($s0) -/* B078F0 80090750 0C009AC3 */ jal Effect_GetByIndex -/* B078F4 80090754 8E040670 */ lw $a0, 0x670($s0) -/* B078F8 80090758 00402025 */ move $a0, $v0 -/* B078FC 8009075C 260508B8 */ addiu $a1, $s0, 0x8b8 -/* B07900 80090760 0C007F7C */ jal EffectBlure_AddVertex -/* B07904 80090764 260608C4 */ addiu $a2, $s0, 0x8c4 -/* B07908 80090768 82190843 */ lb $t9, 0x843($s0) -.L8009076C: -/* B0790C 8009076C 5B200019 */ blezl $t9, .L800907D4 -/* B07910 80090770 8FBF0024 */ lw $ra, 0x24($sp) -/* B07914 80090774 82080842 */ lb $t0, 0x842($s0) -/* B07918 80090778 8FA40050 */ lw $a0, 0x50($sp) -/* B0791C 8009077C 260504E4 */ addiu $a1, $s0, 0x4e4 -/* B07920 80090780 29010018 */ slti $at, $t0, 0x18 -/* B07924 80090784 14200005 */ bnez $at, .L8009079C -/* B07928 80090788 260608D0 */ addiu $a2, $s0, 0x8d0 -/* B0792C 8009078C 8E090680 */ lw $t1, 0x680($s0) -/* B07930 80090790 00095380 */ sll $t2, $t1, 0xe -/* B07934 80090794 0543000F */ bgezl $t2, .L800907D4 -/* B07938 80090798 8FBF0024 */ lw $ra, 0x24($sp) -.L8009079C: -/* B0793C 8009079C 8FA70058 */ lw $a3, 0x58($sp) -/* B07940 800907A0 27AB0038 */ addiu $t3, $sp, 0x38 -/* B07944 800907A4 AFAB0010 */ sw $t3, 0x10($sp) -/* B07948 800907A8 0C024120 */ jal func_80090480 -/* B0794C 800907AC 24E7000C */ addiu $a3, $a3, 0xc -/* B07950 800907B0 8FA70058 */ lw $a3, 0x58($sp) -/* B07954 800907B4 27AC0044 */ addiu $t4, $sp, 0x44 -/* B07958 800907B8 AFAC0010 */ sw $t4, 0x10($sp) -/* B0795C 800907BC 8FA40050 */ lw $a0, 0x50($sp) -/* B07960 800907C0 26050564 */ addiu $a1, $s0, 0x564 -/* B07964 800907C4 260608EC */ addiu $a2, $s0, 0x8ec -/* B07968 800907C8 0C024120 */ jal func_80090480 -/* B0796C 800907CC 24E70018 */ addiu $a3, $a3, 0x18 -/* B07970 800907D0 8FBF0024 */ lw $ra, 0x24($sp) -.L800907D4: -/* B07974 800907D4 8FB00020 */ lw $s0, 0x20($sp) -/* B07978 800907D8 27BD0050 */ addiu $sp, $sp, 0x50 -/* B0797C 800907DC 03E00008 */ jr $ra -/* B07980 800907E0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_800909B4.s b/asm/non_matchings/code/z_player_lib/func_800909B4.s deleted file mode 100644 index cec57f724d..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_800909B4.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_800909B4 -/* B07B54 800909B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B07B58 800909B8 AFBF001C */ sw $ra, 0x1c($sp) -/* B07B5C 800909BC AFB00018 */ sw $s0, 0x18($sp) -/* B07B60 800909C0 AFA40020 */ sw $a0, 0x20($sp) -/* B07B64 800909C4 90AE0170 */ lbu $t6, 0x170($a1) -/* B07B68 800909C8 00A08025 */ move $s0, $a1 -/* B07B6C 800909CC 24A40194 */ addiu $a0, $a1, 0x194 -/* B07B70 800909D0 11C00005 */ beqz $t6, .L800909E8 -/* B07B74 800909D4 00002825 */ move $a1, $zero -/* B07B78 800909D8 0C000CA0 */ jal osRecvMesg -/* B07B7C 800909DC 00003025 */ move $a2, $zero -/* B07B80 800909E0 5440000D */ bnezl $v0, .L80090A18 -/* B07B84 800909E4 8FBF001C */ lw $ra, 0x1c($sp) -.L800909E8: -/* B07B88 800909E8 82020862 */ lb $v0, 0x862($s0) -/* B07B8C 800909EC A2000170 */ sb $zero, 0x170($s0) -/* B07B90 800909F0 8FA40020 */ lw $a0, 0x20($sp) -/* B07B94 800909F4 04400003 */ bltz $v0, .L80090A04 -/* B07B98 800909F8 02002825 */ move $a1, $s0 -/* B07B9C 800909FC 10000002 */ b .L80090A08 -/* B07BA0 80090A00 00403825 */ move $a3, $v0 -.L80090A04: -/* B07BA4 80090A04 00023823 */ negu $a3, $v0 -.L80090A08: -/* B07BA8 80090A08 3C068016 */ lui $a2, %hi(D_80160008) # $a2, 0x8016 -/* B07BAC 80090A0C 0C0241F9 */ jal func_800907E4 -/* B07BB0 80090A10 24C60008 */ addiu $a2, %lo(D_80160008) # addiu $a2, $a2, 8 -/* B07BB4 80090A14 8FBF001C */ lw $ra, 0x1c($sp) -.L80090A18: -/* B07BB8 80090A18 8FB00018 */ lw $s0, 0x18($sp) -/* B07BBC 80090A1C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B07BC0 80090A20 03E00008 */ jr $ra -/* B07BC4 80090A24 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_80090A28.s b/asm/non_matchings/code/z_player_lib/func_80090A28.s deleted file mode 100644 index 0ce3d20502..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_80090A28.s +++ /dev/null @@ -1,61 +0,0 @@ -.late_rodata -glabel D_8013E934 - .float 0.1 - -.text -glabel func_80090A28 -/* B07BC8 80090A28 3C078012 */ lui $a3, %hi(D_80126080) # $a3, 0x8012 -/* B07BCC 80090A2C 24E76080 */ addiu $a3, %lo(D_80126080) # addiu $a3, $a3, 0x6080 -/* B07BD0 80090A30 C4E40000 */ lwc1 $f4, ($a3) -/* B07BD4 80090A34 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B07BD8 80090A38 3C068012 */ lui $a2, %hi(D_8012608C) # $a2, 0x8012 -/* B07BDC 80090A3C 24C6608C */ addiu $a2, %lo(D_8012608C) # addiu $a2, $a2, 0x608c -/* B07BE0 80090A40 AFBF0014 */ sw $ra, 0x14($sp) -/* B07BE4 80090A44 AFA5001C */ sw $a1, 0x1c($sp) -/* B07BE8 80090A48 E4C40000 */ swc1 $f4, ($a2) -/* B07BEC 80090A4C 90820845 */ lbu $v0, 0x845($a0) -/* B07BF0 80090A50 24180009 */ li $t8, 9 -/* B07BF4 80090A54 28410003 */ slti $at, $v0, 3 -/* B07BF8 80090A58 1420000F */ bnez $at, .L80090A98 -/* B07BFC 80090A5C 244E0001 */ addiu $t6, $v0, 1 -/* B07C00 80090A60 31CF00FF */ andi $t7, $t6, 0xff -/* B07C04 80090A64 030FC823 */ subu $t9, $t8, $t7 -/* B07C08 80090A68 44993000 */ mtc1 $t9, $f6 -/* B07C0C 80090A6C A08E0845 */ sb $t6, 0x845($a0) -/* B07C10 80090A70 3C018014 */ lui $at, %hi(D_8013E934) -/* B07C14 80090A74 46803220 */ cvt.s.w $f8, $f6 -/* B07C18 80090A78 C42AE934 */ lwc1 $f10, %lo(D_8013E934)($at) -/* B07C1C 80090A7C 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B07C20 80090A80 44819000 */ mtc1 $at, $f18 -/* B07C24 80090A84 C4C60000 */ lwc1 $f6, ($a2) -/* B07C28 80090A88 460A4402 */ mul.s $f16, $f8, $f10 -/* B07C2C 80090A8C 46109100 */ add.s $f4, $f18, $f16 -/* B07C30 80090A90 46043202 */ mul.s $f8, $f6, $f4 -/* B07C34 80090A94 E4C80000 */ swc1 $f8, ($a2) -.L80090A98: -/* B07C38 80090A98 3C014496 */ li $at, 0x44960000 # 0.000000 -/* B07C3C 80090A9C 44819000 */ mtc1 $at, $f18 -/* B07C40 80090AA0 C4CA0000 */ lwc1 $f10, ($a2) -/* B07C44 80090AA4 3C018012 */ lui $at, %hi(D_80126098) -/* B07C48 80090AA8 00E02025 */ move $a0, $a3 -/* B07C4C 80090AAC 46125400 */ add.s $f16, $f10, $f18 -/* B07C50 80090AB0 8FA5001C */ lw $a1, 0x1c($sp) -/* B07C54 80090AB4 E4D00000 */ swc1 $f16, ($a2) -/* B07C58 80090AB8 C4C60000 */ lwc1 $f6, ($a2) -/* B07C5C 80090ABC 0C0346BD */ jal Matrix_MultVec3f -/* B07C60 80090AC0 E4266098 */ swc1 $f6, %lo(D_80126098)($at) -/* B07C64 80090AC4 8FA5001C */ lw $a1, 0x1c($sp) -/* B07C68 80090AC8 3C068012 */ lui $a2, %hi(D_8012608C) -/* B07C6C 80090ACC 24C4608C */ addiu $a0, $a2, %lo(D_8012608C) -/* B07C70 80090AD0 0C0346BD */ jal Matrix_MultVec3f -/* B07C74 80090AD4 24A5000C */ addiu $a1, $a1, 0xc -/* B07C78 80090AD8 8FA5001C */ lw $a1, 0x1c($sp) -/* B07C7C 80090ADC 3C048012 */ lui $a0, %hi(D_80126098) # $a0, 0x8012 -/* B07C80 80090AE0 24846098 */ addiu $a0, %lo(D_80126098) # addiu $a0, $a0, 0x6098 -/* B07C84 80090AE4 0C0346BD */ jal Matrix_MultVec3f -/* B07C88 80090AE8 24A50018 */ addiu $a1, $a1, 0x18 -/* B07C8C 80090AEC 8FBF0014 */ lw $ra, 0x14($sp) -/* B07C90 80090AF0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B07C94 80090AF4 03E00008 */ jr $ra -/* B07C98 80090AF8 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914664.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914664.s deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Destroy.s deleted file mode 100644 index f6696d1aee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Destroy.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_80B8CE10 - .asciz "../z_magic_wind.c" - .balign 4 - -glabel D_80B8CE24 - .asciz "\"消滅\" = %s\n" - .balign 4 - -glabel D_80B8CE34 - .asciz "消滅" - .balign 4 - -.text -glabel MagicWind_Destroy -/* 00150 80B8B250 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00154 80B8B254 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00158 80B8B258 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0015C 80B8B25C AFA5001C */ sw $a1, 0x001C($sp) -/* 00160 80B8B260 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00164 80B8B264 0C01B217 */ jal SkelCurve_Destroy -/* 00168 80B8B268 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C -/* 0016C 80B8B26C 0C021DB2 */ jal func_800876C8 -/* 00170 80B8B270 8FA4001C */ lw $a0, 0x001C($sp) -/* 00174 80B8B274 3C0480B9 */ lui $a0, %hi(D_80B8CE10) ## $a0 = 80B90000 -/* 00178 80B8B278 2484CE10 */ addiu $a0, $a0, %lo(D_80B8CE10) ## $a0 = 80B8CE10 -/* 0017C 80B8B27C 0C000B84 */ jal LogUtils_LogThreadId - -/* 00180 80B8B280 240501F9 */ addiu $a1, $zero, 0x01F9 ## $a1 = 000001F9 -/* 00184 80B8B284 3C0480B9 */ lui $a0, %hi(D_80B8CE24) ## $a0 = 80B90000 -/* 00188 80B8B288 3C0580B9 */ lui $a1, %hi(D_80B8CE34) ## $a1 = 80B90000 -/* 0018C 80B8B28C 24A5CE34 */ addiu $a1, $a1, %lo(D_80B8CE34) ## $a1 = 80B8CE34 -/* 00190 80B8B290 0C00084C */ jal osSyncPrintf - -/* 00194 80B8B294 2484CE24 */ addiu $a0, $a0, %lo(D_80B8CE24) ## $a0 = 80B8CE24 -/* 00198 80B8B298 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0019C 80B8B29C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001A0 80B8B2A0 03E00008 */ jr $ra -/* 001A4 80B8B2A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s deleted file mode 100644 index 58c3b6411d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s +++ /dev/null @@ -1,57 +0,0 @@ -.rdata -glabel D_80B8CE98 - .asciz "../z_magic_wind.c" - .balign 4 - -glabel D_80B8CEAC - .asciz "../z_magic_wind.c" - .balign 4 - -.text -glabel MagicWind_Draw -/* 006AC 80B8B7AC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 006B0 80B8B7B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 006B4 80B8B7B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 006B8 80B8B7B8 AFA40050 */ sw $a0, 0x0050($sp) -/* 006BC 80B8B7BC AFA50054 */ sw $a1, 0x0054($sp) -/* 006C0 80B8B7C0 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 006C4 80B8B7C4 3C0680B9 */ lui $a2, %hi(D_80B8CE98) ## $a2 = 80B90000 -/* 006C8 80B8B7C8 24C6CE98 */ addiu $a2, $a2, %lo(D_80B8CE98) ## $a2 = 80B8CE98 -/* 006CC 80B8B7CC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 006D0 80B8B7D0 24070295 */ addiu $a3, $zero, 0x0295 ## $a3 = 00000295 -/* 006D4 80B8B7D4 0C031AB1 */ jal Graph_OpenDisps -/* 006D8 80B8B7D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 006DC 80B8B7DC 8FB80050 */ lw $t8, 0x0050($sp) -/* 006E0 80B8B7E0 3C0F80B9 */ lui $t7, %hi(func_80B8B3C8) ## $t7 = 80B90000 -/* 006E4 80B8B7E4 25EFB3C8 */ addiu $t7, $t7, %lo(func_80B8B3C8) ## $t7 = 80B8B3C8 -/* 006E8 80B8B7E8 8F190170 */ lw $t9, 0x0170($t8) ## 00000170 -/* 006EC 80B8B7EC 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019 -/* 006F0 80B8B7F0 11F9000E */ beq $t7, $t9, .L80B8B82C -/* 006F4 80B8B7F4 00000000 */ nop -/* 006F8 80B8B7F8 0C024DDD */ jal Gfx_CallSetupDL -/* 006FC 80B8B7FC 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 00700 80B8B800 8FA40050 */ lw $a0, 0x0050($sp) -/* 00704 80B8B804 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00708 80B8B808 3C0780B9 */ lui $a3, %hi(func_80B8B5F4) ## $a3 = 80B90000 -/* 0070C 80B8B80C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00710 80B8B810 AFA80014 */ sw $t0, 0x0014($sp) -/* 00714 80B8B814 24E7B5F4 */ addiu $a3, $a3, %lo(func_80B8B5F4) ## $a3 = 80B8B5F4 -/* 00718 80B8B818 AFA00018 */ sw $zero, 0x0018($sp) -/* 0071C 80B8B81C AFA00010 */ sw $zero, 0x0010($sp) -/* 00720 80B8B820 8FA50054 */ lw $a1, 0x0054($sp) -/* 00724 80B8B824 0C01B3DB */ jal SkelCurve_Draw -/* 00728 80B8B828 2486014C */ addiu $a2, $a0, 0x014C ## $a2 = 0000014C -.L80B8B82C: -/* 0072C 80B8B82C 3C0680B9 */ lui $a2, %hi(D_80B8CEAC) ## $a2 = 80B90000 -/* 00730 80B8B830 24C6CEAC */ addiu $a2, $a2, %lo(D_80B8CEAC) ## $a2 = 80B8CEAC -/* 00734 80B8B834 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 00738 80B8B838 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0073C 80B8B83C 0C031AD5 */ jal Graph_CloseDisps -/* 00740 80B8B840 240702A1 */ addiu $a3, $zero, 0x02A1 ## $a3 = 000002A1 -/* 00744 80B8B844 8FBF002C */ lw $ra, 0x002C($sp) -/* 00748 80B8B848 8FB00028 */ lw $s0, 0x0028($sp) -/* 0074C 80B8B84C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00750 80B8B850 03E00008 */ jr $ra -/* 00754 80B8B854 00000000 */ nop -/* 00758 80B8B858 00000000 */ nop -/* 0075C 80B8B85C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Init.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Init.s deleted file mode 100644 index 47e68d02c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Init.s +++ /dev/null @@ -1,108 +0,0 @@ -.rdata -glabel D_80B8CDB0 - .asciz "Magic_Wind_Actor_ct():コンストラクト失敗\n" - .balign 4 - -glabel D_80B8CDDC - .asciz "../z_magic_wind.c" - .balign 4 - -glabel D_80B8CDF0 - .asciz "\"表示開始\" = %s\n" - .balign 4 - -glabel D_80B8CE04 - .asciz "表示開始" - .balign 4 - -.text -glabel MagicWind_Init -/* 00008 80B8B108 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0000C 80B8B10C AFB00020 */ sw $s0, 0x0020($sp) -/* 00010 80B8B110 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00014 80B8B114 AFA5003C */ sw $a1, 0x003C($sp) -/* 00018 80B8B118 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 0001C 80B8B11C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00020 80B8B120 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00024 80B8B124 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00028 80B8B128 3C0680B9 */ lui $a2, %hi(D_80B8CD90) ## $a2 = 80B90000 -/* 0002C 80B8B12C 3C0780B9 */ lui $a3, %hi(D_80B8CD50) ## $a3 = 80B90000 -/* 00030 80B8B130 24E7CD50 */ addiu $a3, $a3, %lo(D_80B8CD50) ## $a3 = 80B8CD50 -/* 00034 80B8B134 24C6CD90 */ addiu $a2, $a2, %lo(D_80B8CD90) ## $a2 = 80B8CD90 -/* 00038 80B8B138 AFA50028 */ sw $a1, 0x0028($sp) -/* 0003C 80B8B13C 0C01B1DE */ jal SkelCurve_Init -/* 00040 80B8B140 AFAF0030 */ sw $t7, 0x0030($sp) -/* 00044 80B8B144 14400003 */ bne $v0, $zero, .L80B8B154 -/* 00048 80B8B148 3C0480B9 */ lui $a0, %hi(D_80B8CDB0) ## $a0 = 80B90000 -/* 0004C 80B8B14C 0C00084C */ jal osSyncPrintf - -/* 00050 80B8B150 2484CDB0 */ addiu $a0, $a0, %lo(D_80B8CDB0) ## $a0 = 80B8CDB0 -.L80B8B154: -/* 00054 80B8B154 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00058 80B8B158 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 0005C 80B8B15C A2180003 */ sb $t8, 0x0003($s0) ## 00000003 -/* 00060 80B8B160 10400006 */ beq $v0, $zero, .L80B8B17C -/* 00064 80B8B164 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00068 80B8B168 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0006C 80B8B16C 10410017 */ beq $v0, $at, .L80B8B1CC -/* 00070 80B8B170 8FA40028 */ lw $a0, 0x0028($sp) -/* 00074 80B8B174 10000032 */ beq $zero, $zero, .L80B8B240 -/* 00078 80B8B178 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B8B17C: -/* 0007C 80B8B17C 44810000 */ mtc1 $at, $f0 ## $f0 = 0.00 -/* 00080 80B8B180 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00084 80B8B184 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00088 80B8B188 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 0008C 80B8B18C 3C0580B9 */ lui $a1, %hi(D_80B8CD50) ## $a1 = 80B90000 -/* 00090 80B8B190 44070000 */ mfc1 $a3, $f0 -/* 00094 80B8B194 44061000 */ mfc1 $a2, $f2 -/* 00098 80B8B198 24A5CD50 */ addiu $a1, $a1, %lo(D_80B8CD50) ## $a1 = 80B8CD50 -/* 0009C 80B8B19C 8FA40028 */ lw $a0, 0x0028($sp) -/* 000A0 80B8B1A0 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 000A4 80B8B1A4 0C01B225 */ jal SkelCurve_SetAnim -/* 000A8 80B8B1A8 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 000AC 80B8B1AC 2419001D */ addiu $t9, $zero, 0x001D ## $t9 = 0000001D -/* 000B0 80B8B1B0 3C0580B9 */ lui $a1, %hi(func_80B8B3C8) ## $a1 = 80B90000 -/* 000B4 80B8B1B4 A619016C */ sh $t9, 0x016C($s0) ## 0000016C -/* 000B8 80B8B1B8 24A5B3C8 */ addiu $a1, $a1, %lo(func_80B8B3C8) ## $a1 = 80B8B3C8 -/* 000BC 80B8B1BC 0C2E2C40 */ jal func_80B8B100 -/* 000C0 80B8B1C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000C4 80B8B1C4 1000001E */ beq $zero, $zero, .L80B8B240 -/* 000C8 80B8B1C8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B8B1CC: -/* 000CC 80B8B1CC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 000D0 80B8B1D0 44810000 */ mtc1 $at, $f0 ## $f0 = 60.00 -/* 000D4 80B8B1D4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 000D8 80B8B1D8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 000DC 80B8B1DC 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 000E0 80B8B1E0 3C0580B9 */ lui $a1, %hi(D_80B8CD50) ## $a1 = 80B90000 -/* 000E4 80B8B1E4 44060000 */ mfc1 $a2, $f0 -/* 000E8 80B8B1E8 44071000 */ mfc1 $a3, $f2 -/* 000EC 80B8B1EC 24A5CD50 */ addiu $a1, $a1, %lo(D_80B8CD50) ## $a1 = 80B8CD50 -/* 000F0 80B8B1F0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 000F4 80B8B1F4 0C01B225 */ jal SkelCurve_SetAnim -/* 000F8 80B8B1F8 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 000FC 80B8B1FC 3C0580B9 */ lui $a1, %hi(func_80B8B564) ## $a1 = 80B90000 -/* 00100 80B8B200 24A5B564 */ addiu $a1, $a1, %lo(func_80B8B564) ## $a1 = 80B8B564 -/* 00104 80B8B204 0C2E2C40 */ jal func_80B8B100 -/* 00108 80B8B208 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0010C 80B8B20C 3C0480B9 */ lui $a0, %hi(D_80B8CDDC) ## $a0 = 80B90000 -/* 00110 80B8B210 2484CDDC */ addiu $a0, $a0, %lo(D_80B8CDDC) ## $a0 = 80B8CDDC -/* 00114 80B8B214 0C000B84 */ jal LogUtils_LogThreadId - -/* 00118 80B8B218 240501E6 */ addiu $a1, $zero, 0x01E6 ## $a1 = 000001E6 -/* 0011C 80B8B21C 3C0480B9 */ lui $a0, %hi(D_80B8CDF0) ## $a0 = 80B90000 -/* 00120 80B8B220 3C0580B9 */ lui $a1, %hi(D_80B8CE04) ## $a1 = 80B90000 -/* 00124 80B8B224 24A5CE04 */ addiu $a1, $a1, %lo(D_80B8CE04) ## $a1 = 80B8CE04 -/* 00128 80B8B228 0C00084C */ jal osSyncPrintf - -/* 0012C 80B8B22C 2484CDF0 */ addiu $a0, $a0, %lo(D_80B8CDF0) ## $a0 = 80B8CDF0 -/* 00130 80B8B230 8FA40030 */ lw $a0, 0x0030($sp) -/* 00134 80B8B234 0C00BDF7 */ jal func_8002F7DC -/* 00138 80B8B238 2405087B */ addiu $a1, $zero, 0x087B ## $a1 = 0000087B -/* 0013C 80B8B23C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B8B240: -/* 00140 80B8B240 8FB00020 */ lw $s0, 0x0020($sp) -/* 00144 80B8B244 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00148 80B8B248 03E00008 */ jr $ra -/* 0014C 80B8B24C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Update.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Update.s deleted file mode 100644 index 7e90d376e4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Update.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel MagicWind_Update -/* 004A0 80B8B5A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004A4 80B8B5A4 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 004A8 80B8B5A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004AC 80B8B5AC 00451021 */ addu $v0, $v0, $a1 -/* 004B0 80B8B5B0 904203DC */ lbu $v0, 0x03DC($v0) ## 000103DC -/* 004B4 80B8B5B4 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 004B8 80B8B5B8 10410003 */ beq $v0, $at, .L80B8B5C8 -/* 004BC 80B8B5BC 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 004C0 80B8B5C0 54410006 */ bnel $v0, $at, .L80B8B5DC -/* 004C4 80B8B5C4 8C990170 */ lw $t9, 0x0170($a0) ## 00000170 -.L80B8B5C8: -/* 004C8 80B8B5C8 0C00B55C */ jal Actor_Kill - -/* 004CC 80B8B5CC 00000000 */ nop -/* 004D0 80B8B5D0 10000005 */ beq $zero, $zero, .L80B8B5E8 -/* 004D4 80B8B5D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004D8 80B8B5D8 8C990170 */ lw $t9, 0x0170($a0) ## 00000170 -.L80B8B5DC: -/* 004DC 80B8B5DC 0320F809 */ jalr $ra, $t9 -/* 004E0 80B8B5E0 00000000 */ nop -/* 004E4 80B8B5E4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B8B5E8: -/* 004E8 80B8B5E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004EC 80B8B5EC 03E00008 */ jr $ra -/* 004F0 80B8B5F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B100.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B100.s deleted file mode 100644 index 89888cba66..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B100.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80B8B100 -/* 00000 80B8B100 03E00008 */ jr $ra -/* 00004 80B8B104 AC850170 */ sw $a1, 0x0170($a0) ## 00000170 diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B2A8.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B2A8.s deleted file mode 100644 index e8f704023c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B2A8.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_80B8B2A8 -/* 001A8 80B8B2A8 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 001AC 80B8B2AC 44812000 */ mtc1 $at, $f4 ## $f4 = 255.00 -/* 001B0 80B8B2B0 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 001B4 80B8B2B4 3C0580B9 */ lui $a1, %hi(D_80B8B880) ## $a1 = 80B90000 -/* 001B8 80B8B2B8 46046182 */ mul.s $f6, $f12, $f4 -/* 001BC 80B8B2BC 24A5B880 */ addiu $a1, $a1, %lo(D_80B8B880) ## $a1 = 80B8B880 -/* 001C0 80B8B2C0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 001C4 80B8B2C4 3C0F80B9 */ lui $t7, %hi(D_80B8CD98) ## $t7 = 80B90000 -/* 001C8 80B8B2C8 3C0880B9 */ lui $t0, %hi(D_80B8CD99) ## $t0 = 80B90000 -/* 001CC 80B8B2CC 3C0380B9 */ lui $v1, %hi(D_80B8CD9A) ## $v1 = 80B90000 -/* 001D0 80B8B2D0 444EF800 */ cfc1 $t6, $31 -/* 001D4 80B8B2D4 44C4F800 */ ctc1 $a0, $31 -/* 001D8 80B8B2D8 00000000 */ nop -/* 001DC 80B8B2DC 46003224 */ cvt.w.s $f8, $f6 -/* 001E0 80B8B2E0 4444F800 */ cfc1 $a0, $31 -/* 001E4 80B8B2E4 00000000 */ nop -/* 001E8 80B8B2E8 30840078 */ andi $a0, $a0, 0x0078 ## $a0 = 00000000 -/* 001EC 80B8B2EC 50800013 */ beql $a0, $zero, .L80B8B33C -/* 001F0 80B8B2F0 44044000 */ mfc1 $a0, $f8 -/* 001F4 80B8B2F4 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 001F8 80B8B2F8 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 001FC 80B8B2FC 46083201 */ sub.s $f8, $f6, $f8 -/* 00200 80B8B300 44C4F800 */ ctc1 $a0, $31 -/* 00204 80B8B304 00000000 */ nop -/* 00208 80B8B308 46004224 */ cvt.w.s $f8, $f8 -/* 0020C 80B8B30C 4444F800 */ cfc1 $a0, $31 -/* 00210 80B8B310 00000000 */ nop -/* 00214 80B8B314 30840078 */ andi $a0, $a0, 0x0078 ## $a0 = 00000000 -/* 00218 80B8B318 14800005 */ bne $a0, $zero, .L80B8B330 -/* 0021C 80B8B31C 00000000 */ nop -/* 00220 80B8B320 44044000 */ mfc1 $a0, $f8 -/* 00224 80B8B324 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00228 80B8B328 10000007 */ beq $zero, $zero, .L80B8B348 -/* 0022C 80B8B32C 00812025 */ or $a0, $a0, $at ## $a0 = 80000000 -.L80B8B330: -/* 00230 80B8B330 10000005 */ beq $zero, $zero, .L80B8B348 -/* 00234 80B8B334 2404FFFF */ addiu $a0, $zero, 0xFFFF ## $a0 = FFFFFFFF -/* 00238 80B8B338 44044000 */ mfc1 $a0, $f8 -.L80B8B33C: -/* 0023C 80B8B33C 00000000 */ nop -/* 00240 80B8B340 0480FFFB */ bltz $a0, .L80B8B330 -/* 00244 80B8B344 00000000 */ nop -.L80B8B348: -/* 00248 80B8B348 91EFCD98 */ lbu $t7, %lo(D_80B8CD98)($t7) -/* 0024C 80B8B34C 44CEF800 */ ctc1 $t6, $31 -/* 00250 80B8B350 3C0280B9 */ lui $v0, %hi(D_80B8CDAA) ## $v0 = 80B90000 -/* 00254 80B8B354 000FC100 */ sll $t8, $t7, 4 -/* 00258 80B8B358 00B8C821 */ addu $t9, $a1, $t8 -/* 0025C 80B8B35C A324000F */ sb $a0, 0x000F($t9) ## 0000000F -/* 00260 80B8B360 9108CD99 */ lbu $t0, %lo(D_80B8CD99)($t0) -/* 00264 80B8B364 2442CDAA */ addiu $v0, $v0, %lo(D_80B8CDAA) ## $v0 = 80B8CDAA -/* 00268 80B8B368 2463CD9A */ addiu $v1, $v1, %lo(D_80B8CD9A) ## $v1 = 80B8CD9A -/* 0026C 80B8B36C 00084900 */ sll $t1, $t0, 4 -/* 00270 80B8B370 00A95021 */ addu $t2, $a1, $t1 -/* 00274 80B8B374 A144000F */ sb $a0, 0x000F($t2) ## 0000000F -.L80B8B378: -/* 00278 80B8B378 906B0000 */ lbu $t3, 0x0000($v1) ## 80B8CD9A -/* 0027C 80B8B37C 24630004 */ addiu $v1, $v1, 0x0004 ## $v1 = 80B8CD9E -/* 00280 80B8B380 000B6100 */ sll $t4, $t3, 4 -/* 00284 80B8B384 00AC6821 */ addu $t5, $a1, $t4 -/* 00288 80B8B388 A1A4000F */ sb $a0, 0x000F($t5) ## 0000000F -/* 0028C 80B8B38C 906EFFFD */ lbu $t6, -0x0003($v1) ## 80B8CD9B -/* 00290 80B8B390 000E7900 */ sll $t7, $t6, 4 -/* 00294 80B8B394 00AFC021 */ addu $t8, $a1, $t7 -/* 00298 80B8B398 A304000F */ sb $a0, 0x000F($t8) ## 0000000F -/* 0029C 80B8B39C 9079FFFE */ lbu $t9, -0x0002($v1) ## 80B8CD9C -/* 002A0 80B8B3A0 00194100 */ sll $t0, $t9, 4 -/* 002A4 80B8B3A4 00A84821 */ addu $t1, $a1, $t0 -/* 002A8 80B8B3A8 A124000F */ sb $a0, 0x000F($t1) ## 0000000F -/* 002AC 80B8B3AC 906AFFFF */ lbu $t2, -0x0001($v1) ## 80B8CD9D -/* 002B0 80B8B3B0 000A5900 */ sll $t3, $t2, 4 -/* 002B4 80B8B3B4 00AB6021 */ addu $t4, $a1, $t3 -/* 002B8 80B8B3B8 1462FFEF */ bne $v1, $v0, .L80B8B378 -/* 002BC 80B8B3BC A184000F */ sb $a0, 0x000F($t4) ## 0000000F -/* 002C0 80B8B3C0 03E00008 */ jr $ra -/* 002C4 80B8B3C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B3C8.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B3C8.s deleted file mode 100644 index 5a99d1112b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B3C8.s +++ /dev/null @@ -1,59 +0,0 @@ -.rdata -glabel D_80B8CE3C - .asciz "../z_magic_wind.c" - .balign 4 - -glabel D_80B8CE50 - .asciz "\"表示開始\" = %s\n" - .balign 4 - -glabel D_80B8CE64 - .asciz "表示開始" - .balign 4 - -.text -glabel func_80B8B3C8 -/* 002C8 80B8B3C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 002CC 80B8B3CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 002D0 80B8B3D0 AFA50024 */ sw $a1, 0x0024($sp) -/* 002D4 80B8B3D4 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 002D8 80B8B3D8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 002DC 80B8B3DC 2405021B */ addiu $a1, $zero, 0x021B ## $a1 = 0000021B -/* 002E0 80B8B3E0 AFAF001C */ sw $t7, 0x001C($sp) -/* 002E4 80B8B3E4 8482016C */ lh $v0, 0x016C($a0) ## 0000016C -/* 002E8 80B8B3E8 18400003 */ blez $v0, .L80B8B3F8 -/* 002EC 80B8B3EC 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 002F0 80B8B3F0 10000019 */ beq $zero, $zero, .L80B8B458 -/* 002F4 80B8B3F4 A498016C */ sh $t8, 0x016C($a0) ## 0000016C -.L80B8B3F8: -/* 002F8 80B8B3F8 3C0480B9 */ lui $a0, %hi(D_80B8CE3C) ## $a0 = 80B90000 -/* 002FC 80B8B3FC 2484CE3C */ addiu $a0, $a0, %lo(D_80B8CE3C) ## $a0 = 80B8CE3C -/* 00300 80B8B400 0C000B84 */ jal LogUtils_LogThreadId - -/* 00304 80B8B404 AFA60020 */ sw $a2, 0x0020($sp) -/* 00308 80B8B408 3C0480B9 */ lui $a0, %hi(D_80B8CE50) ## $a0 = 80B90000 -/* 0030C 80B8B40C 3C0580B9 */ lui $a1, %hi(D_80B8CE64) ## $a1 = 80B90000 -/* 00310 80B8B410 24A5CE64 */ addiu $a1, $a1, %lo(D_80B8CE64) ## $a1 = 80B8CE64 -/* 00314 80B8B414 0C00084C */ jal osSyncPrintf - -/* 00318 80B8B418 2484CE50 */ addiu $a0, $a0, %lo(D_80B8CE50) ## $a0 = 80B8CE50 -/* 0031C 80B8B41C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00320 80B8B420 0C00BDF7 */ jal func_8002F7DC -/* 00324 80B8B424 2405087A */ addiu $a1, $zero, 0x087A ## $a1 = 0000087A -/* 00328 80B8B428 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0032C 80B8B42C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00330 80B8B430 0C2E2CAA */ jal func_80B8B2A8 -/* 00334 80B8B434 00000000 */ nop -/* 00338 80B8B438 3C0580B9 */ lui $a1, %hi(func_80B8B468) ## $a1 = 80B90000 -/* 0033C 80B8B43C 24A5B468 */ addiu $a1, $a1, %lo(func_80B8B468) ## $a1 = 80B8B468 -/* 00340 80B8B440 0C2E2C40 */ jal func_80B8B100 -/* 00344 80B8B444 8FA40020 */ lw $a0, 0x0020($sp) -/* 00348 80B8B448 8FA50020 */ lw $a1, 0x0020($sp) -/* 0034C 80B8B44C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00350 80B8B450 0C01B231 */ jal SkelCurve_Update -/* 00354 80B8B454 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -.L80B8B458: -/* 00358 80B8B458 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0035C 80B8B45C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00360 80B8B460 03E00008 */ jr $ra -/* 00364 80B8B464 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B468.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B468.s deleted file mode 100644 index c2721acbe2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B468.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B8B468 -/* 00368 80B8B468 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0036C 80B8B46C AFA40018 */ sw $a0, 0x0018($sp) -/* 00370 80B8B470 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00374 80B8B474 8FA50018 */ lw $a1, 0x0018($sp) -/* 00378 80B8B478 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0037C 80B8B47C 0C01B231 */ jal SkelCurve_Update -/* 00380 80B8B480 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00384 80B8B484 10400007 */ beq $v0, $zero, .L80B8B4A4 -/* 00388 80B8B488 8FA40018 */ lw $a0, 0x0018($sp) -/* 0038C 80B8B48C 3C0580B9 */ lui $a1, %hi(func_80B8B4B4) ## $a1 = 80B90000 -/* 00390 80B8B490 0C2E2C40 */ jal func_80B8B100 -/* 00394 80B8B494 24A5B4B4 */ addiu $a1, $a1, %lo(func_80B8B4B4) ## $a1 = 80B8B4B4 -/* 00398 80B8B498 8FAF0018 */ lw $t7, 0x0018($sp) -/* 0039C 80B8B49C 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 -/* 003A0 80B8B4A0 A5EE016C */ sh $t6, 0x016C($t7) ## 0000016C -.L80B8B4A4: -/* 003A4 80B8B4A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003A8 80B8B4A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003AC 80B8B4AC 03E00008 */ jr $ra -/* 003B0 80B8B4B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B4B4.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B4B4.s deleted file mode 100644 index 42fa48143c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B4B4.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B8B4B4 -/* 003B4 80B8B4B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003B8 80B8B4B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003BC 80B8B4BC AFA5001C */ sw $a1, 0x001C($sp) -/* 003C0 80B8B4C0 8482016C */ lh $v0, 0x016C($a0) ## 0000016C -/* 003C4 80B8B4C4 3C0580B9 */ lui $a1, %hi(func_80B8B500) ## $a1 = 80B90000 -/* 003C8 80B8B4C8 24A5B500 */ addiu $a1, $a1, %lo(func_80B8B500) ## $a1 = 80B8B500 -/* 003CC 80B8B4CC 18400003 */ blez $v0, .L80B8B4DC -/* 003D0 80B8B4D0 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 003D4 80B8B4D4 10000006 */ beq $zero, $zero, .L80B8B4F0 -/* 003D8 80B8B4D8 A48E016C */ sh $t6, 0x016C($a0) ## 0000016C -.L80B8B4DC: -/* 003DC 80B8B4DC 0C2E2C40 */ jal func_80B8B100 -/* 003E0 80B8B4E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 003E4 80B8B4E4 8FA40018 */ lw $a0, 0x0018($sp) -/* 003E8 80B8B4E8 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 003EC 80B8B4EC A48F016C */ sh $t7, 0x016C($a0) ## 0000016C -.L80B8B4F0: -/* 003F0 80B8B4F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003F4 80B8B4F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003F8 80B8B4F8 03E00008 */ jr $ra -/* 003FC 80B8B4FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B500.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B500.s deleted file mode 100644 index 8fa58e990e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B500.s +++ /dev/null @@ -1,34 +0,0 @@ -.late_rodata -glabel D_80B8CEC0 - .float 0.033333335 - -.text -glabel func_80B8B500 -/* 00400 80B8B500 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00404 80B8B504 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00408 80B8B508 AFA5001C */ sw $a1, 0x001C($sp) -/* 0040C 80B8B50C 8482016C */ lh $v0, 0x016C($a0) ## 0000016C -/* 00410 80B8B510 1840000E */ blez $v0, .L80B8B54C -/* 00414 80B8B514 00000000 */ nop -/* 00418 80B8B518 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0041C 80B8B51C 3C0180B9 */ lui $at, %hi(D_80B8CEC0) ## $at = 80B90000 -/* 00420 80B8B520 C428CEC0 */ lwc1 $f8, %lo(D_80B8CEC0)($at) -/* 00424 80B8B524 468021A0 */ cvt.s.w $f6, $f4 -/* 00428 80B8B528 AFA40018 */ sw $a0, 0x0018($sp) -/* 0042C 80B8B52C 46083302 */ mul.s $f12, $f6, $f8 -/* 00430 80B8B530 0C2E2CAA */ jal func_80B8B2A8 -/* 00434 80B8B534 00000000 */ nop -/* 00438 80B8B538 8FA40018 */ lw $a0, 0x0018($sp) -/* 0043C 80B8B53C 848E016C */ lh $t6, 0x016C($a0) ## 0000016C -/* 00440 80B8B540 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 00444 80B8B544 10000003 */ beq $zero, $zero, .L80B8B554 -/* 00448 80B8B548 A48F016C */ sh $t7, 0x016C($a0) ## 0000016C -.L80B8B54C: -/* 0044C 80B8B54C 0C00B55C */ jal Actor_Kill - -/* 00450 80B8B550 00000000 */ nop -.L80B8B554: -/* 00454 80B8B554 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00458 80B8B558 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0045C 80B8B55C 03E00008 */ jr $ra -/* 00460 80B8B560 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B564.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B564.s deleted file mode 100644 index 18d7119e87..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B564.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B8B564 -/* 00464 80B8B564 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00468 80B8B568 AFA40018 */ sw $a0, 0x0018($sp) -/* 0046C 80B8B56C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00470 80B8B570 8FA50018 */ lw $a1, 0x0018($sp) -/* 00474 80B8B574 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00478 80B8B578 0C01B231 */ jal SkelCurve_Update -/* 0047C 80B8B57C 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00480 80B8B580 50400004 */ beql $v0, $zero, .L80B8B594 -/* 00484 80B8B584 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00488 80B8B588 0C00B55C */ jal Actor_Kill - -/* 0048C 80B8B58C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00490 80B8B590 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B8B594: -/* 00494 80B8B594 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00498 80B8B598 03E00008 */ jr $ra -/* 0049C 80B8B59C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s deleted file mode 100644 index 6f00de80a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s +++ /dev/null @@ -1,123 +0,0 @@ -.rdata -glabel D_80B8CE70 - .asciz "../z_magic_wind.c" - .balign 4 - -glabel D_80B8CE84 - .asciz "../z_magic_wind.c" - .balign 4 - -.text -glabel func_80B8B5F4 -/* 004F4 80B8B5F4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 004F8 80B8B5F8 AFBF003C */ sw $ra, 0x003C($sp) -/* 004FC 80B8B5FC AFB00038 */ sw $s0, 0x0038($sp) -/* 00500 80B8B600 AFA5006C */ sw $a1, 0x006C($sp) -/* 00504 80B8B604 AFA60070 */ sw $a2, 0x0070($sp) -/* 00508 80B8B608 AFA70074 */ sw $a3, 0x0074($sp) -/* 0050C 80B8B60C 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 00510 80B8B610 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00514 80B8B614 3C0680B9 */ lui $a2, %hi(D_80B8CE70) ## $a2 = 80B90000 -/* 00518 80B8B618 24C6CE70 */ addiu $a2, $a2, %lo(D_80B8CE70) ## $a2 = 80B8CE70 -/* 0051C 80B8B61C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 -/* 00520 80B8B620 24070267 */ addiu $a3, $zero, 0x0267 ## $a3 = 00000267 -/* 00524 80B8B624 0C031AB1 */ jal Graph_OpenDisps -/* 00528 80B8B628 AFA50060 */ sw $a1, 0x0060($sp) -/* 0052C 80B8B62C 8FA20070 */ lw $v0, 0x0070($sp) -/* 00530 80B8B630 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00534 80B8B634 8FA90060 */ lw $t1, 0x0060($sp) -/* 00538 80B8B638 14410025 */ bne $v0, $at, .L80B8B6D0 -/* 0053C 80B8B63C 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00540 80B8B640 8D2302D0 */ lw $v1, 0x02D0($t1) ## 000002D0 -/* 00544 80B8B644 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00548 80B8B648 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 0054C 80B8B64C 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 00550 80B8B650 AD2E02D0 */ sw $t6, 0x02D0($t1) ## 000002D0 -/* 00554 80B8B654 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 00558 80B8B658 8E02009C */ lw $v0, 0x009C($s0) ## 0000009C -/* 0055C 80B8B65C 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 00560 80B8B660 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 -/* 00564 80B8B664 00026900 */ sll $t5, $v0, 4 -/* 00568 80B8B668 01A26823 */ subu $t5, $t5, $v0 -/* 0056C 80B8B66C 000D6840 */ sll $t5, $t5, 1 -/* 00570 80B8B670 00024100 */ sll $t0, $v0, 4 -/* 00574 80B8B674 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 00578 80B8B678 01024023 */ subu $t0, $t0, $v0 -/* 0057C 80B8B67C 000230C0 */ sll $a2, $v0, 3 -/* 00580 80B8B680 310800FF */ andi $t0, $t0, 0x00FF ## $t0 = 00000000 -/* 00584 80B8B684 016E7823 */ subu $t7, $t3, $t6 -/* 00588 80B8B688 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 0058C 80B8B68C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00590 80B8B690 00C23021 */ addu $a2, $a2, $v0 -/* 00594 80B8B694 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 -/* 00598 80B8B698 AFAC0018 */ sw $t4, 0x0018($sp) -/* 0059C 80B8B69C AFB90014 */ sw $t9, 0x0014($sp) -/* 005A0 80B8B6A0 AFB90028 */ sw $t9, 0x0028($sp) -/* 005A4 80B8B6A4 AFAF0020 */ sw $t7, 0x0020($sp) -/* 005A8 80B8B6A8 01683823 */ subu $a3, $t3, $t0 -/* 005AC 80B8B6AC AFA8001C */ sw $t0, 0x001C($sp) -/* 005B0 80B8B6B0 AFB80010 */ sw $t8, 0x0010($sp) -/* 005B4 80B8B6B4 AFB80024 */ sw $t8, 0x0024($sp) -/* 005B8 80B8B6B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005BC 80B8B6BC 0C0253D0 */ jal Gfx_TwoTexScroll -/* 005C0 80B8B6C0 AFA3004C */ sw $v1, 0x004C($sp) -/* 005C4 80B8B6C4 8FAA004C */ lw $t2, 0x004C($sp) -/* 005C8 80B8B6C8 1000002D */ beq $zero, $zero, .L80B8B780 -/* 005CC 80B8B6CC AD420004 */ sw $v0, 0x0004($t2) ## 00000004 -.L80B8B6D0: -/* 005D0 80B8B6D0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 005D4 80B8B6D4 1441002A */ bne $v0, $at, .L80B8B780 -/* 005D8 80B8B6D8 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 005DC 80B8B6DC 8D2302D0 */ lw $v1, 0x02D0($t1) ## 000002D0 -/* 005E0 80B8B6E0 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 005E4 80B8B6E4 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 -/* 005E8 80B8B6E8 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 -/* 005EC 80B8B6EC AD2C02D0 */ sw $t4, 0x02D0($t1) ## 000002D0 -/* 005F0 80B8B6F0 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 005F4 80B8B6F4 8E02009C */ lw $v0, 0x009C($s0) ## 0000009C -/* 005F8 80B8B6F8 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 005FC 80B8B6FC 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 -/* 00600 80B8B700 00027080 */ sll $t6, $v0, 2 -/* 00604 80B8B704 01C27021 */ addu $t6, $t6, $v0 -/* 00608 80B8B708 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 -/* 0060C 80B8B70C 016F3823 */ subu $a3, $t3, $t7 -/* 00610 80B8B710 00027880 */ sll $t7, $v0, 2 -/* 00614 80B8B714 00026880 */ sll $t5, $v0, 2 -/* 00618 80B8B718 01A26823 */ subu $t5, $t5, $v0 -/* 0061C 80B8B71C 01E27821 */ addu $t7, $t7, $v0 -/* 00620 80B8B720 000F7840 */ sll $t7, $t7, 1 -/* 00624 80B8B724 000D6840 */ sll $t5, $t5, 1 -/* 00628 80B8B728 AFB80010 */ sw $t8, 0x0010($sp) -/* 0062C 80B8B72C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00630 80B8B730 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 00634 80B8B734 AFB90014 */ sw $t9, 0x0014($sp) -/* 00638 80B8B738 AFAC0018 */ sw $t4, 0x0018($sp) -/* 0063C 80B8B73C 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 00640 80B8B740 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000024 -/* 00644 80B8B744 00023080 */ sll $a2, $v0, 2 -/* 00648 80B8B748 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 0064C 80B8B74C 0178C823 */ subu $t9, $t3, $t8 -/* 00650 80B8B750 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 -/* 00654 80B8B754 00C23023 */ subu $a2, $a2, $v0 -/* 00658 80B8B758 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 -/* 0065C 80B8B75C AFAC0024 */ sw $t4, 0x0024($sp) -/* 00660 80B8B760 AFB90020 */ sw $t9, 0x0020($sp) -/* 00664 80B8B764 AFAD0028 */ sw $t5, 0x0028($sp) -/* 00668 80B8B768 AFAE001C */ sw $t6, 0x001C($sp) -/* 0066C 80B8B76C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00670 80B8B770 0C0253D0 */ jal Gfx_TwoTexScroll -/* 00674 80B8B774 AFA30048 */ sw $v1, 0x0048($sp) -/* 00678 80B8B778 8FA80048 */ lw $t0, 0x0048($sp) -/* 0067C 80B8B77C AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -.L80B8B780: -/* 00680 80B8B780 3C0680B9 */ lui $a2, %hi(D_80B8CE84) ## $a2 = 80B90000 -/* 00684 80B8B784 24C6CE84 */ addiu $a2, $a2, %lo(D_80B8CE84) ## $a2 = 80B8CE84 -/* 00688 80B8B788 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 -/* 0068C 80B8B78C 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 00690 80B8B790 0C031AD5 */ jal Graph_CloseDisps -/* 00694 80B8B794 24070286 */ addiu $a3, $zero, 0x0286 ## $a3 = 00000286 -/* 00698 80B8B798 8FBF003C */ lw $ra, 0x003C($sp) -/* 0069C 80B8B79C 8FB00038 */ lw $s0, 0x0038($sp) -/* 006A0 80B8B7A0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 006A4 80B8B7A4 03E00008 */ jr $ra -/* 006A8 80B8B7A8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/data/overlays/actors/z_magic_wind.data.s b/data/overlays/actors/z_magic_wind.data.s deleted file mode 100644 index 12209d0f87..0000000000 --- a/data/overlays/actors/z_magic_wind.data.s +++ /dev/null @@ -1,72 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel Magic_Wind_InitVars - .word 0x009E0700, 0x02000010, 0x00010000, 0x00000174 -.word MagicWind_Init -.word MagicWind_Destroy -.word MagicWind_Update -.word MagicWind_Draw -glabel D_80B8B880 - .word 0x00000000, 0xE8900000, 0x04000800, 0xFFFFFFFF, 0xEF6D3200, 0xEF6D0000, 0x05000000, 0xFFFFFF00, 0x00003200, 0xE8900000, 0x04000000, 0xFFFFFF00, 0xEF6D0000, 0xEF6D0000, 0x05000800, 0xFFFFFFFF, 0x00000000, 0x17700000, 0x00000800, 0xFFFFFFFF, 0x10933200, 0x10930000, 0x01000000, 0xFFFFFF00, 0x00003200, 0x17700000, 0x00000000, 0xFFFFFF00, 0x10930000, 0x10930000, 0x01000800, 0xFFFFFFFF, 0xE8903200, 0x00000000, 0x06000000, 0xFFFFFF00, 0xE8900000, 0x00000000, 0x06000800, 0xFFFFFFFF, 0x10930000, 0xEF6D0000, 0x03000800, 0xFFFFFFFF, 0x10933200, 0xEF6D0000, 0x03000000, 0xFFFFFF00, 0xEF6D3200, 0x10930000, 0x07000000, 0xFFFFFF00, 0xEF6D0000, 0x10930000, 0x07000800, 0xFFFFFFFF, 0x17703200, 0x00000000, 0x02000000, 0xFFFFFF00, 0x17700000, 0x00000000, 0x02000800, 0xFFFFFFFF, 0x00003200, 0x17700000, 0x08000000, 0xFFFFFF00, 0x00000000, 0x17700000, 0x08000800, 0xFFFFFFFF -glabel D_80B8B9A0 - .word 0x00000000, 0xE8900000, 0x04000800, 0xFFFFFFFF, 0xEF6D3200, 0xEF6D0000, 0x05000000, 0xFFFFFF00, 0x00003200, 0xE8900000, 0x04000000, 0xFFFFFF00, 0xEF6D0000, 0xEF6D0000, 0x05000800, 0xFFFFFFFF, 0x00000000, 0x17700000, 0x00000800, 0xFFFFFFFF, 0x10933200, 0x10930000, 0x01000000, 0xFFFFFF00, 0x00003200, 0x17700000, 0x00000000, 0xFFFFFF00, 0x10930000, 0x10930000, 0x01000800, 0xFFFFFFFF, 0xE8903200, 0x00000000, 0x06000000, 0xFFFFFF00, 0xE8900000, 0x00000000, 0x06000800, 0xFFFFFFFF, 0x10930000, 0xEF6D0000, 0x03000800, 0xFFFFFFFF, 0x10933200, 0xEF6D0000, 0x03000000, 0xFFFFFF00, 0xEF6D3200, 0x10930000, 0x07000000, 0xFFFFFF00, 0xEF6D0000, 0x10930000, 0x07000800, 0xFFFFFFFF, 0x17703200, 0x00000000, 0x02000000, 0xFFFFFF00, 0x17700000, 0x00000000, 0x02000800, 0xFFFFFFFF, 0x00003200, 0x17700000, 0x08000000, 0xFFFFFF00, 0x00000000, 0x17700000, 0x08000800, 0xFFFFFFFF -glabel D_80B8BAC0 - .word 0x06192843, 0x6682A0AE, 0xA3937656, 0x32120000, 0x03152539, 0x5781ADBC, 0xA47B5D45, 0x33202438, 0x331F264F, 0x718CB2C9, 0xC7AE8757, 0x33241100, 0x00051C3B, 0x5E7D9093, 0x85767881, 0x703E1401, 0x1627334F, 0x6C84969A, 0x9B8C704F, 0x27090000, 0x05152943, 0x6896B9B7, 0x996E4C34, 0x2A202631, 0x2B202F4D, 0x668FB5C0, 0xB4976B46, 0x311E0700, 0x000C274C, 0x6B8C9E9A, 0x8B7A7A7C, 0x66421E0B, 0x27303E61, 0x7C8F97A0, 0xA2876F51, 0x2A0C0000, 0x091D3559, 0x83ACC0B5, 0x8E5E3E2E, 0x28252427, 0x2628394D, 0x6CA0B8B3, 0xA07A5840, 0x2E130000, 0x061B3B5D, 0x84A9B2AD, 0x998B8F87, 0x6743251C, 0x2D3A4F73, 0x8D9DA8AB, 0x9F85725B, 0x36160300, 0x11294872, 0xA0C6C7AC, 0x80523628, 0x27231B1E, 0x242E3A50, 0x7BA6B3A6, 0x8F684D39, 0x24080000, 0x112D4F73, 0xA2C1C8BD, 0xAFB2B495, 0x65402B25, 0x30485E7D, 0x96A9B4AC, 0x9B8A7960, 0x3A1B0B0A, 0x1A355C8B, 0xBCD6C9A0, 0x734D2F1E, 0x201D1119, 0x28313853, 0x83A2A99D, 0x815B4230, 0x1D020006, 0x1D3C618D, 0xBAD8DBC7, 0xC7CEC18C, 0x5C443527, 0x3A586C84, 0x9BAFB4AE, 0xA3917852, 0x2E171114, 0x264872A4, 0xD4DFC799, 0x7253321C, 0x1F1B192A, 0x393C4663, 0x8AA0A396, 0x73513D30, 0x1C020010, 0x2A4D79A6, 0xD5EFE6D5, 0xD0C8AB77, 0x574F3F2E, 0x44637787, 0x9FADB3B7, 0xAF906439, 0x1C11141F, 0x385C8ABF, 0xE8E7C69E, 0x7F644831, 0x2B313F4C, 0x4E536680, 0x96A4A38E, 0x664F473B, 0x1F06061C, 0x3A6393C2, 0xEFFCEDDD, 0xC2A48564, 0x5A5A4338, 0x48667A8A, 0xA0AAB2BC, 0xAB784521, 0x100D192F, 0x4D72A3D7, 0xF7EDCCAE, 0x947F6953, 0x5263655E, 0x5C698097, 0xA4AAA180, 0x605B5E4C, 0x270D122B, 0x4E7BABDE, 0xFFFDECD2, 0xA57A6962, 0x66614540, 0x4D62798D, 0xA3ABB3B0, 0x89522812, 0x0A102543, 0x638CBEEA, 0xFFF7DEC4, 0xB09F8B7C, 0x8B896F62, 0x66778CA3, 0xB2AF9973, 0x67737258, 0x331C233D, 0x6591C4F2, 0xFFF5DDBA, 0x8A666E79, 0x79664A47, 0x57657D95, 0xAAB5B394, 0x5C2E160B, 0x0B1B3959, 0x7DA6D5F9, 0xFFFFF5E0, 0xCCB8ACAB, 0xA98D6F66, 0x71869DAE, 0xBCAE8E76, 0x808A7C60, 0x44333852, 0x7BAADDFE, 0xFFE7C9A4, 0x7F76909B, 0x866B5250, 0x63768BA1, 0xB9C0AA75, 0x3A191212, 0x192E5075, 0x9BC1E7FF, 0xFFFFFFF5, 0xDFCCC7B6, 0x9A7D6769, 0x85A0B0C0, 0xC1A88C87, 0x99967B65, 0x5B52526B, 0x90C2ECFF, 0xFBDDBDA1, 0x909BB2A9, 0x8268615E, 0x6B819EB4, 0xCAC49D5C, 0x28151C27, 0x30476E96, 0xB8D7F2FB, 0xF9FAFFF9, 0xE7D6BF9E, 0x7F675D75, 0xA1B0BECC, 0xC0A3949B, 0xA8967870, 0x78737180, 0xA6D6F1F6, 0xF2DDC4B7, 0xB4BDB9A0, 0x796D6F6B, 0x6D87ACCA, 0xD5C08E4F, 0x2823313F, 0x4C6993B5, 0xCEE3EDEA, 0xE5E6ECF1, 0xE5CDAA8A, 0x6F5E678D, 0xB2B7C8D1, 0xBFA499A1, 0xA48E7D86, 0x958F8794, 0xBDDFE6E7, 0xE9E1DDD6, 0xD0C8AC98, 0x7B767569, 0x6E8EB7DD, 0xDBB98454, 0x39394553, 0x688DB6CB, 0xD6DFDED7, 0xD3D4DEE2, 0xD7BD9F80, 0x696C87A3, 0xBAC4D4D6, 0xC2A99693, 0x90878D9E, 0xAAA096A6, 0xC9D8D1D2, 0xDCE5E9E1, 0xD4BDA094, 0x8277675E, 0x7195C7EB, 0xDCB08769, 0x544E5163, 0x84AED0D1, 0xD0D3CEC9, 0xC7C7CED0, 0xC7AF9679, 0x6F829FB5, 0xC7D7E3DD, 0xC8A98776, 0x77899FB0, 0xB4A5A0B2, 0xC7C8B8BC, 0xCAD8DBD8, 0xC8AC9786, 0x76625159, 0x73A1DFF7, 0xD3A89586, 0x735C5971, 0x9FC8D3CA, 0xC9CAC2BA, 0xB8B7BABF, 0xB7A39076, 0x7B94AAC3, 0xD3E1F0E2, 0xC6A27358, 0x658CABB7, 0xB3A5A9B4, 0xBCAFA0A4, 0xB3C1D0D1, 0xB7998570, 0x5340475A, 0x7BB8F6F6, 0xC8A3A09F, 0x85656385, 0xB6CECBC9, 0xCCC4B0A2, 0xA1A4AAB2, 0xAD9D8E79, 0x89A5BCCB, 0xCEDEF2DE, 0xBD966146, 0x608DAEB3, 0xAEABB4B5, 0xAA90868D, 0xA0BAD2CA, 0xA482705B, 0x3630465C, 0x8DD2FCEC, 0xC4A8A5A4, 0x8B71759E, 0xC1CCCACD, 0xCDB69180, 0x8593A0AB, 0xAA9A9085, 0x97B7C6BD, 0xB9D6EBD8, 0xB4865A45, 0x628DA6AB, 0xB2B9BFB3, 0x8E726E7D, 0xA2CAD0B5, 0x8E706550, 0x3834435D, 0xA0E0F4E6, 0xCAAEA39A, 0x8D8390B2, 0xC9CCCCCD, 0xBF986B5D, 0x6F85A1B2, 0xAC9B958F, 0x9FAEA597, 0xA5CEE5D4, 0xAC836356, 0x6B8C9EAC, 0xBFCAC39F, 0x705A6286, 0xBFD7BD9A, 0x806D6554, 0x4C3F4063, 0xADDDEAE2, 0xCEAC9A93, 0x909AAFC1, 0xCCC8C8BF, 0x9E704847, 0x6384B0B9, 0xAD9A918E, 0x8D7D6F76, 0x99C4DED4, 0xAF8D7370, 0x7C91A2B7, 0xCBD0B07F, 0x5A526DAA, 0xDCCAA18D, 0x7D716F68, 0x5C404271, 0xB6D8E2DB, 0xC49F9594, 0x98B3C9C9, 0xC3BEB8A1, 0x764D333D, 0x6696C0B6, 0xA5978277, 0x60424665, 0x91BDD5D9, 0xBD9E8D8B, 0x97A6B4C6, 0xCDBA9066, 0x525D8CCB, 0xD7AD938A, 0x80767B7B, 0x5B3C4A80, 0xC2DFD9C6, 0xA08E9A9E, 0xA4C7D4C2, 0xB7B0A280, 0x52342E47, 0x7FABBFAC, 0x947C5E4E, 0x301D3560, 0x8DB6CEDD, 0xCDB6A8A4, 0xB4C4CCCD, 0xBC9A765A, 0x5773A8CA, 0xBF9E8F89, 0x7D7B8171, 0x4A3B588D, 0xD0E1C999, 0x7287A9B0, 0xB3D1D2B7, 0xACA28C65, 0x3B293C6C, 0x9BB4B09B, 0x724C382A, 0x1511335D, 0x8AB3C7DB, 0xE2D0BEB6, 0xCEDED8C3, 0xA2816556, 0x5E85A5AD, 0xAE9B8D86, 0x827D7051, 0x363B6399, 0xD0D1A164, 0x5889B7BD, 0xBAD0C9B0, 0xA2957952, 0x2F2F5E91, 0xA5A99A79, 0x4C2D251C, 0x0F123059, 0x87ABBFDC, 0xF5E3C9C0, 0xE1E7D3B3, 0x8F71594F, 0x5E808D95, 0xA3978683, 0x856F5039, 0x263B6FA2, 0xB9A06746, 0x548CB6B9, 0xC1D0BFA9, 0x99846342, 0x30447999, 0x9A938058, 0x3827231A, 0x12162552, 0x7B9BB8DB, 0xFEEBD0CA, 0xDFD6C4A4, 0x82644A42, 0x546C7786, 0x96897977, 0x755B3928, 0x20477FA3, 0x8D5A3D45, 0x5C85A3B2, 0xCED1B3A0, 0x8F714E3A, 0x3E567A83, 0x7C78664E, 0x3D2D201A, 0x1C202345, 0x678AAFD3, 0xF6E7D7CD, 0xC8BCAE99, 0x72563A31, 0x45586C7B, 0x82756662, 0x584C3524, 0x2D5E8B9D, 0x60292D4F, 0x5D708DB5, 0xDCC4A89A, 0x835D4042, 0x4C596560, 0x5D605450, 0x47321C1A, 0x2D3E3433, 0x5179A4C3, 0xE3E1D6C3, 0xAB9D978B, 0x6244271F, 0x3449616C, 0x6C645C50, 0x4443433A, 0x4A75908E, 0x48172851, 0x505A8CBC, 0xD3B3A098, 0x7750464F, 0x4E4F4C47, 0x4C4F4D4D, 0x46321B26, 0x50664A2A, 0x42739DB2, 0xD4D9CBB2, 0x8C7F847A, 0x52321B10, 0x233B4C53, 0x595D5B48, 0x404C5D66, 0x6B818D80, 0x42162444, 0x3B5894B3, 0xC1AAA294, 0x6F545456, 0x473D3D3C, 0x4345474A, 0x45362D52, 0x7C795329, 0x3F7399AB, 0xC7CDBD98, 0x706C736B, 0x47271408, 0x11283239, 0x4D5D5A4F, 0x51688D8E, 0x80818571, 0x38131C2F, 0x33628FA6, 0xBDB0A88C, 0x77645E56, 0x3F2F2E31, 0x3F43454D, 0x4E506B99, 0x9B7D5A2D, 0x3F719BAB, 0xBCC0A380, 0x5D5E635C, 0x442A1C0B, 0x0B19212D, 0x44606367, 0x7197B49D, 0x8479735B, 0x21101724, 0x346286A3, 0xC2BDA88D, 0x86756B58, 0x3C211524, 0x424C4E57, 0x658AC3CB, 0xAB846031, 0x3E6E98AD, 0xB3B28C71, 0x50545A58, 0x4D3E2F1E, 0x15151E2F, 0x45627A87, 0xA0BDAA8D, 0x7B69523C, 0x11151E1E, 0x325B82A4, 0xC8BEA597, 0x9183795D, 0x3C1A0F25, 0x4C606165, 0x8CCAF7DE, 0xB98D6436, 0x3B6690AA, 0xA89F8162, 0x46505A64, 0x61524235, 0x25192038, 0x4F688DAC, 0xC3AB776B, 0x674E301D, 0x14232517, 0x32587CA3, 0xC0B3A19A, 0x978D8260, 0x3C1E1E39, 0x5C7A7682, 0xBAE5FFEB, 0xC294683D, 0x325C829E, 0x9B8C6948, 0x44566E81, 0x7663574A, 0x2F1F2A44, 0x5B78A0C6, 0xAF724242, 0x442E110A, 0x212A2113, 0x3253799A, 0xB0A59697, 0x9D91835C, 0x4333394F, 0x739090AC, 0xD3E6FFF4, 0xC4986B40, 0x284F6F8E, 0x8B6C3930, 0x4E6C939B, 0x87796F56, 0x31263851, 0x6887B2B3, 0x7B471F19, 0x1E0F000F, 0x2A27160B, 0x3051778C, 0xA0988E96, 0xA2997F5E, 0x54505161, 0x8A9EAEC8, 0xD9F0FFF9, 0xC7936744, 0x1C3C607F, 0x6E361435, 0x6787A8A2, 0x9D967A4D, 0x2D2E4561, 0x7696AA87, 0x5D391200, 0x03000D21, 0x27190806, 0x2E527180, 0x95918F9A, 0xAAA0806B, 0x6F6B6570, 0x97ABC3D4, 0xE9FEFFFB, 0xC2896644, 0x0D2B5064, 0x380F1D58, 0x84949FA0, 0xB3A26938, 0x2939586F, 0x819D9577, 0x5D3F1700, 0x00112D35, 0x17050106, 0x2F526B7A, 0x8F9499A4, 0xAFA38B80, 0x857D757F, 0xA5BAD1E5, 0xFCFFFFF6, 0xBA8C6C39, 0x061C3B33, 0x0C154279, 0x918C95A9, 0xB88F4F2F, 0x344F6E7B, 0x899A9181, 0x684A2306, 0x1A3B4D3D, 0x0700050B, 0x2E506B7B, 0x8F9AA5AB, 0xADA8A296, 0x8C898190, 0xB4C3DEF4, 0xFFFFFFEF, 0xC09E6B29, 0x0211190A, 0x11345B7F, 0x8C879EB3, 0xA070463A, 0x51708385, 0x8BA1A18F, 0x6E503129, 0x516C6033, 0x08071012, 0x29507381, 0x93A4A9A9, 0xACB9B898, 0x8C8C8DA2, 0xB9C8E3F6, 0xFFFFF3F4, 0xD1A25C17, 0x0106020D, 0x30455E70, 0x818EA8A9, 0x7F634F59, 0x7D97978D, 0x90B2B491, 0x6C585466, 0x8F895E27, 0x23242116, 0x29597D85, 0x97A8A0A4, 0xB8CCBD93, 0x8C8C95A6, 0xBACEE3FA, 0xFFFAF5FF, 0xD594480C, 0x0000092A, 0x44445B66, 0x819BA493, 0x72676682, 0xABB5A598, 0xA0BEB58B, 0x6C6C8FAD, 0xB68E5A2E, 0x4F49311E, 0x34648287, 0x94A099AD, 0xC8D1B999, 0x8D8D91A2, 0xB9D4EBFD, 0xFAF5FFFF, 0xC67D3E11, 0x050D213A, 0x44445C69, 0x8BA29A8B, 0x787885AA, 0xC7C0AFA8, 0xADB7AA85, 0x7794CEE1, 0xC08F654F, 0x7B623E2F, 0x486D7D81, 0x8F969FBC, 0xCCCEBFA8, 0x9387899E, 0xBADCF2F4, 0xECF5FFFA, 0xB0734830, 0x313C3D39, 0x40475E72, 0x96A09893, 0x8990A4C0, 0xC8C2B8B4, 0xADAAA28A, 0x97CCFCF6, 0xC49D8782, 0x94684E49, 0x5D72707C, 0x909AB2C3, 0xCDD6CDB4, 0x978387A3, 0xC6E3EFE9, 0xDFEFFFE7, 0xA87F6768, 0x706B5339, 0x3F495E7F, 0x9BA0A29F, 0x9AA9B3BD, 0xBFBDBCB7, 0xA5A2A4A4, 0xCBFBFFFB, 0xD4BEB7AF, 0x976C6267, 0x72766D80, 0x95ABC1CA, 0xD9E7D7B9, 0x9A8791B2, 0xD2E5E7DB, 0xD1E7FEE0, 0xB49D97A0, 0x997B5D3B, 0x3F4A638E, 0x9FAAAEA6, 0xA8B2ADB3, 0xB4B6BEB6, 0xA2A2B8D0, 0xFBFFFFFE, 0xECE5DFC8, 0x96787D87, 0x7D7C7B8B, 0x9FB3C9DB, 0xEFF1DBBA, 0x9F91A2C3, 0xD9DCD3BF, 0xC0DEFBEC, 0xD5C9C6BD, 0xA2795B38, 0x3C54769E, 0xA5B7B8AC, 0xACADA8AC, 0xADB6BEB4, 0xA5AFD7F0, 0xFFFFFFFB, 0xFCFFF3CA, 0x9E909D96, 0x81868A9D, 0xAAB7D4F2, 0xFFF5D9BA, 0xA4A1B7D5, 0xD6BDA69F, 0xAFD0EFFB, 0xFAEDDFC1, 0x9B705132, 0x446E94A6, 0xA9BFC1B3, 0xACA8A5A9, 0xAFBCBEB7, 0xB5C8E0F2, 0xFFFFF3EA, 0xF7FFF3C7, 0xB0B0AB8A, 0x818991A2, 0xACC6E5FF, 0xFFF7D9BD, 0xADB3CCD8, 0xB9867681, 0x9DBCDBF9, 0xFFF7E0BA, 0x8E654534, 0x6194A49F, 0xA6C4CCC0, 0xAFA9AAB2, 0xBEC0BFC2, 0xCBCDCCDE, 0xF3EAD2D5, 0xE5F1EAC7, 0xC8C09D79, 0x787F8A93, 0xA5D2F5FF, 0xFFF7D9C3, 0xBCC4CDBA, 0x83525268, 0x85A4C9EB, 0xFBEDD7AE, 0x80594048, 0x87A9938F, 0xA5CEDED0, 0xBAB3BAC7, 0xCBC2C3CD, 0xCEB8B0C2, 0xCBBDB7C1, 0xD2E0E1CC, 0xCAAB846C, 0x66697280, 0xA1D5FFFF, 0xFFF6DDCE, 0xCAC2AC86, 0x502E364F, 0x6E94BDE1, 0xF3E1CC9F, 0x7054506E, 0x98977C89, 0xADE0F0DC, 0xCBC8D4D9, 0xD0C7C8C8, 0xB89A9398, 0x979AA1B3, 0xC7D5DCD0, 0xAA816B5A, 0x51515B76, 0xA2D5FCFF, 0xFFF6E5D9, 0xC7A58058, 0x30161C36, 0x5C8AB8DC, 0xECD9C08D, 0x67606E86, 0x857A7B90, 0xBFF4FDEA, 0xE1E3E8DF, 0xD2CBC3B4, 0x9A7F706B, 0x718394AD, 0xC2D0D2C4, 0x7B5B4A3E, 0x383A4D73, 0xA4D1EFFF, 0xFFF9EAD7, 0xAF855E3C, 0x1F090825, 0x5184B5D7, 0xE7D1AF80, 0x676E857F, 0x6B7089A6, 0xD9FFFFFB, 0xFAFBEFDD, 0xD4CBB498, 0x7F655050, 0x5D7391AD, 0xC1CAC0A3, 0x583F2F21, 0x1B274676, 0xA4C6E3FF, 0xFFFBE8C4, 0x97704D2E, 0x1502001B, 0x4E83B3D4, 0xDCC2A27A, 0x6C7B8770, 0x66789BC4, 0xF1FFFFFF, 0xFFFFEBD6, 0xD0C1A17C, 0x62483D47, 0x577396AE, 0xC0BFA67B, 0x3F2D1F13, 0x0B1A4376, 0x9FC1E3FF, 0xFFF7DBAE, 0x84614226, 0x0F000017, 0x4D84B6D0, 0xCCB39879, 0x75838273, 0x728BB8E1, 0xFFFFFFFF, 0xFFFBE0C8, 0xC1AF895B, 0x3F313544, 0x5A7DA0B3, 0xBAAD865C, 0x3123190D, 0x08134071, 0x9FC9F3FF, 0xFFEFC89A, 0x73533921, 0x0C02061C, 0x518BB7C7, 0xBCA28E7F, 0x7C858584, 0x86A5D6F4, 0xFFFFFFFF, 0xFFEFCBB2, 0xAC966635, 0x20253147, 0x6791B3B6, 0xAF946948, 0x2A1F1309, 0x08193E73, 0xADE3FFFF, 0xFDDEB287, 0x6448321F, 0x0C081427, 0x5B8FB3BC, 0xAA8F8782, 0x81869198, 0xA0C3EBFF, 0xFFFFFFFF, 0xFEDDAD96, 0x8E713E17, 0x0F1D3252, 0x7CAAC3B5, 0xA07C563C, 0x281C0B05, 0x0C214583, 0xCBFFFFFF, 0xF2CA9B73, 0x543D2D1C, 0x1016283A, 0x6494AFAF, 0x9B828281, 0x82899DAA, 0xBCDFFAFF, 0xFFFFFFFF, 0xF1C18F76, 0x69481D05, 0x061A3B65, 0x95BEC7AB, 0x8E694633, 0x28150001, 0x132F57A1, 0xEDFFFFFF, 0xDFB28360, 0x4635271D, 0x1C293C49, 0x6E97A9A5, 0x8E797A7B, 0x7C89A5BD, 0xD4EFFCFF, 0xFFFFFFFF, 0xDBA47758, 0x44250800, 0x021E4A7C, 0xA9C7BC9D, 0x7C5A3B2F, 0x270C0002, 0x1A3F73C3, 0xFEFFFFF4, 0xC9976B4E, 0x3B2D2325, 0x2D3C4857, 0x7C9AA69B, 0x81716D70, 0x7385B2CE, 0xDCE5F3FF, 0xFFFFFFEF, 0xBD8B623E, 0x260F0000, 0x072B5E91, 0xB4C0AC8D, 0x6D4E3832, 0x26030006, 0x215294D6, 0xFFFFFFE1, 0xAE7B563F, 0x2E232430, 0x3D475067, 0x8CA3A68F, 0x73645E65, 0x6D87BACD, 0xC7CEEBFF, 0xFFFFFED3, 0xA1774E2B, 0x13020000, 0x103A729F, 0xB3B49D7B, 0x604A433E, 0x2000000A, 0x2A66A4D9, 0xFFFFF4CB, 0x93654532, 0x211B283A, 0x464D5A78, 0x9EAFA281, 0x6454525D, 0x6F8DB3B0, 0xA8BFE3FF, 0xFFFFE9B8, 0x8D673F1D, 0x07000002, 0x1D4882A0, 0xADAB8D6F, 0x59575A48, 0x1100000D, 0x3572AADE, 0xFFFFE0AC, 0x79513424, 0x16162A3D, 0x4750668B, 0xAFB49D71, 0x52484553, 0x6E838F87, 0x8FB3D9FB, 0xFFF6CCA0, 0x7D5D3210, 0x0000000D, 0x2A5A869E, 0xA69D7D65, 0x62706E45, 0x00000315, 0x3D77AFDD, 0xF0E6BA86, 0x5E392314, 0x0C142A3C, 0x4654729E, 0xB6AF8C63, 0x493A3547, 0x5B616168, 0x7FA6D0E9, 0xEDD7AC89, 0x714A2107, 0x0000051A, 0x3A62879A, 0x97876D66, 0x767D6026, 0x00010B25, 0x4A7FB0D3, 0xDBC1956B, 0x492A1406, 0x07142A39, 0x465E83AD, 0xB79F755D, 0x492D293B, 0x463E3C54, 0x76A0C1D5, 0xD7BF9B7C, 0x5C311705, 0x00000C26, 0x45698B91, 0x8B786976, 0x856D3002, 0x00091A35, 0x5D85A9C6, 0xBFA1805E, 0x3D1F0700, 0x05162735, 0x4C6D99B9, 0xB28A6858, 0x42252439, 0x3C28294E, 0x7798B5CC, 0xD0B79870, 0x40261505, 0x00021430, 0x51788C8F, 0x86737282, 0x834E1200 -glabel D_80B8CAC0 - .word 0xE7000000, 0x00000000, 0xE3001001, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD900000 -.word D_80B8BAC0 -.word 0xF5900000, 0x07018060, 0xE6000000, 0x00000000, 0xF3000000, 0x077FF100, 0xE7000000, 0x00000000, 0xF5881000, 0x00018060, 0xF2000000, 0x000FC0FC, 0xFD900000 -.word D_80B8BAC0 -.word 0xF5900100, 0x0701B86E, 0xE6000000, 0x00000000, 0xF3000000, 0x077FF100, 0xE7000000, 0x00000000, 0xF5881100, 0x0101B86E, 0xF2000000, 0x010FC0FC, 0xFC272C60, 0x3510937F, 0xE200001C, 0x0C1849D8, 0xD9F0FBFF, 0x00000000, 0xFA000080, 0xFFFFAAFF, 0xFB000000, 0x96FF0000, 0xDE000000, 0x08000000, 0x01012024 -.word D_80B8B880 -.word 0x06000204, 0x00000602, 0x06080A0C, 0x00080E0A, 0x06061002, 0x00061210, 0x06140416, 0x00140004, 0x06121810, 0x00121A18, 0x060E1C0A, 0x000E1E1C, 0x061E161C, 0x001E1416, 0x061A2018, 0x001A2220, 0xDF000000, 0x00000000 -glabel D_80B8CBC8 - .word 0xE7000000, 0x00000000, 0xE3001001, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD900000 -.word D_80B8BAC0 -.word 0xF5900000, 0x07018060, 0xE6000000, 0x00000000, 0xF3000000, 0x077FF100, 0xE7000000, 0x00000000, 0xF5881000, 0x00018060, 0xF2000000, 0x000FC0FC, 0xFD900000 -.word D_80B8BAC0 -.word 0xF5900100, 0x0701BC6F, 0xE6000000, 0x00000000, 0xF3000000, 0x077FF100, 0xE7000000, 0x00000000, 0xF5881100, 0x0101BC6F, 0xF2000000, 0x010FC0FC, 0xFC272C60, 0x3510937F, 0xE200001C, 0x0C1849D8, 0xD9F0FBFF, 0x00000000, 0xFA000080, 0xFFFFAAFF, 0xFB000000, 0x00960000, 0xDE000000, 0x09000000, 0x01012024 -.word D_80B8B9A0 -.word 0x06000204, 0x00000602, 0x06080A0C, 0x00080E0A, 0x06061002, 0x00061210, 0x06140416, 0x00140004, 0x06121810, 0x00121A18, 0x060E1C0A, 0x000E1E1C, 0x061E161C, 0x001E1416, 0x061A2018, 0x001A2220, 0xDF000000, 0x00000000 -glabel D_80B8CCD0 - .word 0x00000000, 0x00000000, 0x00000200, 0x00000000, 0x00000002, 0x00000000, 0x00000000 -glabel D_80B8CCEC - .word 0x04000400, 0x04000000, 0x00000000, 0x00000000, 0x00000200, 0x02000000, 0x00000000, 0x00000000, 0x000002CD, 0x02CD0000, 0x00000000, 0x00000000, 0x00000000 -glabel D_80B8CD20 - .word 0x000C0001, 0x00010001, 0x00000000, 0x0014003C, 0x00000000, 0x3FC00000, 0x000C0001, 0x00010001, 0x00000000, 0x0014003C, 0x00000000, 0x3F800000 -glabel D_80B8CD50 - .word D_80B8CCD0 -.word D_80B8CD20 -.word D_80B8CCEC -.word 0x0001003C -glabel D_80B8CD60 - .word 0x01FF0000, 0x00000000, 0x00000000 -glabel D_80B8CD6C - .word 0xFF020000, 0x00000000 -.word D_80B8CAC0 -glabel D_80B8CD78 - .word 0xFFFF0000, 0x00000000 -.word D_80B8CBC8 -glabel D_80B8CD84 - .word D_80B8CD60 -.word D_80B8CD6C -.word D_80B8CD78 -glabel D_80B8CD90 - .word D_80B8CD84 -.word 0x03000000 -glabel D_80B8CD98 - .byte 0x00 -glabel D_80B8CD99 - .byte 0x03 -glabel D_80B8CD9A - .byte 0x04, 0x07, 0x09, 0x0A, 0x0D, 0x0F, 0x11, 0x12, 0x15, 0x16, 0x19, 0x1B, 0x1C, 0x1F, 0x21, 0x23 -glabel D_80B8CDAA - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - diff --git a/data/overlays/actors/z_magic_wind.reloc.s b/data/overlays/actors/z_magic_wind.reloc.s deleted file mode 100644 index e150723472..0000000000 --- a/data/overlays/actors/z_magic_wind.reloc.s +++ /dev/null @@ -1,11 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata -glabel D_80B8CED0 - -.incbin "baserom/ovl_Magic_Wind", 0x1DD0, 0x00000180 diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 2a07558825..927ec6bad1 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -82,8 +82,6 @@ const ActorInit Boss_Ganondrof_InitVars = { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809142E0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80914664.s") - #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809146DC.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809147A0.s")