From 06a19c619e19e66d9945c6a7b6a9e10c328d071e Mon Sep 17 00:00:00 2001 From: Alto1772 <56553686+Alto1772@users.noreply.github.com> Date: Tue, 9 Feb 2021 21:13:16 +0800 Subject: [PATCH] delete non included asm (battle/area_kmr_part_1) --- .../4309A0/func_802187E0_431180.s | 164 ------------------ .../4309A0/func_80218A50_4313F0.s | 164 ------------------ .../4309A0/func_80218CC0_431660.s | 164 ------------------ .../4309A0/func_80218F30_4318D0.s | 162 ----------------- .../4309A0/func_80219198_431B38.s | 22 --- 5 files changed, 676 deletions(-) delete mode 100644 asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_802187E0_431180.s delete mode 100644 asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218A50_4313F0.s delete mode 100644 asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218CC0_431660.s delete mode 100644 asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218F30_4318D0.s delete mode 100644 asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80219198_431B38.s diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_802187E0_431180.s b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_802187E0_431180.s deleted file mode 100644 index 89b2f35340..0000000000 --- a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_802187E0_431180.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802187E0_431180 -/* 431180 802187E0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 431184 802187E4 AFB40020 */ sw $s4, 0x20($sp) -/* 431188 802187E8 0080A02D */ daddu $s4, $a0, $zero -/* 43118C 802187EC AFBF0024 */ sw $ra, 0x24($sp) -/* 431190 802187F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 431194 802187F4 AFB20018 */ sw $s2, 0x18($sp) -/* 431198 802187F8 AFB10014 */ sw $s1, 0x14($sp) -/* 43119C 802187FC AFB00010 */ sw $s0, 0x10($sp) -/* 4311A0 80218800 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 4311A4 80218804 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 4311A8 80218808 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 4311AC 8021880C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 4311B0 80218810 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 4311B4 80218814 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 4311B8 80218818 8E90000C */ lw $s0, 0xc($s4) -/* 4311BC 8021881C 8E050000 */ lw $a1, ($s0) -/* 4311C0 80218820 0C0B1EAF */ jal get_variable -/* 4311C4 80218824 26100004 */ addiu $s0, $s0, 4 -/* 4311C8 80218828 44820000 */ mtc1 $v0, $f0 -/* 4311CC 8021882C 00000000 */ nop -/* 4311D0 80218830 46800021 */ cvt.d.w $f0, $f0 -/* 4311D4 80218834 8E110000 */ lw $s1, ($s0) -/* 4311D8 80218838 26100004 */ addiu $s0, $s0, 4 -/* 4311DC 8021883C 3C014024 */ lui $at, 0x4024 -/* 4311E0 80218840 44811800 */ mtc1 $at, $f3 -/* 4311E4 80218844 44801000 */ mtc1 $zero, $f2 -/* 4311E8 80218848 3C0140C9 */ lui $at, 0x40c9 -/* 4311EC 8021884C 34210FD0 */ ori $at, $at, 0xfd0 -/* 4311F0 80218850 4481A000 */ mtc1 $at, $f20 -/* 4311F4 80218854 8E130000 */ lw $s3, ($s0) -/* 4311F8 80218858 46220003 */ div.d $f0, $f0, $f2 -/* 4311FC 8021885C 462007A0 */ cvt.s.d $f30, $f0 -/* 431200 80218860 4614F502 */ mul.s $f20, $f30, $f20 -/* 431204 80218864 00000000 */ nop -/* 431208 80218868 26100004 */ addiu $s0, $s0, 4 -/* 43120C 8021886C 8E120000 */ lw $s2, ($s0) -/* 431210 80218870 3C0143B4 */ lui $at, 0x43b4 -/* 431214 80218874 44810000 */ mtc1 $at, $f0 -/* 431218 80218878 8E100004 */ lw $s0, 4($s0) -/* 43121C 8021887C 4600A503 */ div.s $f20, $f20, $f0 -/* 431220 80218880 0C00A85B */ jal sin_rad -/* 431224 80218884 4600A306 */ mov.s $f12, $f20 -/* 431228 80218888 3C014100 */ lui $at, 0x4100 -/* 43122C 8021888C 44816000 */ mtc1 $at, $f12 -/* 431230 80218890 00000000 */ nop -/* 431234 80218894 460CA302 */ mul.s $f12, $f20, $f12 -/* 431238 80218898 00000000 */ nop -/* 43123C 8021889C 3C014316 */ lui $at, 0x4316 -/* 431240 802188A0 4481E000 */ mtc1 $at, $f28 -/* 431244 802188A4 00000000 */ nop -/* 431248 802188A8 461C0582 */ mul.s $f22, $f0, $f28 -/* 43124C 802188AC 00000000 */ nop -/* 431250 802188B0 4480D000 */ mtc1 $zero, $f26 -/* 431254 802188B4 0C00A85B */ jal sin_rad -/* 431258 802188B8 461AB580 */ add.s $f22, $f22, $f26 -/* 43125C 802188BC 3C014120 */ lui $at, 0x4120 -/* 431260 802188C0 44811000 */ mtc1 $at, $f2 -/* 431264 802188C4 00000000 */ nop -/* 431268 802188C8 46020602 */ mul.s $f24, $f0, $f2 -/* 43126C 802188CC 00000000 */ nop -/* 431270 802188D0 4600A306 */ mov.s $f12, $f20 -/* 431274 802188D4 0C00A874 */ jal cos_rad -/* 431278 802188D8 461AC600 */ add.s $f24, $f24, $f26 -/* 43127C 802188DC 0280202D */ daddu $a0, $s4, $zero -/* 431280 802188E0 461C0502 */ mul.s $f20, $f0, $f28 -/* 431284 802188E4 00000000 */ nop -/* 431288 802188E8 0220282D */ daddu $a1, $s1, $zero -/* 43128C 802188EC 4406B000 */ mfc1 $a2, $f22 -/* 431290 802188F0 3C0141A0 */ lui $at, 0x41a0 -/* 431294 802188F4 44810000 */ mtc1 $at, $f0 -/* 431298 802188F8 3C01C248 */ lui $at, 0xc248 -/* 43129C 802188FC 44811000 */ mtc1 $at, $f2 -/* 4312A0 80218900 4600A503 */ div.s $f20, $f20, $f0 -/* 4312A4 80218904 0C0B2190 */ jal set_float_variable -/* 4312A8 80218908 4602A500 */ add.s $f20, $f20, $f2 -/* 4312AC 8021890C 0280202D */ daddu $a0, $s4, $zero -/* 4312B0 80218910 4406C000 */ mfc1 $a2, $f24 -/* 4312B4 80218914 0C0B2190 */ jal set_float_variable -/* 4312B8 80218918 0260282D */ daddu $a1, $s3, $zero -/* 4312BC 8021891C 0280202D */ daddu $a0, $s4, $zero -/* 4312C0 80218920 4406A000 */ mfc1 $a2, $f20 -/* 4312C4 80218924 0C0B2190 */ jal set_float_variable -/* 4312C8 80218928 0240282D */ daddu $a1, $s2, $zero -/* 4312CC 8021892C 3C0142B4 */ lui $at, 0x42b4 -/* 4312D0 80218930 44810000 */ mtc1 $at, $f0 -/* 4312D4 80218934 00000000 */ nop -/* 4312D8 80218938 461E003C */ c.lt.s $f0, $f30 -/* 4312DC 8021893C 00000000 */ nop -/* 4312E0 80218940 4500000B */ bc1f .L80218970 -/* 4312E4 80218944 0000302D */ daddu $a2, $zero, $zero -/* 4312E8 80218948 3C014387 */ lui $at, 0x4387 -/* 4312EC 8021894C 44810000 */ mtc1 $at, $f0 -/* 4312F0 80218950 00000000 */ nop -/* 4312F4 80218954 4600F03C */ c.lt.s $f30, $f0 -/* 4312F8 80218958 00000000 */ nop -/* 4312FC 8021895C 45030001 */ bc1tl .L80218964 -/* 431300 80218960 240600B4 */ addiu $a2, $zero, 0xb4 -.L80218964: -/* 431304 80218964 3C0142B4 */ lui $at, 0x42b4 -/* 431308 80218968 44810000 */ mtc1 $at, $f0 -/* 43130C 8021896C 00000000 */ nop -.L80218970: -/* 431310 80218970 461E0001 */ sub.s $f0, $f0, $f30 -/* 431314 80218974 46000005 */ abs.s $f0, $f0 -/* 431318 80218978 4600010D */ trunc.w.s $f4, $f0 -/* 43131C 8021897C 44022000 */ mfc1 $v0, $f4 -/* 431320 80218980 00000000 */ nop -/* 431324 80218984 2842002D */ slti $v0, $v0, 0x2d -/* 431328 80218988 10400008 */ beqz $v0, .L802189AC -/* 43132C 8021898C 00000000 */ nop -/* 431330 80218990 3C014234 */ lui $at, 0x4234 -/* 431334 80218994 44810000 */ mtc1 $at, $f0 -/* 431338 80218998 00000000 */ nop -/* 43133C 8021899C 4600F001 */ sub.s $f0, $f30, $f0 -/* 431340 802189A0 46000000 */ add.s $f0, $f0, $f0 -/* 431344 802189A4 4600010D */ trunc.w.s $f4, $f0 -/* 431348 802189A8 44062000 */ mfc1 $a2, $f4 -.L802189AC: -/* 43134C 802189AC 3C014387 */ lui $at, 0x4387 -/* 431350 802189B0 44810000 */ mtc1 $at, $f0 -/* 431354 802189B4 00000000 */ nop -/* 431358 802189B8 461E0001 */ sub.s $f0, $f0, $f30 -/* 43135C 802189BC 46000005 */ abs.s $f0, $f0 -/* 431360 802189C0 4600010D */ trunc.w.s $f4, $f0 -/* 431364 802189C4 44022000 */ mfc1 $v0, $f4 -/* 431368 802189C8 00000000 */ nop -/* 43136C 802189CC 2842002D */ slti $v0, $v0, 0x2d -/* 431370 802189D0 1040000C */ beqz $v0, .L80218A04 -/* 431374 802189D4 0280202D */ daddu $a0, $s4, $zero -/* 431378 802189D8 3C014361 */ lui $at, 0x4361 -/* 43137C 802189DC 44810000 */ mtc1 $at, $f0 -/* 431380 802189E0 00000000 */ nop -/* 431384 802189E4 4600F001 */ sub.s $f0, $f30, $f0 -/* 431388 802189E8 46000000 */ add.s $f0, $f0, $f0 -/* 43138C 802189EC 3C014334 */ lui $at, 0x4334 -/* 431390 802189F0 44811000 */ mtc1 $at, $f2 -/* 431394 802189F4 00000000 */ nop -/* 431398 802189F8 46020000 */ add.s $f0, $f0, $f2 -/* 43139C 802189FC 4600010D */ trunc.w.s $f4, $f0 -/* 4313A0 80218A00 44062000 */ mfc1 $a2, $f4 -.L80218A04: -/* 4313A4 80218A04 0C0B2026 */ jal set_variable -/* 4313A8 80218A08 0200282D */ daddu $a1, $s0, $zero -/* 4313AC 80218A0C 8FBF0024 */ lw $ra, 0x24($sp) -/* 4313B0 80218A10 8FB40020 */ lw $s4, 0x20($sp) -/* 4313B4 80218A14 8FB3001C */ lw $s3, 0x1c($sp) -/* 4313B8 80218A18 8FB20018 */ lw $s2, 0x18($sp) -/* 4313BC 80218A1C 8FB10014 */ lw $s1, 0x14($sp) -/* 4313C0 80218A20 8FB00010 */ lw $s0, 0x10($sp) -/* 4313C4 80218A24 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 4313C8 80218A28 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 4313CC 80218A2C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 4313D0 80218A30 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 4313D4 80218A34 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 4313D8 80218A38 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 4313DC 80218A3C 24020002 */ addiu $v0, $zero, 2 -/* 4313E0 80218A40 03E00008 */ jr $ra -/* 4313E4 80218A44 27BD0058 */ addiu $sp, $sp, 0x58 -/* 4313E8 80218A48 00000000 */ nop -/* 4313EC 80218A4C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218A50_4313F0.s b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218A50_4313F0.s deleted file mode 100644 index 6cb99d6dea..0000000000 --- a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218A50_4313F0.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218A50_4313F0 -/* 4313F0 80218A50 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 4313F4 80218A54 AFB40020 */ sw $s4, 0x20($sp) -/* 4313F8 80218A58 0080A02D */ daddu $s4, $a0, $zero -/* 4313FC 80218A5C AFBF0024 */ sw $ra, 0x24($sp) -/* 431400 80218A60 AFB3001C */ sw $s3, 0x1c($sp) -/* 431404 80218A64 AFB20018 */ sw $s2, 0x18($sp) -/* 431408 80218A68 AFB10014 */ sw $s1, 0x14($sp) -/* 43140C 80218A6C AFB00010 */ sw $s0, 0x10($sp) -/* 431410 80218A70 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 431414 80218A74 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 431418 80218A78 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 43141C 80218A7C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 431420 80218A80 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 431424 80218A84 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 431428 80218A88 8E90000C */ lw $s0, 0xc($s4) -/* 43142C 80218A8C 8E050000 */ lw $a1, ($s0) -/* 431430 80218A90 0C0B1EAF */ jal get_variable -/* 431434 80218A94 26100004 */ addiu $s0, $s0, 4 -/* 431438 80218A98 44820000 */ mtc1 $v0, $f0 -/* 43143C 80218A9C 00000000 */ nop -/* 431440 80218AA0 46800021 */ cvt.d.w $f0, $f0 -/* 431444 80218AA4 8E110000 */ lw $s1, ($s0) -/* 431448 80218AA8 26100004 */ addiu $s0, $s0, 4 -/* 43144C 80218AAC 3C014024 */ lui $at, 0x4024 -/* 431450 80218AB0 44811800 */ mtc1 $at, $f3 -/* 431454 80218AB4 44801000 */ mtc1 $zero, $f2 -/* 431458 80218AB8 3C0140C9 */ lui $at, 0x40c9 -/* 43145C 80218ABC 34210FD0 */ ori $at, $at, 0xfd0 -/* 431460 80218AC0 4481A000 */ mtc1 $at, $f20 -/* 431464 80218AC4 8E130000 */ lw $s3, ($s0) -/* 431468 80218AC8 46220003 */ div.d $f0, $f0, $f2 -/* 43146C 80218ACC 462007A0 */ cvt.s.d $f30, $f0 -/* 431470 80218AD0 4614F502 */ mul.s $f20, $f30, $f20 -/* 431474 80218AD4 00000000 */ nop -/* 431478 80218AD8 26100004 */ addiu $s0, $s0, 4 -/* 43147C 80218ADC 8E120000 */ lw $s2, ($s0) -/* 431480 80218AE0 3C0143B4 */ lui $at, 0x43b4 -/* 431484 80218AE4 44810000 */ mtc1 $at, $f0 -/* 431488 80218AE8 8E100004 */ lw $s0, 4($s0) -/* 43148C 80218AEC 4600A503 */ div.s $f20, $f20, $f0 -/* 431490 80218AF0 0C00A85B */ jal sin_rad -/* 431494 80218AF4 4600A306 */ mov.s $f12, $f20 -/* 431498 80218AF8 3C014100 */ lui $at, 0x4100 -/* 43149C 80218AFC 44816000 */ mtc1 $at, $f12 -/* 4314A0 80218B00 00000000 */ nop -/* 4314A4 80218B04 460CA302 */ mul.s $f12, $f20, $f12 -/* 4314A8 80218B08 00000000 */ nop -/* 4314AC 80218B0C 3C014316 */ lui $at, 0x4316 -/* 4314B0 80218B10 4481E000 */ mtc1 $at, $f28 -/* 4314B4 80218B14 00000000 */ nop -/* 4314B8 80218B18 461C0582 */ mul.s $f22, $f0, $f28 -/* 4314BC 80218B1C 00000000 */ nop -/* 4314C0 80218B20 4480D000 */ mtc1 $zero, $f26 -/* 4314C4 80218B24 0C00A85B */ jal sin_rad -/* 4314C8 80218B28 461AB580 */ add.s $f22, $f22, $f26 -/* 4314CC 80218B2C 3C014120 */ lui $at, 0x4120 -/* 4314D0 80218B30 44811000 */ mtc1 $at, $f2 -/* 4314D4 80218B34 00000000 */ nop -/* 4314D8 80218B38 46020602 */ mul.s $f24, $f0, $f2 -/* 4314DC 80218B3C 00000000 */ nop -/* 4314E0 80218B40 4600A306 */ mov.s $f12, $f20 -/* 4314E4 80218B44 0C00A874 */ jal cos_rad -/* 4314E8 80218B48 461AC600 */ add.s $f24, $f24, $f26 -/* 4314EC 80218B4C 0280202D */ daddu $a0, $s4, $zero -/* 4314F0 80218B50 461C0502 */ mul.s $f20, $f0, $f28 -/* 4314F4 80218B54 00000000 */ nop -/* 4314F8 80218B58 0220282D */ daddu $a1, $s1, $zero -/* 4314FC 80218B5C 4406B000 */ mfc1 $a2, $f22 -/* 431500 80218B60 3C0141A0 */ lui $at, 0x41a0 -/* 431504 80218B64 44810000 */ mtc1 $at, $f0 -/* 431508 80218B68 3C01C248 */ lui $at, 0xc248 -/* 43150C 80218B6C 44811000 */ mtc1 $at, $f2 -/* 431510 80218B70 4600A503 */ div.s $f20, $f20, $f0 -/* 431514 80218B74 0C0B2190 */ jal set_float_variable -/* 431518 80218B78 4602A500 */ add.s $f20, $f20, $f2 -/* 43151C 80218B7C 0280202D */ daddu $a0, $s4, $zero -/* 431520 80218B80 4406C000 */ mfc1 $a2, $f24 -/* 431524 80218B84 0C0B2190 */ jal set_float_variable -/* 431528 80218B88 0260282D */ daddu $a1, $s3, $zero -/* 43152C 80218B8C 0280202D */ daddu $a0, $s4, $zero -/* 431530 80218B90 4406A000 */ mfc1 $a2, $f20 -/* 431534 80218B94 0C0B2190 */ jal set_float_variable -/* 431538 80218B98 0240282D */ daddu $a1, $s2, $zero -/* 43153C 80218B9C 3C0142B4 */ lui $at, 0x42b4 -/* 431540 80218BA0 44810000 */ mtc1 $at, $f0 -/* 431544 80218BA4 00000000 */ nop -/* 431548 80218BA8 461E003C */ c.lt.s $f0, $f30 -/* 43154C 80218BAC 00000000 */ nop -/* 431550 80218BB0 4500000B */ bc1f .L80218BE0 -/* 431554 80218BB4 0000302D */ daddu $a2, $zero, $zero -/* 431558 80218BB8 3C014387 */ lui $at, 0x4387 -/* 43155C 80218BBC 44810000 */ mtc1 $at, $f0 -/* 431560 80218BC0 00000000 */ nop -/* 431564 80218BC4 4600F03C */ c.lt.s $f30, $f0 -/* 431568 80218BC8 00000000 */ nop -/* 43156C 80218BCC 45030001 */ bc1tl .L80218BD4 -/* 431570 80218BD0 240600B4 */ addiu $a2, $zero, 0xb4 -.L80218BD4: -/* 431574 80218BD4 3C0142B4 */ lui $at, 0x42b4 -/* 431578 80218BD8 44810000 */ mtc1 $at, $f0 -/* 43157C 80218BDC 00000000 */ nop -.L80218BE0: -/* 431580 80218BE0 461E0001 */ sub.s $f0, $f0, $f30 -/* 431584 80218BE4 46000005 */ abs.s $f0, $f0 -/* 431588 80218BE8 4600010D */ trunc.w.s $f4, $f0 -/* 43158C 80218BEC 44022000 */ mfc1 $v0, $f4 -/* 431590 80218BF0 00000000 */ nop -/* 431594 80218BF4 2842002D */ slti $v0, $v0, 0x2d -/* 431598 80218BF8 10400008 */ beqz $v0, .L80218C1C -/* 43159C 80218BFC 00000000 */ nop -/* 4315A0 80218C00 3C014234 */ lui $at, 0x4234 -/* 4315A4 80218C04 44810000 */ mtc1 $at, $f0 -/* 4315A8 80218C08 00000000 */ nop -/* 4315AC 80218C0C 4600F001 */ sub.s $f0, $f30, $f0 -/* 4315B0 80218C10 46000000 */ add.s $f0, $f0, $f0 -/* 4315B4 80218C14 4600010D */ trunc.w.s $f4, $f0 -/* 4315B8 80218C18 44062000 */ mfc1 $a2, $f4 -.L80218C1C: -/* 4315BC 80218C1C 3C014387 */ lui $at, 0x4387 -/* 4315C0 80218C20 44810000 */ mtc1 $at, $f0 -/* 4315C4 80218C24 00000000 */ nop -/* 4315C8 80218C28 461E0001 */ sub.s $f0, $f0, $f30 -/* 4315CC 80218C2C 46000005 */ abs.s $f0, $f0 -/* 4315D0 80218C30 4600010D */ trunc.w.s $f4, $f0 -/* 4315D4 80218C34 44022000 */ mfc1 $v0, $f4 -/* 4315D8 80218C38 00000000 */ nop -/* 4315DC 80218C3C 2842002D */ slti $v0, $v0, 0x2d -/* 4315E0 80218C40 1040000C */ beqz $v0, .L80218C74 -/* 4315E4 80218C44 0280202D */ daddu $a0, $s4, $zero -/* 4315E8 80218C48 3C014361 */ lui $at, 0x4361 -/* 4315EC 80218C4C 44810000 */ mtc1 $at, $f0 -/* 4315F0 80218C50 00000000 */ nop -/* 4315F4 80218C54 4600F001 */ sub.s $f0, $f30, $f0 -/* 4315F8 80218C58 46000000 */ add.s $f0, $f0, $f0 -/* 4315FC 80218C5C 3C014334 */ lui $at, 0x4334 -/* 431600 80218C60 44811000 */ mtc1 $at, $f2 -/* 431604 80218C64 00000000 */ nop -/* 431608 80218C68 46020000 */ add.s $f0, $f0, $f2 -/* 43160C 80218C6C 4600010D */ trunc.w.s $f4, $f0 -/* 431610 80218C70 44062000 */ mfc1 $a2, $f4 -.L80218C74: -/* 431614 80218C74 0C0B2026 */ jal set_variable -/* 431618 80218C78 0200282D */ daddu $a1, $s0, $zero -/* 43161C 80218C7C 8FBF0024 */ lw $ra, 0x24($sp) -/* 431620 80218C80 8FB40020 */ lw $s4, 0x20($sp) -/* 431624 80218C84 8FB3001C */ lw $s3, 0x1c($sp) -/* 431628 80218C88 8FB20018 */ lw $s2, 0x18($sp) -/* 43162C 80218C8C 8FB10014 */ lw $s1, 0x14($sp) -/* 431630 80218C90 8FB00010 */ lw $s0, 0x10($sp) -/* 431634 80218C94 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 431638 80218C98 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 43163C 80218C9C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 431640 80218CA0 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 431644 80218CA4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 431648 80218CA8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 43164C 80218CAC 24020002 */ addiu $v0, $zero, 2 -/* 431650 80218CB0 03E00008 */ jr $ra -/* 431654 80218CB4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 431658 80218CB8 00000000 */ nop -/* 43165C 80218CBC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218CC0_431660.s b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218CC0_431660.s deleted file mode 100644 index 17ff38800e..0000000000 --- a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218CC0_431660.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218CC0_431660 -/* 431660 80218CC0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 431664 80218CC4 AFB40020 */ sw $s4, 0x20($sp) -/* 431668 80218CC8 0080A02D */ daddu $s4, $a0, $zero -/* 43166C 80218CCC AFBF0024 */ sw $ra, 0x24($sp) -/* 431670 80218CD0 AFB3001C */ sw $s3, 0x1c($sp) -/* 431674 80218CD4 AFB20018 */ sw $s2, 0x18($sp) -/* 431678 80218CD8 AFB10014 */ sw $s1, 0x14($sp) -/* 43167C 80218CDC AFB00010 */ sw $s0, 0x10($sp) -/* 431680 80218CE0 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 431684 80218CE4 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 431688 80218CE8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 43168C 80218CEC F7B80038 */ sdc1 $f24, 0x38($sp) -/* 431690 80218CF0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 431694 80218CF4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 431698 80218CF8 8E90000C */ lw $s0, 0xc($s4) -/* 43169C 80218CFC 8E050000 */ lw $a1, ($s0) -/* 4316A0 80218D00 0C0B1EAF */ jal get_variable -/* 4316A4 80218D04 26100004 */ addiu $s0, $s0, 4 -/* 4316A8 80218D08 44820000 */ mtc1 $v0, $f0 -/* 4316AC 80218D0C 00000000 */ nop -/* 4316B0 80218D10 46800021 */ cvt.d.w $f0, $f0 -/* 4316B4 80218D14 8E110000 */ lw $s1, ($s0) -/* 4316B8 80218D18 26100004 */ addiu $s0, $s0, 4 -/* 4316BC 80218D1C 3C014024 */ lui $at, 0x4024 -/* 4316C0 80218D20 44811800 */ mtc1 $at, $f3 -/* 4316C4 80218D24 44801000 */ mtc1 $zero, $f2 -/* 4316C8 80218D28 3C0140C9 */ lui $at, 0x40c9 -/* 4316CC 80218D2C 34210FD0 */ ori $at, $at, 0xfd0 -/* 4316D0 80218D30 4481A000 */ mtc1 $at, $f20 -/* 4316D4 80218D34 8E130000 */ lw $s3, ($s0) -/* 4316D8 80218D38 46220003 */ div.d $f0, $f0, $f2 -/* 4316DC 80218D3C 462007A0 */ cvt.s.d $f30, $f0 -/* 4316E0 80218D40 4614F502 */ mul.s $f20, $f30, $f20 -/* 4316E4 80218D44 00000000 */ nop -/* 4316E8 80218D48 26100004 */ addiu $s0, $s0, 4 -/* 4316EC 80218D4C 8E120000 */ lw $s2, ($s0) -/* 4316F0 80218D50 3C0143B4 */ lui $at, 0x43b4 -/* 4316F4 80218D54 44810000 */ mtc1 $at, $f0 -/* 4316F8 80218D58 8E100004 */ lw $s0, 4($s0) -/* 4316FC 80218D5C 4600A503 */ div.s $f20, $f20, $f0 -/* 431700 80218D60 0C00A85B */ jal sin_rad -/* 431704 80218D64 4600A306 */ mov.s $f12, $f20 -/* 431708 80218D68 3C014100 */ lui $at, 0x4100 -/* 43170C 80218D6C 44816000 */ mtc1 $at, $f12 -/* 431710 80218D70 00000000 */ nop -/* 431714 80218D74 460CA302 */ mul.s $f12, $f20, $f12 -/* 431718 80218D78 00000000 */ nop -/* 43171C 80218D7C 3C014316 */ lui $at, 0x4316 -/* 431720 80218D80 4481E000 */ mtc1 $at, $f28 -/* 431724 80218D84 00000000 */ nop -/* 431728 80218D88 461C0582 */ mul.s $f22, $f0, $f28 -/* 43172C 80218D8C 00000000 */ nop -/* 431730 80218D90 4480D000 */ mtc1 $zero, $f26 -/* 431734 80218D94 0C00A85B */ jal sin_rad -/* 431738 80218D98 461AB580 */ add.s $f22, $f22, $f26 -/* 43173C 80218D9C 3C014120 */ lui $at, 0x4120 -/* 431740 80218DA0 44811000 */ mtc1 $at, $f2 -/* 431744 80218DA4 00000000 */ nop -/* 431748 80218DA8 46020602 */ mul.s $f24, $f0, $f2 -/* 43174C 80218DAC 00000000 */ nop -/* 431750 80218DB0 4600A306 */ mov.s $f12, $f20 -/* 431754 80218DB4 0C00A874 */ jal cos_rad -/* 431758 80218DB8 461AC600 */ add.s $f24, $f24, $f26 -/* 43175C 80218DBC 0280202D */ daddu $a0, $s4, $zero -/* 431760 80218DC0 461C0502 */ mul.s $f20, $f0, $f28 -/* 431764 80218DC4 00000000 */ nop -/* 431768 80218DC8 0220282D */ daddu $a1, $s1, $zero -/* 43176C 80218DCC 4406B000 */ mfc1 $a2, $f22 -/* 431770 80218DD0 3C0141A0 */ lui $at, 0x41a0 -/* 431774 80218DD4 44810000 */ mtc1 $at, $f0 -/* 431778 80218DD8 3C01C248 */ lui $at, 0xc248 -/* 43177C 80218DDC 44811000 */ mtc1 $at, $f2 -/* 431780 80218DE0 4600A503 */ div.s $f20, $f20, $f0 -/* 431784 80218DE4 0C0B2190 */ jal set_float_variable -/* 431788 80218DE8 4602A500 */ add.s $f20, $f20, $f2 -/* 43178C 80218DEC 0280202D */ daddu $a0, $s4, $zero -/* 431790 80218DF0 4406C000 */ mfc1 $a2, $f24 -/* 431794 80218DF4 0C0B2190 */ jal set_float_variable -/* 431798 80218DF8 0260282D */ daddu $a1, $s3, $zero -/* 43179C 80218DFC 0280202D */ daddu $a0, $s4, $zero -/* 4317A0 80218E00 4406A000 */ mfc1 $a2, $f20 -/* 4317A4 80218E04 0C0B2190 */ jal set_float_variable -/* 4317A8 80218E08 0240282D */ daddu $a1, $s2, $zero -/* 4317AC 80218E0C 3C0142B4 */ lui $at, 0x42b4 -/* 4317B0 80218E10 44810000 */ mtc1 $at, $f0 -/* 4317B4 80218E14 00000000 */ nop -/* 4317B8 80218E18 461E003C */ c.lt.s $f0, $f30 -/* 4317BC 80218E1C 00000000 */ nop -/* 4317C0 80218E20 4500000B */ bc1f .L80218E50 -/* 4317C4 80218E24 0000302D */ daddu $a2, $zero, $zero -/* 4317C8 80218E28 3C014387 */ lui $at, 0x4387 -/* 4317CC 80218E2C 44810000 */ mtc1 $at, $f0 -/* 4317D0 80218E30 00000000 */ nop -/* 4317D4 80218E34 4600F03C */ c.lt.s $f30, $f0 -/* 4317D8 80218E38 00000000 */ nop -/* 4317DC 80218E3C 45030001 */ bc1tl .L80218E44 -/* 4317E0 80218E40 240600B4 */ addiu $a2, $zero, 0xb4 -.L80218E44: -/* 4317E4 80218E44 3C0142B4 */ lui $at, 0x42b4 -/* 4317E8 80218E48 44810000 */ mtc1 $at, $f0 -/* 4317EC 80218E4C 00000000 */ nop -.L80218E50: -/* 4317F0 80218E50 461E0001 */ sub.s $f0, $f0, $f30 -/* 4317F4 80218E54 46000005 */ abs.s $f0, $f0 -/* 4317F8 80218E58 4600010D */ trunc.w.s $f4, $f0 -/* 4317FC 80218E5C 44022000 */ mfc1 $v0, $f4 -/* 431800 80218E60 00000000 */ nop -/* 431804 80218E64 2842002D */ slti $v0, $v0, 0x2d -/* 431808 80218E68 10400008 */ beqz $v0, .L80218E8C -/* 43180C 80218E6C 00000000 */ nop -/* 431810 80218E70 3C014234 */ lui $at, 0x4234 -/* 431814 80218E74 44810000 */ mtc1 $at, $f0 -/* 431818 80218E78 00000000 */ nop -/* 43181C 80218E7C 4600F001 */ sub.s $f0, $f30, $f0 -/* 431820 80218E80 46000000 */ add.s $f0, $f0, $f0 -/* 431824 80218E84 4600010D */ trunc.w.s $f4, $f0 -/* 431828 80218E88 44062000 */ mfc1 $a2, $f4 -.L80218E8C: -/* 43182C 80218E8C 3C014387 */ lui $at, 0x4387 -/* 431830 80218E90 44810000 */ mtc1 $at, $f0 -/* 431834 80218E94 00000000 */ nop -/* 431838 80218E98 461E0001 */ sub.s $f0, $f0, $f30 -/* 43183C 80218E9C 46000005 */ abs.s $f0, $f0 -/* 431840 80218EA0 4600010D */ trunc.w.s $f4, $f0 -/* 431844 80218EA4 44022000 */ mfc1 $v0, $f4 -/* 431848 80218EA8 00000000 */ nop -/* 43184C 80218EAC 2842002D */ slti $v0, $v0, 0x2d -/* 431850 80218EB0 1040000C */ beqz $v0, .L80218EE4 -/* 431854 80218EB4 0280202D */ daddu $a0, $s4, $zero -/* 431858 80218EB8 3C014361 */ lui $at, 0x4361 -/* 43185C 80218EBC 44810000 */ mtc1 $at, $f0 -/* 431860 80218EC0 00000000 */ nop -/* 431864 80218EC4 4600F001 */ sub.s $f0, $f30, $f0 -/* 431868 80218EC8 46000000 */ add.s $f0, $f0, $f0 -/* 43186C 80218ECC 3C014334 */ lui $at, 0x4334 -/* 431870 80218ED0 44811000 */ mtc1 $at, $f2 -/* 431874 80218ED4 00000000 */ nop -/* 431878 80218ED8 46020000 */ add.s $f0, $f0, $f2 -/* 43187C 80218EDC 4600010D */ trunc.w.s $f4, $f0 -/* 431880 80218EE0 44062000 */ mfc1 $a2, $f4 -.L80218EE4: -/* 431884 80218EE4 0C0B2026 */ jal set_variable -/* 431888 80218EE8 0200282D */ daddu $a1, $s0, $zero -/* 43188C 80218EEC 8FBF0024 */ lw $ra, 0x24($sp) -/* 431890 80218EF0 8FB40020 */ lw $s4, 0x20($sp) -/* 431894 80218EF4 8FB3001C */ lw $s3, 0x1c($sp) -/* 431898 80218EF8 8FB20018 */ lw $s2, 0x18($sp) -/* 43189C 80218EFC 8FB10014 */ lw $s1, 0x14($sp) -/* 4318A0 80218F00 8FB00010 */ lw $s0, 0x10($sp) -/* 4318A4 80218F04 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 4318A8 80218F08 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 4318AC 80218F0C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 4318B0 80218F10 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 4318B4 80218F14 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 4318B8 80218F18 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 4318BC 80218F1C 24020002 */ addiu $v0, $zero, 2 -/* 4318C0 80218F20 03E00008 */ jr $ra -/* 4318C4 80218F24 27BD0058 */ addiu $sp, $sp, 0x58 -/* 4318C8 80218F28 00000000 */ nop -/* 4318CC 80218F2C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218F30_4318D0.s b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218F30_4318D0.s deleted file mode 100644 index 2bb460b11e..0000000000 --- a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80218F30_4318D0.s +++ /dev/null @@ -1,162 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218F30_4318D0 -/* 4318D0 80218F30 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 4318D4 80218F34 AFB40020 */ sw $s4, 0x20($sp) -/* 4318D8 80218F38 0080A02D */ daddu $s4, $a0, $zero -/* 4318DC 80218F3C AFBF0024 */ sw $ra, 0x24($sp) -/* 4318E0 80218F40 AFB3001C */ sw $s3, 0x1c($sp) -/* 4318E4 80218F44 AFB20018 */ sw $s2, 0x18($sp) -/* 4318E8 80218F48 AFB10014 */ sw $s1, 0x14($sp) -/* 4318EC 80218F4C AFB00010 */ sw $s0, 0x10($sp) -/* 4318F0 80218F50 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 4318F4 80218F54 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 4318F8 80218F58 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 4318FC 80218F5C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 431900 80218F60 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 431904 80218F64 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 431908 80218F68 8E90000C */ lw $s0, 0xc($s4) -/* 43190C 80218F6C 8E050000 */ lw $a1, ($s0) -/* 431910 80218F70 0C0B1EAF */ jal get_variable -/* 431914 80218F74 26100004 */ addiu $s0, $s0, 4 -/* 431918 80218F78 44820000 */ mtc1 $v0, $f0 -/* 43191C 80218F7C 00000000 */ nop -/* 431920 80218F80 46800021 */ cvt.d.w $f0, $f0 -/* 431924 80218F84 8E110000 */ lw $s1, ($s0) -/* 431928 80218F88 26100004 */ addiu $s0, $s0, 4 -/* 43192C 80218F8C 3C014024 */ lui $at, 0x4024 -/* 431930 80218F90 44811800 */ mtc1 $at, $f3 -/* 431934 80218F94 44801000 */ mtc1 $zero, $f2 -/* 431938 80218F98 3C0140C9 */ lui $at, 0x40c9 -/* 43193C 80218F9C 34210FD0 */ ori $at, $at, 0xfd0 -/* 431940 80218FA0 4481A000 */ mtc1 $at, $f20 -/* 431944 80218FA4 8E130000 */ lw $s3, ($s0) -/* 431948 80218FA8 46220003 */ div.d $f0, $f0, $f2 -/* 43194C 80218FAC 462007A0 */ cvt.s.d $f30, $f0 -/* 431950 80218FB0 4614F502 */ mul.s $f20, $f30, $f20 -/* 431954 80218FB4 00000000 */ nop -/* 431958 80218FB8 26100004 */ addiu $s0, $s0, 4 -/* 43195C 80218FBC 8E120000 */ lw $s2, ($s0) -/* 431960 80218FC0 3C0143B4 */ lui $at, 0x43b4 -/* 431964 80218FC4 44810000 */ mtc1 $at, $f0 -/* 431968 80218FC8 8E100004 */ lw $s0, 4($s0) -/* 43196C 80218FCC 4600A503 */ div.s $f20, $f20, $f0 -/* 431970 80218FD0 0C00A85B */ jal sin_rad -/* 431974 80218FD4 4600A306 */ mov.s $f12, $f20 -/* 431978 80218FD8 3C014100 */ lui $at, 0x4100 -/* 43197C 80218FDC 44816000 */ mtc1 $at, $f12 -/* 431980 80218FE0 00000000 */ nop -/* 431984 80218FE4 460CA302 */ mul.s $f12, $f20, $f12 -/* 431988 80218FE8 00000000 */ nop -/* 43198C 80218FEC 3C014316 */ lui $at, 0x4316 -/* 431990 80218FF0 4481E000 */ mtc1 $at, $f28 -/* 431994 80218FF4 00000000 */ nop -/* 431998 80218FF8 461C0582 */ mul.s $f22, $f0, $f28 -/* 43199C 80218FFC 00000000 */ nop -/* 4319A0 80219000 4480D000 */ mtc1 $zero, $f26 -/* 4319A4 80219004 0C00A85B */ jal sin_rad -/* 4319A8 80219008 461AB580 */ add.s $f22, $f22, $f26 -/* 4319AC 8021900C 3C014120 */ lui $at, 0x4120 -/* 4319B0 80219010 44811000 */ mtc1 $at, $f2 -/* 4319B4 80219014 00000000 */ nop -/* 4319B8 80219018 46020602 */ mul.s $f24, $f0, $f2 -/* 4319BC 8021901C 00000000 */ nop -/* 4319C0 80219020 4600A306 */ mov.s $f12, $f20 -/* 4319C4 80219024 0C00A874 */ jal cos_rad -/* 4319C8 80219028 461AC600 */ add.s $f24, $f24, $f26 -/* 4319CC 8021902C 0280202D */ daddu $a0, $s4, $zero -/* 4319D0 80219030 461C0502 */ mul.s $f20, $f0, $f28 -/* 4319D4 80219034 00000000 */ nop -/* 4319D8 80219038 0220282D */ daddu $a1, $s1, $zero -/* 4319DC 8021903C 4406B000 */ mfc1 $a2, $f22 -/* 4319E0 80219040 3C0141A0 */ lui $at, 0x41a0 -/* 4319E4 80219044 44810000 */ mtc1 $at, $f0 -/* 4319E8 80219048 3C01C248 */ lui $at, 0xc248 -/* 4319EC 8021904C 44811000 */ mtc1 $at, $f2 -/* 4319F0 80219050 4600A503 */ div.s $f20, $f20, $f0 -/* 4319F4 80219054 0C0B2190 */ jal set_float_variable -/* 4319F8 80219058 4602A500 */ add.s $f20, $f20, $f2 -/* 4319FC 8021905C 0280202D */ daddu $a0, $s4, $zero -/* 431A00 80219060 4406C000 */ mfc1 $a2, $f24 -/* 431A04 80219064 0C0B2190 */ jal set_float_variable -/* 431A08 80219068 0260282D */ daddu $a1, $s3, $zero -/* 431A0C 8021906C 0280202D */ daddu $a0, $s4, $zero -/* 431A10 80219070 4406A000 */ mfc1 $a2, $f20 -/* 431A14 80219074 0C0B2190 */ jal set_float_variable -/* 431A18 80219078 0240282D */ daddu $a1, $s2, $zero -/* 431A1C 8021907C 3C0142B4 */ lui $at, 0x42b4 -/* 431A20 80219080 44810000 */ mtc1 $at, $f0 -/* 431A24 80219084 00000000 */ nop -/* 431A28 80219088 461E003C */ c.lt.s $f0, $f30 -/* 431A2C 8021908C 00000000 */ nop -/* 431A30 80219090 4500000B */ bc1f .L802190C0 -/* 431A34 80219094 0000302D */ daddu $a2, $zero, $zero -/* 431A38 80219098 3C014387 */ lui $at, 0x4387 -/* 431A3C 8021909C 44810000 */ mtc1 $at, $f0 -/* 431A40 802190A0 00000000 */ nop -/* 431A44 802190A4 4600F03C */ c.lt.s $f30, $f0 -/* 431A48 802190A8 00000000 */ nop -/* 431A4C 802190AC 45030001 */ bc1tl .L802190B4 -/* 431A50 802190B0 240600B4 */ addiu $a2, $zero, 0xb4 -.L802190B4: -/* 431A54 802190B4 3C0142B4 */ lui $at, 0x42b4 -/* 431A58 802190B8 44810000 */ mtc1 $at, $f0 -/* 431A5C 802190BC 00000000 */ nop -.L802190C0: -/* 431A60 802190C0 461E0001 */ sub.s $f0, $f0, $f30 -/* 431A64 802190C4 46000005 */ abs.s $f0, $f0 -/* 431A68 802190C8 4600010D */ trunc.w.s $f4, $f0 -/* 431A6C 802190CC 44022000 */ mfc1 $v0, $f4 -/* 431A70 802190D0 00000000 */ nop -/* 431A74 802190D4 2842002D */ slti $v0, $v0, 0x2d -/* 431A78 802190D8 10400008 */ beqz $v0, .L802190FC -/* 431A7C 802190DC 00000000 */ nop -/* 431A80 802190E0 3C014234 */ lui $at, 0x4234 -/* 431A84 802190E4 44810000 */ mtc1 $at, $f0 -/* 431A88 802190E8 00000000 */ nop -/* 431A8C 802190EC 4600F001 */ sub.s $f0, $f30, $f0 -/* 431A90 802190F0 46000000 */ add.s $f0, $f0, $f0 -/* 431A94 802190F4 4600010D */ trunc.w.s $f4, $f0 -/* 431A98 802190F8 44062000 */ mfc1 $a2, $f4 -.L802190FC: -/* 431A9C 802190FC 3C014387 */ lui $at, 0x4387 -/* 431AA0 80219100 44810000 */ mtc1 $at, $f0 -/* 431AA4 80219104 00000000 */ nop -/* 431AA8 80219108 461E0001 */ sub.s $f0, $f0, $f30 -/* 431AAC 8021910C 46000005 */ abs.s $f0, $f0 -/* 431AB0 80219110 4600010D */ trunc.w.s $f4, $f0 -/* 431AB4 80219114 44022000 */ mfc1 $v0, $f4 -/* 431AB8 80219118 00000000 */ nop -/* 431ABC 8021911C 2842002D */ slti $v0, $v0, 0x2d -/* 431AC0 80219120 1040000C */ beqz $v0, .L80219154 -/* 431AC4 80219124 0280202D */ daddu $a0, $s4, $zero -/* 431AC8 80219128 3C014361 */ lui $at, 0x4361 -/* 431ACC 8021912C 44810000 */ mtc1 $at, $f0 -/* 431AD0 80219130 00000000 */ nop -/* 431AD4 80219134 4600F001 */ sub.s $f0, $f30, $f0 -/* 431AD8 80219138 46000000 */ add.s $f0, $f0, $f0 -/* 431ADC 8021913C 3C014334 */ lui $at, 0x4334 -/* 431AE0 80219140 44811000 */ mtc1 $at, $f2 -/* 431AE4 80219144 00000000 */ nop -/* 431AE8 80219148 46020000 */ add.s $f0, $f0, $f2 -/* 431AEC 8021914C 4600010D */ trunc.w.s $f4, $f0 -/* 431AF0 80219150 44062000 */ mfc1 $a2, $f4 -.L80219154: -/* 431AF4 80219154 0C0B2026 */ jal set_variable -/* 431AF8 80219158 0200282D */ daddu $a1, $s0, $zero -/* 431AFC 8021915C 8FBF0024 */ lw $ra, 0x24($sp) -/* 431B00 80219160 8FB40020 */ lw $s4, 0x20($sp) -/* 431B04 80219164 8FB3001C */ lw $s3, 0x1c($sp) -/* 431B08 80219168 8FB20018 */ lw $s2, 0x18($sp) -/* 431B0C 8021916C 8FB10014 */ lw $s1, 0x14($sp) -/* 431B10 80219170 8FB00010 */ lw $s0, 0x10($sp) -/* 431B14 80219174 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 431B18 80219178 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 431B1C 8021917C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 431B20 80219180 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 431B24 80219184 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 431B28 80219188 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 431B2C 8021918C 24020002 */ addiu $v0, $zero, 2 -/* 431B30 80219190 03E00008 */ jr $ra -/* 431B34 80219194 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80219198_431B38.s b/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80219198_431B38.s deleted file mode 100644 index 55a6e5bc43..0000000000 --- a/asm/nonmatchings/battle/area_kmr_part_1/4309A0/func_80219198_431B38.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219198_431B38 -/* 431B38 80219198 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 431B3C 8021919C 240403D4 */ addiu $a0, $zero, 0x3d4 -/* 431B40 802191A0 AFBF0010 */ sw $ra, 0x10($sp) -/* 431B44 802191A4 0C046EDD */ jal set_world_fog_dist -/* 431B48 802191A8 240503E8 */ addiu $a1, $zero, 0x3e8 -/* 431B4C 802191AC 2404000F */ addiu $a0, $zero, 0xf -/* 431B50 802191B0 24050005 */ addiu $a1, $zero, 5 -/* 431B54 802191B4 24060037 */ addiu $a2, $zero, 0x37 -/* 431B58 802191B8 0C046EE2 */ jal set_world_fog_color -/* 431B5C 802191BC 240700FF */ addiu $a3, $zero, 0xff -/* 431B60 802191C0 0C046ED4 */ jal enable_world_fog -/* 431B64 802191C4 00000000 */ nop -/* 431B68 802191C8 8FBF0010 */ lw $ra, 0x10($sp) -/* 431B6C 802191CC 24020002 */ addiu $v0, $zero, 2 -/* 431B70 802191D0 03E00008 */ jr $ra -/* 431B74 802191D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 431B78 802191D8 00000000 */ nop -/* 431B7C 802191DC 00000000 */ nop